1.增加月度计划导入时同步bom的逻辑

2.修正月度计划导入页面元素参数缺失的问题

src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.dsic.gj_erp.bean.jcsj.DmBom;
 import com.dsic.gj_erp.pc.Constant;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -317,4 +318,29 @@ public class DmSygdMx implements Serializable {
         return mx;
     }
 
+    public void setBomData(DmBom bom){
+        this.lqlb=bom.getLqlb();
+        this.tzbh=bom.getTzbh();
+        this.wpgg=bom.getWpgg();
+        this.wpxh=bom.getWpcz();
+        this.hxcd=bom.getHxcd().doubleValue();
+        this.dmcd=bom.getDmcd().doubleValue();
+        this.qgcd=bom.getQgcd().doubleValue();
+        this.qbs=bom.getQbs();
+        try {
+            this.pklx=Double.valueOf(bom.getPklx());
+        }catch (Exception ignored){}
+        this.pkcd=bom.getPkcd().doubleValue();
+        this.ljsl=bom.getLjsl().doubleValue();
+        this.zl=bom.getZl();
+        this.xcms=bom.getXcshms().doubleValue();
+        this.kw=bom.getKw();
+        this.dcFd=bom.getFd();
+        this.bclqzl=bom.getBclqzl().doubleValue();
+        this.bcshzl=bom.getBcshzl().doubleValue();
+        this.bcylzl=bom.getBcylzl().doubleValue();
+        this.bcljtlzl=bom.getBcljtlzl().doubleValue();
+        this.bcqpyld=bom.getBcqpyld().doubleValue();
+        this.ylbhgg=bom.getYlbhgg();
+    }
 }

src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java

@@ -23,6 +23,7 @@ import com.dsic.gj_erp.dao.sy.Dm_zhbmpRepository;
 import com.dsic.gj_erp.handler.ComputePlan;
 import com.dsic.gj_erp.handler.dto.RealCapacity;
 import com.dsic.gj_erp.mapper.jhgk.DmSygdMxMapper;
+import com.dsic.gj_erp.service.jcsj.DmBomService;
 import com.dsic.gj_erp.service.jcsj.EmSbcnpService;
 import com.dsic.gj_erp.service.jhgk.*;
 import com.dsic.gj_erp.util.MyString;
@@ -61,6 +62,8 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
     private EmSbcnpService sbcnpService;
     @Autowired
     Dm_zhbmpRepository dm_zhbmpRepository;
+    @Autowired
+    DmBomService bomService;
 
     public Map<String,List<EmGcrlDto>> getMxMap(String begin,String end){
 
@@ -1276,10 +1279,10 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
                     }
                     zz=zz+skbs;
                 }
-                map.put(dcch+dcpl,insertsOne);
+                map.put(dcch+"_"+dcpl,insertsOne);
 
             }{
-                List<DmSygdMx> insertsOne = map.get(dcch + dcpl);
+                List<DmSygdMx> insertsOne = map.get(dcch +"_"+ dcpl);
 
 
                 int yklm=0;
@@ -1410,7 +1413,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
                     }
                     zz=zz+skbs;
                 }
-                map.put(dcch+dcpl,insertsOne);
+                map.put(dcch+"_"+dcpl,insertsOne);//这里改为用"_"分割,方便后面逻辑调用
             }
 
 
@@ -1426,6 +1429,22 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
             System.out.println("Key: " + key);
             System.out.println("Value: " + value);
 
+            //todo 支持导入有基础数据的月度计划
+//            String ch=key.split("_")[0];
+//            String pl=key.split("_")[1];
+//            List<DmBom> bomList=bomService.list(Wrappers.<DmBom>lambdaQuery().eq(DmBom::getDcch,ch).eq(DmBom::getPl,pl));
+//
+//            //补充基础数据
+//            //fixme 这里有个冲突 ,如果导入的数量比bom少,多次导入时无法确认哪些bom被占用
+//            if (ObjectUtil.isNotEmpty(bomList)){
+//                int size=Math.min(value.size(),bomList.size());
+//                for (int i=0;i<size;i++){
+//                    DmSygdMx dmSygdMx = value.get(i);
+//                    DmBom dmBom = bomList.get(i);
+//                    dmSygdMx.setBomData(dmBom);
+//                }
+//            }
+
             // 如果需要，这里还可以进一步遍历List<DmSygdMx>
             for (DmSygdMx item : value) {
                 // 对每个DmSygdMx对象进行操作
@@ -1436,9 +1455,6 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
                     .eq("dc_fd",item.getDcFd())
                 );
 
-
-
-
             }
             for (DmSygdMx item : value) {
                 item.setId(IdWorker.get32UUID());