From 935c2d39e965eb53d47bf7716a118f5791c89076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Tue, 24 Jun 2025 19:34:40 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=9D=90=E8=B4=A8=E8=AF=81=E4=BB=B6=E8=B7=9F?= =?UTF-8?q?=E8=B8=AA=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=AD=A3=E5=8A=9F=E8=83=BD?= =?UTF-8?q?,=E9=98=B2=E6=AD=A2=E6=9C=AA=E5=AF=BC=E5=85=A5=E9=9B=B6?= =?UTF-8?q?=E4=BB=B6=E9=85=8D=E5=A5=97=E8=A1=A8=E6=97=B6=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=9D=90=E8=B4=A8=E8=AF=81=E4=BB=B6=E7=BC=BA?= =?UTF-8?q?=E5=A4=B1=E9=97=AE=E9=A2=98=202.=E8=B0=83=E6=95=B4=E5=88=87?= =?UTF-8?q?=E5=89=B2=E6=8A=A5=E5=B7=A5=E9=9B=B6=E4=BB=B6=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=85=BC=E5=AE=B9=E5=90=8E=E7=BB=AD=E9=9B=B6?= =?UTF-8?q?=E4=BB=B6=E4=BD=9C=E4=B8=9A=E6=8A=A5=E5=B7=A5=E7=8A=B6=E6=80=81?= =?UTF-8?q?,=E9=98=B2=E6=AD=A2=E7=9B=B4=E6=8E=A5=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=8A=A5=E5=B7=A5=E4=BF=A1=E6=81=AF=E4=B8=A2?= =?UTF-8?q?=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java | 3 +++ .../dsic/gj_erp/controller/zyjh/ZyjhController.java | 11 +++++++++-- .../com/dsic/gj_erp/service/zyjh/ZyjhService.java | 5 +++++ src/main/resources/mappers/jhgk/DmYdjhMapper.xml | 1 + 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java index b7d9dda..0188383 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java @@ -345,6 +345,8 @@ public class DmYdjhLj implements Serializable { private String ypph; @TableField(exist = false) private String yzkw; + @TableField(exist = false) + private String sllph; public boolean checkZt(){ return !"03".equals(this.pkZt)||!"03".equals(this.qjgZt)||!"03".equals(this.dmZt); @@ -367,6 +369,7 @@ public class DmYdjhLj implements Serializable { return lj.getCzbh().equals(this.czbh) &&lj.getPl().equals(this.pl) &&lj.getTlth().equals(this.tlth) + &&lj.getLjbh()!=null &&lj.getLjbh().equals(this.ljbh); } diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java index 20f5056..267b053 100644 --- a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java @@ -302,8 +302,16 @@ public class ZyjhController { private void zlgzCreate(DmYdjh item,ArrayList mpDhsjSaveList){ List ljList = zyjhService.createLj(item.getDcCh(), item.getDcPl(), item.getTzbh()); Map mpsycljljbp = zyjhService.getMPSYCLJLJBP(item.getDcCh(), item.getTzbh()); + //兼容手动处理没有上料炉批号的问题 + if (StrUtil.isEmpty(item.getSllph())&&!ljList.isEmpty()){ + item.setSllph(ljList.get(0).getSllph()); + } + mpDhsjServcie.remove(Wrappers.lambdaQuery() + .eq(MpDhsj::getDcCh,item.getDcCh()) + .eq(MpDhsj::getDcPl,item.getDcPl()) + .eq(MpDhsj::getDcTh,item.getTzbh()) + ); //质量跟踪数据 - List collect = new ArrayList<>(); String date = DateUtil.date().toString("yyyy/MM/dd"); String mpDhsjDhh = zyjhService.getMpDhsjDhh(); for (int j = 0; j < ljList.size(); j++) { @@ -315,7 +323,6 @@ public class ZyjhController { if (ObjUtil.isNotEmpty(mpsycljljbp)) { mpDhsj.setGysbh("BZGY-"+mpsycljljbp.get("gzzx3")); } - collect.add(mpDhsj); mpDhsjSaveList.add(mpDhsj); } } diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java index d8430fa..5c36377 100644 --- a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java @@ -182,6 +182,11 @@ public class ZyjhService extends ServiceImpl { ); if (!list.isEmpty()){ list.forEach(item->{ + //清理错误数据 + if (StrUtil.isEmpty(item.getLjbh())){ + ljService.removeById(item); + return; + } ljInfo.forEach(lj->{ if (lj.tmpEq(item)){ //修正零件状态信息 diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml index 69076e7..f5af4e6 100644 --- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml +++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml @@ -902,6 +902,7 @@ REPLACE(CAST(CAST(NEWID()AS BINARY(10)) + CAST(GETDATE() AS BINARY(6)) AS UNIQUEIDENTIFIER),'-','') as id, dm_ydjh.dc_ch as czbh, dm_ydjh.dc_pl as pl, + dm_ydjh.sllph as sllph, dm_bom.fd as fd, dm_ydjh.kw as kw, dm_bom.zl as zl,