上料

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

@@ -1047,6 +1047,7 @@ public class BomUploadServiceImpl {
                         bchxmxp.setZdrqZ(bchxjbp.getZdrq());
                         bchxmxp.setYlzd2Z(bchxjbp.getYlzd2());
                         bchxmxp.setZzcj(zzcj);
+                        bchxmxp.setDcFdZ(StringUtils.isBlank(bchxmxp.getWph()) ? "" : bchxmxp.getWph().substring(0, 4));
                         bchxmxp.setDcZlZ(zl);
                         bchxmxp.setDrcs(cs + 1);
                         addmxs.add(bchxmxp);
@@ -1059,7 +1060,7 @@ public class BomUploadServiceImpl {
             bchxmxpService.saveBatch(addmxs);
             bchxjbpService.saveBatch(adds);
             //List<DmBchxjbp> dmBchxjbps,Map kwxxMap,Map qgKwMap , HttpServletRequest req
-            Map bomxzjh = bomxzjh(adds, kwxxMap, qgKwMap, req);
+            Map bomxzjh = bomxzjh(adds, kwxxMap, qgKwMap, req,addmxs);
             List<DmYdjh> adds1 = (List<DmYdjh>) bomxzjh.get("adds");
             List<DmYdjh> ups = (List<DmYdjh>) bomxzjh.get("ups");
             dmYdjhService.saveBatch(adds1);
@@ -1734,7 +1735,7 @@ public class BomUploadServiceImpl {
 
 
     // 查询 船号 批量 修正作业计划
-    public Map  bomxzjh( List<DmBchxjbp> dmBchxjbps,Map kwxxMap,Map qgKwMap , HttpServletRequest req){
+    public Map  bomxzjh( List<DmBchxjbp> dmBchxjbps,Map kwxxMap,Map qgKwMap , HttpServletRequest req,List<DmBchxmxp>mxs){
         String dcch=dmBchxjbps.get(0).getDcCh();
         String dcpl=dmBchxjbps.get(0).getDcPl();
         List<DmYdjh> ydjhs = dmYdjhService.list(new QueryWrapper<DmYdjh>().eq("dc_ch", dcch )
@@ -1761,7 +1762,8 @@ public class BomUploadServiceImpl {
             //wpgg ,wpxh
           //  DmBchxjbp dmBchxjbp = (DmBchxjbp) ObjConvertUtils.checkNullNew(dmBchxjbp1);
             DmBchxjbp dmBchxjbp =    (DmBchxjbp) ObjConvertUtils.checkNullNew(dmBchxjbp1);
-           // dmBchxjbp
+            DmBchxmxp bchxmxp = mxs.stream().filter(fst -> fst.getHxbh().equals(dmBchxjbp.getHxbh())).findFirst().orElse(null);
+            // dmBchxjbp
             String wpgg = dmBchxjbp.getWpgg();
             String wpxh = dmBchxjbp.getWpxh();
             String tzbh = dmBchxjbp.getTzbh();
@@ -1798,14 +1800,14 @@ public class BomUploadServiceImpl {
                 String zzcj = (String) qgKwMap.get(s); //xhj
 
                 dmYdjh.setKw(zzcj);
-                dmYdjh.setDcFd(dmBchxjbp.getDcFd());
+               // dmYdjh.setDcFd(dmBchxjbp.getDcFd());
 
                 if(tzbh.substring(4, 5).equals("X")){
                     dmYdjh.setLx("X");
                 }else{
                     dmYdjh.setLx("B");
                 }
-
+                dmYdjh.setDcFd(StringUtils.isBlank(bchxmxp.getWph()) ? "" : bchxmxp.getWph().substring(0, 4));
                 dmYdjh.setBmxgrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm"));
                 dmYdjh.setBmxgry((String) req.getAttribute("yhms"));
                 if(StringUtils.isNotBlank(dmYdjh.getSlxhth())){ // 说明已经上料 需要修正数据
@@ -1846,7 +1848,7 @@ public class BomUploadServiceImpl {
                 String s = (String) kwxxMap.get(tzbh.substring(4, 7));
                 String zzcj = (String) qgKwMap.get(s); //xhj
                 dmYdjhadd.setKw(zzcj);
-                dmYdjhadd.setDcFd(dmBchxjbp.getDcFd());
+                dmYdjhadd.setDcFd(StringUtils.isBlank(bchxmxp.getWph()) ? "" : bchxmxp.getWph().substring(0, 4));
                 dmYdjhadd.setZt("2");
 
                 dmYdjhadd.setId(IdWorker.get32UUID());