预装箱单列表导出bug修复

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

@@ -1086,7 +1086,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
     @AutoLog(value = "导出")
     @ApiOperation(value="导出", notes="导出")
     @RequestMapping(value = "/exportXls")
-    public Result<SyPreAssembledPackingList> exportXls3(HttpServletRequest request,HttpServletResponse response,SyPreAssembledPackingListVo syPreAssembledPackingListVo,
+    public Result<SyPreAssembledPackingList> exportXls(HttpServletRequest request,HttpServletResponse response,SyPreAssembledPackingListVo syPreAssembledPackingListVo,
                                                         String stratDate,
                                                         String endDate,
                                                         String []ids,

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

@@ -494,33 +494,34 @@ public class SyPreAssembledPackingListItem implements Serializable {
 		//sizes
 		//件数/每箱	箱数	总件数	外箱长度	外箱宽度	外箱高度	总体积	外箱净重	总净重	外箱毛重	总毛重
 		String sizes="";
-		if(sizes1.size()>sizeTables.size()){
-			for (SizeTable size1 : sizes1){
-				boolean bool=false;
-				SizeTable size2=new SizeTable();
-				for (SizeTable size : sizeTables){
-					 if(size1.getSize().equals(size.getSize())){//有相同的尺码
-					 	bool=true;
-					 	size2=size;
-					 	break;
-					 }
-				}
-				if(bool){
-					sizes+=size2.getProportion()+",";
-				}else{
-					sizes+=",";
-				}
-				//id+=size1.getItemId()+"-";
-			}
-		}else{
+//		if(sizes1.size()>=sizeTables.size()){
+		for (SizeTable size1 : sizes1){
+			boolean bool=false;
+			SizeTable size2=new SizeTable();
 			for (SizeTable size : sizeTables){
-				if(size.getProportion()==null){
-					sizes+=",";
-				}else{
-					sizes+=size.getProportion()+",";
-				}
+				 if(size1.getSize().equals(size.getSize())){//有相同的尺码
+					bool=true;
+					size2=size;
+					break;
+				 }
+			}
+			if(bool){
+				sizes+=size2.getProportion()+",";
+			}else{
+				sizes+=",";
 			}
+			//id+=size1.getItemId()+"-";
 		}
+//		}else{
+//			for (SizeTable size : sizeTables){
+//				if(size.getProportion()==null){
+//					sizes+=",";
+//				}else{
+//					sizes+=size.getProportion()+",";
+//				}
+//			}
+//		}
+		//setSizetable2();
 
 		//System.out.println("totalVolume\t"+totalVolume+"\ttotalNetWeight\t"+totalNetWeight+"\ttotalGrossWeight\t"+totalGrossWeight);
 		return

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

@@ -1791,7 +1791,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 							recording=result(main,resturn5,mapt.get("ordertype")+"发票单",((Map) mapList.get(0)).get("CACCID").toString(),"2");//采购发票单
 							redisUtil.set("pushsno002", pushsno002);//采购委外入库单
 							recording(main,recording);
-							this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn5.getJSONObject(0).get("U8ReceiptNo").toString()),"109");
+							//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn5.getJSONObject(0).get("U8ReceiptNo").toString()),"109");
 							if(((Map) mapList.get(0)).get("CACCID").toString().equals("101")){
 								return account+"账套推送成功!";
 							}
@@ -1807,7 +1807,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						maps.get(account).put("code",resturn3.getJSONObject(0).get("U8ReceiptNo").toString());
 						recording(main,recording);
 						String u8ReceiptNo103= resturn3.getJSONObject(0).get("U8ReceiptNo").toString();
-						this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(u8ReceiptNo103,"108");
+						//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(u8ReceiptNo103,"108");
 					case "3":
 						String consignmentName=maps.get(account).get("code");//获取销售发货单
 						List<Map<String,Object>> consignmentMaps= syPackingListTailoringMapper.getDispatchLists(consignmentName);
@@ -1841,7 +1841,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 							return account+"账套推送成功!";
 						}
 						String saleoutName=maps.get(account).get("code");//销售发票单
-						this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(saleoutName),"131");
+						//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(saleoutName),"131");
 						List<Map<String,Object>> saleoutMaps= syPackingListTailoringMapper.getRdrecord32(saleoutName);
 						if(saleoutMaps!=null){
 							for (Map map : saleoutMaps){
@@ -1873,7 +1873,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		recording=result(main,resturn1,mapt.get("ordertype")+"入库单",((Map) mapList.get(0)).get("CACCID").toString(),"1");//采购入库单
 		redisUtil.set("pushsno001", pushsno001);//采购委外入库单
 		recording(main,recording);
-		this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn1.getJSONObject(0).get("U8ReceiptNo").toString()),"107");
+		//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn1.getJSONObject(0).get("U8ReceiptNo").toString()),"107");
 
 		JSONObject jsonObject1=resturn1.getJSONObject(0);//采购入库单
 		String purchaseinName=jsonObject1.get("U8ReceiptNo").toString();//获取销售发货单
@@ -1902,7 +1902,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			recording=result(main,resturn5,mapt.get("ordertype")+"发票单",((Map) mapList.get(0)).get("CACCID").toString(),"2");//采购发票单
 			redisUtil.set("pushsno002", pushsno002);//采购委外入库单
 			recording(main,recording);
-			this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn5.getJSONObject(0).get("U8ReceiptNo").toString()),"109");
+			//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn5.getJSONObject(0).get("U8ReceiptNo").toString()),"109");
 
 		}
 		if(((Map) mapList.get(0)).get("CACCID").toString().equals("101")){
@@ -1915,7 +1915,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		redisUtil.set("pushsno003", pushsno003);//采购委外入库单
 		recording(main,recording);
 		String u8ReceiptNo103= resturn3.getJSONObject(0).get("U8ReceiptNo").toString();
-		this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(u8ReceiptNo103,"108");
+		//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(u8ReceiptNo103,"108");
 
 		JSONObject jsonObject3=resturn3.getJSONObject(0);//销售发货单
 		String consignmentName=jsonObject3.get("U8ReceiptNo").toString();//获取销售发货单