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

Merge branch 'b_lms' into master_merge

Browse Source
This commit is contained in:
liuxy
2024-06-21 10:24:13 +08:00
parent 1ae9b12cdc cbfec25a9f
commit b8620f0973
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java
View File

@@ -379,7 +379,7 @@ public class SendOutManageServiceImpl implements SendOutManageService {
} }
@Override @Override
public void createSendOutTaskTwo(JSONObject whereJson) { public String createSendOutTaskTwo(JSONObject whereJson) {
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); WQLObject pointTab = WQLObject.getWQLObject("sch_base_point");
@@ -448,13 +448,13 @@ public class SendOutManageServiceImpl implements SendOutManageService {
} }
} }
//创建任务 // 更新当前点位终点
JSONObject task_jo = new JSONObject(); taskJson.put("point_code2", point_code4);
task_jo.put("point_code1", taskJson.getString("point_code2")); taskJson.put("point_code4", "");
task_jo.put("point_code2", point_code4); taskTab.update(taskJson);
task_jo.put("vehicle_code", taskJson.getString("vehicle_code"));
task_jo.put("task_type", "010721"); // 返回点位
TwoSendOutTask taskBean = new TwoSendOutTask(); return point_code4;
taskBean.createTask(task_jo);
} }
} }

3
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/SendOutManageService.java
View File

@@ -36,7 +36,8 @@ public interface SendOutManageService {
* @param whereJson { * @param whereJson {
* task_code：任务号（第一次申请时下发的任务号） * task_code：任务号（第一次申请时下发的任务号）
* } * }
* @return 新点位
*/ */
void createSendOutTaskTwo(JSONObject whereJson); String createSendOutTaskTwo(JSONObject whereJson);
} }

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

@@ -2003,7 +2003,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
sendOutManageService.createSendOutTaskOne(whereJson); sendOutManageService.createSendOutTaskOne(whereJson);
} else { } else {
// 第二次申请 // 第二次申请
sendOutManageService.createSendOutTaskTwo(whereJson); String point_code = sendOutManageService.createSendOutTaskTwo(whereJson);
result.put("data", point_code);
} }
result.put("status", HttpStatus.OK.value()); result.put("status", HttpStatus.OK.value());
result.put("message", "下发成功!"); result.put("message", "下发成功!");