From 5849272dc3d0f1c7c1274d8f047d54c67a0a208c Mon Sep 17 00:00:00 2001 From: zpl Date: Tue, 17 Aug 2021 14:13:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8F=AB=E6=96=99=E6=9D=83=E9=99=90?= =?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/dispatch/service/impl/CallItemServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java index f1db7876..9bfdd9ad 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java @@ -156,7 +156,7 @@ public class CallItemServiceImpl extends ServiceImpl i String user = CommonMethods.getUser(); String language = LocaleContextHolder.getLocale().getLanguage(); callItem.setCallType(Constants.CALL_TYPE_MATERIAL); - List nwaUsers = nwaUserService.checkUserGroup(site, "CJ_ZR,ADMINISTRATORS"); + List nwaUsers = nwaUserService.checkUserGroup(site, "CJZR,ADMINISTRATORS"); for (NwaUser nwaUser:nwaUsers) { if (user.equals(nwaUser.getUserName())){ return callItemMapper.findCallItemListPda(site,language,null,callItem); From 102a1e17bb605cdc17ddcce3e3f916b9e98b3d96 Mon Sep 17 00:00:00 2001 From: zpl Date: Tue, 17 Aug 2021 14:14:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/src/main/resources/mapper/PrintLogMapper.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/common/src/main/resources/mapper/PrintLogMapper.xml b/common/src/main/resources/mapper/PrintLogMapper.xml index b1166863..aa9635f4 100644 --- a/common/src/main/resources/mapper/PrintLogMapper.xml +++ b/common/src/main/resources/mapper/PrintLogMapper.xml @@ -539,8 +539,10 @@ From 98e48c755df413b6f13d445ff4bed52049b853a8 Mon Sep 17 00:00:00 2001 From: Leon <3066758958@qq.com> Date: Tue, 17 Aug 2021 15:37:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-prd.yml | 2 +- .../mesnac/dispatch/model/SfcDispatch.java | 10 + .../service/impl/SfcDispatchServiceImpl.java | 3 + .../resources/mapper/SfcDispatchMapper.xml | 349 +----------------- .../service/impl/InterfaceServiceImpl.java | 4 +- 5 files changed, 32 insertions(+), 336 deletions(-) diff --git a/console/src/main/resources/application-prd.yml b/console/src/main/resources/application-prd.yml index 3d95b624..dd51e095 100644 --- a/console/src/main/resources/application-prd.yml +++ b/console/src/main/resources/application-prd.yml @@ -33,7 +33,7 @@ ftp: #打印服务器配置 print: - server: http://172.16.251.188:8022/print/mesnacprint + server: http://10.10.170.32:8022/print/mesnacprint exportDocument: diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/SfcDispatch.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/SfcDispatch.java index 8b5c9cd1..8db2d18c 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/SfcDispatch.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/SfcDispatch.java @@ -115,6 +115,8 @@ public class SfcDispatch extends Model { */ @TableField("EMPLOYEE") private String employee; + @TableField("EMPLOYEE_DESCRIPTION") + private String employeeDescription; /** * 是否转序 */ @@ -381,6 +383,14 @@ public class SfcDispatch extends Model { this.employee = employee; } + public String getEmployeeDescription() { + return employeeDescription; + } + + public void setEmployeeDescription(String employeeDescription) { + this.employeeDescription = employeeDescription; + } + public String getTurnOperation() { return turnOperation; } 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 6bfe69b4..e2217a51 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 @@ -525,10 +525,13 @@ public class SfcDispatchServiceImpl extends ServiceImpl + @@ -65,6 +66,7 @@ + @@ -73,7 +75,7 @@ - HANDLE, SITE, SHOP_ORDER, SFC, BLANKING_SIZE, DISPATCH_SEQ, DISPATCH_NO, DISPATCH_STATUS, DRAWINGS_NO, DRAWINGS_REVISION, IS_LOCK, ROUTER_BO, STEP_ID, OPERATION, RESOURCE_TYPE, WORK_CENTER, RESRCE, EMPLOYEE, TURN_OPERATION, DISPATCH_QTY, PROD_HOURS, PLANNED_START_DATE, PLANNED_COMP_DATE, EARLIEST_START_DATE, LATEST_END_DATE, SO_RELEASED_DATE, SFC_RELEASED_DATE, RELEASED_COMPLETE_DATE, ACTUAL_START_DATE, ACTUAL_COMPLETE_DATE, IS_DISPATCH, IS_IMPORT, REMARK, PREPOSITION_STEP_ID, PREPOSITION_OPERATION, IS_FIRST_OPERATION, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME, OTHER_1, OTHER_2, OTHER_3, OTHER_4, OTHER_5 + HANDLE, SITE, SHOP_ORDER, SFC, BLANKING_SIZE, DISPATCH_SEQ, DISPATCH_NO, DISPATCH_STATUS, DRAWINGS_NO, DRAWINGS_REVISION, IS_LOCK, ROUTER_BO, STEP_ID, OPERATION, RESOURCE_TYPE, WORK_CENTER, RESRCE, EMPLOYEE, EMPLOYEE_DESCRIPTION, TURN_OPERATION, DISPATCH_QTY, PROD_HOURS, PLANNED_START_DATE, PLANNED_COMP_DATE, EARLIEST_START_DATE, LATEST_END_DATE, SO_RELEASED_DATE, SFC_RELEASED_DATE, RELEASED_COMPLETE_DATE, ACTUAL_START_DATE, ACTUAL_COMPLETE_DATE, IS_DISPATCH, IS_IMPORT, REMARK, PREPOSITION_STEP_ID, PREPOSITION_OPERATION, IS_FIRST_OPERATION, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME, OTHER_1, OTHER_2, OTHER_3, OTHER_4, OTHER_5 @@ -81,143 +83,6 @@ SELECT FROM Z_SFC_DISPATCH WHERE HANDLE=#{handle} - - - - - - - - - - - - - - INSERT INTO Z_SFC_DISPATCH @@ -547,6 +223,7 @@ WORK_CENTER, RESRCE, EMPLOYEE, + EMPLOYEE_DESCRIPTION, TURN_OPERATION, DISPATCH_QTY, PROD_HOURS, @@ -594,6 +271,7 @@ #{workCenter}, #{resrce}, #{employee}, + #{employeeDescription}, #{turnOperation}, #{dispatchQty}, #{prodHours}, @@ -648,6 +326,7 @@ #{workCenter}, #{resrce}, #{employee}, + #{employeeDescription}, #{turnOperation}, #{dispatchQty}, #{prodHours}, @@ -698,6 +377,7 @@ WORK_CENTER=#{et.workCenter}, RESRCE=#{et.resrce}, EMPLOYEE=#{et.employee}, + EMPLOYEE_DESCRIPTION=#{et.employeeDescription}, TURN_OPERATION=#{et.turnOperation}, DISPATCH_QTY=#{et.dispatchQty}, PROD_HOURS=#{et.prodHours}, @@ -748,6 +428,7 @@ WORK_CENTER=#{et.workCenter}, RESRCE=#{et.resrce}, EMPLOYEE=#{et.employee}, + EMPLOYEE_DESCRIPTION=#{et.employeeDescription}, TURN_OPERATION=#{et.turnOperation}, DISPATCH_QTY=#{et.dispatchQty}, PROD_HOURS=#{et.prodHours}, @@ -798,6 +479,7 @@ WORK_CENTER=#{et.workCenter}, RESRCE=#{et.resrce}, EMPLOYEE=#{et.employee}, + EMPLOYEE_DESCRIPTION=#{et.employeeDescription}, TURN_OPERATION=#{et.turnOperation}, DISPATCH_QTY=#{et.dispatchQty}, PROD_HOURS=#{et.prodHours}, @@ -847,6 +529,7 @@ AND WORK_CENTER=#{ew.entity.workCenter} AND RESRCE=#{ew.entity.resrce} AND EMPLOYEE=#{ew.entity.employee} + EMPLOYEE_DESCRIPTION=#{et.entity.employeeDescription}, AND TURN_OPERATION=#{ew.entity.turnOperation} AND DISPATCH_QTY=#{ew.entity.dispatchQty} AND PROD_HOURS=#{ew.entity.prodHours} @@ -927,6 +610,7 @@ AND WORK_CENTER=#{ew.entity.workCenter} AND RESRCE=#{ew.entity.resrce} AND EMPLOYEE=#{ew.entity.employee} + EMPLOYEE_DESCRIPTION=#{et.entity.employeeDescription}, AND TURN_OPERATION=#{ew.entity.turnOperation} AND DISPATCH_QTY=#{ew.entity.dispatchQty} AND PROD_HOURS=#{ew.entity.prodHours} @@ -984,21 +668,20 @@ + + + + +