更新测试问题

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/ItemProtocol.java

@@ -76,8 +76,8 @@ public class ItemProtocol {
         return this.getOpcStringValue(item_material);
     }
 
-    public int getOrder_No() {
+    public String getOrder_No() {
-        return this.getOpcIntegerValue(item_order_No);
+        return this.getOpcStringValue(item_order_No);
     }
 
     public int getMix_num() {

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java

@@ -103,8 +103,8 @@ public class LnshMixingMillDeviceDriver extends AbstractOpcDeviceDriver implemen
     int last_error_time = 0;
     int weight = 0;
     int last_weight = 0;
-    int order_No = 0;
+    String order_No = "0";
-    int last_order_No = 0;
+    String last_order_No = "0";
     int mix_num = 0;
     int last_mix_num = 0;
     String material;
@@ -171,7 +171,7 @@ public class LnshMixingMillDeviceDriver extends AbstractOpcDeviceDriver implemen
                 logServer.deviceLog(this.device_code,"material" ,String.valueOf(material));
                 logServer.deviceLogToacs(this.device_code,"","","信号material：" + last_material + "->" + material);
             }
-            if (order_No != last_order_No) {
+            if (StrUtil.equals(order_No,last_order_No)) {
                 logServer.deviceLog(this.device_code,"order_No" ,String.valueOf(order_No));
                 logServer.deviceLogToacs(this.device_code,"","","信号order_No：" + last_order_No + "->" + order_No);
             }
@@ -213,24 +213,24 @@ public class LnshMixingMillDeviceDriver extends AbstractOpcDeviceDriver implemen
                     break;
                 case 3:
                     //排产单确认
-                    if (!requireSucess && order_No != 0) {
+                    if (!requireSucess && !StrUtil.equals(order_No,"0")) {
                         JSONObject json = new JSONObject();
                         json.put("producetask_code",order_No);
                         json.put("device_code",this.device_code);
                         json.put("material_code",material);
-                        json.put("weight",weight);
+                        json.put("qty",weight);
                         json.put("type","1");
                         enterProduction(json);
                     }
                     break;
                 case 4:
                     //工单完成
-                    if (!requireSucess && order_No != 0) {
+                    if (!requireSucess && !StrUtil.equals(order_No,"0")) {
                         JSONObject json = new JSONObject();
                         json.put("producetask_code",order_No);
                         json.put("device_code",this.device_code);
                         json.put("material_code",material);
-                        json.put("weight",weight);
+                        json.put("qty",weight);
                         json.put("type","2");
                         enterProduction(json);
                     }
@@ -284,8 +284,8 @@ public class LnshMixingMillDeviceDriver extends AbstractOpcDeviceDriver implemen
                     dto.setOrder_status("0");
                 }
                 produceshiftorderService.update(dto);
-            }
                 requireSucess = true;
+            }
             return true;
         }
     }

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java

@@ -318,9 +318,9 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json);
             if (result.getStatus() == 200) {
                 this.writing(this.mode);
+                requireSucess = true;
             }
 
-            requireSucess = true;
             return true;
         }
     }

acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java

@@ -272,7 +272,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
             JSONObject json = orders.getJSONObject(i);
             String producetask_code = json.getString("producetask_code");
             String device_code = json.getString("device_code");
-            String product_code = json.getString("product_code");
             String material_code = json.getString("material_code");
             String material_name = json.getString("material_name");
             String cust_code = json.getString("cust_code");
@@ -336,8 +335,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
             //下发成功后，写入工单信息表记录
             if (is_flag) {
                 ProduceshiftorderDto dto = new ProduceshiftorderDto();
+                dto.setDevice_code(device_code);
                 dto.setOrder_code(producetask_code);
-                dto.setProduct_code(product_code);
                 dto.setOrder_status("1");
                 dto.setMaterial_code(material_code);
                 dto.setMaterial_name(material_name);

acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/wql/QPRODUCESHIFTORDER.wql

@@ -71,6 +71,7 @@
                     	AND dtl.NAME = 'order_status'
             WHERE
                  prod.is_deleted = '0'
+                 and prod.order_status != '2'
             OPTION 输入.order_code <> ""
                             prod.order_code like 输入.order_code
                          ENDOPTION