手动转发 问题修改

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -318,7 +318,9 @@ public class DeviceController {
 
 
                         Storage theStorage = dataCache.getStorageById(pos.getStorageId());
                         Storage theStorage = dataCache.getStorageById(pos.getStorageId());
 
 
-                        lizhenApi.backToWarehouse(warhouseCode,theStorage.getName(),barcode.getBarcode());
+                        if (!barcode.isAskPutIn()) {
+                            lizhenApi.backToWarehouse(warhouseCode, theStorage.getName(), barcode.getBarcode());
+                        }
 
 
                         barcode.setWarehouseCode(warhouseCode);
                         barcode.setWarehouseCode(warhouseCode);
                         barcode.setAskPutIn(true);
                         barcode.setAskPutIn(true);

src/main/java/com/neotel/smfcore/custom/lizhen/kafka/service/KafkaService.java

@@ -58,7 +58,7 @@ public class KafkaService {
     /**
     /**
      * 设备状态发送
      * 设备状态发送
      */
      */
-    //@Scheduled(fixedRate = 1000 * 60 * 1)
+    @Scheduled(fixedRate = 1000 * 60 * 1)
     public void setMachineStatus() {
     public void setMachineStatus() {
         log.info("发送设备状态开始");
         log.info("发送设备状态开始");
         Collection<Storage> storages = dataCache.getAllStorage().values();
         Collection<Storage> storages = dataCache.getAllStorage().values();
@@ -158,7 +158,7 @@ public class KafkaService {
     /**
     /**
      * 心跳数据发送
      * 心跳数据发送
      */
      */
-    //@Scheduled(fixedRate = 1000 * 60 * 5)
+    @Scheduled(fixedRate = 1000 * 60 * 5)
     public void setHeartbeat() {
     public void setHeartbeat() {
         log.info("发送心跳开始");
         log.info("发送心跳开始");
         //根据machineId,找到设备状态,是否正常
         //根据machineId,找到设备状态,是否正常
@@ -203,7 +203,7 @@ public class KafkaService {
     /**
     /**
      * 设备状态发送
      * 设备状态发送
      */
      */
-    //@Scheduled(fixedRate = 1000 * 60 * 1)
+    @Scheduled(fixedRate = 1000 * 60 * 1)
     public void setStorageExportStatus() {
     public void setStorageExportStatus() {
         log.info("发送出料口信息开始");
         log.info("发送出料口信息开始");
 
 
@@ -272,7 +272,7 @@ public class KafkaService {
     /**
     /**
      * 发送出料口心跳
      * 发送出料口心跳
      */
      */
-    //@Scheduled(fixedRate = 1000 * 60 * 5)
+    @Scheduled(fixedRate = 1000 * 60 * 5)
     public void setStorageHeartbeat() {
     public void setStorageHeartbeat() {
         log.info("发送出料口心跳开始");
         log.info("发送出料口心跳开始");
         EquipStatusBean statusBean = EquipStatusUtil.getStatusBean(KafkaConfig.LINE_CID);
         EquipStatusBean statusBean = EquipStatusUtil.getStatusBean(KafkaConfig.LINE_CID);
@@ -308,7 +308,7 @@ public class KafkaService {
     /**
     /**
      * MachineParameter发送
      * MachineParameter发送
      */
      */
-    //@Scheduled(fixedRate = 1000 * 60 * 5)
+    @Scheduled(fixedRate = 1000 * 60 * 5)
     public void setMachineParameter() {
     public void setMachineParameter() {
         log.info("MachineParameter开始发送");
         log.info("MachineParameter开始发送");
         List<String> machineIdList = getMachineIdList();
         List<String> machineIdList = getMachineIdList();

src/main/java/com/neotel/smfcore/custom/lizhen/wcs/LizhenController.java

@@ -195,12 +195,12 @@ public class LizhenController {
         }
         }
         //log.info("Mes缺料预警---" + JSONObject.toJSONString(data));
         //log.info("Mes缺料预警---" + JSONObject.toJSONString(data));
         PreWarningItem item = new PreWarningItem();
         PreWarningItem item = new PreWarningItem();
-        item.setMachinename(data.get("MACHINENAME"));
-        item.setStation(data.get("STATION"));
-        item.setSide(data.get("SIDE"));
+        item.setMachinename(data.get("MACHINE_NAME"));
+        item.setStation(data.get("MACHINE"));
+        item.setSide(data.get("FACE"));
         item.setSlot(data.get("SLOT"));
         item.setSlot(data.get("SLOT"));
         item.setSubslot(data.get("SUBSLOT"));
         item.setSubslot(data.get("SUBSLOT"));
-        item.setPartnumber(data.get("PARTNUMBER"));
+        item.setPartnumber(data.get("MATERIAL_CODE"));
         item.setLine(data.get("LINE"));
         item.setLine(data.get("LINE"));
         item.setItemId(data.get("ID"));
         item.setItemId(data.get("ID"));
         item.setPickingId(data.get("PICKING_ID"));
         item.setPickingId(data.get("PICKING_ID"));

src/main/resources/config/application-21088prod.yml

 api:
 api:
   plantCode: W339
   plantCode: W339
   name: Lizhen
   name: Lizhen
-  inCheckUrl: http://10.68.21.21:8001/Npm/WmsCheckReelfob   #禁用料接口
+  inCheckUrl: http://10.68.25.40:8001/Npm/WmsCheckReelfob   #禁用料接口
   outNotifyUrl: http://10.68.30.22:8082/api/mlb/TowerIssue
   outNotifyUrl: http://10.68.30.22:8082/api/mlb/TowerIssue
   inNotifyUrl: http://10.68.30.22:8082/api/mlb/BackToWarehouse
   inNotifyUrl: http://10.68.30.22:8082/api/mlb/BackToWarehouse
   getBarcode: http://10.68.27.83/smf-core/thirdBarcode/getBarcode
   getBarcode: http://10.68.27.83/smf-core/thirdBarcode/getBarcode
\ No newline at end of file

src/main/resources/config/application-prod.yml

@@ -18,11 +18,11 @@ spring:
 
 
 #kafka配置
 #kafka配置
   kafka:
   kafka:
-    bootstrap-servers: #10.190.196.135:9092
+    bootstrap-servers: 10.68.16.18:9092,10.68.16.19:9092,10.68.16.20:9092
     consumer:
     consumer:
-      group-id: #neotel
-      key-deserializer: #org.apache.kafka.common.serialization.StringDeserializer
-      value-deserializer: #org.apache.kafka.common.serialization.StringDeserializer
+      group-id: neotel
+      key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
+      value-deserializer: org.apache.kafka.common.serialization.StringDeserializer
 
 
 #jwt
 #jwt
 jwt:
 jwt:

src/main/resources/config/application.yml

@@ -80,7 +80,7 @@ spring:
     check-template-location: false
     check-template-location: false
   profiles:
   profiles:
     active: 'prod'
     active: 'prod'
-    include: 21088test
+    include: 21088prod
   jackson:
   jackson:
     time-zone: GMT+8
     time-zone: GMT+8
   data:
   data:
@@ -103,5 +103,5 @@ app:
   type: ""
   type: ""
 
 
 menu:
 menu:
-  show: workOrder
+  show: #workOrder
   hide:
   hide:
\ No newline at end of file