From 0f29c9489c52895371f2463f7e773c9d2e27555c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 12 Jun 2026 11:30:23 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E5=B7=B2?= =?UTF-8?q?=E5=BC=80=E5=8D=95=E6=9C=AA=E8=BF=87=E8=B4=A6=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=92=8C=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在多个DTO和VO类中新增lockedNum字段用于存储已开单未过账数量 - 为各个出库和转移相关的服务接口添加getLockedNum方法 - 实现数据库查询逻辑，通过关联表计算sum(left)或sum(lock_num)作为锁定数量 - 在控制器层调用服务方法设置锁定数量到返回对象中 - 更新MyBatis映射文件添加相应的SQL查询语句 --- .../wms/admin/controller/OutAssistanceController.java | 8 +++++++- .../wms/admin/controller/OutCostCenterController.java | 8 +++++++- .../wms/admin/controller/OutProduceController.java | 1 + .../admin/controller/PurchaseReturnController.java | 11 +++++++++-- .../admin/controller/TransferCompanyController.java | 5 +++++ .../admin/controller/TransferFactoryController.java | 5 +++++ .../nflg/wms/common/pojo/dto/AllocationOrderDTO.java | 5 +++++ .../pojo/dto/DepartmentMaterialRequisitionDTO.java | 5 +++++ .../wms/common/pojo/dto/SubcontractedOrderDTO.java | 5 +++++ .../nflg/wms/common/pojo/dto/TransferOrderDTO.java | 5 +++++ .../com/nflg/wms/common/pojo/vo/GoodsReceiptVO.java | 5 +++++ .../java/com/nflg/wms/common/pojo/vo/QrCodeVO.java | 5 +++++ .../java/com/nflg/wms/common/pojo/vo/Zwm3a07VO.java | 5 +++++ .../repository/mapper/WmsOutAssistanceItemMapper.java | 3 +++ .../repository/mapper/WmsOutCostcenterItemMapper.java | 3 +++ .../repository/mapper/WmsOutProduceItemMapper.java | 3 +++ .../repository/mapper/WmsReturnRequestItemMapper.java | 3 +++ .../mapper/WmsTransferCompanyItemMapper.java | 3 +++ .../mapper/WmsTransferFactoryItemMapper.java | 3 +++ .../service/IWmsOutAssistanceItemService.java | 3 +++ .../service/IWmsOutCostcenterItemService.java | 3 +++ .../repository/service/IWmsOutProduceItemService.java | 3 +++ .../service/IWmsReturnRequestItemService.java | 3 +++ .../service/IWmsTransferCompanyItemService.java | 3 +++ .../service/IWmsTransferFactoryItemService.java | 3 +++ .../service/impl/WmsOutAssistanceItemServiceImpl.java | 6 ++++++ .../service/impl/WmsOutCostcenterItemServiceImpl.java | 6 ++++++ .../service/impl/WmsOutProduceItemServiceImpl.java | 6 ++++++ .../service/impl/WmsReturnRequestItemServiceImpl.java | 6 ++++++ .../impl/WmsTransferCompanyItemServiceImpl.java | 6 ++++++ .../impl/WmsTransferFactoryItemServiceImpl.java | 6 ++++++ .../resources/mapper/WmsOutAssistanceItemMapper.xml | 8 +++++++- .../resources/mapper/WmsOutCostcenterItemMapper.xml | 7 +++++++ .../main/resources/mapper/WmsOutProduceItemMapper.xml | 7 +++++++ .../resources/mapper/WmsReturnRequestItemMapper.xml | 6 ++++++ .../resources/mapper/WmsTransferCompanyItemMapper.xml | 7 +++++++ .../resources/mapper/WmsTransferFactoryItemMapper.xml | 7 +++++++ 37 files changed, 182 insertions(+), 5 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java index 1729de6d..44e87330 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java @@ -110,7 +110,13 @@ public class OutAssistanceController extends BaseController { */ @PostMapping("searchSAP") public ApiResult> searchSAP0(@Valid @RequestBody SubcontractedOrderQO request) { - return ApiResult.success(sapService.zwm3a12(request)); + List dtos = sapService.zwm3a12(request); + if (CollectionUtil.isNotEmpty(dtos)){ + dtos.forEach(dto -> { + dto.setLockedNum(outAssistanceItemService.getLockedNum(dto.getEbeln(),dto.getEbelp())); + }); + } + return ApiResult.success(dtos); } /** diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java index 74dfec58..4a48c750 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java @@ -112,7 +112,13 @@ public class OutCostCenterController extends BaseController { */ @PostMapping("searchSAP") public ApiResult> searchSAP0(@Valid @RequestBody DepartmentMaterialRequisitionQO request) { - return ApiResult.success(sapService.zwm3a13(request)); + List dtos = sapService.zwm3a13(request); + if (CollectionUtil.isNotEmpty(dtos)){ + dtos.forEach(dto -> { + dto.setLockedNum(outCostcenterItemService.getLockedNum(dto.getAufnr(),dto.getMatnr())); + }); + } + return ApiResult.success(dtos); } /** diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java index 50a579ed..2d256a32 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java @@ -136,6 +136,7 @@ public class OutProduceController extends BaseController { .findFirst() .orElse(new InventoryInDTO().setNum(BigDecimal.ZERO)).getNum()); item.setWname(wname); + item.setLockedNum(outProduceItemService.getLockedNum(item.getAufnr(),item.getMatnr())); }); }); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PurchaseReturnController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PurchaseReturnController.java index 90090ff9..885c5166 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PurchaseReturnController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PurchaseReturnController.java @@ -7,6 +7,7 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.nflg.wms.admin.pojo.dto.PdfPageDTO; import com.nflg.wms.admin.pojo.request.UpdateItemNumRequest; import com.nflg.wms.admin.service.BasdeSerialNumberControllerService; @@ -158,8 +159,13 @@ public class PurchaseReturnController extends BaseController { @PostMapping("searchPos") @ApiMark(moduleName = "获取送货单的入库信息", apiName = "获取送货单的入库信息") public ApiResult> getGoodsReceipts(@Valid @RequestBody GoodsReceiptSearchQO request) { - - return ApiResult.success(returnRequestService.getGoodsReceipts(request)); + IPage dtos = returnRequestService.getGoodsReceipts(request); + if (CollectionUtil.isNotEmpty(dtos.getRecords())){ + dtos.getRecords().forEach(dto -> { + dto.setLockedNum(returnRequestItemService.getLockedNum(dto.getPoNum(),dto.getPoLineNumber())); + }); + } + return ApiResult.success(dtos); } /** @@ -540,6 +546,7 @@ public class PurchaseReturnController extends BaseController { //判断是否为有效码 VUtil.trueThrowBusinessError(ObjectUtil.isNull(qrCodeMaster)).throwMessage("无效码"); QrCodeVO qrCodeVO = BarcodeValidation(qrCodeMaster); + qrCodeVO.setLockedNum(returnRequestItemService.getLockedNum(qrCodeVO.getPoNumber(),qrCodeVO.getPoLineNumber())); return ApiResult.success(qrCodeVO); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java index 7ef07333..b9924ef3 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java @@ -123,6 +123,11 @@ public class TransferCompanyController extends BaseController { @PostMapping("searchSAP") public ApiResult> searchSAP0(@Valid @RequestBody AllocationOrderQO request) { List datas = sapService.zwm3a15(request); + if (CollectionUtil.isNotEmpty(datas)){ + datas.forEach(dto -> { + dto.setLockedNum(transferCompanyItemService.getLockedNum(dto.getEbeln(),dto.getEbelp())); + }); + } return ApiResult.success(PageUtil.Page(datas, request.getPage(), request.getPageSize())); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java index 80736afe..f033e4e6 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java @@ -121,6 +121,11 @@ public class TransferFactoryController extends BaseController { @PostMapping("searchSAP") public ApiResult> searchSAP0(@Valid @RequestBody TransferOrderQO request) { List datas = sapService.zwm3a16(request); + if (CollectionUtil.isNotEmpty(datas)){ + datas.forEach(dto -> { + dto.setLockedNum(transferFactoryItemService.getLockedNum(dto.getAufnr(),dto.getMatnr())); + }); + } return ApiResult.success(PageUtil.Page(datas, request.getPage(), request.getPageSize())); } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/AllocationOrderDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/AllocationOrderDTO.java index 58ee0595..550471c1 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/AllocationOrderDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/AllocationOrderDTO.java @@ -168,6 +168,11 @@ public class AllocationOrderDTO{ @Positive(message = "申请数量必须大于0") private BigDecimal num; + /** + * 已开单未过账数量 + */ + private BigDecimal lockedNum; + public BigDecimal getNum() { return Objects.isNull(num) ? sqsl2 : num; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/DepartmentMaterialRequisitionDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/DepartmentMaterialRequisitionDTO.java index 5d34b573..f6b82337 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/DepartmentMaterialRequisitionDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/DepartmentMaterialRequisitionDTO.java @@ -153,6 +153,11 @@ public class DepartmentMaterialRequisitionDTO { */ private String rspos; + /** + * 已开单未过账数量 + */ + private BigDecimal lockedNum; + private String key1; public String getKey1() { diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SubcontractedOrderDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SubcontractedOrderDTO.java index b0ce4244..b29ed7f7 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SubcontractedOrderDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SubcontractedOrderDTO.java @@ -153,6 +153,11 @@ public class SubcontractedOrderDTO { @Positive(message = "领料数量必须大于0") private BigDecimal num; + /** + * 已开单未过账数量 + */ + private BigDecimal lockedNum; + private String key; public String getKey() { diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/TransferOrderDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/TransferOrderDTO.java index dd886838..11f9db9d 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/TransferOrderDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/TransferOrderDTO.java @@ -157,6 +157,11 @@ public class TransferOrderDTO { @Positive(message = "调库数量必须大于0") private BigDecimal num; + /** + * 已开单未过账数量 + */ + private BigDecimal lockedNum; + @JsonIgnore private String group1; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/GoodsReceiptVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/GoodsReceiptVO.java index 05ad6cb6..2e37bb81 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/GoodsReceiptVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/GoodsReceiptVO.java @@ -81,5 +81,10 @@ public class GoodsReceiptVO { */ private String storageLocation; + /** + * 已开单未过账数量 + */ + private BigDecimal lockedNum; + } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QrCodeVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QrCodeVO.java index 8d355b30..8c5ee55c 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QrCodeVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QrCodeVO.java @@ -155,4 +155,9 @@ public class QrCodeVO { private BigDecimal outBoundNum; private BigDecimal leftNum; + + /** + * 已开单未过账数量 + */ + private BigDecimal lockedNum; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a07VO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a07VO.java index 2828f37e..09453035 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a07VO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a07VO.java @@ -138,6 +138,11 @@ public class Zwm3a07VO { */ private Integer dataType = 0; + /** + * 已开单未过账数量 + */ + private BigDecimal lockedNum; + @JsonIgnore private String key1; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsOutAssistanceItemMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsOutAssistanceItemMapper.java index 58167eba..91443126 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsOutAssistanceItemMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsOutAssistanceItemMapper.java @@ -3,6 +3,8 @@ package com.nflg.wms.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nflg.wms.repository.entity.WmsOutAssistanceItem; +import java.math.BigDecimal; + /** *

* Mapper 接口 @@ -12,4 +14,5 @@ import com.nflg.wms.repository.entity.WmsOutAssistanceItem; */ public interface WmsOutAssistanceItemMapper extends BaseMapper { + BigDecimal getLockedNum(String ebeln, String ebelp); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsOutCostcenterItemMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsOutCostcenterItemMapper.java index 2d1b55e6..00123427 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsOutCostcenterItemMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsOutCostcenterItemMapper.java @@ -3,6 +3,7 @@ package com.nflg.wms.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nflg.wms.repository.entity.WmsOutCostcenterItem; +import java.math.BigDecimal; import java.util.List; /** @@ -15,4 +16,6 @@ import java.util.List; public interface WmsOutCostcenterItemMapper extends BaseMapper { List getList(Long id); + + BigDecimal getLockedNum(String aufnr, String matnr); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsOutProduceItemMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsOutProduceItemMapper.java index 56660584..ef4858c7 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsOutProduceItemMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsOutProduceItemMapper.java @@ -3,6 +3,7 @@ package com.nflg.wms.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nflg.wms.repository.entity.WmsOutProduceItem; +import java.math.BigDecimal; import java.util.List; /** @@ -17,4 +18,6 @@ public interface WmsOutProduceItemMapper extends BaseMapper { void releaseNum(List ids); List getList(Long id); + + BigDecimal getLockedNum(String aufnr, String matnr); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsReturnRequestItemMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsReturnRequestItemMapper.java index 838c4883..daa1bd92 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsReturnRequestItemMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsReturnRequestItemMapper.java @@ -3,6 +3,8 @@ package com.nflg.wms.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nflg.wms.repository.entity.WmsReturnRequestItem; +import java.math.BigDecimal; + /** *

* Mapper 接口 @@ -13,4 +15,5 @@ import com.nflg.wms.repository.entity.WmsReturnRequestItem; */ public interface WmsReturnRequestItemMapper extends BaseMapper { + BigDecimal getLockedNum(String poNum, String poLineNumber); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsTransferCompanyItemMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsTransferCompanyItemMapper.java index f708a0e8..9d19cf17 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsTransferCompanyItemMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsTransferCompanyItemMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nflg.wms.common.pojo.vo.TransferCompanyItemVO; import com.nflg.wms.repository.entity.WmsTransferCompanyItem; +import java.math.BigDecimal; import java.util.List; /** @@ -16,4 +17,6 @@ import java.util.List; public interface WmsTransferCompanyItemMapper extends BaseMapper { List getVOList(Long id); + + BigDecimal getLockedNum(String ebeln, String ebelp); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsTransferFactoryItemMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsTransferFactoryItemMapper.java index 1dea8c8f..cff2095d 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsTransferFactoryItemMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsTransferFactoryItemMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nflg.wms.common.pojo.vo.TransferFactoryItemVO; import com.nflg.wms.repository.entity.WmsTransferFactoryItem; +import java.math.BigDecimal; import java.util.List; /** @@ -16,4 +17,6 @@ import java.util.List; public interface WmsTransferFactoryItemMapper extends BaseMapper { List getVOList(Long id); + + BigDecimal getLockedNum(String aufnr, String matnr); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsOutAssistanceItemService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsOutAssistanceItemService.java index dd233e24..58fde232 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsOutAssistanceItemService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsOutAssistanceItemService.java @@ -5,6 +5,7 @@ import com.nflg.wms.repository.entity.WmsOutAssistanceItem; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; +import java.math.BigDecimal; import java.util.List; /** @@ -17,4 +18,6 @@ import java.util.List; public interface IWmsOutAssistanceItemService extends IService { List getList(@Valid @NotNull Long id); + + BigDecimal getLockedNum(String ebeln, String ebelp); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsOutCostcenterItemService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsOutCostcenterItemService.java index e0cf10a0..01391378 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsOutCostcenterItemService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsOutCostcenterItemService.java @@ -5,6 +5,7 @@ import com.nflg.wms.repository.entity.WmsOutCostcenterItem; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; +import java.math.BigDecimal; import java.util.List; /** @@ -17,4 +18,6 @@ import java.util.List; public interface IWmsOutCostcenterItemService extends IService { List getList(@Valid @NotNull Long id); + + BigDecimal getLockedNum(String aufnr, String matnr); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsOutProduceItemService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsOutProduceItemService.java index 007427fb..539073cb 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsOutProduceItemService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsOutProduceItemService.java @@ -6,6 +6,7 @@ import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; +import java.math.BigDecimal; import java.util.List; /** @@ -20,4 +21,6 @@ public interface IWmsOutProduceItemService extends IService { void releaseNum(@Valid @NotEmpty List ids); List getList(@Valid @NotNull Long id); + + BigDecimal getLockedNum(String aufnr, String matnr); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsReturnRequestItemService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsReturnRequestItemService.java index 84380490..4f34a29b 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsReturnRequestItemService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsReturnRequestItemService.java @@ -3,6 +3,8 @@ package com.nflg.wms.repository.service; import com.nflg.wms.repository.entity.WmsReturnRequestItem; import com.baomidou.mybatisplus.extension.service.IService; +import java.math.BigDecimal; + /** *

* 服务类 @@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IWmsReturnRequestItemService extends IService { + BigDecimal getLockedNum(String poNum, String poLineNumber); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsTransferCompanyItemService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsTransferCompanyItemService.java index a29ffaa4..74565e50 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsTransferCompanyItemService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsTransferCompanyItemService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.nflg.wms.common.pojo.vo.TransferCompanyItemVO; import com.nflg.wms.repository.entity.WmsTransferCompanyItem; +import java.math.BigDecimal; import java.util.List; /** @@ -18,4 +19,6 @@ public interface IWmsTransferCompanyItemService extends IService getList(Long id); List getVOList(Long id); + + BigDecimal getLockedNum(String ebeln, String ebelp); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsTransferFactoryItemService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsTransferFactoryItemService.java index 8b3a1747..0dc6d415 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsTransferFactoryItemService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsTransferFactoryItemService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.nflg.wms.common.pojo.vo.TransferFactoryItemVO; import com.nflg.wms.repository.entity.WmsTransferFactoryItem; +import java.math.BigDecimal; import java.util.List; /** @@ -18,4 +19,6 @@ public interface IWmsTransferFactoryItemService extends IService getList(Long id); List getVOList(Long id); + + BigDecimal getLockedNum(String aufnr, String matnr); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutAssistanceItemServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutAssistanceItemServiceImpl.java index 98923da9..d36180ca 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutAssistanceItemServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutAssistanceItemServiceImpl.java @@ -6,6 +6,7 @@ import com.nflg.wms.repository.mapper.WmsOutAssistanceItemMapper; import com.nflg.wms.repository.service.IWmsOutAssistanceItemService; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.List; /** @@ -22,4 +23,9 @@ public class WmsOutAssistanceItemServiceImpl extends ServiceImpl getList(Long id) { return lambdaQuery().eq(WmsOutAssistanceItem::getOrderId, id).list(); } + + @Override + public BigDecimal getLockedNum(String ebeln, String ebelp) { + return baseMapper.getLockedNum(ebeln,ebelp); + } } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutCostcenterItemServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutCostcenterItemServiceImpl.java index 947e0ecb..1e392cf5 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutCostcenterItemServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutCostcenterItemServiceImpl.java @@ -6,6 +6,7 @@ import com.nflg.wms.repository.mapper.WmsOutCostcenterItemMapper; import com.nflg.wms.repository.service.IWmsOutCostcenterItemService; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.List; /** @@ -22,4 +23,9 @@ public class WmsOutCostcenterItemServiceImpl extends ServiceImpl getList(Long id) { return baseMapper.getList(id); } + + @Override + public BigDecimal getLockedNum(String aufnr, String matnr) { + return baseMapper.getLockedNum(aufnr, matnr); + } } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutProduceItemServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutProduceItemServiceImpl.java index a08e75e2..41b05efb 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutProduceItemServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutProduceItemServiceImpl.java @@ -6,6 +6,7 @@ import com.nflg.wms.repository.mapper.WmsOutProduceItemMapper; import com.nflg.wms.repository.service.IWmsOutProduceItemService; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.List; /** @@ -27,4 +28,9 @@ public class WmsOutProduceItemServiceImpl extends ServiceImpl getList(Long id) { return baseMapper.getList(id); } + + @Override + public BigDecimal getLockedNum(String aufnr, String matnr) { + return baseMapper.getLockedNum(aufnr, matnr); + } } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsReturnRequestItemServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsReturnRequestItemServiceImpl.java index 3e484dd4..69b05e98 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsReturnRequestItemServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsReturnRequestItemServiceImpl.java @@ -6,6 +6,8 @@ import com.nflg.wms.repository.service.IWmsReturnRequestItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import java.math.BigDecimal; + /** *

* 服务实现类 @@ -17,4 +19,8 @@ import org.springframework.stereotype.Service; @Service public class WmsReturnRequestItemServiceImpl extends ServiceImpl implements IWmsReturnRequestItemService { + @Override + public BigDecimal getLockedNum(String poNum, String poLineNumber) { + return baseMapper.getLockedNum(poNum, poLineNumber); + } } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsTransferCompanyItemServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsTransferCompanyItemServiceImpl.java index 75e4daac..71528112 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsTransferCompanyItemServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsTransferCompanyItemServiceImpl.java @@ -7,6 +7,7 @@ import com.nflg.wms.repository.mapper.WmsTransferCompanyItemMapper; import com.nflg.wms.repository.service.IWmsTransferCompanyItemService; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.List; /** @@ -28,4 +29,9 @@ public class WmsTransferCompanyItemServiceImpl extends ServiceImpl getVOList(Long id) { return baseMapper.getVOList(id); } + + @Override + public BigDecimal getLockedNum(String ebeln, String ebelp) { + return baseMapper.getLockedNum(ebeln, ebelp); + } } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsTransferFactoryItemServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsTransferFactoryItemServiceImpl.java index ef5d73a7..69453cf1 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsTransferFactoryItemServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsTransferFactoryItemServiceImpl.java @@ -7,6 +7,7 @@ import com.nflg.wms.repository.mapper.WmsTransferFactoryItemMapper; import com.nflg.wms.repository.service.IWmsTransferFactoryItemService; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.List; /** @@ -28,4 +29,9 @@ public class WmsTransferFactoryItemServiceImpl extends ServiceImpl getVOList(Long id) { return baseMapper.getVOList(id); } + + @Override + public BigDecimal getLockedNum(String aufnr, String matnr) { + return baseMapper.getLockedNum(aufnr, matnr); + } } diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsOutAssistanceItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsOutAssistanceItemMapper.xml index 2ac933c5..408058ae 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsOutAssistanceItemMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsOutAssistanceItemMapper.xml @@ -2,4 +2,10 @@ - + + \ No newline at end of file diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsOutCostcenterItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsOutCostcenterItemMapper.xml index 6fc2a1d6..8a729ec4 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsOutCostcenterItemMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsOutCostcenterItemMapper.xml @@ -8,4 +8,11 @@ where order_id = #{id} order by id desc + + diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsOutProduceItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsOutProduceItemMapper.xml index bc06782d..af26a064 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsOutProduceItemMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsOutProduceItemMapper.xml @@ -17,4 +17,11 @@ where order_id=#{id} order by id desc + + diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestItemMapper.xml index fe7eb248..d32abb88 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestItemMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestItemMapper.xml @@ -2,4 +2,10 @@ + diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsTransferCompanyItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsTransferCompanyItemMapper.xml index b1652580..35d9716e 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsTransferCompanyItemMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsTransferCompanyItemMapper.xml @@ -8,4 +8,11 @@ FROM wms_transfer_company_item tci WHERE order_id = #{id} + + diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsTransferFactoryItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsTransferFactoryItemMapper.xml index 3967c6d1..38aec6bf 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsTransferFactoryItemMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsTransferFactoryItemMapper.xml @@ -8,4 +8,11 @@ FROM wms_transfer_factory_item tfi WHERE order_id = #{id} + +