Merge remote-tracking branch 'origin/master'

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;
+    }
 }

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/

console/src/main/resources/application-local.yml

@@ -66,7 +66,7 @@ ws:
 
 #quartz任务启用
 quartz:
-  enabled: false
+  enabled: true
 
 #打印服务器配置
 print:

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);
         }

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)) {