发运明细成衣导出调整

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

@@ -612,15 +612,20 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 				  //页签命名规范 款号-分销点 用-后缀数字区分
 				  workbook.setSheetName(index,syPreList.get(index).getItemNumber()+"-"+syPreList.get(index).getDistributionPoint()+"-"+(index+1));
 				  StringBuilder builder = new StringBuilder();
+				  StringBuilder builder1 = new StringBuilder();
 				  //获取尺码组
 				  List<SizeTable> sizeGroup = syPreAssembledPackingListItemMapper.querySize(syPreList.get(index).getId(),syPreList.get(index).getGroupId());
 				  for(SizeTable si:sizeGroup){
+				  	  //尺码
 					  builder.append(si.getSize());
 					  builder.append("*");
+					  //发运明细ID
+					  builder1.append(si.getItemId());
+					  builder1.append(",");
 				  }
 				  //创建列名放在第一行
 				  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()).split("\\*");
+				  String[] params1 =syPreList.get(index).toString(builder.toString(),builder1.toString()).split("\\*");
 				  Row row1 = sheet.createRow(0);
 				  Row row2 = sheet.createRow(1);
 

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

@@ -195,13 +195,13 @@ public class SyPreAssembledPackingListVo {
     public SyPreAssembledPackingListVo(){
     }
 
-    public String toString(String builder){
+    public String toString(String builder,String builder1){
 //        String fw[] = builder.split("\\*");
 //        String fwSplit = fw[0]+"~"+fw[fw.length-1];
         return garmentFactory+"*"+itemNumber+"*"+smallPo+"*"+distributionPoint+"*"+""+
                 "*"+""+"*"+""+"*"+""+"*"+builder+color+"*"+plannedShippingQuantity+
                 "*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+
-                customerAbb+"*"+itemId+"*"+groupId+"*"+id+"*"+elenmentId;
+                customerAbb+"*"+builder1+"*"+groupId+"*"+id+"*"+elenmentId;
     }