From 97ba5d2f7ba06ec8330c2e30934aae6508cc4b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Wed, 16 Oct 2024 11:44:39 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E6=9C=88=E5=BA=A6=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=AF=BC=E5=85=A5=E6=97=B6=E5=90=8C=E6=AD=A5bom?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91=202.=E4=BF=AE=E6=AD=A3=E6=9C=88?= =?UTF-8?q?=E5=BA=A6=E8=AE=A1=E5=88=92=E5=AF=BC=E5=85=A5=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=85=83=E7=B4=A0=E5=8F=82=E6=95=B0=E7=BC=BA=E5=A4=B1=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dsic/gj_erp/bean/jhgk/DmSygdMx.java | 26 +++++++++++++++++ .../jhgk/impl/DmSygdMxServiceImpl.java | 28 +++++++++++++++---- 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java index a820ec4..d26184c 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java +++ b/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(); + } } diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java index d2ba251..c9106f0 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java +++ b/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 i private EmSbcnpService sbcnpService; @Autowired Dm_zhbmpRepository dm_zhbmpRepository; + @Autowired + DmBomService bomService; public Map> getMxMap(String begin,String end){ @@ -1276,10 +1279,10 @@ public class DmSygdMxServiceImpl extends ServiceImpl i } zz=zz+skbs; } - map.put(dcch+dcpl,insertsOne); + map.put(dcch+"_"+dcpl,insertsOne); }{ - List insertsOne = map.get(dcch + dcpl); + List insertsOne = map.get(dcch +"_"+ dcpl); int yklm=0; @@ -1410,7 +1413,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl i } zz=zz+skbs; } - map.put(dcch+dcpl,insertsOne); + map.put(dcch+"_"+dcpl,insertsOne);//这里改为用"_"分割,方便后面逻辑调用 } @@ -1426,6 +1429,22 @@ public class DmSygdMxServiceImpl extends ServiceImpl i System.out.println("Key: " + key); System.out.println("Value: " + value); + //todo 支持导入有基础数据的月度计划 +// String ch=key.split("_")[0]; +// String pl=key.split("_")[1]; +// List bomList=bomService.list(Wrappers.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 for (DmSygdMx item : value) { // 对每个DmSygdMx对象进行操作 @@ -1436,9 +1455,6 @@ public class DmSygdMxServiceImpl extends ServiceImpl i .eq("dc_fd",item.getDcFd()) ); - - - } for (DmSygdMx item : value) { item.setId(IdWorker.get32UUID());