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-08-20 16:37:30 +08:00
parent e395d856c7
commit 2d60244b82
6 changed files with 56 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java
View File

@@ -1318,6 +1318,10 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
mode = "码垛强制完成";
} else if (this.getMode() == 8) {
mode = "申请空盘";
} else if (this.getMode() == 9) {
mode = "工单完成";
} else if (this.getMode() == 11) {
mode = "强制去包装";
}
if (this.getStatus() == 1) {

25
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java
View File

@@ -440,10 +440,10 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
} else {
this.instruction_require_time = date;
JSONObject json = new JSONObject();
String linkobj = (String)this.getDevice().getExtraValue().get("link_device_code");
String demosub = linkobj.substring(1,linkobj.length()-1);
String demoArray[] = demosub.split(",");
List<String> demoList = Arrays.asList(demoArray);
// String linkobj = (String)this.getDevice().getExtraValue().get("link_device_code");
// String demosub = linkobj.substring(1,linkobj.length()-1);
// String demoArray[] = demosub.split(",");
// List<String> demoList = Arrays.asList(demoArray);
json.put("device_code",this.device_code);
json.put("material_code",material);
json.put("qty",encoder_qty);
@@ -475,10 +475,10 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
} else {
this.instruction_require_time = date;
JSONObject json = new JSONObject();
String linkobj = (String)this.getDevice().getExtraValue().get("link_device_code");
String demosub = linkobj.substring(1,linkobj.length()-1);
String demoArray[] = demosub.split(",");
List<String> demoList = Arrays.asList(demoArray);
// String linkobj = (String)this.getDevice().getExtraValue().get("link_device_code");
// String demosub = linkobj.substring(1,linkobj.length()-1);
// String demoArray[] = demosub.split(",");
// List<String> demoList = Arrays.asList(demoArray);
json.put("device_code",this.device_code);
json.put("material_code",material);
json.put("qty",encoder_qty);
@@ -515,6 +515,7 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
json.put("type","1");
json.put("material_code",material);
json.put("vehicle_code",barcode);
json.put("qty",encoder_qty);
json.put("is_full","1");
HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json);
if (ObjectUtil.isNotEmpty(result)) {
@@ -635,11 +636,17 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
} else if (this.getMode() == 2) {
mode = "联机";
} else if (this.getMode() == 4) {
mode = "叫料";
mode = "人工排产确认";
} else if (this.getMode() == 5) {
mode = "申请空盘";
} else if (this.getMode() == 6) {
mode = "申请入库";
} else if (this.getMode() == 7) {
mode = "码垛完成";
} else if (this.getMode() == 8) {
mode = "码垛强制完成";
} else if (this.getMode() == 9) {
mode = "工单完成";
}
if (this.getAction() == 0) {

10
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java
View File

@@ -1052,12 +1052,14 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im
mode = "联机";
} else if (this.getMode() == 3) {
mode = "工作中";
} else if (this.getMode() == 4) {
mode = "工单确认";
} else if (this.getMode() == 5) {
mode = "获取托盘信息";
mode = "叫料出库";
} else if (this.getMode() == 6) {
mode = "拆垛完成";
} else if (this.getMode() == 7) {
mode = "申请空盘";
mode = "申请空盘入库";
} else if (this.getMode() == 9) {
mode = "工单完成";
}
String onoff_status = "";

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

@@ -244,7 +244,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
break;
case 8:
//申请入窑
if(move ==1 && !requireSucess && StrUtil.isNotEmpty(this.barcode) && StrUtil.equals(this.getDevice().getExtraValue().get("apply_task").toString(),"true")){
if(move == 1 && !requireSucess && StrUtil.isNotEmpty(this.barcode) && StrUtil.equals(this.getDevice().getExtraValue().get("apply_task").toString(),"true")){
applyIn();
}
break;
@@ -340,7 +340,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
}
/**
* 申请入窑
* 申请入窑输送任务
*
* @param
*/
@@ -483,7 +483,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
}
/**
* 申请入库
* 申请入窑
*
* @param
*/
@@ -681,6 +681,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
mode = "申请空盘";
} else if (this.getMode() == 6) {
mode = "申请入库";
} else if (this.getMode() == 7) {
mode = "入窑输送任务";
} else if (this.getMode() == 8) {
mode = "申请入窑";
} else if (this.getMode() == 9) {
mode = "申请出窑";
}
if (this.getAction() == 0) {

3
acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -939,6 +939,9 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
instdto.setVehicle_type(vehicleType);
instructionservice.create(instdto);
acsTask.setTask_status("1");
this.update(acsTask);
}
@Override