现场联调优化

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_kiln_truss/HfKilnTrussDeviceDriver.java

@@ -185,11 +185,15 @@ public class HfKilnTrussDeviceDriver extends AbstractOpcDeviceDriver implements
                     break;
                 case 3:
                     //上报LMS，将对应托盘置为指定窑号中
-                    uploadKilnInJson();
+                    if(!inTrussSucess) {
+                        uploadKilnInJson();
+                    }
                     break;
                 case 4:
                     //上报LMS，将对应窑号中的所有托盘都设置为已出窑
-                    uploadKilnOutJson();
+                    if(!outTrussSucess) {
+                        uploadKilnOutJson();
+                    }
                     break;
             }
         }
@@ -240,7 +244,8 @@ public class HfKilnTrussDeviceDriver extends AbstractOpcDeviceDriver implements
                 logServer.deviceInfo("acs组盘入窑", this.getDevice_code(), "组盘入窑成功!");
             }else{
                 this.writing(99);
-                message = "窑道外冷却区存在存留托盘，无法出窑";
+                message = "入窑失败，托盘号不存在";
+                log.info("入窑失败，托盘号"+barcode+"不存在");
             }
             this.setInTrussSucess(true);
             return true;
@@ -270,9 +275,12 @@ public class HfKilnTrussDeviceDriver extends AbstractOpcDeviceDriver implements
             if (StrUtil.equals(resp.getString("status"), "200")) {
                 this.writing(4);
                 logServer.deviceInfo("acs组盘出窑", this.getDevice_code(), "组盘出窑成功!");
+            }else if (StrUtil.equals(resp.getString("status"), "401")) {
+                this.writing(98);
+                logServer.deviceInfo("acs组盘出窑", this.getDevice_code(), "组盘出窑成功,出窑数量与组盘表不一致!");
             }else{
                 this.writing(99);
-                logServer.deviceInfo("acs组盘出窑", this.getDevice_code(), "组盘出窑成功!");
+                logServer.deviceInfo("acs组盘出窑", this.getDevice_code(), "组盘出窑失败，出窑缓存区有货!");
             }
             this.setOutTrussSucess(true);
             return true;

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station_two/HfStationTwoDeviceDriver.java

@@ -388,6 +388,7 @@ public class HfStationTwoDeviceDriver extends AbstractOpcDeviceDriver implements
             json.put("barcode", barcode);
             json.put("weight", weight);
             json.put("material_code",material_code);
+            json.put("product_code",product_code);
             json.put("create_mode", "2");
             json.put("is_auto_issue", "0");
             json.put("type", "5");