pms 物料领用 详情

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmaterialrequisition/IotMaterialRequisitionController.java

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialrequisition.vo.IotMaterialRequisitionPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialrequisition.vo.IotMaterialRequisitionRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialrequisition.vo.IotMaterialRequisitionSaveReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialrequisition.vo.IotMaterialRequisitionSaveVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaterialrequisition.IotMaterialRequisitionDO;
 import cn.iocoder.yudao.module.pms.service.iotmaterialrequisition.IotMaterialRequisitionService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -43,6 +44,14 @@ public class IotMaterialRequisitionController {
         return success(iotMaterialRequisitionService.createIotMaterialRequisition(createReqVO));
     }
 
+    @PutMapping("/addMaterialRequisition")
+    @Operation(summary = "新增物料领用")
+    @PreAuthorize("@ss.hasPermission('pms:iot-main-work-order:create')")
+    public CommonResult<Boolean> addWorkOrder(@Valid @RequestBody IotMaterialRequisitionSaveVO saveVO) {
+        iotMaterialRequisitionService.addMaterialRequisition(saveVO);
+        return success(true);
+    }
+
     @PutMapping("/update")
     @Operation(summary = "更新物料领用")
     @PreAuthorize("@ss.hasPermission('pms:iot-material-requisition:update')")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmaterialrequisition/vo/IotMaterialRequisitionSaveVO.java

