修改物料新增接口

肖超群
1 parent ded8cb8d
Showing 3 changed files with 35 additions and 3 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/agvcall/controller/AgvCallController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/entity/ErpMaterial.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/service/impl/ErpServiceImpl.java
+package org.jeecg.modules.wms.api.agvcall.controller;
+
+import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.annotations.Api;
+
+/**
+ * @author 游杰
+ */
+@RestController
+@RequestMapping("/api/agvcall")
+@Api(tags = "AGV接口")
+public class AgvCallController extends HuahengBaseController {
+
+}
@@ -24,4 +24,6 @@ public class ErpMaterial {
     /** 类别 */
     @ApiModelProperty(value = "类别")
     private String type;
+
+    private String warehouseCode;
 }
@@ -391,9 +391,22 @@ public class ErpServiceImpl implements IErpService {
         }
         Material material = new Material();
         BeanUtils.copyProperties(erpMaterial, material);
-        boolean success = materialService.save(material);
-        if (!success) {
-            throw new JeecgBootException("增加物料失败, 保存时报错");
+        String materialCode = material.getCode();
+        if (StringUtils.isEmpty(materialCode)) {
+            return Result.error("增加物料失败, 物料编码不能为空!!");
+        }
+        Material material1 = materialService.isMaterialExsit(materialCode);
+        if (material1 != null) {
+            material.setId(material1.getId());
+            boolean success = materialService.updateById(material);
+            if (!success) {
+                throw new JeecgBootException("增加物料失败, 更新时报错");
+            }
+        } else {
+            boolean success = materialService.save(material);
+            if (!success) {
+                throw new JeecgBootException("增加物料失败, 保存时报错");
+            }
         }
         return Result.ok("增加物料成功");
     }