Merge remote-tracking branch 'origin/master'

common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java

@@ -68,7 +68,8 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
     public static final String STATUS_FINISH = "FINISH";
     public static final String STATUS_CANCEL = "CANCEL";
     public static final String MESSAGE_TYPE_WLZB = "WLZB";
-    @Autowired
+
+    @Autowired(required = false)
     @Qualifier("defaultJmsTemplate")
     private JmsMessagingTemplate jmsTemplate;
     @Value("${print.server}")

common/src/main/java/com/foreverwin/mesnac/common/util/ActiveMQUtil.java

@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
 public class ActiveMQUtil {
 
 
-    @Autowired
+    @Autowired(required = false)
     @Qualifier("mesJmsTemplate")
     private JmsMessagingTemplate mesJmsTemplate;
 

common/src/main/java/com/foreverwin/mesnac/common/util/DateUtil.java

@@ -688,6 +688,6 @@ public class DateUtil
 		int second = calendar.get(Calendar.SECOND);
 		int msec = calendar.get(Calendar.MILLISECOND);
 
-		return String.valueOf(year) + String.valueOf(month) + String.valueOf(day) + String.valueOf(hour) + String.valueOf(minute) + String.valueOf(second);
+		return String.valueOf(year) + String.valueOf(month) + String.valueOf(day) + String.valueOf(hour) + String.valueOf(minute) + String.valueOf(second) + String.valueOf(msec);
 	}
 }

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

@@ -38,7 +38,7 @@ spring:
           merge-sql: true
           slow-sql-millis: 100
   activemq:
-    enabled: true
+    enabled: false
     brokerUrl: tcp://localhost:61616?wireFormat.maxInactivityDuration=0
     password: admin
     user: admin

equip/src/main/java/com/foreverwin/mesnac/equip/consumer/ResourceMQConsume.java

@@ -29,7 +29,7 @@ public class ResourceMQConsume {
     @Autowired
     private ResourceMQProcess resourceMQProcess;
 
-    @Autowired
+    @Autowired(required = false)
     @Qualifier("defaultJmsTemplate")
     private JmsMessagingTemplate template;
 

production/src/main/resources/mapper/SfcScrapMapper.xml

@@ -442,12 +442,12 @@
         LEFT JOIN WORK_CENTER WC ON SO.PLANNED_WORK_CENTER_BO = WC.HANDLE
         LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE AND WCT.LOCALE = #{locale}
         LEFT JOIN CUSTOM_FIELDS WO ON WO.HANDLE = SO.HANDLE AND WO."ATTRIBUTE" = 'WORK_ORDER'
-        LEFT JOIN CUSTOM_FIELDS WO2 ON WO2.HANDLE = SO.PLANNED_ITEM_BO AND WO2."ATTRIBUTE" = 'DWG_NO'
         INNER JOIN SFC S ON S.SFC = #{sfc} AND S.SITE = #{site}
         LEFT JOIN Z_SFC_SCRAP ZSS ON  ZSS.SFC = S.SFC
         LEFT JOIN OPERATION O ON O.OPERATION = ZSS.OPERATION AND O.SITE = SO.SITE
         LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE AND OT.LOCALE = #{locale}
         LEFT JOIN ITEM I ON I.HANDLE = SO.PLANNED_ITEM_BO
+        LEFT JOIN CUSTOM_FIELDS WO2 ON WO2.HANDLE = I.HANDLE AND WO2."ATTRIBUTE" = 'DWG_NO'
         LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = ZSS.DUTY_USER
         LEFT JOIN ITEM_T it ON it.ITEM_BO = I.HANDLE AND it.LOCALE = #{locale}
         LEFT JOIN CUSTOM_FIELDS I1 ON I1.HANDLE = I.HANDLE AND I1."ATTRIBUTE" = 'PER_METER'