Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API into dev

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

@@ -621,7 +621,11 @@ public class OMSController {
     public Map<String,Object> getUnloadOrderMaterial(@RequestBody(required = false)Map<String,Object>map){
         return omsFeign.getUnloadOrderMaterial(map);
     }
-
+    @ApiOperation(value = "根据运输订单号查询卸货点")
+    @PostMapping("/getUnloadOrderWarehouseName")
+    public Map<String,Object> getUnloadOrderWarehouseName(@RequestBody(required = false)Map<String,Object>map){
+        return omsFeign.getUnloadOrderWarehouseName(map);
+    }
 
     @ApiOperation(value = "分解异地库计划")
     @PostMapping("/apportionInwardOffsetOrder")

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

@@ -545,8 +545,7 @@ public class WMSController extends BaseRESTfulController {
                                         Integer pageSize,
                                         String con,
                                         String startTime,
-                                        String endTime
-                                      ) {
+                                        String endTime) {
         return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
     }
 

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

@@ -393,6 +393,10 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckorderseparates/getUnloadOrderMaterial")
     Map<String, Object> getUnloadOrderMaterial(@RequestBody(required = false)Map<String, Object> map);
 
+    @ApiOperation(value = "根据运输订单号查询卸货点")
+    @PostMapping("api/v1/oms/omstruckorderseparates/getUnloadOrderWarehouseName")
+    Map<String, Object> getUnloadOrderWarehouseName(@RequestBody(required = false)Map<String, Object> map);
+
     @ApiOperation(value = "根据运输订单id查询物资")
     @PostMapping("api/v1/oms/omstruckorders/getOrderMaterialList")
     Map<String, Object> getOrderMaterialList(@RequestParam Integer orderId);

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

@@ -352,12 +352,10 @@
         RM.MATERIAL_CODE "materialCode",
         RM.MATERIAL_SPECIFICATION "materialSpecification",
         RM.MATERIAL_MODEL "materialModel"
-        FROM RMS_MATERIAL RM
-        <where>
-            <if test="index != null">
-                (instr(RM.MATERIAL_NAME, #{index}) > 0 or instr(RM.MATERIAL_SPECIFICATION,#{index}) >0 or instr(RM.MATERIAL_MODEL,#{index}) >0)
-            </if>
-        </where>
+        FROM RMS_MATERIAL RM WHERE  RM.DELETED = 0
+        <if test="index != null">
+            AND (instr(RM.MATERIAL_NAME, #{index}) > 0 or instr(RM.MATERIAL_SPECIFICATION,#{index}) >0 or instr(RM.MATERIAL_MODEL,#{index}) >0)
+        </if>
         )
         <where>
             <if test="materialName != null">