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-15 17:10:26 +08:00
parent e234b8782c
commit d58e8f6b41
5 changed files with 253 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -479,7 +479,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
//将之前的托盘信息删除
// groupTable.delete("vehicle_code='" + vehicle_code + "' and task_id <>'" + task_id + "'");
// 如果是送料任务需要反向组盘
if (SendMaterialTask.class.getName().equals(taskobj.getString("handle_class"))) {
String handle_class = taskobj.getString("handle_class");
if (SendMaterialTask.class.getName().equals(handle_class) || ToConveyorTask.class.getName().equals(handle_class)) {
JSONObject groupObj = groupTable.query("task_id='" + task_id + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(groupObj)) {
groupObj.put("vehicle_code", vehicle_code);
@@ -898,6 +899,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
public Map<String, Object> queryCribbingInfo(Map jsonObject) {
log.debug("ACS的queryCribbingInfo请求参数为:" + jsonObject);
String device_code = (String) jsonObject.get("device_code");
JSONObject task = WQLObject
.getWQLObject("sch_base_task")
.query("is_delete = '0' AND task_status <> '07' AND next_point_code = '" + device_code + "'")
.uniqueResult(0);
if (ObjectUtil.isNotEmpty(task)) {
throw new BadRequestException("当前点位有空托任务未完成！");
}
WQLObject pointTable = WQLObject.getWQLObject("sch_base_point");
JSONObject produceInfoByCode = this.getProduceInfoByCode(device_code);
//根据点位获取排产单
@@ -914,7 +922,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
//从组盘表里面去获取
result = group_table.query("vehicle_code = '" + vehicle_code + "'").uniqueResult(0);
}
return result;
JSONObject resultJSON = new JSONObject();
resultJSON.put("content", result);
resultJSON.put("status", HttpStatus.OK.value());
resultJSON.put("message", "托盘信息反馈成功");
return resultJSON;
}

8
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java
View File

@@ -91,6 +91,10 @@ public class SendEmptyVehicleTask extends AbstractAcsTask {
startPointObj.put("vehicle_code", "");
pointTab.update(startPointObj);
taskTab.update(jsonTask);
//将组盘表删除
WQLObject.getWQLObject("st_buss_vehiclegroup")
.delete("vehicle_code = '" + vehicle_code + "'");
}
}
@@ -198,10 +202,6 @@ public class SendEmptyVehicleTask extends AbstractAcsTask {
taskObj.put("is_delete", "0");
taskTable.insert(taskObj);
//将组盘表删除
WQLObject.getWQLObject("st_buss_vehiclegroup")
.delete("vehicle_code = '" + vehicle_code + "'");
return task_id;
}