1

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

@@ -764,14 +764,7 @@ public class AMScontroller  extends BaseRESTfulController {
         return amsFeign.saleUpdate(map);
     }
 
-    @ApiOperation(value = "发运通知单直接派车", notes = "发运通知单直接派车")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
-    })
-    @PostMapping(value = "/saleDispatchList")
-    public RESTfulResult saleDispatchList(@RequestBody Map<String, Object> map) {
-        return amsFeign.saleDispatchList(map);
-    }
+
 
     @ApiOperation(value = "批量新增发运通知单", notes = "批量新增发运通知单")
     @ApiImplicitParams({

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

@@ -754,4 +754,13 @@ public class TMSController extends BaseRESTfulController {
     public Map<String,Object> checkWeightResult(@RequestBody  Map<String,Object> map) {
         return tmsFeign.checkWeightResult(map);
     }
+
+    @ApiOperation(value = "发运通知单直接派车", notes = "发运通知单直接派车")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/saleDispatchList")
+    public RESTfulResult saleDispatchList(@RequestBody Map<String, Object> map) {
+        return tmsFeign.saleDispatchList(map);
+    }
 }

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

@@ -276,9 +276,6 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransrequirements/saleUpdate")
     RESTfulResult saleUpdate(@RequestBody Map<String, Object> map);
 
-    @PostMapping(value = "api/v1/ams/amstransrequirements/saleDispatchList")
-    RESTfulResult saleDispatchList(@RequestBody Map<String, Object> map);
-
     @PostMapping(value = "api/v1/ams/amstransrequirements/amsTransRequirementcorn")
     RESTfulResult amsTransRequirementcorn();
 

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

@@ -266,6 +266,9 @@ public interface TmsFeign {
 
     @PostMapping("api/v1/tms/tmsweightresults/checkWeightResult")
     Map<String, Object> checkWeightResult(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/omstransorders/saleDispatchList")
+    RESTfulResult saleDispatchList(@RequestBody Map<String, Object> map);
 }
 
 

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

@@ -1230,7 +1230,7 @@
                            on t.prod_code_l = b.material_code
         <where>
             <if test="prodCode != null and prodCode != ''">
-                and t.prod_code = #{prodCode}
+                and REGEXP_LIKE(t.prod_code, #{prodCode})
             </if>
         </where>
         union all
@@ -1261,10 +1261,10 @@
         from rms_material b
         <where>
             <if test="prodCode != null and prodCode != ''">
-                and b.material_code = #{prodCode}
+                and REGEXP_LIKE(b.material_code, #{prodCode})
             </if>
             <if test="materialId != null and materialId != ''">
-                and b.material_id = #{materialId}
+                and REGEXP_LIKE(b.material_id, #{materialId})
             </if>
         </where>
     </select>