修改接口地址 api/wms 改成api

肖超群
1 parent 314e1fee
Showing 13 changed files with 60 additions and 26 deletions
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/controller/AcsController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/entity/AcsStatus.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/service/IAcsService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/service/impl/AcsServiceImpl.java
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/ErpMaterial.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mes/controller/MesController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/controller/WcsController.java
huaheng-wms-core/src/main/java/org/jeecg/utils/Swagger3Config.java
huaheng-wms-core/src/main/resources/application-dev.yml
huaheng-wms-core/src/main/resources/application-prod.yml
huaheng-wms-core/src/main/resources/application-test.yml
@@ -187,14 +187,15 @@
             <a>回传</a>
           </a-popconfirm>
           <a v-if="record.lastStatus < 800" @click="autoShipmentCombine(record)">自动配盘</a>
-          <a-divider type="vertical"/>
-          <a v-has="'shipmentHeader:edit'" @click="handleEdit(record)">编辑</a>
  
           <a-divider type="vertical"/>
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
-            <a-menu slot="overlay" v-has="'shipmentHeader:delete'">
-              <a-menu-item>
+            <a-menu slot="overlay">
+               <a-menu-item v-has="'shipmentHeader:edit'">
+                  <a @click="handleEdit(record)">编辑</a>
+               </a-menu-item>
+              <a-menu-item v-has="'shipmentHeader:delete'">
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
                 </a-popconfirm>
@@ -21,7 +21,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
  
 @RestController
