预托书参照查询条件更改，发运明细成衣导出增加字段且自动计算

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/controller/SyLetterDepositController.java

@@ -478,7 +478,8 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 		 }
 		 queryWrapper.eq("a.del_flag",0);
 		 queryWrapper.eq("b.del_flag",0);
-		 queryWrapper.eq("a.is_reference",0);
+		 //queryWrapper.eq("a.is_reference",0);
+		 queryWrapper.and(QueryWrapper -> QueryWrapper.eq("a.is_reference", 0).or().eq("a.is_reference", 2));
 		 queryWrapper.eq("a.status",1);
 		 queryWrapper.groupBy("a.document_No");
 		 queryWrapper.orderByDesc("a.item_number,b.po_no");

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -625,7 +625,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 				  }
 				  builder1.deleteCharAt(builder1.length()-1);
 				  //创建列名放在第一行
-				  String[] params =("成衣工厂*款号*小po*分销点*起始箱号*结束箱号*item NO./SKU NO./UPC NO./PACKS CODE*PREACKSKU*"+builder+"颜色*计划装箱数量*净重/箱*毛重/箱*外箱长度*外箱宽度*外箱高度*净净重*客户简称*发运明细子表ID*发运明细分组ID*发运明细主表ID*申报要素ID").split("\\*");
+				  String[] params =("成衣工厂*款号*小po*分销点*起始箱号*结束箱号*item NO./SKU NO./UPC NO./PACKS CODE*PREACKSKU*"+builder+"颜色*计划装箱数量*净重/箱*毛重/箱*外箱长度*外箱宽度*外箱高度*净净重*客户简称*配码规格*箱数*体积*总毛重*总净重*发运明细子表ID*发运明细分组ID*发运明细主表ID*申报要素ID").split("\\*");
 				  String[] params1 =syPreList.get(index).toString(builder.toString(),builder1.toString()).split("\\*");
 				  Row row1 = sheet.createRow(0);
 				  Row row2 = sheet.createRow(1);
@@ -640,13 +640,34 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 					  }else{
 						  sheet.setColumnWidth(x,3000);
 					  }
-					  if(x > 7 && x < params.length-13){
+					  if(x > 7 && x < params.length-18){
 						  Cell cell1 = row2.createCell(x);
 						  cell1.setCellValue(" ");
 					  }else{
 						  Cell cell1 = row2.createCell(x);
 						  cell1.setCellValue(params1[x]);
-
+					  }
+					  //计算箱数
+					  if(x == params.length-8){
+						  Cell cell1 = row2.createCell(x);
+						  cell1.setCellFormula("SUM(F2-E2+1)");
+						  //cell1.setCellValue("=");
+					  }
+					  //体积
+					  if(x == params.length-7){
+						  Cell cell1 = row2.createCell(x);
+						  cell1.setCellFormula("ROUND(SUM(S2*T2*U2*Y2/1000000),3)");
+						  //cell1.setCellValue("=");
+					  }
+					  //总毛重
+					  if(x == params.length-6){
+						  Cell cell1 = row2.createCell(x);
+						  cell1.setCellFormula("ROUND(SUM(R2*Y2),2)");
+					  }
+					  //总净重
+					  if(x == params.length-5){
+						  Cell cell1 = row2.createCell(x);
+						  cell1.setCellFormula("ROUND(SUM(Q2*Y2),2)");
 					  }
 
 				  }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/entity/VO/SyPreAssembledPackingListVo.java

@@ -201,7 +201,7 @@ public class SyPreAssembledPackingListVo {
         return garmentFactory+"*"+itemNumber+"*"+smallPo+"*"+distributionPoint+"*"+""+
                 "*"+""+"*"+""+"*"+""+"*"+builder+color+"*"+plannedShippingQuantity+
                 "*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+
-                customerAbb+"*"+builder1+"*"+groupId+"*"+id+"*"+elenmentId;
+                customerAbb+"*"+codingRules+"*"+""+"*"+""+"*"+""+"*"+""+"*"+builder1+"*"+groupId+"*"+id+"*"+elenmentId;
     }