From 5f8d61f81dd1da2f9ea27c7ae07cc07a75e70a6e Mon Sep 17 00:00:00 2001 From: "maxw@mesnac.com" Date: Mon, 20 Jan 2025 14:55:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E4=B8=BB?= =?UTF-8?q?=E5=AD=90=E8=A1=A8=E9=A1=B5=E9=9D=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WmsPurchaseOrderController.java | 5 ++-- .../WmsPurchaseOrderDetailController.java | 2 +- .../domain/bo/WmsPurchaseOrderDetailBo.java | 2 ++ .../domain/vo/WmsPurchaseOrderDetailVo.java | 2 ++ .../IWmsPurchaseOrderDetailService.java | 2 +- .../wms/service/IWmsPurchaseOrderService.java | 2 +- .../WmsPurchaseOrderDetailServiceImpl.java | 30 ++++++++++++++----- .../impl/WmsPurchaseOrderServiceImpl.java | 4 +-- .../mapper/wms/WmsPsmInStockDetailMapper.xml | 7 +++++ 9 files changed, 42 insertions(+), 14 deletions(-) create mode 100644 ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPsmInStockDetailMapper.xml diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPurchaseOrderController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPurchaseOrderController.java index f8f65693..c1529b62 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPurchaseOrderController.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPurchaseOrderController.java @@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.wms.domain.WmsPurchaseOrder; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -76,8 +77,8 @@ public class WmsPurchaseOrderController extends BaseController { @Log(title = "采购订单", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody WmsPurchaseOrderBo bo) { - return toAjax(wmsPurchaseOrderService.insertByBo(bo)); + public R add(@Validated(AddGroup.class) @RequestBody WmsPurchaseOrderBo bo) { + return R.ok(wmsPurchaseOrderService.insertByBo(bo)); } /** diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPurchaseOrderDetailController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPurchaseOrderDetailController.java index b53d4ac6..576dbc87 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPurchaseOrderDetailController.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPurchaseOrderDetailController.java @@ -76,7 +76,7 @@ public class WmsPurchaseOrderDetailController extends BaseController { @Log(title = "采购订单-物料", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody WmsPurchaseOrderDetailBo bo) { + public R add(@RequestBody List bo) { return toAjax(wmsPurchaseOrderDetailService.insertByBo(bo)); } 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 4ce6f392..25eecce7 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 @@ -68,5 +68,7 @@ public class WmsPurchaseOrderDetailBo extends BaseEntity { */ private Long deliveryQty; + private Long materialId; + } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPurchaseOrderDetailVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPurchaseOrderDetailVo.java index 2c073e18..16a74e90 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPurchaseOrderDetailVo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPurchaseOrderDetailVo.java @@ -94,5 +94,7 @@ public class WmsPurchaseOrderDetailVo implements Serializable { @ExcelProperty(value = "租户号") private String tenantId; + private Long materialId; + } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPurchaseOrderDetailService.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPurchaseOrderDetailService.java index 021daa4a..3eb6f5b5 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPurchaseOrderDetailService.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPurchaseOrderDetailService.java @@ -48,7 +48,7 @@ public interface IWmsPurchaseOrderDetailService { * @param bo 采购订单-物料 * @return 是否新增成功 */ - Boolean insertByBo(WmsPurchaseOrderDetailBo bo); + Boolean insertByBo(List bo); /** * 修改采购订单-物料 diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPurchaseOrderService.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPurchaseOrderService.java index 3a0adeb4..dfbeef13 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPurchaseOrderService.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPurchaseOrderService.java @@ -48,7 +48,7 @@ public interface IWmsPurchaseOrderService { * @param bo 采购订单 * @return 是否新增成功 */ - Boolean insertByBo(WmsPurchaseOrderBo bo); + WmsPurchaseOrder insertByBo(WmsPurchaseOrderBo bo); /** * 修改采购订单 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 967a0af0..dc2cbfed 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 @@ -9,6 +9,12 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.wms.domain.WmsInstockDetail; +import org.dromara.wms.domain.bo.BaseMaterialInfoBo; +import org.dromara.wms.domain.bo.WmsInstockDetailBo; +import org.dromara.wms.domain.vo.BaseMaterialInfoVo; +import org.dromara.wms.service.IBaseMaterialInfoService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.dromara.wms.domain.bo.WmsPurchaseOrderDetailBo; import org.dromara.wms.domain.vo.WmsPurchaseOrderDetailVo; @@ -16,6 +22,7 @@ import org.dromara.wms.domain.WmsPurchaseOrderDetail; import org.dromara.wms.mapper.WmsPurchaseOrderDetailMapper; import org.dromara.wms.service.IWmsPurchaseOrderDetailService; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Collection; @@ -31,6 +38,8 @@ import java.util.Collection; public class WmsPurchaseOrderDetailServiceImpl implements IWmsPurchaseOrderDetailService { private final WmsPurchaseOrderDetailMapper baseMapper; + @Autowired + private IBaseMaterialInfoService baseMaterialInfoService; /** * 查询采购订单-物料 @@ -92,14 +101,21 @@ public class WmsPurchaseOrderDetailServiceImpl implements IWmsPurchaseOrderDetai * @return 是否新增成功 */ @Override - public Boolean insertByBo(WmsPurchaseOrderDetailBo bo) { - WmsPurchaseOrderDetail add = MapstructUtils.convert(bo, WmsPurchaseOrderDetail.class); - validEntityBeforeSave(add); - boolean flag = baseMapper.insert(add) > 0; - if (flag) { - bo.setPoDId(add.getPoDId()); + public Boolean insertByBo(List bo) { + ArrayList list = new ArrayList<>(); + int a = 0; + for (WmsPurchaseOrderDetailBo detailBo : bo) { + BaseMaterialInfoBo baseMaterialInfo = new BaseMaterialInfoBo(); + baseMaterialInfo.setMaterialId(detailBo.getMaterialId()); + List baseMaterialInfoVos = baseMaterialInfoService.queryList(baseMaterialInfo); + WmsPurchaseOrderDetail add = MapstructUtils.convert(detailBo, WmsPurchaseOrderDetail.class); + add.setMaterialCode(baseMaterialInfoVos.get(0).getMaterialCode()); + add.setMaterialName(baseMaterialInfoVos.get(0).getMaterialName()); + add.setMaterialSpe(baseMaterialInfoVos.get(0).getMaterialSpec()); + add.setUnitName(baseMaterialInfoVos.get(0).getMaterialUnit()); + a += baseMapper.insert(add); } - return flag; + return a>0; } /** diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPurchaseOrderServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPurchaseOrderServiceImpl.java index 316ceb18..bb1ccf85 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPurchaseOrderServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPurchaseOrderServiceImpl.java @@ -95,14 +95,14 @@ public class WmsPurchaseOrderServiceImpl implements IWmsPurchaseOrderService { * @return 是否新增成功 */ @Override - public Boolean insertByBo(WmsPurchaseOrderBo bo) { + public WmsPurchaseOrder insertByBo(WmsPurchaseOrderBo bo) { WmsPurchaseOrder add = MapstructUtils.convert(bo, WmsPurchaseOrder.class); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setPoId(add.getPoId()); } - return flag; + return add; } /** diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPsmInStockDetailMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPsmInStockDetailMapper.xml new file mode 100644 index 00000000..fb5c3780 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPsmInStockDetailMapper.xml @@ -0,0 +1,7 @@ + + + + +