From 67ad5556a306e504516e33c7638d0afcda9fbfec Mon Sep 17 00:00:00 2001 From: Leon <3066758958@qq.com> Date: Fri, 3 Sep 2021 15:43:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BE=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E4=BA=BA=E5=91=98=E5=BF=85=E8=BE=93=EF=BC=8C=E4=B8=BB?= =?UTF-8?q?=E5=85=B3=E4=BB=B6=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dispatch/service/impl/SfcDispatchServiceImpl.java | 6 +++--- dispatch/src/main/resources/mapper/SfcDispatchMapper.xml | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java index bd0939cb..e0e5cb4d 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java @@ -506,6 +506,7 @@ public class SfcDispatchServiceImpl extends ServiceImpl Date: Fri, 3 Sep 2021 15:57:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=93=E6=A3=80=E4=B8=8D=E5=90=88?= =?UTF-8?q?=E6=A0=BC=E5=88=9B=E5=BB=BA=E4=BB=BB=E5=8A=A1=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/service/impl/InspectionTaskManageServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java b/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java index ac65ac4d..ffab9b57 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java +++ b/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java @@ -198,7 +198,7 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //如果专检不合格，生产新的检验任务 - if (!Constants.INSPECTION_TYPE_P.equals(category) || !"NG".equals(result) || !"SUBMIT".equals(type)) { + /*if (!Constants.INSPECTION_TYPE_P.equals(category) || !"NG".equals(result) || !"SUBMIT".equals(type)) { return; } @@ -214,6 +214,6 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ newInspectionTask.setComments(null); newInspectionTask.setCreatedDateTime(dateTime); newInspectionTask.setModifiedDateTime(dateTime); - inspectionTaskService.save(newInspectionTask); + inspectionTaskService.save(newInspectionTask);*/ } } From e0d3b631973bbea48e90b50593d106edd3d87f35 Mon Sep 17 00:00:00 2001 From: Leon <3066758958@qq.com> Date: Fri, 3 Sep 2021 16:07:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=B4=BE=E5=B7=A5?= =?UTF-8?q?=E8=A7=84=E6=A0=BC=E6=A3=80=E7=B4=A2=E6=8C=89=E7=85=A7=E7=B2=BE?= =?UTF-8?q?=E7=A1=AE=E6=9F=A5=E6=89=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dispatch/src/main/resources/mapper/SfcDispatchMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml index a03c1dec..b0950a61 100644 --- a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml +++ b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml @@ -758,7 +758,7 @@ AND C3.VALUE LIKE '%'|| #{texture} ||'%' - AND C4.VALUE LIKE '%'|| #{matSpec}|| '%' + AND C4.VALUE = #{matSpec} AND SO.PLANNED_START_DATE >= TO_DATE(#{startFromDate}, 'YYYY-MM-DD')