diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java index 01e205d..546e602 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java @@ -288,13 +288,13 @@ public class HfStationDeviceDriver extends AbstractOpcDeviceDriver implements De break; case 3: //人工排产确认 - if (!requireSucess && !order.equals("0")) { + if (!requireSucess && StrUtil.isNotEmpty(order)) { enterOrder(); } break; case 4: //工单完成 - if (!finishRequireSucess && !order.equals("0")) { + if (!finishRequireSucess && StrUtil.isNotEmpty(order)) { finish(); } break; @@ -302,19 +302,19 @@ public class HfStationDeviceDriver extends AbstractOpcDeviceDriver implements De break; case 6: //呼叫空盅 - if (!callEmptyRequireSucess && !order.equals("0")) { + if (!callEmptyRequireSucess && StrUtil.isNotEmpty(order)) { callEmpty(); } break; case 7: //满盅入库 - if (!fullInRequireSucess && !order.equals("0")) { + if (!fullInRequireSucess && StrUtil.isNotEmpty(order)) { fullIn(); } break; case 8: //压机叫料 - if (!callMaterialRequireSucess && !order.equals("0")) { + if (!callMaterialRequireSucess && StrUtil.isNotEmpty(order)) { callMaterial(); } break; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java index 27c2ff9..14dea09 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java @@ -137,9 +137,9 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A if (device.getDeviceDriver() instanceof HfStationDeviceDriver) { hfStationDeviceDriver = (HfStationDeviceDriver) device.getDeviceDriver(); -// hfStationDeviceDriver.writing("to_order",dto.getOrder_code()); -// hfStationDeviceDriver.writing("to_order_num",String.valueOf(dto.getQty())); -// hfStationDeviceDriver.writing("to_product_number",dto.getMaterial_code()); + hfStationDeviceDriver.writing("to_order",dto.getOrder_code()); + hfStationDeviceDriver.writing("to_order_num",String.valueOf(dto.getQty())); + hfStationDeviceDriver.writing("to_product_number",dto.getMaterial_code()); } JSONObject json = (JSONObject) JSONObject.toJSON(dto);