PDA复核查询修改

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/stockOutOrder/StockOutOrderAssembler.java

@@ -35,6 +35,7 @@ public class StockOutOrderAssembler {
         stockOutOrderDO.setCreateTimeEnd(stockOutOrderDTO.getCreateTimeEnd());
         stockOutOrderDO.setAuditTimeStart(stockOutOrderDTO.getAuditTimeStart());
         stockOutOrderDO.setAuditTimeEnd(stockOutOrderDTO.getAuditTimeEnd());
+        stockOutOrderDO.setTabType(stockOutOrderDTO.getTabType());
         return stockOutOrderDO;
     }
 

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java

@@ -280,6 +280,8 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO {
     @ApiModelProperty("小于复核状态: 1-未复核 2-复核中 3-已复核")
     private Integer ltCheckStatus;
 
+    @ApiModelProperty("PDA复核查询tab: 1-列表(待复核) 2-历史记录(已复核)")
+    private Integer tabType;
 
     @ApiModelProperty("to")
     @Excel(name = "to")

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

@@ -50,8 +50,14 @@ public class StockOutOrderAppApi extends BaseController {
         stockOutOrderDO.setCheckOperatorsBy(userPo.getUserId());
         stockOutOrderDO.setOrganizationId(userPo.getOrganizationId());
         stockOutOrderDO.setTopOrganizationId(userPo.getTopOrganizationId());
-        stockOutOrderDO.setGtCheckStatus(null);  // 清除，避免与 lt 冲突
-        stockOutOrderDO.setLtCheckStatus(3);    // check_status < 3，只查未复核(1)、复核中(2)，不查已复核(3)
+        stockOutOrderDO.setGtCheckStatus(null);
+        stockOutOrderDO.setLtCheckStatus(null);
+        // tabType=2 历史记录：check_status>2(已复核)；否则 列表：check_status<3(未复核、复核中)
+        if (Integer.valueOf(2).equals(stockOutOrderDO.getTabType())) {
+            stockOutOrderDO.setGtCheckStatus(2);
+        } else {
+            stockOutOrderDO.setLtCheckStatus(3);
+        }
         stockOutOrderDO.setDelFlag(1);
         AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
         if (associationWarehouseCacheDO != null) {