From f1820d08287f088173a6878312a110a1a3662d89 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Wed, 3 Sep 2025 11:16:19 +0800 Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E8=AE=A2=E5=8D=95=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 WmsInstockDetailServiceImpl 中添加物料 ID 到打印对象 -移除 WmsPurchaseOrderDetail 中的冗余字段和注解 - 在 WmsPurchaseOrderDetailMapper.xml 中添加物料 ID 字段 --- .../dromara/wms/domain/WmsPurchaseOrderDetail.java | 12 ++++-------- .../service/impl/WmsInstockDetailServiceImpl.java | 4 ++-- .../mapper/wms/WmsPurchaseOrderDetailMapper.xml | 1 + 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPurchaseOrderDetail.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPurchaseOrderDetail.java index e7dd1f7c..c1dde4f9 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPurchaseOrderDetail.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPurchaseOrderDetail.java @@ -1,17 +1,14 @@ package org.dromara.wms.domain; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import org.dromara.common.tenant.core.TenantEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; import java.io.Serial; import java.math.BigDecimal; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; /** * 采购订单-物料对象 wms_purchase_order_detail @@ -76,7 +73,6 @@ public class WmsPurchaseOrderDetail extends TenantEntity { /** * 物料id */ - @TableField(exist = false) private Long materialId; diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java index 1545b5f4..f463bd03 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java @@ -103,8 +103,6 @@ public class WmsInstockDetailServiceImpl implements IWmsInstockDetailService { .select(BaseMaterialInfo::getInspectionRequest) .leftJoin(BaseMaterialInfo.class, BaseMaterialInfo::getMaterialId, WmsInstockDetail::getMaterialId) - - .eq(StringUtils.isNotBlank(bo.getIsInspection()), WmsInstockDetail::getIsInspection, bo.getIsInspection()) .eq(bo.getInstockQty() != null, WmsInstockDetail::getInstockQty, bo.getInstockQty()) @@ -260,6 +258,7 @@ public class WmsInstockDetailServiceImpl implements IWmsInstockDetailService { WmsInstockPrint print = new WmsInstockPrint(); BeanUtils.copyProperties(bo, print); print.setBatchCode(batchCode); + print.setMaterialId(bo.getMaterialId()); print.setApportionQty(BigDecimal.ONE); // 打印的包数：1包 print.setMaterialQty(currentPackageQty.longValue()); // 每包的物料数量 print.setInboundStatus("0"); // 入库状态(0-待入库,1-已入库,2-入库中) @@ -282,6 +281,7 @@ public class WmsInstockDetailServiceImpl implements IWmsInstockDetailService { WmsInstockPrint print = new WmsInstockPrint(); BeanUtils.copyProperties(bo, print); print.setBatchCode(batchCode); + print.setMaterialId(bo.getMaterialId()); print.setApportionQty(copies); // 打印的包数（打印份数） print.setMaterialQty(detail.getInstockQty().longValue()); // 每包的物料数量（全部入库数量） print.setInboundStatus("0");//入库状态(0-待入库,1-已入库,2-入库中) diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPurchaseOrderDetailMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPurchaseOrderDetailMapper.xml index 279ebe41..129d8302 100644 --- a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPurchaseOrderDetailMapper.xml +++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPurchaseOrderDetailMapper.xml @@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"