PDA收货数量问题

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApp/stockOutOrder/StockOutOrderAppApi.java

@@ -5,6 +5,10 @@ import com.mhd.common.core.web.controller.BaseController;
 import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.core.web.page.TableDataInfoApi;
 import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.domain.cache.AssociationWarehouseCacheDO;
+import com.mhd.system.api.domain.cache.SystemServiceCacheUtil;
+import com.mhd.common.core.domain.po.UserPo;
+import com.mhd.system.api.model.LoginUser;
 import com.mhd.wms.application.service.stockOutOrder.StockOutOrderApplicationService;
 import com.mhd.wms.domain.stockOutOrder.repository.po.StockOutOrderPO;
 import com.mhd.wms.domain.stockOutOrder.repository.todo.StockOutOrderDO;
@@ -33,15 +37,25 @@ public class StockOutOrderAppApi extends BaseController {
     private StockOutOrderAssembler stockOutOrderAssembler;
 
     /**
-     * 分页查询出库单列表
+     * 分页查询出库单列表（PDA复核查询）
+     * 查询条件：warehouse_id（用户关联仓库）、check_operators_by（当前用户）、check_status<3 等
      */
     @ApiOperation("查询出库单列表")
     @GetMapping("/list")
     public TableDataInfoApi list(StockOutOrderDTO stockOutOrderDTO) {
-        //转换实体
         StockOutOrderDO stockOutOrderDO = stockOutOrderAssembler.toDO(stockOutOrderDTO);
         startPage();
-        stockOutOrderDO.setCheckOperatorsBy(SecurityUtils.getLoginUser().getUserPo().getUserId());
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        UserPo userPo = loginUser.getUserPo();
+        stockOutOrderDO.setCheckOperatorsBy(userPo.getUserId());
+        stockOutOrderDO.setOrganizationId(userPo.getOrganizationId());
+        stockOutOrderDO.setTopOrganizationId(userPo.getTopOrganizationId());
+        stockOutOrderDO.setLtCheckStatus(3);
+        stockOutOrderDO.setDelFlag(1);
+        AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
+        if (associationWarehouseCacheDO != null) {
+            stockOutOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
+        }
         List<StockOutOrderPO> list = stockOutOrderApplicationService.queryList(stockOutOrderDO);
         return getDataTableApi(list);
     }