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

更新

Browse Source
This commit is contained in:
loujf
2022-10-23 20:43:02 +08:00
parent 288560a9e5
commit 913cf0d696
8 changed files with 81 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,6 +141,9 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
container_type = itemProtocol.getContainer_type();
if (mode != last_mode) {
this.setRequireSucess(false);
if (last_mode == 11) {
this.writing(0);
}
logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode));
logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode);
}
@@ -248,12 +251,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
break;
case 6:
//申请入库
if (!requireSucess && this.move != 0) {
if (!requireSucess && this.move != 0 && barcode != 0) {
putStorage("1");
}
break;
case 7:
//申请入窑输送任务
//申请入送线
if (!requireSucess && this.move != 0 && barcode != 0) {
intoKiln();
}
@@ -275,6 +278,11 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
if (!requireSucess && this.move != 0) {
putStorage("3");
}
case 11:
//半托缓存强制去包装
if (!requireSucess && this.move != 0) {
putStorage("1");
}
break;
}

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

@@ -369,7 +369,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
rljnPackagePalletSplitManipulatorDeviceDriver.writing("to_order_No", producetask_code);
rljnPackagePalletSplitManipulatorDeviceDriver.writing("to_order_qty", qty);
rljnPackagePalletSplitManipulatorDeviceDriver.writing("to_material_code", material_code);
rljnPackagePalletSplitManipulatorDeviceDriver.writing("to_material_type", vehicle_type);
rljnPackagePalletSplitManipulatorDeviceDriver.writing("to_product_code", product_code);
rljnPackagePalletSplitManipulatorDeviceDriver.writing("to_AlongSide", AlongSide);
rljnPackagePalletSplitManipulatorDeviceDriver.writing("to_BshortSide", BshortSide);
rljnPackagePalletSplitManipulatorDeviceDriver.writing("to_Htrapezoidal", Htrapezoidal);
rljnPackagePalletSplitManipulatorDeviceDriver.writing("to_Wthickness", Wthickness);
rljnPackagePalletSplitManipulatorDeviceDriver.writing(3);
is_flag = true;
}