出运明细成衣导出调整

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

@@ -577,7 +577,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 					  builder.append("*");
 				  }
 				  //创建列名放在第一行
-				  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()).split("\\*");
 				  Row row1 = sheet.createRow(0);
 				  Row row2 = sheet.createRow(1);
@@ -586,7 +586,13 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 					  Cell cell = row1.createCell(x);
 					  cell.setCellValue(params[x]);
 
-					  if(x > 9 && x < params.length-27){
+					  //设置单元格宽度
+					  if(x > params.length-5){
+						  sheet.setColumnWidth(x,500);
+					  }else{
+						  sheet.setColumnWidth(x,3000);
+					  }
+					  if(x > 7 && x < params.length-13){
 						  Cell cell1 = row2.createCell(x);
 						  cell1.setCellValue(" ");
 					  }else{

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

@@ -196,13 +196,12 @@ public class SyPreAssembledPackingListVo {
     }
 
     public String toString(String builder){
-        String fw[] = builder.split("\\*");
-        String fwSplit = fw[0]+"~"+fw[fw.length-1];
-
-        return account+"*"+garmentFactory+"*"+preDeliveryDate+"*"+itemNumber+"*"+smallPo+"*"+distributionPoint+
-                "*"+""+"*"+""+"*"+""+"*"+""+"*"+builder+"*"+color+"*"+codingRules+"*"+""+"*"+plannedShippingQuantity+
-                "*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+unitPrice+
-                "*"+""+"*"+""+"*"+itemId+"*"+groupId+"*"+id+"*"+orderNumber+"*"+itemNuber+"*"+fwSplit+"*"+customer+"*"+customerAbb+"*"+elenmentId;
+//        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;
     }