修正导出excel

src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java

@@ -318,6 +318,7 @@ public class PgdSljhController {
                 // 库存主键 没存
                 ydjh.setId(slKc.getYdid());
                 ydjh.setZt("2");
+                ydjh.setSllsh("");
                 ydupList.add(ydjh);
             }
         }
@@ -1176,16 +1177,17 @@ public class PgdSljhController {
         int num=1;
         for(SlKc slKc:slKcs1){
             PwExportExcel pwExportExcel= new PwExportExcel();
-            pwExportExcel.setXh(num);
             pwExportExcel.setLph(slKc.getLPH());
             pwExportExcel.setWpxh(slKc.getWPXH());
             pwExportExcel.setWpgg(slKc.getWPGG());
             pwExportExcel.setWpzt(wpztMap.get(slKc.getWPZT()));
-            pwExportExcel.setZych(slKc.getZYCH());
-            pwExportExcel.setZypl(slKc.getZYPL());
+            pwExportExcel.setZych(slKc.getZYCH()+" " +slKc.getZYPL());
+            pwExportExcel.setBz(slKc.getBZ());
+//            pwExportExcel.setZypl(slKc.getZYPL());
             pwExportExcel.setZylx(zylxMap.get(slKc.getZYLX()));
             pwExportExcel.setSldw(qgKwMap.get(slKc.getSLDW()));
-            pwExportExcel.setDcth(slKc.getDCTH());
+            pwExportExcel.setText1(slKc.getLPH()+" "+slKc.getWPXH()+" "+slKc.getWPGG()+" "+wpztMap.get(slKc.getWPZT())+" "+slKc.getBZ());
+            pwExportExcel.setText2(slKc.getZYCH()+" " +slKc.getZYPL()+" "+zylxMap.get(slKc.getZYLX())+" "+qgKwMap.get(slKc.getSLDW())+" "+slKc.getDCTH());
             num++;
             excels.add(pwExportExcel);
         }

src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PwExportExcel.java

@@ -11,25 +11,50 @@ import lombok.Data;
  */
 @Data
 public class PwExportExcel {
-    @ExcelProperty(value = "序号")
-    private  Integer xh;
-    @ExcelProperty(value = "炉批号")
-    private  String lph;
-    @ExcelProperty(value = "材质")
-    private  String wpxh;
+//    @ExcelProperty(value = "序号")
+//    private  Integer xh;
+
+
+    @ExcelProperty(value = "船号  需求批量")
+    private  String zych;
+
+
+//    @ExcelProperty(value = "批量")
+//    private  String zypl;
     @ExcelProperty(value = "规格")
     private  String wpgg;
-    @ExcelProperty(value = "状态")
-    private  String wpzt; //
-    @ExcelProperty(value = "船号")
-    private  String zych;
-    @ExcelProperty(value = "批量")
-    private  String zypl;
+    @ExcelProperty(value = "材质")
+    private  String wpxh;
     @ExcelProperty(value = "流向")
-    private  String zylx; //
-    @ExcelProperty(value = "垛位")
+    private  String zylx;
+
+    @ExcelProperty(value = "切割跨位")
     private  String sldw; //
-    @ExcelProperty(value = "套料图号")
-    private  String dcth; //
+
+
+    @ExcelProperty(value = "炉批号")
+    private  String lph;
+
+
+    @ExcelProperty(value = "物品状态")
+    private  String wpzt; //
+
+    @ExcelProperty(value = "备注")
+    private  String bz; //
+
+
+    @ExcelProperty(value = "炉批号 材质 规格 物品状态 备注")
+    private  String text1; //
+
+    @ExcelProperty(value = "船号 需求批量 流向 切割跨位 套料图号")
+    private  String text2; //
+
+
+ //
+
+//    @ExcelProperty(value = "套料图号")
+//    private  String dcth; //
+
+
 
 }