2.28

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

@@ -47,14 +47,12 @@ public class WmspInventoryCloseController extends BaseRESTfulController {
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer warehouseId,
                                                String  value){
             if(mapValue == null){
                 mapValue = new HashMap<>();
             }
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
             String sd = sdf.format(new Date(Long.parseLong(value))); // 时间戳转换日期
-            mapValue.put("warehouseId",warehouseId);
             mapValue.put("value",sd);
             List<Map<String,Object>>inventoryCloseList = wmspInventoryCloseServiceImpl.getWmspInventoryClose(mapValue);
             /*分页*/

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

@@ -54,7 +54,6 @@ public class WmspSendReceiveController extends BaseRESTfulController {
                                            Integer pageNum,
                                            Integer pageSize,
                                            String  con,
-                                           Integer warehouseId,
                                            String startTime,
                                            String endTime
                                         ){
@@ -64,7 +63,6 @@ public class WmspSendReceiveController extends BaseRESTfulController {
         if(mapValue == null){
             mapValue =new HashMap<>();
         }
-        mapValue.put("warehouseId",warehouseId);
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         List<Map<String,Object>> sendReceiveList = iWmspSendReceiveService.getWmspSendReceiveService(mapValue);
 

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

@@ -461,10 +461,7 @@
     on rm.material_id=wpic.material_id
     join rms_warehouse rw
     on rw.warehouse_id=wpic.warehouse_id
-    where wpic.WAREHOUSE_ID = #{warehouseId}
-    <if test="value!=null">
-      and #{value}= to_char(wpic.INSERT_TIME,'yyyy-mm')
-    </if>
+    where  #{value}= to_char(wpic.INSERT_TIME,'yyyy-mm')
     )
     <where>
       <if test="warehouse_name != null">

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

@@ -467,7 +467,7 @@
     on rmt.material_type_id=rm.material_type_id
     join rms_warehouse rw
     on rw.warehouse_id=wsr.warehouse_id
-    where wsr.WAREHOUSE_ID = #{warehouseId}
+   <where>
     <if test="oneDate != null">
       and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= wsr.INSERT_TIME
     </if>
@@ -475,6 +475,7 @@
       and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= wsr.INSERT_TIME
       and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= wsr.INSERT_TIME
     </if>
+  </where>
     )
     <where>
       <if test="warehouse_name != null">