成衣装箱单调整、托书调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -157,8 +157,12 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 			queryWrapper.like("b.style_Number",syShippingOrder.getStyleNum());
 		}
 //		制单人
-		if(oConvertUtils.isNotEmpty(syShippingOrder.getStyleNum())){
-			queryWrapper.like("a.createBy",syShippingOrder.getCreateBy());
+		if(oConvertUtils.isNotEmpty(syShippingOrder.getCreateBy())){
+			queryWrapper.like("a.create_By",syShippingOrder.getCreateBy());
+		}
+//		分销点
+		if(oConvertUtils.isNotEmpty(syShippingOrder.getDistributionPoint())){
+			queryWrapper.eq("b.distribution_Point",syShippingOrder.getDistributionPoint());
 		}
 
 		if(oConvertUtils.isNotEmpty(smailPo)){
@@ -1197,7 +1201,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 for (SyShippingOrderItem item : list){
 					 	if (sheetRow<25){
 							Row rowT=sheet.getRow(sheetRow);
-							Row rowT2=sheet.getRow(sheetRow+21);
+							Row rowT2=sheet.getRow(sheetRow+23);
 							Cell cellT1=rowT.getCell(6);
 							cellT1.setCellValue(item.getStyleNumber());
 							Cell cellT2=rowT.getCell(7);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -135,6 +135,8 @@ public class SyPackingListTailoringController implements Job {
 								   String endDate,
 								   HttpServletRequest req) {
 		QueryWrapper<SyPackingListTailoringVo> queryWrapper = new QueryWrapper<>();
+		QueryWrapper<SyPackingListTailoringVo> queryWrapper2 = QueryGenerator.initQueryWrapper(syPackingListTailoringVo, req.getParameterMap());
+		System.out.println("排序 \t"+queryWrapper2.getExpression().getOrderBy());
 		Page<SyPackingListTailoringVo> page = new Page<SyPackingListTailoringVo>(pageNo, pageSize);
 		queryWrapper.eq("a.del_flag","0");
 		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getOrderNumber())){
@@ -182,6 +184,29 @@ public class SyPackingListTailoringController implements Job {
 				queryWrapper.ge("a.is_Reference",syPackingListTailoringVo.getIsReference());//是否被参照
 			}
 		}
+//		queryWrapper.groupBy("a.id");
+		if (oConvertUtils.isNotEmpty(syPackingListTailoringVo.getOrder())){
+			String[] sqlSegments=queryWrapper2.getExpression().getOrderBy().get(0).getSqlSegment().split(" ");
+			String column=sqlSegments[0];
+			String order=sqlSegments[1];
+//			System.out.println("column\t"+column);
+//			System.out.println("order\t"+order);
+			if (order.equals("ASC")){
+				if (column.equals("item_number")){
+					queryWrapper.orderByAsc("a."+column);
+				}else{
+					queryWrapper.orderByAsc("b."+column);
+				}
+			}else{
+				if (column.equals("item_number")){
+					queryWrapper.orderByDesc("a."+column);
+				}else{
+					queryWrapper.orderByDesc("b."+column);
+				}
+			}
+		}else{
+			queryWrapper.orderByDesc("a.create_time");
+		}
 		page.setSearchCount(false);//不查询总数
 		IPage<SyPackingListTailoringVo> pageList = syPackingListTailoringService.selectList(page, queryWrapper);
 		return Result.OK(pageList);
@@ -595,6 +620,7 @@ public class SyPackingListTailoringController implements Job {
 		 Page<SyPackingListTailoringVo> page = new Page<SyPackingListTailoringVo>(1, 10000);
 		 QueryWrapper queryWrapper = new QueryWrapper<>();
 		 queryWrapper.eq("a.del_flag","0");
+		 QueryWrapper<SyPackingListTailoringVo> queryWrapper2 = QueryGenerator.initQueryWrapper(syPackingListTailoringVo, request.getParameterMap());
 		 if(selectAll.equals("1")){
 			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getOrderNumber())){
 				 queryWrapper.like("a.order_number",syPackingListTailoringVo.getOrderNumber().trim());//查询订单号
@@ -641,6 +667,28 @@ public class SyPackingListTailoringController implements Job {
 					 queryWrapper.ge("a.is_Reference",syPackingListTailoringVo.getIsReference());//是否被参照
 				 }
 			 }
+			 if (oConvertUtils.isNotEmpty(syPackingListTailoringVo.getOrder())){
+				 String[] sqlSegments=queryWrapper2.getExpression().getOrderBy().get(0).getSqlSegment().split(" ");
+				 String column=sqlSegments[0];
+				 String order=sqlSegments[1];
+//				 System.out.println("column\t"+column);
+//				 System.out.println("order\t"+order);
+				 if (order.equals("ASC")){
+					 if (column.equals("item_number")){
+						 queryWrapper.orderByAsc("a."+column);
+					 }else{
+						 queryWrapper.orderByAsc("b."+column);
+					 }
+				 }else{
+					 if (column.equals("item_number")){
+						 queryWrapper.orderByDesc("a."+column);
+					 }else{
+						 queryWrapper.orderByDesc("b."+column);
+					 }
+				 }
+			 }else{
+				 queryWrapper.orderByDesc("a.create_time");
+			 }
 		 }else{
 			 queryWrapper.in("a.id",Arrays.asList(ids));//查询列表
 		 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/xml/syPackingListTailoringMapper.xml

@@ -99,7 +99,7 @@
         INNER JOIN sy_packing_list_tailoring_item b
         ON a.id = b.sy_packing_list_tailoring_id
         ${ew.customSqlSegment}
-        ORDER BY a.create_time DESC
+--         ORDER BY a.create_time DESC
     </select>
 
     <select id="selectList1" resultType="java.lang.String">
@@ -111,7 +111,7 @@
             sy_packing_list_tailoring_item b
         ON a.id = b.sy_packing_list_tailoring_id
         ${ew.customSqlSegment}
-        ORDER BY a.create_time DESC;
+--         ORDER BY a.create_time DESC;
     </select>
 
     <select id="selectList2" resultType="org.jeecg.modules.splt.vo.SyPackingListTailoringVo">
@@ -168,8 +168,8 @@
          ON a.id=b.sy_packing_list_tailoring_id
 --          and b.del_flag=0
          ${ew.customSqlSegment}
-         GROUP BY a.id
-         order by a.create_time desc /*倒序*/
+--          GROUP BY a.id
+--          order by a.create_time desc
     </select>
 
     <select id="getMainId" resultType="org.jeecg.modules.splt.entity.SyPackingListTailoring">

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/impl/SyPackingListTailoringServiceImpl.java

@@ -731,6 +731,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		long current=page.getCurrent();
 		page.setCurrent(1);
 		page.setSize(page.getSize());
+		queryWrapper.groupBy("a.id");
 		IPage<SyPackingListTailoringVo> page1=syPackingListTailoringMapper.selectList2(page, queryWrapper);
 		page1.setCurrent(current);
 		return page1;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/vo/SyPackingListTailoringVo.java

@@ -169,4 +169,13 @@ public class SyPackingListTailoringVo {
 	@ApiModelProperty(value = "定时状态")
 	private Integer timeStuta;
 
+	/**排序字段*/
+	@Excel(name = "排序字段", width = 15)
+	@ApiModelProperty(value = "排序字段")
+	private String column;
+
+	/**排序顺序*/
+	@Excel(name = "排序顺序", width = 15)
+	@ApiModelProperty(value = "排序顺序")
+	private String order;
 }