@@ -0,0 +1,18 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotmaterialrequisition.vo;
+
+import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialrequisitiondetail.vo.IotMaterialRequisitionDetailSaveReqVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "管理后台 - 物料领用 保存/修改 Request VO")
+@Data
+public class IotMaterialRequisitionSaveVO {
+    @Schema(description = "物料领用单主表")
+    private IotMaterialRequisitionSaveReqVO materialRequisition;
+
+    @Schema(description = "物料领用单明细")
+    private List<IotMaterialRequisitionDetailSaveReqVO> materialReqDetails;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmaterialrequisitiondetail/IotMaterialRequisitionDetailController.java

@@ -6,11 +6,16 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.iotlockstock.vo.IotLockStockPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialrequisitiondetail.vo.IotMaterialRequisitionDetailPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialrequisitiondetail.vo.IotMaterialRequisitionDetailRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialrequisitiondetail.vo.IotMaterialRequisitionDetailSaveReqVO;
+import cn.iocoder.yudao.module.pms.convert.iotmaterialreq.IotMaterialReqConvert;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaterialrequisitiondetail.IotMaterialRequisitionDetailDO;
+import cn.iocoder.yudao.module.pms.service.iotlockstock.IotLockStockService;
 import cn.iocoder.yudao.module.pms.service.iotmaterialrequisitiondetail.IotMaterialRequisitionDetailService;
+import cn.iocoder.yudao.module.system.api.saporg.SapOrgApi;
+import cn.iocoder.yudao.module.system.api.saporg.dto.SapOrgRespDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -22,10 +27,14 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 
 @Tag(name = "管理后台 - PMS 物料领用明细")
 @RestController
@@ -35,6 +44,10 @@ public class IotMaterialRequisitionDetailController {
 
     @Resource
     private IotMaterialRequisitionDetailService iotMaterialRequisitionDetailService;
+    @Resource
+    private SapOrgApi sapOrgApi;
+    @Resource
+    private IotLockStockService iotLockStockService;
 
     @PostMapping("/create")
     @Operation(summary = "创建PMS 物料领用明细")
@@ -77,6 +90,24 @@ public class IotMaterialRequisitionDetailController {
         return success(BeanUtils.toBean(pageResult, IotMaterialRequisitionDetailRespVO.class));
     }
 
+    @GetMapping("/list")
+    @Operation(summary = "获得PMS 物料领用明细列表")
+    @PreAuthorize("@ss.hasPermission('pms:iot-material-requisition-detail:query')")
+    public CommonResult<List<IotMaterialRequisitionDetailRespVO>> getIotMaterialRequisitionDetailList(@Valid IotMaterialRequisitionDetailPageReqVO pageReqVO) {
+        List<IotMaterialRequisitionDetailDO> list = iotMaterialRequisitionDetailService.getIotMaterialRequisitionDetailList(pageReqVO);
+        // 查询每个行物料的 工厂名称 成本中心名称 当前库存
+        Map<Long, SapOrgRespDTO> factoryMap = sapOrgApi.getSapOrgMap(
+                convertList(list, IotMaterialRequisitionDetailDO::getFactoryId));
+        Map<Long, SapOrgRespDTO> costCenterMap = sapOrgApi.getSapOrgMap(
+                convertList(list, IotMaterialRequisitionDetailDO::getCostCenterId));
+        IotLockStockPageReqVO reqVO = new IotLockStockPageReqVO();
+        reqVO.setCostCenterIds(new HashSet<>(convertList(list, IotMaterialRequisitionDetailDO::getCostCenterId)));
+        reqVO.setMaterialCodes(new HashSet<>(convertList(list, IotMaterialRequisitionDetailDO::getMaterialCode)));
+        Map<String, BigDecimal> stockQuantityPair = iotLockStockService.getIotLockStockList(reqVO);
+        // return success(BeanUtils.toBean(list, IotMaterialRequisitionDetailRespVO.class));
+        return success(IotMaterialReqConvert.INSTANCE.convertList(list, factoryMap, costCenterMap, stockQuantityPair));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出PMS 物料领用明细 Excel")
     @PreAuthorize("@ss.hasPermission('pms:iot-material-requisition-detail:export')")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmaterialrequisitiondetail/vo/IotMaterialRequisitionDetailPageReqVO.java

@@ -21,6 +21,12 @@ public class IotMaterialRequisitionDetailPageReqVO extends PageParam {
     @Schema(description = "物料领用单id", example = "19409")
     private Long requisitionId;
 
+    @Schema(description = "工厂id", example = "19409")
+    private Long factoryId;
+
+    @Schema(description = "costCenterId", example = "19409")
+    private Long costCenterId;
+
     @Schema(description = "物料id", example = "16249")
     private Long materialId;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmaterialrequisitiondetail/vo/IotMaterialRequisitionDetailRespVO.java

@@ -21,6 +21,12 @@ public class IotMaterialRequisitionDetailRespVO {
     @ExcelProperty("物料领用单id")
     private Long requisitionId;
 
+    @Schema(description = "工厂id", example = "19409")
+    private Long factoryId;
+
+    @Schema(description = "costCenterId", example = "19409")
+    private Long costCenterId;
+
     @Schema(description = "物料id", example = "16249")
     @ExcelProperty("物料id")
     private Long materialId;
@@ -69,4 +75,15 @@ public class IotMaterialRequisitionDetailRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    /**
+     * 扩展字段
+     */
+    @Schema(description = "工厂名称", example = "瑞恒兴域")
+    private String factory;
+
+    @Schema(description = "成本中心名称", example = "瑞恒兴域-制氮-吐哈-HY-C4")
+    private String costCenter;
+
+    @Schema(description = "当前库存数量 实时查询")
+    private BigDecimal quantity;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmaterialrequisitiondetail/vo/IotMaterialRequisitionDetailSaveReqVO.java

@@ -15,6 +15,12 @@ public class IotMaterialRequisitionDetailSaveReqVO {
     @Schema(description = "物料领用单id", example = "19409")
     private Long requisitionId;
 
+    @Schema(description = "工厂id", example = "19409")
+    private Long factoryId;
+
+    @Schema(description = "costCenterId", example = "19409")
+    private Long costCenterId;
+
     @Schema(description = "物料id", example = "16249")
     private Long materialId;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/convert/iotmaterialreq/IotMaterialReqConvert.java

@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.module.pms.convert.iotmaterialreq;
+
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialrequisitiondetail.vo.IotMaterialRequisitionDetailRespVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaterialrequisitiondetail.IotMaterialRequisitionDetailDO;
+import cn.iocoder.yudao.module.system.api.saporg.dto.SapOrgRespDTO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface IotMaterialReqConvert {
+
+    IotMaterialReqConvert INSTANCE = Mappers.getMapper(IotMaterialReqConvert.class);
+
+    default List<IotMaterialRequisitionDetailRespVO> convertList(List<IotMaterialRequisitionDetailDO> list,
+                                                                 Map<Long, SapOrgRespDTO> factoryMap,
+                                                                 Map<Long, SapOrgRespDTO> costCenterMap, Map<String, BigDecimal> stockQuantityPair) {
+        return CollectionUtils.convertList(list, requisitionDetail -> convert1(requisitionDetail, factoryMap.get(requisitionDetail.getFactoryId()),
+                costCenterMap.get(requisitionDetail.getCostCenterId()), stockQuantityPair));
+    }
+
+    default IotMaterialRequisitionDetailRespVO convert1(IotMaterialRequisitionDetailDO requisitionDetail,
+                                                        SapOrgRespDTO factory, SapOrgRespDTO costCenter, Map<String, BigDecimal> stockQuantityPair) {
+        IotMaterialRequisitionDetailRespVO requisitionDetailVO = BeanUtils.toBean(requisitionDetail, IotMaterialRequisitionDetailRespVO.class);
+        if (factory != null) {
+            requisitionDetailVO.setFactory(factory.getFactoryName());
+        }
+        if (costCenter != null) {
+            requisitionDetailVO.setCostCenter(costCenter.getCostCenterName());
+        }
+        // 设置当前 成本中心-物料 库存
+        String uniqueKey = StrUtil.join("-", requisitionDetail.getCostCenterId(), requisitionDetail.getMaterialCode());
+        if (stockQuantityPair.containsKey(uniqueKey)) {
+            requisitionDetailVO.setQuantity(stockQuantityPair.get(uniqueKey));
+        }
+        return requisitionDetailVO;
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotmaterialrequisitiondetail/IotMaterialRequisitionDetailDO.java

@@ -32,6 +32,14 @@ public class IotMaterialRequisitionDetailDO extends BaseDO {
      * 物料领用单id
      */
     private Long requisitionId;
+    /**
+     * 工厂id
+     */
+    private Long factoryId;
+    /**
+     * 成本中心id
+     */
+    private Long costCenterId;
     /**
      * 物料id
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotlockstock/IotLockStockMapper.java

@@ -58,6 +58,7 @@ public interface IotLockStockMapper extends BaseMapperX<IotLockStockDO> {
                 .eqIfPresent(IotLockStockDO::getCostCenter, reqVO.getCostCenter())
                 .eqIfPresent(IotLockStockDO::getPickingListNumber, reqVO.getPickingListNumber())
                 .likeIfPresent(IotLockStockDO::getMaterialCode, reqVO.getMaterialCode())
+                .inIfPresent(IotLockStockDO::getMaterialCode, reqVO.getMaterialCodes())
                 .likeIfPresent(IotLockStockDO::getMaterialName, reqVO.getMaterialName())
                 .likeIfPresent(IotLockStockDO::getMaterialGroupName, reqVO.getMaterialGroupName())
                 .eqIfPresent(IotLockStockDO::getMaterialGroupId, reqVO.getMaterialGroupId())

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotmaterialrequisitiondetail/IotMaterialRequisitionDetailMapper.java

@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialrequisitiondetail
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaterialrequisitiondetail.IotMaterialRequisitionDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * PMS 物料领用明细 Mapper
  *
@@ -18,6 +20,28 @@ public interface IotMaterialRequisitionDetailMapper extends BaseMapperX<IotMater
     default PageResult<IotMaterialRequisitionDetailDO> selectPage(IotMaterialRequisitionDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IotMaterialRequisitionDetailDO>()
                 .eqIfPresent(IotMaterialRequisitionDetailDO::getRequisitionId, reqVO.getRequisitionId())
+                .eqIfPresent(IotMaterialRequisitionDetailDO::getFactoryId, reqVO.getFactoryId())
+                .eqIfPresent(IotMaterialRequisitionDetailDO::getCostCenterId, reqVO.getCostCenterId())
+                .eqIfPresent(IotMaterialRequisitionDetailDO::getMaterialId, reqVO.getMaterialId())
+                .eqIfPresent(IotMaterialRequisitionDetailDO::getMaterialCode, reqVO.getMaterialCode())
+                .likeIfPresent(IotMaterialRequisitionDetailDO::getMaterialName, reqVO.getMaterialName())
+                .eqIfPresent(IotMaterialRequisitionDetailDO::getRequisitionQuantity, reqVO.getRequisitionQuantity())
+                .eqIfPresent(IotMaterialRequisitionDetailDO::getUnit, reqVO.getUnit())
+                .eqIfPresent(IotMaterialRequisitionDetailDO::getUnitPrice, reqVO.getUnitPrice())
+                .eqIfPresent(IotMaterialRequisitionDetailDO::getTotalPrice, reqVO.getTotalPrice())
+                .eqIfPresent(IotMaterialRequisitionDetailDO::getSpecification, reqVO.getSpecification())
+                .eqIfPresent(IotMaterialRequisitionDetailDO::getSort, reqVO.getSort())
+                .eqIfPresent(IotMaterialRequisitionDetailDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(IotMaterialRequisitionDetailDO::getRemark, reqVO.getRemark())
+                .betweenIfPresent(IotMaterialRequisitionDetailDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(IotMaterialRequisitionDetailDO::getId));
+    }
+
+    default List<IotMaterialRequisitionDetailDO> selectList(IotMaterialRequisitionDetailPageReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<IotMaterialRequisitionDetailDO>()
+                .eqIfPresent(IotMaterialRequisitionDetailDO::getRequisitionId, reqVO.getRequisitionId())
+                .eqIfPresent(IotMaterialRequisitionDetailDO::getFactoryId, reqVO.getFactoryId())
+                .eqIfPresent(IotMaterialRequisitionDetailDO::getCostCenterId, reqVO.getCostCenterId())
                 .eqIfPresent(IotMaterialRequisitionDetailDO::getMaterialId, reqVO.getMaterialId())
                 .eqIfPresent(IotMaterialRequisitionDetailDO::getMaterialCode, reqVO.getMaterialCode())
                 .likeIfPresent(IotMaterialRequisitionDetailDO::getMaterialName, reqVO.getMaterialName())

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/redis/BizNoRedisDAO.java

@@ -28,6 +28,11 @@ public class BizNoRedisDAO {
      */
     public static final String MAIN_WORK_ORDER_NO_PREFIX = "BYGD";
 
+    /**
+     * 物料领用单
+     */
+    public static final String MATERIAL_REQ_ORDER_NO_PREFIX = "WLLY";
+
     @Resource
     private StringRedisTemplate stringRedisTemplate;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotlockstock/IotLockStockService.java

@@ -6,7 +6,9 @@ import cn.iocoder.yudao.module.pms.controller.admin.iotlockstock.vo.IotLockStock
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotlockstock.IotLockStockDO;
 
 import javax.validation.Valid;
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 /**
  * PMS 本地 库存 Service 接口
@@ -53,6 +55,14 @@ public interface IotLockStockService {
      */
     PageResult<IotLockStockDO> getIotLockStockPage(IotLockStockPageReqVO pageReqVO);
 
+    /**
+     * 获得PMS 本地 库存 列表
+     *
+     * @param pageReqVO 分页查询
+     * @return PMS 本地 库存分页
+     */
+    Map<String, BigDecimal> getIotLockStockList(IotLockStockPageReqVO pageReqVO);
+
     /**
      * 手动添加入库
      *

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotlockstock/IotLockStockServiceImpl.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.pms.service.iotlockstock;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
@@ -17,9 +18,12 @@ import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_LOCK_STOCK_NOT_EXISTS;
@@ -82,6 +86,18 @@ public class IotLockStockServiceImpl implements IotLockStockService {
         return iotLockStockMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public Map<String, BigDecimal> getIotLockStockList(IotLockStockPageReqVO pageReqVO) {
+        List<IotLockStockDO> lockStocks = iotLockStockMapper.selectList(pageReqVO);
+        Map<String, BigDecimal> stockQuantityPair = new HashMap<>();
+        if (CollUtil.isNotEmpty(lockStocks)) {
+            lockStocks.forEach(stock -> {
+                stockQuantityPair.put(StrUtil.join("-",stock.getCostCenterId(), stock.getMaterialCode()), stock.getQuantity());
+            });
+        }
+        return stockQuantityPair;
+    }
+
     @Override
     public Long manualWarehouse(List<IotLockStockSaveReqVO> createReqVO) {
         // 查询当前登录人所属组织 关联的工厂 库存地点 成本中心

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotmaterialrequisition/IotMaterialRequisitionService.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.pms.service.iotmaterialrequisition;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialrequisition.vo.IotMaterialRequisitionPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialrequisition.vo.IotMaterialRequisitionSaveReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialrequisition.vo.IotMaterialRequisitionSaveVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaterialrequisition.IotMaterialRequisitionDO;
 
 import javax.validation.Valid;
@@ -52,4 +53,18 @@ public interface IotMaterialRequisitionService {
      */
     PageResult<IotMaterialRequisitionDO> getIotMaterialRequisitionPage(IotMaterialRequisitionPageReqVO pageReqVO);
 
+    /**
+     * 新增 物料领用
+     *
+     * @param saveVO
+     * @return 物料领用分页
+     */
+    void addMaterialRequisition(IotMaterialRequisitionSaveVO saveVO);
+
+    /**
+     * 生成物料领用单号
+     *
+     * @return 物料领用单号
+     */
+    String createMaterialReqNumber();
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotmaterialrequisition/IotMaterialRequisitionServiceImpl.java

@@ -1,15 +1,24 @@
 package cn.iocoder.yudao.module.pms.service.iotmaterialrequisition;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialrequisition.vo.IotMaterialRequisitionPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialrequisition.vo.IotMaterialRequisitionSaveReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialrequisition.vo.IotMaterialRequisitionSaveVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialrequisitiondetail.vo.IotMaterialRequisitionDetailSaveReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaterialrequisition.IotMaterialRequisitionDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaterialrequisitiondetail.IotMaterialRequisitionDetailDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotmaterialrequisition.IotMaterialRequisitionMapper;
+import cn.iocoder.yudao.module.pms.dal.mysql.iotmaterialrequisitiondetail.IotMaterialRequisitionDetailMapper;
+import cn.iocoder.yudao.module.pms.dal.redis.BizNoRedisDAO;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_MATERIAL_REQUISITION_NOT_EXISTS;
@@ -25,6 +34,10 @@ public class IotMaterialRequisitionServiceImpl implements IotMaterialRequisition
 
     @Resource
     private IotMaterialRequisitionMapper iotMaterialRequisitionMapper;
+    @Resource
+    private IotMaterialRequisitionDetailMapper iotMaterialRequisitionDetailMapper;
+    @Resource
+    private BizNoRedisDAO bizNoRedisDAO;
 
     @Override
     public Long createIotMaterialRequisition(IotMaterialRequisitionSaveReqVO createReqVO) {
@@ -68,4 +81,41 @@ public class IotMaterialRequisitionServiceImpl implements IotMaterialRequisition
         return iotMaterialRequisitionMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public void addMaterialRequisition(IotMaterialRequisitionSaveVO saveVO) {
+        if (ObjectUtil.isEmpty(saveVO)) {
+            throw exception(IOT_MATERIAL_REQUISITION_NOT_EXISTS);
+        }
+        IotMaterialRequisitionSaveReqVO materialRequisition = saveVO.getMaterialRequisition();
+        if (ObjectUtil.isEmpty(materialRequisition)) {
+            throw exception(IOT_MATERIAL_REQUISITION_NOT_EXISTS);
+        }
+        List<IotMaterialRequisitionDetailSaveReqVO> materialReqDetails = saveVO.getMaterialReqDetails();
+        if (ObjectUtil.isEmpty(materialReqDetails)) {
+            throw exception(IOT_MATERIAL_REQUISITION_NOT_EXISTS);
+        }
+        // 保养工单 主表 还有 保养费用 、人工费用 、其他费用
+        IotMaterialRequisitionDO requisition = BeanUtils.toBean(materialRequisition, IotMaterialRequisitionDO.class);
+        requisition.setRequisitionNumber(createMaterialReqNumber());
+        iotMaterialRequisitionMapper.insert(requisition);
+        // 添加物料领用单明细
+        List<IotMaterialRequisitionDetailDO> requisitionDetails = new ArrayList<>();
+        materialReqDetails.forEach(material -> {
+            IotMaterialRequisitionDetailDO tempMaterial = BeanUtils.toBean(material, IotMaterialRequisitionDetailDO.class);
+            tempMaterial.setRequisitionId(requisition.getId());
+            requisitionDetails.add(tempMaterial);
+        });
+        if (CollUtil.isNotEmpty(requisitionDetails)) {
+            iotMaterialRequisitionDetailMapper.insertBatch(requisitionDetails);
+        }
+        // 记录物料出库
+        // 向当前登录人的上级 发送钉钉 站内信 消息
+
+    }
+
+    @Override
+    public String createMaterialReqNumber() {
+        return bizNoRedisDAO.generate(BizNoRedisDAO.MATERIAL_REQ_ORDER_NO_PREFIX);
+    }
+
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotmaterialrequisitiondetail/IotMaterialRequisitionDetailService.java

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialrequisitiondetail
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaterialrequisitiondetail.IotMaterialRequisitionDetailDO;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * PMS 物料领用明细 Service 接口
@@ -52,4 +53,12 @@ public interface IotMaterialRequisitionDetailService {
      */
     PageResult<IotMaterialRequisitionDetailDO> getIotMaterialRequisitionDetailPage(IotMaterialRequisitionDetailPageReqVO pageReqVO);
 
+    /**
+     * 获得PMS 物料领用明细列表
+     *
+     * @param pageReqVO 列表查询
+     * @return PMS 物料领用明细列表
+     */
+    List<IotMaterialRequisitionDetailDO> getIotMaterialRequisitionDetailList(IotMaterialRequisitionDetailPageReqVO pageReqVO);
+
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotmaterialrequisitiondetail/IotMaterialRequisitionDetailServiceImpl.java

@@ -11,6 +11,8 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 
+import java.util.List;
+
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_MATERIAL_REQUISITION_DETAIL_NOT_EXISTS;
 
@@ -68,4 +70,9 @@ public class IotMaterialRequisitionDetailServiceImpl implements IotMaterialRequi
         return iotMaterialRequisitionDetailMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public List<IotMaterialRequisitionDetailDO> getIotMaterialRequisitionDetailList(IotMaterialRequisitionDetailPageReqVO pageReqVO) {
+        return iotMaterialRequisitionDetailMapper.selectList(pageReqVO);
+    }
+
 }