root/rongLiHongFeng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

排产单更新

Browse Source
This commit is contained in:
张江玮
2022-12-17 14:37:05 +08:00
parent c09bd74254
commit 575472fca6
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java
View File

@@ -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;

6
acs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
View File

@@ -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);