From 79925662a90ae37f100386732993fa3a40667256 Mon Sep 17 00:00:00 2001 From: zhaoyf <1783123481@qq.com> Date: Sun, 2 Aug 2026 15:15:25 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=89=8B=E5=8A=A8=E6=8E=A8?= =?UTF-8?q?=E4=B8=AD=E9=BC=8E=EF=BC=8C=E5=87=BA=E5=BA=93=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=94=B9=E4=B8=BA=E5=87=BA=E5=BA=93=E6=95=B0?= =?UTF-8?q?=E9=87=8F=20opt:=E5=87=BA=E5=BA=93=E5=8D=95=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/controller/PurchaseController.java | 10 ++++++++-- .../src/views/wms/pm_manage/allocationIn/index.vue | 3 +++ .../src/views/wms/pm_manage/allocationOut/index.vue | 5 ++++- nladmin-ui/src/views/wms/pm_manage/otherIn/index.vue | 3 +++ nladmin-ui/src/views/wms/pm_manage/otherOut/index.vue | 5 ++++- nladmin-ui/src/views/wms/pm_manage/returnIn/index.vue | 3 +++ nladmin-ui/src/views/wms/pm_manage/saleOut/index.vue | 5 ++++- nladmin-ui/src/views/wms/st/outbill/index.vue | 3 ++- 8 files changed, 31 insertions(+), 6 deletions(-) diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/purchase/controller/PurchaseController.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/purchase/controller/PurchaseController.java index 1fb3505..5571ee0 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/purchase/controller/PurchaseController.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/purchase/controller/PurchaseController.java @@ -7,10 +7,12 @@ import org.nl.common.logging.annotation.Log; import org.nl.wms.ext_manage.purchase.service.dto.BillChangeDto; import org.nl.wms.ext_manage.service.WmsToZDWmdService; import org.nl.wms.pm_manage.purchase.service.PurchaseService; +import org.nl.wms.pm_manage.purchase.service.dao.Purchasemst; import org.nl.wms.pm_manage.purchase.service.dto.PurchaseDto; +import org.nl.wms.pm_manage.purchase.service.enums.PurchaseBillStatus; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity;import org.nl.common.base.ResponseData; +import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -79,7 +81,11 @@ public class PurchaseController { @PostMapping("/pushZD") @Log("出入库单推中鼎") public ResponseEntity pushZD(@RequestBody BillChangeDto billChangeDto){ - return wmsToZDWmdService.syncPurchaseReceiving(billChangeDto); + wmsToZDWmdService.syncPurchaseReceiving(billChangeDto); + purchaseService.lambdaUpdate() + .set(Purchasemst::getBill_status, PurchaseBillStatus.COMPLETED.getCode()) + .eq(Purchasemst::getBill_id, billChangeDto.getBillid()); + return ResponseData.build(); } @PostMapping("/outPush") @Log("下推出库单") diff --git a/nladmin-ui/src/views/wms/pm_manage/allocationIn/index.vue b/nladmin-ui/src/views/wms/pm_manage/allocationIn/index.vue index ea27004..c028196 100644 --- a/nladmin-ui/src/views/wms/pm_manage/allocationIn/index.vue +++ b/nladmin-ui/src/views/wms/pm_manage/allocationIn/index.vue @@ -243,6 +243,9 @@ export default { orderType: row.order_type, red: row.red, status: row.status + }).then(res => { + this.crud.notify(res.respMsg) + this.crud.init() }) }, toView(index, row) { this.mstrow = row diff --git a/nladmin-ui/src/views/wms/pm_manage/allocationOut/index.vue b/nladmin-ui/src/views/wms/pm_manage/allocationOut/index.vue index 326ddb6..3789fe9 100644 --- a/nladmin-ui/src/views/wms/pm_manage/allocationOut/index.vue +++ b/nladmin-ui/src/views/wms/pm_manage/allocationOut/index.vue @@ -51,7 +51,7 @@ - +