调整盘点分页查询业务

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/BussinessInventoryReq.java

@@ -14,6 +14,7 @@ public class BussinessInventoryReq {
     private String inventoryState;
     private String examineState;
     private String type;
+    private String result;
     private String typeList;
     private String orgId;
     private String orderState;

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BussinessInventoryServiceImpl.java

@@ -884,12 +884,12 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
 
                 }
 
-                //同组织机构当前仓库需要增加价格和数量
-                InventorySumReq summaryNowReq=new InventorySumReq();
-                summaryNowReq.setLocationId(BI.getWarehouseId());
-                summaryNowReq.setUnitPrice(String.valueOf(Isum.getPrice()));
-                summaryNowReq.setTypeId(Isum.getTypeId());
-                summaryNowReq.setSizeId(Isum.getSizeId());
+//                //同组织机构当前仓库需要增加价格和数量
+//                InventorySumReq summaryNowReq=new InventorySumReq();
+//                summaryNowReq.setLocationId(BI.getWarehouseId());
+//                summaryNowReq.setUnitPrice(String.valueOf(Isum.getPrice()));
+//                summaryNowReq.setTypeId(Isum.getTypeId());
+//                summaryNowReq.setSizeId(Isum.getSizeId());
             }
           List<ViewEquipmentDto> viewEd=  inventoryMapper.GetViewEquipment(UpdateInventorys);
             for (ViewEquipmentDto inv:viewEd
@@ -1067,6 +1067,7 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
         if (ObjectUtil.isEmpty(req)) {
             return wrapper;
         }
+        wrapper.eq(BussinessInventory::getResult, req.getResult());
         wrapper.eq(BussinessInventory::getOrgId, req.getOrgId());
         wrapper.eq(StringUtils.isNotBlank(req.getWarehouseId()), BussinessInventory::getWarehouseId, req.getWarehouseId());
         wrapper.eq(StringUtils.isNotBlank(req.getInventoryState()), BussinessInventory::getInventoryState, req.getInventoryState());