Ver Fonte

预装箱单导入获取包数,推送添加定时任务

huxy há 2 anos atrás
pai
commit
8d22e2df08

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

@@ -338,7 +338,7 @@ public class SyPreAssembledPackingListItem implements Serializable {
 			prepackSku=parsms[7];
 
 			if(parsms[8]==null|!isNumeric(parsms[8])){
-				totalPack=new BigDecimal("0");//件数包
+				//totalPack=new BigDecimal("0");//件数包
 			}else{
 				totalPack=new BigDecimal(parsms[8]);//件数包
 			}
@@ -347,7 +347,6 @@ public class SyPreAssembledPackingListItem implements Serializable {
 			colour=parsms[9];
 			unitPrice=new BigDecimal("0");//初始化
 			totalPrice=new BigDecimal("0");//初始化
-			System.out.println("parsms[10]\t"+parsms[10]);
 			planQuantity=new BigDecimal(parsms[10]);
 			boxNumber=new BigDecimal(Integer.parseInt(endCaseNumber)-Integer.parseInt(startingBoxNumber)+1);//箱数
 			netWeight=new BigDecimal(parsms[11]);
@@ -362,7 +361,7 @@ public class SyPreAssembledPackingListItem implements Serializable {
 			}*/
 			withCode=parsms[17];//配码
 			if(parsms[18]==null||!isNumeric(parsms[18])){
-				packBox=new BigDecimal("0");//件数包
+				//packBox=new BigDecimal("0");//件数包
 			}else{
 				packBox=new BigDecimal(parsms[18]);//件数包
 			}
@@ -372,7 +371,7 @@ public class SyPreAssembledPackingListItem implements Serializable {
 				piecesBox=new BigDecimal(parsms[8]);//件数包
 			}*/
 			if(parsms[20]==null||!isNumeric(parsms[20])){
-				packs=new BigDecimal("0");//件数包
+				//packs=new BigDecimal("0");//件数包
 			}else{
 				packs=new BigDecimal(parsms[20]);//件数包
 			}

+ 5 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/xml/SyPreAssembledPackingListItemMapper.xml

@@ -448,7 +448,10 @@
 			salesman,
 			sales_Department,
 			customs_declaration_unit_price,
-			pack_id)
+			pack_id,
+			total_Pack,
+			pack_box,
+			packs)
 			VALUES
 			<foreach collection="list" item="entity" index="index" separator="," >
 				(#{entity.id}, #{entity.syPreAssembledPackingListId}, #{entity.syDeclarationElementsId}, #{entity.syDeclarationElementsItemId}, #{entity.acSetNo},
@@ -460,7 +463,7 @@
 				#{entity.inventoryName}, #{entity.factoryUnitPrice}, #{entity.masterMetering}, #{entity.groupId}, #{entity.inventoryCode}, #{entity.planQuantity},
 				#{entity.actualPackingQty}, #{entity.spurOrSubOrder}, #{entity.syOrderDataId}, #{entity.syOrderDataItemId}, #{entity.inventoryCcode}, #{entity.supplierCode},
 				#{entity.supplier}, #{entity.ompoAccount}, #{entity.ompoId}, #{entity.ompoIdItem}, #{entity.ymoney}, #{entity.planSize}, #{entity.orderNumber}, #{entity.remainingQuantity},
-				 #{entity.salesman}, #{entity.salesDepartment}, #{entity.customsDeclarationUnitPrice}, #{entity.packId})
+				 #{entity.salesman}, #{entity.salesDepartment}, #{entity.customsDeclarationUnitPrice}, #{entity.packId}, #{entity.totalPack}, #{entity.packBox}, #{entity.packs})
 			</foreach>
 
 	</select>

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

@@ -671,7 +671,6 @@ public class SyPackingListFabricController {
 		 return maps;
 	 }
 
-
 	 public Map<String,SyPackingListFabric>  refreshSheet2(Workbook workbook1) throws ParseException {
 		 Map<String,SyPackingListFabric> maps=new HashMap<>();
 		 Iterator sheets=workbook1.sheetIterator();
@@ -1069,14 +1068,16 @@ public class SyPackingListFabricController {
 		 return result;
 	 }
 
-
-/*
 	 public void execute(JobExecutionContext context) throws JobExecutionException {
-		 String [] ids=new String[10];//修改调整
+		 QueryWrapper queryWrapper=new QueryWrapper();
+		 queryWrapper.eq("push_State","3");//推送中
+		 queryWrapper.or();
+		 queryWrapper.like("recording_Error","超时");//超时
+	 	 List<SyPackingListFabric> syPackingListFabrics=syPackingListFabricService.list(queryWrapper);//修改调整
 		 String message2="";
-		 for (int i=0; i<ids.length;i++){
+		 for (int i=0; i<syPackingListFabrics.size();i++){
 			 try {
-				 String id=ids[i];
+				 String id=syPackingListFabrics.get(0).getId();
 				 Map<String,Object> map=new HashMap<>();
 				 SyPackingListFabric main=syPackingListFabricService.getById(id);
 				 if(main.getIsReference()==0){
@@ -1101,13 +1102,12 @@ public class SyPackingListFabricController {
 						 message2="请先维护装运期限再推送";
 					 }
 				 }
-			 */
-/*if(main.getRecordingStatus()!=null&&main.getRecordingStatus()==1){
+			 if(main.getRecordingStatus()!=null&&main.getRecordingStatus()==1){
 				 message2="数据在推送中,请不要重复点击";
 			 }else{
 				 main.setRecordingStatus(1);
 				 syPackingListFabricService.updateById(main);//修改成衣
-			 }*//*
+			 }
 
 				 List<SyPackingListFabricItem> items=syPackingListFabricItemService.selectByMainId3(id);
 				 String message="";//获取报错消息
@@ -1192,7 +1192,7 @@ public class SyPackingListFabricController {
 			 }
 		 }
 	 }
-*/
+
 
 	 @AutoLog(value = "装箱单面辅料批量推送u8")
 	 @ApiOperation(value="装箱单面辅料批量推送u8", notes="装箱单面辅料批量推送u8")
@@ -1211,10 +1211,10 @@ public class SyPackingListFabricController {
 		 updateWrapper.ne("push_State","4");//不等于4
 		 updateWrapper.in("id",ids);
 		 syPackingListFabricService.update(updateWrapper);
-//		 result.setSuccess(true);
-//		 result.setMessage("已将"+ids.length+"条数据,调整为推送中");
-//		 return result;
-		 String message2="";
+		 result.setSuccess(true);
+		 result.setMessage("已将"+ids.length+"条数据,调整为推送中");
+		 return result;
+		 /*String message2="";
 		 for (int i=0; i<ids.length;i++){
 			 try {
 				 String id=ids[i];
@@ -1242,12 +1242,12 @@ public class SyPackingListFabricController {
 						 message2="请先维护装运期限再推送";
 					 }
 				 }
-				 /*if(main.getRecordingStatus()!=null&&main.getRecordingStatus()==1){
+				 *//*if(main.getRecordingStatus()!=null&&main.getRecordingStatus()==1){
 					 message2="数据在推送中,请不要重复点击";
 				 }else{
 					 main.setRecordingStatus(1);
 					 syPackingListFabricService.updateById(main);//修改成衣
-				 }*/
+				 }*//*
 				 List<SyPackingListFabricItem> items=syPackingListFabricItemService.selectByMainId3(id);
 				 String message="";//获取报错消息
 				 String account="";//当前账套
@@ -1339,7 +1339,7 @@ public class SyPackingListFabricController {
 				 result.error500("操作失败:"+e.getMessage());
 			 }
 		 }
-		 return result;
+		 return result;*/
 	 }
 
 	 @AutoLog(value = "装箱单面辅料推送u8")

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

