提交

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

@@ -296,14 +296,21 @@ public class WmspGridMaterialController extends BaseRESTfulController {
             @ApiImplicitParam(name = "apiId", value = "443", required = false, dataType = "BigDecimal"),
     })
     @PostMapping("/getSteelMaterialModelList")
-    public  RESTfulResult getSteelMaterialModelList(Integer pageNum,
+    public  RESTfulResult getSteelMaterialModelList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                    Integer pageNum,
                                                    Integer pageSize,
                                                    Integer apiId,
                                                     Integer warehouseId,
-                                                    Integer status){
-        List<Map<String,Object>> columnList=wmspGridMaterialService.getSteelMaterialModelList(warehouseId,status);
+                                                    Integer status,
+                                                    String con){
+        mapValue.put("warehouseId",warehouseId);
+        mapValue.put("status",status);
+//        进行对钢材物资名称的模糊查询
+        String cons = "%"+con+"%";
+        mapValue.put("con",cons);
+        List<Map<String,Object>> columnList=wmspGridMaterialService.getSteelMaterialModelList(mapValue);
         PageHelper.startPage(pageNum,pageSize);
-        List<Map<String,Object>> mapList=wmspGridMaterialService.getSteelMaterialModelList(warehouseId,status);
+        List<Map<String,Object>> mapList=wmspGridMaterialService.getSteelMaterialModelList(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId,columnList,mapList);
         return success(pageList);
     }

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

@@ -17,5 +17,5 @@ public interface WmspCheckWarehouseMapper extends IBaseMapper<WmspCheckWarehouse
 //    查找钢材物资信息
     List<Map<String, Object>> getSteelMaterialList();
     //    查找钢材物资规格型号信息以及当前仓储在今天的最大预留量
-    List<Map<String, Object>> getSteelMaterialModelList(Integer warehouseId,Integer status);
+    List<Map<String, Object>> getSteelMaterialModelList(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/IWmspGridMaterialService.java

@@ -59,7 +59,7 @@ public interface IWmspGridMaterialService  {
 
     int deleteGridMaterial(List<OutBoundMaterialDetailedInfo> thisMaterialDetailedInfos);
 
-    List<Map<String, Object>> getSteelMaterialModelList(Integer warehouseId,Integer status);
+    List<Map<String, Object>> getSteelMaterialModelList(Map<String,Object> map);
 //    新增入库转预留
     int insertReserved(String warehouseId, String materialCode, String materialSpecification, String materialModel, Integer quantity);
 //    新增预留转入库

src/main/java/com/steerinfo/dil/service/impl/WmsInboundResultServiceImpl.java

@@ -42,6 +42,10 @@ public class WmsInboundResultServiceImpl implements IWmsInboundResultService {
     @Override
     public List<Map<String, Object>> getWmsInboundResultStatistics(Map<String, Object> mapValue, Integer warehouseId) {
         mapValue.put("warehouseId",warehouseId);
+        if(mapValue.size()==2){
+            mapValue.put("orderType","desc");
+            mapValue.put("orderField","newtime");
+        }
         List<Map<String, Object>> maps = wmspInboundResultMapper.getWmsInboundResultStatistics(mapValue);
         return maps;
     }

src/main/java/com/steerinfo/dil/service/impl/WmspGridMaterialServiceImpl.java

@@ -341,8 +341,8 @@ public class WmspGridMaterialServiceImpl  implements IWmspGridMaterialService {
     }
 
     @Override
-    public List<Map<String, Object>> getSteelMaterialModelList(Integer warehouseId,Integer status) {
-        return wmspCheckWarehouseMapper.getSteelMaterialModelList(warehouseId,status);
+    public List<Map<String, Object>> getSteelMaterialModelList(Map<String,Object> map) {
+        return wmspCheckWarehouseMapper.getSteelMaterialModelList(map);
     }
     @Override
     public int deleteGridMaterial(List<OutBoundMaterialDetailedInfo> thisMaterialDetailedInfos) {

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/wms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -440,5 +440,17 @@
       ) table1
                        ON table1.code = RM.MATERIAL_CODE
       WHERE RPG.WAREHOUSE_ID = #{warehouseId} AND RM.MATERIAL_NAME IS NOT NULL
+      <if test="con!=null">
+        AND RM.MATERIAL_NAME LIKE (#{con})
+      </if>
+      <include refid="orderBy"></include>
     </select>
+    <sql id="orderBy">
+      <if test="orderField != null and orderField != ''">
+        order by "${orderField}"
+        <if test="orderType != null and orderType != ''">
+          ${orderType}
+        </if>
+      </if>
+    </sql>
 </mapper>

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

@@ -1568,6 +1568,8 @@
         table2.weight "weight",
         --                         炉号生产的第一件钢材时间
         table3.onetime "onetime",
+--         炉号生产的最新钢材时间
+        table3.newtime "newtime",
         --                         生产物资型号
         RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || '(' ||
         RM.MATERIAL_MODEL || ')' "materialName",
@@ -1627,6 +1629,7 @@
         LEFT JOIN(
         SELECT
         MIN(WIR4.INSERT_TIME) onetime,
+        MAX(WIR4.INSERT_TIME) newtime,
         MATERIAL_FURNACE_NUMBER  "furnaceNumber3"
         FROM
         WMSP_INBOUND_RESULT WIR4
@@ -1652,7 +1655,39 @@
             AND to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') <= WIR.INBOUND_TIME
             AND to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= WIR.INBOUND_TIME
         </if>
-        AND WIR.RESULT_DELETED = 0 ORDER BY table3.onetime ASC
+        AND WIR.RESULT_DELETED = 0
+        <where>
+            <if test="count != null">
+                and "count" in
+                <foreach collection="count" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="weight != null">
+                and "weight" in
+                <foreach collection="weight" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="onetime != null">
+                and "onetime" in
+                <foreach collection="onetime" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="materialName != null">
+                and "materialName" in
+                <foreach collection="materialName" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="furnaceNumber1 != null">
+                and "furnaceNumber1" in
+                <foreach collection="furnaceNumber1" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
         <include refid="orderBy"></include>
     </select>