From 24ad67786c39d2231f7d4a7ccaa1c2352bca947f Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Mon, 6 Sep 2021 18:30:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=B8=93=E6=A3=80=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SplitSfcServiceImpl.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java index ac8ef787..e322f3ad 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java @@ -257,18 +257,18 @@ public class SplitSfcServiceImpl extends ServiceImpl i throw new BaseException("处置工艺路线没有步骤"); } sfcDispatchCommonService.saveSplitSfcDispatch(site, CommonMethods.getUser(),"R", sfcData.getShopOrder(), sfc, operation, sfcDispatchBySfc.getStepId(),newSfc, maxRevisionRouter.getHandle(), sfcData.getStepSequence()); - //创建专检任务 - Map paramMap=new HashMap<>(); - paramMap.put("CATEGORY", Constants.INSPECTION_TYPE_P); - paramMap.put("SFC",sfc ); - paramMap.put("SHOP_ORDER",sfcDispatchBySfc.getShopOrder()); - paramMap.put("OPERATION",sfcDispatchBySfc.getOperation()); - paramMap.put("STEP_ID",sfcDispatchBySfc.getStepId()); - paramMap.put("WORK_CENTER",sfcDispatchBySfc.getWorkCenter()); - paramMap.put("RESRCE",sfcDispatchBySfc.getResrce()); - paramMap.put("SFC_DISPATCH_DETAIL_BO",sfcDispatchBySfc.getHandle()); - inspectionTaskService.createNewTask(paramMap); } + //创建专检任务 + Map paramMap=new HashMap<>(); + paramMap.put("CATEGORY", Constants.INSPECTION_TYPE_P); + paramMap.put("SFC",sfc ); + paramMap.put("SHOP_ORDER",sfcDispatchBySfc.getShopOrder()); + paramMap.put("OPERATION",sfcDispatchBySfc.getOperation()); + paramMap.put("STEP_ID",sfcDispatchBySfc.getStepId()); + paramMap.put("WORK_CENTER",sfcDispatchBySfc.getWorkCenter()); + paramMap.put("RESRCE",sfcDispatchBySfc.getResrce()); + paramMap.put("SFC_DISPATCH_DETAIL_BO",sfcDispatchBySfc.getHandle()); + inspectionTaskService.createNewTask(paramMap); SplitSfc splitSfc=new SplitSfc(); splitSfc.setHandle(HandleEnum.SPLIT_SFC.getHandle(site,newSfc)); splitSfc.setSite(site); From ec86e3b2012e517288faf7695df477d402f1f8f1 Mon Sep 17 00:00:00 2001 From: zpl Date: Mon, 6 Sep 2021 18:32:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=9B=E6=AF=8F=E6=97=A5=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=8A=A5=E8=A1=A8=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/ReportDataMapper.xml | 40 +++++++++++++------ .../resources/mapper/SelfReportMapper.xml | 2 +- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml index f6004a3c..61daf532 100644 --- a/common/src/main/resources/mapper/ReportDataMapper.xml +++ b/common/src/main/resources/mapper/ReportDataMapper.xml @@ -122,18 +122,20 @@ OT.DESCRIPTION OPERATION_DESCRIPTION, ZSD.RESRCE , R.DESCRIPTION RESOURCE_DESCRIPTION , ZSD.DISPATCH_STATUS OPERATION_STATUS , ZSD.PROD_HOURS ,ZSD.ACTUAL_PROD_HOURS , ZSD.PLANNED_START_DATE , ZSD.PLANNED_COMP_DATE , ZSD.ACTUAL_START_DATE , ZSD.ACTUAL_COMPLETE_DATE FROM Z_SFC_DISPATCH ZSD - LEFT JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZSD.SHOP_ORDER - LEFT JOIN CUSTOM_FIELDS CFA ON CFA.HANDLE = SO.HANDLE AND CFA."ATTRIBUTE" = 'WORK_ORDER' - LEFT JOIN CUSTOM_FIELDS CFB ON CFB.HANDLE = SO.HANDLE AND CFB."ATTRIBUTE" = 'ITEM_NUMBER' - LEFT JOIN SFC S ON S.SFC = ZSD.SFC - LEFT JOIN ITEM I ON I.HANDLE = S.ITEM_BO - LEFT JOIN ITEM_T IT ON IT.ITEM_BO = S.ITEM_BO - LEFT JOIN WORK_CENTER WC ON WC.WORK_CENTER = ZSD.WORK_CENTER - LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE - LEFT JOIN OPERATION O ON O.OPERATION = ZSD.OPERATION - LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE - LEFT JOIN RESRCE R ON R.RESRCE = ZSD.RESRCE - LEFT JOIN ROUTER RU ON RU.HANDLE = ZSD.ROUTER_BO + LEFT JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZSD.SHOP_ORDER + LEFT JOIN CUSTOM_FIELDS CFA ON CFA.HANDLE = SO.HANDLE AND CFA."ATTRIBUTE" = 'WORK_ORDER' + LEFT JOIN CUSTOM_FIELDS CFB ON CFB.HANDLE = SO.HANDLE AND CFB."ATTRIBUTE" = 'ITEM_NUMBER' + LEFT JOIN SFC S ON S.SFC = ZSD.SFC + LEFT JOIN ITEM I ON I.HANDLE = S.ITEM_BO + LEFT JOIN ITEM_T IT ON IT.ITEM_BO = S.ITEM_BO + LEFT JOIN WORK_CENTER WC ON WC.WORK_CENTER = ZSD.WORK_CENTER + LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE + LEFT JOIN OPERATION O ON O.OPERATION = ZSD.OPERATION + LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE + LEFT JOIN RESRCE R ON R.RESRCE = ZSD.RESRCE + LEFT JOIN ROUTER RU ON RU.HANDLE = ZSD.ROUTER_BO + LEFT JOIN RESRCE R ON R.RESRCE = ZSD.RESRCE AND R.SITE = ZSD.SITE + LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = R.HANDLE AND CF."ATTRIBUTE" = 'CHECK_USR' WHERE ZSD.SITE = #{site} AND CFB.VALUE LIKE '%'||#{itemNumber}||'%' @@ -150,6 +152,18 @@ AND ZSD.RESRCE = #{resrce} + + AND CF.VALUE = #{checkUsr} + + + AND ZSD.OPERATION = #{operation} + + + AND I.ITEM = #{item} + + + AND ZSD.SFC = #{sfc} + AND RU.ROUTER_TYPE = #{routerType} @@ -160,7 +174,7 @@ - AND ZSD.DISPATCH_STATUS != 'START' AND ZSD.DISPATCH_STATUS != 'COMPLETE' + AND ZSD.DISPATCH_STATUS != 'START' AND ZSD.DISPATCH_STATUS != 'COMPLETE' AND ZSD.DISPATCH_STATUS != 'CANCEL' AND ZSD.DISPATCH_STATUS = #{operationStatus} diff --git a/quality/src/main/resources/mapper/SelfReportMapper.xml b/quality/src/main/resources/mapper/SelfReportMapper.xml index c5f0fdf7..0faa64d5 100644 --- a/quality/src/main/resources/mapper/SelfReportMapper.xml +++ b/quality/src/main/resources/mapper/SelfReportMapper.xml @@ -622,7 +622,7 @@ From 02afeb08b37ee6c910a0849a75f75197cb0de004 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Mon, 6 Sep 2021 18:57:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/common/service/impl/InspectionTaskServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionTaskServiceImpl.java index e87cca54..31be0f13 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionTaskServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionTaskServiceImpl.java @@ -280,7 +280,7 @@ public class InspectionTaskServiceImpl extends ServiceImpl