@@ -1329,13 +1329,16 @@ public class SyPackingListTailoringController {
 		 return result;
 	 }
 
-
-	/* public void execute(JobExecutionContext context) throws JobExecutionException {
-		 String [] ids=new String[10];//修改调整
+	 public void execute(JobExecutionContext context) throws JobExecutionException {
+		 QueryWrapper queryWrapper=new QueryWrapper();
+		 queryWrapper.eq("push_State","3");//推送中
+		 queryWrapper.or();
+		 queryWrapper.like("recording_Error","超时");//超时
+		 List<SyPackingListTailoring> syPackingListTailorings=syPackingListTailoringService.list(queryWrapper);//修改调整
 		 String message2="";
-		 for (int i=0; i<ids.length;i++){
+		 for (int i=0; i<syPackingListTailorings.size();i++){
 			 try {
-				 String id=ids[i];
+				 String id=syPackingListTailorings.get(0).getId();
 				 SyPackingListTailoring main=syPackingListTailoringService.getById(id);
 				 if(main.getIsReference()==0){
 					 message2="请先做托书再推送";
@@ -1382,12 +1385,12 @@ public class SyPackingListTailoringController {
 						 syPackingListTailoringService.updateById(main);
 						 continue;//本次不循环
 					 }
-					 *//*if(main.getRecordingStatus()!=null&&main.getRecordingStatus()==1){
+					 /*if(main.getRecordingStatus()!=null&&main.getRecordingStatus()==1){
 						 //message2="数据在推送中,请不要重复点击";
 					 }else{
 						 main.setRecordingStatus(1);
 						 syPackingListTailoringService.updateById(main);//修改成衣
-					 }*//*
+					 }*/
 					 SyOrderDataItem syOrderDataItem=syOrderDataItemMapper.selectById(syPackingListTailoringItems.get(0).getSyOrderDataItemId());//供应商全称
 					 if(syOrderDataItem!=null){
 						 main.setSupplierCode(syOrderDataItem.getSupplierCode());
@@ -1439,7 +1442,7 @@ public class SyPackingListTailoringController {
 				 e.printStackTrace();
 			 }
 		 }
