Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -863,6 +863,12 @@ public class AMScontroller  extends BaseRESTfulController {
         return amsFeign.selectBalanceRemark(map);
     }
 
+    @ApiOperation("获取退货打印备注")
+    @PostMapping("/selectReturnGoodsRemark")
+    RESTfulResult selectReturnGoodsRemark(@RequestBody Map<String,Object> map) {
+        return amsFeign.selectReturnGoodsRemark(map);
+    }
+
     @ApiOperation("销售物流单停用或启用")
     @PostMapping("/deactivateOrEnable")
     RESTfulResult deactivateOrEnable(@RequestBody Map<String,Object> map) {

src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -1031,12 +1031,23 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.disposeQueueGrid(map);
     }
 
+
+    @ApiOperation(value = "获取网格数据")
+    @PostMapping("/getGridAllData")
+    public Map<String,Object> getGridAllData(@RequestBody Map<String,Object> map) {
+        return tmsFeign.getGridAllData(map);
+    }
+
     @ApiOperation(value = "处理排队实绩数据")
     @PostMapping("/disposeQueueResult")
     public Map<String,Object> disposeQueueResult(@RequestBody Map<String,Object> map) {
         return tmsFeign.disposeQueueResult(map);
     }
 
-
-
+    @ApiOperation(value = "禁用/启用运输订单")
+    @PostMapping("/banTransOrder")
+    @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"运输订单"})
+    public Map<String,Object> banTransOrder(@RequestBody Map<String,Object> map) {
+        return tmsFeign.banTransOrder(map);
+    }
 }

src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -411,4 +411,11 @@ public class UniversalController extends BaseRESTfulController {
         List<Map<String, Object>> list = universalMapper.getCompanyMesByLike2(map);
         return success(list);
     }
+
+    @ApiOperation(value = "获取排队网格")
+    @PostMapping("/getQueueGridList")
+    public RESTfulResult getQueueGridList(@RequestBody(required = false) Map<String,Object> map) {
+        List<Map<String,Object>> list = universalMapper.getQueueGridList(map);
+        return success(list);
+    }
 }

src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -321,6 +321,9 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransrequirements/selectBalanceRemark")
     RESTfulResult selectBalanceRemark(@RequestBody Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/ams/amstransrequirements/selectReturnGoodsRemark")
+    RESTfulResult selectReturnGoodsRemark(@RequestBody Map<String, Object> map);
+
     @PostMapping(value = "api/v1/ams/amstransplans/deactivateOrEnable")
     RESTfulResult deactivateOrEnable(@RequestBody Map<String, Object> map);
 

src/main/java/com/steerinfo/dil/feign/TmsFeign.java

@@ -362,6 +362,13 @@ public interface TmsFeign {
 
     @PostMapping(value = "/api/v1/tms/tmsqueueresults/disposeQueueResult")
     Map<String, Object> disposeQueueResult(Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/tms/tmsqueuegrids/getGridAllData")
+    Map<String, Object> getGridAllData(Map<String, Object> map);
+
+
+    @PostMapping("api/v1/tms/omstransorders/banTransOrder")
+    Map<String, Object> banTransOrder(@RequestBody(required = false) Map<String, Object> map);
 }
 
 

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -112,4 +112,7 @@ public interface UniversalMapper {
     String getMaxSerialNumber();
 
     List<Map<String, Object>> getCompanyMesByLike2(Map<String, Object> map);
+
+    List<Map<String, Object>> getQueueGridList(Map<String, Object> map);
+
 }

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -2066,4 +2066,11 @@
             order by to_number(RC.CREDENTIAL_DESC),LENGTH(company_name))
         </if>
     </select>
+    <select id="getQueueGridList" resultType="java.util.Map">
+        SELECT
+        GRID_ID "value",
+        GRID_NAME "label"
+        FROM TMS_QUEUE_GRID
+        where DELETED = 0
+    </select>
 </mapper>