-@RequestMapping("/api/wms/acs")
+@RequestMapping("/api/acs")
 @Api(tags = "AGV接口")
 public class AcsController extends HuahengBaseController {
  
@@ -58,7 +58,6 @@ public class AcsController extends HuahengBaseController {
         String taskNo = acsStatus.getTaskNo();
         String carNo = acsStatus.getCarNo();
         int status = acsStatus.getStatus();
-        String updateBy = acsStatus.getUpdateBy();
         if (StringUtils.isEmpty(taskNo)) {
             return Result.error("更新AGV状态,任务号为空");
         }
@@ -68,14 +67,12 @@ public class AcsController extends HuahengBaseController {
         if (status == 0) {
             return Result.error("更新AGV状态,状态信息为空");
         }
-        if (StringUtils.isEmpty(updateBy)) {
-            return Result.error("更新AGV状态,更新者信息为空");
-        }
         if (status == QuantityConstant.TASK_STATUS_COMPLETED) {
             Result result = agvTaskService.completeAgvTask(Integer.parseInt(taskNo));
             return result;
         }
-        Result result = acsService.notifyAGVTask(taskNo, carNo, status, updateBy);
+        System.out.println("");
+        Result result = acsService.notifyAGVTask(taskNo, carNo, status);
         return result;
     }
  
 package org.jeecg.modules.wms.api.acs.entity;
  
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
  
 /**
@@ -8,9 +9,10 @@ import lombok.Data;
 @Data
 public class AcsStatus {
  
+    @ApiModelProperty(value = "WMS任务号", required = true)
     private String taskNo;
+    @ApiModelProperty(value = "小车编号")
     private String carNo;
+    @ApiModelProperty(value = "任务状态", required = true)
     private int status;
-    private String updateBy;
-
 }
@@ -11,5 +11,5 @@ public interface IAcsService {
  
     Result updateAGVTask(AgvTask agvTask);
  
-    Result notifyAGVTask(String taskNo, String carNo, int status, String updateBy);
+    Result notifyAGVTask(String taskNo, String carNo, int status);
 }
@@ -122,14 +122,13 @@ public class AcsServiceImpl implements IAcsService {
     }
  
     @Override
-    public Result notifyAGVTask(String taskNo, String carNo, int status, String updateBy) {
+    public Result notifyAGVTask(String taskNo, String carNo, int status) {
         AgvTask agvTask = agvTaskService.getById(taskNo);
         if (agvTask == null) {
             return Result.error("没有找到对应AGV任务，任务号为" + taskNo);
         }
         agvTask.setStatus(status);
         agvTask.setCarno(carNo);
-        agvTask.setUpdateBy(updateBy);
         boolean result = agvTaskService.updateById(agvTask);
         if (!result) {
             return Result.error("更新任务信息失败 ");
@@ -16,11 +16,15 @@ import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
 import org.jeecg.utils.HuahengJwtUtil;
 import org.springframework.web.bind.annotation.*;
  
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
 /**
  * @author 游杰
  */
 @RestController
-@RequestMapping("/api/wms/erp")
+@RequestMapping("/api/erp")
+@Api(tags = "ERP接口")
 public class ErpController extends HuahengBaseController {
  
     @Resource
@@ -28,6 +32,7 @@ public class ErpController extends HuahengBaseController {
  
     @PostMapping("/receipt")
     @ResponseBody
+    @ApiOperation("入库单下发")
     @ApiLogger(apiName = "入库单下发", from = "ERP")
     public Result receipt(@RequestBody ErpReceipt erpReceipt, @RequestHeader(value = "token", required = false) String token) {
         String operator = HuahengJwtUtil.getAudienceByToken(token);
@@ -36,6 +41,7 @@ public class ErpController extends HuahengBaseController {
  
     @PostMapping("/cancelReceipt")
     @ResponseBody
+    @ApiOperation("取消入库单")
     @ApiLogger(apiName = "取消入库单", from = "ERP")
     public Result cancelReceipt(@RequestBody Map<String, String> param, HttpServletRequest req) {
         String referCode = param.get("referCode");
@@ -45,6 +51,7 @@ public class ErpController extends HuahengBaseController {
  
     @PostMapping("/shipment")
     @ResponseBody
+    @ApiOperation("出库单下发")
     @ApiLogger(apiName = "出库单下发", from = "ERP")
     public Result shipment(@RequestBody ErpShipment erpShipment) {
         return erpService.shipment(erpShipment);
@@ -52,6 +59,7 @@ public class ErpController extends HuahengBaseController {
  
     @PostMapping("/cancelShipment")
     @ResponseBody
+    @ApiOperation("取消出库单")
     @ApiLogger(apiName = "取消出库单", from = "ERP")
     public Result cancelShipment(@RequestBody Map<String, String> param, HttpServletRequest req) {
         String referCode = param.get("referCode");
@@ -61,6 +69,7 @@ public class ErpController extends HuahengBaseController {
  
     @PostMapping("/searchInventory")
     @ResponseBody
+    @ApiOperation("查询库存")
     @ApiLogger(apiName = "查询库存", from = "ERP")
     public Result searchInventory(@RequestBody InventoryQueryParam inventoryQueryParam, HttpServletRequest req) {
         Result result = erpService.searchInventory(inventoryQueryParam);
@@ -69,6 +78,7 @@ public class ErpController extends HuahengBaseController {
  
     @PostMapping("/addMaterial")
     @ResponseBody
+    @ApiOperation("增加物料")
     @ApiLogger(apiName = "增加物料", from = "ERP")
     public Result addMaterial(@RequestBody Material material) {
         return erpService.addMaterial(material);
+package org.jeecg.modules.wms.api.erp.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ErpMaterial {
+
+    @ApiModelProperty(value = "物料编码", required = true)
+    private String code;
+    @ApiModelProperty(value = "物料名称", required = true)
+    private String name;
+}
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
  * @author 游杰
  */
 @RestController
-@RequestMapping("/api/wms/mes")
+@RequestMapping("/api/mes")
 public class MesController extends HuahengBaseController {
  
     @Resource
@@ -22,7 +22,7 @@ import org.jeecg.utils.constant.QuantityConstant;
 import org.springframework.web.bind.annotation.*;
  
 @RestController
-@RequestMapping("/api/wms")
+@RequestMapping("/api/wcs")
 public class WcsController extends HuahengBaseController {
  
     @Resource
@@ -10,6 +10,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
  
 import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
  
@@ -31,6 +32,17 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 public class Swagger3Config extends Swagger2Config {
  
     /**
+     * 显示swagger-ui.html文档展示页，还必须注入swagger资源：
+     * @param registry
+     */
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+    }
+
+    /**
      * swagger2的配置文件，这里可以配置swagger2的一些基本的内容，比如扫描的包等等
      * @return Docket
      */
@@ -39,7 +51,7 @@ public class Swagger3Config extends Swagger2Config {
     public Docket defaultApi2() {
         return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()).select()
             // 此包路径下的类，才生成接口文档
-            .apis(RequestHandlerSelectors.basePackage("org.jeecg"))
+            .apis(RequestHandlerSelectors.basePackage("org.jeecg.modules.wms.api"))
             // 加了ApiOperation注解的类，才生成接口文档
             .apis(RequestHandlerSelectors.withClassAnnotation(RestController.class)).apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
             .paths(PathSelectors.any()).build().securitySchemes(Collections.singletonList(securityScheme())).securityContexts(securityContexts());
@@ -196,7 +196,7 @@ jeecg:
     #webapp文件路径
     webapp: /opt/webapp
   shiro:
-    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/test/test**,/api/wms/**,/sys/cas/client/validateLogin
+    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/test/test**,/api/**,/sys/cas/client/validateLogin
   #阿里云oss存储和大鱼短信秘钥配置
   oss:
     accessKey: ??
@@ -204,10 +204,10 @@ jeecg:
     endpoint: oss-cn-beijing.aliyuncs.com
     bucketName: jeecgdev
   # ElasticSearch 6设置
-  elasticsearch:
-    cluster-name: jeecg-ES
-    cluster-nodes: 127.0.0.1:9200
-    check-enabled: false
+  elasticsearch:a
+  cluster-name: jeecg-ES
+  cluster-nodes: 127.0.0.1:9200
+  check-enabled: false
   # 表单设计器配置
   desform:
     # 主题颜色（仅支持 16进制颜色代码）
@@ -194,7 +194,7 @@ jeecg:
     #webapp文件路径
     webapp: /opt/jeecg-boot/webapp
   shiro:
-    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/test/test**,/api/wms/**,/sys/cas/client/validateLogin
+    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/test/test**,/api/**,/sys/cas/client/validateLogin
   #阿里云oss存储和大鱼短信秘钥配置
   oss:
     accessKey: ??
@@ -196,7 +196,7 @@ jeecg:
     #webapp文件路径
     webapp: /opt/webapp
   shiro:
-    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/api/wms/**,/sys/cas/client/validateLogin
+    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/api/**,/sys/cas/client/validateLogin
   #阿里云oss存储和大鱼短信秘钥配置
   oss:
     accessKey: ??