-	 }*/
+	 }
 
 	 @AutoLog(value = "装箱单成衣批量推送u8")
 	 @ApiOperation(value="装箱单成衣批量推送u8", notes="装箱单成衣批量推送u8")
@@ -1458,10 +1461,10 @@ public class SyPackingListTailoringController {
 		 updateWrapper.set("recording_Status",1);//推送中
 		 updateWrapper.in("id",ids);
 		 syPackingListTailoringService.update(updateWrapper);
-		 //result.setSuccess(true);
-		 //result.setMessage("已将"+ids.length+"条数据,调整为推送中");
-		 //return result;
-		 String message2="";
+		 result.setSuccess(true);
+		 result.setMessage("已将"+ids.length+"条数据,调整为推送中");
+		 return result;
+		/* String message2="";
 		 for (int i=0; i<ids.length;i++){
 			 try {
 			 	String id=ids[i];
@@ -1511,12 +1514,12 @@ public class SyPackingListTailoringController {
 						 syPackingListTailoringService.updateById(main);
 					 	continue;//本次不循环
 					 }
-					 /*if(main.getRecordingStatus()!=null&&main.getRecordingStatus()==1){
+					 *//*if(main.getRecordingStatus()!=null&&main.getRecordingStatus()==1){
 						 //message2="数据在推送中,请不要重复点击";
 					 }else{
 						 main.setRecordingStatus(1);
 						 syPackingListTailoringService.updateById(main);//修改成衣
-					 }*/
+					 }*//*
 					 SyOrderDataItem syOrderDataItem=syOrderDataItemMapper.selectById(syPackingListTailoringItems.get(0).getSyOrderDataItemId());//供应商全称
 					 if(syOrderDataItem!=null){
 						 main.setSupplierCode(syOrderDataItem.getSupplierCode());
@@ -1576,7 +1579,7 @@ public class SyPackingListTailoringController {
 				 result.error500("操作失败:"+e.getMessage());
 			 }
 		 }
-		 return result;
+		 return result;*/
 	 }
 
 	 @AutoLog(value = "装箱单成衣推送u8")

+ 12 - 8
jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/xml/syPackingListTailoringItemMapper.xml

@@ -128,7 +128,10 @@
 			salesman,/*业务员*/
 			sales_Department,/*业务部门*/
 			ymoney,/*佣金*/
-			group_id
+			group_id,
+			total_Pack,
+			pack_box,
+			packs
 		FROM  sy_pre_assembled_packing_list_item
 		WHERE sy_pre_assembled_packing_list_id in
 		<foreach collection="list" item="value" index="index" open="(" separator="," close=")">
@@ -320,17 +323,18 @@
 		net_weight,total_net_weight,gross_weight,total_gross_weight,outer_box_length,outer_box_width,outer_box_height,total_volume,net_weight_too,unit_price,total_price,
 		remarks,create_by,create_time,update_by,update_time,pk_org,del_flag,memo,sort,with_code,inventory_name,group_id,inventory_Code,master_Metering,factory_Unit_Price,
 		plan_Quantity,actual_Packing_Qty,plan_Size,inventory_Ccode,supplier_Code,supplier,ompo_Account,ompo_Id,ompo_Id_Item,ymoney,order_Number,salesman,sales_Department,
