From e2fe9edb931065a3f92a69ef66e588b93bb36057 Mon Sep 17 00:00:00 2001 From: zpl Date: Tue, 7 Sep 2021 09:03:45 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=A0=B9=E6=8D=AE=E8=AE=BE=E5=A4=87=E7=82=B9?= =?UTF-8?q?=E6=A3=80=E7=BB=93=E6=9E=9C=EF=BC=8C=E5=88=9B=E5=BB=BA=E5=BD=93?= =?UTF-8?q?=E6=97=A5=E4=BB=BB=E5=8A=A1=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ResourceRepairTaskServiceImpl.java | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java index 07a59942..9d38f159 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java @@ -206,6 +206,7 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl inspectTaskList = resourceInspectTaskMapper.getInspectTaskListByCondition(resourceInspectTask); for (ResourceInspectTask inspectTask:inspectTaskList) { + // 查询到点检结果为NG的设备，创建新的当日点检任务 if (Constants.RSESULT_NG.equals(inspectTask.getResult())){ - resourceInspectPlanService.autoCreateTaskByResourceInspectTask(inspectTask); + String taskNo = inspectTask.getTaskNo(); + String taskStr = taskNo+now; + inspectTask.setTaskNo(taskStr); + inspectTask.setHandle(HandleEnum.RESOURCE_INSPECT_TASK.getHandle(site,taskStr)); + inspectTask.setResult(""); + inspectTask.setActualCompleteDate(null); + inspectTask.setExecutor(""); + inspectTask.setCreatedDateTime(now); + inspectTask.setTaskCreateDate(now); + inspectTask.setPlanStartDate(now); + resourceInspectTaskMapper.insert(inspectTask); break; } } @@ -269,7 +281,7 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl Date: Tue, 7 Sep 2021 09:04:27 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=A0=B9=E6=8D=AE=E8=AE=BE=E5=A4=87=E7=82=B9?= =?UTF-8?q?=E6=A3=80=E7=BB=93=E6=9E=9C=EF=BC=8C=E5=88=9B=E5=BB=BA=E5=BD=93?= =?UTF-8?q?=E6=97=A5=E4=BB=BB=E5=8A=A1=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml index 5c65907f..f7c5dfca 100644 --- a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml +++ b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml @@ -745,6 +745,7 @@ AND ZRIT.TASK_CREATE_DATE >= #{planStartDate} + ORDER BY ZRIT.TASK_CREATE_DATE DESC diff --git a/common/src/main/java/com/foreverwin/mesnac/common/enums/AnomalyConstant.java b/common/src/main/java/com/foreverwin/mesnac/common/enums/AnomalyConstant.java index cf149fdc..567dbbfa 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/enums/AnomalyConstant.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/enums/AnomalyConstant.java @@ -221,7 +221,7 @@ public enum AnomalyConstant { public enum AnomalyMethod{ AnomalyMethod1("X","线下换料"), AnomalyMethod2("S","试装"), - AnomalyMethod3("R","让步放心"), + AnomalyMethod3("R","让步放行"), AnomalyMethod4("C","产品报废"), AnomalyMethod5("P","配作"), AnomalyMethod6("F","返修"); From 7347fb4911ca1a861bb8580adb2d4acd292c0d50 Mon Sep 17 00:00:00 2001 From: zpl Date: Tue, 7 Sep 2021 10:03:26 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=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=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/ReportDataMapper.xml | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml index 61daf532..6bb7deec 100644 --- a/common/src/main/resources/mapper/ReportDataMapper.xml +++ b/common/src/main/resources/mapper/ReportDataMapper.xml @@ -165,20 +165,24 @@ AND ZSD.SFC = #{sfc} - - AND RU.ROUTER_TYPE = #{routerType} - - - AND RU.ROUTER_TYPE != #{routerType} - + + + AND RU.ROUTER_TYPE = #{routerType} + + + AND RU.ROUTER_TYPE != 'C' + + - - AND ZSD.DISPATCH_STATUS != 'START' AND ZSD.DISPATCH_STATUS != 'COMPLETE' AND ZSD.DISPATCH_STATUS != 'CANCEL' - - - AND ZSD.DISPATCH_STATUS = #{operationStatus} - + + + AND ZSD.DISPATCH_STATUS = #{operationStatus} + + + AND ZSD.DISPATCH_STATUS != 'START' AND ZSD.DISPATCH_STATUS != 'COMPLETE' AND ZSD.DISPATCH_STATUS != 'CANCEL' + + AND ZSD.PLANNED_START_DATE >= TO_DATE(#{startFromDate}, 'YYYY-MM-DD') - 8/24 From 1819d8f44c61a5dc9c5164eb8adc05af8fdae5bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Tue, 7 Sep 2021 14:01:31 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=BA=9F?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- production/src/main/resources/mapper/SfcScrapMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/production/src/main/resources/mapper/SfcScrapMapper.xml b/production/src/main/resources/mapper/SfcScrapMapper.xml index e83a2974..2fe19166 100644 --- a/production/src/main/resources/mapper/SfcScrapMapper.xml +++ b/production/src/main/resources/mapper/SfcScrapMapper.xml @@ -439,13 +439,13 @@ NVL(SO.SHOP_ORDER,' ') SHOP_ORDER,NVL(ZNU.FULL_NAME,' ') DUTY_USER FROM SHOP_ORDER SO - LEFT JOIN WORK_CENTER WC ON SO.PLANNED_WORK_CENTER_BO = WC.HANDLE - LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE AND WCT.LOCALE = #{locale} LEFT JOIN CUSTOM_FIELDS WO ON WO.HANDLE = SO.HANDLE AND WO."ATTRIBUTE" = 'WORK_ORDER' INNER JOIN SFC S ON S.SFC = #{sfc} AND S.SITE = #{site} LEFT JOIN Z_SFC_SCRAP ZSS ON ZSS.SFC = S.SFC LEFT JOIN OPERATION O ON O.OPERATION = ZSS.OPERATION AND O.SITE = SO.SITE LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE AND OT.LOCALE = #{locale} + LEFT JOIN WORK_CENTER WC ON WC.WORK_CENTER = SUBSTR(O.OPERATION,1,INSTR(O.OPERATION,'_')-1) + LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE AND WCT.LOCALE = #{locale} LEFT JOIN ITEM I ON I.HANDLE = SO.PLANNED_ITEM_BO LEFT JOIN CUSTOM_FIELDS WO2 ON WO2.HANDLE = I.HANDLE AND WO2."ATTRIBUTE" = 'DWG_NO' LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = ZSS.DUTY_USER From a02fd7927b6e1406d05762dfcac74b06245cc839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Tue, 7 Sep 2021 14:49:09 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=BA=9F?= =?UTF-8?q?=E6=89=BE=E4=B8=8D=E5=88=B0=E8=B4=A3=E4=BB=BB=E4=BA=BA/?= =?UTF-8?q?=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SfcScrapController.java | 22 +------- .../main/resources/mapper/SfcScrapMapper.xml | 55 +++++++++++++------ 2 files changed, 40 insertions(+), 37 deletions(-) diff --git a/production/src/main/java/com/foreverwin/mesnac/production/controller/SfcScrapController.java b/production/src/main/java/com/foreverwin/mesnac/production/controller/SfcScrapController.java index 4158f1a5..3442dcec 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/controller/SfcScrapController.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/controller/SfcScrapController.java @@ -17,8 +17,8 @@ import java.util.List; /** * - * @author zjw - * @since 2021-07-30 + * @author Leon.L + * @since 2021-09-07 */ @RestController @RequestMapping("/Z-SFC-SCRAP") @@ -30,8 +30,6 @@ public class SfcScrapController { @Autowired private AnomalyService anomalyService; - - /** * 根据id查询 * @@ -83,6 +81,7 @@ public class SfcScrapController { .or().like(SfcScrap::getReason, frontPage.getGlobalQuery()) .or().like(SfcScrap::getCreatedUser, frontPage.getGlobalQuery()) .or().like(SfcScrap::getModifiedUser, frontPage.getGlobalQuery()) + .or().like(SfcScrap::getDutyUser, frontPage.getGlobalQuery()) ); } result = sfcScrapService.page(frontPage.getPagePlus(), queryWrapper); @@ -168,19 +167,4 @@ public class SfcScrapController { sfcScrapService.generatorWord(shopOrder,sfc,response,request); return R.ok(); } - - -// @PostMapping("/import") -// public String importFile(@PathParam("shopOrder") String shopOrder,@PathParam("sfc")String sfc, @RequestParam("file") MultipartFile multipartFile) { -// -// //----------------------------------------------------------------------------------------------------------------------------------------- -// try { -// String transInfo = masterDataImportService.importFile(multipartFile, importRequest); -// return new APResult().getResult(0, transInfo, transInfo); -// } catch (Exception e) { -// e.printStackTrace(); -// return new APResult().getResult(9999, e.getMessage(), e.getMessage()); -// } -// } - } \ No newline at end of file diff --git a/production/src/main/resources/mapper/SfcScrapMapper.xml b/production/src/main/resources/mapper/SfcScrapMapper.xml index 2fe19166..e9f85cf5 100644 --- a/production/src/main/resources/mapper/SfcScrapMapper.xml +++ b/production/src/main/resources/mapper/SfcScrapMapper.xml @@ -16,11 +16,12 @@ + - HANDLE, SITE, SFC, OPERATION, STEP_ID, QTY, TYPE, REASON, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME + HANDLE, SITE, SFC, OPERATION, STEP_ID, QTY, TYPE, REASON, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME, DUTY_USER @@ -66,6 +67,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND DUTY_USER=#{ew.entity.dutyUser} @@ -88,6 +90,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND DUTY_USER=#{ew.entity.dutyUser} ${ew.sqlSegment} @@ -118,6 +121,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND DUTY_USER=#{ew.entity.dutyUser} ${ew.sqlSegment} @@ -148,6 +152,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND DUTY_USER=#{ew.entity.dutyUser} ${ew.sqlSegment} @@ -178,6 +183,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND DUTY_USER=#{ew.entity.dutyUser} ${ew.sqlSegment} @@ -208,6 +214,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND DUTY_USER=#{ew.entity.dutyUser} ${ew.sqlSegment} @@ -238,6 +245,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND DUTY_USER=#{ew.entity.dutyUser} ${ew.sqlSegment} @@ -264,6 +272,7 @@ CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME, + DUTY_USER, VALUES #{handle}, @@ -278,6 +287,7 @@ #{createdDateTime}, #{modifiedUser}, #{modifiedDateTime}, + #{dutyUser}, @@ -299,6 +309,7 @@ #{createdDateTime}, #{modifiedUser}, #{modifiedDateTime}, + #{dutyUser}, @@ -316,6 +327,7 @@ CREATED_DATE_TIME=#{et.createdDateTime}, MODIFIED_USER=#{et.modifiedUser}, MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + DUTY_USER=#{et.dutyUser}, WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} @@ -333,6 +345,7 @@ CREATED_DATE_TIME=#{et.createdDateTime}, MODIFIED_USER=#{et.modifiedUser}, MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + DUTY_USER=#{et.dutyUser}, WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} @@ -350,6 +363,7 @@ CREATED_DATE_TIME=#{et.createdDateTime}, MODIFIED_USER=#{et.modifiedUser}, MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + DUTY_USER=#{et.dutyUser}, @@ -366,6 +380,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND DUTY_USER=#{ew.entity.dutyUser} ${ew.sqlSegment} @@ -413,6 +428,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND DUTY_USER=#{ew.entity.dutyUser} ${ew.sqlSegment} @@ -430,28 +446,31 @@ ) + + +