liyg 2 سال پیش
والد
کامیت
925804187f

+ 8 - 0
src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -86,6 +86,14 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.dispatchOrder(map);
     }
 
+    @ApiOperation(value="更改运输订单状态")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/changeTransOrder")
+    @LogAround(foreignKeys = {"transOrderId"},foreignKeyTypes = {"运输订单"})
+    public Map<String, Object> changeTransOrder(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.changeTransOrder(map);
+    }
+
     @ApiOperation(value = "查询运输订单")
     @PostMapping("/getTransOrderList")
     public Map<String, Object> getTransOrderList(@RequestBody(required = false) Map<String, Object> map,

+ 3 - 0
src/main/java/com/steerinfo/dil/feign/TmsFeign.java

@@ -52,6 +52,9 @@ public interface TmsFeign {
     @PostMapping("api/v1/tms/omstransorders/closeTransOrder")
     Map<String, Object> closeTransOrder(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping("api/v1/tms/omstransorders/changeTransOrder")
+    Map<String, Object> changeTransOrder(Map<String, Object> map);
+
     @PostMapping("api/v1/tms/omstransorders/closeTransOrderByPlan")
     Map<String, Object> closeTransOrderByPlan(@RequestBody(required = false) Map<String, Object> map);
 }

+ 4 - 1
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -107,7 +107,10 @@
         RC.SSO_CODE "ssoCode",
         RC.COMPANY_ID "id",
         RC.COMPANY_ID "value",
-        RC.COMPANY_TYPE || '-' || RC.COMPANY_NAME "label"
+        <if test="companyType==null">
+            RC.COMPANY_TYPE || '-' ||
+        </if>
+        RC.COMPANY_NAME "label"
         from RMS_COMPANY RC
         where DELETED = 0        )
         <where>