1. 更新ERP接口

2. swagger适配

1. 更新ERP接口
2. swagger适配
肖超群
1 parent daf7ae48
Showing 8 changed files with 58 additions and 40 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/controller/ErpController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/entity/ErpCancel.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/IErpService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/service/impl/ErpServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java
huaheng-wms-core/src/main/java/org/jeecg/utils/Swagger3Config.java
huaheng-wms-core/src/main/java/org/jeecg/utils/interceptor/HuahengBatisInterceptor.java
 package org.jeecg.modules.wms.api.erp.controller;
  
-import java.util.Map;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
  
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.wms.api.erp.entity.ErpReceipt;
-import org.jeecg.modules.wms.api.erp.entity.ErpShipment;
-import org.jeecg.modules.wms.api.erp.entity.InventoryQueryParam;
+import org.jeecg.modules.wms.api.erp.entity.*;
 import org.jeecg.modules.wms.api.erp.service.IErpService;
-import org.jeecg.modules.wms.config.material.entity.Material;
 import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
 import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
 import org.jeecg.utils.HuahengJwtUtil;
@@ -43,9 +38,9 @@ public class ErpController extends HuahengBaseController {
     @ResponseBody
     @ApiOperation("取消入库单")
     @ApiLogger(apiName = "取消入库单", from = "ERP")
-    public Result cancelReceipt(@RequestBody Map<String, String> param, HttpServletRequest req) {
-        String referCode = param.get("referCode");
-        String warehouseCode = param.get("warehouseCode");
+    public Result cancelReceipt(@RequestBody ErpCancel erpCancel, HttpServletRequest req) {
+        String referCode = erpCancel.getReferCode();
+        String warehouseCode = erpCancel.getWarehouseCode();
         return erpService.cancelReceipt(referCode, warehouseCode);
     }
  
@@ -61,9 +56,9 @@ public class ErpController extends HuahengBaseController {
     @ResponseBody
     @ApiOperation("取消出库单")
     @ApiLogger(apiName = "取消出库单", from = "ERP")
-    public Result cancelShipment(@RequestBody Map<String, String> param, HttpServletRequest req) {
-        String referCode = param.get("referCode");
-        String warehouseCode = param.get("warehouseCode");
+    public Result cancelShipment(@RequestBody ErpCancel erpCancel, HttpServletRequest req) {
+        String referCode = erpCancel.getReferCode();
+        String warehouseCode = erpCancel.getWarehouseCode();
         return erpService.cancelShipment(referCode, warehouseCode);
     }
  
@@ -80,7 +75,8 @@ public class ErpController extends HuahengBaseController {
     @ResponseBody
     @ApiOperation("增加物料")
     @ApiLogger(apiName = "增加物料", from = "ERP")
-    public Result addMaterial(@RequestBody Material material) {
-        return erpService.addMaterial(material);
+    public Result addMaterial(@RequestBody ErpMaterial erpMaterial) {
+        return erpService.addMaterial(erpMaterial);
     }
+
 }
+package org.jeecg.modules.wms.api.erp.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author 游杰
+ */
+@Data
+public class ErpCancel {
+
+    /** 上游系统单号 */
+    @ApiModelProperty(value = "上游系统单号", required = true)
+    private String referCode;
+    /** 仓库编码 */
+    @ApiModelProperty(value = "仓库编码", required = true)
+    private String warehouseCode;
+
+}
@@ -3,11 +3,25 @@ package org.jeecg.modules.wms.api.erp.entity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
  
+/**
+ * @author 游杰
+ */
 @Data
 public class ErpMaterial {
  
+    /** 物料编码 */
     @ApiModelProperty(value = "物料编码", required = true)
     private String code;
+    /** 物料名称 */
     @ApiModelProperty(value = "物料名称", required = true)
     private String name;
+    /** 规格 */
+    @ApiModelProperty(value = "规格")
+    private String spec;
+    /** 单位 */
+    @ApiModelProperty(value = "单位")
+    private String unit;
+    /** 类别 */
+    @ApiModelProperty(value = "类别")
+    private String type;
 }
 package org.jeecg.modules.wms.api.erp.service;
  
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.wms.api.erp.entity.ErpMaterial;
 import org.jeecg.modules.wms.api.erp.entity.ErpReceipt;
 import org.jeecg.modules.wms.api.erp.entity.ErpShipment;
 import org.jeecg.modules.wms.api.erp.entity.InventoryQueryParam;
-import org.jeecg.modules.wms.config.material.entity.Material;
 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
 import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentHeader;
  
@@ -38,7 +38,7 @@ public interface IErpService {
     /**
      * 增加物料信息
      */
-    public Result addMaterial(Material material);
+    public Result addMaterial(ErpMaterial erpMaterial);
  
     /**
      * 回传入库单
@@ -33,6 +33,7 @@ import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentHeaderServ
 import org.jeecg.utils.OkHttpUtils;
 import org.jeecg.utils.StringUtils;
 import org.jeecg.utils.constant.QuantityConstant;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
  
@@ -383,26 +384,15 @@ public class ErpServiceImpl implements IErpService {
  
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result addMaterial(Material material) {
-        if (StringUtils.isEmpty(material.getCode())) {
+    public Result addMaterial(ErpMaterial erpMaterial) {
+        if (StringUtils.isEmpty(erpMaterial.getCode())) {
             return Result.error("增加物料失败, 物料编码不能为空!!");
         }
-        if (StringUtils.isEmpty(material.getName())) {
+        if (StringUtils.isEmpty(erpMaterial.getName())) {
             return Result.error("增加物料失败, 物料名称不能为空!!");
         }
-        if (StringUtils.isEmpty(material.getWarehouseCode())) {
-            return Result.error("增加物料失败, 仓库编码不能为空!!");
-        }
-
-        Warehouse warehouse = warehouseService.getWarehouseByCode(material.getWarehouseCode());
-        if (warehouse == null) {
-            return Result.error("增加物料失败, 仓库为空!!");
-        }
-        material.setEnable(QuantityConstant.STATUS_ENABLE);
-        Material material1 = materialService.getMaterialByCode(material.getCode());
-        if (material1 != null) {
-            return Result.error("增加物料失败, 物料已经存在!!");
-        }
+        Material material = new Material();
+        BeanUtils.copyProperties(erpMaterial, material);
         boolean success = materialService.save(material);
         if (!success) {
             throw new ServiceException("增加物料失败, 保存时报错");
@@ -56,8 +56,6 @@ public class MaterialController extends JeecgController&lt;Material, IMaterialServi
     @GetMapping(value = "/list")
     public Result<IPage<Material>> queryPageList(Material material, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
-        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
-        material.setWarehouseCode(warehouseCode);
         QueryWrapper<Material> queryWrapper = QueryGenerator.initQueryWrapper(material, req.getParameterMap());
         Page<Material> page = new Page<Material>(pageNo, pageSize);
         IPage<Material> pageList = materialService.page(page, queryWrapper);
@@ -25,6 +25,9 @@ import springfox.documentation.spi.service.contexts.SecurityContext;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
  
+/**
+ * @author 游杰
+ */
 @Configuration
 @EnableSwagger2
 @EnableKnife4j
@@ -45,12 +45,10 @@ public class HuahengBatisInterceptor implements Interceptor {
                         Object local_createBy = field.get(parameter);
                         field.setAccessible(false);
                         if (local_createBy == null || local_createBy.equals("")) {
-                            if (sysUser != null) {
-                                // 登录人账号
-                                field.setAccessible(true);
-                                field.set(parameter, sysUser.getRealname());
-                                field.setAccessible(false);
-                            }
+                            // 登录人账号
+                            field.setAccessible(true);
+                            field.set(parameter, HuahengJwtUtil.getCurrentOperator());
+                            field.setAccessible(false);
                         }
                     }
                     // 注入创建时间