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

sql/release_202405/wms_202405.sql

@@ -3000,3 +3000,10 @@ ALTER TABLE record_deliver_detail ADD COLUMN parent_packing_number VARCHAR(64) D
 -- 增加采收收货缺货生成记录功能
 alter table `record_purchasereceipt_main` add `purchasereturn_record_flag` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT 'FALSE' COMMENT '是否已生成缺货退货记录';
 alter table `record_purchasereceipt_main` add `purchasereturn_record_msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT null COMMENT '生成缺货退货记录异常信息';
+
+-- 标签类型
+-- 长春
+INSERT INTO `label_barcode` (`id`, `master_id`, `label_type`, `code`, `name`, `description`, `order`, `length`, `prefix_lenght`, `prefix_char`, `entity_properties`, `trim_end`, `is_encypt`, `encypt_method`, `deleted`, `tenant_id`, `create_time`, `creator`, `updater`, `update_time`) VALUES (null, 1688840868044877852, 'PurchaseLabel', 'toLocationCode', '来源库位', '来源库位', 1, 0, 0, 'C', 'ToLocationCode', '0', 'FALSE', NULL, b'0', 1, '2023-10-27 09:21:55', '1', '', '2024-09-25 14:11:05');
+-- 成都
+INSERT INTO `label_barcode` (`id`, `master_id`, `label_type`, `code`, `name`, `description`, `order`, `length`, `prefix_lenght`, `prefix_char`, `entity_properties`, `trim_end`, `is_encypt`, `encypt_method`, `deleted`, `tenant_id`, `create_time`, `creator`, `updater`, `update_time`) VALUES (null, 1688840868044877852, 'PurchaseLabel', 'toLocationCode', '来源库位', '来源库位', 1, 0, 0, 'C', 'ToLocationCode', '0', 'FALSE', NULL, b'0', 2, '2023-10-27 09:21:55', '1', '', '2024-09-25 14:11:05');
+INSERT INTO `label_barcode` (`id`, `master_id`, `label_type`, `code`, `name`, `description`, `order`, `length`, `prefix_lenght`, `prefix_char`, `entity_properties`, `trim_end`, `is_encypt`, `encypt_method`, `deleted`, `tenant_id`, `create_time`, `creator`, `updater`, `update_time`) VALUES (null, 1688840868044877852, 'PurchaseLabel', 'toLocationCode', '来源库位', '来源库位', 1, 0, 0, 'C', 'ToLocationCode', '0', 'FALSE', NULL, b'0', 3, '2023-10-27 09:21:55', '1', '', '2024-09-25 14:11:05');

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/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()));

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/RecommendedUtils.java

@@ -346,7 +346,7 @@ public class RecommendedUtils {
             countQty = countQty.add(balanceDO.getQty().subtract(countQtyExpectout));
             // 20240926 cxm HL-6131 如果balanceDOListJob 实际推荐列表中有值 最后推荐不累加直接返回
             // 数据列表循环累加 直到总和大于等于当前物料的qty {countQty >= balanceDO.getQty()}
-            if (balanceDOListJob != null && balanceDOListJob.size() > 0 && countQty.compareTo(qty) != -1) {
+            if (balanceDOListJob != null && balanceDOListJob.size() > 0 && countQty.compareTo(qty) > 0) {
                 break;
             }