diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvOutService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvOutService.java index 3dfa90d..4b0c602 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvOutService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvOutService.java @@ -1,6 +1,7 @@ package org.nl.b_lms.storage_manage.ios.service.iostorInv; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinv; @@ -81,7 +82,6 @@ public interface IStIvtIostorinvOutService extends IService { */ void allDiv(JSONObject whereJson); - /** * 手工分配 * @param whereJson:{ diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java index fc936d5..906376b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java @@ -85,4 +85,9 @@ public class CheckOutBillController { iStIvtIostorinvOutService.allDiv(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } + @GetMapping("/getOutBillTask") + @Log("查询出库单分配任务") + public ResponseEntity getOutBillTask(@RequestParam Map whereJson) { + return new ResponseEntity<>(checkOutBillService.getOutBillTask(whereJson), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/CheckOutBillService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/CheckOutBillService.java index 4311b38..cddae02 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/CheckOutBillService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/CheckOutBillService.java @@ -53,4 +53,12 @@ public interface CheckOutBillService { JSONArray queryBox(JSONObject whereJson); JSONArray getOutBillDis2(Map whereJson); + + /** + * 查询出库单分配任务 + * + * @param whereJson / + * @return + */ + JSONArray getOutBillTask(Map whereJson); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index 0183181..d0d1e3a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -137,4 +137,20 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { .getResultJSONArray(0); return jo; } + @Override + public JSONArray getOutBillTask(Map whereJson) { + HashMap map = new HashMap<>(whereJson); + map.put("flag", "10"); + if ("true".equals(map.get("checked"))) { + map.put("task_status", "99"); + } + JSONArray jo = new JSONArray(); + if (map.containsKey("iostorinvdtl_id")) { + jo = WQL.getWO("QST_IVT_CHECKOUTBILL") + .addParamMap(map) + .process() + .getResultJSONArray(0); + } + return jo; + } }