[feat] 工程管理

物料Controller的审批功能新增 审核通过添加物料库存查询记录方法;

ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java

@@ -228,13 +228,15 @@ public class ErpMaterialController extends BaseController
         if (processIsFinish) {
             // 审核通过
             erpMaterialVo.setAuditStatus("1");
+
+            //审核通过添加物料库存查询记录
+            erpMaterialService.addInventoryInquiry(erpMaterialVo);
+
             // 提交
             if("submit".equals(instanceType)){
                 //物料审核通过后，填写通过后库存物料信息初始化，填写对应的信息
                 // 使用状态-是
                 erpMaterialVo.setUseStatus("1");
-                //审核通过后添加库存物料信息
-                erpMaterialService.addStockMaterial(erpMaterialVo);
             }
             // 作废
             else if("cancel".equals(instanceType)){

ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpMaterialService.java

@@ -151,7 +151,10 @@ public interface IErpMaterialService
      */
     public ProcessInstance submitApply(ErpMaterial erpMaterial);
 
-    Integer addStockMaterial(ErpMaterialVo erpMaterialVo);
+    /**
+    *  审核通过添加物料库存查询记录
+    * */
+    void addInventoryInquiry(ErpMaterialVo erpMaterialVo);
 
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java

@@ -754,31 +754,36 @@ public class ErpMaterialServiceImpl implements IErpMaterialService
     }
 
 
-    /*审核通过添加库存物料信息*/
+    /**
+     *
+     * 审核通过添加物料库存查询记录
+     * */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Integer addStockMaterial(ErpMaterialVo erpMaterialVo) {
+    public void addInventoryInquiry(ErpMaterialVo erpMaterialVo) {
+
+        String materialNo = erpMaterialVo.getMaterialNo();
+        ErpMaterialVo oldErpMaterialVo = erpMaterialMapper.selectErpMaterialByMaterialNo(materialNo);
+
         WarehouseInventoryInquiry warehouseInventoryInquiry = new WarehouseInventoryInquiry();
-        warehouseInventoryInquiry.setMaterialNo(erpMaterialVo.getMaterialNo());
-        warehouseInventoryInquiry.setMaterialName(erpMaterialVo.getMaterialName());
-        warehouseInventoryInquiry.setMaterialDescribe(erpMaterialVo.getDescribe());
-        warehouseInventoryInquiry.setMaterialBrand(erpMaterialVo.getBrand());
-        warehouseInventoryInquiry.setMaterialProcessMethod(erpMaterialVo.getProcessMethod());
-        warehouseInventoryInquiry.setMaterialUnit(erpMaterialVo.getUnit());
-        warehouseInventoryInquiry.setMaterialPhotourl(erpMaterialVo.getPhotoUrl());
-        warehouseInventoryInquiry.setMaterialType(erpMaterialVo.getMaterialType());
+        warehouseInventoryInquiry.setMaterialNo(oldErpMaterialVo.getMaterialNo());
+        warehouseInventoryInquiry.setMaterialName(oldErpMaterialVo.getMaterialName());
+        warehouseInventoryInquiry.setMaterialDescribe(oldErpMaterialVo.getDescribe());
+        warehouseInventoryInquiry.setMaterialBrand(oldErpMaterialVo.getBrand());
+        warehouseInventoryInquiry.setMaterialProcessMethod(oldErpMaterialVo.getProcessMethod());
+        warehouseInventoryInquiry.setMaterialModel(oldErpMaterialVo.getMaterialModel());
+        warehouseInventoryInquiry.setMaterialUnit(oldErpMaterialVo.getUnit());
+        warehouseInventoryInquiry.setMaterialPhotourl(oldErpMaterialVo.getPhotoUrl());
+        warehouseInventoryInquiry.setMaterialType(oldErpMaterialVo.getMaterialType());
         warehouseInventoryInquiry.setMaterialUseStatus(erpMaterialVo.getUseStatus());
-        warehouseInventoryInquiry.setWarehouseDept(erpMaterialVo.getWarehouseDept());
-        if(erpMaterialVo.getDescribe().contains(",")){
-            warehouseInventoryInquiry.setMaterialSpecification(erpMaterialVo.getDescribe().split(" ")[0]);
-            warehouseInventoryInquiry.setMaterialModel(erpMaterialVo.getDescribe().split(",")[1]);
-        }
-        String user = ShiroUtils.getLoginName();
-        warehouseInventoryInquiry.setCreateBy(user);
+        warehouseInventoryInquiry.setWarehouseDept(oldErpMaterialVo.getWarehouseDept());
+        String loginName = ShiroUtils.getLoginName();
+        warehouseInventoryInquiry.setCreateBy(loginName);
         warehouseInventoryInquiry.setCreateTime(DateUtils.getNowDate());
-        warehouseInventoryInquiry.setUpdateBy(user);
-        warehouseInventoryInquiry.setUpdateTime(DateUtils.getNowDate());
-        return inventoryInquiryMapper.insertWarehouseInventoryInquiry(warehouseInventoryInquiry);
+        int insertResult = inventoryInquiryMapper.insertWarehouseInventoryInquiry(warehouseInventoryInquiry);
+        if (insertResult <= 0){
+            throw new BusinessException("添加物料库存查询记录失败");
+        }
     }