面辅料拉取和推送调整，预装箱单列表导出增加字段

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -1343,12 +1343,14 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                             strs=strs+sizeTable.getSize()+",";
                         }
                         String[] args2=("B号码,ITEMCODE,LABEL,启始箱号,结束箱号,颜色（中英文）,"+strs+
-                        "件数/每箱,箱数,总件数,长,宽,高,总体积,外箱净重,总净重,外箱毛重,总毛重").split(",");
+                        "件数/每箱,PCS/PACK,PACKS/CTN,PACK QTY,箱数,总件数,长,宽,高,总体积,外箱净重,总净重,外箱毛重,总毛重").split(",");
                         num2++;
+                        //PCS/PACK	PACKS/CTN	PACK QTY
+                        //件数/包	包数/箱	包数
                         for (int i=0;i<args2.length;i++){
                             Cell cell = row1.createCell(i);//横向
                             cell.setCellValue(args2[i]);
-                            if(i<args2.length-11&&i>5){
+                            if(i<args2.length-11-3&&i>5){
                                 cell.setCellStyle(cellStyle2);
                             }else{
                                 cell.setCellStyle(cellStyle);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/entity/SyPreAssembledPackingListItem.java

@@ -528,6 +528,9 @@ public class SyPreAssembledPackingListItem implements Serializable {
 			piecesBox+ ","+
 			boxNumber+ ","+
 			total+ ","+
+			totalPack+ ","+
+			packBox+ ","+
+			packs+ ","+
 			outerBoxLength + ","+
 			outerBoxWidth + ","+
 			outerBoxHeight + ","+
@@ -536,6 +539,8 @@ public class SyPreAssembledPackingListItem implements Serializable {
 			totalNetWeight+ ","+
 			grossWeight + ","+
 			totalGrossWeight;
+
+
 	}
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -1104,12 +1104,12 @@ public class SyPackingListFabricController implements Job {
 						 message2="请先维护装运期限再推送";
 					 }
 				 }
-			 if(main.getRecordingStatus()!=null&&main.getRecordingStatus()==1){
-				 message2="数据在推送中，请不要重复点击";
-			 }else{
-				 main.setRecordingStatus(1);
-				 syPackingListFabricService.updateById(main);//修改成衣
-			 }
+				 /*if(main.getRecordingStatus()!=null&&main.getRecordingStatus()==1){
+					 message2="数据在推送中，请不要重复点击";
+				 }else{
+					 main.setRecordingStatus(1);
+					 syPackingListFabricService.updateById(main);//修改成衣
+				 }*/
 
 				 List<SyPackingListFabricItem> items=syPackingListFabricItemService.selectByMainId3(id);
 				 String message="";//获取报错消息

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricItemMapper.xml

@@ -206,7 +206,7 @@
 	<select id="getDocumentNos"  resultType="java.lang.String">
 		SELECT DISTINCT Document_No
 		FROM `sy_packing_list_fabric`
-		WHERE /* del_flag=0 and*/
+		WHERE del_flag=0 and
 		 Document_No not like 'ML%'
 	</select>
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -1163,7 +1163,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			JSONObject map=new JSONObject();//采购(委外)入库单
 			map.put("CVOUCHCODE", org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cCode","RdRecord01","dnmaketime")));//获取单据号
 			//map.put("CVOUCHCODE", main.getId());//获取单据号
-			map.put("DDATE",createDate);//日期(格式2015-01-01)
+			map.put("DDATE",main.getLatestDateOfShipment());//日期(格式2015-01-01)
 			map.put("CMAKER",createBy);//制单人
 			map.put("CMEMO",main.getRemarks());//制单人
 			map.put("CHANDLER",createBy);//审核人
@@ -1186,7 +1186,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 			JSONObject map4=new JSONObject();//销售出库单
 			map4.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("ccode","rdrecord32","dnmaketime")));//单据号
-			map4.put("DDATE",createDate);//订单日期（格式2015-01-01）
+			map4.put("DDATE",main.getLatestDateOfShipment());//订单日期（格式2015-01-01）
 			map4.put("CHANDLER",createBy);//审核人
 			map4.put("CRDCODE","26");//出库类别
 			map4.put("CMAKER",createBy);//制单人
@@ -1208,7 +1208,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 			JSONObject map7=new JSONObject();//采购(委外)入库单
 			map7.put("CVOUCHCODE", org.jeecg.modules.system.util.oConvertUtils.addOne(org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cCode","RdRecord01","dnmaketime"))));//获取单据号
-			map7.put("DDATE",createDate);//日期(格式2015-01-01)
+			map7.put("DDATE",main.getLatestDateOfShipment());//日期(格式2015-01-01)
 			map7.put("CMAKER",createBy);//制单人
 			map7.put("cVouchType",1);//传1
 			map7.put("CRDCODE","12");//入库类别
@@ -2217,10 +2217,12 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						QueryWrapper<SyShippingDetailsItem> queryWrapper2 = new QueryWrapper<>();
 						queryWrapper2.eq("sy_order_data_item_id", sy1.getIsosid());
 						queryWrapper2.isNotNull("elements_Id");
-						//queryWrapper2.orderByDesc("update_time");
+						queryWrapper2.eq("del_flag","0");
+						queryWrapper2.orderByDesc("update_time");
 						queryWrapper2.last("limit 1");
 						SyShippingDetailsItem syShippingDetailsItem = syShippingDetailsItemMapper.selectOne(queryWrapper2);
 						if (syShippingDetailsItem != null) {
+							System.out.println("syShippingDetailsItemId\t"+syShippingDetailsItem.getId());
 							sy1.setInventoryCcode(syShippingDetailsItem.getInventoryCcode());
 							String elementsId = syShippingDetailsItem.getElementsId();//申报要素id
 							if (oConvertUtils.isNotEmpty(elementsId)) {