1.0.62 合同新增SAP物料信息

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/controller/BaseMaterialInfoController.java

@@ -81,6 +81,19 @@ public class BaseMaterialInfoController extends BaseController {
         return toAjax(baseMaterialInfoService.insertByBo(bo));
     }
 
+    /**
+     * 合同新增SAP物料信息
+     * @param bo
+     * @return
+     */
+    @SaCheckPermission("oa/base:materialInfo:contractAdd")
+    @Log(title = "SAP物料信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/contractAdd")
+    public R<BaseMaterialInfoVo> contractAdd(@Validated(AddGroup.class) @RequestBody BaseMaterialInfoBo bo) {
+        return R.ok(baseMaterialInfoService.contractAdd(bo));
+    }
+
     /**
      * 修改SAP物料信息
      */

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/vo/BaseMaterialInfoVo.java

@@ -89,8 +89,7 @@ public class BaseMaterialInfoVo implements Serializable {
     /**
      * 备货期（天）
      */
-    @ExcelProperty(value = "备货期", converter = ExcelDictConvert.class)
+    @ExcelProperty(value = "备货期")
-    @ExcelDictFormat(readConverterExp = "天=")
     private Long stockingPeriod;
 
     /**

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/IBaseMaterialInfoService.java

@@ -76,4 +76,12 @@ public interface IBaseMaterialInfoService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 合同新增SAP物料信息
+     * @param bo
+     * @return
+     */
+    BaseMaterialInfoVo contractAdd(BaseMaterialInfoBo bo);
+
 }

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BaseMaterialInfoServiceImpl.java

@@ -111,6 +111,22 @@ public class BaseMaterialInfoServiceImpl implements IBaseMaterialInfoService {
         return flag;
     }
 
+    /**
+     * 合同新增SAP物料信息
+     * @param bo
+     * @return
+     */
+    @Override
+    public BaseMaterialInfoVo contractAdd(BaseMaterialInfoBo bo) {
+        BaseMaterialInfo add = MapstructUtils.convert(bo, BaseMaterialInfo.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setMaterialId(add.getMaterialId());
+        }
+        return MapstructUtils.convert(add, BaseMaterialInfoVo.class);
+    }
+
     /**
      * 修改SAP物料信息
      *