采购订单主子表页面功能

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<Void> add(@Validated(AddGroup.class) @RequestBody WmsPurchaseOrderBo bo) {
-        return toAjax(wmsPurchaseOrderService.insertByBo(bo));
+    public R<WmsPurchaseOrder> add(@Validated(AddGroup.class) @RequestBody WmsPurchaseOrderBo bo) {
+        return R.ok(wmsPurchaseOrderService.insertByBo(bo));
     }
 
     /**

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<Void> add(@Validated(AddGroup.class) @RequestBody WmsPurchaseOrderDetailBo bo) {
+    public R<Void> add(@RequestBody List<WmsPurchaseOrderDetailBo> bo) {
         return toAjax(wmsPurchaseOrderDetailService.insertByBo(bo));
     }
 

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;
+
 
 }

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;
+
 
 }

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<WmsPurchaseOrderDetailBo> bo);
 
     /**
      * 修改采购订单-物料

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);
 
     /**
      * 修改采购订单

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<WmsPurchaseOrderDetailBo> bo) {
+        ArrayList<WmsPurchaseOrderDetail> list = new ArrayList<>();
+        int a = 0;
+        for (WmsPurchaseOrderDetailBo detailBo : bo) {
+            BaseMaterialInfoBo baseMaterialInfo = new BaseMaterialInfoBo();
+            baseMaterialInfo.setMaterialId(detailBo.getMaterialId());
+            List<BaseMaterialInfoVo> 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;
     }
 
     /**

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;
     }
 
     /**

ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPsmInStockDetailMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.wms.mapper.WmsPsmInStockDetailMapper">
+
+</mapper>