Merge branch 'master' of https://git.steerinfo.com/luobang/DIL-DAZHOU-WMS2

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

@@ -512,7 +512,7 @@ public class WmspOutboundResultController extends BaseRESTfulController {
 
     //统计出厂每个炉号生产的支数
     @PostMapping("/getWmsOutboundResultStatistics")
-    @ApiOperation(value = "展示入库统计信息")
+    @ApiOperation(value = "展示出库统计信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "371", required = false, dataType = "BigDecimal"),
     })

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

@@ -55,6 +55,7 @@ public class WmspSendReceiveController extends BaseRESTfulController {
                                            Integer pageNum,
                                            Integer pageSize,
                                            String  con,
+                                           Integer warehouseId,
                                            String startTime,
                                            String endTime
                                         ){
@@ -64,6 +65,7 @@ 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/WmspSendReceiveMapper.xml

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