From 1a3f693cd497d04920975af75789cba6b6e866c9 Mon Sep 17 00:00:00 2001 From: Leon <3066758958@qq.com> Date: Wed, 1 Sep 2021 12:07:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?MQ=E8=BF=9E=E6=8E=A5=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=97=AE=E9=A2=98=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/ProdReadyTaskServiceImpl.java | 3 ++- .../java/com/foreverwin/mesnac/common/util/ActiveMQUtil.java | 2 +- .../main/java/com/foreverwin/mesnac/common/util/DateUtil.java | 2 +- console/src/main/resources/application-local.yml | 2 +- .../foreverwin/mesnac/equip/consumer/ResourceMQConsume.java | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java index 3af68b0c..ac7ed5e0 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java @@ -68,7 +68,8 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl Date: Wed, 1 Sep 2021 13:45:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E5=B7=A5=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProdReadyTaskServiceImpl.java | 2 +- .../service/impl/PodTemplateServiceImpl.java | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java index 3af68b0c..2cff07ce 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java @@ -486,7 +486,7 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl resrceEnter(WorkCenterDto workCenterDto) { @@ -208,9 +205,8 @@ public class PodTemplateServiceImpl implements PodTemplateService { String dispatchNo = sfcDto.getDispatchNo(); Sfc sfcServiceById = sfcService.getById(HandleEnum.SFC.getHandle(site, sfc)); BigDecimal qty = new BigDecimal(sfcServiceById.getQty().toString()); - WorkShopTransfer transfer = workShopTransferService.sfcEnter(sfc, "OUT"); - String isOutSource = transfer.getIsOutSource(); - if (StringUtil.isBlank(isOutSource)||!isOutSource.equals(Constants.STATUS_Y)){ + + if (!operation.equals("WX_6106GX")){ //是否有互检检验项目 List inspectionItemDetails = inspectionItemService.selectQualityInspection(sfc, operation, stepId, Constants.INSPECTION_TYPE_H); if (inspectionItemDetails.size() > 0 && inspectionItemDetails.get(0) != null) { @@ -264,9 +260,7 @@ public class PodTemplateServiceImpl implements PodTemplateService { } BigDecimal workHour=BigDecimal.ZERO; BigDecimal qty = new BigDecimal(sfcServiceById.getQty().toString()); - WorkShopTransfer transfer = workShopTransferService.sfcEnter(sfc, "OUT"); - String isOutSource = transfer.getIsOutSource(); - if (StringUtil.isBlank(isOutSource)||!isOutSource.equals(Constants.STATUS_Y)) { + if (!operation.equals("WX_6106GX")) { //是否有自检检验项目 List inspectionItemDetails = inspectionItemService.selectQualityInspection(sfc, operation, stepId, Constants.INSPECTION_TYPE_Z); if (inspectionItemDetails.size() > 0 && inspectionItemDetails.get(0) != null) { From 4809f0c219daa4df27a1f175aaa9c33a7bead983 Mon Sep 17 00:00:00 2001 From: Leon <3066758958@qq.com> Date: Wed, 1 Sep 2021 14:53:32 +0800 Subject: [PATCH 3/4] =?UTF-8?q?MQ=E8=BF=9E=E6=8E=A5=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- console/src/main/resources/application-dev.yml | 2 +- console/src/main/resources/application-qas.yml | 2 +- .../mesnac/dispatch/controller/SfcDispatchController.java | 2 +- dispatch/src/main/resources/mapper/SfcDispatchMapper.xml | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/console/src/main/resources/application-dev.yml b/console/src/main/resources/application-dev.yml index eb3d1be8..729e3584 100644 --- a/console/src/main/resources/application-dev.yml +++ b/console/src/main/resources/application-dev.yml @@ -8,7 +8,7 @@ spring: driver-class-name: com.sap.db.jdbc.Driver jndi-name: jdbc/jts/wipPool activemq: - enabled: true + enabled: false brokerUrl: tcp://113.98.201.217:61616?wireFormat.maxInactivityDuration=0 password: admin user: admin diff --git a/console/src/main/resources/application-qas.yml b/console/src/main/resources/application-qas.yml index f31d312b..8f3519c7 100644 --- a/console/src/main/resources/application-qas.yml +++ b/console/src/main/resources/application-qas.yml @@ -8,7 +8,7 @@ spring: driver-class-name: com.sap.db.jdbc.Driver jndi-name: jdbc/jts/wipPool activemq: - enabled: true + enabled: false brokerUrl: tcp://172.16.251.133:61616?wireFormat.maxInactivityDuration=0 password: admin user: admin diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java index ed4f73be..32801b0d 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java @@ -219,7 +219,7 @@ public class SfcDispatchController { try { String site = CommonMethods.getSite(); paramMap.put("site", site); - paramMap.put("", DispatchStatusEnum.RELEASE.getCode()); + paramMap.put("status", "('RELEASE','START','COMPLETE')"); result = sfcDispatchService.ganttList(site, paramMap); diff --git a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml index d8bb39bc..3a652661 100644 --- a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml +++ b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml @@ -708,6 +708,9 @@ AND SD.DISPATCH_STATUS = #{dispatchStatus} + + AND SD.DISPATCH_STATUS IN ${status} + AND IM.ITEM = #{item} From e6deb0b820f0f1f02a8cfccbec9cd69518fda03e Mon Sep 17 00:00:00 2001 From: Leon <3066758958@qq.com> Date: Wed, 1 Sep 2021 15:13:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=B4=BE=E5=B7=A5&?= =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE&=E8=B4=A8=E9=87=8F=E4=BB=A3?= =?UTF-8?q?=E5=8A=9E=E4=BA=8B=E9=A1=B9=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/foreverwin/mesnac/common/constant/Constants.java | 2 ++ .../mesnac/dispatch/controller/SfcDispatchController.java | 6 +++--- .../dispatch/service/impl/SfcDispatchServiceImpl.java | 8 ++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java b/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java index 468d8fb6..3c3f4774 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java @@ -194,6 +194,8 @@ public interface Constants { //用户组 String USER_GROUP_ADMINISTRATOR = "ADMINISTRATORS"; + //外协 + String USER_GROUP_WX_USER = "WX_USER"; //车间调度 String USER_GROUP_CJDD = "CJDD"; //总计划 diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java index 32801b0d..241bcae7 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java @@ -212,7 +212,9 @@ public class SfcDispatchController { result = sfcDispatchService.page(frontPage.getPagePlus(), queryWrapper); return R.ok(result); } - @PostMapping("/gantt-list") + + + @GetMapping("/gantt-list") public R ganttList(@RequestParam(required = false) Map paramMap) { Map result = new HashMap<>(); @@ -229,6 +231,4 @@ public class SfcDispatchController { return R.ok(result); } - - } \ No newline at end of file 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 1192b2e5..57064170 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 @@ -38,6 +38,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.io.InputStream; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -107,6 +108,9 @@ public class SfcDispatchServiceImpl extends ServiceImpl>> processedMap = this.processWorkCenterWorkTimes(site, workCenterList, startFromDate, StartToDate); map.put("workCenterWorkTimes", processedMap);