Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
This commit is contained in:
@@ -418,14 +418,12 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
|
||||
String task_id = IdUtil.getSnowflake(1, 1).nextId() + "";
|
||||
String task_code = IdUtil.getSnowflake(1,1).nextId();
|
||||
|
||||
task.put("taskdtl_id", task_id);
|
||||
task.put("task_id", task_id);
|
||||
task.put("task_code", task_code);
|
||||
task.put("task_type", "05");
|
||||
task.put("taskdtl_type", "07");
|
||||
task.put("task_status", "01");
|
||||
task.put("start_point_code", jo.getString("start_point_code"));
|
||||
task.put("next_point_code", point.getString("point_code"));
|
||||
task.put("task_type", "010505");
|
||||
task.put("task_status", TaskStatusEnum.START_AND_POINT.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"));
|
||||
task.put("handle_class", HandMoveStorAcsTask.class.getName());
|
||||
task.put("finished_type", "");
|
||||
@@ -460,7 +458,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
|
||||
storPublicService.IOStor(jo, "31");
|
||||
//锁定起点点位、仓位
|
||||
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("inv_type", jo_mst.getString("bill_type"));
|
||||
from_start.put("inv_id", jo_mst.getString("moveinv_id"));
|
||||
@@ -471,6 +469,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
|
||||
storPublicService.updateStructAndPoint(from_start);
|
||||
//锁定终点点位、仓位
|
||||
from_start.put("struct_id", turnin_struct_id);
|
||||
from_start.put("lock_type", "7");
|
||||
storPublicService.updateStructAndPoint(from_start);
|
||||
}
|
||||
ret.put("total_qty", total_qty);
|
||||
|
||||
Reference in New Issue
Block a user