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

代码更新

Browse Source
This commit is contained in:
liuxy
2023-02-19 21:04:57 +08:00
parent 9b3909ad96
commit 4289789946
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java
View File

@@ -73,6 +73,8 @@ public class SendOutTask extends AbstractAcsTask {
JSONObject jsonPoint2 = pointTab.query("point_code = '" + jsonTask.getString("point_code2") + "'").uniqueResult(0); JSONObject jsonPoint2 = pointTab.query("point_code = '" + jsonTask.getString("point_code2") + "'").uniqueResult(0);
jsonPoint2.put("lock_type", "1"); jsonPoint2.put("lock_type", "1");
jsonPoint2.put("vehicle_code", "");
jsonPoint2.put("point_status", "1");
pointTab.update(jsonPoint2); pointTab.update(jsonPoint2);
} }

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

@@ -292,7 +292,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
storPublicService.IOStor(jo, "31"); storPublicService.IOStor(jo, "31");
//锁定起点点位、仓位 //锁定起点点位、仓位
JSONObject from_start = new JSONObject(); JSONObject from_start = new JSONObject();
from_start.put("lock_type", "03"); from_start.put("lock_type", "6");
from_start.put("struct_id", jo.getString("turnout_struct_id")); from_start.put("struct_id", jo.getString("turnout_struct_id"));
from_start.put("inv_type", jo_mst.getString("bill_type")); from_start.put("inv_type", jo_mst.getString("bill_type"));
from_start.put("inv_id", jo_mst.getString("moveinv_id")); from_start.put("inv_id", jo_mst.getString("moveinv_id"));
@@ -303,6 +303,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
storPublicService.updateStructAndPoint(from_start); storPublicService.updateStructAndPoint(from_start);
//锁定终点点位、仓位 //锁定终点点位、仓位
from_start.put("struct_id", turnin_struct_id); from_start.put("struct_id", turnin_struct_id);
from_start.put("lock_type", "7");
storPublicService.updateStructAndPoint(from_start); storPublicService.updateStructAndPoint(from_start);
} }
ret.put("total_qty", total_qty); ret.put("total_qty", total_qty);

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

@@ -89,7 +89,7 @@ public class HandMoveStorAcsTask extends AbstractAcsTask {
if(TaskStatusEnum.EXECUTING.getCode().equals(status)){ if(TaskStatusEnum.EXECUTING.getCode().equals(status)){
map.put("work_status","02"); map.put("work_status","02");
wo_dtl.update(map,"task_id='"+task_id+"'"); wo_dtl.update(map,"task_id='"+task_id+"'");
map.put("task_status","03"); map.put("task_status",TaskStatusEnum.EXECUTING.getCode());
map.put("update_optid",currentUserId+""); map.put("update_optid",currentUserId+"");
map.put("update_optname",nickName); map.put("update_optname",nickName);
map.put("update_time",now); map.put("update_time",now);