From 9f9313591c872ec726ea1ee67ae29f848cbcf7f3 Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Mon, 20 Apr 2026 10:20:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=94=9F=E4=BA=A7=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=BF=AE=E6=94=B9-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml | 1 + .../java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml | 2 +- .../org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml | 2 +- .../java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml | 2 +- .../springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml | 2 +- .../springblade/erpdata/mapper/ErpMesRbSodelreczgMapper.xml | 2 +- .../springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml | 2 +- .../erpdata/service/impl/ErpMesRbWoServiceImpl.java | 3 +++ 8 files changed, 10 insertions(+), 6 deletions(-) diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml index d26ce303..3b92f5f6 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml @@ -29,6 +29,7 @@ FROM dba_mgr.v_mes_rb_pacturnrecord a + a.processlinedesc like '%4%' AND a.cdate ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS') diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml index 0184851c..c49191de 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml @@ -40,7 +40,7 @@ FROM dba_mgr.v_mes_rb_pk a - 1=1 + a.processlinedesc like '%4%' AND a.newlevdate ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS') diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml index 7850dcb8..db434488 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml @@ -24,7 +24,7 @@ a.warctlr,a.lewdept,a.prtudeptcode,a.newlevname,a.newlevdate from dba_mgr.V_MES_RB_PURTOSO a - 1=1 + a.processlinedesc like '%4%' AND a.newlevdate ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS') diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml index 8fde9329..97e69538 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml @@ -29,7 +29,7 @@ FROM dba_mgr.v_mes_rb_sjso a - 1=1 + a.processlinedesc like '%4%' AND a.newlevdate ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS') diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml index c55d7d3f..879bc7d3 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml @@ -39,7 +39,7 @@ FROM dba_mgr.v_mes_rb_sodelrecwx a - 1=1 + a.processlinedesc like '%4%' AND a.newlevdate ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS') diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelreczgMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelreczgMapper.xml index 15fb625f..18b68a69 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelreczgMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelreczgMapper.xml @@ -39,7 +39,7 @@ FROM dba_mgr.v_mes_rb_sodelreczg a - 1=1 + a.processlinedesc like '%4%' AND a.newlevdate ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS') diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml index e613f411..508e1b24 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml @@ -28,7 +28,7 @@ FROM dba_mgr.v_mes_rb_wxpromotion a - 1=1 + a.processlinedesc like '%4%' AND a.newlevdate ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS') diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java index 524b231b..e7c3e6f2 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java @@ -430,6 +430,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { YieldOrder yieldOrder=new YieldOrder(); yieldOrder.setSiteWork(true); yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_SJ); + yieldOrder.setYpMemo("烧结转工单"); yieldOrder.setManualIncrease(false); yieldOrder.setYoCode(mesRbtoso.getSono());//生产单号 yieldOrder.setYpCode(mesRbtoso.getWono()); @@ -572,6 +573,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { YieldOrder yieldOrder=new YieldOrder(); yieldOrder.setSiteWork(false); yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB); + yieldOrder.setYpMemo("外协转工单"); yieldOrder.setManualIncrease(false); yieldOrder.setYoCode(mesRbSodelrecwx.getSono());//生产单号 yieldOrder.setYpCode(mesRbSodelrecwx.getWono()); @@ -732,6 +734,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { YieldOrder yieldOrder=new YieldOrder(); yieldOrder.setSiteWork(true); yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB); + yieldOrder.setYpMemo("配套转工单"); yieldOrder.setYoCode(mesRbPk.getWono());//生产单号 yieldOrder.setYpCode(mesRbPk.getWono()); yieldOrder.setBatchNo(mesRbPk.getSplcode());//批次号