diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java index 1ae06ed..94f424b 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java @@ -201,10 +201,18 @@ public class DmBom implements Serializable { private String bzry; private String bzrq; - + // 型材根数 private BigDecimal xcgs; + //型材实耗米数 private BigDecimal xcshms; + private BigDecimal bclqzl; + private BigDecimal bcshzl; + private BigDecimal bcylzl; + private BigDecimal bcljtlzl; + private BigDecimal bcqpyld; + private String ylbhgg; + diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpNewController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpNewController.java index 8a06bb2..de635a1 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpNewController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpNewController.java @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -62,6 +63,19 @@ public class DmCzplpNewController { dmCzplpNewService.czPlupdate(dmCzplpNews); return new ResultBean(); + } + + @PostMapping("/czPlDel") + @AuthFunction + @ResponseBody + public ResultBean czPlDel(HttpServletRequest req, @RequestBody List dmCzplpNews) throws Exception, CustomException { + + dmCzplpNews.forEach(e->{ + dmCzplpNewService.removeById(e.getId()); + }); + + return new ResultBean(); + } @PostMapping("/getCzplList") @ResponseBody diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java index c471350..c2ce26b 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java @@ -972,7 +972,9 @@ public class BomUploadServiceImpl { BigDecimal sl = new BigDecimal("1"); if (lines.get(j + lji).contains(",")) { ljmc = lines.get(j + lji).split(",")[0]; - sl = new BigDecimal(lines.get(j + lji).split(",")[1]); + System.out.println("ljmc = " + ljmc); + System.out.println("ljmc = " + lines.get(j + lji).split(",")[1]); + sl = new BigDecimal(String.valueOf(lines.get(j + lji).split(",")[1].trim())); } if (ljmcs.contains(ljmc)) { } else { @@ -1442,6 +1444,7 @@ public class BomUploadServiceImpl { dmBom.setZl(zlbm); dmBom.setKw(zzcj); dmBom.setLqlb(hxlx); + dmBom.setYlbhgg(e.getYlggs()); // 领取表找打 fds if (e.getHxfl().equals("B")) { dmBom.setType("B"); @@ -1450,6 +1453,14 @@ public class BomUploadServiceImpl { ).collect(Collectors.toList()); if (collect11.size() > 0) { dmBom.setFds(collect11.get(0).getBclq().getDcFdZ()); + // 还需要 一些其他参数 领取重量 实耗重量 余料重量 前批语料代 零件套料重量 + + + dmBom.setBcylzl(null==collect11.get(0).getBclq().getYlzl()? null:collect11.get(0).getBclq().getYlzl()); + dmBom.setBclqzl(null==collect11.get(0).getBclq().getLqzl()? null:collect11.get(0).getBclq().getLqzl()); + dmBom.setBcshzl(null==collect11.get(0).getBclq().getShzl()? null:collect11.get(0).getBclq().getShzl()); + dmBom.setBcljtlzl(null==collect11.get(0).getBclq().getLjzl()? null:collect11.get(0).getBclq().getLjzl()); + dmBom.setBcqpyld(null==collect11.get(0).getBclq().getQpyld()? null:collect11.get(0).getBclq().getQpyld()); } } else { @@ -1509,7 +1520,7 @@ public class BomUploadServiceImpl { dmBom.setZl(zlbm); dmBom.setKw(zzcj); dmBom.setLqlb(hxlx); - dmBom.setLqbs("Y"); + //dmBom.setLqbs("Y"); if(tzbh.substring(4, 5).equals("X")){ // 型材 // 先去 统计表中查找 // List collect11 = list.stream().filter(fst -> null!= fst.getTjb() && fst.getTjb().getWpxh().equals(e.getWpxhZ()) && @@ -1527,9 +1538,35 @@ public class BomUploadServiceImpl { // dmBom.setFds(collect11.get(0).getBclq().getDcFdZ()); dmBom.setXcgs(collect111.get(0).getBclq().getSl()); dmBom.setXcshms(collect111.get(0).getBclq().getShms()); + dmBom.setFds(collect111.get(0).getBclq().getDcFdZ()); } dmBom.setType("X"); }else { + + List collect11 = list.stream().filter(fst -> null!= fst.getTjb() && tzbh.equals(fst.getTjb().getTzbh()) + ).collect(Collectors.toList()); + // 找到长度 + if(collect11.size()>0){ + dmBom.setYlbhgg(collect11.get(0).getTjb().getYlggs()); + } + + + List collect111 = list.stream().filter(fst -> null!= fst.getBclq() && fst.getBclq().getWpgg().equals(e.getWpggZ()) && + fst.getBclq().getWpxh().equals(e.getWpxhZ()) && fst.getBclq().getDcPlZ().equals(e.getDcPlZ()) + ).collect(Collectors.toList()); + if (collect111.size() > 0) { +// dmBom.setFds(collect11.get(0).getBclq().getDcFdZ()); +// dmBom.setXcgs(collect111.get(0).getBclq().getSl()); +// dmBom.setXcshms(collect111.get(0).getBclq().getShms()); + dmBom.setBcylzl(null==collect111.get(0).getBclq().getYlzl()? null:collect111.get(0).getBclq().getYlzl()); + dmBom.setBclqzl(null==collect111.get(0).getBclq().getLqzl()? null:collect111.get(0).getBclq().getLqzl()); + dmBom.setBcshzl(null==collect111.get(0).getBclq().getShzl()? null:collect111.get(0).getBclq().getShzl()); + dmBom.setBcljtlzl(null==collect111.get(0).getBclq().getLjzl()? null:collect111.get(0).getBclq().getLjzl()); + dmBom.setBcqpyld(null==collect111.get(0).getBclq().getQpyld()? null:collect111.get(0).getBclq().getQpyld()); + dmBom.setFds(collect111.get(0).getBclq().getDcFdZ()); + } + + dmBom.setType("B"); } diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqmxpServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqmxpServiceImpl.java index 1be636c..b88c729 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqmxpServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqmxpServiceImpl.java @@ -33,7 +33,12 @@ public class DmBclqmxpServiceImpl extends ServiceImpl implements .eq(StrUtil.isNotEmpty((String) map.get("fd")), "fd", map.get("dcfd")) .eq(StrUtil.isNotEmpty((String) map.get("dcpl")), "pl", map.get("dcpl")) .eq(StrUtil.isNotEmpty((String) map.get("zt")), "zt", map.get("zt")) - .orderBy(true,true,"pl","fd") + .orderBy(true,true,"pl","fd","type") ); return list; // } diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java index 511446f..688eb9d 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java @@ -390,7 +390,7 @@ public class DmCzplpNewServiceImpl extends ServiceImpl cbbm = dmCbxxpService.list(new QueryWrapper().orderBy(true, true, "cbbm")); + List cbbm = dmCbxxpService.list(new QueryWrapper().orderBy(true, true, "wgbs","cbbm","len(cbbm)")); returnMap.put("cbbm", cbbm); return returnMap; } @@ -399,7 +399,7 @@ public class DmCzplpNewServiceImpl extends ServiceImpl getCzplList(Map map) { QueryWrapper qw = new QueryWrapper<>(); qw.eq(StrUtil.isNotEmpty((String) map.get("dcch")), "dc_ch", (String) map.get("dcch")); - qw.eq(StrUtil.isNotEmpty((String) map.get("dcfd")), "dc_pl", (String) map.get("dcpl")); + qw.eq(StrUtil.isNotEmpty((String) map.get("dcpl")), "dc_pl", (String) map.get("dcpl")); qw.orderBy(true, true, "len(dc_pl)","dc_pl"); List list = this.list(qw); return list; diff --git a/src/main/resources/mappers/jcsj/DmBchxmxpMapper.xml b/src/main/resources/mappers/jcsj/DmBchxmxpMapper.xml index bbc0077..01196be 100644 --- a/src/main/resources/mappers/jcsj/DmBchxmxpMapper.xml +++ b/src/main/resources/mappers/jcsj/DmBchxmxpMapper.xml @@ -118,8 +118,8 @@ and dc_ch=#{dcch} and dc_pl=#{dcpl} RTRIM(DM_BCHXJBP.WPXH) AS wpxhz, DM_BCHXJBP.LJSL AS LJSLz, RTRIM(DM_BCHXJBP.dc_zl) AS dc_zl - FROM DM_BCHXMXP,DM_BCHXJBP - WHERE DM_BCHXMXP.HXBH = DM_BCHXJBP.HXBH + FROM DM_BCHXMXP,DM_BCHXJBP + WHERE DM_BCHXMXP.HXBH = DM_BCHXJBP.HXBH and DM_BCHXJBP.dc_pl=#{dcpl} @@ -130,6 +130,16 @@ and dc_ch=#{dcch} and dc_pl=#{dcpl} and DM_BCHXJBP.HXFL=#{hxfl} + + and DM_BCHXJBP.wpgg=#{wpgg} + + + and DM_BCHXJBP.WPXH=#{WPXH} + + + and DM_BCHXJBP.tzbh=#{tzbh} + +order by DM_BCHXJBP.dc_ch,DM_BCHXJBP.dc_pl diff --git a/src/main/resources/mappers/jcsj/DmBchxylpMapper.xml b/src/main/resources/mappers/jcsj/DmBchxylpMapper.xml index 15d3781..c4cf664 100644 --- a/src/main/resources/mappers/jcsj/DmBchxylpMapper.xml +++ b/src/main/resources/mappers/jcsj/DmBchxylpMapper.xml @@ -82,7 +82,8 @@ dm_bchxylp.xcmc , dm_bchxylp.xccd , dm_bchxylp.ZZCJ, - dm_bchxylp.ylcd + dm_bchxylp.ylcd, + dm_bchxylp.ylggs FROM dm_bchxylp where 1=1 and dm_bchxylp.dc_pl=#{dcpl} @@ -104,6 +105,13 @@ and dm_bchxylp.tzbh like'%'+#{tzbh}+'%' + + and dm_bchxylp.wpgg=#{wpgg} + + + and dm_bchxylp.wpxh=#{wpxh} + + order by dc_ch,dc_pl,dc_zl,tzbh diff --git a/src/main/resources/mappers/jcsj/DmBclqmxpMapper.xml b/src/main/resources/mappers/jcsj/DmBclqmxpMapper.xml index 87a2787..208b167 100644 --- a/src/main/resources/mappers/jcsj/DmBclqmxpMapper.xml +++ b/src/main/resources/mappers/jcsj/DmBclqmxpMapper.xml @@ -117,7 +117,7 @@ and DM_BCLQJBP.zzcj=#{zzcj} - and DM_BCLQMXP.DC_FD like'%'+#{dcfd}+'%' + and DM_BCLQJBP.DC_FD like'%'+#{dcfd}+'%' diff --git a/src/main/resources/mappers/jcsj/DmWlqdMapper.xml b/src/main/resources/mappers/jcsj/DmWlqdMapper.xml index 9afb79d..32d27be 100644 --- a/src/main/resources/mappers/jcsj/DmWlqdMapper.xml +++ b/src/main/resources/mappers/jcsj/DmWlqdMapper.xml @@ -129,7 +129,7 @@ and DM_WLQD.DC_CH=#{dcch} - + order by DM_WLQD.dc_ch,DM_WLQD.dc_fd,DM_WLQD.dc_zl,DM_WLQD.ylzd1,tt1.tzbh,DM_WLQD.zxwph