From a2d78d543a4c1784228ed91d8980ecd0c90d7034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Thu, 31 Oct 2024 10:10:15 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=A0=B9=E6=8D=AE=E7=B3=BB=E5=88=97=E8=88=B9?=
 =?UTF-8?q?=E6=88=96=E8=AE=A2=E8=B4=A7=E6=B8=85=E5=8D=95=E6=8E=92=E4=BA=A7?=
 =?UTF-8?q?=E6=97=B6,=E8=8E=B7=E5=8F=96=E5=88=86=E6=AE=B5=E9=92=A2?=
 =?UTF-8?q?=E6=96=99=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9=E4=B8=BA=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=85=A8=E9=87=8F=E6=95=B0=E6=8D=AE,=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91=E4=BA=A7=E5=93=81=E7=BB=93=E6=9E=84=E6=97=B6=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E4=BB=8E=E7=B3=BB=E5=88=97=E8=88=B9=E6=88=96=E8=AE=A2?=
 =?UTF-8?q?=E8=B4=A7=E6=B8=85=E5=8D=95=E5=8A=A0=E8=BD=BD=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=202.=E5=A2=9E=E5=8A=A0=E5=BD=93=E4=BB=8E?=
 =?UTF-8?q?=E7=B3=BB=E5=88=97=E8=88=B9=E5=92=8C=E8=AE=A2=E8=B4=A7=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E4=BE=9D=E7=84=B6=E6=97=A0=E6=B3=95=E7=94=9F=E6=88=90?=
 =?UTF-8?q?bom=E6=97=B6=E7=9A=84=E9=94=99=E8=AF=AF=E6=8F=90=E9=86=92,?=
 =?UTF-8?q?=E5=88=87=E7=BB=88=E6=AD=A2=E6=9C=AC=E6=AC=A1=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=8E=92=E4=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/jhgk/impl/DmDhqdpServiceImpl.java |  6 +-
 .../jhgk/impl/DmSygdxqServiceImpl.java        | 77 +++++++++++--------
 .../resources/mappers/jhgk/DmSygdxqMapper.xml |  4 +-
 3 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmDhqdpServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmDhqdpServiceImpl.java
index 6168de1..8330132 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmDhqdpServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmDhqdpServiceImpl.java
@@ -178,9 +178,9 @@ public class DmDhqdpServiceImpl extends ServiceImpl<DmDhqdpMapper, DmDhqdp> impl
         List<DmDhqdp> dmDhqdps = reader.read(1, 2, DmDhqdp.class);
         String day = DateUtil.format(DateUtil.date(), "yyyy/MM/dd");
         String user = (String) req.getAttribute("yhms");
