From c454b61ed034d83886f18cc5b8d77b19415a57a2 Mon Sep 17 00:00:00 2001 From: zch Date: Wed, 12 Mar 2025 14:00:51 +0800 Subject: [PATCH] =?UTF-8?q?change(wms):=20=E4=BF=AE=E6=94=B9WMS=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E9=A1=B5=E9=9D=A2=E7=9A=84=E7=89=A9=E6=96=99=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=AF=B9=E8=AF=9D=E6=A1=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 instockOrderCopy 和 linkage 组件中添加物料选择对话框 - 实现物料编码点击检索功能，替换原有的直接选择方式 - 新增 MaterialSelectInWMS 组件用于展示和选择物料信息 --- .../dromara/wms/domain/WmsPurchaseOrderDetail.java | 9 +++++++++ .../wms/domain/bo/WmsPurchaseOrderDetailBo.java | 3 +++ .../impl/WmsAllocateOrderDetailServiceImpl.java | 11 ++++++----- .../impl/WmsPurchaseOrderDetailServiceImpl.java | 2 +- 4 files changed, 19 insertions(+), 6 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 d8b9b4a5..e7dd1f7c 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,5 +1,7 @@ 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 lombok.Data; @@ -7,6 +9,9 @@ import lombok.EqualsAndHashCode; import java.io.Serial; import java.math.BigDecimal; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; /** * 采购订单-物料对象 wms_purchase_order_detail @@ -68,6 +73,10 @@ public class WmsPurchaseOrderDetail extends TenantEntity { */ private BigDecimal deliveryQty; + /** + * 物料id + */ + @TableField(exist = false) private Long materialId; diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPurchaseOrderDetailBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPurchaseOrderDetailBo.java index e7edf92f..2ef41ada 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPurchaseOrderDetailBo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPurchaseOrderDetailBo.java @@ -70,6 +70,9 @@ public class WmsPurchaseOrderDetailBo extends BaseEntity { */ private BigDecimal deliveryQty; + /** + * 物料id + */ private Long materialId; diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsAllocateOrderDetailServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsAllocateOrderDetailServiceImpl.java index b3c35b42..f6eb13a0 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsAllocateOrderDetailServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsAllocateOrderDetailServiceImpl.java @@ -108,15 +108,16 @@ public class WmsAllocateOrderDetailServiceImpl implements IWmsAllocateOrderDetai * @return 是否新增成功 */ @Override + @Transactional( rollbackFor = Exception.class ) public Boolean insertByBo(List bo) { - ArrayList list = new ArrayList<>(); + int i = 0; for (WmsAllocateOrderDetailBo detailBo : bo) { WmsAllocateOrderDetail add = MapstructUtils.convert(detailBo, WmsAllocateOrderDetail.class); - add.setCreateBy(LoginHelper.getUsername()); - add.setTenantId(LoginHelper.getTenantId()); - list.add(add); +/* add.setCreateBy(LoginHelper.getUsername()); + add.setTenantId(LoginHelper.getTenantId());*/ + i = baseMapper.insert(add); } - int i = baseMapper.insertDetails(list); +// int i = baseMapper.insertDetails(list); return i > 0; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPurchaseOrderDetailServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPurchaseOrderDetailServiceImpl.java index 7d6d55e7..639987a1 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPurchaseOrderDetailServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPurchaseOrderDetailServiceImpl.java @@ -132,7 +132,7 @@ public class WmsPurchaseOrderDetailServiceImpl implements IWmsPurchaseOrderDetai public Boolean updateByBo(WmsPurchaseOrderDetailBo bo) { WmsPurchaseOrderDetail update = MapstructUtils.convert(bo, WmsPurchaseOrderDetail.class); validEntityBeforeSave(update); - update.setUpdateBy(LoginHelper.getUserId()); +// update.setUpdateBy(LoginHelper.getUserId()); return baseMapper.updateById(update) > 0; }