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

信息缺失修复

Browse Source
This commit is contained in:
zhangjiangwei
2023-03-14 20:53:56 +08:00
parent fc9dd6a476
commit 6b23c87f1e
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -707,9 +707,10 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
case 6: case 6:
//码垛完成 //码垛完成
if (!requireSucess) { if (!requireSucess) {
if (applyEmpty()) { applyEmpty();
palletizing(); }
} if (resultSucess) {
palletizing();
} }
break; break;
case 7: case 7:
@@ -1138,7 +1139,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
JSONObject jsonObject = JSONObject.parseObject(result.body()); JSONObject jsonObject = JSONObject.parseObject(result.body());
if ("200".equals(jsonObject.getString("status"))) { if ("200".equals(jsonObject.getString("status"))) {
this.writing(this.mode); this.writing(this.mode);
this.setRequireSucess(true); this.setResultSucess(false);
} }
} }
result.close(); result.close();

9
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java
View File

@@ -729,9 +729,10 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
case 6: case 6:
//码垛完成 //码垛完成
if (!requireSucess) { if (!requireSucess) {
if (applyEmpty()) { applyEmpty();
palletizing(); }
} if (resultSucess) {
palletizing();
} }
break; break;
case 7: case 7:
@@ -1372,7 +1373,7 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
JSONObject jsonObject = JSONObject.parseObject(result.body()); JSONObject jsonObject = JSONObject.parseObject(result.body());
if ("200".equals(jsonObject.getString("status"))) { if ("200".equals(jsonObject.getString("status"))) {
this.writing(this.mode); this.writing(this.mode);
this.setRequireSucess(true); this.setResultSucess(false);
} }
} }
result.close(); result.close();

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

@@ -476,19 +476,19 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
} else { } else {
throw new BadRequestException("未找到指令号'" + task_id); throw new BadRequestException("未找到指令号'" + task_id);
} }
if ("RYSMW01".equals(device_code)) { //将之前的托盘信息删除
//将之前的托盘信息删除
// groupTable.delete("vehicle_code='" + vehicle_code + "' and task_id <>'" + task_id + "'"); // groupTable.delete("vehicle_code='" + vehicle_code + "' and task_id <>'" + task_id + "'");
JSONObject groupObj = groupTable.query("task_id='" + task_id + "'").uniqueResult(0); JSONObject groupObj = groupTable.query("task_id='" + task_id + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(groupObj)) { // 根据任务标识查询组盘，如果不存在表示已经走过下面的反向组盘过程，如果存在则需要走一遍反向组盘过程
throw new BadRequestException("未找到指令号为'" + task_id + "'的组盘信息！"); if (ObjectUtil.isNotEmpty(groupObj)) {
} groupObj.put("task_id", "");
groupObj.put("vehicle_code", vehicle_code); groupObj.put("vehicle_code", vehicle_code);
groupObj.put("update_optid", SecurityUtils.getCurrentUserId()); groupObj.put("update_optid", SecurityUtils.getCurrentUserId());
groupObj.put("update_optname", SecurityUtils.getNickName()); groupObj.put("update_optname", SecurityUtils.getNickName());
groupObj.put("update_time", DateUtil.now()); groupObj.put("update_time", DateUtil.now());
groupTable.update(groupObj); groupTable.update(groupObj);
} }
//更新入库单单据的托盘条码 //更新入库单单据的托盘条码
WQLObject iosTable = WQLObject.getWQLObject("ST_IVT_workProcedureIOS"); WQLObject iosTable = WQLObject.getWQLObject("ST_IVT_workProcedureIOS");
JSONObject iosObj = iosTable.query("task_id ='" + task_id + "'").uniqueResult(0); JSONObject iosObj = iosTable.query("task_id ='" + task_id + "'").uniqueResult(0);