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"