Merge remote-tracking branch 'origin/master'

src/main/java/com/dsic/gj_erp/bean/kc/ImCkwpkwp.java

@@ -24,6 +24,7 @@ public class ImCkwpkwp {
     private String kwh;//垛位
     @MppMultiId
     private String nbsbm;
+    private String pwbz;
 //    private String ydid;
 //
 //    private String cfcs1;//层数

src/main/java/com/dsic/gj_erp/bean/kc/SlKc.java

@@ -66,6 +66,7 @@ public class SlKc {
     private String ydid;
     private Integer xh;
     private String cz;
+    private String pwbz;
 
     private List<SlKc> list;
 }

src/main/java/com/dsic/gj_erp/bean/zyjh/PwExcel.java

@@ -32,4 +32,9 @@ public class PwExcel {
     @ExcelProperty(value = "状态")
     private String zt;
 
+
+    @ExcelProperty(value = "入库批号")
+    public String nbsmb;
+
+
 }

src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java

@@ -10,12 +10,14 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jhgk.DmYdjh;
+import com.dsic.gj_erp.bean.kc.ImCkwpkwp;
 import com.dsic.gj_erp.bean.zyjh.PwExcel;
 import com.dsic.gj_erp.bean.zyjh.Ycldw;
 import com.dsic.gj_erp.bean.zyjh.YcldwInfo;
 import com.dsic.gj_erp.controller.zyjh.dto.*;
 import com.dsic.gj_erp.exception.ServiceException;
 import com.dsic.gj_erp.listeners.ExcelPwListener;
+import com.dsic.gj_erp.service.kc.ImCkwpkwpService;
 import com.dsic.gj_erp.service.zyjh.YcldwInfoService;
 import com.dsic.gj_erp.service.zyjh.YcldwService;
 import com.dsic.gj_erp.service.zyjh.ZyjhService;
@@ -49,6 +51,9 @@ public class ZyjhController {
 
     private final WebSocketService webSocketService;
 
+
+    private final ImCkwpkwpService imCkwpkwpService;
+
     /**
      * 抛丸导入
      */
@@ -73,20 +78,29 @@ public class ZyjhController {
             DmYdjh ydjh = zyjhService.getOne(new QueryWrapper<DmYdjh>()
                     .eq("dc_ch", item.getDcCh())
                     .eq("dc_pl", item.getDcPl())
-                    .eq("dc_fd", item.getDcFd())
                     .eq("tzbh", item.getTlth())
             );
-            if ("返库".equals(item.getDcCh())) {
+            if ("返库".equals(item.getZt())) {
                 try {
                     DmYdjh dmYdjh = new DmYdjh();
                     dmYdjh.setId(ydjh.getId());
-                    dmYdjh.setZt("11");
+                    dmYdjh.setPwbz(item.getBz());
+                    dmYdjh.setZt("2");
                     zyjhService.updateById(dmYdjh);
 
+                    imCkwpkwpService.update(Wrappers.<ImCkwpkwp>lambdaUpdate()
+                        .set(ImCkwpkwp::getSllsh,"")
+                        .set(ImCkwpkwp::getDyrq,"")
+                        .set(ImCkwpkwp::getDyry,"")
+                        .set(ImCkwpkwp::getPwbz,item.getBz())
+
+                        .eq(ImCkwpkwp::getNbsbm, item.getNbsmb())
+
+                    );
+
                     ycldwInfoService.remove(Wrappers.<YcldwInfo>lambdaQuery()
                             .eq(YcldwInfo::getCzbh, item.getDcCh())
                             .eq(YcldwInfo::getPl, item.getDcPl())
-                            .eq(YcldwInfo::getFd, item.getDcFd())
                             .eq(YcldwInfo::getTlth, item.getTlth())
                     );
                 }catch (Exception ignored){}
@@ -97,13 +111,12 @@ public class ZyjhController {
                         .set(DmYdjh::getLldw,dwId).set(DmYdjh::getLlcs,item.getLlcs())
                         .eq(DmYdjh::getDcCh, item.getDcCh())
                         .eq(DmYdjh::getDcPl, item.getDcPl())
-                        .eq(DmYdjh::getDcFd, item.getDcFd())
+
                         .eq(DmYdjh::getTzbh, item.getTlth()));
 
                 ycldwInfoService.remove(Wrappers.<YcldwInfo>lambdaQuery()
                         .eq(YcldwInfo::getCzbh, item.getDcCh())
                         .eq(YcldwInfo::getPl, item.getDcPl())
-                        .eq(YcldwInfo::getFd, item.getDcFd())
                         .eq(YcldwInfo::getTlth, item.getTlth())
                 );
 

src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java

@@ -190,9 +190,9 @@ public class BomUploadServiceImpl {
             }
 
             List<String> lines = FileUtil.readLines(destFile, "GBK");
-            lines.forEach(e -> {
-                System.out.println("lines = " + e);
-            });
+//            lines.forEach(e -> {
+//                System.out.println("lines = " + e);
+//            });
             //  String delzt="00";
             if (fname.contains("板材领取表")) {
                 int indexOfUnderscore = fname.indexOf('_');

src/main/resources/mappers/kc/ImCkwpkwp.xml

@@ -59,6 +59,7 @@
                    rtrim(IM_CKWPKWP.SLDW) AS SLDW ,
 
                    rtrim(IM_CKWPKWP.WPZT) AS WPZT,
+                   rtrim(IM_CKWPKWP.pwbz) AS pwbz,
                    sllsh,
                    dyry,
                    dyrq,