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-11-02 21:16:25 +08:00
parent 47247cef79
commit 8ab1445ef4
5 changed files with 63 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1164,7 +1164,6 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
} else {
this.instruction_require_time = date;
JSONObject json = new JSONObject();
this.instruction_require_time = date;
String linkobj = (String)this.getDevice().getExtraValue().get("link_device_code");
String demosub = linkobj.substring(1,linkobj.length()-1);
String demoArray[] = demosub.split(",");

6
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/ItemProtocol.java
View File

@@ -40,6 +40,7 @@ public class ItemProtocol {
public static String item_to_task2 = "to_task2";
public static String item_to_onset2 = "to_onset2";
public static String item_to_target2 = "to_target2";
public static String item_to_container_type = "to_container_type";
private LnshRGVDeviceDriver driver;
@@ -159,6 +160,10 @@ public class ItemProtocol {
return this.getOpcIntegerValue(item_to_task2);
}
public int getTo_container_type() {
return this.getOpcIntegerValue(item_to_container_type);
}
//是否有货
public int hasGoods(int move) {
return move;
@@ -224,6 +229,7 @@ public class ItemProtocol {
list.add(new ItemDto(item_to_onset2, "下发起始站", "DB51.W12"));
list.add(new ItemDto(item_to_target2, "下发目标站", "DB51.W14"));
list.add(new ItemDto(item_to_task2, "下发任务号2", "DB51.D16"));
list.add(new ItemDto(item_to_container_type, "下发托盘类型", "DB51.W20"));
return list;
}

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

@@ -567,7 +567,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
json.put("type","2");
json.put("is_full","1");
HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json);
HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json);
if (ObjectUtil.isNotEmpty(result)) {
JSONObject jsonObject = JSONObject.parseObject(result.body());
if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) {
@@ -626,7 +626,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
json.put("type",type);
// json.put("material",material);
json.put("vehicle_code",this.autoGenericCode(String.valueOf(barcode)));
// json.put("is_full","1");
json.put("is_full","1");
HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json);
if (ObjectUtil.isNotEmpty(result)) {
JSONObject jsonObject = JSONObject.parseObject(result.body());