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

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

@@ -961,10 +961,13 @@ public class WMSController extends BaseRESTfulController {
     }
 //    查询所有的钢材物资信息
     @PostMapping(value = "/getSteelMaterialList")
-    public Map<String,Object> getSteelMaterialList(@RequestParam(value = "pageNum") Integer pageNum,
-                                                 @RequestParam(value = "pageSize") Integer pageSize,
-                                                 @RequestParam(value = "apiId") Integer apiId) {
-        return wmsFeign.getSteelMaterialList(pageNum,pageSize,apiId);
+    public Map<String,Object> getSteelMaterialList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId,
+                                                  Integer warehouseId,
+                                                   String con) {
+        return wmsFeign.getSteelMaterialList(mapVal ==null? new HashMap<>():mapVal,pageNum,pageSize,apiId,warehouseId,con);
     }
     //    查询所有的钢材物资规格型号信息
     @PostMapping(value = "/getSteelMaterialModelList")

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

@@ -835,9 +835,13 @@ public interface WMSFeign {
                                           @RequestParam(value = "pageSize") Integer pageSize,
                                           @RequestParam(value = "apiId") Integer apiId);
     @PostMapping("/api/v1/wms/wmspgridmaterials/getSteelMaterialList")
-    Map<String,Object> getSteelMaterialList(@RequestParam(value = "pageNum") Integer pageNum,
-                                          @RequestParam(value = "pageSize") Integer pageSize,
-                                          @RequestParam(value = "apiId") Integer apiId);
+    Map<String,Object> getSteelMaterialList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer warehouseId,
+                                            @RequestParam String con);
+
     @PostMapping("/api/v1/wms/wmspgridmaterials/getSteelMaterialModelList")
     Map<String,Object> getSteelMaterialModelList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                 @RequestParam(value = "pageNum") Integer pageNum,

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

@@ -75,14 +75,14 @@
                         ON DB.BATCH_ID = APO.BATCH_ID
                     JOIN RMS_MATERIAL RM
                         ON RM.MATERIAL_ID = DB.MATERIAL_ID
-                <where>
+                where APO.DELETED = 0
                     <if test="supplierId != null">
                         and APO.SUPPLIER_UNIT_ID = #{supplierId}
                     </if>
                     <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>
+
                  group by RM.MATERIAL_ID,RM.MATERIAL_NAME,RM.MATERIAL_CODE,RM.MATERIAL_SPECIFICATION,RM.MATERIAL_MODEL
         )
         <where>
@@ -168,13 +168,11 @@
             <if test="index != null">
                 and (instr(RC.CAPACITY_NUMBER, #{index}) > 0 or instr(RCA.CARRIER_NAME, #{index}) > 0)
             </if>
-        )
-        <where>
             <if test="con != null">
-                and instr(RC.INSERT_UPDATE_REMARK,#{con}) > 0
-                "capacityNumber" like #{con} or "carrierName" like #{con} or
-                "remark" like #{con}
+                and instr(RC.INSERT_UPDATE_REMARK, #{con}) > 0
             </if>
+        )
+        <where>
             <if test="capacityNumber != null">
                 <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
                     "capacityNumber" like '%${item}%'