-		spur_Or_Sub_Order,elements_Id,customs_declaration_unit_price,sy_order_data_id,sy_order_data_item_id,pack_id) VALUES
+		spur_Or_Sub_Order,elements_Id,customs_declaration_unit_price,sy_order_data_id,sy_order_data_item_id,pack_id,total_Pack,pack_box,packs) VALUES
 		<foreach collection="list" item="entity" index="index" separator="," >
 			(#{entity.id},#{entity.syPackingListTailoringId},#{entity.syPreAssembledPackingListId},#{entity.syPreAssembledPackingListItemId},#{entity.acSetNo},
 			#{entity.garmentFactory},#{entity.hod},#{entity.styleNo},#{entity.smallPo},#{entity.poNo},#{entity.itemCode},#{entity.distributionPoint},#{entity.prepackSku},
 			#{entity.size},#{entity.startingBoxNumber},#{entity.endCaseNumber},#{entity.colour},#{entity.piecesBox},#{entity.boxNumber},#{entity.total},#{entity.netWeight},
-			#{entity.totalNetWeight},#{entity.grossWeight},#{entity.totalGrossWeight},#{entity.outerBoxLength},#{entity.outerBoxWidth},#{entity.outerBoxHeight},
-			#{entity.totalVolume},#{entity.netWeightToo},#{entity.unitPrice},#{entity.totalPrice},#{entity.remarks},#{entity.createBy},#{entity.createTime},#{entity.updateBy},
-			#{entity.updateTime},#{entity.pkOrg},#{entity.delFlag},#{entity.memo},#{entity.sort},#{entity.withCode},#{entity.inventoryName},#{entity.groupId},#{entity.inventoryCode},
-			#{entity.masterMetering},#{entity.factoryUnitPrice},#{entity.planQuantity},#{entity.actualPackingQty},#{entity.planSize},#{entity.inventoryCcode},#{entity.supplierCode},
-			#{entity.supplier},#{entity.ompoAccount},#{entity.ompoId},#{entity.ompoIdItem},#{entity.ymoney},#{entity.orderNumber},#{entity.salesman},#{entity.salesDepartment},
-			#{entity.spurOrSubOrder},#{entity.elementsId},#{entity.customsDeclarationUnitPrice},#{entity.syOrderDataId},#{entity.syOrderDataItemId},#{entity.packId})
+			#{entity.totalNetWeight},#{entity.grossWeight},#{entity.totalGrossWeight},#{entity.outerBoxLength},#{entity.outerBoxWidth},#{entity.outerBoxHeight},#{entity.totalVolume},
+			#{entity.netWeightToo},#{entity.unitPrice},#{entity.totalPrice},#{entity.remarks},#{entity.createBy},#{entity.createTime},#{entity.updateBy},#{entity.updateTime},#{entity.pkOrg},
+			#{entity.delFlag},#{entity.memo},#{entity.sort},#{entity.withCode},#{entity.inventoryName},#{entity.groupId},#{entity.inventoryCode},#{entity.masterMetering},
+			#{entity.factoryUnitPrice},#{entity.planQuantity},#{entity.actualPackingQty},#{entity.planSize},#{entity.inventoryCcode},#{entity.supplierCode},#{entity.supplier},
+			#{entity.ompoAccount},#{entity.ompoId},#{entity.ompoIdItem},#{entity.ymoney},#{entity.orderNumber},#{entity.salesman},#{entity.salesDepartment},
+			#{entity.spurOrSubOrder},#{entity.elementsId},#{entity.customsDeclarationUnitPrice},#{entity.syOrderDataId},#{entity.syOrderDataItemId},#{entity.packId},
+			#{entity.totalPack}, #{entity.packBox}, #{entity.packs})
 		</foreach>
 
 	</select>

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

@@ -1497,14 +1497,17 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 									System.out.println("mapItems4\t"+mapItems5);
 								}
 							}
-							text(mapList3,"销售发货单");
+							text(mapList5,mapt.get("ordertype")+"发票单");
 							JSONArray resturn5 = InterfaceConnUtils.doPost(mapList5,"purinvoice_import");//采购发票单
 							recording=result(main,resturn5,mapt.get("ordertype")+"发票单",((Map) mapList.get(0)).get("CACCID").toString(),"2");//采购发票单
 							recording(main,recording);
 							this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn5.getJSONObject(0).get("U8ReceiptNo").toString()),"109");
 						}
 					case "2":
-						text(mapList5,mapt.get("ordertype")+"发票单");
+						text(mapList3,"销售发货单");
+						if(true){
+							throw new JeecgBootException("账套102接口销售发货单,原因错误:未设置对象变量或 With block 变量");
+						}
 						JSONArray resturn3 = InterfaceConnUtils.doPost(mapList3,"consignment_import");//销售发货单
 						recording=result(main,resturn3,"销售发货单",((Map) mapList.get(0)).get("CACCID").toString(),"3");//销售发货单
 						maps.get(account).put("code",resturn3.getJSONObject(0).get("U8ReceiptNo").toString());