Merge remote-tracking branch 'origin/hella_online_20240927' into hella_online_20240927

win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java

@@ -1344,6 +1344,7 @@ public interface ErrorCodeConstants {
     ErrorCode COUNT_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_154_000, "盘点任务主不存在");
     ErrorCode COUNT_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_154_001, "盘点任务子不存在");
     ErrorCode COUNT_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_154_002, "盘点任务状态错误");
+    ErrorCode COUNT_JOB_MAIN_PROGRESS_ERROR = new ErrorCode(1_000_154_003, "盘点任务进行中，无法关闭");
     // 盘点申请ErrorCode
     ErrorCode COUNT_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_155_000, "盘点申请主不存在");
     ErrorCode COUNT_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_155_001, "盘点申请子不存在");

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java

@@ -881,6 +881,35 @@ public class BalanceServiceImpl implements BalanceService {
                         queryWrapperSenior.in("area_type", areaTypeList);
                     }
                 }
+            }else{
+                if (businesstypeDO != null) {
+                    // 增加为空判断，防止报错
+                    if (businesstypeDO.getOutAreaTypes() != null) {
+                        String[] outAreaArray = businesstypeDO.getOutAreaTypes().split(",");
+                        if (!Arrays.asList(outAreaArray).isEmpty()) {
+                            queryWrapperSenior.in("area_type", Arrays.asList(outAreaArray));
+                        }
+                    }
+                    if (businesstypeDO.getOutInventoryStatuses() != null) {
+                        String[] inventoryStatuseArray = businesstypeDO.getOutInventoryStatuses().split(",");
+                        if (!Arrays.asList(inventoryStatuseArray).isEmpty()) {
+                            queryWrapperSenior.in("inventory_status", Arrays.asList(inventoryStatuseArray));
+                        }
+                    }
+                    if (businesstypeDO.getItemTypes() != null) {
+                        String[] itemTypeArray = businesstypeDO.getItemTypes().split(",");
+                        QueryWrapper<ItembasicDO> itembasicDOQueryWrapper = new QueryWrapper<>();
+                        itembasicDOQueryWrapper.in("type", Arrays.asList(itemTypeArray));
+                        List<ItembasicDO> itembasicDOS = itembasicMapper.selectList(itembasicDOQueryWrapper);
+                        List<String> itemCodeList = new ArrayList<>();
+                        for (ItembasicDO itembasicDO : itembasicDOS) {
+                            itemCodeList.add(itembasicDO.getCode());
+                        }
+                        if (itemCodeList.size() > 0) {
+                            queryWrapperSenior.in("item_code", itemCodeList);
+                        }
+                    }
+                }
             }
         }
         return balanceMapper.selectLocationTypeToBalanceSenior(conditions, queryWrapperSenior);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java

@@ -190,7 +190,7 @@ public class CountJobMainServiceImpl implements CountJobMainService {
         CountJobMainDO countJobMainDO = this.validateCountJobMainExists(id);
         JobStatusState jobStatusState = new JobStatusState(countJobMainDO.getStatus());
         if (!jobStatusState.close()) {
-            throw exception(COUNT_JOB_MAIN_STATUS_ERROR);
+            throw exception(COUNT_JOB_MAIN_PROGRESS_ERROR);
         }
         countJobMainDO.setStatus(jobStatusState.getState().getCode());
         trendsApi.createTrends(id, "job_count_main", "关闭了盘点任务", TrendsTypeEnum.JOB_CLOSE, String.valueOf(getLoginUserId()));