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

sql/release_202405/wms_202405.sql

@@ -2956,8 +2956,8 @@ INSERT INTO `document_documentsetting`( `code`, `name`, `description`, `type`, `
 INSERT INTO `system_serial_number`( `rule_code`, `rule_name`, `prefix`, `pattern`, `length`, `separator`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ( 'HoldToWipRecord', '隔离转线边记录', 'REC61', 'yyyyMMdd', 4, '-', NULL, '1', '2024-09-19 15:11:27', '1', '2024-09-19 15:11:27', b'0');
 INSERT INTO `system_serial_number`( `rule_code`, `rule_name`, `prefix`, `pattern`, `length`, `separator`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ( 'HoldToWipJob', '隔离转线边任务', 'JOB38', 'yyyyMMdd', 4, '-', NULL, '1', '2024-09-19 15:10:08', '1', '2024-09-19 15:10:08', b'0');
 INSERT INTO `system_serial_number`( `rule_code`, `rule_name`, `prefix`, `pattern`, `length`, `separator`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ( 'HoldToWipRequest', '隔离转线边申请', 'REQ58', 'yyyyMMdd', 4, '-', NULL, '1', '2024-09-19 14:32:46', '1', '2024-09-19 15:08:42', b'0');
-
-
+-- 增加供应商批次
+ALTER TABLE record_packagesplit_detail ADD COLUMN altBatch VARCHAR(64) DEFAULT NULL COMMENT '供应商批次';
 
 -- 计划外出库增加目的地字段
 ALTER TABLE request_unplannedissue_main add COLUMN destination VARCHAR(255) DEFAULT NULL COMMENT '目的地';

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java

@@ -304,6 +304,10 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ
             number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_OK_RECORD.getCode());
             recordsettingDO = recordsettingService.selectRecordsettingExist("HoldToOkRecord");
             businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOkRecord", "隔离转合格记录");
+        } else if ("HoldToWip".equals(inventorymoveRecordMainDO.getBusinessType())) {
+            number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_WIP_RECORD.getCode());
+            recordsettingDO = recordsettingService.selectRecordsettingExist("HoldToWipRecord");
+            businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToWipRecord", "隔离转线边记录");
         } else if ("OkToHold".equals(inventorymoveRecordMainDO.getBusinessType())) {
             String inventorymoveConfirmationSwitch = switchService.selectSwitchExist("inventorymoveConfirmationSwitch").getEffectiveSetValue();
             if("TRUE".equals(inventorymoveConfirmationSwitch)){