-        this.remove(new QueryWrapper<DmDhqdp>().eq("Dc_ch", dcch)
-                .eq("qdh", ddh)
-                .eq("qc", qc));
+        this.remove(new QueryWrapper<DmDhqdp>().eq("Dc_ch", map.get("dcch"))
+                .eq("qdh", map.get("ddh"))
+                .eq("qc", map.get("qc")));
         dmDhqdps.stream().filter(item->StrUtil.isNotEmpty(item.getXh())&&!item.getXh().contains("合计"))
                 .forEach(l -> {
                     l.setDcCh(map.get("dcch"));
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdxqServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdxqServiceImpl.java
index a14333b..3ed205a 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdxqServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdxqServiceImpl.java
@@ -16,8 +16,8 @@ import com.dsic.gj_erp.bean.jhgk.DmDhqdp;
 import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
 import com.dsic.gj_erp.bean.jhgk.DmSygdxq;
 import com.dsic.gj_erp.bean.jhgk.DmSygdxqOld;
+import com.dsic.gj_erp.exception.ServiceException;
 import com.dsic.gj_erp.mapper.jhgk.DmSygdxqMapper;
-import com.dsic.gj_erp.pc.dto.data.Bom;
 import com.dsic.gj_erp.service.jcsj.DmBomService;
 import com.dsic.gj_erp.service.jcsj.DmCbxxpService;
 import com.dsic.gj_erp.service.jhgk.DmDhqdpService;
@@ -171,6 +171,7 @@ public class DmSygdxqServiceImpl extends ServiceImpl<DmSygdxqMapper, DmSygdxq> i
                             .eq(DmBom::getPl, xq.getDcPl())
                             .eq(DmBom::getFd, xq.getDcFd())
                     );
+                    bomList.forEach(item->item.setDcch(xq.getDcCh()));//系列船获取bom船号修正为当前船只
                     xq.setBomList(bomList);
                 }else{//bom不存在从订货清单获取数据
                     List<DmDhqdp> list = dhqdpService.list(Wrappers.<DmDhqdp>lambdaQuery().eq(DmDhqdp::getDcCh, xq.getDcCh()));
@@ -178,49 +179,61 @@ public class DmSygdxqServiceImpl extends ServiceImpl<DmSygdxqMapper, DmSygdxq> i
 
                     List<DmBom> bomList=new ArrayList<>();
                     collect.forEach(item->{
-                        int num = item.getSdzs().intValue();
-                        for (int i=0;i<num;i++){
-                            DmBom bom = new DmBom();
-                            bom.setDcch(dcch);
-                            bom.setPl(pl);
-                            bom.setWpcz(item.getWpxh());
-                            bom.setWpgg(StrUtil.format("{}*{}*{}",item.getThickness(),item.getWidth(),item.getLength()));
+                        if (item.getKdzlsl()==null){
+                            return;
+                        }
+                        String[] kdzlsls=item.getKdzlsl().split("/");
 
-                            Optional.ofNullable(item.getKdzlsl()).ifPresent(it->{
+                        for (String kdzlsl:kdzlsls){
+                            Optional.ofNullable(kdzlsl).ifPresent(it->{
                                 String kd= String.valueOf(it.charAt(1));
                                 String kw= String.valueOf(it.charAt(0));
                                 String kw4= String.valueOf(it.charAt(2));
                                 String zl=String.valueOf(it.charAt(3));
-                                switch (kd){
-                                    case "1":
-                                        this.handlerFor1(bom,zl,kw,kw4);
-                                        break;
-                                    case "2":
-                                        this.handlerFor2(bom,zl,kw,kw4);
-                                        break;
-                                    case "3":
-                                        this.handlerFor3(bom,zl,kw,kw4);
-                                        break;
-                                    case "4":
-                                        this.handlerFor4(bom,zl,kw,kw4);
-                                        break;
-                                    case "7"://型材
-                                        this.handlerFor7(bom,zl,kw,kw4);
-                                        break;
-                                    case "8"://光电
-                                        this.handlerFor8(bom,zl,kw,kw4);
-                                        break;
-                                }
+                                String sl=kdzlsl.split("=")[1];
+                                try {
+                                    int slI = Integer.parseInt(sl);
+                                    for (int i=0;i<slI;i++){
+                                        DmBom bom = new DmBom();
+                                        bom.setDcch(dcch);
+                                        bom.setPl(pl);
+                                        bom.setWpcz(item.getWpxh());
+                                        bom.setWpgg(StrUtil.format("{}*{}*{}",item.getThickness(),item.getWidth(),item.getLength()));
+
+                                        switch (kd){
+                                            case "1":
+                                                this.handlerFor1(bom,zl,kw,kw4);
+                                                break;
+                                            case "2":
+                                                this.handlerFor2(bom,zl,kw,kw4);
+                                                break;
+                                            case "3":
+                                                this.handlerFor3(bom,zl,kw,kw4);
+                                                break;
+                                            case "4":
+                                                this.handlerFor4(bom,zl,kw,kw4);
+                                                break;
+                                            case "7"://型材
+                                                this.handlerFor7(bom,zl,kw,kw4);
+                                                break;
+                                            case "8"://光电
+                                                this.handlerFor8(bom,zl,kw,kw4);
+                                                break;
+                                        }
+                                        bomList.add(bom);
+                                    }
+                                }catch (Exception ignored){}
                             });
-                            bomList.add(bom);
                         }
-
                     });
                     xq.setBomList(bomList);
-
+                }
+                if (ObjUtil.isEmpty(xq.getBomList())){
+                    throw new ServiceException(10001,StrUtil.format("船只:{},批次{}无法从系列船或订货清单获取基础数据,请先核对数据后再次排产!",xq.getDcCh(),xq.getDcPl()));
                 }
             }
         }
+
         return xqWithBom;
     }
 
diff --git a/src/main/resources/mappers/jhgk/DmSygdxqMapper.xml b/src/main/resources/mappers/jhgk/DmSygdxqMapper.xml
index 111e0f8..52af712 100644
--- a/src/main/resources/mappers/jhgk/DmSygdxqMapper.xml
+++ b/src/main/resources/mappers/jhgk/DmSygdxqMapper.xml
@@ -49,11 +49,11 @@
                 bom.ljsl as bom_ljsl,
                 bom.fkgs as bom_fkgs,
                 bom.tlsl as bom_tlsl,
-                ROW_NUMBER() over(partition by bom.dcch,bom.pl,bom.tzbh order by bom.tzbh) rn
+                ROW_NUMBER() over(partition by xq.dc_ch,xq.dc_pl,bom.tzbh order by bom.tzbh) rn
             from
                 dm_sygdxq xq left join dm_bom bom on bom.dcch = xq.DC_CH and bom.pl = xq.DC_PL and bom.fd = xq.DC_FD
             where
-                xq.xzglxq between #{from} and #{to} and bom.type='b'
+                xq.xzglxq between #{from} and #{to} and (bom.type='b' or isnull(bom.type,'')='')
                 <if test="dcch!=null and dcch!=''">
                     and xq.DC_CH=#{dcch}
                 </if>