PDA容器移位修改bug

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryQueryListDTO.java

@@ -169,6 +169,10 @@ public class MaterialInventoryQueryListDTO extends MaterialBaseDTO {
     @Excel(name = "物料/库位信息")
     private String storageInfo;
 
+    @ApiModelProperty("容器号或批次号，输入后同时按容器号、批次号模糊匹配")
+    @Excel(name = "容器号或批次号")
+    private String containerOrBatch;
+
     @ApiModelProperty("Batch Ref NO's")
     @Excel(name = "Batch Ref NO's")
     private String batchRefNo;

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApp/shiftManage/ShiftManageAppApi.java

@@ -50,10 +50,10 @@ public class ShiftManageAppApi extends BaseController {
     /**
      * 下拉分页查询移位管理列表
      */
-    @ApiOperation("移位详情")
+    @ApiOperation("移位详情。按单移位传 shiftManageId，从库存/容器移位传 materialInventoryId，返回结构一致")
     @GetMapping("/getInfoByApp")
-    public AjaxResult getInfoByApp(Long shiftManageId) {
-        ShiftManagePO shiftManagePO = shiftManageApplicationService.getInfoByApp(shiftManageId);
+    public AjaxResult getInfoByApp(Long shiftManageId, Long materialInventoryId) {
+        ShiftManagePO shiftManagePO = shiftManageApplicationService.getInfoByApp(shiftManageId, materialInventoryId);
         return AjaxResult.success(shiftManagePO);
     }
 
@@ -84,6 +84,4 @@ public class ShiftManageAppApi extends BaseController {
         return AjaxResult.success(shiftManageApplicationService.appMoveContainShift(containerShiftDOList));
     }
 
-
-
 }