Merge remote-tracking branch 'origin/master'

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)
+        this.remove(new QueryWrapper<DmDhqdp>().eq("Dc_ch", map.get("dcch"))
-                .eq("qdh", ddh)
+                .eq("qdh", map.get("ddh"))
-                .eq("qc", qc));
+                .eq("qc", map.get("qc")));
         dmDhqdps.stream().filter(item->StrUtil.isNotEmpty(item.getXh())&&!item.getXh().contains("合计"))
                 .forEach(l -> {
                     l.setDcCh(map.get("dcch"));

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,19 +179,27 @@ public class DmSygdxqServiceImpl extends ServiceImpl<DmSygdxqMapper, DmSygdxq> i
 
                     List<DmBom> bomList=new ArrayList<>();
                     collect.forEach(item->{
-                        int num = item.getSdzs().intValue();
+                        if (item.getKdzlsl()==null){
-                        for (int i=0;i<num;i++){
+                            return;
+                        }
+                        String[] kdzlsls=item.getKdzlsl().split("/");
+
+                        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));
+                                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()));
 
-                            Optional.ofNullable(item.getKdzlsl()).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);
@@ -211,16 +220,20 @@ public class DmSygdxqServiceImpl extends ServiceImpl<DmSygdxqMapper, DmSygdxq> i
                                                 this.handlerFor8(bom,zl,kw,kw4);
                                                 break;
                                         }
-                            });
                                         bomList.add(bom);
                                     }
-
+                                }catch (Exception ignored){}
+                            });
+                        }
                     });
                     xq.setBomList(bomList);
-
+                }
+                if (ObjUtil.isEmpty(xq.getBomList())){
+                    throw new ServiceException(10001,StrUtil.format("船只:{},批次{}无法从系列船或订货清单获取基础数据,请先核对数据后再次排产!",xq.getDcCh(),xq.getDcPl()));
                 }
             }
         }
+
         return xqWithBom;
     }
 

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>