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

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

@@ -77,10 +77,10 @@ public class WmsInboundResultController extends BaseRESTfulController {
      * @param pageSize
      * @return
      */
-    @PostMapping("/getWmsInboundResult2")
+    @PostMapping("/getWmsInboundResult")
     @ApiOperation(value = "展示入库实绩信息")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "90", required = false, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "apiId", value = "371", required = false, dataType = "BigDecimal"),
     })
     public RESTfulResult getWmsInboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                              Integer apiId,

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

@@ -331,10 +331,8 @@ public class WmspRestackMakeResultController extends BaseRESTfulController {
 
     //PDA根据仓库id查找倒垛单
     @GetMapping("/selectRestackByWarehouseIds")
-    public  RESTfulResult selectRestackByWarehouseIds(@RequestParam(required = true) String warehouseid){
-
+    public  RESTfulResult selectRestackByWarehouseIds(@RequestParam(name = "warehouseid") String warehouseid){
         List<Map<String,Object>> list=wmspRestackMakeResultService.selectRestackByWarehouseIds( warehouseid);
-
         return  success(list);
     }
 

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

@@ -1399,10 +1399,14 @@
            rw.WAREHOUSE_NAME "warehouseName"-- 当前下发的倒垛单的完成状态
           
            FROM WMSP_RESTACK_MAKE_RESULT wrme
-           LEFT JOIN WMSP_RESTACK_MAKE_MATERIAL wrmm ON wrmm.MAKE_RESULT_ID=wrme.RESULT_ID
-           LEFT JOIN RMS_STACKING rs ON rs.STACKING_ID=wrme.AFTER_STACKING_ID
-           LEFT JOIN RMS_STACKING rs2 ON rs2.STACKING_ID=wrme.AFTER_BEFORE_STACKING_ID
-           LEFT JOIN RMS_WAREHOUSE rw ON rw.WAREHOUSE_ID=wrme.AFTER_WAREHOUSE_ID
+           LEFT JOIN WMSP_RESTACK_MAKE_MATERIAL wrmm
+               ON wrmm.MAKE_RESULT_ID=wrme.RESULT_ID
+           LEFT JOIN RMS_STACKING rs
+               ON rs.STACKING_ID=wrme.AFTER_STACKING_ID
+           LEFT JOIN RMS_STACKING rs2
+               ON rs2.STACKING_ID=wrme.AFTER_BEFORE_STACKING_ID
+           LEFT JOIN RMS_WAREHOUSE rw
+               ON rw.WAREHOUSE_ID=wrme.AFTER_WAREHOUSE_ID
             WHERE wrme.DISTRIBUTIONSTATUS=1 and wrme.DELETED=0 and wrme.RESULT_STATUS=0 and wrme.AFTER_WAREHOUSE_ID=#{warehouseid}
     </select>
   <select id="getResultLoaderAudit" resultType="java.lang.Integer">