From b7e0c2b771c884b5fa7a208380b304ad61397bc1 Mon Sep 17 00:00:00 2001 From: zhaoyf <1783123481@qq.com> Date: Wed, 5 Aug 2026 19:30:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=87=8D=E6=96=B0=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=EF=BC=8C=E6=8C=89Sn=E5=8F=B7=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PmDemandServiceImpl.java | 6 ++ .../ReceiveOutReturnController.java | 4 +- .../dto/ReceiveOutReturnQuery.java | 4 ++ .../impl/ReceiveOutReturnServiceImpl.java | 6 ++ .../wms/pm_manage/receiveOutReturn/index.vue | 60 ++++++++++++++++--- 5 files changed, 70 insertions(+), 10 deletions(-) diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/impl/PmDemandServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/impl/PmDemandServiceImpl.java index aff7f29..6995c59 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/impl/PmDemandServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/impl/PmDemandServiceImpl.java @@ -122,6 +122,9 @@ public class PmDemandServiceImpl extends ServiceImpl i throw new BadRequestException("MES推送需求单失败，需求单已存在"); } for (PmDemandParam pmDemandParam : param) { + if (Objects.equals(pmDemandParam.getStatus(), "1")){ + pmDemandParam.setStatus(DemandStatus.CANCEL.getValue()); + } this.create(pmDemandParam); } } @@ -173,6 +176,9 @@ public class PmDemandServiceImpl extends ServiceImpl i if (demand == null) { throw new BadRequestException("需求单不存在"); } + if (Objects.equals(demand.getStatus(), DemandStatus.FINISH.getValue())){ + throw new BadRequestException("单据已完成不允许分配"); + } demand.setInventory_dis(inventoryDis); demand.setStatus(DemandStatus.DIS.getValue()); this.updateById(demand); diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/controller/ReceiveOutReturnController.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/controller/ReceiveOutReturnController.java index e3842d8..f3f0e4e 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/controller/ReceiveOutReturnController.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/controller/ReceiveOutReturnController.java @@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.Arrays; -import java.util.HashSet; import java.util.List; import java.util.Set; @@ -151,7 +150,8 @@ public class ReceiveOutReturnController { } @PostMapping("/reSubmit") - public ResponseEntity reSubmit(HashSet ids){ + @Log("重新提交报工") + public ResponseEntity reSubmit(@RequestBody Set ids){ receiveOutReturnService.reSubmit(ids); return ResponseData.build(); } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/dto/ReceiveOutReturnQuery.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/dto/ReceiveOutReturnQuery.java index a04fccc..3ffe810 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/dto/ReceiveOutReturnQuery.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/dto/ReceiveOutReturnQuery.java @@ -2,12 +2,16 @@ package org.nl.wms.warehouse_manage.stockReturn.receiveOutRetur.dto; import lombok.Data; +import java.util.List; + @Data public class ReceiveOutReturnQuery { private String billno; private String orgno; + private String sn; private String status; private String requestId; private String beginTime; private String endTime; + private List workArea; } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/impl/ReceiveOutReturnServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/impl/ReceiveOutReturnServiceImpl.java index 4e216f1..f0c0db5 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/impl/ReceiveOutReturnServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/impl/ReceiveOutReturnServiceImpl.java @@ -109,6 +109,12 @@ public class ReceiveOutReturnServiceImpl extends ServiceImpl + + + + + - - - - @@ -115,23 +127,35 @@ - + {{ currentRow.billno }} {{ currentRow.sn }} + {{ currentRow.workArea }} {{ currentRow.trackNo }} + {{ currentRow.comment }} {{ statusLabel(currentRow.status) }} - {{ currentRow.remark }} + + {{ currentRow.remark }} {{ currentRow.orgno }} + {{ currentRow.biztype }} {{ currentRow.invscheme }} + {{ currentRow.transtype }} {{ currentRow.biztime }} + {{ currentRow.createTime }} {{ currentRow.updateTime }} - {{ currentRow.requestId }} - {{ currentRow.reportParam }} + + {{ currentRow.requestId }} + {{ currentRow.reportParam }}
@@ -214,6 +238,7 @@ const createDefaultForm = () => ({ export default { name: 'ReceiveOutReturn', + dicts: ['work_code'], components: { crudOperation, rrOperation, udOperation, pagination }, mixins: [presenter(), header(), form(createDefaultForm()), crud()], cruds() { @@ -278,6 +303,7 @@ export default { }, methods: { [CRUD.HOOK.beforeRefresh]() { + console.log(this.query.workArea) if (this.query.dateRange) { this.query.beginTime = this.query.dateRange[0] this.query.endTime = this.query.dateRange[1] || this.query.dateRange[0] @@ -467,4 +493,22 @@ export default {