From da39877815a75090f705d1db4f95ff5462659ec1 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 20 Jun 2025 09:52:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=A8=E9=83=A8=E5=88=86=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/st/outbill/rest/CheckOutBillController.java | 13 +++++++++++++ .../wms/st/outbill/service/CheckOutBillService.java | 3 +++ .../service/impl/CheckOutBillServiceImpl.java | 12 ++++++++++++ 3 files changed, 28 insertions(+) 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 23b9e06..fc936d5 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 @@ -2,6 +2,7 @@ package org.nl.wms.st.outbill.rest; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; +import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvOutService; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -17,6 +18,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Map; /** * 出库单管理 @@ -72,4 +74,15 @@ public class CheckOutBillController { public ResponseEntity getInvTypes() { return new ResponseEntity<>(dictService.getInvTypes(), HttpStatus.OK); } + @GetMapping("/getOutBillDis2") + @Log("查询未出库单分配") + public ResponseEntity getOutBillDis2(@RequestParam Map whereJson) { + return new ResponseEntity<>(checkOutBillService.getOutBillDis2(whereJson), HttpStatus.OK); + } + @PostMapping("/allDiv") + @Log("出库单全部分配") + public ResponseEntity allDiv(@RequestBody JSONObject whereJson) { + iStIvtIostorinvOutService.allDiv(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } } 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 257ada2..4311b38 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 @@ -14,6 +14,7 @@ import org.nl.wms.st.outbill.service.vo.OutBillTaskVo; import org.nl.wms.st.outbill.service.vo.StockMaterialVo; import java.util.List; +import java.util.Map; /** * @Author: lyd @@ -50,4 +51,6 @@ public interface CheckOutBillService { * @return */ JSONArray queryBox(JSONObject whereJson); + + JSONArray getOutBillDis2(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 64149a8..0183181 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 @@ -29,8 +29,10 @@ import org.nl.wms.stat.service.vo.PastStructPageVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Map; /** * @Author: lyd @@ -125,4 +127,14 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { } return array; } + + @Override + public JSONArray getOutBillDis2(Map whereJson) { + whereJson.put("flag", "52"); + JSONArray jo = WQL.getWO("QST_IVT_CHECKOUTBILL") + .addParamMap((HashMap) whereJson) + .process() + .getResultJSONArray(0); + return jo; + } }