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

rev: 移库修改

Browse Source
This commit is contained in:
liuxy
2023-05-24 13:48:15 +08:00
parent 6448cd9a18
commit 697df0c844
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java
View File

@@ -429,7 +429,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
throw new BadRequestException(row.getString("turnin_struct_code") + "仓位数据异常，找不到对应点位！");
}
//判断是否已生成过了任务，无未生成则插入任务
JSONObject task = wo_Task.query("is_delete = '0' and task_status='04' and point_code1='" + jo.getString("start_point_code") + "'").uniqueResult(0);
JSONObject task = wo_Task.query("is_delete = '0' and task_status<'05' and point_code1='" + jo.getString("start_point_code") + "'").uniqueResult(0);
if (task != null) {
jo.put("task_id", task.getString("task_id"));
} else {
@@ -442,7 +442,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
task.put("task_code", task_code);
task.put("task_type", "010505");
task.put("acs_task_type", "7");
task.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
task.put("task_status", TaskStatusEnum.SURE_START.getCode());
task.put("point_code1", jo.getString("start_point_code"));
task.put("point_code2", point.getString("point_code"));
task.put("vehicle_code", jo.getString("storagevehicle_code"));
@@ -1180,8 +1180,11 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
this.isBlock(jsonAttr);
}
JSONObject result = handMoveStorAcsTask.immediateNotifyAcs(task_id);
JSONObject task = wo_Task.query("task_id='" + task_id + "'").uniqueResult(0);
task.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
wo_Task.update(task);
JSONObject result = handMoveStorAcsTask.immediateNotifyAcs(task_id);
if (ObjectUtil.isNotEmpty(result)) {
String status = result.getString("status");
if ("200".equals(status)) {
@@ -1473,9 +1476,6 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
moveParam.put("is_move", "1");
moveParam.put("task_group_id", IdUtil.getSnowflake(1,1).nextId());
bean.createMove(moveParam,null);
// 下发移库任务组
handMoveStorAcsTask.immediateNotifyAcs(null);
}
return jsonLockArr.size();

2
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/EmpMoveTask.java
View File

@@ -50,6 +50,8 @@ public class EmpMoveTask extends AbstractAcsTask {
.remark(json.getString("remark"))
.build();
resultList.add(dto);
json.put("task_status", TaskStatusEnum.ISSUE.getCode());
WQLObject.getWQLObject("SCH_BASE_Task").update(json);
}
return resultList;
}

4
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java
View File

@@ -32,7 +32,7 @@ public class HandMoveStorAcsTask extends AbstractAcsTask {
/*
* 下发给ACS时需要特殊处理
*/
JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0);
JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0' order by create_time").getResultJSONArray(0);
ArrayList<AcsTaskDto> resultList = new ArrayList<>();
for (int i = 0; i < arr.size(); i++) {
@@ -61,6 +61,8 @@ public class HandMoveStorAcsTask extends AbstractAcsTask {
.remark(json.getString("remark"))
.build();
resultList.add(dto);
json.put("task_status", TaskStatusEnum.ISSUE.getCode());
WQLObject.getWQLObject("SCH_BASE_Task").update(json);
}
return resultList;
}

7
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql
View File

@@ -317,7 +317,8 @@
IF 输入.flag = "4"
QUERY
SELECT
DISTINCT(task.task_id)
DISTINCT(task.task_id),
dtl.turnout_struct_code AS turnout_struct_code
FROM
ST_IVT_MoveInvDtl dtl
INNER JOIN ST_IVT_MoveInv mst ON mst.moveinv_id = dtl.moveinv_id
@@ -326,12 +327,14 @@
1 = 1
AND mst.bill_status = '10'
AND dtl.work_status = '01'
AND task.task_status = '04'
AND task.task_status < '05'
AND mst.is_delete = '0'
AND task.is_delete = '0'
OPTION 输入.moveinv_id <> ""
dtl.moveinv_id = 输入.moveinv_id
ENDOPTION
order by turnout_struct_code DESC
ENDSELECT
ENDQUERY
ENDIF