From e6fe7c8bdac221dc2e441c0d56edb247e2d1893e Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Thu, 4 Sep 2025 15:37:53 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E8=AE=A2=E5=8D=95=E9=AB=98=E4=BB=B7=E5=80=BC=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=AE=A1=E6=A0=B8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在创建出库订单时,判断是否包含高价值物料 - 如果包含高价值物料,设置审核状态为"待审核" - 如果不包含高价值物料,设置审核状态为"非高价值物料" -优化了代码导入部分,使用了更简洁的导入方式 --- .../impl/WmsOutstockOrderServiceImpl.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockOrderServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockOrderServiceImpl.java index 69bd0383..a24ec31b 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockOrderServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockOrderServiceImpl.java @@ -15,6 +15,7 @@ import org.dromara.wms.domain.BaseMaterialCategory; import org.dromara.wms.domain.WmsBaseCustomer; import org.dromara.wms.domain.WmsBaseWarehouse; import org.dromara.wms.domain.WmsOutstockOrder; +import org.dromara.wms.domain.bo.WmsOutstockDetailBo; import org.dromara.wms.domain.bo.WmsOutstockOrderBo; import org.dromara.wms.domain.bo.WmsOutstockRecordBo; import org.dromara.wms.domain.vo.WmsOutstockOrderVo; @@ -28,10 +29,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; -import java.util.Collection; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.atomic.AtomicInteger; /** @@ -175,6 +173,18 @@ public class WmsOutstockOrderServiceImpl implements IWmsOutstockOrderService { // 转换业务对象为实体对象 WmsOutstockOrder add = MapstructUtils.convert(bo, WmsOutstockOrder.class); + Boolean isHighValue = false; + for (WmsOutstockDetailBo detailBo : bo.getDetailList()){ + if ("1".equals(detailBo.getIsHighValue())){//是否高价值物料(0否,1是) + isHighValue = true; + } + } + if (isHighValue){ + add.setAuditStatus("0");//审核状态(0待审核,1审核通过,2审核未通过) + }else { + add.setAuditStatus("3");//审核状态(0待审核,1审核通过,2审核未通过,3非高价值物料) + } + // 验证实体数据是否合规 validEntityBeforeSave(add);