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/4] =?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 89587b6ab115495f119a2271d4cccfbd5c413336 Mon Sep 17 00:00:00 2001 From: zpl Date: Tue, 31 Aug 2021 15:24:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=B8=BB=E8=A7=82?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreverwin/mesnac/common/dto/LabelPrintDto.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java b/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java index d576e969..2a9749f5 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java @@ -49,6 +49,8 @@ public class LabelPrintDto implements Serializable { private String operation; //打印张数 private Integer printNum; + //是否主观件 + private String mainPart; public String getItemNumber() { return itemNumber; @@ -201,4 +203,12 @@ public class LabelPrintDto implements Serializable { public void setPrintNum(Integer printNum) { this.printNum = printNum; } + + public String getMainPart() { + return mainPart; + } + + public void setMainPart(String mainPart) { + this.mainPart = mainPart; + } } 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 3/4] =?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 4/4] =?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: