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-09 17:54:54 +08:00
parent 528e0d1a65
commit 71e80aefbb
11 changed files with 57 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -494,7 +494,7 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
json.put("unqualified_qty",unqualified_qty);
json.put("batch",batch);
json.put("producetask_code",order_No);
json.put("is_full","1");
json.put("is_full","0");
HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json);
if (ObjectUtil.isNotEmpty(result)) {
JSONObject jsonObject = JSONObject.parseObject(result.body());

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

@@ -271,7 +271,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
}
if (!StrUtil.isEmpty(dto.getVehicle_code())) {
Instruction inst_dto = this.findByContainer(dto.getVehicle_code());
if (ObjectUtils.isNotEmpty(inst_dto) && !StrUtil.equals(inst_dto.getTask_id(), dto.getTask_id())) {
if (ObjectUtils.isNotEmpty(inst_dto) && !StrUtil.equals(inst_dto.getTask_id(), dto.getTask_id())
&& !StrUtil.equals(dto.getVehicle_code(), "999") && !StrUtil.equals(dto.getVehicle_code(), "0000")) {
throw new WDKException("已存在该载具号的指令!");
}
}

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

@@ -290,7 +290,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
dto = foramte(dto);
if (!StrUtil.isEmpty(dto.getVehicle_code())) {
TaskDto vehicle_dto = this.findByContainer(dto.getVehicle_code());
if (vehicle_dto != null) {
if (vehicle_dto != null && !StrUtil.equals(dto.getVehicle_code(), "999") && !StrUtil.equals(dto.getVehicle_code(), "0000")) {
throw new WDKException("已存在该载具号的任务!");
}
}