From 98d763d27965d20a8d62d722631abc5d7e5c696f Mon Sep 17 00:00:00 2001 From: Leon <3066758958@qq.com> Date: Tue, 31 Aug 2021 10:00:20 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83ERP?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=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 --- .../mesnac/production/service/impl/PodTemplateServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java index 8f23e906..e8f44d3b 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java @@ -326,7 +326,7 @@ public class PodTemplateServiceImpl implements PodTemplateService { //更改派工单状态 sfcDispatchCommonService.updateSfcDispatchStatus(site, CommonMethods.getUser(), dispatchNo, DispatchStatusEnum.COMPLETE.getCode(),workHour); //报工 - sendErp(sfc, stepId, qty, BigDecimal.ZERO, workHour); + //sendErp(sfc, stepId, qty, BigDecimal.ZERO, workHour); } catch (Exception e) { ExceptionUtil.throwException(e); } From a6c500dc78d66c3fe268008b282dd1d11009185c Mon Sep 17 00:00:00 2001 From: Leon <3066758958@qq.com> Date: Tue, 31 Aug 2021 15:36:23 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83ERP?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=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 --- console/src/main/resources/application-dev.yml | 17 ++++++++++++----- .../src/main/resources/application-local.yml | 2 +- console/src/main/resources/application.yml | 2 +- .../quartz/job/ResourceInspectTaskJob.java | 6 ++++++ 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/console/src/main/resources/application-dev.yml b/console/src/main/resources/application-dev.yml index a82f4ead..eb3d1be8 100644 --- a/console/src/main/resources/application-dev.yml +++ b/console/src/main/resources/application-dev.yml @@ -8,14 +8,23 @@ spring: driver-class-name: com.sap.db.jdbc.Driver jndi-name: jdbc/jts/wipPool activemq: - enabled: false - brokerUrl: tcp://121.36.58.109:61616?wireFormat.maxInactivityDuration=0 + enabled: true + brokerUrl: tcp://113.98.201.217:61616?wireFormat.maxInactivityDuration=0 password: admin user: admin pool: enabled: true max-connections: 10 +#发送消息 +activemq: + brokerUrl: tcp://113.98.201.217:61616?wireFormat.maxInactivityDuration=0 + password: admin + user: admin + pool: + enabled: true + max-connections: 10 + #WebService ws: erp: @@ -40,9 +49,7 @@ print: quartz: enabled: true -activeMq: - sendWeChatMessage: tcp://localhost:61616?wireFormat.maxInactivityDuration=0 - queue: send.weChat.notice + exportDocument: filePath: /usr/word/ outputPath: /usr/word/outputWord/ diff --git a/console/src/main/resources/application-local.yml b/console/src/main/resources/application-local.yml index 31b82509..4459c48e 100644 --- a/console/src/main/resources/application-local.yml +++ b/console/src/main/resources/application-local.yml @@ -66,7 +66,7 @@ ws: #quartz任务启用 quartz: - enabled: false + enabled: true #打印服务器配置 print: diff --git a/console/src/main/resources/application.yml b/console/src/main/resources/application.yml index b6c5feaf..db134693 100644 --- a/console/src/main/resources/application.yml +++ b/console/src/main/resources/application.yml @@ -35,7 +35,7 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss profiles: - active: local + active: dev # 文件上传 servlet: multipart: diff --git a/quartz/src/main/java/com/foreverwin/mesnac/quartz/job/ResourceInspectTaskJob.java b/quartz/src/main/java/com/foreverwin/mesnac/quartz/job/ResourceInspectTaskJob.java index b4fa0021..c928d721 100644 --- a/quartz/src/main/java/com/foreverwin/mesnac/quartz/job/ResourceInspectTaskJob.java +++ b/quartz/src/main/java/com/foreverwin/mesnac/quartz/job/ResourceInspectTaskJob.java @@ -8,6 +8,8 @@ import org.quartz.DisallowConcurrentExecution; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; /** @@ -20,11 +22,15 @@ public class ResourceInspectTaskJob implements Job { private static final String SITE_UPPERCASE = "SITE"; private static final String SITE_LOWERCASE = "site"; + private Logger logger = LoggerFactory.getLogger("ResourceInspectTaskJob"); + @Autowired private ResourceInspectTaskJobService resourceInspectTaskJobService; @Override public void execute(JobExecutionContext context) throws JobExecutionException { + logger.info("设备点检任务创建定时任务开始执行"); + //获取站点，若站点为空则抛出异常 String site = getSite(context); if (StringUtil.isBlank(site)) { From 480f9952578e7203fb18421455f353097523b181 Mon Sep 17 00:00:00 2001 From: Leon <3066758958@qq.com> Date: Tue, 31 Aug 2021 15:37:17 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83ERP?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=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 --- console/src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/console/src/main/resources/application.yml b/console/src/main/resources/application.yml index db134693..b6c5feaf 100644 --- a/console/src/main/resources/application.yml +++ b/console/src/main/resources/application.yml @@ -35,7 +35,7 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss profiles: - active: dev + active: local # 文件上传 servlet: multipart: From 56599d67b031aad62b3309bd243b07904d15f655 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, 31 Aug 2021 17:34:52 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=BA=8B=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/AbnormalBillMapper.xml | 11 ++++++++++- .../foreverwin/mesnac/common/util/ActiveMQUtil.java | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml index 4898d922..20580a3f 100644 --- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml +++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml @@ -942,9 +942,18 @@ AND zab.ABNORMAL_NO = #{abnormalBill.abnormalNo} - + AND zab.STATUS = #{abnormalBill.status} + + AND zab.PROGRAM IS NULL + + + AND zab.CORRECTION IS NULL + + + AND zab.PROGRAM = 'true' AND zab.CORRECTION = 'true' AND zab.status != 'G' + AND zab.CREATED_DATE_TIME >= #{abnormalBill.startDateTime} diff --git a/common/src/main/java/com/foreverwin/mesnac/common/util/ActiveMQUtil.java b/common/src/main/java/com/foreverwin/mesnac/common/util/ActiveMQUtil.java index b6244cf3..97478976 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/util/ActiveMQUtil.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/util/ActiveMQUtil.java @@ -2,6 +2,7 @@ package com.foreverwin.mesnac.common.util; import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.jms.core.JmsMessagingTemplate; import org.springframework.stereotype.Component; @@ -15,6 +16,7 @@ public class ActiveMQUtil { @Autowired + @Qualifier("mesJmsTemplate") private JmsMessagingTemplate mesJmsTemplate; public void wechatSendMessage(String user, String text) { From 18df19141e061075bd13d0801a44c032b6c9462b Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Tue, 31 Aug 2021 17:41:37 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/mapper/InspectionItemMapper.java | 6 ++++++ .../service/impl/InspectionItemServiceImpl.java | 15 ++++++++++++++- .../resources/mapper/InspectionItemMapper.xml | 10 ++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/mapper/InspectionItemMapper.java b/common/src/main/java/com/foreverwin/mesnac/common/mapper/InspectionItemMapper.java index b084ecc5..f434ec01 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/mapper/InspectionItemMapper.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/mapper/InspectionItemMapper.java @@ -24,4 +24,10 @@ public interface InspectionItemMapper extends BaseMapper { List selectWidestQualityInspection(@Param("site")String site,@Param("inspectionType")String inspectionType,@Param("additionalObject")String additionalObject); Integer checkRouterStep(@Param("site")String site,@Param("operation") String operation,@Param("stepId") String stepId); + + Integer resrcePlanCheck(String handle); + + Integer resrceTaskCheck(String handle); + + Integer inspectTaskCheck(String handle); } \ No newline at end of file diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionItemServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionItemServiceImpl.java index 97370026..833f5766 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionItemServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionItemServiceImpl.java @@ -219,7 +219,20 @@ public class InspectionItemServiceImpl extends ServiceImpl0){ + throw new BaseException("检验项目已被使用，无法删除"); + } + num=inspectionItemMapper.resrceTaskCheck(handle); + if (num>0){ + throw new BaseException("检验项目已被使用，无法删除"); + } + num=inspectionItemMapper.inspectTaskCheck(handle); + if (num>0){ + throw new BaseException("检验项目已被使用，无法删除"); + } HashMap removeCondition = new HashMap<>(); removeCondition.put(InspectionItemAddition.INSPECTION_ITEM_BO, inspectionItem.getHandle()); inspectionItemAdditionService.removeByMap(removeCondition); diff --git a/common/src/main/resources/mapper/InspectionItemMapper.xml b/common/src/main/resources/mapper/InspectionItemMapper.xml index ac19108f..65f625bd 100644 --- a/common/src/main/resources/mapper/InspectionItemMapper.xml +++ b/common/src/main/resources/mapper/InspectionItemMapper.xml @@ -475,4 +475,14 @@ WHERE (ziia.ADDITIONAL_OBJECT_TYPE='ITEM' OR ziia.ADDITIONAL_OBJECT_TYPE='OPERATION') AND zii.STATUS='Y' AND zii.INSPECTION_TYPE=#{inspectionType} AND ziia.ADDITIONAL_OBJECT=#{additionalObject} AND zii.SITE=#{site} + + + + From 1dacffcf9c2e2a4f1273ef51f7bdb75a520e762e Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Tue, 31 Aug 2021 17:45:37 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=89=93=E5=BC=80=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/production/service/impl/PodTemplateServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java index e8f44d3b..8f23e906 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java @@ -326,7 +326,7 @@ public class PodTemplateServiceImpl implements PodTemplateService { //更改派工单状态 sfcDispatchCommonService.updateSfcDispatchStatus(site, CommonMethods.getUser(), dispatchNo, DispatchStatusEnum.COMPLETE.getCode(),workHour); //报工 - //sendErp(sfc, stepId, qty, BigDecimal.ZERO, workHour); + sendErp(sfc, stepId, qty, BigDecimal.ZERO, workHour); } catch (Exception e) { ExceptionUtil.throwException(e); }