From 87733eb3623593da247c051593d64b8ff9e1d3a4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 06 十一月 2026 19:00:39 +0800
Subject: [PATCH] feat(crm,mes): 扩展客户字段与重构批次号生成逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/dto/MesWmTransactionSaveReqDTO.java | 7
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/SeedQualityScanTest.java | 23
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/appearance/SystemAppearanceService.java | 27
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/pallet/MesProPalletService.java | 8
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/detail/MesWmReturnIssueDetailSaveReqVO.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedQualityPageReqVO.java | 14
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java | 75
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesDetailController.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedIndicatorRangeService.java | 126 +
docs/qc_seed_quality_batch_fold_integration.md | 141 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstockbag/MesWmMaterialStockBagMapper.java | 8
docs/material_stock_transaction_spec_category.md | 85
sql/mysql/mes_wm_product_sales_shipment.sql | 28
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java | 28
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/transaction/MesWmTransactionMapper.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/listener/MesQcSeedReturnStatusListener.java | 47
yudao-module-mes/src/main/resources/bpm/mes_seed_return_approve.bpmn20.xml | 31
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesRespVO.java | 5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/listener/MesQcSeedCompanyStatusListener.java | 46
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageRecordTypeEnum.java | 3
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java | 1
docs/qc_bpm_migration_plan.md | 26
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/result/MesWmStockTakingTaskResultSaveReqVO.java | 6
sql/mysql/mes_seed_quality_dual_line_20261105.sql | 142 +
docs/qc_seed_indicator_range_product_integration.md | 123 +
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java | 5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java | 14
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesShipmentDO.java | 26
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesDO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmProductSalesStatusEnum.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesDetailServiceImpl.java | 50
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerRespVO.java | 32
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/seedquality/MesQcSeedIndicatorRangeDO.java | 15
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesScanReqVO.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/batch/MesProBatchMapper.java | 15
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/detail/MesWmReturnSalesDetailSaveReqVO.java | 6
docs/system_appearance_integration.md | 107 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockBagRespVO.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/pallet/MesProPalletMapper.java | 17
seed-range-redesign.png | 0
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/SeedQualityGroupTest.java | 56
yudao-module-mes/src/main/resources/mapper/wm/batch/MesWmBatchMapper.xml | 29
scripts/deploy-seed-quality-bpm.ps1 | 60
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseAreaServiceImpl.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/vo/MesWmBatchSalesTargetRespVO.java | 1
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedQualityRespVO.java | 10
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java | 167 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/line/MesWmMiscIssueLineSaveReqVO.java | 6
docs/scan_in_multi_type_inbound.md | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedIndicatorRangeSaveReqVO.java | 33
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesScanRespVO.java | 1
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/scan/vo/MesProScanEventCreateReqVO.java | 7
sql/mysql/mes_qc_approver_menu_retire_20261106.sql | 11
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/appearance/vo/SystemAppearanceRespVO.java | 22
sql/mysql/crm_customer_dealer_fields_20261106.sql | 53
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedReturnQualitySubmitReqVO.java | 25
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/listener/MesQcSeedLineStatusListener.java | 55
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedIndicatorRangeServiceTest.java | 29
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedQualityScopeRetestReqVO.java | 1
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/vo/MesProBatchRespVO.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/seedquality/MesQcSeedQualityIndicatorDO.java | 4
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageApplicationTypeEnum.java | 4
yudao-module-mes/src/main/resources/bpm/mes_seed_quality_company_approve.bpmn20.xml | 31
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/bagcode/MesProBagCodeMapper.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/vo/MesWmTransactionPageReqVO.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java | 64
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/scan/MesProScanEventServiceImpl.java | 144 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedQualityBatchRespVO.java | 49
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerPageReqVO.java | 18
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockRespVO.java | 4
docs/pro_batch_pallet_code_column_integration.md | 60
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java | 66
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/detail/MesWmProductSalesDetailRespVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockAdjustReqVO.java | 6
docs/pro_batch_code_rule_integration.md | 77
sql/mysql/system_appearance_init_20261106.sql | 24
docs/mes_wm_material_stock_bag_api.md | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockPageReqVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/scan/vo/MesProScanEventRespVO.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/trace/MesProTracePublicServiceImpl.java | 14
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseServiceImpl.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockBagPageReqVO.java | 3
sql/mysql/mes_qc_seed_indicator_range_product_20261105.sql | 104 +
docs/warehouse_location_area_removal.md | 74
sql/mysql/mes_wm_remove_warehouse_location_area_menu.sql | 24
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/customer/CrmCustomerDO.java | 31
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesLineController.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/transaction/MesWmTransactionDO.java | 1
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/redis/MesCodeRedisDAO.java | 33
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/batch/MesProBatchServiceImpl.java | 83
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/appearance/vo/SystemAppearanceSaveReqVO.java | 16
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/pallet/MesProPalletServiceImpl.java | 8
sql/mysql/qc_seed_quality_line_menus_20261106.sql | 20
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityServiceImpl.java | 910 +++++++++-
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedIndicatorRangeRespVO.java | 21
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineRespVO.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesDetailDO.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java | 3
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/SeedQualityWorkflowTest.java | 32
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityService.java | 27
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/line/MesWmMiscReceiptLineSaveReqVO.java | 6
docs/crm_customer_dealer_fields_integration.md | 110 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/MesWmTransactionServiceImpl.java | 17
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/MesQcSeedQualityController.java | 94
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedQualitySubmitReqVO.java | 8
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/scan/MesProScanEventDO.java | 11
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/appearance/SystemAppearanceServiceImpl.java | 94 +
docs/scan_event_pallet_code_integration.md | 84
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerSaveReqVO.java | 34
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesShipmentMapper.java | 31
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/batch/MesProBatchDO.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/seedquality/MesQcSeedIndicatorRangeMapper.java | 49
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/appearance/SystemAppearanceController.java | 51
yudao-module-mes/src/main/resources/bpm/mes_seed_quality_line_approve.bpmn20.xml | 31
docs/mes_scan_event_integration.md | 8
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesDetailMapper.java | 24
docs/qc_seed_quality_dual_line_integration.md | 145 +
docs/销售出库分次发货说明.md | 77
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/vo/MesProBatchSaveReqVO.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/seedquality/MesQcSeedQualityDO.java | 14
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/seedquality/MesQcSeedQualityMapper.java | 140 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java | 8
/dev/null | 127 -
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/vo/MesWmTransactionRespVO.java | 10
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesService.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseLocationServiceImpl.java | 3
129 files changed, 4,547 insertions(+), 566 deletions(-)
diff --git a/docs/crm_customer_dealer_fields_integration.md b/docs/crm_customer_dealer_fields_integration.md
new file mode 100644
index 0000000..2f25c6d
--- /dev/null
+++ b/docs/crm_customer_dealer_fields_integration.md
@@ -0,0 +1,110 @@
+# 瀹㈡埛绠$悊鏂板瀛楁锛堢ぞ浼氫俊鐢ㄤ唬鐮佺瓑 7 椤癸級- 鍓嶇鑱旇皟鏂规
+
+## 娑夊強椤甸潰
+
+- CRM 鈫� 瀹㈡埛绠$悊 鈫� 瀹㈡埛鍒楄〃
+- CRM 鈫� 瀹㈡埛绠$悊 鈫� 鏂板/缂栬緫瀹㈡埛寮圭獥
+- CRM 鈫� 瀹㈡埛绠$悊 鈫� 瀹㈡埛璇︽儏
+
+## 涓氬姟娴佺▼涓庢暟鎹甫鍏�
+
+1. 鏂板/缂栬緫瀹㈡埛鏃讹紝鍙綍鍏� 7 涓柊瀛楁锛屼繚瀛樺悗鎸佷箙鍖栧埌 `crm_customer` 琛ㄣ��
+2. 鍒楄〃灞曠ず 7 涓柊瀛楁锛涖�屾墍灞炰笂绾х粡閿�鍟嗐�嶅睍绀哄叾鍚嶇О锛坄parentDealerName`锛夈��
+3. 鍒楄〃鏀寔鎸� 6 涓柊瀛楁绛涢�夛紙绀句細淇$敤浠g爜銆佽韩浠借瘉鍙枫�佸鎴峰鍚嶃�佸妗堟祦姘村彿銆佹墍灞炲尯鍩熴�佹墍灞炰笂绾х粡閿�鍟嗭級銆�
+4. 銆屾墍灞炰笂绾х粡閿�鍟嗐�嶅鐢� CRM 瀹㈡埛涓绘暟鎹紝閫夋嫨寮圭獥涓庡鎴烽�夋嫨缁勪欢涓�鑷达紱鍚庣鏍¢獙涓嶈兘閫夋嫨瀹㈡埛鑷韩銆�
+5. 璇︽儏椤靛睍绀� 7 涓柊瀛楁锛屽叾涓�屾墍灞炰笂绾х粡閿�鍟嗐�嶅睍绀哄悕绉般��
+
+## API
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|------|------|------|
+| GET | /crm/customer/page | 瀹㈡埛鍒嗛〉锛堟柊澧炵瓫閫夊弬鏁般�佸搷搴斿瓧娈碉級 |
+| POST | /crm/customer/create | 鏂板瀹㈡埛锛堟柊澧炶姹傚瓧娈碉級 |
+| PUT | /crm/customer/update | 淇敼瀹㈡埛锛堟柊澧炶姹傚瓧娈碉級 |
+| GET | /crm/customer/get | 瀹㈡埛璇︽儏锛堟柊澧炲搷搴斿瓧娈碉級 |
+
+### 璇锋眰瀛楁鏂板锛坈reate / update锛�
+
+| 鍙傛暟 | 绫诲瀷 | 蹇呭~ | 璇存槑 |
+|------|------|------|------|
+| socialCreditCode | String | 鍚� | 绀句細淇$敤浠g爜锛屾渶闀� 64 瀛楃 |
+| idCardNo | String | 鍚� | 韬唤璇佸彿锛屾渶闀� 32 瀛楃 |
+| customerName | String | 鍚� | 瀹㈡埛濮撳悕锛屾渶闀� 64 瀛楃 |
+| filingSerialNo | String | 鍚� | 澶囨娴佹按鍙凤紝鏈�闀� 64 瀛楃 |
+| bankAccountName | String | 鍚� | 閾惰璐︽埛鍚嶇О锛屾渶闀� 128 瀛楃 |
+| region | String | 鍚� | 鎵�灞炲尯鍩燂紝鏈�闀� 64 瀛楃 |
+| parentDealerId | Long | 鍚� | 鎵�灞炰笂绾х粡閿�鍟嗙紪鍙凤紝鍏宠仈瀹㈡埛琛� `id` |
+
+### 鏌ヨ鍙傛暟鏂板锛坧age锛�
+
+| 鍙傛暟 | 绫诲瀷 | 鍖归厤鏂瑰紡 | 璇存槑 |
+|------|------|----------|------|
+| socialCreditCode | String | 妯$硦鍖归厤 | 绀句細淇$敤浠g爜 |
+| idCardNo | String | 妯$硦鍖归厤 | 韬唤璇佸彿 |
+| customerName | String | 妯$硦鍖归厤 | 瀹㈡埛濮撳悕 |
+| filingSerialNo | String | 妯$硦鍖归厤 | 澶囨娴佹按鍙� |
+| region | String | 妯$硦鍖归厤 | 鎵�灞炲尯鍩� |
+| parentDealerId | Long | 绮剧‘鍖归厤 | 鎵�灞炰笂绾х粡閿�鍟嗙紪鍙� |
+
+### 鍝嶅簲瀛楁鏂板锛坧age / get锛�
+
+| 瀛楁 | 绫诲瀷 | 璇存槑 |
+|------|------|------|
+| socialCreditCode | String | 绀句細淇$敤浠g爜 |
+| idCardNo | String | 韬唤璇佸彿 |
+| customerName | String | 瀹㈡埛濮撳悕 |
+| filingSerialNo | String | 澶囨娴佹按鍙� |
+| bankAccountName | String | 閾惰璐︽埛鍚嶇О |
+| region | String | 鎵�灞炲尯鍩� |
+| parentDealerId | Long | 鎵�灞炰笂绾х粡閿�鍟嗙紪鍙� |
+| parentDealerName | String | 鎵�灞炰笂绾х粡閿�鍟嗗悕绉帮紙鐢卞悗绔壒閲忓洖濉紝浠呭睍绀虹敤锛� |
+
+**鍝嶅簲绀轰緥锛�**
+
+```json
+{
+ "code": 0,
+ "data": {
+ "id": 1001,
+ "name": "鏌愭煇鍐滀笟鍚堜綔绀�",
+ "customerName": "寮犱笁",
+ "socialCreditCode": "91320600MA1XXXXXXX",
+ "idCardNo": "320602199001011234",
+ "filingSerialNo": "BA2026000001",
+ "bankAccountName": "鍗楅�氭煇鏌愬啘涓氭湁闄愬叕鍙�",
+ "region": "鍗楅��",
+ "parentDealerId": 900,
+ "parentDealerName": "鏌愭煇缁忛攢鍟�"
+ },
+ "msg": ""
+}
+```
+
+## 瀛楁灞曠ず瑙勫垯
+
+| 瀛楁 | 灞曠ず浣嶇疆 | 璇存槑 |
+|------|----------|------|
+| customerName | 鏂板/缂栬緫銆佸垪琛ㄣ�佺瓫閫夈�佽鎯� | 瀹㈡埛濮撳悕锛屼笌銆屽鎴峰悕绉般�嶅苟瀛� |
+| socialCreditCode | 鏂板/缂栬緫銆佸垪琛ㄣ�佺瓫閫夈�佽鎯� | 绀句細淇$敤浠g爜 |
+| idCardNo | 鏂板/缂栬緫銆佸垪琛ㄣ�佺瓫閫夈�佽鎯� | 韬唤璇佸彿 |
+| filingSerialNo | 鏂板/缂栬緫銆佸垪琛ㄣ�佺瓫閫夈�佽鎯� | 澶囨娴佹按鍙� |
+| bankAccountName | 鏂板/缂栬緫銆佸垪琛ㄣ�佽鎯� | 閾惰璐︽埛鍚嶇О |
+| region | 鏂板/缂栬緫銆佸垪琛ㄣ�佺瓫閫夈�佽鎯� | 鎵�灞炲尯鍩燂紙鑷敱鏂囨湰锛� |
+| parentDealerId | 鏂板/缂栬緫銆佺瓫閫� | 鎵�灞炰笂绾х粡閿�鍟嗭紝澶嶇敤瀹㈡埛閫夋嫨缁勪欢 |
+| parentDealerName | 鍒楄〃銆佽鎯� | 鎵�灞炰笂绾х粡閿�鍟嗗悕绉帮紝绌哄�煎睍绀� `-` |
+
+## 涓氬姟瑙勫垯璇存槑
+
+| 鍦烘櫙 | 瑙勫垯 |
+|------|------|
+| 鎵�灞炰笂绾х粡閿�鍟� | 澶嶇敤 CRM 瀹㈡埛涓绘暟鎹紝鑷叧鑱� `parent_dealer_id 鈫� crm_customer.id` |
+| 鑷叧鑱旀牎楠� | 缂栬緫瀹㈡埛鏃讹紝鎵�灞炰笂绾х粡閿�鍟嗕笉鑳介�夋嫨瀹㈡埛鑷韩锛屽悗绔繑鍥炪�屾墍灞炰笂绾х粡閿�鍟嗕笉鑳介�夋嫨瀹㈡埛鑷韩銆� |
+| 鏁版嵁鏉冮檺 | 鍒楄〃鏌ヨ浠嶅彈 CRM 鏁版嵁鏉冮檺鎺у埗锛屻�屾墍灞炰笂绾х粡閿�鍟嗐�嶄笅鎷夊彲閫夎寖鍥寸敱瀹㈡埛閫夋嫨缁勪欢鍐冲畾 |
+| 绌哄�� | 鏂板瀛楁鍧囬潪蹇呭~锛涘垪琛ㄧ┖鍊煎睍绀� `-` |
+
+## 娉ㄦ剰浜嬮」
+
+- 銆屽鎴峰鍚嶃�嶏紙`customerName`锛変笌鏃㈡湁銆屽鎴峰悕绉般�嶏紙`name`锛変负涓や釜鐙珛瀛楁锛屼笉瑕佹贩鐢ㄣ��
+- 銆屾墍灞炲尯鍩熴�嶏紙`region`锛変负鑷敱鏂囨湰锛屼笌鏃㈡湁銆屽湴鍧�銆嶏紙`areaId` 鐪佸競鍖虹骇鑱旓級浜掍笉褰卞搷銆�
+- 鏂板瀛楁宸插姞鍏ュ鍑� Excel 鍒楋紝瀵煎嚭鏂囦欢鑷姩鍖呭惈锛沗parentDealerName` 浠呯敤浜庡睍绀猴紝涓嶅彲浣滀负淇濆瓨鍏ュ弬銆�
+- 鏁版嵁搴撻渶鍏堟墽琛� `sql/mysql/crm_customer_dealer_fields_20261106.sql`銆�
diff --git a/docs/material_stock_transaction_spec_category.md b/docs/material_stock_transaction_spec_category.md
new file mode 100644
index 0000000..0226b8d
--- /dev/null
+++ b/docs/material_stock_transaction_spec_category.md
@@ -0,0 +1,85 @@
+# 搴撳瓨鐜版湁閲�/搴撳瓨浜嬪姟娴佹按 瑙勬牸涓庣被鍒瓧娈� - 鍓嶇鑱旇皟鏂规
+
+## 娑夊強椤甸潰
+
+- 搴撳瓨鐜版湁閲忥紙`src/views/wls/materialstock`锛�
+- 搴撳瓨鐜版湁閲忛�夋嫨寮圭獥锛堢墿鏂欏簱瀛橀�夋嫨锛宍useSelectGridColumns`锛�
+- 搴撳瓨浜嬪姟娴佹按锛坄src/views/wls/transaction`锛�
+
+## 涓氬姟娴佺▼涓庢暟鎹甫鍏�
+
+1. 搴撳瓨鐜版湁閲忓垪琛細鐗╂枡涓绘暟鎹殑 `specification`锛堣鏍煎瀷鍙凤級灞曠ず涓衡�滆鏍尖�濆垪锛涚墿鏂欐墍灞� MDM 鍒嗙被鍚嶇О灞曠ず涓衡�滅被鍒�濆垪銆�
+2. 搴撳瓨浜嬪姟娴佹按鍒楄〃锛氬湪鍘熸湁鐗╂枡缂栫爜銆佺墿鏂欏悕绉颁箣鍚庯紝琛ュ厖鈥滆鏍尖�濆拰鈥滅被鍒�濅袱鍒楋紝鏁版嵁鍚屾牱鏉ヨ嚜鐗╂枡涓绘暟鎹��
+
+## API
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|------|------|------|
+| GET | /mes/wm/material-stock/page | 搴撳瓨鐜版湁閲忓垎椤� |
+| GET | /mes/wm/material-stock/get | 搴撳瓨鐜版湁閲忚鎯� |
+| GET | /mes/wm/material-stock/picking-list | 閿�鍞嚭搴撴寜琛屾煡璇㈠悎鏍煎簱瀛� |
+| GET | /mes/wm/transaction/page | 搴撳瓨浜嬪姟娴佹按鍒嗛〉 |
+
+### 鍝嶅簲瀛楁鏂板
+
+**`MesWmMaterialStockRespVO`锛�**
+
+| 瀛楁 | 绫诲瀷 | 璇存槑 |
+|------|------|------|
+| itemTypeName | String | 鐗╂枡绫诲埆鍚嶇О锛圡DM 鐗╂枡鍒嗙被鍚嶇О锛� |
+
+鍘熷瓧娈� `specification`锛堣鏍煎瀷鍙凤級缁х画淇濈暀锛岀敱鍓嶇鐢ㄤ簬鈥滆鏍尖�濆垪灞曠ず銆�
+
+**`MesWmTransactionRespVO`锛�**
+
+| 瀛楁 | 绫诲瀷 | 璇存槑 |
+|------|------|------|
+| specification | String | 瑙勬牸鍨嬪彿锛堝搧绉嶆湭缁存姢鏃跺洖閫� MES 鐗╂枡瑙勬牸鍨嬪彿锛� |
+| itemTypeName | String | 鐗╂枡绫诲埆鍚嶇О锛堜紭鍏� MDM 鐗╂枡鍒嗙被锛屽叾娆� MES 鐗╂枡鍒嗙被锛� |
+| palletCode | String | 鎵樼洏鐮侊紙閿�鍞嚭搴撳彇閿�鍞槑缁嗘墭鐩橈紝鍏朵綑娴佹按鍥為��鍙栬鐮佸綋鍓嶇粦瀹氭墭鐩橈級 |
+| shipmentId | Number | 鍙戣揣鍗曠紪鍙� |
+
+**鍝嶅簲绀轰緥锛�**
+
+```json
+{
+ "code": 0,
+ "data": {
+ "itemCode": "M001",
+ "itemName": "閽㈡澘",
+ "specification": "10mm*100mm",
+ "itemTypeName": "浜旈噾閰嶄欢"
+ }
+}
+```
+
+## 瀛楁灞曠ず瑙勫垯
+
+| 瀛楁 | 灞曠ず浣嶇疆 | 璇存槑 |
+|------|----------|------|
+| itemTypeName | 搴撳瓨鐜版湁閲忓垪琛ㄣ�侀�夋嫨寮圭獥銆佷簨鍔℃祦姘村垪琛� | 鍒楀悕鈥滅被鍒�� |
+| specification | 搴撳瓨鐜版湁閲忓垪琛ㄣ�侀�夋嫨寮圭獥銆佷簨鍔℃祦姘村垪琛� | 鍒楀悕鈥滆鏍尖�� |
+| palletCode | 浜嬪姟娴佹按鍒楄〃 | 鍒楀悕鈥滄墭鐩樼爜鈥� |
+
+**鍒楅『搴忥細**
+
+- 搴撳瓨浜嬪姟娴佹按锛氫簨鍔$被鍨� 鈫� 涓氬姟绫诲瀷 鈫� 鐗╂枡缂栫爜 鈫� 鐗╂枡鍚嶇О 鈫� 瑙勬牸 鈫� 绫诲埆 鈫� 涓氬姟鍗曞彿 鈫� 鎵规鍙� 鈫� 鎵樼洏鐮� 鈫� 琚嬬爜 鈫� 鏁伴噺 鈫� 浠撳簱 鈫� 浜嬪姟鏃堕棿銆�
+- 搴撳瓨鐜版湁閲忥細浜у搧鐗╂枡缂栫爜 鈫� 浜у搧鐗╂枡鍚嶇О 鈫� 瑙勬牸 鈫� 绫诲埆 鈫� 搴撳瓨鐘舵�� 鈫� 鏁伴噺鍒椻��
+- 搴撳瓨鐜版湁閲忛�夋嫨寮圭獥锛氫骇鍝佺墿鏂欑紪鐮� 鈫� 浜у搧鐗╂枡鍚嶇О 鈫� 瑙勬牸 鈫� 绫诲埆 鈫� 鍏ュ簱鎵规鍙封��
+
+## 涓氬姟瑙勫垯璇存槑
+
+| 鍦烘櫙 | 瑙勫垯 |
+|------|------|
+| 绫诲埆鍚嶇О鏉ユ簮 | 浼樺厛鎸夌墿鏂欎富鏁版嵁鐨� `categoryId` 鏌ヨ MDM 鐗╂枡鍒嗙被锛涙湭缁存姢鍒嗙被鏃跺洖閫�鏌� MES 鐗╂枡锛坄mes_md_item.mdm_item_id`锛夌殑鐗╂枡鍒嗙被锛坄mes_md_item_type.name`锛� |
+| 瑙勬牸鏉ユ簮 | 浼樺厛鍙栫墿鏂欎富鏁版嵁鐨� `specification`锛涗负绌烘椂鍥為��鍙� MES 鐗╂枡鐨� `specification` |
+| 鎵樼洏鐮佹潵婧� | 閿�鍞嚭搴撴祦姘存寜鈥滈攢鍞崟+琚嬬爜+鍙戣揣鍗曗�濆尮閰嶉攢鍞槑缁嗕腑鐨勬墭鐩橈紱鍏朵粬娴佹按锛堣川妫�銆佺敓浜у叆搴撶瓑锛夊彇琚嬬爜褰撳墠缁戝畾鐨勬墭鐩樼爜 |
+| 鐗╂枡缂哄け | 鐗╂枡淇℃伅涓嶅瓨鍦ㄦ椂锛岃鏍间笌绫诲埆杩斿洖绌� |
+| 鍒嗙被缂哄け | 鐗╂枡鏈淮鎶ゅ垎绫绘垨鍒嗙被宸插垹闄ゆ椂锛岀被鍒繑鍥炵┖ |
+| 鏁版嵁缁存姢鍏ュ彛 | 瑙勬牸鍨嬪彿鍦ㄢ�滃搧绉嶇鐞嗏�濇垨鈥淢ES 鐗╂枡鈥濈淮鎶わ紱MDM 鍒嗙被闇�鍦� `/mdm/category` 缁存姢锛孧ES 鐗╂枡鍒嗙被鍦ㄢ�淢ES 鐗╂枡鍒嗙被鈥濈淮鎶� |
+
+## 娉ㄦ剰浜嬮」
+
+- 搴撳瓨鐜版湁閲忛〉闈㈠師鏈夌殑鈥滃崟浣嶁�濆垪宸叉浛鎹负鈥滆鏍尖�濓紝鈥滆鏍煎瀷鍙封�濆垪宸叉浛鎹负鈥滅被鍒�濓紝涓嶅啀灞曠ず璁¢噺鍗曚綅銆�
+- 鐗╂枡鍚嶇О銆佽鏍笺�佺被鍒笁鍒楅渶鐩搁偦灞曠ず锛屽苟鏁翠綋鍓嶇Щ锛涘簱瀛樹簨鍔℃祦姘村墠绉诲埌涓氬姟鍗曞彿涔嬪墠锛屽簱瀛樼幇鏈夐噺鍓嶇Щ鍒板簱瀛樼姸鎬佷箣鍓嶃��
+- Excel 瀵煎嚭涓柊澧炩�滅被鍒�濆垪锛屽師鏈夆�滆鏍煎瀷鍙封�濃�滆閲忓崟浣嶁�濆垪淇濇寔涓嶅彉銆�
diff --git a/docs/mes_scan_event_integration.md b/docs/mes_scan_event_integration.md
index 289532b..29d1b10 100644
--- a/docs/mes_scan_event_integration.md
+++ b/docs/mes_scan_event_integration.md
@@ -29,10 +29,10 @@
| eventId | String | 鏄� | 杈圭紭璁惧鐢熸垚鐨勫箓绛変簨浠跺彿 |
| bagCode | String | 鏄� | 宸ヤ笟鐩告満璇嗗埆鍑虹殑琚嬬爜 |
| quantity | Decimal | 鏄� | 鍏ュ簱鏁伴噺锛屾湰鏈熶竴琚嬮�氬父涓� 1 |
-| deviceCode | String | 鏄� | 璁惧缂栫爜锛岀敤浜庡璁� |
+| deviceCode | String | 鍚� | 璁惧缂栫爜锛岀敤浜庡璁� |
| lineCode | String | 鍚� | 浜х嚎缂栫爜锛岀敤浜庡璁� |
-| locationId | Long | 鏄� | WIP 鏆傚瓨搴撳尯缂栧彿 |
-| areaId | Long | 鏄� | WIP 鏆傚瓨搴撲綅缂栧彿 |
+| locationId | Long | 鍚� | WIP 鏆傚瓨搴撳尯缂栧彿锛涗粨搴撳凡鏀逛负銆屼粨搴� 鈫� 搴撳瓨銆嶄袱绾х粨鏋勶紝鍙笉浼� |
+| areaId | Long | 鍚� | WIP 鏆傚瓨搴撲綅缂栧彿锛涘彲涓嶄紶 |
| remark | String | 鍚� | 澶囨敞 |
**鍝嶅簲瀛楁锛�**
@@ -100,4 +100,4 @@
- 杈圭紭绋嬪簭涓嶅緱涓婁紶鍥剧墖鎴栬棰戯紝鏈帴鍙e彧鎺ユ敹瑙g爜鍚庣殑浜岀淮鐮佺粨鏋溿��
- 鍓嶇宸ヤ綔鍙板簲鍦ㄩ〉闈㈠嵏杞芥椂鍋滄鍒锋柊浠诲姟銆�
- 鍏ュ簱澶辫触鏃跺睍绀哄悗绔繑鍥炵殑涓氬姟閿欒锛屼笉鑷姩璋冪敤閫氱敤搴撳瓨璋冩暣鎺ュ彛閲嶈瘯銆�
-- WIP 搴撳尯鍜屽簱浣嶉渶鎻愬墠閰嶇疆锛涙帴鍙d笉鎺ュ彈瀹㈡埛绔寚瀹氫粨搴撶紪鍙枫��
+- 鎵爜鍏ュ簱缁熶竴钀藉埌 WIP 鐢熶骇鏆傚瓨浠擄紱搴撳尯銆佸簱浣嶅彲涓嶄紶锛屾帴鍙d笉鎺ュ彈瀹㈡埛绔寚瀹氫粨搴撶紪鍙枫��
diff --git a/docs/mes_wm_material_stock_bag_api.md b/docs/mes_wm_material_stock_bag_api.md
index bbda426..355ec7c 100644
--- a/docs/mes_wm_material_stock_bag_api.md
+++ b/docs/mes_wm_material_stock_bag_api.md
@@ -40,6 +40,7 @@
|------|------|------|------|
| materialStockId | Long | 鏄� | 搴撳瓨姹囨�昏褰� ID |
| bagCode | String | 鍚� | 琚嬬爜妯$硦鏌ヨ |
+| includeHistory | Boolean | 鍚� | 涓� true 鏃跺悓鏃惰繑鍥炲凡鍑哄簱銆佸凡鎶ュ簾琚嬬爜锛涢粯璁や粎杩斿洖鍦ㄥ簱琚嬬爜 |
| pageNo | Integer | 鏄� | 椤电爜 |
| pageSize | Integer | 鏄� | 姣忛〉鏉℃暟 |
@@ -64,6 +65,6 @@
- 鍚屼竴琚嬬爜鍙兘瀛樺湪涓�鏉″簱瀛樿鐮佹槑缁嗐��
- 璐ㄦ鎸夊疄闄呰鐮佸畾浣嶆殏瀛樺簱瀛橈紝涓嶆寜鎵规闅忔満鎵e噺銆�
-- 鎶ュ簾琚嬬爜涓嶈鍏ュ湪搴撴槑缁嗘煡璇紝浣嗕繚鐣欐槑缁嗚褰曠敤浜庤拷婧��
+- 鎶ュ簾鍜屽凡鍑哄簱琚嬬爜涓嶈鍏ラ粯璁ゅ湪搴撴槑缁嗘煡璇紝鍙�氳繃 `includeHistory` 鏌ヨ淇濈暀鐨勫綋鍓嶇姸鎬併�傚凡鍑哄簱涓嶄竴瀹氭槸閿�鍞彂璐э紝搴旂粨鍚堝嚭搴撴祦姘村垽鏂笟鍔$被鍨嬨��
- 鏃犳硶浠庡巻鍙叉眹鎬诲簱瀛樿繕鍘熻鐮佹椂锛屼笉浼�犺鐮佹槑缁嗐��
- SQL 鑴氭湰涓嶅寘鍚� `tenant_id` 瀛楁銆�
diff --git a/docs/pro_batch_code_rule_integration.md b/docs/pro_batch_code_rule_integration.md
new file mode 100644
index 0000000..7de51c2
--- /dev/null
+++ b/docs/pro_batch_code_rule_integration.md
@@ -0,0 +1,77 @@
+# 鐢熶骇鎵规鍙疯鍒� - 鍓嶇鑱旇皟鏂规
+
+## 娑夊強椤甸潰
+
+- 鎵规鐢熶骇绠$悊 - 鏂板鎵规锛坄/mes/pro/batch` 鏂板寮圭獥锛�
+- 鎵规鐢熶骇绠$悊 - 琛ュ綍鎵规淇℃伅锛堜复鏃舵壒娆$爜琛ュ綍寮圭獥锛�
+- 鎵规鐢熶骇绠$悊 - 缂栬緫鎵规
+
+## 涓氬姟娴佺▼涓庢暟鎹甫鍏�
+
+1. 鏂板鎵规锛氭壒娆″彿瀛楁鍙敱浜哄伐濉啓锛涚暀绌烘椂鐢卞悗绔寜銆屽綋鍓嶅勾浠� + 3 浣嶆祦姘淬�嶈嚜鍔ㄧ敓鎴愶紙濡� 2026001锛夈��
+2. 棰勭敓鎴愪簩缁寸爜 -> 琛ュ綍鎵规淇℃伅锛氳ˉ褰曟椂鍚屾牱鏀寔浜哄伐濉啓鎵规鍙凤紝鐣欑┖鍒欒嚜鍔ㄧ敓鎴愶紱鐢熸垚鍚庝复鏃舵壒娆$爜浠嶄繚鐣欑敤浜庢壂鐮佽拷婧��
+3. 缂栬緫鎵规锛氬凡鐢熸垚姝e紡鎵规鍙风殑鎵规锛屾壒娆″彿涓嶅啀鍙樺寲锛堜慨鏀瑰姞宸ュ崟浣嶄笉浼氶噸鏂扮敓鎴愭壒娆″彿锛夛紱浠呭巻鍙蹭复鏃舵壒娆★紙灏氭棤姝e紡鎵规鍙凤級鍦ㄧ紪杈戞椂琛ョ敓鎴愩��
+
+## API
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|------|------|------|
+| POST | /mes/pro/batch/create | 鍒涘缓鐢熶骇鎵规 |
+| PUT | /mes/pro/batch/fill-info | 琛ュ綍鐢熶骇鎵规涓氬姟淇℃伅 |
+| PUT | /mes/pro/batch/update | 鏇存柊鐢熶骇鎵规 |
+
+**璇锋眰鍙傛暟鏂板锛�**
+
+| 鍙傛暟 | 绫诲瀷 | 蹇呭~ | 璇存槑 |
+|------|------|------|------|
+| code | String | 鍚� | 鎵规鍙枫�備笉浼犳垨鐣欑┖鏃剁敱绯荤粺鎸夈��4 浣嶅勾浠� + 3 浣嶆祦姘淬�嶈嚜鍔ㄧ敓鎴愶紝濡� `2026001`锛涗紶鍏ユ椂鍚庣鏍¢獙鏍煎紡涓庡敮涓�鎬� |
+
+**鎵规鍙锋牸寮忚鍒欙細**
+
+| 瑙勫垯 | 璇存槑 |
+|------|------|
+| 闀垮害 | 鍥哄畾 7 浣嶇函鏁板瓧锛堝勾浠� 4 浣� + 娴佹按 3 浣嶏級 |
+| 绀轰緥 | `2026001`銆乣2026002` 鈥� |
+| 骞翠唤鑼冨洿 | 2000 ~ 2100 |
+| 娴佹按鑼冨洿 | 001 ~ 999锛岃秴鍑哄悗鍚庣鎻愮ず銆屾湰骞村害鐢熶骇鎵规鍙峰凡鐢ㄥ敖銆� |
+| 鍞竴鎬� | 鍏ㄥ簱鍞竴锛屽寘鍚凡閫昏緫鍒犻櫎璁板綍锛涢噸澶嶆椂杩斿洖閿欒 |
+
+**鍝嶅簲锛�**
+
+- `create`锛歚{ "code": 0, "data": 鎵规缂栧彿 }`
+- `fill-info` / `update`锛歚{ "code": 0, "data": true }`
+
+**閿欒鎻愮ず锛�**
+
+| 鍦烘櫙 | 鎻愮ず |
+|------|------|
+| 鏍煎紡涓嶆纭� | 鐢熶骇鎵规鍙锋牸寮忎笉姝g‘锛屽簲涓哄勾浠�+3浣嶆祦姘村彿锛屽 2026001 |
+| 鎵规鍙烽噸澶� | 鐢熶骇鎵规鍙枫��2026001銆戝凡瀛樺湪 |
+| 褰撳勾娴佹按鐢ㄥ敖 | 鏈勾搴︾敓浜ф壒娆″彿宸茬敤灏斤紙001-999锛� |
+
+## 瀛楁灞曠ず瑙勫垯
+
+| 瀛楁 | 灞曠ず浣嶇疆 | 璇存槑 |
+|------|----------|------|
+| code | 鏂板寮圭獥 | 鍙紪杈戣緭鍏ユ锛岄潪蹇呭~锛涘崰浣嶆彁绀恒�岀暀绌鸿嚜鍔ㄧ敓鎴愶紝濡� 2026001銆� |
+| code | 琛ュ綍寮圭獥 | 鍙紪杈戣緭鍏ユ锛岄潪蹇呭~锛涚暀绌鸿嚜鍔ㄧ敓鎴� |
+| code | 缂栬緫/璇︽儏寮圭獥 | 鍙灞曠ず锛屼笉鏀寔淇敼 |
+| code | 鍒楄〃 | 鎸夈�屾壒娆″彿銆嶅垪灞曠ず |
+
+## 涓氬姟瑙勫垯璇存槑
+
+| 鍦烘櫙 | 瑙勫垯 |
+|------|------|
+| 浜哄伐杈撳叆鎵规鍙� | 鍓嶇灏嗙敤鎴疯緭鍏ュ�兼斁鍏� `code` 瀛楁鎻愪氦锛涘悗绔牎楠� 7 浣嶆暟瀛楁牸寮忓強鍞竴鎬� |
+| 鐣欑┖鑷姩鐢熸垚 | 涓嶄紶鎴栦紶绌哄瓧绗︿覆锛涘悗绔彇褰撳墠骞翠唤宸茬敤鏈�澶ф祦姘� + 1锛屾牸寮忓寲涓� 3 浣嶆祦姘� |
+| 缂栬緫宸叉湁鎵规 | 鍚庣淇濈暀鍘熸壒娆″彿锛屽拷鐣ヨ姹備腑鐨� `code` 鍙樻洿锛涗慨鏀瑰姞宸ュ崟浣嶄笉鍐嶉噸鏂扮敓鎴愭壒娆″彿 |
+| 涓存椂鎵规琛ュ綍 | 琛ュ綍鎴愬姛鍚庢墠鎷ユ湁姝e紡鎵规鍙凤紱琛ュ綍鍓嶅垪琛ㄥ睍绀轰复鏃舵壒娆$爜 |
+| 骞跺彂鏂板 | 鎵规鍙峰垪瀛樺湪鏁版嵁搴撳敮涓�绱㈠紩锛岄噸澶嶆彁浜や細杩斿洖閲嶅鎻愮ず |
+
+## 娉ㄦ剰浜嬮」
+
+- 鏂板銆佽ˉ褰曞脊绐楃殑銆屾壒娆″彿銆嶅凡鏀逛负鍙汉宸ヨ緭鍏ワ紙闈炲繀濉紝鐣欑┖鑷姩鐢熸垚锛夛紱缂栬緫銆佽鎯呭脊绐椾负鍙灞曠ず銆�
+- 鍓嶇鏈仛鏍煎紡寮烘牎楠岋紝浠ユ湇鍔$杩斿洖鐨勯敊璇彁绀轰负鍑嗭紱濡傞渶鍗虫椂鏍¢獙锛屽彲鎸� `^\d{7}$` 涓斿勾浠藉湪 2000-2100銆佹祦姘� 鈮� 001 鍒ゆ柇銆�
+- 鎵规鍙风敓鎴愪緷璧栨湇鍔$褰撳墠骞翠唤锛屽墠绔笉瑕佽嚜琛屾嫾鎺ュ勾浠芥垨娴佹按鍙枫��
+- 缂栬緫寮圭獥鍥炴樉鐨� `code` 浠呯敤浜庡睍绀猴紝鎻愪氦鏃跺嵆浣挎惡甯︿篃涓嶄細鏀瑰彉宸叉湁鎵规鍙枫��
+- 宸叉湁鍘嗗彶鎵规鍙凤紙鏃х殑 PC 鍓嶇紑/16 浣嶉殢鏈虹爜锛夌户缁繚鐣欙紝涓嶅彈鏂拌鍒欏奖鍝嶏紱鏂拌鍒欎粎浣滅敤浜庢柊鐢熸垚鎴栦汉宸ヨ緭鍏ョ殑鎵规鍙枫��
diff --git a/docs/pro_batch_pallet_code_column_integration.md b/docs/pro_batch_pallet_code_column_integration.md
new file mode 100644
index 0000000..95d4643
--- /dev/null
+++ b/docs/pro_batch_pallet_code_column_integration.md
@@ -0,0 +1,60 @@
+# 鐢熶骇鎵规鍒楄〃鏂板銆屾墭鐩樼爜銆嶅垪 - 鍓嶇鑱旇皟鏂规
+
+## 娑夊強椤甸潰
+
+- 鎵规鐢熶骇绠$悊 - 鐢熶骇鎵规鍒楄〃锛坄/mes/pro/batch`锛�
+
+## API
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|------|------|------|
+| GET | /mes/pro/batch/page | 鐢熶骇鎵规鍒嗛〉锛堝搷搴旀柊澧炴墭鐩樼爜鍒楄〃锛� |
+| GET | /mes/pro/batch/get | 鐢熶骇鎵规璇︽儏锛堝搷搴斿悓姝ユ柊澧炴墭鐩樼爜鍒楄〃锛� |
+
+**鍝嶅簲瀛楁鏂板锛�**
+
+| 瀛楁 | 绫诲瀷 | 璇存槑 |
+|------|------|------|
+| palletCodes | String[] | 璇ユ壒娆′笅鍏ㄩ儴宸茬敓鎴愮殑姝e紡鎵樼洏鐮侊紝鎸夋墭鐩樺簭鍙峰崌搴忥紱鏃犳墭鐩樻椂涓虹┖鏁扮粍 |
+
+**鍝嶅簲绀轰緥锛�**
+
+```json
+{
+ "code": 0,
+ "data": {
+ "list": [
+ {
+ "id": 1024,
+ "code": "2026001",
+ "itemName": "濉旀渤4鍙�",
+ "palletCodes": ["2026001-P001", "2026001-P002"]
+ }
+ ],
+ "total": 1
+ }
+}
+```
+
+## 瀛楁灞曠ず瑙勫垯
+
+| 瀛楁 | 灞曠ず浣嶇疆 | 璇存槑 |
+|------|----------|------|
+| palletCodes | 鐢熶骇鎵规鍒楄〃 | 浣嶄簬銆屾壒娆″彿銆嶅垪涔嬪悗銆併�屽搧绉嶅悕绉般�嶅垪涔嬪墠锛涘涓墭鐩樼爜鐢ㄨ嫳鏂囬�楀彿杩炴帴灞曠ず锛岃秴闀挎椂鎮诞鎻愮ず瀹屾暣鍐呭 |
+| palletCodes | 鐢熶骇鎵规鍒楄〃 | 鏃犳墭鐩樼爜鏃跺睍绀� `-` |
+
+## 涓氬姟瑙勫垯璇存槑
+
+| 鍦烘櫙 | 瑙勫垯 |
+|------|------|
+| 鎵规宸茬粦瀹�/鐢熸垚鎵樼洏 | 杩斿洖璇ユ壒娆′笅鎵�鏈夋寮忔墭鐩樼爜锛坄code` 闈炵┖锛夛紝鎸夋墭鐩樺簭鍙峰崌搴� |
+| 鎵规浠呮湁涓存椂鎵樼洏 | 涓存椂鎵樼洏灏氭湭鐢熸垚姝e紡鎵樼洏鐮侊紝涓嶈繑鍥� |
+| 鎵规鏈粦瀹氭墭鐩橈紙濡傚惃琚嬫壒娆★級 | 杩斿洖绌烘暟缁勶紝鍒楄〃灞曠ず `-` |
+| 浜岀淮鐮侀鐢熸垚鎵规 | 鏈ˉ褰曟寮忎俊鎭墠鏃犳寮忔墭鐩樼爜锛岃繑鍥炵┖鏁扮粍 |
+
+## 娉ㄦ剰浜嬮」
+
+- 鎵樼洏鐮佷负鎵规涓嬪鍊煎瓧娈碉紝鍓嶇浠ユ暟缁勬帴鏀讹紝灞曠ず灞傝嚜琛屾嫾鎺ワ紝涓嶈鎸夊崟鍊煎鐞嗐��
+- 鏌ヨ涓烘壒閲忓叧鑱旓紝鍒楄〃鍒嗛〉姣忛〉浠呭鍔犱竴娆℃墭鐩樻煡璇紝鏃犻渶鍓嶇棰濆璇锋眰銆�
+- 璇︽儏鎺ュ彛杩斿洖鐨� `palletCodes` 涓庡垪琛ㄤ竴鑷达紱瀹屾暣鐨勬墭鐩樹俊鎭粛閫氳繃璇︽儏涓殑 `pallets` 瀛楁鑾峰彇銆�
+- Excel 瀵煎嚭鏈柊澧炶鍒楋紝鑻ュ悗缁渶瑕佸鍑烘墭鐩樼爜璇峰彟琛岀‘璁ゆ牸寮忋��
diff --git a/docs/qc_bpm_migration_plan.md b/docs/qc_bpm_migration_plan.md
new file mode 100644
index 0000000..9e81a8b
--- /dev/null
+++ b/docs/qc_bpm_migration_plan.md
@@ -0,0 +1,26 @@
+# 绉嶅瓙璐ㄦ BPM 杩佺Щ璁板綍
+
+## 鐩爣娴佺▼
+
+浠ョ敤鎴锋彁渚涚殑鐢熶骇娴佺▼鍥句负鍑嗐�傚姞宸ラ儴鍜岄攢鍞儴鍚勮嚜杩涜璐ㄦ锛氬垵妫�涓嶅悎鏍兼椂澶嶆锛屽妫�涓嶅悎鏍艰繘鍏ュ妫�/閿�姣佸鎵瑰苟鐣欏瓨璁板綍锛涙楠屽畬鎴愬悗鍒嗗埆鐢遍儴闂ㄩ瀵煎鎵癸紝姹囧悎鍚庤繘鍏ュ叕鍙歌川妫�瀹℃壒銆傚鎵归�氳繃鍚庝骇鍝佹寮忓叆搴撱��
+
+缁忛攢鍟嗛��璐ц繘鍏ラ攢鍞儴璐ㄦ锛氫笉鍚堟牸鏃跺妫�锛屽妫�涓嶅悎鏍间笉浜堥��璐у苟鐣欏瓨璁板綍锛岄殢鍚庤繘鍏ラ攢鍞儴棰嗗瀹℃壒銆傚悇瀹℃壒鑺傜偣鏆傜敱 admin 澶勭悊銆�
+
+## 鏈浠g爜璋冩暣
+
+- 鐢熶骇璐ㄦ鎸夊姞宸ラ儴銆侀攢鍞儴鍒嗗埆褰曞叆锛屾帴鍙e繀椤讳紶 `qcLine=1/2`锛涘悓涓�琚嬬爜鍙舰鎴愪袱鏉$嫭绔嬫楠岃褰曘��
+- 鎵归噺澶嶆鎸夎川妫�绾块殧绂伙紝鎻愪氦鏃舵牎楠屾壒娆°�佽川妫�绾垮拰娴佺▼鐘舵�佷竴鑷达紝閬垮厤璺ㄧ嚎瑕嗙洊瀹炴祴缁撴灉銆�
+- 鍒濇鍚堟牸杩涘叆閮ㄩ棬瀹℃壒锛屽垵妫�涓嶅悎鏍煎厛澶嶆锛涢儴闂ㄥ鎵瑰畬鎴愬悗锛屼袱鏉$嚎姹囧悎鍒板叕鍙歌川妫�瀹℃壒銆傞��璐у妫�缁撴灉杩涘叆閿�鍞儴瀹℃壒銆�
+- BPM 鍥炶皟鎸夋祦绋嬪疄渚嬬紪鍙峰尮閰嶈褰曪紝瀹℃壒椹冲洖鍚庢竻鐞嗗搴斿疄渚嬬紪鍙凤紝浠ヤ究閲嶆鍚庨噸鏂板彂璧枫��
+- 璐ㄦ璁板綍椤垫彁渚� BPM 璇︽儏鍏ュ彛锛涙祦绋嬪惎鍔ㄥけ璐ユ椂鍙璇ヨ褰曢噸鏂板彂璧枫��
+- 涓変唤 BPMN 妯″瀷鏂囦欢浣嶄簬 `yudao-module-mes/src/main/resources/bpm/`锛屽�欓�変汉鏆備负褰撳墠鏁版嵁搴撻粯璁� admin 鐢ㄦ埛 ID 1銆�
+
+## 涓婄嚎鍓嶇疆宸ヤ綔
+
+- 鍦� BPM 娴佺▼妯″瀷绠$悊涓鍏ュ苟鍙戝竷涓変唤 BPMN 鏂囦欢锛屾祦绋嬪畾涔� key 蹇呴』涓庢枃浠朵腑 `process id` 涓�鑷淬�傚彲鐢� `scripts/deploy-seed-quality-bpm.ps1 -ApiBaseUrl <绠$悊鍚庡彴 API 鏍瑰湴鍧�> -AccessToken <admin 浠ょ墝>` 鍒涘缓鎴栨洿鏂板苟鍙戝竷銆傝剼鏈樉寮忚缃� admin锛堢敤鎴� ID 1锛変负瀹℃壒浜轰笖绂佺敤鑷姩瀹℃壒锛涚洰鏍囩幆澧冧腑搴斿厛纭 admin 鐨� ID 涓� 1銆�
+- 鎵ц `sql/mysql/mes_seed_quality_dual_line_20261105.sql`锛岀‘淇� `qc_line`銆乣biz_type`銆佹祦绋嬪疄渚嬪瓧娈靛拰鍙岀嚎鍞竴绱㈠紩宸插氨缁��
+- 澶勭悊鏃х殑鍦ㄩ�斾汉宸ュ鎵硅褰曞強宸茬粡浜х敓鐨� BPM 娴佺▼瀹炰緥锛岄伩鍏嶆柊鏃х姸鎬佹贩鐢ㄣ��
+- 涓変釜 BPM 娴佺▼鍙戝竷骞跺畬鎴愬湪閫旀暟鎹鐞嗗悗锛屾墽琛� `sql/mysql/mes_qc_approver_menu_retire_20261106.sql` 闅愯棌鏃у鏍镐汉閰嶇疆鑿滃崟銆傚巻鍙查厤缃暟鎹笉鍒犻櫎銆�
+- 鏂板弻绾胯褰曠殑浜哄伐瀹℃壒鎺ュ彛浼氭嫆缁濇搷浣滃苟鎻愮ず杞埌 BPM 寰呭姙锛涘巻鍙叉湭鍖哄垎璐ㄦ绾跨殑璁板綍浠嶄繚鐣欎汉宸ユ帴鍙e吋瀹广�傞〉闈㈤殣钘忔柊璁板綍鐨勬壒閲忎汉宸ュ鎵瑰叆鍙c��
+
+鏈枃鏄縼绉诲伐浣滆褰曪紱BPM 妯″瀷灏氭湭鍦ㄧ洰鏍囨暟鎹簱鍙戝竷锛岀敤鎴峰皢缁熶竴璐熻矗娴嬭瘯銆�
diff --git a/docs/qc_seed_indicator_range_product_integration.md b/docs/qc_seed_indicator_range_product_integration.md
new file mode 100644
index 0000000..a089d97
--- /dev/null
+++ b/docs/qc_seed_indicator_range_product_integration.md
@@ -0,0 +1,123 @@
+# 璐ㄦ椤瑰悎鏍艰寖鍥撮厤缃紙鎸変骇鍝佺淮鎶わ級- 鍓嶇鑱旇皟鏂规
+
+## 鍙樻洿鑳屾櫙
+
+鍘熴�岃川閲忕鐞� > 璐ㄦ椤瑰悎鏍艰寖鍥撮厤缃�嶅皢鎵�鏈変骇鍝佸叡鐢ㄧ函搴︺�佸噣搴︺�佸彂鑺界巼銆佹按鍒嗗洓椤瑰浐瀹氶厤缃��
+鐜版敼涓�**鎸変骇鍝佺淮鎶よ川妫�椤�**锛氭瘡涓川妫�椤瑰繀椤荤粦瀹氫竴涓骇鍝侊紙`mdm_item` 涓殑鍚敤鐗╂枡锛屾湰涓氬姟鍗崇瀛愬搧绉嶏級锛�
+鍚屼竴浜у搧涓嬭川妫�椤圭紪鐮佸敮涓�锛屽彲鑷敱鏂板銆佺紪杈戙�佸垹闄ゃ�佸惎鍋滃拰鎺掑簭銆�
+
+鍘嗗彶鍥涢」鏁版嵁鑷姩杩佺Щ涓�**閫氱敤榛樿椤�**锛坄itemId` 涓虹┖锛夛紝浜у搧鏈厤缃笓灞為」鏃跺洖閫�浣跨敤锛屼繚璇佸瓨閲忔暟鎹笌娴佺▼涓嶅彈褰卞搷銆�
+
+## 娑夊強椤甸潰
+
+- 璐ㄩ噺绠$悊 鈫� 璐ㄦ椤瑰悎鏍艰寖鍥撮厤缃紙璺敱 `mes/qc/seedRange/index`锛�
+- 璐ㄩ噺绠$悊 鈫� 绉嶅瓙璐ㄦ锛堟闈㈢锛岃矾鐢� `mes/qc/seedQuality/index`锛�
+- 璐ㄩ噺绠$悊 鈫� 绉嶅瓙璐ㄦ璁板綍锛堟闈㈢锛岃矾鐢� `mes/qc/seedQuality/record`锛�
+- 绉诲姩绔� 鈫� 绉嶅瓙璐ㄦ锛坄/mobile/quality`锛�
+- 绉诲姩绔� 鈫� 璐ㄦ璁板綍 / 鎵归噺妫�楠屼笌瀹℃牳锛坄/mobile/quality-records`锛�
+
+## 涓氬姟娴佺▼涓庢暟鎹甫鍏�
+
+1. 閰嶇疆椤甸�夋嫨浜у搧 鈫� 鍒楄〃鍙樉绀鸿浜у搧宸茬淮鎶ょ殑璐ㄦ椤癸紱浜у搧鏈厤缃椂鏄剧ず绌烘�佸苟鎻愮ず"璐ㄦ鏃朵娇鐢ㄩ�氱敤榛樿椤�"銆�
+2. 璐ㄦ椤垫壂鐮侊紙琚嬬爜 / 鎵樼洏鐮� / 鐢熶骇鎵规鐮侊級鈫� 瑙f瀽鎺ュ彛鐩存帴杩斿洖璇ヤ骇鍝佺殑**鐢熸晥璐ㄦ椤瑰垪琛�**锛堝惈缂栫爜銆佸悕绉般�佸崟浣嶃�佸悎鏍间笂涓嬮檺锛夈��
+3. 璐ㄦ椤垫寜杩斿洖鐨勬寚鏍囧垪琛ㄥ姩鎬佹覆鏌撹緭鍏ラ」锛屼笉鍐嶅浐瀹氬洓椤广�佷笉鍐嶉檺鍒� 0鈥�100銆�
+4. 鎻愪氦鏃跺悗绔寜"鐢熸晥閰嶇疆 / 鍘熻褰曟寚鏍囬泦鍚�"鏍¢獙鎸囨爣鏁伴噺涓庣紪鐮侀泦鍚堬紝鍓嶇涓嶅緱鑷澧炲垹鎸囨爣銆�
+5. 澶嶆浣跨敤鍘熻川妫�璁板綍鐨勬寚鏍囬泦鍚堬紝閰嶇疆鍚庣画鍙樻洿涓嶅奖鍝嶅巻鍙茶褰曞妫�銆�
+
+## API
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|------|------|------|
+| GET | /mes/qc/seed-quality/ranges | 鏌ヨ璐ㄦ椤归厤缃紙`itemId` 涓虹┖鏌ラ�氱敤榛樿椤癸級 |
+| GET | /mes/qc/seed-quality/ranges/effective | 鏌ヨ鎸囧畾浜у搧鐢熸晥鐨勮川妫�椤� |
+| POST | /mes/qc/seed-quality/ranges | 鏂板璐ㄦ椤� |
+| PUT | /mes/qc/seed-quality/ranges/{id} | 淇敼璐ㄦ椤� |
+| DELETE | /mes/qc/seed-quality/ranges/{id} | 鍒犻櫎璐ㄦ椤� |
+| POST | /mes/qc/seed-quality/ranges/copy-default?itemId= | 澶嶅埗閫氱敤榛樿椤瑰埌鎸囧畾浜у搧 |
+
+**鏌ヨ鍙傛暟锛圙ET /ranges锛夛細**
+
+| 鍙傛暟 | 绫诲瀷 | 蹇呭~ | 璇存槑 |
+|------|------|------|------|
+| itemId | Long | 鍚� | 浜у搧缂栧彿锛涗笉浼犳煡璇㈤�氱敤榛樿椤� |
+| keyword | String | 鍚� | 璐ㄦ椤瑰悕绉�/缂栫爜妯$硦鍖归厤 |
+| status | Integer | 鍚� | 0 鍚敤 1 鍋滅敤 |
+
+**淇濆瓨鍙傛暟锛圥OST / PUT锛夛細**
+
+| 鍙傛暟 | 绫诲瀷 | 蹇呭~ | 璇存槑 |
+|------|------|------|------|
+| itemId | Long | 鏄� | 浜у搧缂栧彿锛堝惎鐢ㄧ姸鎬佺殑鐗╂枡锛� |
+| indicatorCode | String | 鏄� | 缂栫爜锛屽瓧姣嶅紑澶达紝浠呭瓧姣�/鏁板瓧/涓嬪垝绾匡紝鏈�闀� 64锛涘悓涓�浜у搧涓嬪敮涓� |
+| indicatorName | String | 鏄� | 璐ㄦ椤瑰悕绉� |
+| unit | String | 鍚� | 鍗曚綅锛岄粯璁� `%` |
+| minValue | BigDecimal | 鏄� | 鍚堟牸涓嬮檺锛屸墺 0 |
+| maxValue | BigDecimal | 鏄� | 鍚堟牸涓婇檺锛屸墺 涓嬮檺 |
+| sort | Integer | 鍚� | 鎺掑簭锛岄粯璁� 0 |
+| status | Integer | 鍚� | 0 鍚敤 1 鍋滅敤锛岄粯璁� 0 |
+
+**鍝嶅簲瀛楁锛堝垪琛� / 鐢熸晥鍒楄〃锛夛細**
+
+| 瀛楁 | 绫诲瀷 | 璇存槑 |
+|------|------|------|
+| id | Long | 涓婚敭 |
+| itemId | Long | 浜у搧缂栧彿锛涗负绌鸿〃绀洪�氱敤榛樿椤� |
+| indicatorCode | String | 缂栫爜 |
+| indicatorName | String | 鍚嶇О |
+| unit | String | 鍗曚綅 |
+| minValue | BigDecimal | 鍚堟牸涓嬮檺 |
+| maxValue | BigDecimal | 鍚堟牸涓婇檺 |
+| sort | Integer | 鎺掑簭 |
+| status | Integer | 鐘舵�� |
+| updateTime | Date | 鏇存柊鏃堕棿 |
+
+**鍝嶅簲绀轰緥锛�**
+
+```json
+{
+ "code": 0,
+ "data": [
+ { "id": 1, "itemId": 1001, "indicatorCode": "purity", "indicatorName": "绾害",
+ "unit": "%", "minValue": 95, "maxValue": 100, "sort": 10, "status": 0 }
+ ]
+}
+```
+
+## 璐ㄦ鎺ュ彛鍝嶅簲鏂板瀛楁
+
+`/mes/qc/seed-quality/resolve`銆乣/retest-scope/resolve` 鍝嶅簲鏂板锛�
+
+| 瀛楁 | 绫诲瀷 | 璇存槑 |
+|------|------|------|
+| itemId | Long | 浜у搧缂栧彿 |
+| itemCode | String | 浜у搧缂栫爜 |
+| itemName | String | 浜у搧鍚嶇О |
+| indicators | Array | 鐢熸晥璐ㄦ椤癸細`{ code, name, unit, minValue, maxValue }` |
+
+璐ㄦ璁板綍鍒嗛〉鏂板 `itemId / itemCode / itemName`锛涙寚鏍囨槑缁嗘柊澧� `indicatorName / unit`銆�
+
+## 鐢熸晥瑙勫垯
+
+| 鍦烘櫙 | 瑙勫垯 |
+|------|------|
+| 浜у搧閰嶇疆浜嗗惎鐢ㄧ殑涓撳睘璐ㄦ椤� | 浣跨敤璇ヤ骇鍝佺殑涓撳睘閰嶇疆 |
+| 浜у搧鏈厤缃换浣曚笓灞炶川妫�椤� | 鍥為��浣跨敤閫氱敤榛樿椤癸紙`item_id` 涓虹┖涓斿惎鐢級 |
+| 浜у搧瀛樺湪涓撳睘椤逛絾鍏ㄩ儴鍋滅敤 | 瑙嗕负鏈厤缃紝鍥為��閫氱敤榛樿椤� |
+| 浜у搧涓庨�氱敤榛樿椤归兘涓虹┖ | 璐ㄦ鎺ュ彛鎶ラ敊"璇ヤ骇鍝佸皻鏈厤缃川妫�椤癸紝璇疯仈绯荤鐞嗗憳缁存姢" |
+| 鎸囨爣鏍¢獙 | 鎻愪氦鐨勬寚鏍囩紪鐮侀泦鍚堝繀椤讳笌鐢熸晥閰嶇疆瀹屽叏涓�鑷达紝鏁伴噺銆佺紪鐮佷笉寰楀鍒� |
+| 鏁板�兼牎楠� | 瀹炴祴鍊笺�佷笂涓嬮檺鍧� 鈮� 0锛屼笅闄� 鈮� 涓婇檺锛涘疄娴嬪�煎湪鍖洪棿鍐呭垽瀹氬悎鏍� |
+| 澶嶆 | 鎸夊師璐ㄦ璁板綍鐨勬寚鏍囬泦鍚堟牎楠岋紝涓嶄娇鐢ㄥ綋鍓嶉厤缃� |
+
+## 杩佺Щ姝ラ
+
+1. 鎵ц `sql/mysql/mes_qc_seed_indicator_range_product_20261105.sql`锛堝箓绛夛紝鍙噸澶嶆墽琛岋級銆�
+2. 鑴氭湰浼氭妸鍘熷洓椤规爣璁颁负閫氱敤榛樿椤癸紙`item_id` 涓虹┖锛夛紝涓嶅奖鍝嶄换浣曞瓨閲忚川妫�娴佺▼銆�
+3. 鍚勪骇鍝佸彲鍦ㄩ厤缃〉閫氳繃"澶嶅埗閫氱敤榛樿椤�"蹇�熺敓鎴愪笓灞為厤缃紝鍐嶆寜闇�璋冩暣銆�
+
+## 娉ㄦ剰浜嬮」
+
+- 璐ㄦ椤圭紪鐮佸湪鍚屼竴浜у搧涓嬪敮涓�锛涚紪杈戞椂缂栫爜涓嶅彲淇敼锛屽闇�鏇存崲璇峰垹闄ゅ悗鏂板銆�
+- 浜у搧涓嬫媺鍙樉绀哄惎鐢ㄧ姸鎬佺殑鐗╂枡锛岃纭繚寰呴厤缃殑绉嶅瓙鍝佺宸茬淮鎶や负鍚敤鐗╂枡銆�
+- 鍓嶇涓嶅啀瀵规寚鏍囧仛 0鈥�100 鐨勭‖鎬ч檺鍒讹紝鏀逛负闈炶礋 + 涓嬮檺 鈮� 涓婇檺锛涜鍕垮湪鍓嶇鑷杩囨护鎴栬ˉ鍏ㄦ寚鏍囥��
+- 绉诲姩绔笌妗岄潰绔潎浠ヨВ鏋愭帴鍙h繑鍥炵殑 `indicators` 涓哄噯锛屼笉鍐嶅崟鐙皟鐢ㄨ寖鍥撮厤缃帴鍙c��
+- 鍒犻櫎璐ㄦ椤瑰彧褰卞搷鍚庣画璐ㄦ锛屽巻鍙茶褰曚腑鐨勬寚鏍囧悕绉�/鍗曚綅浠ュ揩鐓у舰寮忎繚瀛橈紝涓嶅彈褰卞搷銆�
diff --git a/docs/qc_seed_quality_batch_fold_integration.md b/docs/qc_seed_quality_batch_fold_integration.md
new file mode 100644
index 0000000..266980b
--- /dev/null
+++ b/docs/qc_seed_quality_batch_fold_integration.md
@@ -0,0 +1,141 @@
+# 璐ㄦ璁板綍鎸夌敓浜ф壒娆℃姌鍙犲睍绀� - 鍓嶇鑱旇皟鏂规
+
+## 娑夊強椤甸潰
+
+- 璐ㄩ噺绠$悊 > 璐ㄦ璁板綍锛坄/qc/seed-quality-record`锛�
+
+## 椤甸潰缁撴瀯
+
+1. 椤堕儴椤靛ご涓庣粨鏋滅粺璁″崱鐗囦繚鎸佸師鏍枫��
+2. 璁板綍鍖哄煙鐢便�屾暣琛ㄥ钩閾恒�嶆敼涓恒�屾寜鐢熶骇鎵规鎶樺彔銆嶏細
+ - 姣忎釜鐢熶骇鎵规涓轰竴寮犲彲鎶樺彔鍒嗙粍鍗$墖锛岄粯璁ゅ睍寮�绗竴鏉°��
+ - 鍗$墖澶撮儴灞曠ず鎵规鍙枫�佸搧绉嶃�佸姞宸ュ崟浣嶃�佺敓浜ф棩鏈熴�佹渶杩戞楠屾椂闂达紝浠ュ強鍚堟牸/涓嶅悎鏍�/澶勭悊涓�/寰呭鏍哥粺璁°��
+ - 灞曞紑鍚庡睍绀鸿鎵规涓嬬殑璐ㄦ鏄庣粏琛紙鍒嗛〉銆佸嬀閫夈�佹壒閲忔搷浣滀粛鍙敤锛夈��
+3. 搴曢儴涓恒�屾壒娆″垎椤点�嶏紝鎸夋壒娆$炕椤碉紱鏄庣粏鍒嗛〉鍦ㄦ瘡寮犲崱鐗囧唴閮ㄧ嫭绔嬬淮鎶ゃ��
+
+## API
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|------|------|------|
+| GET | /mes/qc/seed-quality/batch-page | 鏂板锛氳川妫�璁板綍鎸夌敓浜ф壒娆″垎缁勫垎椤碉紙鎵规姹囨�伙級 |
+| GET | /mes/qc/seed-quality/page | 鍘熸湁锛氳川妫�鏄庣粏鍒嗛〉锛屾柊澧炰袱涓彲閫夎繃婊ゅ弬鏁� |
+
+### 1. 鎵规鍒嗙粍鍒嗛〉
+
+`GET /mes/qc/seed-quality/batch-page`
+
+**璇锋眰鍙傛暟锛堜笌鏄庣粏鍒嗛〉涓�鑷达紝鍧囧彲閫夛級锛�**
+
+| 鍙傛暟 | 绫诲瀷 | 蹇呭~ | 璇存槑 |
+|------|------|------|------|
+| pageNo | Integer | 鍚� | 鎵规椤电爜锛岄粯璁� 1 |
+| pageSize | Integer | 鍚� | 姣忛〉鎵规鏁帮紝榛樿 10锛屾渶澶� 100 |
+| code | String | 鍚� | 琚嬬爜锛堟敮鎸佹壂鐮佸唴瀹癸紝鍚庣鑷姩瑙f瀽涓鸿鐮侊級 |
+| batchCode | String | 鍚� | 鐢熶骇鎵规鍙凤紙妯$硦鍖归厤锛� |
+| result | Integer | 鍚� | 妫�楠岀粨鏋滐細1 鍚堟牸锛�2 涓嶅悎鏍硷紝0 澶勭悊涓� |
+| workflowStatus | Integer | 鍚� | 娴佺▼鐘舵�侊紝鍙栧�艰涓嬭〃 |
+
+**鍝嶅簲瀛楁锛�**
+
+| 瀛楁 | 绫诲瀷 | 璇存槑 |
+|------|------|------|
+| batchId | Long | 鐢熶骇鎵规缂栧彿锛屾湭缁戝畾鎵规鏃朵负绌� |
+| batchCode | String | 鐢熶骇鎵规鍙凤紝鏈粦瀹氭椂涓虹┖瀛楃涓� |
+| batchLabel | String | 鎵规灞曠ず鍚嶏紝鏈粦瀹氭椂涓恒�屾湭缁戝畾鎵规銆� |
+| itemId | Long | 鍝佺缂栧彿 |
+| itemCode | String | 鍝佺缂栫爜 |
+| itemName | String | 鍝佺鍚嶇О |
+| lineName | String | 鍔犲伐鍗曚綅锛堜骇绾垮悕绉帮級 |
+| produceDate | LocalDateTime | 鐢熶骇鏃ユ湡 |
+| totalCount | Integer | 缁勫唴璐ㄦ璁板綍鎬绘暟 |
+| passCount | Integer | 鍚堟牸鏁伴噺 |
+| failCount | Integer | 涓嶅悎鏍兼暟閲� |
+| processingCount | Integer | 澶勭悊涓暟閲� |
+| pendingRetestCount | Integer | 寰呭妫�/閲嶆柊鍒濇鏁伴噺锛�10銆�50锛� |
+| pendingProcessReviewCount | Integer | 寰呭垵妫�瀹℃牳鏁伴噺锛�20銆�25锛� |
+| pendingCompanyReviewCount | Integer | 寰呭妫�瀹℃牳鏁伴噺锛�30銆�60锛� |
+| releasedCount | Integer | 宸叉斁琛屾暟閲忥紙40锛� |
+| scrappedCount | Integer | 宸叉姤搴熸暟閲忥紙70锛� |
+| lastInspectedAt | LocalDateTime | 缁勫唴鏈�杩戞楠屾椂闂达紝鐢ㄤ簬鎺掑簭涓庡睍绀� |
+
+**鍝嶅簲绀轰緥锛�**
+
+```json
+{
+ "code": 0,
+ "data": {
+ "list": [
+ {
+ "batchId": 1024,
+ "batchCode": "2026001",
+ "batchLabel": "2026001",
+ "itemCode": "SEED001",
+ "itemName": "濉旀渤4鍙�",
+ "lineName": "涓�鍙峰姞宸ョ嚎",
+ "produceDate": "2026-11-01 08:00:00",
+ "totalCount": 120,
+ "passCount": 80,
+ "failCount": 10,
+ "processingCount": 30,
+ "pendingRetestCount": 5,
+ "pendingProcessReviewCount": 15,
+ "pendingCompanyReviewCount": 10,
+ "releasedCount": 80,
+ "scrappedCount": 10,
+ "lastInspectedAt": "2026-11-05 09:30:00"
+ }
+ ],
+ "total": 1
+ }
+}
+```
+
+### 2. 鏄庣粏鍒嗛〉鏂板鍙傛暟
+
+`GET /mes/qc/seed-quality/page`
+
+鍦ㄥ師鏈夊弬鏁板熀纭�涓婃柊澧烇細
+
+| 鍙傛暟 | 绫诲瀷 | 蹇呭~ | 璇存槑 |
+|------|------|------|------|
+| exactBatchCode | String | 鍚� | 鐢熶骇鎵规鍙风簿纭尮閰嶏紝灞曞紑鏌愪釜鎵规鏃朵紶鍏� |
+| unbound | Boolean | 鍚� | 浠呮煡璇㈡湭缁戝畾鐢熶骇鎵规鐨勮褰曪紝灞曞紑銆屾湭缁戝畾鎵规銆嶆椂浼� true |
+
+**鍝嶅簲瀛楁鏃犲彉鍖栥��**
+
+## 鎺ュ彛璋冪敤鏃跺簭
+
+1. 椤甸潰鍔犺浇鎴栫瓫閫夋煡璇細璋冪敤 `batch-page` 鑾峰彇褰撳墠椤垫壒娆℃眹鎬汇��
+2. 榛樿灞曞紑绗竴鏉℃壒娆★細璋冪敤 `page`锛屼紶 `exactBatchCode`锛堟垨 `unbound=true`锛�+ 褰撳墠绛涢�夋潯浠躲��
+3. 灞曞紑鍏朵粬鎵规锛氭寜闇�璋冪敤 `page`锛屾瘡涓壒娆$淮鎶ょ嫭绔嬬殑椤电爜涓庢瘡椤垫潯鏁般��
+4. 鎵规缈婚〉锛氶噸鏂拌皟鐢� `batch-page`銆�
+5. 澶嶆銆佸鏍搞�佹祦绋嬭褰曠瓑鎿嶄綔娌跨敤鍘熸帴鍙o紝鎿嶄綔鎴愬姛鍚庨噸鏂板姞杞芥壒娆℃眹鎬诲強宸插睍寮�鎵规鐨勬槑缁嗐��
+
+## 瀛楁灞曠ず瑙勫垯
+
+| 瀛楁 | 灞曠ず浣嶇疆 | 璇存槑 |
+|------|----------|------|
+| batchLabel | 鎵规鍗$墖澶� | 鎵规涓绘爣棰橈紝鏈粦瀹氭壒娆℃樉绀恒�屾湭缁戝畾鎵规銆� |
+| itemName / lineName / produceDate / lastInspectedAt | 鎵规鍗$墖澶� | 鍓爣棰樹俊鎭紝缂哄け鏃堕殣钘� |
+| totalCount / passCount / failCount / processingCount | 鎵规鍗$墖澶� | 缁熻鑳跺泭锛屽缁堝睍绀� |
+| pendingProcessReviewCount / pendingCompanyReviewCount / pendingRetestCount / releasedCount / scrappedCount | 鎵规鍗$墖澶� | 鐘舵�佹爣绛撅紝鏁伴噺涓� 0 鏃堕殣钘� |
+| 璐ㄦ缂栧彿銆佽鐮併�佹墭鐩樼爜銆佹楠岀粨鏋溿�佹祦绋嬬姸鎬併�佷笉鍚堟牸鍘熷洜銆佹楠屾椂闂淬�佹彁浜ゆ椂闂淬�佹搷浣� | 灞曞紑鍚庣殑鏄庣粏琛� | 鏄庣粏琛ㄥ唴涓嶅啀閲嶅灞曠ず鐢熶骇鎵规鍒� |
+
+## 涓氬姟瑙勫垯璇存槑
+
+| 鍦烘櫙 | 瑙勫垯 |
+|------|------|
+| 鍒嗙粍渚濇嵁 | 鎸夎川妫�璁板綍鐨� `batch_code` 鍒嗙粍锛屽悓涓�鎵规鐨勬墍鏈夎鐮佽川妫�璁板綍褰掍负涓�缁� |
+| 鏈粦瀹氭壒娆� | `batch_code` 涓虹┖鐨勮褰曞綊鍏ャ�屾湭缁戝畾鎵规銆嶇粍锛屾帓鍦ㄦ湁鎵规璁板綍涔嬪悗 |
+| 鎺掑簭 | 鎸夌粍鍐呮渶杩戞楠屾椂闂村�掑簭锛屽叾娆℃寜缁勫唴鏈�澶ц褰曠紪鍙峰�掑簭 |
+| 绛涢�� | 琚嬬爜銆佹壒娆″彿銆佹楠岀粨鏋溿�佹祦绋嬬姸鎬佺瓫閫夊悓鏃朵綔鐢ㄤ簬鍒嗙粍缁熻涓庢槑缁� |
+| 缁熻鍙e緞 | 缁熻鏁伴噺鍧囧熀浜庡綋鍓嶇瓫閫夋潯浠朵笅鐨勮褰曪紝涓嶇瓑浜庢壒娆″叏閮ㄨ鐮佹暟 |
+| 鍒嗛〉 | 鎵规鍒嗛〉涓庢槑缁嗗垎椤电浉浜掔嫭绔嬶紝鎵规鍒嗛〉鏀瑰彉鍚庢槑缁嗛噸鏂板姞杞� |
+
+## 娉ㄦ剰浜嬮」
+
+- 鎵规鍒嗙粍鎺ュ彛杩斿洖鐨勬槸姹囨�绘暟鎹紝涓嶅寘鍚槑缁嗭紱鏄庣粏蹇呴』閫氳繃 `page` 鎺ュ彛鎸夋壒娆″姞杞姐��
+- 灞曞紑鎵规鏃朵笉瑕佸鐢ㄣ�岀敓浜ф壒娆°�嶆ā绯婄瓫閫夊�硷紝蹇呴』浣跨敤 `exactBatchCode` 鎴� `unbound`锛屽惁鍒欎細涓插叆鍏朵粬鎵规鏁版嵁銆�
+- `processingCount` 涓虹粨鏋滀负绌烘垨 0 鐨勮褰曟暟锛屼笌銆屽鐞嗕腑銆嶅睍绀哄彛寰勪竴鑷淬��
+- 鍕鹃�夎褰曡法鎵规淇濈暀锛屾壒閲忔搷浣滀粛鎸夋祦绋嬬姸鎬佷笌鐢熶骇鎵规鍒嗙粍鍛堢幇銆�
+- 鑻ュ悗缁柊澧炶川妫�璁板綍瀛楁锛屽垎缁勭粺璁℃棤闇�璋冩暣锛涜嫢鏂板娴佺▼鐘舵�侊紝闇�瑕佸悓姝ヨˉ鍏呯粺璁″瓧娈典笌鍒嗙粍澶存爣绛俱��
diff --git a/docs/qc_seed_quality_dual_line_integration.md b/docs/qc_seed_quality_dual_line_integration.md
new file mode 100644
index 0000000..857f89c
--- /dev/null
+++ b/docs/qc_seed_quality_dual_line_integration.md
@@ -0,0 +1,145 @@
+# 绉嶅瓙璐ㄦ鍙岀嚎娴佺▼锛堝惈缁忛攢鍟嗛��璐ц川妫�锛�- 鍓嶇鑱旇皟鏂规
+
+## 娑夊強椤甸潰
+
+- 绉嶅瓙璐ㄦ鎻愪氦椤碉紙`views/mes/qc/seedQuality/index.vue`锛�
+- 绉嶅瓙璐ㄦ璁板綍椤碉紙`views/mes/qc/seedQuality/record.vue`锛�
+- 閿�鍞��璐у崟鍒楄〃椤碉紙`views/wls/returnsales/index.vue`锛夊強閫�璐ц川妫�寮圭獥
+
+## 涓氬姟娴佺▼涓庢暟鎹甫鍏�
+
+1. 鍔犲伐閮ㄥ紑閿�鍞叆搴擄細琚嬬爜鍏ュ簱鍚庡彲鎵爜璐ㄦ锛屾墭鐩樼爜姣� 48 琚嬫垨 100 琚嬬敓鎴愶紝鎵规鐮佸甫鍑烘暣鎵硅鏁般��
+2. **涓�娆$瀛愯川妫�鎻愪氦鍗冲悓鏃剁敓鎴愪袱鏉¤川妫�璁板綍**锛歚qcLine=1`锛堝姞宸ラ儴锛変笌 `qcLine=2`锛堥攢鍞儴锛夛紝涓ゆ潯璁板綍鐨勬寚鏍囥�佺粨璁哄畬鍏ㄤ竴鑷达紱鍚庣画澶嶆銆佸鎵瑰垎鍒寜璐ㄦ绾跨嫭绔嬭繘琛屻��
+3. 鍒濇鍚堟牸鐩存帴杩涘叆鏈嚎棰嗗 BPM 瀹℃壒锛涘垵妫�涓嶅悎鏍煎厛澶嶆锛屽啀杩涘叆鏈嚎棰嗗瀹℃壒銆傞儴闂ㄥ鎵归┏鍥炲悗閲嶆柊鍒濇銆�
+4. 涓ゆ潯绾垮垎鍒娇鐢ㄦ祦绋嬪畾涔� `mes_seed_quality_line_approve`锛宐usinessKey 涓� `璐ㄦ绾�#鐢熶骇鎵规鍙穈锛涘鎵归�氳繃鍚庤繘鍏ュ叕鍙歌川妫�寰呭鐘舵�併��
+5. 鍚屼竴鐢熶骇鎵规鍐呮墍鏈夎鐨勪袱鏉$嚎閮藉畬鎴愰儴闂ㄥ鎵瑰悗锛岀郴缁熻嚜鍔ㄥ彂璧�**涓�娆�**鍏徃璐ㄦ瀹℃壒锛堟祦绋嬪畾涔� `mes_seed_quality_company_approve`锛宐usinessKey 涓�**鐢熶骇鎵规鍙�**锛夈�傚叕鍙稿鎵�**鎸夋壒娆″彂璧枫�佹寜琚嬭惤搴�**锛氭瘡涓涓ゆ潯绾块兘涓哄悎鏍兼墠鏀捐鍏ュ簱锛屼换涓�鏉′笉鍚堟牸鍒欒琚嬫姤搴燂紱椹冲洖鍒欐暣鎵逛袱鏉$嚎涓�璧烽��鍥炲緟澶嶆銆�
+6. 鏀捐鍚庝骇鍝佹寮忓叆搴擄紝鍚庣画搴撶鎵爜鍑哄簱銆侀攢鍞浆绉荤粡閿�鍟嗐�佺粓绔啘鎴锋壂鐮佹函婧愩��
+7. 缁忛攢鍟嗛��璐у垎鏀細閿�鍞��璐у崟纭鍚庡彂璧烽��璐ц川妫� 鈫� 澶嶆 鈫� 閿�鍞儴棰嗗瀹℃壒锛涗笉鍚堟牸鍒欓��璐у崟鑷姩鍙栨秷銆佷笉浜堥��璐у苟淇濈暀妫�楠岃褰曘��
+
+## API
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|---|---|---|
+| GET | `/mes/qc/seed-quality/resolve` | 璇嗗埆琚嬬爜/鎵樼洏鐮�/鎵规鐮侊紝杩斿洖寰呮娓呭崟涓庡凡鏈夎川妫�绾� |
+| POST | `/mes/qc/seed-quality/submit-group` | 鎸夎鐮併�佹墭鐩樼爜銆佹壒娆$爜鎻愪氦鍒濇锛屼竴娆$敓鎴愬姞宸ラ儴銆侀攢鍞儴涓ゆ潯璁板綍 |
+| POST | `/mes/qc/seed-quality/submit` | 鍗曡鎻愪氦鍒濇锛屼竴娆$敓鎴愬姞宸ラ儴銆侀攢鍞儴涓ゆ潯璁板綍 |
+| GET | `/mes/qc/seed-quality/page` | 璐ㄦ璁板綍鍒嗛〉锛堟柊澧� `qcLine`銆乣bizType` 绛涢�変笌杩斿洖瀛楁锛� |
+| GET | `/mes/qc/seed-quality/batch-page` | 鎸夌敓浜ф壒娆″垎缁勭殑璐ㄦ姹囨�� |
+| POST | `/mes/qc/seed-quality/process-approve` | 鍒濇瀹℃牳锛堝姞宸ラ儴/閿�鍞儴棰嗗锛涢��璐ц川妫�鐨勯攢鍞儴瀹℃壒澶嶇敤姝ゆ帴鍙o級 |
+| POST | `/mes/qc/seed-quality/process-approve-batch` | 鎵归噺鍒濇瀹℃牳 |
+| POST | `/mes/qc/seed-quality/company-approve` | 鍏徃璐ㄦ瀹℃壒锛堟寜琚嬪悎骞朵袱鏉$嚎澶勭悊锛� |
+| POST | `/mes/qc/seed-quality/company-approve-batch` | 鎵归噺鍏徃璐ㄦ瀹℃壒锛堟寜琚嬬爜鍒嗙粍鍚堝苟锛� |
+| POST | `/mes/qc/seed-quality/retest` | 鍗曟潯璁板綍澶嶆/閲嶆柊鍒濇 |
+| POST | `/mes/qc/seed-quality/retest-batch` | 鎸夎褰� ID 鎵归噺澶嶆 |
+| GET | `/mes/qc/seed-quality/retest-scope/resolve` | 鎸夋墭鐩樼爜/鎵规鐮佽В鏋愬緟澶嶆涓庡緟瀹℃牳娓呭崟 |
+| POST | `/mes/qc/seed-quality/retest-scope` | 鎸夋墭鐩樼爜/鎵规鐮佹壒閲忓妫�鎴栭噸鏂板垵妫� |
+| GET | `/mes/qc/seed-quality/return/resolve` | 瑙f瀽缁忛攢鍟嗛��璐у崟寰呰川妫�淇℃伅 |
+| POST | `/mes/qc/seed-quality/return/submit` | 鎻愪氦缁忛攢鍟嗛��璐ц川妫� |
+| POST | `/mes/qc/seed-quality/return/approve` | 缁忛攢鍟嗛��璐ц川妫�閿�鍞儴棰嗗瀹℃壒 |
+
+### 鍝嶅簲瀛楁鏂板
+
+**`/resolve`锛坄SeedQualityScan`锛夋柊澧烇細**
+
+| 瀛楁 | 绫诲瀷 | 璇存槑 |
+|---|---|---|
+| qualityIds | Number[] | 璇ヨ宸插瓨鍦ㄧ殑鍏ㄩ儴璐ㄦ璁板綍缂栧彿 |
+| qualityLines | Object[] | 宸插瓨鍦ㄨ川妫�绾匡細`{ id, qcLine, workflowStatus }`锛堜笉鍚��璐ц川妫�璁板綍锛� |
+
+**`/page`锛坄SeedQualityRecord`锛夋柊澧烇細**
+
+| 瀛楁 | 绫诲瀷 | 璇存槑 |
+|---|---|---|
+| qcLine | Number | 璐ㄦ绾匡細1 鍔犲伐閮紝2 閿�鍞儴锛�0 鏈尯鍒嗭紙鍘嗗彶鏁版嵁锛� |
+| bizType | Number | 涓氬姟绫诲瀷锛�1 鐢熶骇鍏ュ簱璐ㄦ锛�2 缁忛攢鍟嗛��璐ц川妫� |
+| processInstanceId | String | 鏈嚎 BPM 娴佺▼瀹炰緥 |
+| companyProcessInstanceId | String | 鍏徃璐ㄦ BPM 娴佺▼瀹炰緥 |
+| returnSalesId / returnSalesCode | Number / String | 鍏宠仈閿�鍞��璐у崟 |
+| retestedAt / processApprovedAt / lineFinishedAt | String | 澶嶆銆佸垵妫�瀹℃牳銆佹湰绾垮畬鎴愭椂闂� |
+| companySubmittedAt / companyApprovedAt | String | 鍏徃瀹℃壒鍙戣捣銆佸畬鎴愭椂闂� |
+
+**璇锋眰鍙傛暟鏂板锛�**
+
+`/page`銆乣/batch-page` 鏀寔 `qcLine`銆乣bizType` 绛涢�夈��
+
+**`/return/resolve` 鍝嶅簲锛�**
+
+| 瀛楁 | 绫诲瀷 | 璇存槑 |
+|---|---|---|
+| returnSalesId / returnSalesCode / returnSalesStatus | Number / String / Number | 閫�璐у崟淇℃伅 |
+| itemId / batchId / batchCode | Number / Number / String | 浠庨��璐у崟鏄庣粏甯﹀嚭 |
+| indicators | Object[] | 璇ヤ骇鍝佺敓鏁堣川妫�椤� `{ code, name, unit, minValue, maxValue }` |
+| qualityId / result / workflowStatus | Number | 宸插瓨鍦ㄨ川妫�璁板綍鏃惰繑鍥烇紝鐢ㄤ簬绂佹閲嶅鎻愪氦 |
+
+**`/return/submit` 璇锋眰锛�**
+
+| 鍙傛暟 | 绫诲瀷 | 蹇呭~ | 璇存槑 |
+|---|---|---|---|
+| returnSalesId | Number | 鏄� | 閿�鍞��璐у崟缂栧彿 |
+| indicators | Object[] | 鏄� | `{ code, value, minValue, maxValue }`锛岄』瑕嗙洊鍏ㄩ儴鐢熸晥璐ㄦ椤� |
+| reason | String | 涓嶅悎鏍兼椂蹇呭~ | 涓嶅悎鏍煎師鍥� |
+
+## 娴佺▼鐘舵�佽鏄�
+
+| 鐘舵�佸�� | 鍚箟 | 澶勭悊浜�/瑙﹀彂鏂瑰紡 |
+|---|---|---|
+| 10 | 寰呭妫� | 鍔犲伐閮�/閿�鍞儴璐ㄦ鍛� |
+| 20 | 寰呴儴闂ㄥ鎵� | 鏈嚎棰嗗 BPM 寰呭姙 |
+| 25 | 寰呴儴闂ㄤ笉鍚堟牸瀹℃壒 | 鏈嚎棰嗗 BPM 寰呭姙 |
+| 30 | 寰呭叕鍙歌川妫�瀹℃壒 | 鍏徃璐ㄦ锛堝弻绾块儴闂ㄥ鎵瑰畬鎴愬悗鑷姩鍙戣捣锛� |
+| 40 | 宸叉斁琛� | 鍏徃瀹℃壒閫氳繃锛屽簱瀛樿浆鍏ュ悎鏍煎簱 |
+| 50 | 鍒濇椹冲洖寰呴噸妫� | 鏈嚎棰嗗椹冲洖鍚� |
+| 60 | 寰呭叕鍙歌川妫�涓嶅悎鏍煎鐞� | 鍏徃璐ㄦ锛堝弻绾块儴闂ㄥ鎵瑰畬鎴愬悗鑷姩鍙戣捣锛� |
+| 70 | 宸叉姤搴� | 鍏徃瀹℃壒纭涓嶅悎鏍� |
+
+缁忛攢鍟嗛��璐ц川妫�澶嶇敤鍚屼竴缁勭姸鎬侊細鍒濇鍚堟牸 鈫� 20锛堝緟閿�鍞儴棰嗗瀹℃壒锛夛紝涓嶅悎鏍� 鈫� 10锛堝緟澶嶆锛夛紱澶嶆鍚庢棤璁虹粨璁哄潎杩涘叆 20 骞跺彂璧烽攢鍞儴瀹℃壒銆傚鎵归�氳繃涓旀楠屽悎鏍� 鈫� 40锛岄��璐у崟杩涘叆鈥滃緟鎵ц鈥濓紱瀹℃壒椹冲洖鎴栨楠屼笉鍚堟牸 鈫� 70锛岄��璐у崟鍙栨秷銆�
+
+## BPM 娴佺▼瀹氫箟
+
+| 娴佺▼瀹氫箟 key | businessKey | 娴佺▼鍙橀噺 |
+|---|---|---|
+| `mes_seed_quality_line_approve` | `{qcLine}#{鐢熶骇鎵规鍙穧` | `qcLine`銆乣batchCode` |
+| `mes_seed_quality_company_approve` | 鐢熶骇鎵规鍙� | `batchCode`銆乣code`锛堝吋瀹规棫娴佺▼锛夈�乣passed` |
+| `mes_seed_return_approve` | 閿�鍞��璐у崟缂栧彿 | `returnSalesId`銆乣returnSalesCode`銆乣code` |
+
+- 娴佺▼鐩戝惉鍣ㄥ湪娴佺▼缁撴潫锛堥�氳繃/椹冲洖锛夋椂鍥炲啓璐ㄦ鐘舵�侊紱鍙栨秷锛圕ANCEL锛変笉鏀瑰彉涓氬姟鐘舵�併��
+- 鑻� BPM 娴佺▼瀹氫箟鏈儴缃诧紝鍙戣捣娴佺▼浼氬け璐ュ苟璁板綍鏃ュ織锛涗慨澶嶉厤缃悗鍙�氳繃璐ㄦ璁板綍椤电殑鈥滈噸鏂板彂璧峰鎵光�濇仮澶嶃�傛柊鍙岀嚎璁板綍涓嶈兘浣跨敤浜哄伐瀹℃壒鎺ュ彛銆�
+
+## 瀛楁灞曠ず瑙勫垯
+
+| 瀛楁 | 灞曠ず浣嶇疆 | 璇存槑 |
+|---|---|---|
+| qcLine | 璁板綍鍒楄〃銆佽鎯� | 鍔犲伐閮�/閿�鍞儴鏍囩锛涘巻鍙叉暟鎹樉绀衡�滄湭鍖哄垎鈥� |
+| bizType | 璁板綍鍒楄〃 | 閫�璐ц川妫�璁板綍鏄剧ず鈥滈��璐р�濇爣绛句笌閫�璐у崟鍙� |
+| workflowStatus | 璁板綍鍒楄〃銆佽鎯� | 鎸変笟鍔$被鍨嬪睍绀猴細閫�璐х姸鎬� 20 鏄剧ず鈥滃緟閿�鍞儴棰嗗瀹℃壒鈥� |
+| returnSalesCode | 璁板綍鍒楄〃 | 閫�璐ц川妫�鍏宠仈鐨勭粡閿�鍟嗛��璐у崟 |
+| processInstanceId / companyProcessInstanceId | 璇︽儏 | 灞曠ず瀵瑰簲鐨� BPM 瀹℃壒瀹炰緥锛堝彲璺宠浆娴佺▼璇︽儏锛� |
+
+## 涓氬姟瑙勫垯璇存槑
+
+| 鍦烘櫙 | 瑙勫垯 |
+|---|---|
+| 鍒濇鎻愪氦 | 姣忚鍥哄畾鐢熸垚鍔犲伐閮ㄣ�侀攢鍞儴涓ゆ潯璁板綍锛屾寚鏍囦笌缁撹瀹屽叏涓�鑷� |
+| 閲嶅鎻愪氦 | 鍚屼竴琚嬬爜宸叉湁浠绘剰涓�鏉$敓浜у叆搴撹川妫�璁板綍鏃舵嫆缁濆啀娆℃彁浜� |
+| 绾挎潯瀹℃壒 | 姣忔潯绾跨嫭绔嬪鎵癸紱BPM businessKey 鎸� `璐ㄦ绾�#鐢熶骇鎵规鍙穈 褰掑苟锛屽悓鎵规鍚岀嚎鏉′竴娆″鎵瑰叏閮ㄥ緟瀹¤褰� |
+| 鍏徃瀹℃壒锛圔PM锛� | 鎸夌敓浜ф壒娆″彧鍙戣捣涓�娆★細鎵规鍐呮墍鏈夌敓浜у叆搴撹川妫�璁板綍閮藉浜� 30/60 鏃舵墠鍙戣捣锛涙祦绋� businessKey 涓虹敓浜ф壒娆″彿锛涙祦绋嬪畬鎴愬悗鎸夎钀藉簱锛屾瘡涓涓ゆ潯绾块兘涓� 30 鏃舵斁琛岋紝鍚﹀垯鎶ュ簾锛涢┏鍥炴椂鏁存壒涓ゆ潯绾夸竴璧峰洖鍒� 10锛堝緟澶嶆锛� |
+| 鍏徃瀹℃壒锛堜汉宸ユ帴鍙o級 | 浠嶆寜琚嬪鐞嗭細蹇呴』涓ゆ潯绾块兘澶勪簬 30/60锛涗袱鏉$嚎閮戒负 30 鏃舵斁琛岋紝鍚﹀垯鎶ュ簾锛涢┏鍥炴椂涓ゆ潯绾夸竴璧峰洖鍒� 10锛堝緟澶嶆锛� |
+| 搴撳瓨娴佽浆 | 鍏徃瀹℃壒閫氳繃鍚庢暣琚嬭浆鍏ュ悎鏍煎簱锛涙姤搴熸椂涓嶅叆鍚堟牸搴擄紝淇濈暀璐ㄦ涓庡鎵圭棔杩� |
+| 閫�璐ц川妫� | 閫�璐у崟鐘舵�佷负鑽夌鎴栧緟妫�楠屾椂鍙彁浜わ紱涓嶅悎鏍艰嚜鍔ㄥ彇娑堥��璐у崟骞朵繚鐣欒川妫�璁板綍 |
+| 鏉冮檺 | 鍒濇鎻愪氦 `mes:qc-seed-quality:submit`锛涘妫� `mes:qc-seed-quality:retest`锛涙湰绾�/閿�鍞儴瀹℃壒 `mes:qc-seed-quality:process-approve`锛涘叕鍙稿鎵� `mes:qc-seed-quality:company-approve` |
+
+## 鏁版嵁搴撳彉鏇�
+
+鎵ц鑴氭湰锛歚sql/mysql/mes_seed_quality_dual_line_20261105.sql`
+
+- 鏂板瀛楁锛歚qc_line`銆乣biz_type`銆乣process_instance_id`銆乣company_process_instance_id`銆乣line_finished_at`銆乣company_submitted_at`銆乣return_sales_id`銆乣return_sales_code`銆�
+- 鍘熷敮涓�绱㈠紩 `uk_code` 璋冩暣涓� `uk_code_line(code, qc_line)`锛屽厑璁稿悓涓�琚嬬爜瀛樺湪涓ゆ潯璁板綍銆�
+- 鍘嗗彶鏁版嵁 `biz_type` 鍥炲~涓� 1锛堢敓浜у叆搴撹川妫�锛夛紝`qc_line` 涓� 0锛堟湭鍖哄垎锛夈��
+
+## 娉ㄦ剰浜嬮」
+
+- 鍓嶇鍒楄〃闇�鎸夆�滆鐮� + 璐ㄦ绾库�濆睍绀猴紝閬垮厤鎶婂悓涓�琚嬬殑涓ゆ潯璁板綍褰撴垚涓よ缁熻锛涙壒娆℃眹鎬绘帴鍙e凡鎸夎鐮佸幓閲嶃��
+- 鍏徃瀹℃壒鍗充娇鍙�変腑涓�鏉$嚎璁板綍锛屽悗绔篃浼氬鐞嗘暣琚嬩袱鏉$嚎锛屽墠绔彁绀洪渶璇存槑鈥滄寜琚嬪悎骞跺鐞嗏�濄��
+- 澶嶆銆佸垵妫�瀹℃牳鎸夎褰� ID 鎿嶄綔鏃跺彧褰卞搷鎵�閫夎褰曟墍鍦ㄧ嚎鏉★紱闇�瑕佸弻绾夸竴璧峰鐞嗚浣跨敤鍏徃瀹℃壒銆�
+- 缁忛攢鍟嗛��璐ц川妫�鍏ュ彛浣嶄簬鈥滈攢鍞��璐у崟鈥濆垪琛紝浠呪�滃緟妫�楠屸�濈姸鎬佹樉绀猴紱鎻愪氦鍚庡鎵瑰湪鈥滆川妫�璁板綍鈥濋〉瀹屾垚銆�
+- 閫�璐у崟琚彇娑堟垨璐ㄦ涓嶅悎鏍煎悗锛屼笉寰楀啀娆℃彁浜よ川妫�銆�
diff --git a/docs/scan_event_pallet_code_integration.md b/docs/scan_event_pallet_code_integration.md
new file mode 100644
index 0000000..073e8ca
--- /dev/null
+++ b/docs/scan_event_pallet_code_integration.md
@@ -0,0 +1,84 @@
+# 鎵爜浜嬩欢鍚屾椂灞曠ず鎵樼洏鐮佷笌鎵规鐮� - 鍓嶇鑱旇皟鏂规
+
+## 娑夊強椤甸潰
+
+- MES / 涓�琚嬩竴鐮佺鐞� / 鐢熶骇绾挎壂鐮佸叆搴擄紙`/bagcode/scan-in`锛�
+- MES / 鎵爜浜嬩欢鏌ヨ椤碉紙濡傚睍绀烘壂鐮佷簨浠跺垪琛紝鍙�夊悓姝ワ級
+
+## 涓氬姟璇存槑
+
+鎵爜浜嬩欢鐨勩�岃拷婧爜銆嶆槸瀹為檯鎵弿鍒扮殑鐮佸�硷紝鎸夋壂鐮佺被鍨嬩笉鍚屽彲鑳芥槸琚嬬爜銆佹墭鐩樼爜鎴栨壒娆$爜锛屽崟鐪嬭鍒楁棤娉曞尯鍒嗘墭鐩樹笌鎵规銆傛湰娆″湪鍝嶅簲涓ˉ鍏呮墭鐩樼爜锛屼娇鍒楄〃鍙互鍚屾椂灞曠ず銆屾墭鐩樼爜銆嶄笌銆屾壒娆$爜銆嶃��
+
+| 鎵爜绫诲瀷 | 杩芥函鐮侊紙bagCode锛� | 鎵樼洏鐮侊紙palletCode锛� | 鎵规鐮侊紙batchCode锛� |
+|----------|-------------------|----------------------|---------------------|
+| 琚嬬爜 BAG | 鎵弿鐨勮鐮�/涓氬姟鐮� | 璇ヨ鎵�灞炴墭鐩樼爜 | 琚嬫墍灞炴壒娆″彿 |
+| 鎵樼洏鐮� PALLET | 鎵弿鐨勬墭鐩樼爜/涓氬姟鐮�/涓存椂鐮� | 鎵樼洏姝e紡鐮侊紙鏃犳寮忕爜鏃跺洖閫�涓存椂鐮侊級 | 鎵樼洏鎵�灞炴壒娆″彿 |
+| 鎵规鐮� BATCH | 鎵弿鐨勬壒娆$爜 | 绌猴紙鏁存壒鍙兘璺ㄥ涓墭鐩橈紝涓嶅綊灞炲崟涓�鎵樼洏锛� | 鎵规鍙� |
+
+鎵樼洏鐮佷负璇诲彇鏃跺疄鏃跺弽鏌ュ緱鍑猴細
+
+- 鎵樼洏鐮佷簨浠舵寜鎵爜鍐呭鍙嶆煡鎵樼洏锛堝吋瀹逛笟鍔$爜銆佹寮忔墭鐩樼爜銆佷复鏃舵墭鐩樼爜锛夛紱
+- 琚嬬爜浜嬩欢鎸夎鐮佺紪鍙锋垨鐮佸�煎弽鏌ヨ鐮侊紝鍐嶅彇鍏舵墍灞炴墭鐩橈紱
+- 鍥犳鍘嗗彶鎵爜浜嬩欢鍚屾牱鑳藉睍绀烘墭鐩樼爜锛屾棤闇�鏁版嵁杩佺Щ銆�
+
+## API
+
+### 1. 鎵爜浜嬩欢鍒嗛〉
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|------|------|------|
+| GET | `/mes/pro/scan-in/page` | 鎵爜浜嬩欢鍒嗛〉锛堟潈闄� `mes:pro-scan-in:query`锛� |
+
+**鍝嶅簲瀛楁鏂板锛坄data.list[]`锛夛細**
+
+| 瀛楁 | 绫诲瀷 | 璇存槑 |
+|------|------|------|
+| palletId | Long | 鎵樼洏缂栧彿锛屾棤娉曞綊灞炴墭鐩樻椂涓虹┖ |
+| palletCode | String | 鎵樼洏鐮侊紝鏃犳硶褰掑睘鎵樼洏鏃朵负绌猴紙鎵规鎵爜鍥哄畾涓虹┖锛� |
+
+**鍝嶅簲绀轰緥锛�**
+
+```json
+{
+ "code": 0,
+ "data": {
+ "list": [
+ {
+ "id": 20,
+ "bagCode": "3508118133307512",
+ "scanType": "PALLET",
+ "palletId": 13708,
+ "palletCode": "3508118133307512",
+ "batchCode": "2026002",
+ "status": "SUCCESS"
+ }
+ ],
+ "total": 1
+ }
+}
+```
+
+### 2. 鏈�鏂版壂鐮佷簨浠� / 鐪嬫澘
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|------|------|------|
+| GET | `/mes/pro/scan-in/latest` | 鏈�鏂版壂鐮佷簨浠讹紙鏉冮檺 `mes:pro-scan-in:query`锛� |
+| GET | `/mes/pro/scan-in/dashboard` | 鎵爜鐪嬫澘锛坄data.latest` 鍚屾牱鍖呭惈鏂板瓧娈碉級 |
+
+### 3. 鍏朵粬杩斿洖鎵爜浜嬩欢鐨勬帴鍙�
+
+`/mes/pro/scan-in/my-page`銆乣/mes/pro/scan-in/my-event`銆乣/mes/pro/scan-in/inbound` 杩斿洖缁撴瀯涓�鑷达紝鍧囧寘鍚� `palletId`銆乣palletCode`銆�
+
+## 瀛楁灞曠ず瑙勫垯
+
+| 瀛楁 | 灞曠ず浣嶇疆 | 璇存槑 |
+|------|----------|------|
+| bagCode | 鍒楄〃 | 淇濈暀鍘熸湁銆岃拷婧爜銆嶅垪锛屽睍绀哄疄闄呮壂鎻忕爜鍊� |
+| palletCode | 鍒楄〃 | 鏂板銆屾墭鐩樼爜銆嶅垪锛岀┖鍊兼樉绀� `-` |
+| batchCode | 鍒楄〃 | 鍒楀悕鐢便�岀敓浜ф壒娆°�嶈皟鏁翠负銆屾壒娆$爜銆嶏紝绌哄�兼樉绀� `-` |
+
+## 娉ㄦ剰浜嬮」
+
+- 鎵规鐮佹壂鐮佷簨浠朵笉褰掑睘鍗曚竴鎵樼洏锛宍palletCode` 涓虹┖灞炴甯哥幇璞★紝鍓嶇鏄剧ず `-` 鍗冲彲銆�
+- 鎵樼洏鐮佷负瀹炴椂鍙嶆煡缁撴灉锛岃嫢鎵樼洏琚�昏緫鍒犻櫎锛屽巻鍙蹭簨浠跺彲鑳藉睍绀轰负绌恒��
+- 鏈敼鍔ㄤ笉娑夊強鏁版嵁搴撹〃缁撴瀯鍙樻洿锛屾棤闇�鎵ц SQL 鑴氭湰銆�
diff --git a/docs/scan_in_multi_type_inbound.md b/docs/scan_in_multi_type_inbound.md
index 283635c..470f8f0 100644
--- a/docs/scan_in_multi_type_inbound.md
+++ b/docs/scan_in_multi_type_inbound.md
@@ -28,8 +28,8 @@
| eventId | String | 鏄� | - | 浜嬩欢鍙凤紙寤鸿鐢� `{scanType}-{鏃堕棿鎴硙` 淇濊瘉鍞竴锛� |
| quantity | Number | 鏄� | - | 琚嬬爜鍦烘櫙浼� 1锛涙墭鐩�/鎵规鍦烘櫙鍚庣蹇界暐璇ュ�硷紝鎸夊凡瑁呰鏁�/鎵规琚嬫暟璁$畻 |
| lineCode | String | 鍚� | - | 浜х嚎缂栫爜锛堝墠绔笅鎷夐�夋嫨锛� |
-| locationId | Long | 鏄� | - | WIP 鏆傚瓨搴撳尯缂栧彿锛堝墠绔笅鎷夐�夋嫨锛� |
-| areaId | Long | 鏄� | - | WIP 鏆傚瓨搴撲綅缂栧彿锛堝墠绔笅鎷夐�夋嫨锛� |
+| locationId | Long | 鍚� | 鏀逛负闈炲繀濉� | WIP 鏆傚瓨搴撳尯缂栧彿锛堜粨搴撶Щ闄ゅ簱鍖�/搴撲綅鍚庡墠绔笉鍐嶄紶锛� |
+| areaId | Long | 鍚� | 鏀逛负闈炲繀濉� | WIP 鏆傚瓨搴撲綅缂栧彿锛堝墠绔笉鍐嶄紶锛� |
**鍝嶅簲鏂板瀛楁锛�**
diff --git a/docs/system_appearance_integration.md b/docs/system_appearance_integration.md
new file mode 100644
index 0000000..8c5b0c5
--- /dev/null
+++ b/docs/system_appearance_integration.md
@@ -0,0 +1,107 @@
+# 绯荤粺澶栬璁剧疆锛堢櫥褰曢〉鑳屾櫙鍥� + 浼佷笟 Logo锛�- 鍓嶇鑱旇皟鏂规
+
+## 娑夊強椤甸潰
+
+- 绯荤粺绠$悊 鈫� 澶栬璁剧疆锛坄system/appearance/index`锛�
+- 鐧诲綍椤碉紙鍝佺墝 Logo銆佺櫥褰曡儗鏅浘锛�
+- 棣栭〉锛堜晶杈规爮浼佷笟 Logo锛�
+
+## 涓氬姟娴佺▼涓庢暟鎹甫鍏�
+
+1. 绠$悊鍛樺湪銆屽瑙傝缃�嶉〉涓婁紶鐧诲綍椤佃儗鏅浘 / 浼佷笟 Logo锛屽浘鐗囬�氳繃鍏叡涓婁紶鎺ュ彛鐩存帴鑾峰緱姘镐箙璁块棶鍦板潃涓� `blobId`銆�
+2. 鐐瑰嚮淇濆瓨鍚庯紝鍚庣鎶� `blobId` 涓庡浐瀹氳褰曪紙`recordType = system_appearance`銆乣recordId = 1`锛夌粦瀹氾紝骞跺垎鍒互 `application = logo`銆乣application = login_background` 鍖哄垎涓ょ被鍥剧墖銆�
+3. 鍓嶇淇濆瓨鎴愬姛鍚庣珛鍗冲簲鐢細鐧诲綍椤佃儗鏅�佺櫥褰曢〉 Logo銆侀椤典晶杈规爮 Logo 瀹炴椂鍙樺寲銆�
+4. 娴忚鍣ㄥ埛鏂版垨閲嶆柊鐧诲綍鏃讹紝鍓嶇鍦ㄥ簲鐢ㄥ惎鍔ㄩ樁娈佃皟鐢ㄣ�岃幏寰楃郴缁熷瑙傘�嶆帴鍙o紝璇诲彇鏈嶅姟绔厤缃苟搴旂敤锛涙湭鐧诲綍鐨勭櫥褰曢〉涔熻兘鏄剧ず宸查厤缃殑鑳屾櫙鍥句笌 Logo銆�
+
+## API
+
+| 鏂规硶 | 璺緞 | 璇存槑 | 鏉冮檺 |
+|------|------|------|------|
+| GET | /system/appearance/get | 鑾峰緱绯荤粺澶栬閰嶇疆 | 鍖垮悕鍙闂紙@PermitAll锛� |
+| POST | /system/appearance/save | 淇濆瓨绯荤粺澶栬閰嶇疆 | `system:appearance:update` |
+| POST | /system/storage-blob/public-upload | 鍏叡鏂囦欢涓婁紶锛堟案涔呮湁鏁堬級 | 鐧诲綍鐢ㄦ埛 |
+| GET | /system/storage-blob/preview/{fileName}?publicKey=xxx | 鍥剧墖棰勮锛堟案涔呭湴鍧�锛� | 鍖垮悕鍙闂紙@PermitAll锛� |
+
+### 鑾峰緱绯荤粺澶栬
+
+**鍝嶅簲瀛楁锛�**
+
+| 瀛楁 | 绫诲瀷 | 璇存槑 |
+|------|------|------|
+| logoBlobId | Long | 浼佷笟 Logo 鐨勬枃浠剁紪鍙凤紝鏈厤缃负 null |
+| logoUrl | String | 浼佷笟 Logo 鐨勬案涔呰闂湴鍧�锛屾湭閰嶇疆涓� null |
+| loginBackgroundBlobId | Long | 鐧诲綍鑳屾櫙鍥剧殑鏂囦欢缂栧彿锛屾湭閰嶇疆涓� null |
+| loginBackgroundUrl | String | 鐧诲綍鑳屾櫙鍥剧殑姘镐箙璁块棶鍦板潃锛屾湭閰嶇疆涓� null |
+
+**鍝嶅簲绀轰緥锛�**
+
+```json
+{
+ "code": 0,
+ "data": {
+ "logoBlobId": 1024,
+ "logoUrl": "http://192.168.0.10:48080/admin-api/system/storage-blob/preview/xxx.png?publicKey=yyy",
+ "loginBackgroundBlobId": 1025,
+ "loginBackgroundUrl": "http://192.168.0.10:48080/admin-api/system/storage-blob/preview/zzz.png?publicKey=www"
+ },
+ "msg": ""
+}
+```
+
+### 鍏叡鏂囦欢涓婁紶
+
+- 璇锋眰鏂瑰紡锛歚multipart/form-data`
+- 鍙傛暟锛歚files`锛堝彲澶氫釜鏂囦欢锛屾湰鍦烘櫙涓�娆′竴涓枃浠讹級
+- 鍝嶅簲涓烘枃浠舵暟缁勶紝鏈満鏅彇绗竴涓厓绱狅紝浣跨敤鍏朵腑鐨� `id`锛堝嵆 `blobId`锛変笌 `previewURL`锛堟案涔呰闂湴鍧�锛夈��
+
+### 淇濆瓨绯荤粺澶栬
+
+**璇锋眰鍙傛暟锛�**
+
+| 鍙傛暟 | 绫诲瀷 | 蹇呭~ | 璇存槑 |
+|------|------|------|------|
+| logoBlobId | Long | 鍚� | 浼佷笟 Logo 鏂囦欢缂栧彿锛涗紶 null 琛ㄧず娓呴櫎 |
+| loginBackgroundBlobId | Long | 鍚� | 鐧诲綍鑳屾櫙鍥炬枃浠剁紪鍙凤紱浼� null 琛ㄧず娓呴櫎 |
+
+**璇锋眰绀轰緥锛�**
+
+```json
+{
+ "logoBlobId": 1024,
+ "loginBackgroundBlobId": 1025
+}
+```
+
+**鍝嶅簲锛�** `{ "code": 0, "data": true }`
+
+## 鎺ュ彛璋冪敤鏃跺簭
+
+1. 杩涘叆銆屽瑙傝缃�嶉〉 鈫� 璋冪敤 `GET /system/appearance/get`锛屽洖鏄惧凡閰嶇疆鐨勫浘鐗囦笌 `blobId`銆�
+2. 閫夋嫨鍥剧墖 鈫� 璋冪敤 `POST /system/storage-blob/public-upload` 鈫� 璁板綍杩斿洖鐨� `blobId` 涓� `previewURL`锛岄〉闈㈢珛鍗抽瑙堛��
+3. 鐐瑰嚮淇濆瓨 鈫� 璋冪敤 `POST /system/appearance/save`锛屾彁浜や袱涓� `blobId`銆�
+4. 淇濆瓨鎴愬姛鍚� 鈫� 绔嬪嵆鏇存柊棣栭〉 Logo 涓庣櫥褰曢〉鑳屾櫙/Logo锛屾棤闇�鍒锋柊銆�
+
+## 瀛楁灞曠ず瑙勫垯
+
+| 瀛楁 | 灞曠ず浣嶇疆 | 璇存槑 |
+|------|----------|------|
+| loginBackgroundUrl | 澶栬璁剧疆椤甸瑙堛�佺櫥褰曢〉鏁撮〉鑳屾櫙 | 鐧诲綍椤佃儗鏅浘锛屾湭閰嶇疆鏃朵娇鐢ㄧ郴缁熼粯璁よ儗鏅� |
+| logoUrl | 澶栬璁剧疆椤甸瑙堛�佺櫥褰曢〉鍝佺墝鍖� Logo銆侀椤典晶杈规爮 Logo | 涓�濂楅厤缃悓鏃朵綔鐢ㄤ簬鐧诲綍椤典笌棣栭〉锛屾湭閰嶇疆鏃朵娇鐢ㄧ郴缁熼粯璁� Logo |
+
+## 涓氬姟瑙勫垯璇存槑
+
+| 鍦烘櫙 | 瑙勫垯 |
+|------|------|
+| 涓婁紶 | 浠呮帴鍙楀父瑙勫浘鐗囨牸寮忥紙image/*锛夛紝浣跨敤鍏叡涓婁紶鎺ュ彛锛岃繑鍥炴案涔呭彲璁块棶鍦板潃 |
+| 淇濆瓨 | 涓ょ被鍥剧墖鐙珛淇濆瓨锛屾浛鎹㈠叾涓竴寮犱笉褰卞搷鍙︿竴寮� |
+| 娓呴櫎 | 瀵瑰簲 `blobId` 浼� null锛屼繚瀛樺悗鎭㈠绯荤粺榛樿鏍峰紡 |
+| 鏈櫥褰曡闂� | 鐧诲綍椤甸�氳繃 `@PermitAll` 鐨勫瑙傛煡璇㈡帴鍙h鍙栭厤缃紝鑳屾櫙鍥�/Logo 浣跨敤 `?publicKey=` 姘镐箙鍦板潃锛屾棤闇�鐧诲綍 |
+| 鍔犺浇澶辫触 | 鍓嶇鍚姩闃舵鏌ヨ澶栬澶辫触鏃堕潤榛樹繚鐣欓粯璁ゆ牱寮忥紝涓嶉樆濉炲簲鐢ㄥ惎鍔� |
+
+## 娉ㄦ剰浜嬮」
+
+- 鍥剧墖涓婁紶涓庝繚瀛樻槸涓ゆ鎿嶄綔锛屼笂浼犳垚鍔熶絾鏈偣鍑讳繚瀛樹笉浼氱敓鏁堛��
+- 澶栬閰嶇疆涓哄叏绯荤粺绾э紙`recordId = 1`锛夛紝涓嶅尯鍒嗙鎴蜂笌鐢ㄦ埛銆�
+- 鍓嶇鍚姩闃舵鏌ヨ澶栬鎺ュ彛闇�甯� `tenant-id` 璇锋眰澶淬��
+- 鑿滃崟銆屽瑙傝缃�嶇敱 SQL 鑴氭湰鍒濆鍖栵紝瓒呯骇绠$悊鍛橀粯璁ゆ嫢鏈夋潈闄愶紝鍏朵粬瑙掕壊闇�鍦ㄨ鑹茶彍鍗曚腑鍕鹃�夈�屼繚瀛樺瑙傝缃�嶆寜閽潈闄愩��
+- 鏇存崲鍥剧墖鍚庡缓璁娇鐢ㄥ浐瀹氬昂瀵哥殑妯増鑳屾櫙鍥撅紙濡� 1920脳1080锛夛紝Logo 寤鸿浣跨敤閫忔槑鑳屾櫙 PNG銆�
diff --git a/docs/warehouse_location_area_removal.md b/docs/warehouse_location_area_removal.md
new file mode 100644
index 0000000..01c8978
--- /dev/null
+++ b/docs/warehouse_location_area_removal.md
@@ -0,0 +1,74 @@
+# 浠撳簱绉婚櫎搴撳尯/搴撲綅 - 鍓嶇鑱旇皟鏂规
+
+## 鑳屾櫙
+
+浠撳簱绠$悊鏀逛负銆屼粨搴� 鈫� 搴撳瓨銆嶄袱绾х粨鏋勶紝涓嶅啀缁存姢搴撳尯锛坄warehouse_location`锛夊拰搴撲綅锛坄warehouse_area`锛夈��
+鍓嶇宸插垹闄ゅ簱鍖恒�佸簱浣嶇鐞嗛〉闈㈠強鎵�鏈変笟鍔¤〃鍗曚腑鐨勫簱鍖�/搴撲綅閫夋嫨椤癸紝鍚庣鍚屾绉婚櫎瀵瑰簲绠$悊鎺ュ彛锛屽苟鏀惧搴撳尯/搴撲綅鐨勫己鏍¢獙锛氭湭浼� `locationId`銆乣areaId` 鏃讹紝涓氬姟鎸変粨搴撶淮搴︽甯告墽琛屻��
+
+> 娉ㄦ剰锛氫唬鐮佷腑 `warehouse_location` 瀵瑰簲涓枃銆屽簱鍖恒�嶏紝`warehouse_area` 瀵瑰簲涓枃銆屽簱浣嶃�嶏紝涓庢棫鍛藉悕瀛楅潰鍚箟鐩稿弽锛岃仈璋冩椂璇蜂互瀛楁涓哄噯銆�
+
+## 娑夊強椤甸潰
+
+- 浠撳偍鐗╂祦 - 浠撳簱璁剧疆
+- 浠撳偍鐗╂祦 - 搴撳尯鍒楄〃銆佸簱浣嶅垪琛紙宸插垹闄わ級
+- 浠撳偍鐗╂祦 - 鍏ュ簱/鍑哄簱/绉诲簱/鐩樼偣/鏉傞」鏀跺彂璐�/濮斿绛夊崟鎹槑缁�
+- 浠撳偍鐗╂祦 - 搴撳瓨鏌ヨ銆佸簱瀛樼Щ搴撱�佸簱瀛樿皟鏁�
+- MES - 宸ヤ綔绔欑淮鎶�
+- 绉诲姩绔� - 鎵爜鍏ュ簱銆佸簱瀛樻煡璇€�佺Щ搴撱�佺洏鐐广�侀攢鍞嚭搴撱�佹潅椤归鏂欍�侀��璐ч鏂�
+
+## 绉婚櫎鐨勬帴鍙�
+
+浠ヤ笅鎺ュ彛锛堝簱鍖恒�佸簱浣嶇鐞嗭級宸蹭粠鍚庣鍒犻櫎锛岃皟鐢ㄥ皢杩斿洖 404锛�
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|------|------|------|
+| GET | `/mes/wm/warehouse-location/page` | 搴撳尯鍒嗛〉 |
+| GET | `/mes/wm/warehouse-location/simple-list` | 搴撳尯绮剧畝鍒楄〃 |
+| GET | `/mes/wm/warehouse-location/get` | 搴撳尯璇︽儏 |
+| POST | `/mes/wm/warehouse-location/create` | 鏂板搴撳尯 |
+| PUT | `/mes/wm/warehouse-location/update` | 淇敼搴撳尯 |
+| DELETE | `/mes/wm/warehouse-location/delete` | 鍒犻櫎搴撳尯 |
+| GET | `/mes/wm/warehouse-area/page` | 搴撲綅鍒嗛〉 |
+| GET | `/mes/wm/warehouse-area/simple-list` | 搴撲綅绮剧畝鍒楄〃 |
+| GET | `/mes/wm/warehouse-area/get` | 搴撲綅璇︽儏 |
+| POST | `/mes/wm/warehouse-area/create` | 鏂板搴撲綅 |
+| PUT | `/mes/wm/warehouse-area/update` | 淇敼搴撲綅 |
+| DELETE | `/mes/wm/warehouse-area/delete` | 鍒犻櫎搴撲綅 |
+
+## 淇濈暀瀛楁璇存槑
+
+浠ヤ笅鎺ュ彛鐨� `locationId`銆乣areaId`銆乣locationName`銆乣areaName` 瀛楁**淇濈暀浣嗕笉鍐嶄綔涓哄繀濉」**锛�
+
+| 娑夊強鎺ュ彛 | 瀛楁 | 瑙勫垯 |
+|----------|------|------|
+| 搴撳瓨鍒嗛〉/璇︽儏 | `warehouseId`銆乣locationId`銆乣areaId` | 鏌ヨ鏉′欢鍙笉浼狅紱杩斿洖鍊间负鍘嗗彶鏁版嵁鏃跺彲鑳介潪绌� |
+| 鍚勭被鍏ュ簱/鍑哄簱鏄庣粏淇濆瓨 | `warehouseId`銆乣locationId`銆乣areaId` | 浠� `warehouseId` 蹇呭~锛沗locationId`銆乣areaId` 鍙笉浼� |
+| 绉诲簱鍗曟槑缁嗕繚瀛� | `fromWarehouseId`銆乣fromLocationId`銆乣fromAreaId` | 浠� `fromWarehouseId` 蹇呭~ |
+| 绉诲簱鍗曞ご | `toWarehouseId`銆乣toLocationId`銆乣toAreaId` | 浠� `toWarehouseId` 蹇呭~ |
+| 宸ヤ綔绔欎繚瀛� | `warehouseId`銆乣locationId`銆乣areaId` | 浠� `warehouseId` 鍙備笌鏍¢獙锛涙湭浼犳椂鑷姩钀藉埌铏氭嫙绾胯竟浠� |
+| 搴撳瓨绉诲簱/搴撳瓨璋冩暣 | `toWarehouseId`銆乣toLocationId`銆乣toAreaId` | 浠� `toWarehouseId` 蹇呭~锛涚洰鏍囦粨搴撲笌褰撳墠浠撳簱鐩稿悓鏃剁姝㈢Щ搴� |
+
+## 涓氬姟瑙勫垯鍙樺寲
+
+| 鍦烘櫙 | 璋冩暣鍓� | 璋冩暣鍚� |
+|------|--------|--------|
+| 浠撳簱鍒犻櫎 | 浠撳簱涓嬪瓨鍦ㄥ簱鍖烘椂绂佹鍒犻櫎 | 涓嶅啀鏍¢獙搴撳尯锛屽瓨鍦ㄥ伐浣滅珯鎴栧簱瀛樻椂浠嶇姝㈠垹闄� |
+| 搴撳瓨鍐荤粨鏍¢獙 | 搴撳尯/搴撲綅涓嶅瓨鍦ㄦ椂鎶ラ敊 | `locationId`銆乣areaId` 涓虹┖鏃惰烦杩囧簱鍖�/搴撲綅鍐荤粨鏍¢獙 |
+| 搴撳瓨娣锋斁鏍¢獙 | 搴撲綅涓嶅瓨鍦ㄦ椂鎶ラ敊 | 鏈寚瀹氬簱浣嶆椂璺宠繃鐗╂枡/鎵规娣锋斁鏍¢獙 |
+| 搴撳瓨閫夋嫨鏍¢獙 | 鍓嶇浼犲叆鐨勫簱鍖�/搴撲綅蹇呴』涓庡簱瀛樿褰曞畬鍏ㄤ竴鑷� | 浠呭湪浼犲叆闈炵┖ `locationId`銆乣areaId` 鏃舵瘮瀵� |
+| 宸ヤ綔绔欎繚瀛� | 搴撳尯蹇呴』灞炰簬浠撳簱銆佸簱浣嶅繀椤诲睘浜庡簱鍖� | 浠呮牎楠屼粨搴撳瓨鍦紝搴撳尯/搴撲綅涓嶅啀鍙備笌 |
+| 绉嶅瓙璐ㄦ鍚堟牸鍏ュ簱 | 鍚堟牸搴撴湭閰嶇疆搴撳尯/搴撲綅鏃舵姤閿� | 搴撳尯/搴撲綅鍙栧悎鏍煎簱涓嬮涓潪鍐荤粨搴撳尯/搴撲綅锛屾湭閰嶇疆鏃舵寜浠撳簱鐩存帴鍏ュ簱 |
+| 搴撳瓨鍚堝苟锛堢Щ搴�/鍚堟牸鍏ュ簱锛� | 缁勫悎閿腑搴撳尯/搴撲綅閲囩敤绮剧‘鍖归厤 | `locationId`銆乣areaId` 涓虹┖鏃跺拷鐣ヨ缁村害锛屾寜鐗╂枡+浠撳簱+鎵规鍖归厤 |
+
+## 鏁版嵁甯﹀叆璇存槑
+
+1. 鍗曟嵁鏄庣粏閫夋嫨搴撳瓨璁板綍鍚庯紝椤甸潰鍙甫鍏� `itemId`銆乣batchId`銆乣batchCode`銆乣quantity`銆乣warehouseId`锛屼笉鍐嶅甫鍏� `itemName`/`batchCode` 涔嬪鐨勫簱鍖恒�佸簱浣嶅悕绉般��
+2. 绉诲簱銆佸簱瀛樿皟鏁寸殑鐩爣浣嶇疆鍙�夋嫨浠撳簱锛屾彁浜ゆ椂鍙紶鐩爣浠撳簱缂栧彿銆�
+3. 绉诲姩绔壂鐮佸嚭鍏ュ簱鎸夎拷婧爜瑙f瀽鐗╂枡涓庢壒娆★紝钀藉簱浣嶇疆榛樿涓虹敓浜ф殏瀛樹粨/鍚堟牸搴擄紝涓嶅啀瑕佹眰閫夋嫨搴撳尯銆佸簱浣嶃��
+
+## 娉ㄦ剰浜嬮」
+
+- 鍘嗗彶鏁版嵁涓� `location_id`銆乣area_id` 鍙兘浠嶄负闈炵┖鍊硷紝灞曠ず灞傚彲蹇界暐锛屼笉褰卞搷鏌ヨ涓庡嚭鍏ュ簱銆�
+- 鍓嶇璋冪敤鍑哄叆搴撱�佺Щ搴撱�佺洏鐐圭瓑淇濆瓨鎺ュ彛鏃讹紝璇蜂笉瑕佸啀浼犲簱鍖�/搴撲綅锛涜嫢浠嶄紶鍏ュ巻鍙� ID锛屽悗绔細鐓у父鏍¢獙鍏跺瓨鍦ㄦ�э紝ID 澶辨晥灏嗗鑷存姤閿欍��
+- 宸叉墽琛� `sql/mysql/mes_wm_remove_warehouse_location_area_menu.sql` 娓呯悊搴撳尯/搴撲綅鑿滃崟涓庢潈闄愬悗锛屽墠绔笉鑳藉啀閫氳繃鑿滃崟杩涘叆鏃ч〉闈€��
+- 搴撳瓨缁勫悎閿紙鐗╂枡+浠撳簱+搴撳尯+搴撲綅+鎵规+渚涘簲鍟嗭級涓簱鍖�/搴撲綅鍙樹负鍙�夛紱鍚屼竴浠撳簱鍚屾壒娆′笉鍚屽簱鍖虹殑鍘嗗彶搴撳瓨鍙兘鍦ㄧЩ搴撳悎骞舵椂琚悎骞跺埌涓�鏉¤褰曘��
diff --git "a/docs/\351\224\200\345\224\256\345\207\272\345\272\223\345\210\206\346\254\241\345\217\221\350\264\247\350\257\264\346\230\216.md" "b/docs/\351\224\200\345\224\256\345\207\272\345\272\223\345\210\206\346\254\241\345\217\221\350\264\247\350\257\264\346\230\216.md"
new file mode 100644
index 0000000..7b658f1
--- /dev/null
+++ "b/docs/\351\224\200\345\224\256\345\207\272\345\272\223\345\210\206\346\254\241\345\217\221\350\264\247\350\257\264\346\230\216.md"
@@ -0,0 +1,77 @@
+# 閿�鍞嚭搴撲紭鍖栦慨鏀硅鏄�
+
+## 1. 淇敼鑼冨洿鍜屽綋鍓嶇姸鎬�
+
+鏈淇敼瑕嗙洊閿�鍞嚭搴撳垎娆″彂璐с�丳C 鍜岀Щ鍔ㄧ鎷h揣銆佸簱瀛樿鐮佺姸鎬併�佸簱瀛樹簨鍔℃祦姘村強鎵规杩芥函銆備唬鐮佸凡缁忎慨鏀癸紝**鏈鏁村淇敼灏氭湭鎵ц缂栬瘧銆佽嚜鍔ㄥ寲娴嬭瘯鎴栭〉闈㈣仈璋�**锛涗互涓嬫弿杩版槸瀹炵幇鎰忓浘鍜屽緟楠岃瘉琛屼负锛屼笉浠h〃楠屾敹宸查�氳繃銆�
+
+鍘嗗彶鐗堟湰涓浘瀵归儴鍒嗗悗绔唬鐮佹墽琛岀紪璇戯紝浣嗕笉鑳戒綔涓烘湰娆″叏閮ㄤ慨鏀圭殑楠岃瘉缁撴灉銆傛祴璇曟垨閮ㄧ讲鍓嶏紝搴斿厛鏍稿褰撳墠宸ヤ綔鍖虹殑瀹為檯浠g爜鍜屾暟鎹簱缁撴瀯銆�
+
+## 2. 鍔熻兘淇敼
+
+### 2.1 閿�鍞嚭搴撲笌鍒嗘鍙戣揣
+
+- 涓�寮犻攢鍞嚭搴撳崟鍙垱寤哄娆″彂璐ц褰曘�傛瘡娆″厛鎷h揣銆佸~鍐欒繍鍗曪紝鍐嶆墽琛屾湰娆″嚭搴撱��
+- 鏈鑷冲皯閫夋嫨涓�鏉″緟鍙戞槑缁嗭紱鍚勮绱鎷h揣鏁伴噺涓嶅緱瓒呰繃璇ヨ璁″垝鏁伴噺銆傚厑璁稿彧鍙戦儴鍒嗙墿鏂欒銆�
+- 鏈鍑哄簱鍙鐞嗚鍙戣揣璁板綍鐨勬槑缁嗗苟鐢熸垚瀵瑰簲搴撳瓨娴佹按锛涘彂璐ч�氱煡鍗曟寜鏈瀹為檯鏄庣粏鏁伴噺绱鍥炲啓銆�
+- 鍏ㄩ儴璁″垝鏁伴噺鍑哄簱鍚庡崟鎹畬鎴愶紱鏈叏閮ㄥ彂瀹屾椂锛屽崟鎹繑鍥炲緟鎷h揣锛屽彲缁х画涓嬩竴娆″彂璐с�傚凡閮ㄥ垎鍙戣揣鐨勫崟鎹湪椤甸潰涓婃樉绀虹浉搴旀彁绀恒��
+- 寰呰繍鍗曟垨寰呭嚭搴撴椂鍙互鍙栨秷鏈鍙戣揣锛岄噴鏀惧崰鐢紝鏄庣粏淇濈暀骞惰繑鍥炲緟鎷h揣鐘舵�併�傚凡鏈夊彂璐т絾涓嶅啀缁х画鍙戣揣鏃讹紝鍙厛绉婚櫎鏈疆鏈彂鏄庣粏锛屽~鍐欏師鍥犲叧闂墿浣欐暟閲忋��
+- 宸插垎閰嶅彂璐ц褰曠殑鏄庣粏涓嶈兘鐩存帴淇敼鎴栧垹闄わ紱宸插嚭搴撳悗鐨勭籂姝e簲璧伴��璐х瓑涓氬姟娴佺▼銆�
+
+### 2.2 鎵爜鍙婃墜宸ユ嫞璐�
+
+- 鏀寔鎵弿鎴栬緭鍏ユ壒娆$爜銆佹墭鐩樼爜銆佽鐮侊紝璇嗗埆鍚庢寜瀹為檯琚嬬爜閫夋嫨銆備緥濡傗��1 鎵� + 4 鎵樼洏 + 8 琚嬧�濆彲浠ュ垎娆¤瘑鍒悗鍔犲叆鍚屼竴娆℃嫞璐ф竻鍗曘��
+- 琚嬬爜鎸夊疄闄呴�変腑缁撴灉鐢熸垚鏄庣粏锛涢噸澶嶃�佸凡鍑哄簱銆佹湭璐ㄦ鍚堟牸銆佸喕缁撴垨涓嶅湪鏈夋晥鍚堟牸搴撳瓨鐨勮鐮佸簲琚嫤鎴垨鏍囨槑涓嶅彲閫夊師鍥犮��
+- PC 绔墜宸ユ嫞璐у彲鍏堥�夋嫨搴撳瓨锛屽啀鍔犺浇骞堕�夋嫨璇ュ簱瀛樼殑琚嬬爜锛涚Щ鍔ㄧ鍙粠鍑哄簱鍗曡閫夋嫨搴撳瓨琚嬬爜锛屼篃鏀寔鎵嬪姩杈撳叆鐮佸�笺��
+- 鏈夊湪搴撹鐮佹槑缁嗙殑搴撳瓨涓嶈兘鐩存帴鍒涘缓鏃犺鐮佺殑鏁伴噺鎷h揣鏄庣粏锛涙棤鍦ㄥ簱琚嬬爜鏄庣粏鐨勫巻鍙插簱瀛樹繚鐣欐寜鏁伴噺鎷h揣鍏ュ彛锛屼絾鏃犳硶閫愯杩芥函銆�
+- 鏄庣粏涓殑鎵爜绫诲瀷鍙婃潵婧愮爜鏄剧ず涓轰腑鏂囷紝渚嬪鈥滄壂鐮佺被鍨� 鎵规鐮侊紱鏉ユ簮鎵规鐮� 鈥︹�濓紱鈥滆鐮佷笌鎵爜鏉ユ簮鈥濆垪鏀寔榧犳爣鎮仠鏌ョ湅銆�
+
+### 2.3 搴撳瓨銆佹祦姘翠笌杩芥函
+
+- 搴撳瓨鍒楄〃榛樿鎺掗櫎闆跺簱瀛橈紱PC 鍜岀Щ鍔ㄧ鍙�夋嫨鍖呭惈闆跺簱瀛樿褰曞苟鏌ョ湅浠嶅叧鑱旇搴撳瓨璁板綍鐨勮鐮佸巻鍙层��
+- 琚嬬爜鏄庣粏鏄剧ず鍦ㄥ簱銆佸凡鎷i�夈�佸凡鍗犵敤銆佸凡鍑哄簱鎴栧凡鎶ュ簾绛夌姸鎬侊紱鍙湁鍏宠仈娴佹按鍙垽鏂负閿�鍞嚭搴撴椂鎵嶆樉绀衡�滈攢鍞凡鍑哄簱鈥濄��
+- 搴撳瓨浜嬪姟娴佹按澧炲姞鎵樼洏鐮併�佽鐮佸強鍙戣揣璁板綍鍏宠仈銆傚巻鍙叉祦姘存病鏈夊叧鑱旀暟鎹椂鏄剧ず鏈褰曪紝涓嶆帹娴嬪叿浣撹鐮併��
+- 鎵规杩芥函涓殑閿�鍞簨浠舵寜瀹為檯閿�鍞嚭搴撴祦姘磋仛鍚堬紱鍙睍寮�鏌ヨ鐩稿簲鍑哄簱鍗曘�佹壒娆″強鍙戣揣璁板綍鐨勬祦姘淬��
+
+## 3. 鏁版嵁搴撳強閮ㄧ讲
+
+1. 澶囦唤鐩爣鏁版嵁搴擄紝纭宸叉湁搴撳瓨琚嬬爜銆侀攢鍞嚭搴撹拷婧瓑鍩虹琛ㄥ拰瀛楁宸叉寜鍘熺増鏈儴缃层��
+2. 鏍稿鐩爣搴撳悗锛屾墽琛屼竴娆� `sql/mysql/mes_wm_product_sales_shipment.sql`锛氭柊澧� `mes_wm_product_sales_shipment` 琛紝鍦ㄩ攢鍞嚭搴撳崟澧炲姞 `close_reason`锛屽湪鍑哄簱鏄庣粏鍙婂簱瀛樹簨鍔℃祦姘村鍔� `shipment_id` 鍜岀储寮曘��
+3. 璇� SQL **涓嶅彲閲嶅鎵ц**锛涘厛妫�鏌ョ洰鏍囧簱鏄惁宸茬粡鍖呭惈琛ㄥ拰瀛楁锛岄伩鍏嶉噸澶嶆墽琛屻�備笉瑕佹妸瀹冧笌鍏朵粬鏈‘璁ょ敤閫旂殑 SQL 涓�骞舵墽琛屻��
+4. 鍗忚皟鍙戝竷鍚庣鍙� PC銆佺Щ鍔ㄧ鍓嶇锛岀‘淇濅唬鐮佸拰鏁版嵁搴撶粨鏋勭増鏈竴鑷达紱鍦ㄦ祴璇曠幆澧冨畬鎴愪笅鍒楅獙璇佸悗鍐嶅畨鎺掓寮忕幆澧冨彂甯冦��
+
+### 鍘嗗彶鏁版嵁鍏煎
+
+- 鍘嗗彶宸插畬鎴愬崟鎹殑鏄庣粏鍙婃祦姘翠笉浼氳嚜鍔ㄧ敓鎴愬彂璐ц褰曪紱鍘嗗彶娴佹按浠嶄互鍘熸湁鏁版嵁涓哄噯銆�
+- 鍗囩骇鏃跺凡澶勪簬寰呭~鍐欒繍鍗曟垨寰呮墽琛屽嚭搴撶殑鏃у崟鎹紝缁х画鎿嶄綔鏃朵細涓哄凡鏈夋槑缁嗗缓绔嬪彂璐ц褰曪紝闇�閲嶇偣楠岃瘉搴撳瓨鍗犵敤鍜岄�氱煡鍗曞洖鍐欍��
+- 鏃犳硶浠庝粎鏈夋暟閲忕殑鍘嗗彶鏄庣粏鍙潬杩樺師瀹為檯琚嬬爜锛屼笉鑷姩琛ラ�犺鐮併��
+- 褰撳墠琚嬬爜鏄庣粏璁板綍鐨勬槸琚嬬爜褰撳墠鍏宠仈鐨勫簱瀛樿褰曞強鐘舵�侊紝涓嶅簲灏嗗叾褰撲綔鎵�鏈夊巻鍙茬Щ搴撲綅缃殑瀹屾暣蹇収锛涘巻鍙叉祦杞互浜嬪姟娴佹按涓哄噯銆�
+
+## 4. 涓昏鎺ュ彛鍜屾潈闄�
+
+| 鎺ュ彛 | 鐢ㄩ�� | 鏉冮檺 |
+| --- | --- | --- |
+| `GET /mes/wm/product-sales/shipments` | 鏌ョ湅鍙戣揣璁板綍 | `mes:wm-product-sales:query` |
+| `GET /mes/wm/product-sales/scan-preview` | 璇嗗埆鎵规銆佹墭鐩樻垨琚嬬爜锛岃繑鍥炶鐮佸彲閫夌姸鎬� | `mes:wm-product-sales:stock` |
+| `POST /mes/wm/product-sales/scan` | 灏嗛�変腑鐨勮鐮佸姞鍏ユ嫞璐э紱鎵嬪伐閫夎鍙寚瀹氳鍜屽簱瀛� | `mes:wm-product-sales:stock` |
+| `PUT /mes/wm/product-sales/stock` | 瀹屾垚鏈鎷h揣骞跺崰鐢ㄥ簱瀛� | `mes:wm-product-sales:stock` |
+| `PUT /mes/wm/product-sales/shipping` | 濉啓鏈杩愬崟 | `mes:wm-product-sales:shipping` |
+| `PUT /mes/wm/product-sales/finish` | 鎵ц鏈鍑哄簱 | `mes:wm-product-sales:finish` |
+| `PUT /mes/wm/product-sales/cancel-shipment` | 鍙栨秷灏氭湭鍑哄簱鐨勬湰娆″彂璐у苟閲婃斁鍗犵敤 | `mes:wm-product-sales:cancel` |
+| `PUT /mes/wm/product-sales/close-remaining` | 濉啓鍘熷洜骞跺叧闂墿浣欐暟閲� | `mes:wm-product-sales:cancel` |
+| `GET /mes/wm/material-stock/picking-list` | 鏍规嵁鍑哄簱鍗曡鏌ヨ鍚堟牸搴撳瓨 | 鍚屾椂闇�瑕侀攢鍞嫞璐у拰搴撳瓨鏌ヨ鏉冮檺 |
+| `POST /mes/wm/product-sales-detail/create-mobile-manual` | 绉诲姩绔寜鏁伴噺鎷i�夋棤琚嬬爜鍘嗗彶搴撳瓨 | `mes:wm-product-sales:stock` |
+| `GET /mes/wm/material-stock/bag-details` | 鏌ヨ搴撳瓨琚嬬爜锛沗includeHistory=true` 鍖呭惈鍘嗗彶鐘舵�� | `mes:wm-material-stock:query` |
+| `GET /mes/wm/transaction/page` | 鏌ヨ搴撳瓨娴佹按锛涙敮鎸佺簿纭崟鍙枫�佹壒娆″拰鍙戣揣璁板綍绛涢�� | `mes:wm-transaction:query` |
+
+## 5. 鏁翠綋娴嬭瘯娓呭崟
+
+涓嬪垪椤圭洰鍧囦负**寰呴獙璇�**锛�
+
+1. **鍒嗘鍙戣揣**锛氬悓涓�寮犲崟鎹垎涓ゆ鍙戣揣锛涢�愭鏍稿搴撳瓨銆佸彂璐ц褰曘�佽繍鍗曘�佸悇琛屽凡鍑哄簱鍙婂墿浣欓噺銆侀�氱煡鍗曠疮璁¢噺鍜岀姸鎬併�傝鐩栦粎鍙戦儴鍒嗙墿鏂欒銆�
+2. **娣峰悎鎵爜**锛氭寜鎵规銆佹墭鐩樸�佸崟琚嬫贩鍚堥�夋嫨锛涙牳瀵瑰疄闄呰鐮併�佹潵婧愮被鍨嬩笌鏉ユ簮鐮併�傝鐩栭噸澶嶆壂鎻忋�佷氦鍙夎寖鍥淬�佽法鍗曞苟鍙戙�佸喕缁撱�佹湭璐ㄦ鍚堟牸鍜岃秴鍑哄墿浣欐暟閲忋��
+3. **鎵嬪伐鎷h揣**锛歅C 鍜岀Щ鍔ㄧ鍒嗗埆閫夋嫨瀹為檯琚嬬爜锛涘鏃犺鐮佸巻鍙插簱瀛橀獙璇佹暟閲忔嫞璐у強鏃犺鐮佹彁绀猴紱楠岃瘉宸叉湁琚嬬爜搴撳瓨涓嶈兘缁曡繃閫愯閫夋嫨銆�
+4. **鍙栨秷涓庡叧闂�**锛氬彇娑堝緟鍑哄簱鍙戣揣鍚庢牳瀵瑰崰鐢ㄩ噴鏀惧強鏄庣粏璋冩暣锛涘凡鏈夊嚭搴撳悗鍏抽棴鍓╀綑閲忥紝鏍稿鍏抽棴鍘熷洜鍙婇�氱煡鍗曚笉浼氳鏍囧叏閮ㄥ嚭搴撱��
+5. **杩芥函鍜屽巻鍙�**锛氭牳瀵归浂搴撳瓨琚嬬爜鍘嗗彶銆佸簱瀛樻祦姘寸殑鎵规锛忔墭鐩橈紡琚嬬爜銆佹壒娆℃椂闂寸嚎鐨勬瘡娆″嚭搴撱�傝鐩栧巻鍙插凡瀹屾垚鍗曟嵁鍜屽崌绾у墠寰呰繍鍗曪紡寰呭嚭搴撳崟鎹��
+6. **寮傚父涓庢潈闄�**锛氳鐩栬姹傝秴鏃跺悗鐨勭Щ鍔ㄧ缁撴灉鏍稿疄銆侀噸澶嶆彁浜ゃ�佷笉鍚岀敤鎴峰苟鍙戞嫞閫夈�佸簱瀛樹笉瓒充互鍙婄己灏戠浉鍏宠彍鍗曟潈闄愮殑鎯呭喌銆�
+
+鍏抽敭鏍稿鍏崇郴锛氬悓涓�鍙戣揣璁板綍鍐咃紝鏈瀹為檯鏄庣粏鏁伴噺銆佸簱瀛樻墸鍑忔暟閲忋�侀攢鍞嚭搴撴祦姘存暟閲忓簲涓�鑷达紱閫氱煡鍗曠疮璁″嚭搴撻噺搴旂瓑浜庡悇娆″疄闄呭洖鍐欓噺锛屼笉鑳借秴杩囪鍒掗噺銆備笉鍚岀墿鏂欐垨涓嶅悓鍗曚綅搴斿垎鍒牳瀵广��
diff --git a/scripts/deploy-seed-quality-bpm.ps1 b/scripts/deploy-seed-quality-bpm.ps1
new file mode 100644
index 0000000..776b424
--- /dev/null
+++ b/scripts/deploy-seed-quality-bpm.ps1
@@ -0,0 +1,60 @@
+锘縫aram(
+ [Parameter(Mandatory = $true)][string]$ApiBaseUrl,
+ [Parameter(Mandatory = $true)][string]$AccessToken,
+ [long]$AdminUserId = 1,
+ # 娴佺▼鍒嗙被缂栫爜锛岄渶涓� BPM銆屾祦绋嬪垎绫汇�嶄腑鐨� code 涓�鑷达紱涓虹┖鍒欐ā鍨嬩笉浼氭樉绀哄湪娴佺▼妯″瀷椤�
+ [string]$CategoryCode = 'mes_qc_approve'
+)
+
+$ErrorActionPreference = 'Stop'
+$base = $ApiBaseUrl.TrimEnd('/')
+$headers = @{ Authorization = "Bearer $AccessToken" }
+$resourceRoot = Join-Path $PSScriptRoot '../yudao-module-mes/src/main/resources/bpm'
+# 涓枃鍛藉悕缁熶竴浠� BPMN 鏂囦欢璇诲彇锛岄伩鍏� Windows PowerShell 5.1 鎸� ANSI 瑙f瀽鑴氭湰瀵艰嚧涔辩爜
+$models = @(
+ 'mes_seed_quality_line_approve',
+ 'mes_seed_quality_company_approve',
+ 'mes_seed_return_approve'
+)
+
+function Invoke-BpmApi([string]$Method, [string]$Path, $Body) {
+ $request = @{ Method = $Method; Uri = "$base$Path"; Headers = $headers }
+ if ($null -ne $Body) {
+ $json = ConvertTo-Json -InputObject $Body -Depth 12 -Compress
+ # Windows PowerShell 5.1 榛樿鎸� ISO-8859-1 缂栫爜璇锋眰浣擄紝蹇呴』鏄惧紡杞� UTF-8 瀛楄妭
+ $request.ContentType = 'application/json; charset=utf-8'
+ $request.Body = [System.Text.Encoding]::UTF8.GetBytes($json)
+ }
+ $result = Invoke-RestMethod @request
+ if ($result.code -ne 0) { throw "BPM API $Path failed: $($result.msg)" }
+ return $result.data
+}
+
+$existing = @(Invoke-BpmApi 'GET' '/bpm/model/list' $null)
+foreach ($key in $models) {
+ $path = Join-Path $resourceRoot "$key.bpmn20.xml"
+ $xml = Get-Content -LiteralPath $path -Raw -Encoding UTF8
+ if (-not $xml.Contains('flowable:candidateParam="1"')) {
+ throw "BPM model $key has no admin candidate placeholder"
+ }
+ $xml = $xml -replace 'flowable:candidateParam="1"', "flowable:candidateParam=`"$AdminUserId`""
+ [xml]$doc = $xml
+ $processName = [string]$doc.definitions.process.name
+ $model = $existing | Where-Object { $_.key -eq $key } | Select-Object -First 1
+ $body = @{
+ key = $key; name = $processName; category = $CategoryCode; type = 10; formType = 20
+ formCustomCreatePath = '/mes/qc/seed-quality-record'
+ formCustomViewPath = '/mes/qc/seed-quality-record'
+ visible = $false; startUserIds = @(); managerUserIds = @($AdminUserId)
+ autoApprovalType = 0; bpmnXml = $xml
+ }
+ if ($null -eq $model) {
+ $id = Invoke-BpmApi 'POST' '/bpm/model/create' $body
+ } else {
+ $id = $model.id
+ $body.id = $id
+ [void](Invoke-BpmApi 'PUT' '/bpm/model/update' $body)
+ }
+ [void](Invoke-BpmApi 'POST' "/bpm/model/deploy?id=$([uri]::EscapeDataString([string]$id))" $null)
+ Write-Output "Deployed $key ($id)"
+}
diff --git a/seed-range-redesign.png b/seed-range-redesign.png
new file mode 100644
index 0000000..79fffb7
--- /dev/null
+++ b/seed-range-redesign.png
Binary files differ
diff --git a/sql/mysql/crm_customer_dealer_fields_20261106.sql b/sql/mysql/crm_customer_dealer_fields_20261106.sql
new file mode 100644
index 0000000..52eb2ba
--- /dev/null
+++ b/sql/mysql/crm_customer_dealer_fields_20261106.sql
@@ -0,0 +1,53 @@
+-- =============================================
+-- CRM 瀹㈡埛鏂板缁忛攢鍟嗗妗堢浉鍏冲瓧娈�
+-- 鐩爣搴擄細mom-thzy
+-- 璇存槑锛歁ySQL 鐨� ALTER TABLE ADD COLUMN 涓嶆敮鎸� IF NOT EXISTS锛�
+-- 鍏堟煡 information_schema 鍐嶆墽琛岋紝淇濊瘉鑴氭湰鍙噸澶嶆墽琛屻��
+-- =============================================
+
+SET @col_exists = (
+ SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE()
+ AND table_name = 'crm_customer'
+ AND column_name = 'social_credit_code'
+);
+
+SET @ddl = IF(@col_exists = 0,
+ 'ALTER TABLE `crm_customer`
+ ADD COLUMN `social_credit_code` VARCHAR(64) NULL COMMENT ''绀句細淇$敤浠g爜'' AFTER `name`,
+ ADD COLUMN `id_card_no` VARCHAR(32) NULL COMMENT ''韬唤璇佸彿'' AFTER `social_credit_code`,
+ ADD COLUMN `customer_name` VARCHAR(64) NULL COMMENT ''瀹㈡埛濮撳悕'' AFTER `id_card_no`,
+ ADD COLUMN `filing_serial_no` VARCHAR(64) NULL COMMENT ''澶囨娴佹按鍙�'' AFTER `customer_name`,
+ ADD COLUMN `bank_account_name` VARCHAR(128) NULL COMMENT ''閾惰璐︽埛鍚嶇О'' AFTER `filing_serial_no`,
+ ADD COLUMN `region` VARCHAR(64) NULL COMMENT ''鎵�灞炲尯鍩�'' AFTER `bank_account_name`,
+ ADD COLUMN `parent_dealer_id` BIGINT NULL COMMENT ''鎵�灞炰笂绾х粡閿�鍟嗙紪鍙�'' AFTER `region`',
+ 'SELECT 1');
+
+PREPARE stmt FROM @ddl;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+-- 绱㈠紩鍚屾牱鐢� information_schema 鍒ゆ柇锛圡ySQL 8.4 鐨� ADD INDEX IF NOT EXISTS 涓嶅彲鐢級
+SET @idx_exists = (
+ SELECT COUNT(*) FROM information_schema.statistics
+ WHERE table_schema = DATABASE() AND table_name = 'crm_customer'
+ AND index_name = 'idx_crm_customer_parent_dealer_id'
+);
+SET @ddl = IF(@idx_exists = 0,
+ 'ALTER TABLE `crm_customer` ADD INDEX `idx_crm_customer_parent_dealer_id` (`parent_dealer_id`)',
+ 'SELECT 1');
+PREPARE stmt FROM @ddl;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SET @idx_exists = (
+ SELECT COUNT(*) FROM information_schema.statistics
+ WHERE table_schema = DATABASE() AND table_name = 'crm_customer'
+ AND index_name = 'idx_crm_customer_social_credit_code'
+);
+SET @ddl = IF(@idx_exists = 0,
+ 'ALTER TABLE `crm_customer` ADD INDEX `idx_crm_customer_social_credit_code` (`social_credit_code`)',
+ 'SELECT 1');
+PREPARE stmt FROM @ddl;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
diff --git a/sql/mysql/mes_qc_approver_menu_retire_20261106.sql b/sql/mysql/mes_qc_approver_menu_retire_20261106.sql
new file mode 100644
index 0000000..6e76567
--- /dev/null
+++ b/sql/mysql/mes_qc_approver_menu_retire_20261106.sql
@@ -0,0 +1,11 @@
+-- BPM 璐ㄦ娴佺▼鍚敤鍚庢墽琛屻�備粎闅愯棌鏃у鏍镐汉閰嶇疆鑿滃崟鍜屾寜閽紝淇濈暀閰嶇疆璁板綍浠ヤ緵鍘嗗彶杩芥函銆�
+-- 鎵ц鍓嶇‘璁や笁涓� BPM 娴佺▼瀹氫箟宸插彂甯冿紝骞跺凡澶勭悊鏃х殑鍦ㄩ�斾汉宸ュ鎵硅褰曘��
+UPDATE system_menu child
+JOIN system_menu parent ON child.parent_id = parent.id
+SET child.status = 1, child.visible = b'0', child.update_time = NOW()
+WHERE parent.parent_id = 5500 AND parent.path = 'approver-config'
+ AND parent.deleted = b'0' AND child.deleted = b'0';
+
+UPDATE system_menu
+SET status = 1, visible = b'0', update_time = NOW()
+WHERE parent_id = 5500 AND path = 'approver-config' AND deleted = b'0';
diff --git a/sql/mysql/mes_qc_seed_indicator_range_product_20261105.sql b/sql/mysql/mes_qc_seed_indicator_range_product_20261105.sql
new file mode 100644
index 0000000..2ea2418
--- /dev/null
+++ b/sql/mysql/mes_qc_seed_indicator_range_product_20261105.sql
@@ -0,0 +1,104 @@
+-- 璐ㄦ椤瑰悎鏍艰寖鍥撮厤缃細鐢卞叏灞�鍥哄畾鍥涢」鏀逛负鎸変骇鍝佺淮鎶�
+-- 1. 涓婚敭鐢� indicator_code 鏀逛负鑷 id
+-- 2. 鏂板浜у搧缁戝畾銆佸悕绉般�佸崟浣嶃�佹帓搴忋�佺姸鎬佸瓧娈�
+-- 3. 鍘嗗彶鍥涢」鑷姩杩佺Щ涓洪�氱敤榛樿椤癸紙item_id 涓虹┖锛夛紝浜у搧鏈厤缃椂鍥為��浣跨敤
+-- 4. 璐ㄦ鎸囨爣璁板綍琛ュ厖鍚嶇О涓庡崟浣嶅揩鐓�
+
+-- ===== 1. 涓婚敭鏀逛负鑷 id =====
+SET @has_id = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_qc_seed_indicator_range' AND column_name = 'id');
+SET @sql = IF(@has_id = 0,
+ 'ALTER TABLE mes_qc_seed_indicator_range DROP PRIMARY KEY, ADD COLUMN id BIGINT NOT NULL AUTO_INCREMENT FIRST, ADD PRIMARY KEY (id)',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- ===== 2. 鏂板閰嶇疆瀛楁锛圡ySQL 涓嶆敮鎸� ADD COLUMN IF NOT EXISTS锛岄�愬垪鍒ゆ柇锛�=====
+SET @has_item_id = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_qc_seed_indicator_range' AND column_name = 'item_id');
+SET @sql = IF(@has_item_id = 0,
+ 'ALTER TABLE mes_qc_seed_indicator_range ADD COLUMN item_id BIGINT NULL COMMENT ''缁戝畾浜у搧缂栧彿锛坢dm_item锛宨temType=2锛夛紝涓虹┖琛ㄧず閫氱敤榛樿椤�'' AFTER id',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @has_name = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_qc_seed_indicator_range' AND column_name = 'indicator_name');
+SET @sql = IF(@has_name = 0,
+ 'ALTER TABLE mes_qc_seed_indicator_range ADD COLUMN indicator_name VARCHAR(64) NULL COMMENT ''璐ㄦ椤瑰悕绉�'' AFTER indicator_code',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @has_unit = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_qc_seed_indicator_range' AND column_name = 'unit');
+SET @sql = IF(@has_unit = 0,
+ 'ALTER TABLE mes_qc_seed_indicator_range ADD COLUMN unit VARCHAR(16) NULL COMMENT ''璁¢噺鍗曚綅'' AFTER indicator_name',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @has_sort = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_qc_seed_indicator_range' AND column_name = 'sort');
+SET @sql = IF(@has_sort = 0,
+ 'ALTER TABLE mes_qc_seed_indicator_range ADD COLUMN sort INT NOT NULL DEFAULT 0 COMMENT ''鎺掑簭'' AFTER max_value',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @has_status = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_qc_seed_indicator_range' AND column_name = 'status');
+SET @sql = IF(@has_status = 0,
+ 'ALTER TABLE mes_qc_seed_indicator_range ADD COLUMN status TINYINT NOT NULL DEFAULT 0 COMMENT ''鐘舵�侊細0鍚敤 1鍋滅敤'' AFTER sort',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- ===== 3. 鍘嗗彶鏁版嵁鍥炲~ =====
+UPDATE mes_qc_seed_indicator_range
+SET indicator_name = CASE indicator_code
+ WHEN 'purity' THEN '绾害'
+ WHEN 'cleanliness' THEN '鍑�搴�'
+ WHEN 'germination_rate' THEN '鍙戣娊鐜�'
+ WHEN 'moisture' THEN '姘村垎'
+ ELSE indicator_code END
+WHERE indicator_name IS NULL OR indicator_name = '';
+
+UPDATE mes_qc_seed_indicator_range SET unit = '%' WHERE unit IS NULL OR unit = '';
+
+UPDATE mes_qc_seed_indicator_range
+SET sort = CASE indicator_code
+ WHEN 'purity' THEN 10
+ WHEN 'cleanliness' THEN 20
+ WHEN 'germination_rate' THEN 30
+ WHEN 'moisture' THEN 40
+ ELSE 999 END
+WHERE sort IS NULL OR sort = 0;
+
+-- ===== 4. 浜у搧 + 缂栫爜绱㈠紩 =====
+SET @has_index = (SELECT COUNT(*) FROM information_schema.statistics
+ WHERE table_schema = DATABASE() AND table_name = 'mes_qc_seed_indicator_range' AND index_name = 'idx_item_code');
+SET @sql = IF(@has_index = 0,
+ 'ALTER TABLE mes_qc_seed_indicator_range ADD INDEX idx_item_code (item_id, indicator_code)',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- ===== 5. 璐ㄦ鎸囨爣璁板綍琛ュ厖鍚嶇О涓庡崟浣嶅揩鐓� =====
+SET @has_ind_name = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_qc_seed_quality_indicator' AND column_name = 'indicator_name');
+SET @sql = IF(@has_ind_name = 0,
+ 'ALTER TABLE mes_qc_seed_quality_indicator ADD COLUMN indicator_name VARCHAR(64) NULL COMMENT ''鎸囨爣鍚嶇О蹇収'' AFTER indicator_code',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @has_ind_unit = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_qc_seed_quality_indicator' AND column_name = 'unit');
+SET @sql = IF(@has_ind_unit = 0,
+ 'ALTER TABLE mes_qc_seed_quality_indicator ADD COLUMN unit VARCHAR(16) NULL COMMENT ''鎸囨爣鍗曚綅蹇収'' AFTER indicator_name',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+UPDATE mes_qc_seed_quality_indicator
+SET indicator_name = CASE indicator_code
+ WHEN 'purity' THEN '绾害'
+ WHEN 'cleanliness' THEN '鍑�搴�'
+ WHEN 'germination_rate' THEN '鍙戣娊鐜�'
+ WHEN 'moisture' THEN '姘村垎'
+ ELSE indicator_code END
+WHERE indicator_name IS NULL OR indicator_name = '';
+
+UPDATE mes_qc_seed_quality_indicator SET unit = '%' WHERE unit IS NULL OR unit = '';
diff --git a/sql/mysql/mes_seed_quality_dual_line_20261105.sql b/sql/mysql/mes_seed_quality_dual_line_20261105.sql
new file mode 100644
index 0000000..8111ebc
--- /dev/null
+++ b/sql/mysql/mes_seed_quality_dual_line_20261105.sql
@@ -0,0 +1,142 @@
+-- =====================================================================
+-- 绉嶅瓙璐ㄦ銆屽姞宸ラ儴 / 閿�鍞儴銆嶅弻绾挎楠� + BPM 瀹℃壒 + 缁忛攢鍟嗛��璐у妫�
+--
+-- 鍙樻洿鍐呭锛�
+-- 1. 涓�鏉¤鐮佺殑鍒濇鍚屾椂鐢熸垚鍔犲伐閮ㄣ�侀攢鍞儴涓ゆ潯璐ㄦ璁板綍锛坬c_line锛�
+-- 2. 涓ゆ潯绾垮悇鑷蛋閮ㄩ棬棰嗗瀹℃壒锛屼簰涓嶅奖鍝�
+-- 3. 涓ゆ潯绾块兘杩涘叆澶嶆瀹℃牳鍚庯紝绯荤粺鑷姩鍙戣捣鍏徃璐ㄦ瀹℃壒
+-- 4. 缁忛攢鍟嗛��璐у妫�澶嶇敤鍚屼竴寮犺〃锛坆iz_type=2锛夛紝鍗曠嫭璧伴攢鍞儴绾�
+--
+-- 鏈剼鏈叏閮� DDL 甯﹀瓨鍦ㄦ�у垽鏂紝鍙鍚屼竴鐜閲嶅鎵ц銆�
+-- 涓嶄娇鐢ㄥ绉熸埛锛屾棤 tenant_id 瀛楁銆�
+-- 鎵ц鍓嶈鍏� use <鐩爣搴�>銆�
+-- =====================================================================
+
+SET @db = DATABASE();
+
+-- ---------------------------------------------------------------------
+-- 1. 璐ㄦ绾匡細1 鍔犲伐閮� 2 閿�鍞儴 0 鏈尯鍒嗭紙鍘嗗彶鏁版嵁锛�
+-- ---------------------------------------------------------------------
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = @db AND table_name = 'mes_qc_seed_quality' AND column_name = 'qc_line');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_qc_seed_quality` ADD COLUMN `qc_line` TINYINT NOT NULL DEFAULT 0 COMMENT ''璐ㄦ绾匡細1鍔犲伐閮� 2閿�鍞儴 0鏈尯鍒嗭紙鍘嗗彶鏁版嵁锛�'' AFTER `code`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- ---------------------------------------------------------------------
+-- 2. 涓氬姟绫诲瀷锛�1 鐢熶骇鍏ュ簱璐ㄦ 2 缁忛攢鍟嗛��璐ц川妫�
+-- ---------------------------------------------------------------------
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = @db AND table_name = 'mes_qc_seed_quality' AND column_name = 'biz_type');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_qc_seed_quality` ADD COLUMN `biz_type` TINYINT NOT NULL DEFAULT 1 COMMENT ''涓氬姟绫诲瀷锛�1鐢熶骇鍏ュ簱璐ㄦ 2缁忛攢鍟嗛��璐ц川妫�'' AFTER `qc_line`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- ---------------------------------------------------------------------
+-- 3. BPM 娴佺▼瀹炰緥涓庢椂闂磋妭鐐�
+-- ---------------------------------------------------------------------
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = @db AND table_name = 'mes_qc_seed_quality' AND column_name = 'process_instance_id');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_qc_seed_quality` ADD COLUMN `process_instance_id` VARCHAR(64) DEFAULT NULL COMMENT ''鏈嚎閮ㄩ棬瀹℃壒娴佺▼瀹炰緥缂栧彿'' AFTER `workflow_status`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = @db AND table_name = 'mes_qc_seed_quality' AND column_name = 'company_process_instance_id');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_qc_seed_quality` ADD COLUMN `company_process_instance_id` VARCHAR(64) DEFAULT NULL COMMENT ''鍏徃璐ㄦ瀹℃壒娴佺▼瀹炰緥缂栧彿'' AFTER `process_instance_id`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = @db AND table_name = 'mes_qc_seed_quality' AND column_name = 'line_finished_at');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_qc_seed_quality` ADD COLUMN `line_finished_at` DATETIME DEFAULT NULL COMMENT ''鏈嚎閮ㄩ棬瀹℃壒瀹屾垚鏃堕棿'' AFTER `process_approved_at`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = @db AND table_name = 'mes_qc_seed_quality' AND column_name = 'company_submitted_at');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_qc_seed_quality` ADD COLUMN `company_submitted_at` DATETIME DEFAULT NULL COMMENT ''鍏徃璐ㄦ瀹℃壒鍙戣捣鏃堕棿'' AFTER `line_finished_at`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- ---------------------------------------------------------------------
+-- 4. 缁忛攢鍟嗛��璐у叧鑱�
+-- ---------------------------------------------------------------------
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = @db AND table_name = 'mes_qc_seed_quality' AND column_name = 'return_sales_id');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_qc_seed_quality` ADD COLUMN `return_sales_id` BIGINT DEFAULT NULL COMMENT ''缁忛攢鍟嗛��璐у崟缂栧彿'' AFTER `qualified_warehouse_id`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = @db AND table_name = 'mes_qc_seed_quality' AND column_name = 'return_sales_code');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_qc_seed_quality` ADD COLUMN `return_sales_code` VARCHAR(64) DEFAULT NULL COMMENT ''缁忛攢鍟嗛��璐у崟鍙�'' AFTER `return_sales_id`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- ---------------------------------------------------------------------
+-- 5. 鍞竴閿敱 (code) 璋冩暣涓� (code, qc_line)锛屽悓琚嬬爜鍏佽涓ゆ潯璐ㄦ绾胯褰�
+-- 鍏堝垹闄ゆ棫鍞竴閿紝鍐嶅垱寤烘柊鍞竴閿紝鍧囧甫瀛樺湪鎬у垽鏂�
+-- ---------------------------------------------------------------------
+SET @exists = (SELECT COUNT(*) FROM information_schema.statistics
+ WHERE table_schema = @db AND table_name = 'mes_qc_seed_quality' AND index_name = 'uk_code');
+SET @sql = IF(@exists > 0,
+ 'ALTER TABLE `mes_qc_seed_quality` DROP INDEX `uk_code`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.statistics
+ WHERE table_schema = @db AND table_name = 'mes_qc_seed_quality' AND index_name = 'uk_code_line');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_qc_seed_quality` ADD UNIQUE KEY `uk_code_line` (`code`, `qc_line`)',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- ---------------------------------------------------------------------
+-- 6. 杈呭姪绱㈠紩锛氭祦绋嬪疄渚嬪洖鏌ャ�佷笟鍔$被鍨嬬瓫閫�
+-- ---------------------------------------------------------------------
+SET @exists = (SELECT COUNT(*) FROM information_schema.statistics
+ WHERE table_schema = @db AND table_name = 'mes_qc_seed_quality' AND index_name = 'idx_process_instance');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_qc_seed_quality` ADD INDEX `idx_process_instance` (`process_instance_id`)',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.statistics
+ WHERE table_schema = @db AND table_name = 'mes_qc_seed_quality' AND index_name = 'idx_company_process_instance');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_qc_seed_quality` ADD INDEX `idx_company_process_instance` (`company_process_instance_id`)',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.statistics
+ WHERE table_schema = @db AND table_name = 'mes_qc_seed_quality' AND index_name = 'idx_biz_type');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_qc_seed_quality` ADD INDEX `idx_biz_type` (`biz_type`, `workflow_status`)',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- 鍘嗗彶璁板綍缁熶竴褰掍负鐢熶骇鍏ュ簱璐ㄦ锛岃川妫�绾夸繚鎸� 0锛堟湭鍖哄垎锛夛紝閬垮厤閲嶅瀹℃壒
+UPDATE `mes_qc_seed_quality` SET `biz_type` = 1 WHERE `biz_type` IS NULL OR `biz_type` = 0;
+
+-- ---------------------------------------------------------------------
+-- 7. 鎵ц鍚庤嚜妫�锛歱resent=1 琛ㄧず瀛楁/绱㈠紩宸插氨缁�
+-- ---------------------------------------------------------------------
+SELECT 'mes_qc_seed_quality.qc_line' AS item, COUNT(*) AS present FROM information_schema.columns
+ WHERE table_schema = @db AND table_name = 'mes_qc_seed_quality' AND column_name = 'qc_line'
+UNION ALL SELECT 'mes_qc_seed_quality.biz_type', COUNT(*) FROM information_schema.columns
+ WHERE table_schema = @db AND table_name = 'mes_qc_seed_quality' AND column_name = 'biz_type'
+UNION ALL SELECT 'mes_qc_seed_quality.process_instance_id', COUNT(*) FROM information_schema.columns
+ WHERE table_schema = @db AND table_name = 'mes_qc_seed_quality' AND column_name = 'process_instance_id'
+UNION ALL SELECT 'mes_qc_seed_quality.company_process_instance_id', COUNT(*) FROM information_schema.columns
+ WHERE table_schema = @db AND table_name = 'mes_qc_seed_quality' AND column_name = 'company_process_instance_id'
+UNION ALL SELECT 'INDEX uk_code_line', COUNT(*) FROM information_schema.statistics
+ WHERE table_schema = @db AND table_name = 'mes_qc_seed_quality' AND index_name = 'uk_code_line';
diff --git a/sql/mysql/mes_wm_product_sales_shipment.sql b/sql/mysql/mes_wm_product_sales_shipment.sql
new file mode 100644
index 0000000..684ed6d
--- /dev/null
+++ b/sql/mysql/mes_wm_product_sales_shipment.sql
@@ -0,0 +1,28 @@
+-- 鍒嗘鍙戣揣缁撴瀯锛氫笂绾垮墠瀵圭洰鏍囧簱鎵ц涓�娆★紱鍘嗗彶宸插畬鎴愬崟鎹繚鐣欏師娴佹按锛屼笉鑷姩鎺ㄦ柇鍙戣揣鎵规銆�
+CREATE TABLE mes_wm_product_sales_shipment (
+ id BIGINT NOT NULL AUTO_INCREMENT COMMENT '鍙戣揣璁板綍缂栧彿',
+ sales_id BIGINT NOT NULL COMMENT '閿�鍞嚭搴撳崟缂栧彿',
+ status TINYINT NOT NULL DEFAULT 0 COMMENT '0鎷h揣涓紝10寰呰繍鍗曪紝20寰呭嚭搴擄紝30宸插嚭搴擄紝40宸插彇娑�',
+ carrier VARCHAR(100) DEFAULT NULL COMMENT '鎵胯繍鍟�',
+ shipping_number VARCHAR(100) DEFAULT NULL COMMENT '杩愬崟鍙�',
+ outbound_time DATETIME DEFAULT NULL COMMENT '瀹為檯鍑哄簱鏃堕棿',
+ outbound_user_id BIGINT DEFAULT NULL COMMENT '鍑哄簱鎿嶄綔浜�',
+ creator VARCHAR(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ updater VARCHAR(64) DEFAULT '' COMMENT '鏇存柊鑰�',
+ update_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ deleted BIT NOT NULL DEFAULT 0 COMMENT '鏄惁鍒犻櫎',
+ PRIMARY KEY (id),
+ KEY idx_sales_status (sales_id, status, deleted)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='閿�鍞嚭搴撳垎娆″彂璐ц褰�';
+
+ALTER TABLE mes_wm_product_sales
+ ADD COLUMN close_reason VARCHAR(500) DEFAULT NULL COMMENT '閮ㄥ垎鍙戣揣鍚庡叧闂墿浣欐暟閲忕殑鍘熷洜';
+
+ALTER TABLE mes_wm_product_sales_detail
+ ADD COLUMN shipment_id BIGINT DEFAULT NULL COMMENT '鍙戣揣璁板綍ID锛涘巻鍙叉槑缁嗕负绌�',
+ ADD KEY idx_shipment_id (shipment_id);
+
+ALTER TABLE mes_wm_transaction
+ ADD COLUMN shipment_id BIGINT DEFAULT NULL COMMENT '閿�鍞彂璐ц褰旾D锛涘巻鍙叉祦姘翠负绌�',
+ ADD KEY idx_shipment_id (shipment_id);
diff --git a/sql/mysql/mes_wm_remove_warehouse_location_area_menu.sql b/sql/mysql/mes_wm_remove_warehouse_location_area_menu.sql
new file mode 100644
index 0000000..e8bc97a
--- /dev/null
+++ b/sql/mysql/mes_wm_remove_warehouse_location_area_menu.sql
@@ -0,0 +1,24 @@
+-- =============================================
+-- 绉婚櫎浠撳簱"搴撳尯/搴撲綅"鑿滃崟涓庢潈闄�
+-- 浠撳簱涓嶅啀缁存姢搴撳尯锛坵arehouse_location锛夈�佸簱浣嶏紙warehouse_area锛夛紝
+-- 鍚屾娓呯悊鍚庡彴鑿滃崟鍙婅鑹叉巿鏉冿紝閬垮厤鍓嶇璁块棶宸插垹闄ょ殑椤甸潰缁勪欢銆�
+-- =============================================
+
+-- 1. 娓呯悊瑙掕壊涓庡簱鍖�/搴撲綅鑿滃崟鐨勬巿鏉冨叧鑱�
+DELETE rm FROM system_role_menu rm
+JOIN system_menu m ON m.id = rm.menu_id
+WHERE m.component LIKE 'wls/warehouse/location%'
+ OR m.component LIKE 'wls/warehouse/area%'
+ OR m.component LIKE 'mes/wm/warehouse/location%'
+ OR m.component LIKE 'mes/wm/warehouse/area%'
+ OR m.permission LIKE 'mes:wm-warehouse-location%'
+ OR m.permission LIKE 'mes:wm-warehouse-area%';
+
+-- 2. 鍒犻櫎搴撳尯/搴撲綅鑿滃崟
+DELETE FROM system_menu
+WHERE component LIKE 'wls/warehouse/location%'
+ OR component LIKE 'wls/warehouse/area%'
+ OR component LIKE 'mes/wm/warehouse/location%'
+ OR component LIKE 'mes/wm/warehouse/area%'
+ OR permission LIKE 'mes:wm-warehouse-location%'
+ OR permission LIKE 'mes:wm-warehouse-area%';
diff --git a/sql/mysql/qc_seed_quality_line_menus_20261106.sql b/sql/mysql/qc_seed_quality_line_menus_20261106.sql
new file mode 100644
index 0000000..1ef0245
--- /dev/null
+++ b/sql/mysql/qc_seed_quality_line_menus_20261106.sql
@@ -0,0 +1,20 @@
+-- 璐ㄩ噺绠$悊锛氭柊澧炪�屽姞宸ラ儴璐ㄦ銆嶃�岄攢鍞儴璐ㄦ銆嶈彍鍗曪紙澶嶇敤璐ㄦ璁板綍椤甸潰锛屾寜璐ㄦ绾垮浐瀹氳繃婊わ級
+-- 鐖惰彍鍗曪細5500 璐ㄩ噺绠$悊
+
+-- 鍔犲伐閮ㄨ川妫�
+INSERT INTO `system_menu`
+ (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`,
+ `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+SELECT 1065303, '鍔犲伐閮ㄨ川妫�', '', 2, 96, 5500, 'seed-quality-record-processing', 'ep:document-checked',
+ 'mes/qc/seedQuality/record-processing', 'MesQcSeedQualityRecordProcessing',
+ 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'
+WHERE NOT EXISTS (SELECT 1 FROM `system_menu` WHERE id = 1065303);
+
+-- 閿�鍞儴璐ㄦ
+INSERT INTO `system_menu`
+ (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`,
+ `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+SELECT 1065304, '閿�鍞儴璐ㄦ', '', 2, 97, 5500, 'seed-quality-record-sales', 'ep:document-checked',
+ 'mes/qc/seedQuality/record-sales', 'MesQcSeedQualityRecordSales',
+ 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'
+WHERE NOT EXISTS (SELECT 1 FROM `system_menu` WHERE id = 1065304);
diff --git a/sql/mysql/system_appearance_init_20261106.sql b/sql/mysql/system_appearance_init_20261106.sql
new file mode 100644
index 0000000..c325aac
--- /dev/null
+++ b/sql/mysql/system_appearance_init_20261106.sql
@@ -0,0 +1,24 @@
+-- =============================================
+-- 绯荤粺澶栬璁剧疆鑿滃崟鍒濆鍖�
+-- 绯荤粺绠$悊 -> 澶栬璁剧疆锛堢櫥褰曢〉鑳屾櫙鍥俱�佷紒涓� Logo锛�
+-- 椤甸潰璺敱 /system/appearance/index
+-- 淇濆瓨鏉冮檺 system:appearance:update
+-- 鐩爣搴擄細mom-thzy
+-- =============================================
+
+-- 椤甸潰鑿滃崟锛堟寕鍦ㄣ�岀郴缁熺鐞嗐�嶄笅锛�
+INSERT INTO `system_menu`
+ (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`,
+ `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+SELECT 1065301, '澶栬璁剧疆', '', 2, 15, 1, 'appearance', 'ep:picture', 'system/appearance/index', 'SystemAppearance',
+ 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'
+WHERE NOT EXISTS (SELECT 1 FROM `system_menu` WHERE id = 1065301);
+
+-- 淇濆瓨鎸夐挳鏉冮檺
+INSERT INTO `system_menu`
+ (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`,
+ `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+SELECT 1065302, '淇濆瓨澶栬璁剧疆', 'system:appearance:update', 3, 1, 1065301, '', '', '', NULL,
+ 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'
+WHERE EXISTS (SELECT 1 FROM `system_menu` WHERE id = 1065301)
+ AND NOT EXISTS (SELECT 1 FROM `system_menu` WHERE id = 1065302);
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
index bf22058..7953ac0 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
@@ -35,8 +35,10 @@
import java.io.IOException;
import java.time.LocalDateTime;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.stream.Stream;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -139,9 +141,16 @@
Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(convertSet(userMap.values(), AdminUserRespDTO::getDeptId));
// 1.2 鑾峰彇璺濈杩涘叆鍏捣鐨勬椂闂�
Map<Long, Long> poolDayMap = getPoolDayMap(list);
+ // 1.3 鑾峰彇鎵�灞炰笂绾х粡閿�鍟嗗悕绉�
+ Set<Long> parentDealerIds = convertSet(list, CrmCustomerDO::getParentDealerId);
+ parentDealerIds.remove(null);
+ Map<Long, CrmCustomerDO> parentDealerMap = CollUtil.isEmpty(parentDealerIds)
+ ? Collections.emptyMap() : customerService.getCustomerMap(parentDealerIds);
// 2. 杞崲鎴� VO
return BeanUtils.toBean(list, CrmCustomerRespVO.class, customerVO -> {
customerVO.setAreaName(AreaUtils.format(customerVO.getAreaId()));
+ MapUtils.findAndThen(parentDealerMap, customerVO.getParentDealerId(),
+ dealer -> customerVO.setParentDealerName(dealer.getName()));
// 2.1 璁剧疆鍒涘缓浜恒�佽礋璐d汉鍚嶇О
MapUtils.findAndThen(userMap, NumberUtils.parseLong(customerVO.getCreator()),
user -> customerVO.setCreatorName(user.getNickname()));
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerPageReqVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerPageReqVO.java
index 73af5d6..1b8d2a5 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerPageReqVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerPageReqVO.java
@@ -30,6 +30,24 @@
@Schema(description = "瀹㈡埛鍚嶇О", example = "璧靛叚")
private String name;
+ @Schema(description = "绀句細淇$敤浠g爜", example = "91320600MA1XXXXXXX")
+ private String socialCreditCode;
+
+ @Schema(description = "韬唤璇佸彿", example = "320602199001011234")
+ private String idCardNo;
+
+ @Schema(description = "瀹㈡埛濮撳悕", example = "寮犱笁")
+ private String customerName;
+
+ @Schema(description = "澶囨娴佹按鍙�", example = "BA2026000001")
+ private String filingSerialNo;
+
+ @Schema(description = "鎵�灞炲尯鍩�", example = "鍗楅��")
+ private String region;
+
+ @Schema(description = "鎵�灞炰笂绾х粡閿�鍟嗙紪鍙�", example = "1024")
+ private Long parentDealerId;
+
@Schema(description = "鎵嬫満", example = "18000000000")
private String mobile;
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerRespVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerRespVO.java
index acc167e..6860a7a 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerRespVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerRespVO.java
@@ -23,6 +23,38 @@
@ExcelProperty("瀹㈡埛鍚嶇О")
private String name;
+ @Schema(description = "绀句細淇$敤浠g爜", example = "91320600MA1XXXXXXX")
+ @ExcelProperty("绀句細淇$敤浠g爜")
+ private String socialCreditCode;
+
+ @Schema(description = "韬唤璇佸彿", example = "320602199001011234")
+ @ExcelProperty("韬唤璇佸彿")
+ private String idCardNo;
+
+ @Schema(description = "瀹㈡埛濮撳悕", example = "寮犱笁")
+ @ExcelProperty("瀹㈡埛濮撳悕")
+ private String customerName;
+
+ @Schema(description = "澶囨娴佹按鍙�", example = "BA2026000001")
+ @ExcelProperty("澶囨娴佹按鍙�")
+ private String filingSerialNo;
+
+ @Schema(description = "閾惰璐︽埛鍚嶇О", example = "鍗楅�氭煇鏌愬啘涓氭湁闄愬叕鍙�")
+ @ExcelProperty("閾惰璐︽埛鍚嶇О")
+ private String bankAccountName;
+
+ @Schema(description = "鎵�灞炲尯鍩�", example = "鍗楅��")
+ @ExcelProperty("鎵�灞炲尯鍩�")
+ private String region;
+
+ @Schema(description = "鎵�灞炰笂绾х粡閿�鍟嗙紪鍙�", example = "1024")
+ @ExcelProperty("鎵�灞炰笂绾х粡閿�鍟嗙紪鍙�")
+ private Long parentDealerId;
+
+ @Schema(description = "鎵�灞炰笂绾х粡閿�鍟嗗悕绉�", example = "鏌愭煇缁忛攢鍟�")
+ @ExcelProperty("鎵�灞炰笂绾х粡閿�鍟�")
+ private String parentDealerName;
+
@Schema(description = "璺熻繘鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "13563")
@ExcelProperty(value = "璺熻繘鐘舵��", converter = DictConvert.class)
@DictFormat(DictTypeConstants.BOOLEAN_STRING)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerSaveReqVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerSaveReqVO.java
index bf4a4f0..99017ff 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerSaveReqVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerSaveReqVO.java
@@ -35,6 +35,40 @@
@NotEmpty(message = "瀹㈡埛鍚嶇О涓嶈兘涓虹┖")
private String name;
+ @Schema(description = "绀句細淇$敤浠g爜", example = "91320600MA1XXXXXXX")
+ @DiffLogField(name = "绀句細淇$敤浠g爜")
+ @Size(max = 64, message = "绀句細淇$敤浠g爜闀垮害涓嶈兘瓒呰繃 64 涓瓧绗�")
+ private String socialCreditCode;
+
+ @Schema(description = "韬唤璇佸彿", example = "320602199001011234")
+ @DiffLogField(name = "韬唤璇佸彿")
+ @Size(max = 32, message = "韬唤璇佸彿闀垮害涓嶈兘瓒呰繃 32 涓瓧绗�")
+ private String idCardNo;
+
+ @Schema(description = "瀹㈡埛濮撳悕", example = "寮犱笁")
+ @DiffLogField(name = "瀹㈡埛濮撳悕")
+ @Size(max = 64, message = "瀹㈡埛濮撳悕闀垮害涓嶈兘瓒呰繃 64 涓瓧绗�")
+ private String customerName;
+
+ @Schema(description = "澶囨娴佹按鍙�", example = "BA2026000001")
+ @DiffLogField(name = "澶囨娴佹按鍙�")
+ @Size(max = 64, message = "澶囨娴佹按鍙烽暱搴︿笉鑳借秴杩� 64 涓瓧绗�")
+ private String filingSerialNo;
+
+ @Schema(description = "閾惰璐︽埛鍚嶇О", example = "鍗楅�氭煇鏌愬啘涓氭湁闄愬叕鍙�")
+ @DiffLogField(name = "閾惰璐︽埛鍚嶇О")
+ @Size(max = 128, message = "閾惰璐︽埛鍚嶇О闀垮害涓嶈兘瓒呰繃 128 涓瓧绗�")
+ private String bankAccountName;
+
+ @Schema(description = "鎵�灞炲尯鍩�", example = "鍗楅��")
+ @DiffLogField(name = "鎵�灞炲尯鍩�")
+ @Size(max = 64, message = "鎵�灞炲尯鍩熼暱搴︿笉鑳借秴杩� 64 涓瓧绗�")
+ private String region;
+
+ @Schema(description = "鎵�灞炰笂绾х粡閿�鍟嗙紪鍙�", example = "1024")
+ @DiffLogField(name = "鎵�灞炰笂绾х粡閿�鍟嗙紪鍙�")
+ private Long parentDealerId;
+
@Schema(description = "涓嬫鑱旂郴鏃堕棿")
@DiffLogField(name = "涓嬫鑱旂郴鏃堕棿")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/customer/CrmCustomerDO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/customer/CrmCustomerDO.java
index 76d5111..2f80d12 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/customer/CrmCustomerDO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/customer/CrmCustomerDO.java
@@ -35,6 +35,37 @@
private String name;
/**
+ * 绀句細淇$敤浠g爜
+ */
+ private String socialCreditCode;
+ /**
+ * 韬唤璇佸彿
+ */
+ private String idCardNo;
+ /**
+ * 瀹㈡埛濮撳悕
+ */
+ private String customerName;
+ /**
+ * 澶囨娴佹按鍙�
+ */
+ private String filingSerialNo;
+ /**
+ * 閾惰璐︽埛鍚嶇О
+ */
+ private String bankAccountName;
+ /**
+ * 鎵�灞炲尯鍩�
+ */
+ private String region;
+ /**
+ * 鎵�灞炰笂绾х粡閿�鍟嗙紪鍙�
+ *
+ * 鍏宠仈 {@link CrmCustomerDO#getId()} 瀛楁
+ */
+ private Long parentDealerId;
+
+ /**
* 璺熻繘鐘舵��
*/
private Boolean followUpStatus;
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java
index 25de6e6..4502e7f 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java
@@ -64,6 +64,12 @@
// 鎷兼帴鑷韩鐨勬煡璇㈡潯浠�
query.selectAll(CrmCustomerDO.class)
.likeIfPresent(CrmCustomerDO::getName, pageReqVO.getName())
+ .likeIfPresent(CrmCustomerDO::getSocialCreditCode, pageReqVO.getSocialCreditCode())
+ .likeIfPresent(CrmCustomerDO::getIdCardNo, pageReqVO.getIdCardNo())
+ .likeIfPresent(CrmCustomerDO::getCustomerName, pageReqVO.getCustomerName())
+ .likeIfPresent(CrmCustomerDO::getFilingSerialNo, pageReqVO.getFilingSerialNo())
+ .likeIfPresent(CrmCustomerDO::getRegion, pageReqVO.getRegion())
+ .eqIfPresent(CrmCustomerDO::getParentDealerId, pageReqVO.getParentDealerId())
.eqIfPresent(CrmCustomerDO::getMobile, pageReqVO.getMobile())
.eqIfPresent(CrmCustomerDO::getIndustryId, pageReqVO.getIndustryId())
.eqIfPresent(CrmCustomerDO::getLevel, pageReqVO.getLevel())
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
index ffcdf9c..cfc9967 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
@@ -72,6 +72,7 @@
ErrorCode CUSTOMER_CREATE_NAME_NOT_NULL = new ErrorCode(1_020_006_013, "瀹㈡埛鍚嶇О涓嶈兘涓虹┖锛�");
ErrorCode CUSTOMER_NAME_EXISTS = new ErrorCode(1_020_006_014, "宸插瓨鍦ㄥ悕涓恒�恵}銆戠殑瀹㈡埛锛�");
ErrorCode CUSTOMER_UPDATE_DEAL_STATUS_FAIL = new ErrorCode(1_020_006_015, "鏇存柊瀹㈡埛鐨勬垚浜ょ姸鎬佸け璐ワ紝鍘熷洜锛氬凡缁忔槸璇ョ姸鎬侊紝鏃犻渶鏇存柊");
+ ErrorCode CUSTOMER_PARENT_DEALER_SELF = new ErrorCode(1_020_006_016, "鎵�灞炰笂绾х粡閿�鍟嗕笉鑳介�夋嫨瀹㈡埛鑷韩");
// ========== 鏉冮檺绠$悊 1_020_007_000 ==========
ErrorCode CRM_PERMISSION_NOT_EXISTS = new ErrorCode(1_020_007_000, "鏁版嵁鏉冮檺涓嶅瓨鍦�");
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
index 756a962..0fbc86e 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
@@ -131,6 +131,11 @@
updateReqVO.setOwnerUserId(null); // 鏇存柊鐨勬椂鍊欙紝瑕佹妸 updateReqVO 璐熻矗浜鸿缃负绌猴紝閬垮厤淇敼
// 1. 鏍¢獙瀛樺湪
CrmCustomerDO oldCustomer = validateCustomerExists(updateReqVO.getId());
+ // 1.1 鏍¢獙鎵�灞炰笂绾х粡閿�鍟嗕笉鑳芥槸鑷繁
+ if (updateReqVO.getParentDealerId() != null
+ && updateReqVO.getParentDealerId().equals(updateReqVO.getId())) {
+ throw exception(CUSTOMER_PARENT_DEALER_SELF);
+ }
// 2. 鏇存柊瀹㈡埛
CrmCustomerDO updateObj = BeanUtils.toBean(updateReqVO, CrmCustomerDO.class);
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java
index 68b397b..123b59c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java
@@ -48,6 +48,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -246,9 +247,16 @@
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
convertSet(list, MesProBatchDO::getOwnerUserId));
Map<Long, MesMdmItemDO> itemMap = mdmItemService.getItemMap(convertSet(list, MesProBatchDO::getItemId));
+ // 鎵规涓嬪凡鐢熸垚鐨勬寮忔墭鐩樼爜锛堟壒閲忔煡璇紝閬垮厤閫愯鏌ヨ锛�
+ Map<Long, List<String>> palletCodeMap = palletService.getPalletListByBatchIds(
+ convertSet(list, MesProBatchDO::getId)).stream()
+ .filter(pallet -> StrUtil.isNotBlank(pallet.getCode()))
+ .collect(Collectors.groupingBy(MesProPalletDO::getBatchId,
+ Collectors.mapping(MesProPalletDO::getCode, Collectors.toList())));
return BeanUtils.toBean(list, MesProBatchRespVO.class, vo -> {
MapUtils.findAndThen(userMap, vo.getOwnerUserId(), user -> vo.setOwnerUserName(user.getNickname()));
MapUtils.findAndThen(itemMap, vo.getItemId(), item -> { vo.setItemCode(item.getCode()); vo.setItemName(item.getName()); });
+ vo.setPalletCodes(palletCodeMap.getOrDefault(vo.getId(), Collections.emptyList()));
});
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/vo/MesProBatchRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/vo/MesProBatchRespVO.java
index f79e5eb..a7d7518 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/vo/MesProBatchRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/vo/MesProBatchRespVO.java
@@ -83,6 +83,10 @@
@ExcelProperty("鎵樼洏鐮佹暟閲�")
private Integer palletQuantity;
+ @Schema(description = "鎵规涓嬪叏閮ㄦ寮忔墭鐩樼爜")
+ @ExcelIgnore
+ private List<String> palletCodes;
+
@Schema(description = "鎵规鐘舵�侊紙瀛楀吀 mes_pro_batch_status锛�", example = "20")
@ExcelProperty(value = "鎵规鐘舵��", converter = DictConvert.class)
@DictFormat(DictTypeConstants.MES_PRO_BATCH_STATUS)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/vo/MesProBatchSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/vo/MesProBatchSaveReqVO.java
index 47f5142..20a58d0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/vo/MesProBatchSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/vo/MesProBatchSaveReqVO.java
@@ -20,6 +20,8 @@
@Schema(description = "缂栧彿", example = "1024")
private Long id;
+ @Schema(description = "鎵规鍙凤紙鍙�夛紝浜哄伐杈撳叆锛涗笉浼犲垯绯荤粺鎸夈�屽勾浠�+3浣嶆祦姘淬�嶈嚜鍔ㄧ敓鎴愶紝濡� 2026001锛�", example = "2026001")
+ private String code;
@Schema(description = "鍝佺缂栧彿锛岀敱缁戝畾鎵樼洏鎴栧惃琚嬪甫鍏ュ苟缁忓悗绔牎楠�")
private Long itemId;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/scan/vo/MesProScanEventCreateReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/scan/vo/MesProScanEventCreateReqVO.java
index c6c2565..9f2d3ad 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/scan/vo/MesProScanEventCreateReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/scan/vo/MesProScanEventCreateReqVO.java
@@ -18,11 +18,12 @@
private String scanType;
@NotNull @DecimalMin("0.000001") private BigDecimal quantity;
/**
- * 璁惧缂栫爜锛堜笉鍐嶅繀濉紝浜х嚎鎵爜浠ヤ骇绾�+搴撳尯搴撲綅瀹氫綅锛�
+ * 璁惧缂栫爜锛堜笉鍐嶅繀濉紝浜х嚎鎵爜浠ヤ骇绾垮畾浣嶏級
*/
@Size(max = 64) private String deviceCode;
private String lineCode;
- @NotNull private Long locationId;
- @NotNull private Long areaId;
+ /** 搴撲綅銆佸簱鍖洪潪蹇呭~锛氭壂鐮佸叆搴撶粺涓�钀藉埌 WIP 鐢熶骇鏆傚瓨浠擄紝鍓嶇涓嶅啀瑕佹眰閫夋嫨搴撳尯搴撲綅 */
+ private Long locationId;
+ private Long areaId;
private String remark;
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/scan/vo/MesProScanEventRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/scan/vo/MesProScanEventRespVO.java
index 2cfb498..45f308b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/scan/vo/MesProScanEventRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/scan/vo/MesProScanEventRespVO.java
@@ -12,6 +12,8 @@
private String bagCode;
private String scanType;
private String batchCode;
+ private Long palletId;
+ private String palletCode;
private BigDecimal quantity;
private String deviceCode;
private String lineCode;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/MesQcSeedQualityController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/MesQcSeedQualityController.java
index 8e6c366..771a109 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/MesQcSeedQualityController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/MesQcSeedQualityController.java
@@ -3,6 +3,7 @@
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityBatchRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualitySubmitReqVO;
@@ -11,7 +12,9 @@
import cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityBatchApprovalReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityBatchRetestReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityScopeRetestReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedReturnQualitySubmitReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedIndicatorRangeSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedIndicatorRangeRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityActionRespVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.bagcode.MesProBagCodeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.seedquality.MesQcSeedQualityActionDO;
@@ -41,27 +44,56 @@
@Resource private MesQcSeedIndicatorRangeService rangeService;
@Resource private MesProBagCodeMapper bagCodeMapper;
@Resource private AdminUserApi adminUserApi;
- @GetMapping("/ranges") @Operation(summary = "鑾峰緱绉嶅瓙璐ㄦ鍚堟牸鑼冨洿")
+ @GetMapping("/ranges") @Operation(summary = "鑾峰緱浜у搧璐ㄦ椤归厤缃�")
@PreAuthorize("@ss.hasAnyPermissions('mes:qc-seed-quality:submit', 'mes:qc-seed-quality:retest', 'mes:qc-seed-range:query')")
- public CommonResult<java.util.List<cn.iocoder.yudao.module.mes.dal.dataobject.qc.seedquality.MesQcSeedIndicatorRangeDO>> ranges() {
- return success(rangeService.getRanges());
+ public CommonResult<List<MesQcSeedIndicatorRangeRespVO>> ranges(@RequestParam(required = false) Long itemId,
+ @RequestParam(required = false) String keyword,
+ @RequestParam(required = false) Integer status) {
+ return success(BeanUtils.toBean(rangeService.getRanges(itemId, keyword, status), MesQcSeedIndicatorRangeRespVO.class));
}
- @PutMapping("/ranges") @Operation(summary = "閰嶇疆绉嶅瓙璐ㄦ鍚堟牸鑼冨洿")
+ @GetMapping("/ranges/effective") @Operation(summary = "鑾峰緱浜у搧鐢熸晥鐨勮川妫�椤�")
+ @PreAuthorize("@ss.hasAnyPermissions('mes:qc-seed-quality:submit', 'mes:qc-seed-quality:retest', 'mes:qc-seed-range:query')")
+ public CommonResult<List<MesQcSeedIndicatorRangeRespVO>> effectiveRanges(@RequestParam Long itemId) {
+ return success(BeanUtils.toBean(rangeService.getEffectiveRanges(itemId), MesQcSeedIndicatorRangeRespVO.class));
+ }
+
+ @PostMapping("/ranges") @Operation(summary = "鏂板浜у搧璐ㄦ椤�")
@PreAuthorize("@ss.hasPermission('mes:qc-seed-range:update')")
- public CommonResult<Boolean> saveRanges(@Valid @RequestBody MesQcSeedIndicatorRangeSaveReqVO reqVO) {
- rangeService.saveRanges(reqVO);
+ public CommonResult<Long> createRange(@Valid @RequestBody MesQcSeedIndicatorRangeSaveReqVO reqVO) {
+ return success(rangeService.create(reqVO));
+ }
+
+ @PutMapping("/ranges/{id}") @Operation(summary = "淇敼浜у搧璐ㄦ椤�")
+ @PreAuthorize("@ss.hasPermission('mes:qc-seed-range:update')")
+ public CommonResult<Boolean> updateRange(@PathVariable Long id, @Valid @RequestBody MesQcSeedIndicatorRangeSaveReqVO reqVO) {
+ rangeService.update(id, reqVO);
return success(true);
+ }
+
+ @DeleteMapping("/ranges/{id}") @Operation(summary = "鍒犻櫎浜у搧璐ㄦ椤�")
+ @PreAuthorize("@ss.hasPermission('mes:qc-seed-range:update')")
+ public CommonResult<Boolean> deleteRange(@PathVariable Long id) {
+ rangeService.delete(id);
+ return success(true);
+ }
+
+ @PostMapping("/ranges/copy-default") @Operation(summary = "澶嶅埗閫氱敤榛樿璐ㄦ椤瑰埌浜у搧")
+ @PreAuthorize("@ss.hasPermission('mes:qc-seed-range:update')")
+ public CommonResult<Integer> copyDefaultRanges(@RequestParam Long itemId) {
+ return success(rangeService.copyDefaults(itemId));
}
@GetMapping("/resolve")
@Operation(summary = "瑙f瀽寰呰川妫�琚嬬爜鍙婄‘璁よ琚嬭川妫�缁撴灉")
@PreAuthorize("@ss.hasAnyPermissions('mes:qc-seed-quality:submit', 'mes:qc-seed-quality:retest', 'mes:qc-seed-quality:process-approve', 'mes:qc-seed-quality:company-approve')")
- public CommonResult<java.util.Map<String, Object>> resolve(@RequestParam String code, @RequestParam(defaultValue = "BAG") String scanType) {
- return success(service.resolveScan(code, scanType));
+ public CommonResult<java.util.Map<String, Object>> resolve(@RequestParam String code, @RequestParam(defaultValue = "BAG") String scanType,
+ @RequestParam(defaultValue = "1") Integer qcLine) {
+ return success(service.resolveScan(code, scanType, qcLine));
}
@GetMapping("/page")
@Operation(summary = "鑾峰緱绉嶅瓙璐ㄦ璁板綍鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:qc-seed-quality:query')")
+ @PreAuthorize("@ss.hasAnyPermissions('mes:qc-seed-quality:query', 'mes:qc-seed-quality:submit', "
+ + "'mes:qc-seed-quality:retest', 'mes:qc-seed-quality:process-approve', 'mes:qc-seed-quality:company-approve')")
public CommonResult<PageResult<MesQcSeedQualityRespVO>> getQualityPage(@Valid MesQcSeedQualityPageReqVO pageReqVO) {
PageResult<MesQcSeedQualityRespVO> page = BeanUtils.toBean(
service.getQualityPage(pageReqVO), MesQcSeedQualityRespVO.class);
@@ -78,13 +110,22 @@
return success(page);
}
- @GetMapping("/indicators") @Operation(summary = "鑾峰緱绉嶅瓙璐ㄦ鏈�鏂版寚鏍�")
+ @GetMapping("/batch-page")
+ @Operation(summary = "鑾峰緱绉嶅瓙璐ㄦ璁板綍鎸夌敓浜ф壒娆″垎缁勫垎椤�")
@PreAuthorize("@ss.hasPermission('mes:qc-seed-quality:query')")
+ public CommonResult<PageResult<MesQcSeedQualityBatchRespVO>> getQualityBatchPage(@Valid MesQcSeedQualityPageReqVO pageReqVO) {
+ return success(service.getQualityBatchPage(pageReqVO));
+ }
+
+ @GetMapping("/indicators") @Operation(summary = "鑾峰緱绉嶅瓙璐ㄦ鏈�鏂版寚鏍�")
+ @PreAuthorize("@ss.hasAnyPermissions('mes:qc-seed-quality:query', 'mes:qc-seed-quality:submit', "
+ + "'mes:qc-seed-quality:retest', 'mes:qc-seed-quality:process-approve', 'mes:qc-seed-quality:company-approve')")
public CommonResult<java.util.List<cn.iocoder.yudao.module.mes.dal.dataobject.qc.seedquality.MesQcSeedQualityIndicatorDO>> indicators(@RequestParam Long id) {
return success(service.getIndicatorsByQualityId(id));
}
@GetMapping("/actions") @Operation(summary = "鑾峰緱绉嶅瓙璐ㄦ娴佺▼鐣欑棔")
- @PreAuthorize("@ss.hasPermission('mes:qc-seed-quality:query')")
+ @PreAuthorize("@ss.hasAnyPermissions('mes:qc-seed-quality:query', 'mes:qc-seed-quality:submit', "
+ + "'mes:qc-seed-quality:retest', 'mes:qc-seed-quality:process-approve', 'mes:qc-seed-quality:company-approve')")
public CommonResult<List<MesQcSeedQualityActionRespVO>> actions(@RequestParam Long id) {
List<MesQcSeedQualityActionDO> actions = service.getActions(id);
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(actions.stream()
@@ -106,6 +147,13 @@
return success(service.submitGroup(reqVO));
}
+ @PostMapping("/retry-bpm") @Operation(summary = "閲嶆柊鍙戣捣璐ㄦ BPM 瀹℃壒")
+ @PreAuthorize("@ss.hasPermission('mes:qc-seed-quality:process-approve')")
+ public CommonResult<Boolean> retryBpm(@RequestParam Long id) {
+ service.retryBpmProcess(id);
+ return success(true);
+ }
+
@PostMapping("/retest") @Operation(summary = "绉嶅瓙璐ㄦ澶嶆")
@PreAuthorize("@ss.hasPermission('mes:qc-seed-quality:retest')")
public CommonResult<Boolean> retest(@RequestParam Long id, @Valid @RequestBody MesQcSeedQualityRetestReqVO reqVO) {
@@ -122,8 +170,9 @@
@GetMapping("/retest-scope/resolve") @Operation(summary = "鎸夋墭鐩樼爜鎴栫敓浜ф壒娆$爜瑙f瀽寰呮壒閲忚川妫�璁板綍")
@PreAuthorize("@ss.hasAnyPermissions('mes:qc-seed-quality:submit', 'mes:qc-seed-quality:retest', 'mes:qc-seed-quality:process-approve', 'mes:qc-seed-quality:company-approve')")
- public CommonResult<java.util.Map<String, Object>> resolveRetestScope(@RequestParam String code, @RequestParam String scanType) {
- return success(service.resolveRetestScope(code, scanType));
+ public CommonResult<java.util.Map<String, Object>> resolveRetestScope(@RequestParam String code, @RequestParam String scanType,
+ @RequestParam(defaultValue = "1") Integer qcLine) {
+ return success(service.resolveRetestScope(code, scanType, qcLine));
}
@PostMapping("/retest-scope") @Operation(summary = "鎸夋墭鐩樼爜鎴栫敓浜ф壒娆$爜鎵归噺澶嶆鎴栭噸鏂板垵妫�")
@@ -157,4 +206,23 @@
service.companyApproveBatch(reqVO.getIds(), reqVO.getApproved(), reqVO.getOpinion());
return success(true);
}
+
+ @GetMapping("/return/resolve") @Operation(summary = "瑙f瀽缁忛攢鍟嗛��璐у崟寰呰川妫�淇℃伅")
+ @PreAuthorize("@ss.hasAnyPermissions('mes:qc-seed-quality:submit', 'mes:qc-seed-quality:retest', 'mes:qc-seed-quality:process-approve')")
+ public CommonResult<Map<String, Object>> resolveReturnQuality(@RequestParam Long returnSalesId) {
+ return success(service.resolveReturnQuality(returnSalesId));
+ }
+
+ @PostMapping("/return/submit") @Operation(summary = "鎻愪氦缁忛攢鍟嗛��璐ц川妫�")
+ @PreAuthorize("@ss.hasPermission('mes:qc-seed-quality:submit')")
+ public CommonResult<Long> submitReturnQuality(@Valid @RequestBody MesQcSeedReturnQualitySubmitReqVO reqVO) {
+ return success(service.submitReturnQuality(reqVO));
+ }
+
+ @PostMapping("/return/approve") @Operation(summary = "缁忛攢鍟嗛��璐ц川妫�閿�鍞儴瀹℃壒")
+ @PreAuthorize("@ss.hasPermission('mes:qc-seed-quality:process-approve')")
+ public CommonResult<Boolean> returnApprove(@Valid @RequestBody MesQcSeedQualityApprovalReqVO reqVO) {
+ service.returnApprove(reqVO.getId(), reqVO.getApproved(), reqVO.getOpinion());
+ return success(true);
+ }
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedIndicatorRangeRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedIndicatorRangeRespVO.java
new file mode 100644
index 0000000..d3742ee
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedIndicatorRangeRespVO.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class MesQcSeedIndicatorRangeRespVO {
+ private Long id;
+ private Long itemId;
+ private String indicatorCode;
+ private String indicatorName;
+ private String unit;
+ private BigDecimal minValue;
+ private BigDecimal maxValue;
+ private Integer sort;
+ /** 鐘舵�侊細0 鍚敤 1 鍋滅敤 */
+ private Integer status;
+ private LocalDateTime updateTime;
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedIndicatorRangeSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedIndicatorRangeSaveReqVO.java
index 5f9148b..cb6a0a7 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedIndicatorRangeSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedIndicatorRangeSaveReqVO.java
@@ -1,25 +1,32 @@
package cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.DecimalMax;
import jakarta.validation.constraints.DecimalMin;
import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
import lombok.Data;
import java.math.BigDecimal;
-import java.util.List;
@Data
public class MesQcSeedIndicatorRangeSaveReqVO {
- @NotEmpty
- private List<@Valid Item> ranges;
-
- @Data
- public static class Item {
- @NotBlank private String indicatorCode;
- @NotNull @DecimalMin("0") @DecimalMax("100") private BigDecimal minValue;
- @NotNull @DecimalMin("0") @DecimalMax("100") private BigDecimal maxValue;
- }
+ /** 缁戝畾浜у搧锛坢dm_item锛宨temType=2锛� */
+ @NotNull
+ private Long itemId;
+ @NotBlank
+ @Pattern(regexp = "[A-Za-z][A-Za-z0-9_]{0,63}", message = "鎸囨爣缂栫爜蹇呴』浠ュ瓧姣嶅紑澶达紝浠呭彲鍖呭惈瀛楁瘝銆佹暟瀛楀拰涓嬪垝绾�")
+ private String indicatorCode;
+ @NotBlank
+ private String indicatorName;
+ /** 鍗曚綅锛屽 %銆佺矑/鍏枻 */
+ private String unit;
+ @NotNull
+ @DecimalMin("0")
+ private BigDecimal minValue;
+ @NotNull
+ @DecimalMin("0")
+ private BigDecimal maxValue;
+ private Integer sort;
+ /** 鐘舵�侊細0 鍚敤 1 鍋滅敤 */
+ private Integer status;
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedQualityBatchRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedQualityBatchRespVO.java
new file mode 100644
index 0000000..ccab05c
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedQualityBatchRespVO.java
@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 绉嶅瓙璐ㄦ璁板綍鎸夌敓浜ф壒娆″垎缁� Response VO")
+@Data
+public class MesQcSeedQualityBatchRespVO {
+
+ @Schema(description = "鐢熶骇鎵规缂栧彿锛涙湭缁戝畾鎵规鏃朵负绌�")
+ private Long batchId;
+ @Schema(description = "鐢熶骇鎵规鍙凤紱鏈粦瀹氭椂涓虹┖瀛楃涓�")
+ private String batchCode;
+ @Schema(description = "鎵规灞曠ず鍚嶇О锛屾湭缁戝畾鏃朵负銆屾湭缁戝畾鎵规銆�")
+ private String batchLabel;
+ @Schema(description = "鍝佺缂栧彿")
+ private Long itemId;
+ @Schema(description = "鍝佺缂栫爜")
+ private String itemCode;
+ @Schema(description = "鍝佺鍚嶇О")
+ private String itemName;
+ @Schema(description = "鍔犲伐鍗曚綅锛堜骇绾垮悕绉帮級")
+ private String lineName;
+ @Schema(description = "鐢熶骇鏃ユ湡")
+ private LocalDateTime produceDate;
+
+ @Schema(description = "缁勫唴璐ㄦ璁板綍鎬绘暟")
+ private Integer totalCount;
+ @Schema(description = "鍚堟牸鏁伴噺")
+ private Integer passCount;
+ @Schema(description = "涓嶅悎鏍兼暟閲�")
+ private Integer failCount;
+ @Schema(description = "澶勭悊涓暟閲�")
+ private Integer processingCount;
+ @Schema(description = "寰呭妫�/閲嶆柊鍒濇鏁伴噺")
+ private Integer pendingRetestCount;
+ @Schema(description = "寰呭垵妫�瀹℃牳鏁伴噺")
+ private Integer pendingProcessReviewCount;
+ @Schema(description = "寰呭妫�瀹℃牳鏁伴噺")
+ private Integer pendingCompanyReviewCount;
+ @Schema(description = "宸叉斁琛屾暟閲�")
+ private Integer releasedCount;
+ @Schema(description = "宸叉姤搴熸暟閲�")
+ private Integer scrappedCount;
+ @Schema(description = "缁勫唴鏈�杩戞楠屾椂闂�")
+ private LocalDateTime lastInspectedAt;
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedQualityPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedQualityPageReqVO.java
index c7bf339..6a58863 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedQualityPageReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedQualityPageReqVO.java
@@ -13,12 +13,24 @@
@Schema(description = "璐ㄦ琚嬬爜")
private String code;
- @Schema(description = "鐢熶骇鎵规")
+ @Schema(description = "鐢熶骇鎵规锛堟ā绯婂尮閰嶏級")
private String batchCode;
+
+ @Schema(description = "鐢熶骇鎵规锛堢簿纭尮閰嶏紝鎸夋壒娆″睍寮�鏄庣粏鏃朵娇鐢級")
+ private String exactBatchCode;
+
+ @Schema(description = "鏄惁浠呮煡璇㈡湭缁戝畾鐢熶骇鎵规鐨勮褰曪紙鎸夈�屾湭缁戝畾鎵规銆嶅睍寮�鏄庣粏鏃朵娇鐢級")
+ private Boolean unbound;
@Schema(description = "妫�楠岀粨鏋滐細1鍚堟牸 2涓嶅悎鏍�")
private Integer result;
@Schema(description = "娴佺▼鐘舵�侊細10寰呭妫� 20/50寰呭姞宸ラ儴 30/60寰呭叕鍙歌川妫� 40宸叉斁琛� 70宸叉姤搴�")
private Integer workflowStatus;
+
+ @Schema(description = "璐ㄦ绾匡細1鍔犲伐閮� 2閿�鍞儴 0鏈尯鍒嗭紙鍘嗗彶鏁版嵁锛�")
+ private Integer qcLine;
+
+ @Schema(description = "涓氬姟绫诲瀷锛�1鐢熶骇鍏ュ簱璐ㄦ 2缁忛攢鍟嗛��璐ц川妫�")
+ private Integer bizType;
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedQualityRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedQualityRespVO.java
index ca3b1f2..aebcdc1 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedQualityRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedQualityRespVO.java
@@ -11,6 +11,10 @@
private Long id;
private String code;
+ @Schema(description = "璐ㄦ绾匡細1鍔犲伐閮� 2閿�鍞儴 0鏈尯鍒嗭紙鍘嗗彶鏁版嵁锛�")
+ private Integer qcLine;
+ @Schema(description = "涓氬姟绫诲瀷锛�1鐢熶骇鍏ュ簱璐ㄦ 2缁忛攢鍟嗛��璐ц川妫�")
+ private Integer bizType;
@Schema(description = "瀵瑰簲鎵樼洏鐮侊紱鏈粦瀹氭墭鐩樻椂涓虹┖")
private String palletCode;
private Long itemId;
@@ -18,9 +22,15 @@
private String batchCode;
private Integer result;
private Integer workflowStatus;
+ private String processInstanceId;
+ private String companyProcessInstanceId;
+ private Long returnSalesId;
+ private String returnSalesCode;
private Integer retestResult;
private LocalDateTime retestedAt;
private LocalDateTime processApprovedAt;
+ private LocalDateTime lineFinishedAt;
+ private LocalDateTime companySubmittedAt;
private LocalDateTime companyApprovedAt;
private String reason;
private Long inspectorId;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedQualityScopeRetestReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedQualityScopeRetestReqVO.java
index 0547673..7d4060d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedQualityScopeRetestReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedQualityScopeRetestReqVO.java
@@ -11,6 +11,7 @@
public class MesQcSeedQualityScopeRetestReqVO {
@NotBlank private String code;
@NotBlank private String scanType;
+ @NotNull private Integer qcLine;
@NotNull private Integer workflowStatus;
@NotEmpty private List<@NotNull Long> qualityIds;
@NotEmpty @Valid private List<MesQcSeedQualitySubmitReqVO.Indicator> indicators;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedQualitySubmitReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedQualitySubmitReqVO.java
index 1c4ef86..4513ec7 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedQualitySubmitReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedQualitySubmitReqVO.java
@@ -9,6 +9,8 @@
@Data
public class MesQcSeedQualitySubmitReqVO {
@NotBlank private String code;
+ /** 鍏煎瀛楁锛氫竴娆℃彁浜や細鍚屾椂鐢熸垚鍔犲伐閮ㄤ笌閿�鍞儴涓ゆ潯璁板綍锛屽悗绔笉鍐嶆寜璇ュ瓧娈垫媶鍒嗐�� */
+ private Integer qcLine;
private String batchCode;
@NotEmpty @Valid private List<Indicator> indicators;
private String reason;
@@ -16,8 +18,8 @@
@NotNull private Long qualifiedWarehouseId;
@Data public static class Indicator {
@NotBlank private String code;
- @NotNull @DecimalMin("0") @DecimalMax("100") private BigDecimal value;
- @NotNull @DecimalMin("0") @DecimalMax("100") private BigDecimal minValue;
- @NotNull @DecimalMin("0") @DecimalMax("100") private BigDecimal maxValue;
+ @NotNull @DecimalMin("0") private BigDecimal value;
+ @NotNull @DecimalMin("0") private BigDecimal minValue;
+ @NotNull @DecimalMin("0") private BigDecimal maxValue;
}
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedReturnQualitySubmitReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedReturnQualitySubmitReqVO.java
new file mode 100644
index 0000000..eb7377d
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/vo/MesQcSeedReturnQualitySubmitReqVO.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 绠$悊鍚庡彴 - 缁忛攢鍟嗛��璐х瀛愯川妫�鎻愪氦 Request VO
+ */
+@Data
+public class MesQcSeedReturnQualitySubmitReqVO {
+
+ @NotNull
+ private Long returnSalesId;
+
+ @NotEmpty
+ @Valid
+ private List<MesQcSeedQualitySubmitReqVO.Indicator> indicators;
+
+ /** 涓嶅悎鏍煎師鍥� */
+ private String reason;
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/vo/MesWmBatchSalesTargetRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/vo/MesWmBatchSalesTargetRespVO.java
index 804c03c..25600ad 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/vo/MesWmBatchSalesTargetRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/vo/MesWmBatchSalesTargetRespVO.java
@@ -12,6 +12,7 @@
@Schema(description = "閿�鍞嚭搴撳崟鍙�", example = "SO20250801001")
private String salesCode;
+ private Long shipmentId;
@Schema(description = "鍑哄簱鏃ユ湡")
private LocalDateTime salesDate;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
index 6c23287..0f2a2b5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
@@ -20,6 +20,8 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmStockSummaryRespVO;
import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
+import cn.iocoder.yudao.module.mdm.api.category.MdmItemCategoryApi;
+import cn.iocoder.yudao.module.mdm.api.category.dto.MdmItemCategoryRespDTO;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
@@ -63,9 +65,14 @@
public class MesWmMaterialStockController {
@Resource
+ private cn.iocoder.yudao.module.mes.dal.mysql.wm.transaction.MesWmTransactionMapper transactionMapper;
+
+ @Resource
private MesWmMaterialStockService materialStockService;
@Resource
private MdmItemApi mdmItemApi;
+ @Resource
+ private MdmItemCategoryApi mdmItemCategoryApi;
@Resource
private MdmUnitMeasureApi mdmUnitMeasureApi;
@Resource
@@ -78,6 +85,20 @@
private SrmSupplierApi srmSupplierApi;
@Resource
private MesWmMaterialStockBagMapper materialStockBagMapper;
+ @Resource
+ private cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesLineService productSalesLineService;
+ @Resource private cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesDetailMapper salesDetailMapper;
+ @Resource private cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesMapper salesMapper;
+ @Resource private cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesShipmentMapper shipmentMapper;
+
+ @GetMapping("/picking-list")
+ @Operation(summary = "鎸夐攢鍞嚭搴撳崟琛屾煡璇㈠悎鏍煎簱瀛�")
+ @PreAuthorize("@ss.hasPermission('mes:wm-product-sales:stock') and @ss.hasPermission('mes:wm-material-stock:query')")
+ public CommonResult<List<MesWmMaterialStockRespVO>> getPickingStocks(@RequestParam("lineId") Long lineId) {
+ var line = productSalesLineService.getProductSalesLine(lineId);
+ if (line == null) throw new IllegalArgumentException("鍑哄簱鍗曡涓嶅瓨鍦�");
+ return success(buildRespVOList(materialStockService.getQualifiedMaterialStockListByItemAndBatch(line.getItemId(), line.getBatchId())));
+ }
@GetMapping("/get")
@Operation(summary = "鑾峰緱搴撳瓨璁板綍")
@@ -108,7 +129,37 @@
PageResult<MesWmMaterialStockBagRespVO> result = new PageResult<>();
PageResult<cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstockbag.MesWmMaterialStockBagDO> page =
materialStockBagMapper.selectPage(pageReqVO);
- return success(new PageResult<>(BeanUtils.toBean(page.getList(), MesWmMaterialStockBagRespVO.class), page.getTotal()));
+ var transactionIds = convertSet(page.getList(), cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstockbag.MesWmMaterialStockBagDO::getLastTransactionId);
+ Map<Long, cn.iocoder.yudao.module.mes.dal.dataobject.wm.transaction.MesWmTransactionDO> transactions = transactionIds.isEmpty()
+ ? Collections.emptyMap() : transactionMapper.selectBatchIds(transactionIds).stream()
+ .collect(Collectors.toMap(cn.iocoder.yudao.module.mes.dal.dataobject.wm.transaction.MesWmTransactionDO::getId, tx -> tx));
+ var rows = BeanUtils.toBean(page.getList(), MesWmMaterialStockBagRespVO.class);
+ var bagIds = convertSet(page.getList(), cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstockbag.MesWmMaterialStockBagDO::getBagCodeId);
+ var pickingDetails = salesDetailMapper.selectByBagIds(bagIds);
+ var saleIds = convertSet(pickingDetails, cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDetailDO::getSalesId);
+ var shipmentIds = convertSet(pickingDetails, cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDetailDO::getShipmentId);
+ var saleMap = saleIds.isEmpty() ? Collections.<Long, cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO>emptyMap()
+ : salesMapper.selectBatchIds(saleIds).stream().collect(Collectors.toMap(cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO::getId, s -> s));
+ var shipmentMap = shipmentIds.isEmpty() ? Collections.<Long, cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesShipmentDO>emptyMap()
+ : shipmentMapper.selectBatchIds(shipmentIds).stream().collect(Collectors.toMap(cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesShipmentDO::getId, s -> s));
+ Map<Long, String> pickingByBag = new java.util.HashMap<>();
+ for (var detail : pickingDetails) {
+ var sale = saleMap.get(detail.getSalesId());
+ var shipment = detail.getShipmentId() == null ? null : shipmentMap.get(detail.getShipmentId());
+ if (sale == null) continue;
+ if (detail.getShipmentId() == null && Integer.valueOf(2).equals(sale.getStatus())) pickingByBag.putIfAbsent(detail.getBagCodeId(), "PICKED");
+ else if ((detail.getShipmentId() == null && (Integer.valueOf(10).equals(sale.getStatus()) || Integer.valueOf(3).equals(sale.getStatus())))
+ || (shipment != null && (Integer.valueOf(10).equals(shipment.getStatus()) || Integer.valueOf(20).equals(shipment.getStatus())))) pickingByBag.put(detail.getBagCodeId(), "RESERVED");
+ }
+ for (int i = 0; i < rows.size(); i++) {
+ var bag = page.getList().get(i);
+ var tx = bag.getLastTransactionId() == null ? null : transactions.get(bag.getLastTransactionId());
+ if (Integer.valueOf(2).equals(bag.getStatus()) && tx != null && Integer.valueOf(2).equals(tx.getType())) {
+ rows.get(i).setOutboundBizType(tx.getBizType());
+ }
+ if (Integer.valueOf(1).equals(bag.getStatus())) rows.get(i).setPickingStatus(pickingByBag.get(bag.getBagCodeId()));
+ }
+ return success(new PageResult<>(rows, page.getTotal()));
}
@PutMapping("/update-frozen")
@@ -187,6 +238,9 @@
// 1. 鑾峰緱鍏宠仈鏁版嵁
Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
convertSet(list, MesWmMaterialStockDO::getItemId));
+ Map<Long, MdmItemCategoryRespDTO> itemCategoryMap = mdmItemCategoryApi.getItemCategoryList(
+ convertSet(itemMap.values(), MdmItemRespDTO::getCategoryId)).getCheckedData().stream()
+ .collect(Collectors.toMap(MdmItemCategoryRespDTO::getId, c -> c));
Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureList(
convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId)).getCheckedData()
.stream().collect(Collectors.toMap(MdmUnitMeasureRespDTO::getId, e -> e));
@@ -196,9 +250,11 @@
convertSet(list, MesWmMaterialStockDO::getLocationId));
Map<Long, MesWmWarehouseAreaDO> areaMap = areaService.getWarehouseAreaMap(
convertSet(list, MesWmMaterialStockDO::getAreaId));
- Map<Long, Long> bagCountMap = materialStockBagMapper.selectListByMaterialStockIds(
- convertSet(list, MesWmMaterialStockDO::getId)).stream()
+ List<MesWmMaterialStockBagDO> bagHistory = materialStockBagMapper.selectHistoryByMaterialStockIds(
+ convertSet(list, MesWmMaterialStockDO::getId));
+ Map<Long, Long> bagCountMap = bagHistory.stream().filter(bag -> Integer.valueOf(1).equals(bag.getStatus()))
.collect(Collectors.groupingBy(MesWmMaterialStockBagDO::getMaterialStockId, Collectors.counting()));
+ var stockIdsWithBagHistory = convertSet(bagHistory, MesWmMaterialStockBagDO::getMaterialStockId);
Map<Long, SrmSupplierRespDTO> vendorMap = srmSupplierApi.getSupplierList(
convertSet(list, MesWmMaterialStockDO::getVendorId)).getCheckedData().stream()
.collect(Collectors.toMap(SrmSupplierRespDTO::getId, s -> s));
@@ -206,6 +262,8 @@
return BeanUtils.toBean(list, MesWmMaterialStockRespVO.class, vo -> {
MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification());
+ MapUtils.findAndThen(itemCategoryMap, item.getCategoryId(),
+ category -> vo.setItemTypeName(category.getName()));
MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName()));
});
@@ -218,7 +276,7 @@
MapUtils.findAndThen(vendorMap, vo.getVendorId(),
vendor -> vo.setVendorName(vendor.getName()));
vo.setBagCount(bagCountMap.getOrDefault(vo.getId(), 0L));
- vo.setBagDetailSupported(bagCountMap.containsKey(vo.getId()));
+ vo.setBagDetailSupported(stockIdsWithBagHistory.contains(vo.getId()));
// 璁$畻鍙敤閲� = 鍦ㄥ簱鏁伴噺 - 鍐荤粨鏁伴噺 - 鍗犵敤閲�
BigDecimal quantity = vo.getQuantity() != null ? vo.getQuantity() : BigDecimal.ZERO;
BigDecimal frozenQty = vo.getFrozenQuantity() != null ? vo.getFrozenQuantity() : BigDecimal.ZERO;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockAdjustReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockAdjustReqVO.java
index 612d289..f36370a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockAdjustReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockAdjustReqVO.java
@@ -27,12 +27,10 @@
@NotNull(message = "浠撳簱ID涓嶈兘涓虹┖")
private Long warehouseId;
- @Schema(description = "搴撳尯ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "搴撳尯ID涓嶈兘涓虹┖")
+ @Schema(description = "搴撳尯ID", example = "1")
private Long locationId;
- @Schema(description = "搴撲綅ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "搴撲綅ID涓嶈兘涓虹┖")
+ @Schema(description = "搴撲綅ID", example = "1")
private Long areaId;
// ========== 鎵规鐩稿叧瀛楁 ==========
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockBagPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockBagPageReqVO.java
index 7b6c868..01d00b8 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockBagPageReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockBagPageReqVO.java
@@ -15,4 +15,7 @@
@Schema(description = "琚嬬爜")
private String bagCode;
+
+ @Schema(description = "鍖呭惈宸插嚭搴撳拰宸叉姤搴熻鐮�")
+ private Boolean includeHistory;
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockBagRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockBagRespVO.java
index e1b8041..60dbb04 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockBagRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockBagRespVO.java
@@ -26,4 +26,8 @@
private Boolean frozen;
private LocalDateTime inboundTime;
private LocalDateTime outboundTime;
+ @Schema(description = "鏈�杩戜竴娆″嚭搴撶殑涓氬姟绫诲瀷锛涗粎鍦ㄨ鐮佸凡鍑哄簱涓斿瓨鍦ㄥ叧鑱旀祦姘存椂杩斿洖")
+ private Integer outboundBizType;
+ @Schema(description = "閿�鍞嫞璐х姸鎬侊細PICKED宸叉嫞閫夈�丷ESERVED宸插崰鐢�")
+ private String pickingStatus;
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockPageReqVO.java
index c4b9862..8dc2db5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockPageReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockPageReqVO.java
@@ -57,4 +57,7 @@
@Schema(description = "鏄惁鍐荤粨", example = "false")
private Boolean frozen;
+ @Schema(description = "鍖呭惈闆舵暟閲忓簱瀛樿褰曪紝鐢ㄤ簬鏌ヨ鍘嗗彶")
+ private Boolean includeZero;
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockRespVO.java
index c3d901e..b15bc66 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockRespVO.java
@@ -35,6 +35,10 @@
@ExcelProperty("瑙勬牸鍨嬪彿")
private String specification;
+ @Schema(description = "鐗╂枡绫诲埆鍚嶇О", example = "浜旈噾閰嶄欢")
+ @ExcelProperty("绫诲埆")
+ private String itemTypeName;
+
@Schema(description = "璁¢噺鍗曚綅鍚嶇О", example = "鍗冨厠")
@ExcelProperty("璁¢噺鍗曚綅")
private String unitMeasureName;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/line/MesWmMiscIssueLineSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/line/MesWmMiscIssueLineSaveReqVO.java
index d005005..8063cc1 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/line/MesWmMiscIssueLineSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/line/MesWmMiscIssueLineSaveReqVO.java
@@ -43,12 +43,10 @@
@NotNull(message = "浠撳簱涓嶈兘涓虹┖")
private Long warehouseId;
- @Schema(description = "搴撳尯缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "搴撳尯涓嶈兘涓虹┖")
+ @Schema(description = "搴撳尯缂栧彿", example = "1")
private Long locationId;
- @Schema(description = "搴撲綅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "搴撲綅涓嶈兘涓虹┖")
+ @Schema(description = "搴撲綅缂栧彿", example = "1")
private Long areaId;
@Schema(description = "澶囨敞", example = "澶囨敞")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/line/MesWmMiscReceiptLineSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/line/MesWmMiscReceiptLineSaveReqVO.java
index 5eaf187..cba5c92 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/line/MesWmMiscReceiptLineSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/line/MesWmMiscReceiptLineSaveReqVO.java
@@ -34,12 +34,10 @@
@NotNull(message = "浠撳簱涓嶈兘涓虹┖")
private Long warehouseId;
- @Schema(description = "搴撳尯缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "搴撳尯涓嶈兘涓虹┖")
+ @Schema(description = "搴撳尯缂栧彿", example = "1")
private Long locationId;
- @Schema(description = "搴撲綅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "搴撲綅涓嶈兘涓虹┖")
+ @Schema(description = "搴撲綅缂栧彿", example = "1")
private Long areaId;
@Schema(description = "澶囨敞", example = "澶囨敞")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java
index 016e3c3..0ef05e3 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java
@@ -44,6 +44,7 @@
@RequestMapping("/mes/wm/product-sales")
@Validated
public class MesWmProductSalesController {
+ @Resource private cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesShipmentMapper shipmentMapper;
@Resource
private MesWmProductSalesService productSalesService;
@@ -128,6 +129,13 @@
return success(productSalesService.checkProductSalesQuantity(id));
}
+ @GetMapping("/shipments")
+ @Operation(summary = "鏌ヨ鍑哄簱鍗曞彂璐ц褰�")
+ @PreAuthorize("@ss.hasPermission('mes:wm-product-sales:query')")
+ public CommonResult<List<cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesShipmentDO>> getShipments(@RequestParam("id") Long id) {
+ return success(productSalesService.getShipments(id));
+ }
+
@PostMapping("/scan")
@Operation(summary = "鎵爜鎷h揣")
@PreAuthorize("@ss.hasPermission('mes:wm-product-sales:stock')")
@@ -179,6 +187,22 @@
return success(true);
}
+ @PutMapping("/close-remaining")
+ @Operation(summary = "鍏抽棴閮ㄥ垎鍙戣揣鍗曠殑鍓╀綑鏁伴噺")
+ @PreAuthorize("@ss.hasPermission('mes:wm-product-sales:cancel')")
+ public CommonResult<Boolean> closeRemaining(@RequestParam("id") Long id, @RequestParam("reason") String reason) {
+ productSalesService.closeRemaining(id, reason);
+ return success(true);
+ }
+
+ @PutMapping("/cancel-shipment")
+ @Operation(summary = "鍙栨秷鏈鏈嚭搴撳彂璐у苟閲婃斁鍗犵敤")
+ @PreAuthorize("@ss.hasPermission('mes:wm-product-sales:cancel')")
+ public CommonResult<Boolean> cancelShipment(@RequestParam("id") Long id) {
+ productSalesService.cancelShipment(id);
+ return success(true);
+ }
+
// ==================== 鎷兼帴 VO ====================
private List<MesWmProductSalesRespVO> buildRespVOList(List<MesWmProductSalesDO> list) {
@@ -192,8 +216,12 @@
convertSet(list, MesWmProductSalesDO::getNoticeId));
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
convertSet(list, MesWmProductSalesDO::getOutboundUserId));
+ var partiallyShippedIds = convertSet(shipmentMapper.selectCompletedBySalesIds(convertSet(list, MesWmProductSalesDO::getId)),
+ cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesShipmentDO::getSalesId);
// 2. 鏋勫缓缁撴灉
return BeanUtils.toBean(list, MesWmProductSalesRespVO.class, vo -> {
+ vo.setPartiallyShipped(partiallyShippedIds.contains(vo.getId()) && (Integer.valueOf(2).equals(vo.getStatus())
+ || Integer.valueOf(10).equals(vo.getStatus()) || Integer.valueOf(3).equals(vo.getStatus())));
MapUtils.findAndThen(customerMap, vo.getClientId(), customer ->
vo.setClientName(customer.getName()));
if (vo.getClientName() == null) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesDetailController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesDetailController.java
index 6e79bf3..6db93ca 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesDetailController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesDetailController.java
@@ -63,6 +63,15 @@
return success(productSalesDetailService.createProductSalesDetail(createReqVO));
}
+ @PostMapping("/create-mobile-manual")
+ @Operation(summary = "绉诲姩绔寜鏁伴噺鎷i�夋棤琚嬬爜鍘嗗彶搴撳瓨")
+ @PreAuthorize("@ss.hasPermission('mes:wm-product-sales:stock')")
+ public CommonResult<Long> createMobileManual(@Valid @RequestBody MesWmProductSalesDetailSaveReqVO reqVO) {
+ if (reqVO.getRemark() == null || !reqVO.getRemark().matches("绉诲姩绔棤琚嬬爜鎷h揣 #[a-f0-9-]{36}"))
+ throw new IllegalArgumentException("缂哄皯鏈夋晥鐨勬嫞璐ц姹傛爣璇�");
+ return success(productSalesDetailService.createProductSalesDetail(reqVO));
+ }
+
@PutMapping("/update")
@Operation(summary = "淇敼閿�鍞嚭搴撴槑缁�")
@PreAuthorize("@ss.hasPermission('mes:wm-product-sales:update')")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesLineController.java
index 336da58..5967c5b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesLineController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesLineController.java
@@ -40,6 +40,7 @@
@RequestMapping("/mes/wm/product-sales-line")
@Validated
public class MesWmProductSalesLineController {
+ @Resource private cn.iocoder.yudao.module.mes.dal.mysql.wm.transaction.MesWmTransactionMapper transactionMapper;
@Resource
private MesWmProductSalesLineService productSalesLineService;
@@ -108,6 +109,9 @@
.stream().collect(Collectors.toMap(MdmUnitMeasureRespDTO::getId, e -> e));
// 2. 鏋勫缓缁撴灉
return BeanUtils.toBean(list, MesWmProductSalesLineRespVO.class, vo -> {
+ var shipped = transactionMapper.sumSalesOutboundByLineId(vo.getId());
+ vo.setShippedQuantity(shipped == null ? java.math.BigDecimal.ZERO : shipped);
+ vo.setRemainingQuantity((vo.getQuantity() == null ? java.math.BigDecimal.ZERO : vo.getQuantity()).subtract(vo.getShippedQuantity()).max(java.math.BigDecimal.ZERO));
MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification());
MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesRespVO.java
index 885e7fd..9904ae3 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesRespVO.java
@@ -76,6 +76,9 @@
@Schema(description = "鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
@ExcelProperty("鐘舵��")
private Integer status;
+ private String closeReason;
+ @Schema(description = "鏄惁宸查儴鍒嗗彂璐т笖浠嶆湁鍚庣画澶勭悊")
+ private Boolean partiallyShipped;
@Schema(description = "澶囨敞", example = "澶囨敞")
@ExcelProperty("澶囨敞")
@@ -85,4 +88,4 @@
@ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
-}
\ No newline at end of file
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesScanReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesScanReqVO.java
index a654097..fb66b4e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesScanReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesScanReqVO.java
@@ -29,4 +29,13 @@
@Schema(description = "鏈鏄庣‘閫変腑鐨勮鐮� ID锛涙墭鐩樺拰鎵规蹇呴』閫夋嫨")
private List<@NotNull Long> bagIds;
+ @Schema(description = "鎵嬪伐閫夋嫨鏃舵寚瀹氬嚭搴撳崟琛�")
+ private Long lineId;
+
+ @Schema(description = "鎵嬪伐閫夋嫨鏃舵寚瀹氬簱瀛樿褰�")
+ private Long materialStockId;
+
+ @Schema(description = "鏄惁涓烘墜宸ラ�夋嫨琚嬬爜")
+ private Boolean manual;
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesScanRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesScanRespVO.java
index 2ca22b9..079ec44 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesScanRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesScanRespVO.java
@@ -82,6 +82,7 @@
private String code;
private String businessCode;
private Long palletId;
+ private Long materialStockId;
private Boolean selectable;
private String unavailableReason;
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/detail/MesWmProductSalesDetailRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/detail/MesWmProductSalesDetailRespVO.java
index 124e387..75121d4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/detail/MesWmProductSalesDetailRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/detail/MesWmProductSalesDetailRespVO.java
@@ -19,6 +19,9 @@
@Schema(description = "鍑哄簱鍗旾D", example = "1")
private Long salesId;
+ @Schema(description = "鍙戣揣璁板綍ID锛涗负绌鸿〃绀烘湰娆″緟鎷f垨鍘嗗彶鏄庣粏")
+ private Long shipmentId;
+
@Schema(description = "鐗╂枡ID", example = "1")
private Long itemId;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineRespVO.java
index 67e244b..c799b5a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineRespVO.java
@@ -36,6 +36,10 @@
@Schema(description = "鍑哄簱鏁伴噺", example = "100")
private BigDecimal quantity;
+ @Schema(description = "瀹為檯宸插嚭搴撴暟閲�")
+ private BigDecimal shippedQuantity;
+ @Schema(description = "鍓╀綑鏈嚭搴撴暟閲�")
+ private BigDecimal remainingQuantity;
@Schema(description = "鎵规ID", example = "1")
private Long batchId;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/detail/MesWmReturnIssueDetailSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/detail/MesWmReturnIssueDetailSaveReqVO.java
index e5ff434..d45d387 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/detail/MesWmReturnIssueDetailSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/detail/MesWmReturnIssueDetailSaveReqVO.java
@@ -44,12 +44,10 @@
@NotNull(message = "浠撳簱缂栧彿涓嶈兘涓虹┖")
private Long warehouseId;
- @Schema(description = "搴撳尯缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "搴撳尯缂栧彿涓嶈兘涓虹┖")
+ @Schema(description = "搴撳尯缂栧彿", example = "1")
private Long locationId;
- @Schema(description = "搴撲綅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "搴撲綅缂栧彿涓嶈兘涓虹┖")
+ @Schema(description = "搴撲綅缂栧彿", example = "1")
private Long areaId;
@Schema(description = "澶囨敞", example = "澶囨敞")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/detail/MesWmReturnSalesDetailSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/detail/MesWmReturnSalesDetailSaveReqVO.java
index 2df2281..7dad10e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/detail/MesWmReturnSalesDetailSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/detail/MesWmReturnSalesDetailSaveReqVO.java
@@ -46,12 +46,10 @@
@NotNull(message = "浠撳簱ID涓嶈兘涓虹┖")
private Long warehouseId;
- @Schema(description = "搴撳尯ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "搴撳尯ID涓嶈兘涓虹┖")
+ @Schema(description = "搴撳尯ID", example = "1")
private Long locationId;
- @Schema(description = "搴撲綅ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "搴撲綅ID涓嶈兘涓虹┖")
+ @Schema(description = "搴撲綅ID", example = "1")
private Long areaId;
@Schema(description = "澶囨敞", example = "澶囨敞")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/result/MesWmStockTakingTaskResultSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/result/MesWmStockTakingTaskResultSaveReqVO.java
index 9835883..16cb32b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/result/MesWmStockTakingTaskResultSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/result/MesWmStockTakingTaskResultSaveReqVO.java
@@ -37,12 +37,10 @@
@NotNull(message = "浠撳簱 ID 涓嶈兘涓虹┖")
private Long warehouseId;
- @Schema(description = "搴撳尯 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "搴撳尯 ID 涓嶈兘涓虹┖")
+ @Schema(description = "搴撳尯 ID", example = "1")
private Long locationId;
- @Schema(description = "搴撲綅 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "搴撲綅 ID 涓嶈兘涓虹┖")
+ @Schema(description = "搴撲綅 ID", example = "1")
private Long areaId;
@Schema(description = "鐩樼偣鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.000000")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java
index 4f90f4f..8f9469e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java
@@ -1,22 +1,35 @@
package cn.iocoder.yudao.module.mes.controller.admin.wm.transaction;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.transaction.vo.MesWmTransactionPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.transaction.vo.MesWmTransactionRespVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemTypeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.transaction.MesWmTransactionDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.bagcode.MesProBagCodeDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.pallet.MesProPalletDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDetailDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.md.item.MesMdItemMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.bagcode.MesProBagCodeMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.pallet.MesProPalletMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesDetailMapper;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemTypeService;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
+import cn.iocoder.yudao.module.mdm.api.category.MdmItemCategoryApi;
+import cn.iocoder.yudao.module.mdm.api.category.dto.MdmItemCategoryRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -28,6 +41,7 @@
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -47,11 +61,18 @@
@Resource
private MesMdmItemService mdmItemService;
@Resource
+ private MdmItemCategoryApi mdmItemCategoryApi;
+ @Resource
private MesWmWarehouseService warehouseService;
@Resource
private MesWmWarehouseLocationService locationService;
@Resource
private MesWmWarehouseAreaService areaService;
+ @Resource private MesProBagCodeMapper bagCodeMapper;
+ @Resource private MesProPalletMapper palletMapper;
+ @Resource private MesWmProductSalesDetailMapper salesDetailMapper;
+ @Resource private MesMdItemMapper mesMdItemMapper;
+ @Resource private MesMdItemTypeService mesMdItemTypeService;
@GetMapping("/page")
@Operation(summary = "鑾峰彇搴撳瓨浜嬪姟娴佹按鍒嗛〉")
@@ -66,6 +87,19 @@
// 鍏宠仈鏌ヨ鐗╂枡淇℃伅
Map<Long, MesMdmItemDO> itemMap = mdmItemService.getItemMap(
convertSet(pageResult.getList(), MesWmTransactionDO::getItemId));
+ // 鍏宠仈鏌ヨ鐗╂枡绫诲埆淇℃伅
+ Map<Long, MdmItemCategoryRespDTO> itemCategoryMap = mdmItemCategoryApi.getItemCategoryList(
+ convertSet(itemMap.values(), MesMdmItemDO::getCategoryId)).getCheckedData().stream()
+ .collect(Collectors.toMap(MdmItemCategoryRespDTO::getId, c -> c));
+ // 鍏宠仈鏌ヨ MES 鐗╂枡锛堝搧绉嶅悓姝ョ敓鎴愶級锛屽搧绉嶆湭缁存姢瑙勬牸/鍒嗙被鏃跺洖閫�浣跨敤
+ Set<Long> mdmItemIds = convertSet(itemMap.values(), MesMdmItemDO::getId);
+ Map<Long, MesMdItemDO> mesItemMap = mdmItemIds.isEmpty() ? Map.of()
+ : mesMdItemMapper.selectList(MesMdItemDO::getMdmItemId, mdmItemIds).stream()
+ .collect(Collectors.toMap(MesMdItemDO::getMdmItemId, i -> i, (a, b) -> a));
+ Set<Long> mesItemTypeIds = convertSet(mesItemMap.values(), MesMdItemDO::getItemTypeId);
+ mesItemTypeIds.remove(null);
+ Map<Long, MesMdItemTypeDO> mesItemTypeMap = mesItemTypeIds.isEmpty() ? Map.of()
+ : mesMdItemTypeService.getItemTypeMap(mesItemTypeIds);
// 鍏宠仈鏌ヨ浠撳簱淇℃伅
Map<Long, MesWmWarehouseDO> warehouseMap = warehouseService.getWarehouseMap(
convertSet(pageResult.getList(), MesWmTransactionDO::getWarehouseId));
@@ -76,9 +110,34 @@
Map<Long, MesWmWarehouseAreaDO> areaMap = areaService.getWarehouseAreaMap(
convertSet(pageResult.getList(), MesWmTransactionDO::getAreaId));
+ var bagIds = convertSet(pageResult.getList(), MesWmTransactionDO::getBagCodeId);
+ bagIds.remove(null);
+ Map<Long, MesProBagCodeDO> bagMap = bagIds.isEmpty() ? Map.of() : bagCodeMapper.selectBatchIds(bagIds)
+ .stream().collect(Collectors.toMap(MesProBagCodeDO::getId, b -> b));
+ var salesIds = pageResult.getList().stream().filter(t -> Integer.valueOf(MesBizTypeConstants.WM_PRODUCT_SALES).equals(t.getBizType()))
+ .map(MesWmTransactionDO::getBizId).filter(java.util.Objects::nonNull).collect(Collectors.toSet());
+ var details = salesDetailMapper.selectBySalesIdsAndBagIds(salesIds, bagIds);
+ var palletIds = convertSet(details, MesWmProductSalesDetailDO::getPalletCodeId);
+ palletIds.remove(null);
+ Map<Long, MesProPalletDO> pallets = palletIds.isEmpty() ? Map.of() : palletMapper.selectBatchIds(palletIds)
+ .stream().collect(Collectors.toMap(MesProPalletDO::getId, p -> p));
+ Map<String, MesWmProductSalesDetailDO> detailMap = details.stream().collect(Collectors.toMap(
+ d -> d.getSalesId() + ":" + d.getBagCodeId() + ":" + d.getShipmentId(), d -> d, (a, b) -> a));
+
// 杞崲涓� VO
List<MesWmTransactionRespVO> voList = pageResult.getList().stream().map(transaction -> {
MesWmTransactionRespVO vo = BeanUtils.toBean(transaction, MesWmTransactionRespVO.class);
+ MesProBagCodeDO bag = transaction.getBagCodeId() == null ? null : bagMap.get(transaction.getBagCodeId());
+ if ((vo.getBagCode() == null || vo.getBagCode().isBlank()) && bag != null) vo.setBagCode(bag.getCode());
+ if (Integer.valueOf(MesBizTypeConstants.WM_PRODUCT_SALES).equals(transaction.getBizType())) {
+ MesWmProductSalesDetailDO detail = detailMap.get(transaction.getBizId() + ":" + transaction.getBagCodeId() + ":" + transaction.getShipmentId());
+ MesProPalletDO pallet = detail == null || detail.getPalletCodeId() == null ? null : pallets.get(detail.getPalletCodeId());
+ if (pallet != null) vo.setPalletCode(pallet.getCode());
+ }
+ // 璐ㄦ銆佺敓浜у叆搴撶瓑娴佹按娌℃湁閿�鍞槑缁嗭紝鎵樼洏鐮佸洖閫�鍙栬鐮佸綋鍓嶇粦瀹氱殑鎵樼洏
+ if (StrUtil.isBlank(vo.getPalletCode()) && bag != null) {
+ vo.setPalletCode(bag.getPalletCode());
+ }
// 浜嬪姟绫诲瀷鍚嶇О
MesWmTransactionTypeEnum typeEnum = MesWmTransactionTypeEnum.valueOf(transaction.getType());
vo.setTypeName(typeEnum != null ? typeEnum.getName() : "鏈煡");
@@ -87,8 +146,22 @@
// 鐗╂枡淇℃伅
MesMdmItemDO item = itemMap.get(transaction.getItemId());
if (item != null) {
+ MesMdItemDO mesItem = mesItemMap.get(item.getId());
vo.setItemCode(item.getCode());
vo.setItemName(item.getName());
+ // 瑙勬牸锛氬搧绉嶇鐞嗘湭缁存姢鏃讹紝鍥為��鍙� MES 鐗╂枡瑙勬牸鍨嬪彿
+ vo.setSpecification(StrUtil.blankToDefault(item.getSpecification(),
+ mesItem != null ? mesItem.getSpecification() : null));
+ // 绫诲埆锛氫紭鍏堝搧绉嶅垎绫伙紝鍏舵 MES 鐗╂枡鍒嗙被
+ MdmItemCategoryRespDTO category = itemCategoryMap.get(item.getCategoryId());
+ String itemTypeName = category != null ? category.getName() : null;
+ if (StrUtil.isBlank(itemTypeName) && mesItem != null && mesItem.getItemTypeId() != null) {
+ MesMdItemTypeDO itemType = mesItemTypeMap.get(mesItem.getItemTypeId());
+ if (itemType != null) {
+ itemTypeName = itemType.getName();
+ }
+ }
+ vo.setItemTypeName(itemTypeName);
}
// 浠撳簱淇℃伅
MesWmWarehouseDO warehouse = warehouseMap.get(transaction.getWarehouseId());
@@ -164,4 +237,4 @@
}
}
-}
\ No newline at end of file
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/vo/MesWmTransactionPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/vo/MesWmTransactionPageReqVO.java
index 20b4b0f..4b936fd 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/vo/MesWmTransactionPageReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/vo/MesWmTransactionPageReqVO.java
@@ -26,8 +26,12 @@
@Schema(description = "鎵规鍙�", example = "BATCH001")
private String batchCode;
+ @Schema(description = "绮剧‘鎵规鍙�")
+ private String batchCodeExact;
+
@Schema(description = "琚嬬爜", example = "BG202608180001")
private String bagCode;
+ private Long shipmentId;
@Schema(description = "浠撳簱ID", example = "1")
private Long warehouseId;
@@ -47,6 +51,9 @@
@Schema(description = "涓氬姟鍗曞彿", example = "STOCK_ADJUST_1")
private String bizCode;
+ @Schema(description = "绮剧‘涓氬姟鍗曞彿")
+ private String bizCodeExact;
+
@Schema(description = "搴撳瓨璁板綍ID", example = "1")
private Long materialStockId;
@@ -58,4 +65,4 @@
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime endTime;
-}
\ No newline at end of file
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/vo/MesWmTransactionRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/vo/MesWmTransactionRespVO.java
index 3ec6568..cbcc426 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/vo/MesWmTransactionRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/vo/MesWmTransactionRespVO.java
@@ -42,6 +42,12 @@
@Schema(description = "鐗╂枡鍚嶇О", example = "铻轰笣")
private String itemName;
+ @Schema(description = "瑙勬牸鍨嬪彿", example = "10mm*100mm")
+ private String specification;
+
+ @Schema(description = "鐗╂枡绫诲埆鍚嶇О", example = "浜旈噾閰嶄欢")
+ private String itemTypeName;
+
@Schema(description = "鍙樺姩鏁伴噺锛堟鏁�=鍏ュ簱锛岃礋鏁�=鍑哄簱锛�", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
private BigDecimal quantity;
@@ -57,6 +63,10 @@
@Schema(description = "琚嬬爜", example = "BG202608180001")
private String bagCode;
+ @Schema(description = "閿�鍞嚭搴撴槑缁嗚褰曠殑鎵樼洏鐮�")
+ private String palletCode;
+ private Long shipmentId;
+
// ========== 搴撳瓨浣嶇疆 ==========
@Schema(description = "浠撳簱ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/MesWmWarehouseAreaController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/MesWmWarehouseAreaController.java
deleted file mode 100644
index 024a59b..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/MesWmWarehouseAreaController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.area.MesWmWarehouseAreaPageReqVO;
-import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.area.MesWmWarehouseAreaRespVO;
-import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.area.MesWmWarehouseAreaSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
-import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
-import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
-import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
-
-@Tag(name = "绠$悊鍚庡彴 - MES 搴撲綅")
-@RestController
-@RequestMapping("/mes/wm/warehouse-area")
-@Validated
-public class MesWmWarehouseAreaController {
-
- @Resource
- private MesWmWarehouseAreaService areaService;
- @Resource
- private MesWmWarehouseLocationService locationService;
- @Resource
- private MesWmWarehouseService warehouseService;
-
- @PostMapping("/create")
- @Operation(summary = "鍒涘缓搴撲綅")
- @PreAuthorize("@ss.hasPermission('mes:wm-warehouse:create')")
- public CommonResult<Long> createWarehouseArea(@Valid @RequestBody MesWmWarehouseAreaSaveReqVO createReqVO) {
- return success(areaService.createWarehouseArea(createReqVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "鏇存柊搴撲綅")
- @PreAuthorize("@ss.hasPermission('mes:wm-warehouse:update')")
- public CommonResult<Boolean> updateWarehouseArea(@Valid @RequestBody MesWmWarehouseAreaSaveReqVO updateReqVO) {
- areaService.updateWarehouseArea(updateReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "鍒犻櫎搴撲綅")
- @Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('mes:wm-warehouse:delete')")
- public CommonResult<Boolean> deleteWarehouseArea(@RequestParam("id") Long id) {
- areaService.deleteWarehouseArea(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "鑾峰緱搴撲綅")
- @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-warehouse:query')")
- public CommonResult<MesWmWarehouseAreaRespVO> getWarehouseArea(@RequestParam("id") Long id) {
- MesWmWarehouseAreaDO area = areaService.getWarehouseArea(id);
- if (area == null) {
- return success(null);
- }
- return success(buildWarehouseAreaRespVOList(Collections.singletonList(area)).get(0));
- }
-
- @GetMapping("/page")
- @Operation(summary = "鑾峰緱搴撲綅鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:wm-warehouse:query')")
- public CommonResult<PageResult<MesWmWarehouseAreaRespVO>> getWarehouseAreaPage(@Valid MesWmWarehouseAreaPageReqVO pageReqVO) {
- PageResult<MesWmWarehouseAreaDO> pageResult = areaService.getWarehouseAreaPage(pageReqVO);
- return success(new PageResult<>(buildWarehouseAreaRespVOList(pageResult.getList()), pageResult.getTotal()));
- }
-
- @GetMapping("/simple-list")
- @Operation(summary = "鑾峰緱搴撲綅绮剧畝鍒楄〃", description = "鍙寜搴撳尯杩囨护")
- public CommonResult<List<MesWmWarehouseAreaRespVO>> getWarehouseAreaSimpleList(
- @Parameter(name = "locationId", description = "搴撳尯缂栧彿") @RequestParam(value = "locationId", required = false) Long locationId) {
- List<MesWmWarehouseAreaDO> list = areaService.getWarehouseAreaList(locationId);
- return success(buildWarehouseAreaRespVOList(list));
- }
-
- // ==================== 鎷兼帴 VO ====================
-
- /**
- * 鎵归噺鏋勫缓搴撲綅鍝嶅簲 VO 鍒楄〃锛堝~鍏呭簱鍖恒�佷粨搴撲俊鎭級
- *
- * @param list 搴撲綅鍒楄〃
- * @return 鍝嶅簲 VO 鍒楄〃
- */
- private List<MesWmWarehouseAreaRespVO> buildWarehouseAreaRespVOList(List<MesWmWarehouseAreaDO> list) {
- if (CollUtil.isEmpty(list)) {
- return Collections.emptyList();
- }
- // 1. 鑾峰緱搴撳尯淇℃伅
- Map<Long, MesWmWarehouseLocationDO> locationMap = locationService.getWarehouseLocationMap(
- convertSet(list, MesWmWarehouseAreaDO::getLocationId));
- Map<Long, MesWmWarehouseDO> warehouseMap = warehouseService.getWarehouseMap(
- convertSet(locationMap.values(), MesWmWarehouseLocationDO::getWarehouseId));
- // 2. 鏋勫缓缁撴灉
- return BeanUtils.toBean(list, MesWmWarehouseAreaRespVO.class, vo -> {
- MapUtils.findAndThen(locationMap, vo.getLocationId(), location -> {
- vo.setLocationName(location.getName());
- vo.setWarehouseId(location.getWarehouseId());
- MapUtils.findAndThen(warehouseMap, location.getWarehouseId(), warehouse -> vo.setWarehouseName(warehouse.getName()));
- });
- });
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/MesWmWarehouseLocationController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/MesWmWarehouseLocationController.java
deleted file mode 100644
index 2668cbf..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/MesWmWarehouseLocationController.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.location.MesWmWarehouseLocationPageReqVO;
-import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.location.MesWmWarehouseLocationRespVO;
-import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.location.MesWmWarehouseLocationSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
-import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
-import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
-import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
-
-@Tag(name = "绠$悊鍚庡彴 - MES 搴撳尯")
-@RestController
-@RequestMapping("/mes/wm/warehouse-location")
-@Validated
-public class MesWmWarehouseLocationController {
-
- @Resource
- private MesWmWarehouseLocationService locationService;
- @Resource
- private MesWmWarehouseService warehouseService;
- @Resource
- private MesWmWarehouseAreaService areaService;
-
- @PostMapping("/create")
- @Operation(summary = "鍒涘缓搴撳尯")
- @PreAuthorize("@ss.hasPermission('mes:wm-warehouse:create')")
- public CommonResult<Long> createWarehouseLocation(@Valid @RequestBody MesWmWarehouseLocationSaveReqVO createReqVO) {
- return success(locationService.createWarehouseLocation(createReqVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "鏇存柊搴撳尯")
- @PreAuthorize("@ss.hasPermission('mes:wm-warehouse:update')")
- public CommonResult<Boolean> updateWarehouseLocation(@Valid @RequestBody MesWmWarehouseLocationSaveReqVO updateReqVO) {
- locationService.updateWarehouseLocation(updateReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "鍒犻櫎搴撳尯")
- @Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('mes:wm-warehouse:delete')")
- public CommonResult<Boolean> deleteWarehouseLocation(@RequestParam("id") Long id) {
- locationService.deleteWarehouseLocation(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "鑾峰緱搴撳尯")
- @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-warehouse:query')")
- public CommonResult<MesWmWarehouseLocationRespVO> getWarehouseLocation(@RequestParam("id") Long id) {
- MesWmWarehouseLocationDO location = locationService.getWarehouseLocation(id);
- if (location == null) {
- return success(null);
- }
- return success(buildWarehouseLocationRespVOList(Collections.singletonList(location)).get(0));
- }
-
- @GetMapping("/page")
- @Operation(summary = "鑾峰緱搴撳尯鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:wm-warehouse:query')")
- public CommonResult<PageResult<MesWmWarehouseLocationRespVO>> getWarehouseLocationPage(@Valid MesWmWarehouseLocationPageReqVO pageReqVO) {
- PageResult<MesWmWarehouseLocationDO> pageResult = locationService.getWarehouseLocationPage(pageReqVO);
- return success(new PageResult<>(buildWarehouseLocationRespVOList(pageResult.getList()), pageResult.getTotal()));
- }
-
- @GetMapping("/simple-list")
- @Operation(summary = "鑾峰緱搴撳尯绮剧畝鍒楄〃", description = "鍙寜浠撳簱杩囨护")
- public CommonResult<List<MesWmWarehouseLocationRespVO>> getWarehouseLocationSimpleList(
- @Parameter(name = "warehouseId", description = "浠撳簱缂栧彿") @RequestParam(value = "warehouseId", required = false) Long warehouseId) {
- List<MesWmWarehouseLocationDO> list = locationService.getWarehouseLocationList(warehouseId);
- return success(buildWarehouseLocationRespVOList(list));
- }
-
- @PutMapping("/update-by-location-id")
- @Operation(summary = "鎵归噺璁剧疆搴撳尯涓嬫墍鏈夊簱浣嶇殑娣锋斁瑙勫垯")
- @PreAuthorize("@ss.hasPermission('mes:wm-warehouse:update')")
- public CommonResult<Boolean> updateAreaByLocationId(
- @RequestParam("locationId") Long locationId,
- @RequestParam(value = "allowItemMixing", required = false) Boolean allowItemMixing,
- @RequestParam(value = "allowBatchMixing", required = false) Boolean allowBatchMixing) {
- areaService.updateByLocationId(locationId, allowItemMixing, allowBatchMixing);
- return success(true);
- }
-
- // ==================== 鎷兼帴 VO ====================
-
- /**
- * 鎵归噺鏋勫缓搴撳尯鍝嶅簲 VO 鍒楄〃锛堝~鍏呬粨搴撳悕绉帮級
- *
- * @param list 搴撳尯鍒楄〃
- * @return 鍝嶅簲 VO 鍒楄〃
- */
- private List<MesWmWarehouseLocationRespVO> buildWarehouseLocationRespVOList(List<MesWmWarehouseLocationDO> list) {
- if (CollUtil.isEmpty(list)) {
- return Collections.emptyList();
- }
- // 1. 鑾峰緱浠撳簱淇℃伅
- Map<Long, MesWmWarehouseDO> warehouseMap = warehouseService.getWarehouseMap(convertSet(list, MesWmWarehouseLocationDO::getWarehouseId));
- // 2. 鏋勫缓缁撴灉
- return BeanUtils.toBean(list, MesWmWarehouseLocationRespVO.class, vo ->
- MapUtils.findAndThen(warehouseMap, vo.getWarehouseId(), warehouse -> vo.setWarehouseName(warehouse.getName())));
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/batch/MesProBatchDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/batch/MesProBatchDO.java
index 86ac208..8bb6e2f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/batch/MesProBatchDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/batch/MesProBatchDO.java
@@ -16,7 +16,7 @@
* <p>
* 鎵规鐢熶骇绠$悊锛堜竴琚嬩竴鐮佹ā鍧楋級锛氬叧鑱斾骇绾匡紙浜х嚎缁存姢锛変笌鐢熶骇浜哄憳锛堜汉鍛橀厤缃 {@link MesProBatchWorkerDO}锛夛紝璐d换钀藉疄鍒颁汉銆�
* 鍝佺宸蹭笅娌夊埌琚嬬爜鏁版嵁鍖咃紙璧嬬爜绠$悊锛夛紝鎵规涓嶅啀缁戝畾鍝佺銆�
- * 鎵规鍙疯嚜鍔ㄧ敓鎴愶紝缂栫爜瑙勫垯鍖呭惈鏃ユ湡銆佷骇绾跨紪鐮併�佹祦姘村彿绛夎绱狅紝骞朵笌琚嬬爜锛堜竴琚嬩竴鐮侊級銆佹墭鐩樼爜鑷姩鍏宠仈銆�
+ * 鎵规鍙锋敮鎸佷汉宸ヨ緭鍏ユ垨绯荤粺鐢熸垚锛屾牸寮忎负銆�4 浣嶅勾浠� + 3 浣嶆祦姘淬�嶏紙濡� 2026001锛夛紝骞朵笌琚嬬爜锛堜竴琚嬩竴鐮侊級銆佹墭鐩樼爜鑷姩鍏宠仈銆�
*
* @author 瓒呯骇绠$悊鍛�
*/
@@ -36,7 +36,7 @@
@TableId
private Long id;
/**
- * 鎵规鍙凤紙鑷姩鐢熸垚锛氬墠缂� + 鏃ユ湡 + 浜х嚎缂栫爜 + 娴佹按鍙凤紱琛ュ綍涓氬姟淇℃伅鍚庣敓鎴愶級
+ * 鎵规鍙凤紙浜哄伐杈撳叆鎴栫郴缁熺敓鎴愶細4 浣嶅勾浠� + 3 浣嶆祦姘达紝濡� 2026001锛涜ˉ褰曚笟鍔′俊鎭悗鐢熸垚锛�
*/
private String code;
/** 鍐呴儴鍑哄叆搴撲笟鍔$爜锛屼繚鎸佺ǔ瀹氾紝涓嶉殢姝e紡鐮佽ˉ褰曟垨缁戝畾鍙樺寲銆� */
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/scan/MesProScanEventDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/scan/MesProScanEventDO.java
index 6bf1274..1ddc460 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/scan/MesProScanEventDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/scan/MesProScanEventDO.java
@@ -2,6 +2,7 @@
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
@@ -25,6 +26,16 @@
private Long bagCodeId;
private Long batchId;
private String batchCode;
+ /**
+ * 鎵樼洏缂栧彿锛堥潪鎸佷箙鍖栵紝鎸夎鐮�/鎵樼洏鐮佹壂鐮佷簨浠跺疄鏃跺弽鏌ワ紝鍘嗗彶浜嬩欢鍚屾牱鍙睍绀猴級
+ */
+ @TableField(exist = false)
+ private Long palletId;
+ /**
+ * 鎵樼洏鐮侊紙闈炴寔涔呭寲锛屾潵婧愬悓涓婏級
+ */
+ @TableField(exist = false)
+ private String palletCode;
private Long itemId;
private BigDecimal quantity;
private String deviceCode;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/seedquality/MesQcSeedIndicatorRangeDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/seedquality/MesQcSeedIndicatorRangeDO.java
index d294b49..4a10986 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/seedquality/MesQcSeedIndicatorRangeDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/seedquality/MesQcSeedIndicatorRangeDO.java
@@ -9,12 +9,25 @@
import java.math.BigDecimal;
+/**
+ * 绉嶅瓙璐ㄦ椤瑰悎鏍艰寖鍥撮厤缃�
+ *
+ * itemId 涓虹┖琛ㄧず閫氱敤榛樿椤癸紱浜у搧閰嶇疆浼樺厛浜庨�氱敤榛樿椤广��
+ */
@TableName("mes_qc_seed_indicator_range")
@Data
@EqualsAndHashCode(callSuper = true)
public class MesQcSeedIndicatorRangeDO extends BaseDO {
- @TableId(type = IdType.INPUT)
+ @TableId(type = IdType.AUTO)
+ private Long id;
+ /** 浜у搧缂栧彿锛坢dm_item锛宨temType=2锛夛紝涓虹┖琛ㄧず閫氱敤榛樿椤� */
+ private Long itemId;
private String indicatorCode;
+ private String indicatorName;
+ private String unit;
private BigDecimal minValue;
private BigDecimal maxValue;
+ private Integer sort;
+ /** 鐘舵�侊細0 鍚敤 1 鍋滅敤 */
+ private Integer status;
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/seedquality/MesQcSeedQualityDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/seedquality/MesQcSeedQualityDO.java
index d0d1392..b36f210 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/seedquality/MesQcSeedQualityDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/seedquality/MesQcSeedQualityDO.java
@@ -11,6 +11,10 @@
public class MesQcSeedQualityDO extends BaseDO {
@TableId private Long id;
private String code;
+ /** 璐ㄦ绾匡細1 鍔犲伐閮紱2 閿�鍞儴锛�0 鏈尯鍒嗭紙鍘嗗彶鏁版嵁锛� */
+ private Integer qcLine;
+ /** 涓氬姟绫诲瀷锛�1 鐢熶骇鍏ュ簱璐ㄦ锛�2 缁忛攢鍟嗛��璐ц川妫� */
+ private Integer bizType;
private Long itemId;
/** 鐢熶骇鎵规 ID */
private Long batchId;
@@ -19,10 +23,20 @@
private String reason;
/** 10 寰呭妫�锛�20 寰呭垵妫�瀹℃牳锛�25 寰呭垵妫�涓嶅悎鏍煎鐞嗭紱30 寰呭妫�瀹℃牳锛�40 宸叉斁琛岋紱50 鍒濇椹冲洖寰呴噸妫�锛�60 寰呭妫�涓嶅悎鏍煎鐞嗭紱70 宸叉姤搴熴�� */
private Integer workflowStatus;
+ /** 鏈嚎閮ㄩ棬瀹℃壒娴佺▼瀹炰緥缂栧彿 */
+ private String processInstanceId;
+ /** 鍏徃璐ㄦ瀹℃壒娴佺▼瀹炰緥缂栧彿 */
+ private String companyProcessInstanceId;
private Long qualifiedWarehouseId;
+ /** 缁忛攢鍟嗛��璐у崟缂栧彿锛坆izType=2 鏃朵娇鐢級 */
+ private Long returnSalesId;
+ /** 缁忛攢鍟嗛��璐у崟鍙凤紙bizType=2 鏃朵娇鐢級 */
+ private String returnSalesCode;
private Integer retestResult;
private LocalDateTime retestedAt;
private LocalDateTime processApprovedAt;
+ private LocalDateTime lineFinishedAt;
+ private LocalDateTime companySubmittedAt;
private LocalDateTime companyApprovedAt;
private Long inspectorId;
private LocalDateTime inspectedAt;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/seedquality/MesQcSeedQualityIndicatorDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/seedquality/MesQcSeedQualityIndicatorDO.java
index 3a5ba38..0947009 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/seedquality/MesQcSeedQualityIndicatorDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/seedquality/MesQcSeedQualityIndicatorDO.java
@@ -12,6 +12,10 @@
@TableId private Long id;
private Long qualityId;
private String indicatorCode;
+ /** 鎸囨爣鍚嶇О蹇収 */
+ private String indicatorName;
+ /** 鎸囨爣鍗曚綅蹇収 */
+ private String unit;
private BigDecimal value;
private BigDecimal minValue;
private BigDecimal maxValue;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesDO.java
index 211f40e..7d52617 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesDO.java
@@ -97,6 +97,7 @@
* 鏋氫妇 {@link MesWmProductSalesStatusEnum}
*/
private Integer status;
+ private String closeReason;
/**
* 澶囨敞
*/
@@ -114,4 +115,4 @@
*/
private String processDefinitionKey;
-}
\ No newline at end of file
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesDetailDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesDetailDO.java
index 3ad3273..8c98a73 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesDetailDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesDetailDO.java
@@ -46,6 +46,8 @@
* 鍏宠仈 {@link MesWmProductSalesDO#getId()}
*/
private Long salesId;
+ /** 宸插垎閰嶇殑鍙戣揣璁板綍锛岀┖鍊艰〃绀烘湰杞緟鎷h揣鎴栧巻鍙叉槑缁嗐�� */
+ private Long shipmentId;
/**
* 鐗╂枡ID
*
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesShipmentDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesShipmentDO.java
new file mode 100644
index 0000000..09f323b
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesShipmentDO.java
@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/** 閿�鍞嚭搴撳崟鐨勫崟娆″彂璐ц褰曘�� */
+@TableName("mes_wm_product_sales_shipment")
+@KeySequence("mes_wm_product_sales_shipment_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MesWmProductSalesShipmentDO extends BaseDO {
+ @TableId
+ private Long id;
+ private Long salesId;
+ private Integer status;
+ private String carrier;
+ private String shippingNumber;
+ private LocalDateTime outboundTime;
+ private Long outboundUserId;
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/transaction/MesWmTransactionDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/transaction/MesWmTransactionDO.java
index b3cce53..59956ac 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/transaction/MesWmTransactionDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/transaction/MesWmTransactionDO.java
@@ -111,6 +111,7 @@
private Long bagCodeId;
/** 琚嬬爜 */
private String bagCode;
+ private Long shipmentId;
// ==================== 搴撳瓨浣嶇疆 ====================
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/bagcode/MesProBagCodeMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/bagcode/MesProBagCodeMapper.java
index 2a8f155..789ed76 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/bagcode/MesProBagCodeMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/bagcode/MesProBagCodeMapper.java
@@ -37,6 +37,12 @@
.and(q -> q.eq(MesProBagCodeDO::getBusinessCode, code).or().eq(MesProBagCodeDO::getCode, code)));
}
+ /** 鎵归噺鎸夋壂鐮佸唴瀹瑰弽鏌ヨ鐮侊紙鍏煎涓氬姟鐮併�佽拷婧爜锛夛紝鐢ㄤ簬鎵爜浜嬩欢灞曠ず鎵�灞炴墭鐩樼爜 */
+ default List<MesProBagCodeDO> selectListByScanCodes(Collection<String> codes) {
+ return selectList(new LambdaQueryWrapperX<MesProBagCodeDO>().and(q ->
+ q.in(MesProBagCodeDO::getBusinessCode, codes).or().in(MesProBagCodeDO::getCode, codes)));
+ }
+
default MesProBagCodeDO selectByScanCodeForUpdate(String code) {
return selectOne(new LambdaQueryWrapperX<MesProBagCodeDO>()
.and(q -> q.eq(MesProBagCodeDO::getBusinessCode, code).or().eq(MesProBagCodeDO::getCode, code))
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/batch/MesProBatchMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/batch/MesProBatchMapper.java
index 4767842..199e91e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/batch/MesProBatchMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/batch/MesProBatchMapper.java
@@ -20,6 +20,21 @@
return selectOne(MesProBatchDO::getCode, code);
}
+ /**
+ * 鎸夋壒娆″彿鏌ヨ锛堝寘鍚凡閫昏緫鍒犻櫎璁板綍锛�
+ * <p>
+ * 鎵规鍙峰瓨鍦ㄥ敮涓�绱㈠紩锛岄�昏緫鍒犻櫎鐨勮褰曚粛鍗犵敤鐮佸�硷紝鏍¢獙閲嶅鏃跺繀椤讳竴骞剁撼鍏ャ��
+ */
+ @Select("SELECT * FROM mes_pro_batch WHERE code = #{code} LIMIT 1")
+ MesProBatchDO selectByCodeIgnoreDeleted(@org.apache.ibatis.annotations.Param("code") String code);
+
+ /**
+ * 鏌ヨ鎸囧畾骞翠唤宸蹭娇鐢ㄧ殑鏈�澶ф壒娆℃祦姘村彿锛堟壒娆″彿鏍煎紡涓� 4 浣嶅勾浠� + 3 浣嶆祦姘达級
+ */
+ @Select("SELECT COALESCE(MAX(CAST(SUBSTRING(code, 5) AS UNSIGNED)), 0) FROM mes_pro_batch "
+ + "WHERE code LIKE CONCAT(#{year}, '%') AND code REGEXP '^[0-9]{7}$'")
+ Integer selectMaxCodeSerialByYear(@org.apache.ibatis.annotations.Param("year") String year);
+
default MesProBatchDO selectByScanCode(String code) {
return selectOne(new LambdaQueryWrapperX<MesProBatchDO>().and(q ->
q.eq(MesProBatchDO::getBusinessCode, code).or().eq(MesProBatchDO::getCode, code)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/pallet/MesProPalletMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/pallet/MesProPalletMapper.java
index 804e94a..b34c216 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/pallet/MesProPalletMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/pallet/MesProPalletMapper.java
@@ -13,6 +13,7 @@
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
+import java.util.Collection;
import java.util.List;
/**
@@ -50,6 +51,22 @@
return selectList(MesProPalletDO::getBatchId, batchId);
}
+ /** 鎵归噺鎸夋壂鐮佸唴瀹瑰弽鏌ユ墭鐩橈紙鍏煎涓氬姟鐮併�佹寮忔墭鐩樼爜銆佷复鏃舵墭鐩樼爜锛夛紝鐢ㄤ簬鎵爜浜嬩欢灞曠ず鎵樼洏鐮� */
+ default List<MesProPalletDO> selectListByScanCodes(Collection<String> codes) {
+ return selectList(new LambdaQueryWrapperX<MesProPalletDO>().and(q ->
+ q.in(MesProPalletDO::getBusinessCode, codes).or().in(MesProPalletDO::getCode, codes)
+ .or().in(MesProPalletDO::getTempCode, codes)));
+ }
+
+ /**
+ * 鎵归噺鏌ヨ澶氫釜鎵规涓嬬殑鎵樼洏鐮侊紙鎸夋墭鐩樺簭鍙峰崌搴忥級
+ */
+ default List<MesProPalletDO> selectListByBatchIds(Collection<Long> batchIds) {
+ return selectList(new LambdaQueryWrapperX<MesProPalletDO>()
+ .in(MesProPalletDO::getBatchId, batchIds)
+ .orderByAsc(MesProPalletDO::getPalletNo));
+ }
+
/**
* 鍒嗛〉鏌ヨ鏈粦瀹氱敓浜ф壒娆$殑涓存椂鎵樼洏锛堟棤姝e紡鎵樼洏鐮佷笖鏈綔搴燂級锛屼緵鎵规鏂板/琛ュ綍缁戝畾鎵樼洏涓嬫媺浣跨敤銆�
* <p>
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/seedquality/MesQcSeedIndicatorRangeMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/seedquality/MesQcSeedIndicatorRangeMapper.java
index b43584e..fedc93a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/seedquality/MesQcSeedIndicatorRangeMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/seedquality/MesQcSeedIndicatorRangeMapper.java
@@ -1,9 +1,58 @@
package cn.iocoder.yudao.module.mes.dal.mysql.qc.seedquality;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.seedquality.MesQcSeedIndicatorRangeDO;
import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+
@Mapper
public interface MesQcSeedIndicatorRangeMapper extends BaseMapperX<MesQcSeedIndicatorRangeDO> {
+
+ default List<MesQcSeedIndicatorRangeDO> selectListByItemId(Long itemId, String keyword, Integer status) {
+ LambdaQueryWrapperX<MesQcSeedIndicatorRangeDO> wrapper = new LambdaQueryWrapperX<>();
+ if (itemId == null) {
+ wrapper.isNull(MesQcSeedIndicatorRangeDO::getItemId);
+ } else {
+ wrapper.eq(MesQcSeedIndicatorRangeDO::getItemId, itemId);
+ }
+ wrapper.and(StrUtil.isNotBlank(keyword), w -> w
+ .like(MesQcSeedIndicatorRangeDO::getIndicatorName, keyword)
+ .or().like(MesQcSeedIndicatorRangeDO::getIndicatorCode, keyword));
+ wrapper.eqIfPresent(MesQcSeedIndicatorRangeDO::getStatus, status)
+ .orderByAsc(MesQcSeedIndicatorRangeDO::getSort)
+ .orderByAsc(MesQcSeedIndicatorRangeDO::getId);
+ return selectList(wrapper);
+ }
+
+ /** 浜у搧涓撳睘涓斿惎鐢ㄧ殑鎸囨爣锛屾寜鎺掑簭杩斿洖 */
+ default List<MesQcSeedIndicatorRangeDO> selectEnabledByItemId(Long itemId) {
+ return selectList(new LambdaQueryWrapperX<MesQcSeedIndicatorRangeDO>()
+ .eq(MesQcSeedIndicatorRangeDO::getItemId, itemId)
+ .eq(MesQcSeedIndicatorRangeDO::getStatus, 0)
+ .orderByAsc(MesQcSeedIndicatorRangeDO::getSort)
+ .orderByAsc(MesQcSeedIndicatorRangeDO::getId));
+ }
+
+ /** 鏈粦瀹氫骇鍝佺殑閫氱敤榛樿鎸囨爣锛屾寜鎺掑簭杩斿洖 */
+ default List<MesQcSeedIndicatorRangeDO> selectEnabledDefaults() {
+ return selectList(new LambdaQueryWrapperX<MesQcSeedIndicatorRangeDO>()
+ .isNull(MesQcSeedIndicatorRangeDO::getItemId)
+ .eq(MesQcSeedIndicatorRangeDO::getStatus, 0)
+ .orderByAsc(MesQcSeedIndicatorRangeDO::getSort)
+ .orderByAsc(MesQcSeedIndicatorRangeDO::getId));
+ }
+
+ default MesQcSeedIndicatorRangeDO selectByItemIdAndCode(Long itemId, String indicatorCode) {
+ LambdaQueryWrapperX<MesQcSeedIndicatorRangeDO> wrapper = new LambdaQueryWrapperX<>();
+ if (itemId == null) {
+ wrapper.isNull(MesQcSeedIndicatorRangeDO::getItemId);
+ } else {
+ wrapper.eq(MesQcSeedIndicatorRangeDO::getItemId, itemId);
+ }
+ wrapper.eq(MesQcSeedIndicatorRangeDO::getIndicatorCode, indicatorCode);
+ return selectOne(wrapper);
+ }
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/seedquality/MesQcSeedQualityMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/seedquality/MesQcSeedQualityMapper.java
index 8078d31..fa0b8bb 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/seedquality/MesQcSeedQualityMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/seedquality/MesQcSeedQualityMapper.java
@@ -1,13 +1,17 @@
package cn.iocoder.yudao.module.mes.dal.mysql.qc.seedquality;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityPageReqVO;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.seedquality.MesQcSeedQualityDO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.ibatis.annotations.Mapper;
+import java.util.Collection;
import java.util.List;
+import java.util.Map;
@Mapper
public interface MesQcSeedQualityMapper extends BaseMapperX<MesQcSeedQualityDO> {
@@ -16,29 +20,79 @@
return selectPage(reqVO, new LambdaQueryWrapperX<MesQcSeedQualityDO>()
.likeIfPresent(MesQcSeedQualityDO::getCode, reqVO.getCode())
.likeIfPresent(MesQcSeedQualityDO::getBatchCode, reqVO.getBatchCode())
+ .eqIfPresent(MesQcSeedQualityDO::getBatchCode, reqVO.getExactBatchCode())
.eqIfPresent(MesQcSeedQualityDO::getResult, reqVO.getResult())
.eqIfPresent(MesQcSeedQualityDO::getWorkflowStatus, reqVO.getWorkflowStatus())
+ .eqIfPresent(MesQcSeedQualityDO::getQcLine, reqVO.getQcLine())
+ .eqIfPresent(MesQcSeedQualityDO::getBizType, reqVO.getBizType())
+ .isNull(Boolean.TRUE.equals(reqVO.getUnbound()), MesQcSeedQualityDO::getBatchCode)
+ .orderByAsc(MesQcSeedQualityDO::getCode)
+ .orderByAsc(MesQcSeedQualityDO::getQcLine)
.orderByDesc(MesQcSeedQualityDO::getInspectedAt)
.orderByDesc(MesQcSeedQualityDO::getId));
}
- default MesQcSeedQualityDO selectByCode(String code) {
- return selectOne(new LambdaQueryWrapperX<MesQcSeedQualityDO>().eq(MesQcSeedQualityDO::getCode, code));
+
+ /** 鍚屼竴琚嬬爜鍙兘鍚屾椂瀛樺湪鍔犲伐閮ㄣ�侀攢鍞儴涓ゆ潯璁板綍锛屾寜璐ㄦ绾垮崌搴忚繑鍥� */
+ default List<MesQcSeedQualityDO> selectListByCode(String code) {
+ return selectList(new LambdaQueryWrapperX<MesQcSeedQualityDO>()
+ .eq(MesQcSeedQualityDO::getCode, code)
+ .orderByAsc(MesQcSeedQualityDO::getQcLine));
}
- default List<MesQcSeedQualityDO> selectListByCodes(java.util.Collection<String> codes) {
+
+ default List<MesQcSeedQualityDO> selectListByCodeForUpdate(String code) {
+ return selectList(new LambdaQueryWrapperX<MesQcSeedQualityDO>()
+ .eq(MesQcSeedQualityDO::getCode, code)
+ .orderByAsc(MesQcSeedQualityDO::getQcLine)
+ .last("FOR UPDATE"));
+ }
+
+ default MesQcSeedQualityDO selectByCodeAndLine(String code, Integer qcLine) {
+ return selectOne(new LambdaQueryWrapperX<MesQcSeedQualityDO>()
+ .eq(MesQcSeedQualityDO::getCode, code)
+ .eq(MesQcSeedQualityDO::getQcLine, qcLine));
+ }
+
+ default MesQcSeedQualityDO selectByReturnSalesId(Long returnSalesId) {
+ return selectOne(new LambdaQueryWrapperX<MesQcSeedQualityDO>()
+ .eq(MesQcSeedQualityDO::getReturnSalesId, returnSalesId)
+ .orderByDesc(MesQcSeedQualityDO::getId));
+ }
+
+ default MesQcSeedQualityDO selectByReturnSalesIdForUpdate(Long returnSalesId) {
+ return selectOne(new LambdaQueryWrapperX<MesQcSeedQualityDO>()
+ .eq(MesQcSeedQualityDO::getReturnSalesId, returnSalesId)
+ .orderByDesc(MesQcSeedQualityDO::getId)
+ .last("FOR UPDATE"));
+ }
+
+ /** 娓呯┖鍚屼竴琚嬬爜鐨勫叕鍙歌川妫�娴佺▼瀹炰緥缂栧彿锛屼究浜庡叕鍙稿鎵归┏鍥炲悗閲嶆柊鍙戣捣 */
+ default void clearCompanyProcessInstance(String code) {
+ update(null, new com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper<MesQcSeedQualityDO>()
+ .eq(MesQcSeedQualityDO::getCode, code)
+ .set(MesQcSeedQualityDO::getCompanyProcessInstanceId, null));
+ }
+
+ default void clearLineProcessInstance(Long id) {
+ update(null, new com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper<MesQcSeedQualityDO>()
+ .eq(MesQcSeedQualityDO::getId, id)
+ .set(MesQcSeedQualityDO::getProcessInstanceId, null));
+ }
+
+ default List<MesQcSeedQualityDO> selectListByCodes(Collection<String> codes) {
if (codes.isEmpty()) return List.of();
return selectList(new LambdaQueryWrapperX<MesQcSeedQualityDO>().in(MesQcSeedQualityDO::getCode, codes));
}
- default List<MesQcSeedQualityDO> selectListByCodesForUpdate(java.util.Collection<String> codes) {
+
+ default List<MesQcSeedQualityDO> selectListByCodesForUpdate(Collection<String> codes) {
if (codes.isEmpty()) return List.of();
return selectList(new LambdaQueryWrapperX<MesQcSeedQualityDO>().in(MesQcSeedQualityDO::getCode, codes).last("FOR UPDATE"));
}
- default MesQcSeedQualityDO selectByCodeForUpdate(String code) {
- return selectOne(new LambdaQueryWrapperX<MesQcSeedQualityDO>().eq(MesQcSeedQualityDO::getCode, code).last("FOR UPDATE"));
- }
+
default MesQcSeedQualityDO selectByIdForUpdate(Long id) {
return selectOne(new LambdaQueryWrapperX<MesQcSeedQualityDO>().eq(MesQcSeedQualityDO::getId, id).last("FOR UPDATE"));
}
- default List<MesQcSeedQualityDO> selectListByIdsForUpdate(java.util.Collection<Long> ids) {
+
+ default List<MesQcSeedQualityDO> selectListByIdsForUpdate(Collection<Long> ids) {
if (ids.isEmpty()) return List.of();
return selectList(new LambdaQueryWrapperX<MesQcSeedQualityDO>()
.in(MesQcSeedQualityDO::getId, ids)
@@ -46,9 +100,79 @@
.last("FOR UPDATE"));
}
+ default List<MesQcSeedQualityDO> selectListByProcessInstanceId(String processInstanceId) {
+ return selectList(new LambdaQueryWrapperX<MesQcSeedQualityDO>()
+ .eq(MesQcSeedQualityDO::getProcessInstanceId, processInstanceId));
+ }
+
+ default List<MesQcSeedQualityDO> selectListByCompanyProcessInstanceId(String processInstanceId) {
+ return selectList(new LambdaQueryWrapperX<MesQcSeedQualityDO>()
+ .eq(MesQcSeedQualityDO::getCompanyProcessInstanceId, processInstanceId));
+ }
+
default List<MesQcSeedQualityDO> selectListByBatchCode(String batchCode) {
return selectList(new LambdaQueryWrapperX<MesQcSeedQualityDO>()
.eq(MesQcSeedQualityDO::getBatchCode, batchCode)
.orderByDesc(MesQcSeedQualityDO::getInspectedAt));
}
+
+ /** 鎸夌敓浜ф壒娆″垎缁勭殑缁勬暟锛堟湭缁戝畾鎵规褰掑叆绌烘壒娆$粍锛� */
+ default long countBatchGroups(MesQcSeedQualityPageReqVO reqVO) {
+ QueryWrapper<MesQcSeedQualityDO> wrapper = buildBatchGroupFilter(reqVO);
+ wrapper.select("COUNT(DISTINCT IFNULL(batch_code, '')) AS cnt");
+ List<Object> values = selectObjs(wrapper);
+ if (values.isEmpty() || values.get(0) == null) {
+ return 0L;
+ }
+ return ((Number) values.get(0)).longValue();
+ }
+
+ /**
+ * 鎸夌敓浜ф壒娆″垎缁勭殑鍒嗛〉姹囨�伙紝offset/limit 鐢辫皟鐢ㄦ柟鎸夋壒娆¢〉璁$畻銆�
+ * 鍚屼竴琚嬬爜瀛樺湪鍔犲伐閮ㄣ�侀攢鍞儴涓ゆ潯璁板綍锛屽洜姝ゆ寜琚嬬爜鍘婚噸缁熻銆�
+ */
+ default List<Map<String, Object>> selectBatchGroups(MesQcSeedQualityPageReqVO reqVO, long offset, int limit) {
+ QueryWrapper<MesQcSeedQualityDO> wrapper = buildBatchGroupFilter(reqVO);
+ wrapper.select(
+ "IFNULL(batch_code, '') AS batchCode",
+ "MAX(batch_id) AS batchId",
+ "MAX(item_id) AS itemId",
+ "COUNT(DISTINCT code) AS totalCount",
+ "COUNT(DISTINCT CASE WHEN result = 1 THEN code END) AS passCount",
+ "COUNT(DISTINCT CASE WHEN result = 2 THEN code END) AS failCount",
+ "COUNT(DISTINCT CASE WHEN result IS NULL OR result = 0 THEN code END) AS processingCount",
+ "COUNT(DISTINCT CASE WHEN workflow_status IN (10, 50) THEN code END) AS pendingRetestCount",
+ "COUNT(DISTINCT CASE WHEN workflow_status IN (20, 25) THEN code END) AS pendingProcessReviewCount",
+ "COUNT(DISTINCT CASE WHEN workflow_status IN (30, 60) THEN code END) AS pendingCompanyReviewCount",
+ "COUNT(DISTINCT CASE WHEN workflow_status = 40 THEN code END) AS releasedCount",
+ "COUNT(DISTINCT CASE WHEN workflow_status = 70 THEN code END) AS scrappedCount",
+ "MAX(inspected_at) AS lastInspectedAt");
+ wrapper.groupBy("IFNULL(batch_code, '')");
+ wrapper.orderByDesc("MAX(inspected_at)", "MAX(id)");
+ wrapper.last("LIMIT " + offset + ", " + limit);
+ return selectMaps(wrapper);
+ }
+
+ private static QueryWrapper<MesQcSeedQualityDO> buildBatchGroupFilter(MesQcSeedQualityPageReqVO reqVO) {
+ QueryWrapper<MesQcSeedQualityDO> wrapper = new QueryWrapper<>();
+ if (StrUtil.isNotBlank(reqVO.getCode())) {
+ wrapper.like("code", reqVO.getCode());
+ }
+ if (StrUtil.isNotBlank(reqVO.getBatchCode())) {
+ wrapper.like("batch_code", reqVO.getBatchCode());
+ }
+ if (reqVO.getResult() != null) {
+ wrapper.eq("result", reqVO.getResult());
+ }
+ if (reqVO.getWorkflowStatus() != null) {
+ wrapper.eq("workflow_status", reqVO.getWorkflowStatus());
+ }
+ if (reqVO.getQcLine() != null) {
+ wrapper.eq("qc_line", reqVO.getQcLine());
+ }
+ if (reqVO.getBizType() != null) {
+ wrapper.eq("biz_type", reqVO.getBizType());
+ }
+ return wrapper;
+ }
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
index d3a7a25..196b777 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
@@ -37,8 +37,10 @@
.eqIfPresent(MesWmMaterialStockDO::getVendorId, reqVO.getVendorId())
.eqIfPresent(MesWmMaterialStockDO::getStockState, reqVO.getStockState())
.eqIfPresent(MesWmMaterialStockDO::getFrozen, reqVO.getFrozen());
- wrapper.ne(MesWmMaterialStockDO::getQuantity, BigDecimal.ZERO)
- .orderByAsc(MesWmMaterialStockDO::getReceiptTime);
+ if (!Boolean.TRUE.equals(reqVO.getIncludeZero())) {
+ wrapper.ne(MesWmMaterialStockDO::getQuantity, BigDecimal.ZERO);
+ }
+ wrapper.orderByAsc(MesWmMaterialStockDO::getReceiptTime);
// 铏氭嫙浠撹繃婊わ紙Service 灞傚凡灏� virtualFilter 瑙f瀽涓� virtualWarehouseId锛�
if (virtualWarehouseId != null) {
if (MesWmMaterialStockPageReqVO.VIRTUAL_FILTER_ONLY.equals(reqVO.getVirtualFilter())) {
@@ -162,8 +164,8 @@
LambdaQueryWrapperX<MesWmMaterialStockDO> wrapper = new LambdaQueryWrapperX<MesWmMaterialStockDO>()
.eq(MesWmMaterialStockDO::getItemId, itemId)
.eq(MesWmMaterialStockDO::getWarehouseId, warehouseId)
- .eq(MesWmMaterialStockDO::getLocationId, locationId)
- .eq(MesWmMaterialStockDO::getAreaId, areaId)
+ .eqIfPresent(MesWmMaterialStockDO::getLocationId, locationId)
+ .eqIfPresent(MesWmMaterialStockDO::getAreaId, areaId)
.eq(MesWmMaterialStockDO::getStockState, MesWmStockStateEnum.QUALIFIED.getState());
// batchId=null 鏃剁簿纭尮閰� is null
if (batchId != null) {
@@ -186,8 +188,8 @@
LambdaQueryWrapperX<MesWmMaterialStockDO> wrapper = new LambdaQueryWrapperX<MesWmMaterialStockDO>()
.eq(MesWmMaterialStockDO::getItemId, itemId)
.eq(MesWmMaterialStockDO::getWarehouseId, warehouseId)
- .eq(MesWmMaterialStockDO::getLocationId, locationId)
- .eq(MesWmMaterialStockDO::getAreaId, areaId)
+ .eqIfPresent(MesWmMaterialStockDO::getLocationId, locationId)
+ .eqIfPresent(MesWmMaterialStockDO::getAreaId, areaId)
.eq(MesWmMaterialStockDO::getStockState, MesWmStockStateEnum.QUALIFIED.getState());
// batchId=null 鏃剁簿纭尮閰� is null
if (batchId != null) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstockbag/MesWmMaterialStockBagMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstockbag/MesWmMaterialStockBagMapper.java
index a6851fa..6637530 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstockbag/MesWmMaterialStockBagMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstockbag/MesWmMaterialStockBagMapper.java
@@ -25,7 +25,7 @@
return selectPage(reqVO, new LambdaQueryWrapperX<MesWmMaterialStockBagDO>()
.eq(MesWmMaterialStockBagDO::getMaterialStockId, reqVO.getMaterialStockId())
.likeIfPresent(MesWmMaterialStockBagDO::getBagCode, reqVO.getBagCode())
- .eq(MesWmMaterialStockBagDO::getStatus, 1)
+ .eqIfPresent(MesWmMaterialStockBagDO::getStatus, Boolean.TRUE.equals(reqVO.getIncludeHistory()) ? null : 1)
.orderByAsc(MesWmMaterialStockBagDO::getInboundTime));
}
@@ -81,6 +81,12 @@
.orderByAsc(MesWmMaterialStockBagDO::getInboundTime));
}
+ default List<MesWmMaterialStockBagDO> selectHistoryByMaterialStockIds(Collection<Long> materialStockIds) {
+ if (materialStockIds.isEmpty()) return List.of();
+ return selectList(new LambdaQueryWrapperX<MesWmMaterialStockBagDO>()
+ .in(MesWmMaterialStockBagDO::getMaterialStockId, materialStockIds));
+ }
+
default List<MesWmMaterialStockBagDO> selectListByMaterialStockId(Long materialStockId) {
return selectList(new LambdaQueryWrapperX<MesWmMaterialStockBagDO>()
.eq(MesWmMaterialStockBagDO::getMaterialStockId, materialStockId)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesDetailMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesDetailMapper.java
index dc477d3..575bfa5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesDetailMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesDetailMapper.java
@@ -5,6 +5,7 @@
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
+import java.util.Collection;
/**
* MES 閿�鍞嚭搴撴槑缁� Mapper
@@ -14,11 +15,26 @@
@Mapper
public interface MesWmProductSalesDetailMapper extends BaseMapperX<MesWmProductSalesDetailDO> {
+ default List<MesWmProductSalesDetailDO> selectBySalesIdsAndBagIds(Collection<Long> salesIds, Collection<Long> bagIds) {
+ if (salesIds.isEmpty() || bagIds.isEmpty()) return List.of();
+ return selectList(new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<MesWmProductSalesDetailDO>()
+ .in(MesWmProductSalesDetailDO::getSalesId, salesIds)
+ .in(MesWmProductSalesDetailDO::getBagCodeId, bagIds));
+ }
+
+ default List<MesWmProductSalesDetailDO> selectByBagIds(Collection<Long> bagIds) {
+ if (bagIds.isEmpty()) return List.of();
+ return selectList(new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<MesWmProductSalesDetailDO>()
+ .in(MesWmProductSalesDetailDO::getBagCodeId, bagIds));
+ }
+
// 浠呮湭鍙栨秷涓斿皻鏈畬鎴愮殑鍑哄簱鍗曞崰鐢ㄨ鐮併�傛棫鏁存墭鏄庣粏涔熷弬涓庨噸鍙犲垽鏂��
@org.apache.ibatis.annotations.Select("""
SELECT d.* FROM mes_wm_product_sales_detail d
JOIN mes_wm_product_sales s ON s.id = d.sales_id
+ LEFT JOIN mes_wm_product_sales_shipment sh ON sh.id = d.shipment_id AND sh.deleted = 0
WHERE d.deleted = 0 AND s.deleted = 0 AND s.status IN (2, 10, 3)
+ AND (d.shipment_id IS NULL OR sh.status IN (10, 20))
AND d.batch_code = #{batchCode}
""")
List<MesWmProductSalesDetailDO> selectPickingByBatchCode(String batchCode);
@@ -26,7 +42,9 @@
@org.apache.ibatis.annotations.Select("""
SELECT d.* FROM mes_wm_product_sales_detail d
JOIN mes_wm_product_sales s ON s.id = d.sales_id
+ LEFT JOIN mes_wm_product_sales_shipment sh ON sh.id = d.shipment_id AND sh.deleted = 0
WHERE d.deleted = 0 AND s.deleted = 0 AND s.status IN (2, 10, 3)
+ AND (d.shipment_id IS NULL OR sh.status IN (10, 20))
AND d.batch_code = #{batchCode} FOR UPDATE
""")
List<MesWmProductSalesDetailDO> selectPickingByBatchCodeForUpdate(String batchCode);
@@ -35,6 +53,12 @@
return selectList(MesWmProductSalesDetailDO::getLineId, lineId);
}
+ default void unassignShipment(Long shipmentId) {
+ update(null, new com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper<MesWmProductSalesDetailDO>()
+ .eq(MesWmProductSalesDetailDO::getShipmentId, shipmentId)
+ .set(MesWmProductSalesDetailDO::getShipmentId, null));
+ }
+
default List<MesWmProductSalesDetailDO> selectListBySalesId(Long salesId) {
return selectList(MesWmProductSalesDetailDO::getSalesId, salesId);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesShipmentMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesShipmentMapper.java
new file mode 100644
index 0000000..80a6258
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesShipmentMapper.java
@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesShipmentDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Collection;
+
+@Mapper
+public interface MesWmProductSalesShipmentMapper extends BaseMapperX<MesWmProductSalesShipmentDO> {
+ default List<MesWmProductSalesShipmentDO> selectBySalesId(Long salesId) {
+ return selectList(new LambdaQueryWrapperX<MesWmProductSalesShipmentDO>()
+ .eq(MesWmProductSalesShipmentDO::getSalesId, salesId)
+ .orderByAsc(MesWmProductSalesShipmentDO::getId));
+ }
+
+ default List<MesWmProductSalesShipmentDO> selectCompletedBySalesIds(Collection<Long> salesIds) {
+ if (salesIds.isEmpty()) return List.of();
+ return selectList(new LambdaQueryWrapperX<MesWmProductSalesShipmentDO>()
+ .in(MesWmProductSalesShipmentDO::getSalesId, salesIds).eq(MesWmProductSalesShipmentDO::getStatus, 30));
+ }
+
+ default MesWmProductSalesShipmentDO selectActive(Long salesId) {
+ return selectOne(new LambdaQueryWrapperX<MesWmProductSalesShipmentDO>()
+ .eq(MesWmProductSalesShipmentDO::getSalesId, salesId)
+ .in(MesWmProductSalesShipmentDO::getStatus, 10, 20)
+ .orderByDesc(MesWmProductSalesShipmentDO::getId).last("LIMIT 1"));
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/transaction/MesWmTransactionMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/transaction/MesWmTransactionMapper.java
index 1d18be0..8371c77 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/transaction/MesWmTransactionMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/transaction/MesWmTransactionMapper.java
@@ -13,17 +13,23 @@
@Mapper
public interface MesWmTransactionMapper extends BaseMapperX<MesWmTransactionDO> {
+ @org.apache.ibatis.annotations.Select("SELECT COALESCE(-SUM(quantity), 0) FROM mes_wm_transaction WHERE biz_type = 119 AND type = 2 AND biz_line_id = #{lineId} AND deleted = 0")
+ java.math.BigDecimal sumSalesOutboundByLineId(Long lineId);
+
default PageResult<MesWmTransactionDO> selectPage(MesWmTransactionPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<MesWmTransactionDO>()
.eqIfPresent(MesWmTransactionDO::getItemId, reqVO.getItemId())
.likeIfPresent(MesWmTransactionDO::getBatchCode, reqVO.getBatchCode())
+ .eqIfPresent(MesWmTransactionDO::getBatchCode, reqVO.getBatchCodeExact())
.likeIfPresent(MesWmTransactionDO::getBagCode, reqVO.getBagCode())
+ .eqIfPresent(MesWmTransactionDO::getShipmentId, reqVO.getShipmentId())
.eqIfPresent(MesWmTransactionDO::getWarehouseId, reqVO.getWarehouseId())
.eqIfPresent(MesWmTransactionDO::getLocationId, reqVO.getLocationId())
.eqIfPresent(MesWmTransactionDO::getAreaId, reqVO.getAreaId())
.eqIfPresent(MesWmTransactionDO::getType, reqVO.getType())
.eqIfPresent(MesWmTransactionDO::getBizType, reqVO.getBizType())
.likeIfPresent(MesWmTransactionDO::getBizCode, reqVO.getBizCode())
+ .eqIfPresent(MesWmTransactionDO::getBizCode, reqVO.getBizCodeExact())
.eqIfPresent(MesWmTransactionDO::getMaterialStockId, reqVO.getMaterialStockId())
.geIfPresent(MesWmTransactionDO::getTransactionTime, reqVO.getStartTime())
.leIfPresent(MesWmTransactionDO::getTransactionTime, reqVO.getEndTime())
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/redis/MesCodeRedisDAO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/redis/MesCodeRedisDAO.java
index dd24ca3..6217e44 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/redis/MesCodeRedisDAO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/redis/MesCodeRedisDAO.java
@@ -25,6 +25,11 @@
private static final String BAG_NO_SEQ_KEY = "mes:bag_no:seq";
/**
+ * 鐢熶骇鎵规娴佹按鍙疯嚜澧� KEY 鍓嶇紑锛堟寜骞翠唤闅旂锛�
+ */
+ private static final String BATCH_NO_SEQ_KEY_PREFIX = "mes:pro_batch_code:seq:";
+
+ /**
* 鍗曟鎵归噺鍙栫爜鐨勬渶澶т釜鏁�
* <p>
* 鍙� Redis 鍗曟潯鍛戒护鍙傛暟瑙勬ā涓庡搷搴斾綋澶у皬绾︽潫锛岃繃澶у弽鑰屽鍔犲崟娆¢樆濉炴椂闂淬��
@@ -60,6 +65,17 @@
+ "local base = tonumber(ARGV[2]) "
+ "if (not cur) or (tonumber(cur) < base) then redis.call('SET', KEYS[1], base) end "
+ "return redis.call('INCRBY', KEYS[1], ARGV[1])",
+ Long.class);
+
+ /**
+ * 鍘熷瓙鍒嗛厤鐢熶骇鎵规娴佹按鍙凤細鍏堟寜搴撳唴褰撳墠鏈�澶ф祦姘存牎姝e熀鍑嗗�硷紝鍐嶈嚜澧炪��
+ * 鎵嬪姩褰曞叆杈冨ぇ鎵规鍙锋垨鐩存帴瀵煎叆鏁版嵁鍚庯紝涓嬩竴娆¤嚜鍔ㄥ彇鍙蜂笉浼氫笌涔嬮噸澶嶃��
+ */
+ private static final RedisScript<Long> ALLOCATE_BATCH_NO_SCRIPT = new DefaultRedisScript<>(
+ "local cur = redis.call('GET', KEYS[1]) "
+ + "local base = tonumber(ARGV[1]) "
+ + "if (not cur) or (tonumber(cur) < base) then redis.call('SET', KEYS[1], base) end "
+ + "return redis.call('INCR', KEYS[1])",
Long.class);
@Resource
@@ -117,6 +133,23 @@
}
/**
+ * 鍘熷瓙鍒嗛厤鐢熶骇鎵规娴佹按鍙凤細鍏堟寜搴撳唴褰撳墠鏈�澶ф祦姘存牎姝e熀鍑嗗�硷紝鍐嶈嚜澧炪��
+ *
+ * @param year 鎵规鍙峰勾浠斤紙4 浣嶏級
+ * @param dbMaxSerial 鏁版嵁搴撳綋骞村凡鐢ㄦ渶澶ф祦姘村彿锛屼紶 null 瑙嗕负 0
+ * @return 涓嬩竴涓祦姘村彿
+ */
+ public int allocateBatchNo(String year, Integer dbMaxSerial) {
+ Long next = stringRedisTemplate.execute(ALLOCATE_BATCH_NO_SCRIPT,
+ List.of(BATCH_NO_SEQ_KEY_PREFIX + year),
+ String.valueOf(dbMaxSerial == null ? 0 : dbMaxSerial));
+ if (next == null) {
+ throw new IllegalStateException("鍒嗛厤鐢熶骇鎵规娴佹按鍙峰け璐ワ紝璇烽噸璇�");
+ }
+ return next.intValue();
+ }
+
+ /**
* 鍘熷瓙鍒嗛厤涓�娈佃繛缁殑琚嬪簭鍙凤紝杩斿洖鍖洪棿璧峰鍊笺��
* <p>
* 琚嬪簭鍙峰師鍏堢敱銆屾煡搴撳唴鏈�澶у�煎啀 +1銆嶅緱鍒帮紝骞跺彂鐢熸垚鏃朵袱涓姹備細璇诲埌鍚屼竴涓渶澶у�硷紝
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
index 91fd6d6..d5ab657 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
@@ -861,6 +861,9 @@
ErrorCode PRO_QR_EXPORT_TOO_MANY_FOR_SYNC = new ErrorCode(1_040_750_015, "鏈闇�瀵煎嚭 {} 寮狅紝瓒呰繃鍚屾瀵煎嚭涓婇檺 {} 寮狅紝璇锋敼鐢ㄥ悗鍙板鍑轰换鍔�");
ErrorCode PRO_QR_EXPORT_TASK_FILE_MISSING = new ErrorCode(1_040_750_016, "瀵煎嚭鏂囦欢涓嶅瓨鍦ㄦ垨宸茶鍒犻櫎锛岃閲嶆柊瀵煎嚭");
ErrorCode PRO_QR_EXPORT_TASK_STATUS_INVALID = new ErrorCode(1_040_750_017, "褰撳墠瀵煎嚭浠诲姟鐘舵�佷笉鍏佽璇ユ搷浣�");
+ ErrorCode PRO_BATCH_CODE_INVALID = new ErrorCode(1_040_750_018, "鐢熶骇鎵规鍙锋牸寮忎笉姝g‘锛屽簲涓哄勾浠�+3浣嶆祦姘村彿锛屽 2026001");
+ ErrorCode PRO_BATCH_CODE_DUPLICATE = new ErrorCode(1_040_750_019, "鐢熶骇鎵规鍙枫�恵}銆戝凡瀛樺湪");
+ ErrorCode PRO_BATCH_CODE_EXHAUSTED = new ErrorCode(1_040_750_025, "鏈勾搴︾敓浜ф壒娆″彿宸茬敤灏斤紙001-999锛�");
// ========== MES 鐢熶骇绠$悊-琚嬬爜璧嬬爜锛�1-040-752-000锛� ==========
ErrorCode PRO_BAG_CODE_NOT_EXISTS = new ErrorCode(1_040_752_000, "琚嬬爜涓嶅瓨鍦�");
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmProductSalesStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmProductSalesStatusEnum.java
index dd0c9a3..a7c945e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmProductSalesStatusEnum.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmProductSalesStatusEnum.java
@@ -59,7 +59,8 @@
*
* 瀵瑰簲 MesWmProductSalesService#cancelProductSales 鏂规硶
*/
- CANCELED(MesOrderStatusConstants.CANCELLED, "宸插彇娑�");
+ CANCELED(MesOrderStatusConstants.CANCELLED, "宸插彇娑�"),
+ CLOSED(MesOrderStatusConstants.CLOSED, "宸插叧闂�");
public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesWmProductSalesStatusEnum::getStatus).toArray(Integer[]::new);
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java
index d0de3aa..d74af46 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java
@@ -9,14 +9,10 @@
import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.MesMdWorkstationSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkshopDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
import cn.iocoder.yudao.module.mes.dal.mysql.md.workstation.MesMdWorkstationMapper;
import cn.iocoder.yudao.module.mes.enums.wm.BarcodeBizTypeEnum;
import cn.iocoder.yudao.module.mes.service.wm.barcode.MesWmBarcodeService;
-import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
-import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
import jakarta.annotation.Resource;
@@ -55,10 +51,6 @@
private MesMdWorkshopService workshopService;
@Resource
private MesWmWarehouseService warehouseService;
- @Resource
- private MesWmWarehouseLocationService locationService;
- @Resource
- private MesWmWarehouseAreaService areaService;
@Resource
private MesWmBarcodeService barcodeService;
@Resource
@@ -144,68 +136,18 @@
}
/**
- * 鏍¢獙骞跺鐞嗕粨搴撳眰绾у叧绯�
- *
- * 浠撳簱灞傜骇缁撴瀯锛氫粨搴� -> 搴撳尯 -> 搴撲綅
- * 澶勭悊瑙勫垯锛�
- * 1. 濡傛灉浠撳簱/搴撳尯/搴撲綅閮芥湭濉啓锛屽垯鑷姩璁剧疆铏氭嫙绾胯竟搴�
- * 2. 濡傛灉濉啓浜嗗簱鍖猴紝蹇呴』濉啓浠撳簱锛屼笖搴撳尯蹇呴』灞炰簬璇ヤ粨搴�
- * 3. 濡傛灉濉啓浜嗗簱浣嶏紝蹇呴』濉啓搴撳尯锛屼笖搴撲綅蹇呴』灞炰簬璇ュ簱鍖�
+ * 澶勭悊浠撳簱锛氭湭濉啓浠撳簱鏃惰嚜鍔ㄨ缃櫄鎷熺嚎杈逛粨
*
* @param reqVO 宸ヤ綔绔欎繚瀛樿姹傚璞�
*/
private void handleWarehouseHierarchy(MesMdWorkstationSaveReqVO reqVO) {
- // 1.1 鑾峰彇浠撳簱銆佸簱鍖恒�佸簱浣� ID
Long warehouseId = reqVO.getWarehouseId();
- Long locationId = reqVO.getLocationId();
- Long areaId = reqVO.getAreaId();
- // 1.2 濡傛灉閮戒负绌猴紝鍒欒嚜鍔ㄨ缃櫄鎷熺嚎杈瑰簱
- if (warehouseId == null && locationId == null && areaId == null) {
+ if (warehouseId == null) {
MesWmWarehouseDO warehouse = warehouseService.getWarehouseByCode(MesWmWarehouseDO.WIP_VIRTUAL_WAREHOUSE);
- MesWmWarehouseLocationDO location = locationService.getWarehouseLocationByCode(
- MesWmWarehouseLocationDO.WIP_VIRTUAL_LOCATION);
- MesWmWarehouseAreaDO area = areaService.getWarehouseAreaByCode(
- MesWmWarehouseAreaDO.WIP_VIRTUAL_AREA);
reqVO.setWarehouseId(warehouse.getId());
- reqVO.setLocationId(location.getId());
- reqVO.setAreaId(area.getId());
return;
}
-
- // 2. 鏍¢獙浠撳簱鏄惁瀛樺湪
- if (warehouseId != null) {
- warehouseService.validateWarehouseExists(warehouseId);
- }
-
- // 3. 鏍¢獙搴撳尯锛氬鏋滃~鍐欎簡搴撳尯锛屽繀椤诲~鍐欎粨搴擄紝涓斿簱鍖哄繀椤诲睘浜庤浠撳簱
- MesWmWarehouseLocationDO location;
- if (locationId != null) {
- // 3.1 鏍¢獙搴撳尯鏄惁瀛樺湪
- location = locationService.validateWarehouseLocationExists(locationId);
- // 3.2 鏍¢獙蹇呴』濉啓浠撳簱
- if (warehouseId == null) {
- throw exception(WM_WAREHOUSE_REQUIRED);
- }
- // 3.3 鏍¢獙搴撳尯鏄惁灞炰簬璇ヤ粨搴�
- if (ObjUtil.notEqual(location.getWarehouseId(), warehouseId)) {
- throw exception(WM_WAREHOUSE_LOCATION_RELATION_INVALID);
- }
- }
-
- // 4. 鏍¢獙搴撲綅锛氬鏋滃~鍐欎簡搴撲綅锛屽繀椤诲~鍐欏簱鍖猴紝涓斿簱浣嶅繀椤诲睘浜庤搴撳尯
- if (areaId == null) {
- return;
- }
- // 4.1 鏍¢獙搴撲綅鏄惁瀛樺湪
- MesWmWarehouseAreaDO area = areaService.validateWarehouseAreaExists(areaId);
- // 4.2 鏍¢獙蹇呴』濉啓搴撳尯
- if (locationId == null) {
- throw exception(WM_WAREHOUSE_LOCATION_REQUIRED);
- }
- // 4.3 鏍¢獙搴撲綅鏄惁灞炰簬璇ュ簱鍖�
- if (ObjUtil.notEqual(area.getLocationId(), locationId)) {
- throw exception(WM_WAREHOUSE_AREA_RELATION_INVALID);
- }
+ warehouseService.validateWarehouseExists(warehouseId);
}
private void validateWorkstationCodeUnique(Long id, String code) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/batch/MesProBatchServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/batch/MesProBatchServiceImpl.java
index 084b5a0..43946d8 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/batch/MesProBatchServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/batch/MesProBatchServiceImpl.java
@@ -20,9 +20,7 @@
import cn.iocoder.yudao.module.mes.dal.mysql.pro.batch.MesProBatchWorkerMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.pallet.MesProPalletMapper;
import cn.iocoder.yudao.module.mes.dal.redis.MesCodeRedisDAO;
-import cn.iocoder.yudao.module.mes.enums.md.autocode.MesMdAutoCodeRuleCodeEnum;
import cn.iocoder.yudao.module.mes.enums.pro.MesProBatchStatusEnum;
-import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
import cn.iocoder.yudao.module.mes.service.pro.line.MesProLineService;
import cn.iocoder.yudao.module.mes.service.pro.bagcode.MesProBagCodeService;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
@@ -35,12 +33,14 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
+import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
+import java.util.regex.Pattern;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
@@ -55,6 +55,12 @@
@Validated
@Slf4j
public class MesProBatchServiceImpl implements MesProBatchService {
+
+ /**
+ * 鎵规鍙锋牸寮忥細4 浣嶅勾浠� + 3 浣嶆祦姘达紙濡� 2026001锛�
+ */
+ private static final Pattern BATCH_CODE_PATTERN = Pattern.compile("^[0-9]{7}$");
+ private static final int BATCH_CODE_MAX_SERIAL = 999;
@Resource
private MesProBatchMapper batchMapper;
@@ -78,8 +84,6 @@
private MesCodeRedisDAO codeRedisDao;
@Resource
- private MesMdAutoCodeRecordService autoCodeRecordService;
- @Resource
private AdminUserApi adminUserApi;
@Resource
private MesProLineService lineService;
@@ -94,8 +98,8 @@
validateRelations(createReqVO);
createReqVO.setItemId(resolveBindingItem(null, createReqVO));
- // 2. 鐢熸垚鎵规鍙凤紙缂栫爜瑙勫垯锛氬墠缂� + 鏃ユ湡 + 浜х嚎缂栫爜 + 娴佹按鍙凤級
- String code = generateBatchCode(line.getCode());
+ // 2. 纭畾鎵规鍙凤紙浜哄伐杈撳叆浼樺厛锛屾湭杈撳叆鍒欐寜銆屽勾浠�+3浣嶆祦姘淬�嶈嚜鍔ㄧ敓鎴愶級
+ String code = resolveBatchCode(createReqVO.getCode(), null);
// 3. 鎻掑叆鎵规锛堜骇绾跨紪鐮�/鍚嶇О鍐椾綑鍥炲~锛涘嬀閫夌粦瀹氭墭鐩樻椂鎵规鐩存帴杩涘叆鐢熶骇涓級
boolean hasBindings = hasBindings(createReqVO);
@@ -152,11 +156,11 @@
if (StrUtil.isNotEmpty(batch.getCode())) {
throw exception(PRO_BATCH_ALREADY_FILLED);
}
- // 2. 鏍¢獙鍏宠仈鏁版嵁骞剁敓鎴愭寮忔壒娆″彿
+ // 2. 鏍¢獙鍏宠仈鏁版嵁骞剁‘瀹氭寮忔壒娆″彿锛堜汉宸ヨ緭鍏ヤ紭鍏堬紝鏈緭鍏ュ垯鑷姩鐢熸垚锛�
MesProLineDO line = lineService.validateLineExistsAndEnable(fillReqVO.getLineId());
validateRelations(fillReqVO);
fillReqVO.setItemId(resolveBindingItem(batch, fillReqVO));
- String code = generateBatchCode(line.getCode());
+ String code = resolveBatchCode(fillReqVO.getCode(), null);
// 3. 钀藉簱涓氬姟淇℃伅锛堜繚鐣欎复鏃舵壒娆$爜鐢ㄤ簬鍘嗗彶鎵爜杩芥函锛涗骇绾跨紪鐮�/鍚嶇О鍐椾綑鍥炲~锛涘嬀閫夌粦瀹氭墭鐩樻椂鎵规鐩存帴杩涘叆鐢熶骇涓級
boolean hasBindings = hasBindings(fillReqVO);
MesProBatchDO updateObj = BeanUtils.toBean(fillReqVO, MesProBatchDO.class)
@@ -187,17 +191,14 @@
validateRelations(updateReqVO);
updateReqVO.setItemId(resolveBindingItem(oldBatch, updateReqVO));
- // 3. 鏈敓鎴愭寮忔壒娆″彿鎴栦骇绾垮彉鍖栨椂閲嶆柊鐢熸垚鎵规鍙凤紙鎵规鍙峰寘鍚骇绾跨紪鐮佽绱狅級
+ // 3. 鎵规鍙蜂粎鍚勾浠戒笌娴佹按鍙凤紝鐢熸垚鍚庝笉鍐嶉殢浜х嚎鍙樺寲锛涙湭鐢熸垚姝e紡鎵规鍙锋椂琛ョ敓鎴�
boolean codeEmpty = StrUtil.isEmpty(oldBatch.getCode());
boolean lineChanged = !Objects.equals(oldBatch.getLineId(), updateReqVO.getLineId());
- String code = oldBatch.getCode();
+ String code = codeEmpty ? resolveBatchCode(updateReqVO.getCode(), oldBatch.getId()) : oldBatch.getCode();
MesProBatchDO updateObj = BeanUtils.toBean(updateReqVO, MesProBatchDO.class);
- if (codeEmpty || lineChanged) {
- // 鍙樻洿浜х嚎鏃讹紝鐩爣浜х嚎蹇呴』鍚敤锛涙湭鍙樻洿鍒欎粎鏍¢獙瀛樺湪锛堥伩鍏嶅仠鐢ㄤ骇绾跨殑鍘嗗彶鎵规鏃犳硶缂栬緫鍏朵粬瀛楁锛�
- MesProLineDO line = (lineChanged || codeEmpty)
- ? lineService.validateLineExistsAndEnable(updateReqVO.getLineId())
- : lineService.validateLineExists(updateReqVO.getLineId());
- code = generateBatchCode(line.getCode());
+ if (lineChanged || codeEmpty) {
+ // 鍙樻洿浜х嚎鏃讹紝鐩爣浜х嚎蹇呴』鍚敤
+ MesProLineDO line = lineService.validateLineExistsAndEnable(updateReqVO.getLineId());
updateObj.setLineCode(line.getCode()).setLineName(line.getName());
}
// 4. 鏇存柊鎵规锛堝嬀閫夌粦瀹氭墭鐩樻椂鎵规鐩存帴杩涘叆鐢熶骇涓紱鍙栨秷鍕鹃�変笉鍥為��锛屽凡缁戝畾鎵樼洏涓嶅彲瑙g粦锛�
@@ -448,16 +449,50 @@
}
/**
- * 鐢熸垚鎵规鍙�
- * <p>
- * 缂栫爜瑙勫垯锛氬浐瀹氬墠缂�(PC) + 鏃ユ湡(yyyyMMdd) + 杈撳叆瀛楃(浜х嚎缂栫爜) + 娴佹按鍙�(鎸夋棩寰幆)
+ * 纭畾鎵规鍙凤細浜哄伐杈撳叆浼樺厛锛屾湭杈撳叆鍒欐寜銆屽綋鍓嶅勾浠� + 3 浣嶆祦姘淬�嶈嚜鍔ㄧ敓鎴�
*
- * @param lineCode 浜х嚎缂栫爜
- * @return 鎵规鍙�
+ * @param requestedCode 浜哄伐杈撳叆鐨勬壒娆″彿锛屽彲涓虹┖
+ * @param selfId 褰撳墠鎵规缂栧彿锛堟洿鏂版椂鎺掗櫎鑷韩锛屾柊澧炰紶 null锛�
+ * @return 鏈�缁堟壒娆″彿
*/
- private String generateBatchCode(String lineCode) {
- String inputChar = StrUtil.emptyToDefault(lineCode, "");
- return autoCodeRecordService.generateAutoCode(MesMdAutoCodeRuleCodeEnum.PRO_BATCH_CODE.getCode(), inputChar);
+ private String resolveBatchCode(String requestedCode, Long selfId) {
+ if (StrUtil.isBlank(requestedCode)) {
+ return generateNextBatchCode();
+ }
+ String code = StrUtil.trim(requestedCode);
+ validateBatchCode(code, selfId);
+ return code;
+ }
+
+ /**
+ * 鏍¢獙鎵规鍙锋牸寮忥紙4 浣嶅勾浠� + 3 浣嶆祦姘达紝濡� 2026001锛夊強鍞竴鎬�
+ */
+ private void validateBatchCode(String code, Long selfId) {
+ if (!BATCH_CODE_PATTERN.matcher(code).matches()) {
+ throw exception(PRO_BATCH_CODE_INVALID);
+ }
+ int year = Integer.parseInt(code.substring(0, 4));
+ int serial = Integer.parseInt(code.substring(4));
+ if (year < 2000 || year > 2100 || serial < 1) {
+ throw exception(PRO_BATCH_CODE_INVALID);
+ }
+ MesProBatchDO existing = batchMapper.selectByCodeIgnoreDeleted(code);
+ if (existing != null && !Objects.equals(existing.getId(), selfId)) {
+ throw exception(PRO_BATCH_CODE_DUPLICATE, code);
+ }
+ }
+
+ /**
+ * 鐢熸垚褰撳墠骞翠唤鐨勪笅涓�涓壒娆″彿
+ */
+ private String generateNextBatchCode() {
+ String year = String.valueOf(LocalDate.now().getYear());
+ Integer maxSerial = batchMapper.selectMaxCodeSerialByYear(year);
+ int serial = codeRedisDao.allocateBatchNo(year, maxSerial);
+ if (serial > BATCH_CODE_MAX_SERIAL) {
+ throw exception(PRO_BATCH_CODE_EXHAUSTED);
+ }
+ return year + String.format("%03d", serial);
}
/**
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/pallet/MesProPalletService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/pallet/MesProPalletService.java
index 94c7ae6..fa7894c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/pallet/MesProPalletService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/pallet/MesProPalletService.java
@@ -96,6 +96,14 @@
List<MesProPalletDO> getPalletListByBatchId(Long batchId);
/**
+ * 鎵归噺鑾峰緱澶氫釜鎵规鐨勬墭鐩樼爜鍒楄〃
+ *
+ * @param batchIds 鎵规缂栧彿鍒楄〃
+ * @return 鎵樼洏鐮佸垪琛�
+ */
+ List<MesProPalletDO> getPalletListByBatchIds(Collection<Long> batchIds);
+
+ /**
* 鍒嗛〉鑾峰緱鏈粦瀹氱敓浜ф壒娆$殑涓存椂鎵樼洏锛堜緵鎵规鏂板/琛ュ綍缁戝畾鎵樼洏涓嬫媺浣跨敤锛�
*
* @param reqVO 鍒嗛〉涓庡叧閿瓧鏉′欢
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/pallet/MesProPalletServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/pallet/MesProPalletServiceImpl.java
index 40bd071..e1d5eee 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/pallet/MesProPalletServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/pallet/MesProPalletServiceImpl.java
@@ -288,6 +288,14 @@
}
@Override
+ public List<MesProPalletDO> getPalletListByBatchIds(Collection<Long> batchIds) {
+ if (CollUtil.isEmpty(batchIds)) {
+ return List.of();
+ }
+ return palletMapper.selectListByBatchIds(batchIds);
+ }
+
+ @Override
public PageResult<MesProPalletDO> getUnboundPalletPage(MesProPalletUnboundPageReqVO reqVO) {
return palletMapper.selectUnboundPage(reqVO);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/scan/MesProScanEventServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/scan/MesProScanEventServiceImpl.java
index 56a5a4e..56d99e1 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/scan/MesProScanEventServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/scan/MesProScanEventServiceImpl.java
@@ -1,5 +1,7 @@
package cn.iocoder.yudao.module.mes.service.pro.scan;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.mes.controller.admin.pro.scan.vo.MesProScanEventCreateReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.scan.vo.MesProScanEventPageReqVO;
@@ -31,9 +33,11 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.Set;
import cn.iocoder.yudao.module.mes.enums.pro.MesProBagCodeStatusEnum;
import cn.iocoder.yudao.module.mes.enums.pro.MesProPalletStatusEnum;
import cn.iocoder.yudao.module.mes.enums.pro.MesProBatchStatusEnum;
@@ -108,6 +112,8 @@
if (batch == null) return failed(event, "MES_SCAN_BATCH_NOT_EXISTS", "鐢熶骇鎵规涓嶅瓨鍦�");
batchId = batch.getId();
targetId = pallet.getId();
+ event.setPalletId(pallet.getId())
+ .setPalletCode(StrUtil.blankToDefault(pallet.getCode(), pallet.getTempCode()));
quantity = BigDecimal.valueOf(bagCodeMapper.selectPendingInboundCountByPalletId(pallet.getId()));
} else if (SCAN_TYPE_BATCH.equals(scanType)) {
batch = batchMapper.selectByScanCodeForUpdate(scanCode);
@@ -121,6 +127,9 @@
if (MesProBagCodeStatusEnum.CANCELED.getStatus().equals(bag.getStatus()))
return failed(event, "MES_SCAN_BAG_CANCELED", "琚嬬爜宸蹭綔搴燂紝涓嶅彲鍏ュ簱");
event.setBagCodeId(bag.getId());
+ if (bag.getPalletId() != null) {
+ event.setPalletId(bag.getPalletId()).setPalletCode(bag.getPalletCode());
+ }
bagCodeId = bag.getId();
// 搴撳瓨娴佹按淇濇寔鍘熻拷婧爜涓鸿鑼冪爜锛屼笟鍔$爜浠呯敤浜庢煡鎵惧悓涓�琚嬶紝閬垮厤鍙岀爜鎷嗘垚涓や唤搴撳瓨銆�
bagCode = bag.getCode();
@@ -135,7 +144,9 @@
return failed(event, "MES_SCAN_BATCH_CANCELED", "鐢熶骇鎵规宸蹭綔搴燂紝涓嶅彲鍏ュ簱");
if (quantity.signum() <= 0)
return failed(event, "MES_SCAN_NO_PENDING_BAGS", "娌℃湁寰呭叆搴撶殑鏈夋晥琚嬬爜锛岃鍕块噸澶嶅叆搴�");
- event.setBatchId(batchId).setBatchCode(batch.getCode()).setItemId(batch.getItemId()).setQuantity(quantity);
+ // 鎵规鏈ˉ褰曟寮忔壒娆″彿鏃跺洖閫�涓存椂鎵规鐮侊紝淇濊瘉浠讳綍鎵爜绫诲瀷鐨勪簨浠堕兘甯﹀嚭鎵规鐮�
+ event.setBatchId(batchId).setBatchCode(StrUtil.blankToDefault(batch.getCode(), batch.getTempCode()))
+ .setItemId(batch.getItemId()).setQuantity(quantity);
MesWmWarehouseDO warehouse = warehouseService.getWarehouseByCode(MesWmWarehouseDO.WIP_VIRTUAL_WAREHOUSE);
if (warehouse == null) return failed(event, "MES_SCAN_WIP_WAREHOUSE_NOT_EXISTS", "WIP铏氭嫙浠撲笉瀛樺湪");
event.setWarehouseId(warehouse.getId()).setLocationId(req.getLocationId()).setAreaId(req.getAreaId());
@@ -175,6 +186,109 @@
}
}
+ /**
+ * 涓烘壂鐮佷簨浠惰ˉ鍏呮墭鐩樼爜锛氭墭鐩樼爜浜嬩欢鎸夋壂鎻忓唴瀹瑰弽鏌ユ墭鐩橈紝琚嬬爜浜嬩欢鍙栨墍灞炴墭鐩橈紱
+ * 鎵规浜嬩欢鏁存壒鍙兘璺ㄥ涓墭鐩橈紝涓嶅綊灞炲崟涓�鎵樼洏锛屼繚鎸佷负绌恒��
+ * <p>
+ * 鎵樼洏鐮佷笉钀藉簱锛岃鍙栨椂瀹炴椂鍙嶆煡锛屼繚璇佸巻鍙蹭簨浠朵篃鑳藉睍绀恒��
+ */
+ private void fillPalletInfo(List<MesProScanEventDO> events) {
+ if (CollUtil.isEmpty(events)) {
+ return;
+ }
+ // 1. 鎵樼洏鐮佷簨浠讹細鎵弿鍐呭鍙兘鏄笟鍔$爜銆佹寮忕爜鎴栦复鏃剁爜锛岀粺涓�鍙嶆煡
+ List<String> palletScanCodes = events.stream()
+ .filter(event -> SCAN_TYPE_PALLET.equals(event.getScanType()) && StrUtil.isNotBlank(event.getBagCode()))
+ .map(MesProScanEventDO::getBagCode).distinct().toList();
+ Map<String, MesProPalletDO> palletByScanCode = new HashMap<>();
+ if (CollUtil.isNotEmpty(palletScanCodes)) {
+ for (MesProPalletDO pallet : palletMapper.selectListByScanCodes(palletScanCodes)) {
+ if (StrUtil.isNotBlank(pallet.getBusinessCode())) {
+ palletByScanCode.put(pallet.getBusinessCode(), pallet);
+ }
+ if (StrUtil.isNotBlank(pallet.getCode())) {
+ palletByScanCode.put(pallet.getCode(), pallet);
+ }
+ if (StrUtil.isNotBlank(pallet.getTempCode())) {
+ palletByScanCode.put(pallet.getTempCode(), pallet);
+ }
+ }
+ }
+ // 2. 琚嬬爜浜嬩欢锛氭寜琚嬬爜缂栧彿鎴栫爜鍊煎弽鏌ヨ鐮侊紝鍐嶅彇鎵�灞炴墭鐩�
+ List<Long> bagIds = events.stream()
+ .filter(event -> SCAN_TYPE_BAG.equals(event.getScanType()))
+ .map(MesProScanEventDO::getBagCodeId).filter(Objects::nonNull).distinct().toList();
+ List<String> bagScanCodes = events.stream()
+ .filter(event -> SCAN_TYPE_BAG.equals(event.getScanType()) && StrUtil.isNotBlank(event.getBagCode()))
+ .map(MesProScanEventDO::getBagCode).distinct().toList();
+ Map<Long, MesProBagCodeDO> bagById = new HashMap<>();
+ Map<String, MesProBagCodeDO> bagByScanCode = new HashMap<>();
+ if (CollUtil.isNotEmpty(bagIds)) {
+ for (MesProBagCodeDO bag : bagCodeMapper.selectBatchIds(bagIds)) {
+ bagById.put(bag.getId(), bag);
+ }
+ }
+ if (CollUtil.isNotEmpty(bagScanCodes)) {
+ for (MesProBagCodeDO bag : bagCodeMapper.selectListByScanCodes(bagScanCodes)) {
+ bagByScanCode.putIfAbsent(bag.getCode(), bag);
+ if (StrUtil.isNotBlank(bag.getBusinessCode())) {
+ bagByScanCode.putIfAbsent(bag.getBusinessCode(), bag);
+ }
+ }
+ }
+ // 3. 琚嬬爜鍐椾綑鎵樼洏鐮佷负绌烘椂锛屽洖鏌ユ墭鐩樺彇姝e紡鐮�/涓存椂鐮�
+ Set<Long> missingPalletIds = new HashSet<>();
+ for (MesProBagCodeDO bag : bagById.values()) {
+ if (bag.getPalletId() != null && StrUtil.isBlank(bag.getPalletCode())) {
+ missingPalletIds.add(bag.getPalletId());
+ }
+ }
+ for (MesProBagCodeDO bag : bagByScanCode.values()) {
+ if (bag.getPalletId() != null && StrUtil.isBlank(bag.getPalletCode())) {
+ missingPalletIds.add(bag.getPalletId());
+ }
+ }
+ Map<Long, MesProPalletDO> palletById = new HashMap<>();
+ if (CollUtil.isNotEmpty(missingPalletIds)) {
+ for (MesProPalletDO pallet : palletMapper.selectBatchIds(missingPalletIds)) {
+ palletById.put(pallet.getId(), pallet);
+ }
+ }
+ for (MesProScanEventDO event : events) {
+ if (StrUtil.isNotBlank(event.getPalletCode())) {
+ continue;
+ }
+ if (SCAN_TYPE_PALLET.equals(event.getScanType())) {
+ MesProPalletDO pallet = palletByScanCode.get(event.getBagCode());
+ if (pallet != null) {
+ event.setPalletId(pallet.getId())
+ .setPalletCode(StrUtil.blankToDefault(pallet.getCode(), pallet.getTempCode()));
+ }
+ } else if (SCAN_TYPE_BAG.equals(event.getScanType())) {
+ MesProBagCodeDO bag = event.getBagCodeId() != null
+ ? bagById.get(event.getBagCodeId()) : bagByScanCode.get(event.getBagCode());
+ if (bag == null || bag.getPalletId() == null) {
+ continue;
+ }
+ event.setPalletId(bag.getPalletId());
+ if (StrUtil.isNotBlank(bag.getPalletCode())) {
+ event.setPalletCode(bag.getPalletCode());
+ } else {
+ MesProPalletDO pallet = palletById.get(bag.getPalletId());
+ if (pallet != null) {
+ event.setPalletCode(StrUtil.blankToDefault(pallet.getCode(), pallet.getTempCode()));
+ }
+ }
+ }
+ }
+ }
+
+ private void fillPalletInfo(MesProScanEventDO event) {
+ if (event != null) {
+ fillPalletInfo(List.of(event));
+ }
+ }
+
private MesProScanEventDO failed(MesProScanEventDO event, String code, String message) {
event.setStatus(MesProScanEventStatusEnum.FAILED).setErrorCode(code).setErrorMessage(message)
.setFailedTime(LocalDateTime.now()).setEventTime(LocalDateTime.now());
@@ -182,13 +296,31 @@
return event;
}
- @Override public MesProScanEventDO getByEventId(String eventId) { return eventMapper.selectOne(MesProScanEventDO::getEventId, eventId); }
- @Override public PageResult<MesProScanEventDO> getPage(MesProScanEventPageReqVO reqVO) { return eventMapper.selectPage(reqVO); }
- @Override public MesProScanEventDO getLatest(String deviceCode) { return eventMapper.selectLatest(deviceCode); }
- @Override public List<MesProScanEventDO> getByBatchId(Long batchId) { return eventMapper.selectListByBatchId(batchId); }
+ @Override public MesProScanEventDO getByEventId(String eventId) {
+ MesProScanEventDO event = eventMapper.selectOne(MesProScanEventDO::getEventId, eventId);
+ fillPalletInfo(event);
+ return event;
+ }
+ @Override public PageResult<MesProScanEventDO> getPage(MesProScanEventPageReqVO reqVO) {
+ PageResult<MesProScanEventDO> page = eventMapper.selectPage(reqVO);
+ fillPalletInfo(page.getList());
+ return page;
+ }
+ @Override public MesProScanEventDO getLatest(String deviceCode) {
+ MesProScanEventDO event = eventMapper.selectLatest(deviceCode);
+ fillPalletInfo(event);
+ return event;
+ }
+ @Override public List<MesProScanEventDO> getByBatchId(Long batchId) {
+ List<MesProScanEventDO> events = eventMapper.selectListByBatchId(batchId);
+ fillPalletInfo(events);
+ return events;
+ }
@Override public Map<String, Object> getDashboard() {
Map<String, Object> result = new HashMap<>();
- result.put("latest", eventMapper.selectLatest(null));
+ MesProScanEventDO latest = eventMapper.selectLatest(null);
+ fillPalletInfo(latest);
+ result.put("latest", latest);
result.put("total", eventMapper.selectCount(null));
result.put("success", eventMapper.selectCount(new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<MesProScanEventDO>().eq(MesProScanEventDO::getStatus, MesProScanEventStatusEnum.SUCCESS)));
result.put("failed", eventMapper.selectCount(new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<MesProScanEventDO>().eq(MesProScanEventDO::getStatus, MesProScanEventStatusEnum.FAILED)));
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedIndicatorRangeService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedIndicatorRangeService.java
index 0318ac7..80fe407 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedIndicatorRangeService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedIndicatorRangeService.java
@@ -1,45 +1,121 @@
package cn.iocoder.yudao.module.mes.service.qc.seedquality;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedIndicatorRangeSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.seedquality.MesQcSeedIndicatorRangeDO;
import cn.iocoder.yudao.module.mes.dal.mysql.qc.seedquality.MesQcSeedIndicatorRangeMapper;
+import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.LinkedHashMap;
import java.util.List;
-import java.util.Set;
-import java.math.BigDecimal;
-import java.util.stream.Collectors;
+import java.util.Map;
@Service
public class MesQcSeedIndicatorRangeService {
- private static final Set<String> CODES = Set.of("purity", "cleanliness", "germination_rate", "moisture");
- @Resource private MesQcSeedIndicatorRangeMapper mapper;
- public List<MesQcSeedIndicatorRangeDO> getRanges() {
- return mapper.selectList().stream().filter(item -> CODES.contains(item.getIndicatorCode())).toList();
+ @Resource
+ private MesQcSeedIndicatorRangeMapper mapper;
+ @Resource
+ private MesMdmItemService mdmItemService;
+
+ /** 閰嶇疆椤垫煡璇細itemId 涓虹┖琛ㄧず閫氱敤榛樿椤� */
+ public List<MesQcSeedIndicatorRangeDO> getRanges(Long itemId, String keyword, Integer status) {
+ return mapper.selectListByItemId(itemId, keyword, status);
+ }
+
+ /**
+ * 鐢熸晥鎸囨爣锛氫骇鍝佷笓灞為厤缃紭鍏堬紝鏈厤缃椂鍥為��閫氱敤榛樿椤广��
+ */
+ public List<MesQcSeedIndicatorRangeDO> getEffectiveRanges(Long itemId) {
+ List<MesQcSeedIndicatorRangeDO> productRanges = itemId == null ? List.of() : mapper.selectEnabledByItemId(itemId);
+ return productRanges.isEmpty() ? mapper.selectEnabledDefaults() : productRanges;
+ }
+
+ public Map<String, MesQcSeedIndicatorRangeDO> getEffectiveMap(Long itemId) {
+ Map<String, MesQcSeedIndicatorRangeDO> result = new LinkedHashMap<>();
+ for (MesQcSeedIndicatorRangeDO range : getEffectiveRanges(itemId)) {
+ result.put(range.getIndicatorCode(), range);
+ }
+ return result;
}
@Transactional(rollbackFor = Exception.class)
- public void saveRanges(MesQcSeedIndicatorRangeSaveReqVO request) {
- List<MesQcSeedIndicatorRangeSaveReqVO.Item> items = request.getRanges();
- if (items == null || items.size() != CODES.size() || items.stream().anyMatch(item -> item == null || item.getIndicatorCode() == null
- || item.getMinValue() == null || item.getMaxValue() == null)
- || !items.stream().map(MesQcSeedIndicatorRangeSaveReqVO.Item::getIndicatorCode)
- .collect(Collectors.toSet()).equals(CODES))
- throw new IllegalArgumentException("蹇呴』瀹屾暣閰嶇疆绾害銆佸噣搴︺�佸彂鑺界巼銆佹按鍒嗗洓椤规寚鏍�");
- for (MesQcSeedIndicatorRangeSaveReqVO.Item item : items) {
- if (item.getMinValue().compareTo(BigDecimal.ZERO) < 0 || item.getMaxValue().compareTo(new BigDecimal("100")) > 0
- || item.getMinValue().compareTo(item.getMaxValue()) > 0)
- throw new IllegalArgumentException("鎸囨爣鍚堟牸鑼冨洿蹇呴』澶勪簬 0鈥�100 涓斾笅闄愪笉澶т簬涓婇檺锛�" + item.getIndicatorCode());
- MesQcSeedIndicatorRangeDO row = new MesQcSeedIndicatorRangeDO();
- row.setIndicatorCode(item.getIndicatorCode());
- row.setMinValue(item.getMinValue());
- row.setMaxValue(item.getMaxValue());
- if (mapper.selectById(item.getIndicatorCode()) == null) mapper.insert(row);
- else mapper.updateById(row);
- }
+ public Long create(MesQcSeedIndicatorRangeSaveReqVO reqVO) {
+ validateProduct(reqVO.getItemId());
+ validateRange(reqVO);
+ if (mapper.selectByItemIdAndCode(reqVO.getItemId(), reqVO.getIndicatorCode()) != null)
+ throw new IllegalArgumentException("璇ヤ骇鍝佸凡瀛樺湪鐩稿悓缂栫爜鐨勮川妫�椤癸細" + reqVO.getIndicatorCode());
+ MesQcSeedIndicatorRangeDO row = buildRow(reqVO);
+ mapper.insert(row);
+ return row.getId();
}
+ @Transactional(rollbackFor = Exception.class)
+ public void update(Long id, MesQcSeedIndicatorRangeSaveReqVO reqVO) {
+ MesQcSeedIndicatorRangeDO existing = mapper.selectById(id);
+ if (existing == null) throw new IllegalArgumentException("璐ㄦ椤逛笉瀛樺湪鎴栧凡鍒犻櫎");
+ validateProduct(reqVO.getItemId());
+ validateRange(reqVO);
+ MesQcSeedIndicatorRangeDO sameCode = mapper.selectByItemIdAndCode(reqVO.getItemId(), reqVO.getIndicatorCode());
+ if (sameCode != null && !sameCode.getId().equals(id))
+ throw new IllegalArgumentException("璇ヤ骇鍝佸凡瀛樺湪鐩稿悓缂栫爜鐨勮川妫�椤癸細" + reqVO.getIndicatorCode());
+ MesQcSeedIndicatorRangeDO update = buildRow(reqVO);
+ update.setId(id);
+ mapper.updateById(update);
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(Long id) {
+ MesQcSeedIndicatorRangeDO existing = mapper.selectById(id);
+ if (existing == null) throw new IllegalArgumentException("璐ㄦ椤逛笉瀛樺湪鎴栧凡鍒犻櫎");
+ mapper.deleteById(id);
+ }
+
+ /** 灏嗛�氱敤榛樿椤瑰鍒跺埌鎸囧畾浜у搧锛屽凡瀛樺湪鐨勭紪鐮佽烦杩� */
+ @Transactional(rollbackFor = Exception.class)
+ public int copyDefaults(Long itemId) {
+ validateProduct(itemId);
+ int copied = 0;
+ for (MesQcSeedIndicatorRangeDO source : mapper.selectEnabledDefaults()) {
+ if (mapper.selectByItemIdAndCode(itemId, source.getIndicatorCode()) != null) continue;
+ MesQcSeedIndicatorRangeDO row = new MesQcSeedIndicatorRangeDO();
+ row.setItemId(itemId);
+ row.setIndicatorCode(source.getIndicatorCode());
+ row.setIndicatorName(source.getIndicatorName());
+ row.setUnit(source.getUnit());
+ row.setMinValue(source.getMinValue());
+ row.setMaxValue(source.getMaxValue());
+ row.setSort(source.getSort());
+ row.setStatus(0);
+ mapper.insert(row);
+ copied++;
+ }
+ return copied;
+ }
+
+ private void validateProduct(Long itemId) {
+ if (itemId == null) throw new IllegalArgumentException("璇峰厛閫夋嫨浜у搧");
+ if (mdmItemService.getItem(itemId) == null) throw new IllegalArgumentException("浜у搧涓嶅瓨鍦紝璇烽噸鏂伴�夋嫨");
+ }
+
+ private void validateRange(MesQcSeedIndicatorRangeSaveReqVO reqVO) {
+ if (reqVO.getMinValue().compareTo(reqVO.getMaxValue()) > 0)
+ throw new IllegalArgumentException("鍚堟牸涓嬮檺涓嶈兘澶т簬涓婇檺锛�" + reqVO.getIndicatorName());
+ }
+
+ private MesQcSeedIndicatorRangeDO buildRow(MesQcSeedIndicatorRangeSaveReqVO reqVO) {
+ MesQcSeedIndicatorRangeDO row = new MesQcSeedIndicatorRangeDO();
+ row.setItemId(reqVO.getItemId());
+ row.setIndicatorCode(reqVO.getIndicatorCode().trim());
+ row.setIndicatorName(reqVO.getIndicatorName().trim());
+ row.setUnit(StrUtil.blankToDefault(reqVO.getUnit(), "%"));
+ row.setMinValue(reqVO.getMinValue());
+ row.setMaxValue(reqVO.getMaxValue());
+ row.setSort(reqVO.getSort() == null ? 0 : reqVO.getSort());
+ row.setStatus(reqVO.getStatus() == null ? 0 : reqVO.getStatus());
+ return row;
+ }
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityService.java
index 66740af..c08b644 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityService.java
@@ -14,19 +14,46 @@
java.util.Map<String, Object> resolveScan(String code);
java.util.Map<String, Object> resolveScan(String code, String scanType);
+ java.util.Map<String, Object> resolveScan(String code, String scanType, Integer qcLine);
java.util.Map<String, Object> submitGroup(cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityGroupSubmitReqVO reqVO);
void retest(Long id, cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityRetestReqVO reqVO);
void retestBatch(cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityBatchRetestReqVO reqVO);
java.util.Map<String, Object> resolveRetestScope(String code, String scanType);
+ java.util.Map<String, Object> resolveRetestScope(String code, String scanType, Integer qcLine);
java.util.Map<String, Object> retestScope(cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityScopeRetestReqVO reqVO);
void processApprove(Long id, boolean approved, String opinion);
void companyApprove(Long id, boolean approved, String opinion);
void processApproveBatch(List<Long> ids, boolean approved, String opinion);
void companyApproveBatch(List<Long> ids, boolean approved, String opinion);
+ /** 瑙f瀽缁忛攢鍟嗛��璐у崟鐨勫緟璐ㄦ淇℃伅 */
+ java.util.Map<String, Object> resolveReturnQuality(Long returnSalesId);
+ /** 鎻愪氦缁忛攢鍟嗛��璐ц川妫� */
+ Long submitReturnQuality(cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedReturnQualitySubmitReqVO reqVO);
+ /** 缁忛攢鍟嗛��璐ц川妫�閿�鍞儴棰嗗瀹℃壒 */
+ void returnApprove(Long id, boolean approved, String opinion);
+ /** 绠$悊鍛樺湪娴佺▼瀹氫箟鍙戝竷鍚庯紝瀵瑰皻鏈敓鎴� BPM 瀹炰緥鐨勮褰曢噸璇曞彂璧峰鎵广�� */
+ void retryBpmProcess(Long id);
+
+ /** BPM 鍥炶皟锛氭湰绾块瀵煎鎵瑰畬鎴� */
+ void handleLineProcessResult(String processInstanceId, Integer qcLine, String batchCode, boolean approved, String reason);
+ /** BPM 鍥炶皟锛氬叕鍙歌川妫�瀹℃壒瀹屾垚锛坆usinessKey 涓虹敓浜ф壒娆″彿锛屽巻鍙叉暟鎹彲鑳戒负琚嬬爜锛� */
+ void handleCompanyProcessResult(String processInstanceId, String businessKey, boolean approved, String reason);
+ /** BPM 鍥炶皟锛氱粡閿�鍟嗛��璐ч攢鍞儴瀹℃壒瀹屾垚 */
+ void handleReturnProcessResult(String processInstanceId, Long returnSalesId, boolean approved, String reason);
+
PageResult<MesQcSeedQualityDO> getQualityPage(MesQcSeedQualityPageReqVO reqVO);
/**
+ * 鎸夌敓浜ф壒娆″垎缁勫垎椤垫煡璇㈣川妫�璁板綍姹囨�伙紝鏈粦瀹氭壒娆$殑璁板綍褰掑叆绌烘壒娆$粍銆�
+ *
+ * @param reqVO 鏌ヨ鏉′欢锛堜笌鏄庣粏鍒嗛〉涓�鑷达級
+ * @return 鎵规鍒嗙粍鍒嗛〉缁撴灉
+ */
+ PageResult<cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityBatchRespVO>
+ getQualityBatchPage(MesQcSeedQualityPageReqVO reqVO);
+
+ /**
* 鏍规嵁鎵规鍙锋煡璇㈣川妫�璁板綍锛堟寜妫�楠屾椂闂村�掑簭锛屽彇鏈�鏂帮級锛岀敤浜庡叕寮�婧簮銆�
* 绉嶅瓙璐ㄦ琛ㄦ湭鍒濆鍖栨椂杩斿洖绌哄垪琛紙瀹归敊锛屼笉褰卞搷杩芥函锛夈��
*
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityServiceImpl.java
index 67f0fc5..f8ac385 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityServiceImpl.java
@@ -5,12 +5,21 @@
import cn.hutool.json.JSONUtil;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityBatchRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualitySubmitReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedReturnQualitySubmitReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
+import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.bagcode.MesProBagCodeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.batch.MesProBatchDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.seedquality.*;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesLineDO;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnSalesStatusEnum;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstock.MesWmMaterialStockDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
@@ -31,6 +40,8 @@
import cn.iocoder.yudao.module.mes.service.pro.batch.MesProBatchService;
import cn.iocoder.yudao.module.mes.service.qc.approver.MesQcApproverService;
import cn.iocoder.yudao.module.mes.service.wm.materialstockbag.MesWmMaterialStockBagService;
+import cn.iocoder.yudao.module.mes.service.wm.returnsales.MesWmReturnSalesLineService;
+import cn.iocoder.yudao.module.mes.service.wm.returnsales.MesWmReturnSalesService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
@@ -41,10 +52,15 @@
import org.springframework.jdbc.BadSqlGrammarException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionSynchronization;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
+import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.invalidParamException;
@@ -55,11 +71,23 @@
@Service @Validated @Slf4j
public class MesQcSeedQualityServiceImpl implements MesQcSeedQualityService {
- private static final Set<String> REQUIRED = Set.of("purity", "cleanliness", "germination_rate", "moisture");
private static final int MAX_BATCH_SIZE = 500, WRITE_BATCH_SIZE = 100;
private static final int WAIT_RETEST = 10, WAIT_PROCESS = 20, WAIT_INITIAL_FAIL_REVIEW = 25, WAIT_COMPANY = 30,
RELEASED = 40, WAIT_INITIAL_RECHECK = 50, WAIT_COMPANY_FAIL = 60, SCRAPPED = 70;
+ /** 璐ㄦ绾匡細1 鍔犲伐閮紱2 閿�鍞儴 */
+ private static final int QC_LINE_PROCESS = 1, QC_LINE_SALES = 2;
+ /** 涓氬姟绫诲瀷锛�1 鐢熶骇鍏ュ簱璐ㄦ锛�2 缁忛攢鍟嗛��璐ц川妫� */
+ private static final int BIZ_TYPE_PRODUCTION = 1, BIZ_TYPE_RETURN = 2;
+ /** 鏈嚎棰嗗瀹℃壒娴佺▼瀹氫箟鏍囪瘑 */
+ private static final String LINE_PROCESS_KEY = "mes_seed_quality_line_approve";
+ /** 鍏徃璐ㄦ瀹℃壒娴佺▼瀹氫箟鏍囪瘑 */
+ private static final String COMPANY_PROCESS_KEY = "mes_seed_quality_company_approve";
+ /** 缁忛攢鍟嗛��璐ц川妫�瀹℃壒娴佺▼瀹氫箟鏍囪瘑 */
+ private static final String RETURN_PROCESS_KEY = "mes_seed_return_approve";
@Resource private MesQcSeedQualityMapper qualityMapper;
+ @Resource private BpmProcessInstanceApi processInstanceApi;
+ @Resource private MesWmReturnSalesService returnSalesService;
+ @Resource private MesWmReturnSalesLineService returnSalesLineService;
@Resource private MesQcApproverService approverService;
@Resource private MesQcSeedQualityActionMapper actionMapper;
@Resource private MesQcSeedQualityIndicatorMapper indicatorMapper;
@@ -75,14 +103,93 @@
@Resource private MesWmWarehouseService warehouseService;
@Resource private MesWmWarehouseLocationService warehouseLocationService;
@Resource private MesWmWarehouseAreaService warehouseAreaService;
+ @Resource private MesMdmItemService mdmItemService;
+ @Resource private MesQcSeedIndicatorRangeService rangeService;
@Override
public PageResult<MesQcSeedQualityDO> getQualityPage(MesQcSeedQualityPageReqVO reqVO) {
+ resolveBagScanCode(reqVO);
+ return qualityMapper.selectPage(reqVO);
+ }
+
+ @Override
+ public PageResult<MesQcSeedQualityBatchRespVO> getQualityBatchPage(MesQcSeedQualityPageReqVO reqVO) {
+ resolveBagScanCode(reqVO);
+ int pageNo = reqVO.getPageNo() == null || reqVO.getPageNo() < 1 ? 1 : reqVO.getPageNo();
+ int pageSize = reqVO.getPageSize() == null || reqVO.getPageSize() < 1 ? 10 : Math.min(reqVO.getPageSize(), 100);
+ long total = qualityMapper.countBatchGroups(reqVO);
+ if (total == 0) {
+ return new PageResult<>(Collections.emptyList(), 0L);
+ }
+ List<MesQcSeedQualityBatchRespVO> list = qualityMapper.selectBatchGroups(reqVO, (long) (pageNo - 1) * pageSize, pageSize)
+ .stream().map(this::toBatchRespVO).collect(Collectors.toList());
+ // 鍥炲~鎵规涓庡搧绉嶄俊鎭�
+ Set<Long> batchIds = list.stream().map(MesQcSeedQualityBatchRespVO::getBatchId)
+ .filter(Objects::nonNull).collect(Collectors.toSet());
+ Map<Long, MesProBatchDO> batchMap = batchIds.isEmpty() ? Collections.emptyMap()
+ : batchMapper.selectBatchIds(batchIds).stream()
+ .collect(Collectors.toMap(MesProBatchDO::getId, Function.identity(), (first, ignored) -> first));
+ Map<Long, MesMdmItemDO> itemMap = mdmItemService.getItemMap(list.stream()
+ .map(MesQcSeedQualityBatchRespVO::getItemId).filter(Objects::nonNull).collect(Collectors.toSet()));
+ for (MesQcSeedQualityBatchRespVO vo : list) {
+ vo.setBatchLabel(StrUtil.blankToDefault(vo.getBatchCode(), "鏈粦瀹氭壒娆�"));
+ MesProBatchDO batch = batchMap.get(vo.getBatchId());
+ if (batch != null) {
+ vo.setLineName(batch.getLineName());
+ vo.setProduceDate(batch.getProduceDate());
+ }
+ MesMdmItemDO item = itemMap.get(vo.getItemId());
+ if (item != null) {
+ vo.setItemCode(item.getCode());
+ vo.setItemName(item.getName());
+ }
+ }
+ return new PageResult<>(list, total);
+ }
+
+ private void resolveBagScanCode(MesQcSeedQualityPageReqVO reqVO) {
if (StrUtil.isNotBlank(reqVO.getCode())) {
MesProBagCodeDO bag = bagCodeMapper.selectByScanCode(reqVO.getCode());
- if (bag != null) reqVO.setCode(bag.getCode());
+ if (bag != null) {
+ reqVO.setCode(bag.getCode());
+ }
}
- return qualityMapper.selectPage(reqVO);
+ }
+
+ private MesQcSeedQualityBatchRespVO toBatchRespVO(Map<String, Object> row) {
+ MesQcSeedQualityBatchRespVO vo = new MesQcSeedQualityBatchRespVO();
+ vo.setBatchCode((String) row.get("batchCode"));
+ vo.setBatchId(toLong(row.get("batchId")));
+ vo.setItemId(toLong(row.get("itemId")));
+ vo.setTotalCount(toInt(row.get("totalCount")));
+ vo.setPassCount(toInt(row.get("passCount")));
+ vo.setFailCount(toInt(row.get("failCount")));
+ vo.setProcessingCount(toInt(row.get("processingCount")));
+ vo.setPendingRetestCount(toInt(row.get("pendingRetestCount")));
+ vo.setPendingProcessReviewCount(toInt(row.get("pendingProcessReviewCount")));
+ vo.setPendingCompanyReviewCount(toInt(row.get("pendingCompanyReviewCount")));
+ vo.setReleasedCount(toInt(row.get("releasedCount")));
+ vo.setScrappedCount(toInt(row.get("scrappedCount")));
+ vo.setLastInspectedAt(toLocalDateTime(row.get("lastInspectedAt")));
+ return vo;
+ }
+
+ private static Long toLong(Object value) {
+ return value instanceof Number number ? number.longValue() : null;
+ }
+
+ private static Integer toInt(Object value) {
+ return value instanceof Number number ? number.intValue() : 0;
+ }
+
+ private static LocalDateTime toLocalDateTime(Object value) {
+ if (value instanceof LocalDateTime dateTime) {
+ return dateTime;
+ }
+ if (value instanceof Timestamp timestamp) {
+ return timestamp.toLocalDateTime();
+ }
+ return null;
}
@Override
@@ -95,9 +202,28 @@
result.put("batchCode", bag.getBatchCode());
result.put("inbound", bag.getInboundEventId() != null);
result.put("canceled", Integer.valueOf(30).equals(bag.getStatus()));
- MesQcSeedQualityDO quality = qualityMapper.selectByCode(bag.getCode());
+ Long itemId = bag.getItemId();
+ MesMdmItemDO item = itemId == null ? null : mdmItemService.getItem(itemId);
+ result.put("itemId", itemId);
+ result.put("itemCode", item == null ? null : item.getCode());
+ result.put("itemName", item == null ? null : item.getName());
+ result.put("indicators", toRangePayload(itemId));
+ List<MesQcSeedQualityDO> qualities = qualityMapper.selectListByCode(bag.getCode());
+ MesQcSeedQualityDO quality = qualities.stream()
+ .filter(q -> !isReturnQuality(q)).findFirst().orElse(null);
result.put("qualityId", quality == null ? null : quality.getId());
result.put("result", quality == null ? null : quality.getResult());
+ result.put("qualityIds", qualities.stream().map(MesQcSeedQualityDO::getId).toList());
+ result.put("qualityLines", qualities.stream()
+ .filter(q -> !isReturnQuality(q))
+ .map(q -> {
+ Map<String, Object> line = new HashMap<>();
+ line.put("id", q.getId());
+ line.put("qcLine", q.getQcLine());
+ line.put("workflowStatus", q.getWorkflowStatus());
+ return line;
+ })
+ .toList());
return result;
}
@@ -127,9 +253,17 @@
@Override
public Map<String, Object> resolveScan(String code, String scanType) {
+ return resolveScan(code, scanType, QC_LINE_PROCESS);
+ }
+
+ @Override
+ public Map<String, Object> resolveScan(String code, String scanType, Integer qcLine) {
+ requireQcLine(qcLine);
Scope scope = scope(code, scanType, false);
List<MesProBagCodeDO> effective = scope.bags().stream().filter(b -> !Integer.valueOf(30).equals(b.getStatus())).toList();
+ // 涓�娆℃彁浜ょ敓鎴愪袱鏉¤川妫�绾胯褰曪紝浠讳竴宸插瓨鍦ㄥ嵆瑙嗕负璇ヨ宸插畬鎴愬垵妫�銆�
Set<String> inspected = qualityMapper.selectListByCodes(effective.stream().map(MesProBagCodeDO::getCode).toList()).stream()
+ .filter(q -> !isReturnQuality(q))
.map(MesQcSeedQualityDO::getCode).collect(java.util.stream.Collectors.toSet());
Map<String, Object> result = new HashMap<>();
result.put("scanType", scanType); result.put("code", scope.code()); result.put("businessCode", scope.businessCode());
@@ -138,9 +272,19 @@
result.put("inbound", !effective.isEmpty() && effective.stream().allMatch(b -> b.getInboundEventId() != null));
result.put("pendingBagIds", effective.stream().filter(b -> b.getInboundEventId() != null && !inspected.contains(b.getCode())).map(MesProBagCodeDO::getId).sorted().toList());
result.put("completedBagIds", effective.stream().filter(b -> inspected.contains(b.getCode())).map(MesProBagCodeDO::getId).sorted().toList());
+ Long itemId = resolveItemId(scope);
+ MesMdmItemDO item = itemId == null ? null : mdmItemService.getItem(itemId);
+ result.put("itemId", itemId);
+ result.put("itemCode", item == null ? null : item.getCode());
+ result.put("itemName", item == null ? null : item.getName());
+ result.put("indicators", toRangePayload(itemId));
if ("BAG".equals(scanType)) {
- MesQcSeedQualityDO quality = qualityMapper.selectByCode(scope.code());
- result.put("qualityId", quality == null ? null : quality.getId()); result.put("result", quality == null ? null : quality.getResult());
+ List<MesQcSeedQualityDO> qualities = qualityMapper.selectListByCode(scope.code());
+ MesQcSeedQualityDO quality = qualities.stream()
+ .filter(q -> !isReturnQuality(q)).findFirst().orElse(null);
+ result.put("qualityId", quality == null ? null : quality.getId());
+ result.put("result", quality == null ? null : quality.getResult());
+ result.put("qualityIds", qualities.stream().map(MesQcSeedQualityDO::getId).toList());
}
return result;
}
@@ -152,7 +296,9 @@
if (scope.canceled()) throw invalidParamException("璐ㄦ瀵硅薄宸蹭綔搴�");
List<MesProBagCodeDO> effective = scope.bags().stream().filter(b -> !Integer.valueOf(30).equals(b.getStatus())).toList();
if (effective.isEmpty()) throw new IllegalArgumentException("娌℃湁鏈夋晥琚嬬爜");
+ // 涓�娆℃彁浜ゅ悓鏃剁敓鎴愪袱鏉¤川妫�绾胯褰曪紝浠讳竴宸插瓨鍦ㄥ嵆瑙嗕负璇ヨ宸茶川妫�銆�
Set<String> inspected = qualityMapper.selectListByCodes(effective.stream().map(MesProBagCodeDO::getCode).toList()).stream()
+ .filter(q -> !isReturnQuality(q))
.map(MesQcSeedQualityDO::getCode).collect(java.util.stream.Collectors.toSet());
List<MesProBagCodeDO> pendingPreview = effective.stream().filter(b -> b.getInboundEventId() != null && !inspected.contains(b.getCode()))
.sorted(Comparator.comparing(MesProBagCodeDO::getId)).toList();
@@ -168,7 +314,8 @@
Set<Long> currentIds = current.bags().stream().filter(b -> !Integer.valueOf(30).equals(b.getStatus())).map(MesProBagCodeDO::getId).collect(java.util.stream.Collectors.toSet());
if (!currentIds.containsAll(confirmed))
throw new IllegalArgumentException("琚嬬爜褰掑睘宸插彉鍖栵紝璇烽噸鏂版壂鎻忔牳瀵�");
- if (!qualityMapper.selectListByCodesForUpdate(locked.stream().map(MesProBagCodeDO::getCode).toList()).isEmpty())
+ if (qualityMapper.selectListByCodesForUpdate(locked.stream().map(MesProBagCodeDO::getCode).toList()).stream()
+ .anyMatch(q -> !isReturnQuality(q)))
throw new IllegalArgumentException("寰呰川妫�娓呭崟宸插彉鍖栨垨宸插叏閮ㄨ川妫�锛岃閲嶆柊鎵弿锛岀姝㈤噸澶嶅鐞�");
List<MesProBagCodeDO> pending = locked.stream().sorted(Comparator.comparing(MesProBagCodeDO::getId)).toList();
submitInitialBatch(pending, req);
@@ -177,13 +324,14 @@
private void submitInitialBatch(List<MesProBagCodeDO> bags,
cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityGroupSubmitReqVO req) {
- boolean passed = validateIndicators(req.getIndicators());
- if (!passed && StrUtil.isBlank(req.getReason())) throw new IllegalArgumentException("璐ㄦ涓嶅悎鏍煎繀椤诲~鍐欏師鍥�");
Long batchId = bags.get(0).getBatchId();
if (batchId == null || bags.stream().anyMatch(bag -> !Objects.equals(batchId, bag.getBatchId())))
throw new IllegalArgumentException("鎵归噺鍒濇鍙厑璁稿悓涓�鐢熶骇鎵规鐨勮鐮�");
MesProBatchDO batch = proBatchService.getBatch(batchId);
if (batch == null || batch.getItemId() == null) throw new IllegalArgumentException("鏈牴鎹鐮佽В鏋愬埌鐗╂枡淇℃伅");
+ Map<String, IndicatorMeta> expected = requireEffectiveIndicators(batch.getItemId());
+ boolean passed = validateIndicators(req.getIndicators(), expected);
+ if (!passed && StrUtil.isBlank(req.getReason())) throw new IllegalArgumentException("璐ㄦ涓嶅悎鏍煎繀椤诲~鍐欏師鍥�");
if (Integer.valueOf(40).equals(batch.getStatus())) throw new IllegalArgumentException("鐢熶骇鎵规宸蹭綔搴燂紝鏃犳硶璐ㄦ");
MesWmBatchDO wmBatch = mesWmBatchMapper.selectByCode(batch.getCode());
if (wmBatch == null || materialStockMapper.selectTempStockCountByBatchId(wmBatch.getId()) == 0)
@@ -193,37 +341,48 @@
if (qualifiedWarehouse == null) throw exception(WM_WAREHOUSE_NOT_EXISTS);
if (!MesWmWarehouseTypeEnum.QUALIFIED.getType().equals(qualifiedWarehouse.getType()))
throw exception(WM_WAREHOUSE_TYPE_NOT_QUALIFIED);
- // 鎻愬墠鏍¢獙鍚堟牸搴撳凡閰嶇疆搴撳尯/搴撲綅锛岄伩鍏嶅妫�瀹℃牳鏀捐鏃舵墠澶辫触
- resolveQualifiedLocation(qualifiedWarehouse);
LocalDateTime now = LocalDateTime.now();
Long operatorId = getLoginUserId();
int result = passed ? 1 : 2;
- int status = passed ? WAIT_PROCESS : WAIT_INITIAL_FAIL_REVIEW;
- List<MesQcSeedQualityDO> qualities = bags.stream().map(bag -> MesQcSeedQualityDO.builder()
- .code(bag.getCode()).itemId(batch.getItemId()).batchId(batch.getId()).batchCode(batch.getCode())
- .result(result).reason(passed ? "" : req.getReason().trim()).workflowStatus(status)
- .qualifiedWarehouseId(qualifiedWarehouse.getId()).inspectorId(operatorId).inspectedAt(now).build()).toList();
+ int status = passed ? WAIT_PROCESS : WAIT_RETEST;
+ // 涓�娆℃彁浜ゅ悓鏃剁敓鎴愬姞宸ラ儴涓庨攢鍞儴涓ゆ潯璁板綍锛屾寚鏍囦笌缁撹瀹屽叏涓�鑷淬��
+ List<MesQcSeedQualityDO> qualities = new ArrayList<>(bags.size() * 2);
+ for (MesProBagCodeDO bag : bags) {
+ for (int qcLine : new int[]{QC_LINE_PROCESS, QC_LINE_SALES}) {
+ qualities.add(MesQcSeedQualityDO.builder()
+ .code(bag.getCode()).qcLine(qcLine).bizType(BIZ_TYPE_PRODUCTION)
+ .itemId(batch.getItemId()).batchId(batch.getId()).batchCode(batch.getCode())
+ .result(result).reason(passed ? "" : req.getReason().trim()).workflowStatus(status)
+ .qualifiedWarehouseId(qualifiedWarehouse.getId()).inspectorId(operatorId).inspectedAt(now).build());
+ }
+ }
qualityMapper.insertBatch(qualities, WRITE_BATCH_SIZE);
if (qualities.stream().anyMatch(quality -> quality.getId() == null))
throw new IllegalStateException("鎵归噺鍒濇璁板綍缂栧彿鐢熸垚澶辫触");
- List<MesQcSeedQualityIndicatorDO> indicators = new ArrayList<>(qualities.size() * REQUIRED.size());
+ List<MesQcSeedQualityIndicatorDO> indicators = new ArrayList<>(qualities.size() * expected.size());
List<MesQcSeedQualityActionDO> actions = new ArrayList<>(qualities.size());
for (MesQcSeedQualityDO quality : qualities) {
for (MesQcSeedQualitySubmitReqVO.Indicator item : req.getIndicators()) {
+ IndicatorMeta meta = expected.get(item.getCode());
indicators.add(MesQcSeedQualityIndicatorDO.builder().qualityId(quality.getId()).indicatorCode(item.getCode())
+ .indicatorName(meta.name()).unit(meta.unit())
.value(item.getValue()).minValue(item.getMinValue()).maxValue(item.getMaxValue()).build());
}
actions.add(newAction(quality.getId(), "INITIAL", result, req.getReason(), req.getIndicators(), operatorId, now));
}
- indicatorMapper.insertBatch(indicators, WRITE_BATCH_SIZE * REQUIRED.size());
+ indicatorMapper.insertBatch(indicators, WRITE_BATCH_SIZE * expected.size());
actionMapper.insertBatch(actions, WRITE_BATCH_SIZE);
+ String batchCode = batch.getCode();
+ if (passed) {
+ afterCommit(() -> startLineProcess(QC_LINE_PROCESS, batchCode, operatorId));
+ afterCommit(() -> startLineProcess(QC_LINE_SALES, batchCode, operatorId));
+ }
}
@Override @Transactional(rollbackFor = Exception.class)
public Long submit(MesQcSeedQualitySubmitReqVO reqVO) {
- if (reqVO.getIndicators().size() != 4) throw new IllegalArgumentException("蹇呴』鎻愪氦鍥涢」鎸囨爣");
// 绉嶅瓙璐ㄦ蹇呴』浠ヨ鐮侊紙鍗曡锛夋彁浜わ紝鐗╂枡淇℃伅鐢辫鐮佽嚜鍔ㄨВ鏋愶紝鍓嶇涓嶅啀鍗曠嫭閫夋嫨鐗╂枡
MesProBagCodeDO bag = bagCodeMapper.selectByScanCodeForUpdate(reqVO.getCode());
if (bag == null) {
@@ -232,7 +391,9 @@
if (Integer.valueOf(30).equals(bag.getStatus()) || bag.getInboundEventId() == null)
throw new IllegalArgumentException("琚嬬爜宸蹭綔搴熸垨灏氭湭鍏ュ簱锛屾棤娉曡川妫�");
// 鍙岀爜閿佸畾鍚屼竴琚嬶紝骞朵互杩芥函鐮佽褰曠粨鏋滐紝闃叉鎹㈢爜鎴栧苟鍙戦噸澶嶆墸鍑忓簱瀛樸��
- if (qualityMapper.selectByCodeForUpdate(bag.getCode()) != null) throw new IllegalArgumentException("璇ヨ鐮佸凡璐ㄦ锛岀姝㈤噸澶嶆彁浜�");
+ if (qualityMapper.selectListByCodeForUpdate(bag.getCode()).stream()
+ .anyMatch(q -> !isReturnQuality(q)))
+ throw new IllegalArgumentException("璇ヨ鐮佸凡璐ㄦ锛岀姝㈤噸澶嶆彁浜�");
MesProBatchDO batch = bag.getBatchId() == null ? null : proBatchService.getBatch(bag.getBatchId());
if (batch == null || batch.getItemId() == null) {
throw new IllegalArgumentException("鏈牴鎹鐮佽В鏋愬埌鐗╂枡淇℃伅锛岃纭鎵爜鍐呭鎴栨壒娆″彿姝g‘");
@@ -254,35 +415,39 @@
if (!MesWmWarehouseTypeEnum.QUALIFIED.getType().equals(qualifiedWarehouse.getType())) {
throw exception(WM_WAREHOUSE_TYPE_NOT_QUALIFIED);
}
- // 鎻愬墠鏍¢獙鍚堟牸搴撳凡閰嶇疆搴撳尯/搴撲綅锛岄伩鍏嶅妫�瀹℃牳鏀捐鏃舵墠澶辫触
- resolveQualifiedLocation(qualifiedWarehouse);
- Set<String> codes = new HashSet<>();
- boolean passed = true;
- MesQcSeedQualityDO quality = MesQcSeedQualityDO.builder().code(bag.getCode()).itemId(batch.getItemId())
- .batchCode(batch.getCode()).batchId(batch.getId()).reason(reqVO.getReason()).result(0)
- .qualifiedWarehouseId(qualifiedWarehouse.getId()).inspectorId(getLoginUserId())
- .inspectedAt(LocalDateTime.now()).build();
- qualityMapper.insert(quality);
- for (MesQcSeedQualitySubmitReqVO.Indicator item : reqVO.getIndicators()) {
- if (item == null || item.getCode() == null || item.getValue() == null || item.getMinValue() == null || item.getMaxValue() == null)
- throw new IllegalArgumentException("鍥涢」鎸囨爣鐨勫疄娴嬪�煎拰鏈鍚堟牸鑼冨洿蹇呴』瀹屾暣");
- if (!REQUIRED.contains(item.getCode()) || !codes.add(item.getCode())) throw new IllegalArgumentException("鎸囨爣蹇呴』涓虹函搴︺�佸噣搴︺�佸彂鑺界巼銆佹按鍒嗕笖涓嶅彲閲嶅");
- if (item.getMinValue().compareTo(item.getMaxValue()) > 0) throw new IllegalArgumentException("鎸囨爣涓嬮檺涓嶈兘澶т簬涓婇檺");
- if (item.getValue().compareTo(BigDecimal.ZERO) < 0 || item.getValue().compareTo(new BigDecimal("100")) > 0
- || item.getMinValue().compareTo(BigDecimal.ZERO) < 0 || item.getMaxValue().compareTo(new BigDecimal("100")) > 0)
- throw new IllegalArgumentException("鐧惧垎姣旀寚鏍囧繀椤诲浜� 0鈥�100");
- if (item.getValue().compareTo(item.getMinValue()) < 0 || item.getValue().compareTo(item.getMaxValue()) > 0) passed = false;
- indicatorMapper.insert(MesQcSeedQualityIndicatorDO.builder().qualityId(quality.getId()).indicatorCode(item.getCode())
- .value(item.getValue()).minValue(item.getMinValue()).maxValue(item.getMaxValue()).build());
- }
- if (!codes.equals(REQUIRED)) throw new IllegalArgumentException("鍥涢」鎸囨爣涓嶅畬鏁�");
+ Map<String, IndicatorMeta> expected = requireEffectiveIndicators(batch.getItemId());
+ boolean passed = validateIndicators(reqVO.getIndicators(), expected);
if (!passed && StrUtil.isBlank(reqVO.getReason())) throw new IllegalArgumentException("璐ㄦ涓嶅悎鏍煎繀椤诲~鍐欏師鍥�");
- quality.setResult(passed ? 1 : 2);
- quality.setWorkflowStatus(passed ? WAIT_PROCESS : WAIT_INITIAL_FAIL_REVIEW);
- qualityMapper.updateById(quality);
- recordAction(quality.getId(), "INITIAL", quality.getResult(), reqVO.getReason(), reqVO.getIndicators());
+ LocalDateTime now = LocalDateTime.now();
+ Long operatorId = getLoginUserId();
+ int result = passed ? 1 : 2;
+ int status = passed ? WAIT_PROCESS : WAIT_RETEST;
+ // 涓�娆℃彁浜ゅ悓鏃剁敓鎴愬姞宸ラ儴涓庨攢鍞儴涓ゆ潯璁板綍锛屾寚鏍囦笌缁撹瀹屽叏涓�鑷淬��
+ Long firstQualityId = null;
+ for (int qcLine : new int[]{QC_LINE_PROCESS, QC_LINE_SALES}) {
+ MesQcSeedQualityDO quality = MesQcSeedQualityDO.builder().code(bag.getCode())
+ .qcLine(qcLine).bizType(BIZ_TYPE_PRODUCTION)
+ .itemId(batch.getItemId()).batchCode(batch.getCode()).batchId(batch.getId())
+ .reason(passed ? "" : reqVO.getReason().trim()).result(result).workflowStatus(status)
+ .qualifiedWarehouseId(qualifiedWarehouse.getId()).inspectorId(operatorId)
+ .inspectedAt(now).build();
+ qualityMapper.insert(quality);
+ for (MesQcSeedQualitySubmitReqVO.Indicator item : reqVO.getIndicators()) {
+ IndicatorMeta meta = expected.get(item.getCode());
+ indicatorMapper.insert(MesQcSeedQualityIndicatorDO.builder().qualityId(quality.getId()).indicatorCode(item.getCode())
+ .indicatorName(meta.name()).unit(meta.unit())
+ .value(item.getValue()).minValue(item.getMinValue()).maxValue(item.getMaxValue()).build());
+ }
+ recordAction(quality.getId(), "INITIAL", result, reqVO.getReason(), reqVO.getIndicators());
+ if (firstQualityId == null) firstQualityId = quality.getId();
+ }
// 鍒濇浠呰褰曠粨璁猴紱琚嬩粛鐣欏湪鏆傚瓨搴擄紝寰呭垵妫�瀹℃牳銆佸妫�鍙婃渶缁堝鏍稿悗鍐嶆斁琛屾垨鎶ュ簾銆�
- return quality.getId();
+ String batchCode = batch.getCode();
+ if (passed) {
+ afterCommit(() -> startLineProcess(QC_LINE_PROCESS, batchCode, operatorId));
+ afterCommit(() -> startLineProcess(QC_LINE_SALES, batchCode, operatorId));
+ }
+ return firstQualityId;
}
private void finalizeStock(MesQcSeedQualityDO quality, boolean passed) {
@@ -370,25 +535,47 @@
MesQcSeedQualityDO quality = qualityMapper.selectByIdForUpdate(id);
if (quality == null || !Set.of(WAIT_RETEST, WAIT_INITIAL_RECHECK).contains(quality.getWorkflowStatus()))
throw new IllegalArgumentException("褰撳墠鐘舵�佷笉鑳芥彁浜ゅ妫�锛岃鍒锋柊鍚庨噸璇�");
+ boolean returnQuality = Objects.equals(quality.getBizType(), BIZ_TYPE_RETURN);
+ if (returnQuality && !Objects.equals(quality.getWorkflowStatus(), WAIT_RETEST))
+ throw new IllegalArgumentException("缁忛攢鍟嗛��璐ц川妫�褰撳墠鐘舵�佷笉鑳藉妫�锛岃鍒锋柊鍚庨噸璇�");
boolean initialRecheck = Objects.equals(quality.getWorkflowStatus(), WAIT_INITIAL_RECHECK);
if (!Objects.equals(quality.getCode(), req.getCode())) throw new IllegalArgumentException("妫�楠岃鐮佷笌鍘熻川妫�璁板綍涓嶄竴鑷�");
- boolean passed = validateIndicators(req.getIndicators());
- if (!passed && StrUtil.isBlank(req.getReason())) throw new IllegalArgumentException("妫�楠屼笉鍚堟牸蹇呴』濉啓鍘熷洜");
- recordAction(id, initialRecheck ? "INITIAL_RECHECK" : "RETEST", passed ? 1 : 2, req.getReason(), req.getIndicators());
- MesQcSeedQualityDO update = MesQcSeedQualityDO.builder().id(id).result(passed ? 1 : 2)
- .reason(passed ? "" : req.getReason().trim())
- .inspectorId(getLoginUserId()).inspectedAt(LocalDateTime.now())
- .workflowStatus(initialRecheck ? (passed ? WAIT_PROCESS : WAIT_INITIAL_FAIL_REVIEW)
- : (passed ? WAIT_COMPANY : WAIT_COMPANY_FAIL)).build();
- if (!initialRecheck) {
- update.setRetestResult(passed ? 1 : 2);
- update.setRetestedAt(LocalDateTime.now());
- }
- qualityMapper.updateById(update);
- // 椤甸潰銆佸叕寮�杩芥函璇诲彇涓绘寚鏍囪〃锛涘悓姝ヤ负鏈�鏂颁竴娆℃祴鍊硷紝鍘嗘娴嬪�煎湪鎿嶄綔鐣欑棔琛ㄤ繚鐣欍��
+ // 澶嶆娌跨敤鍘熻褰曠殑鎸囨爣闆嗗悎锛岄伩鍏嶉厤缃彉鏇村鑷村巻鍙茶褰曟棤娉曞妫�
Map<String, MesQcSeedQualityIndicatorDO> existing = new HashMap<>();
for (MesQcSeedQualityIndicatorDO indicator : indicatorMapper.selectListByQualityId(id))
existing.put(indicator.getIndicatorCode(), indicator);
+ boolean passed = validateIndicators(req.getIndicators(), toMetaMap(existing.values(), quality.getItemId()));
+ if (!passed && StrUtil.isBlank(req.getReason())) throw new IllegalArgumentException("妫�楠屼笉鍚堟牸蹇呴』濉啓鍘熷洜");
+ recordAction(id, initialRecheck ? "INITIAL_RECHECK" : "RETEST", passed ? 1 : 2, req.getReason(), req.getIndicators());
+ Long operatorId = getLoginUserId();
+ LocalDateTime now = LocalDateTime.now();
+ int nextStatus;
+ if (returnQuality) {
+ // 澶嶆缁撹缁熶竴浜ょ敱閿�鍞儴棰嗗瀹℃壒锛屼笉鍚堟牸鏃跺鎵瑰悗涓嶄簣閫�璐с��
+ nextStatus = WAIT_PROCESS;
+ } else if (initialRecheck) {
+ nextStatus = passed ? WAIT_PROCESS : WAIT_INITIAL_FAIL_REVIEW;
+ } else {
+ nextStatus = passed ? WAIT_PROCESS : WAIT_INITIAL_FAIL_REVIEW;
+ }
+ MesQcSeedQualityDO update = MesQcSeedQualityDO.builder().id(id).result(passed ? 1 : 2)
+ .reason(passed ? "" : req.getReason().trim())
+ .inspectorId(operatorId).inspectedAt(now)
+ .workflowStatus(nextStatus).build();
+ if (!initialRecheck) {
+ update.setRetestResult(passed ? 1 : 2);
+ update.setRetestedAt(now);
+ }
+ qualityMapper.updateById(update);
+ if (returnQuality) {
+ afterCommit(() -> startReturnProcess(quality, operatorId));
+ } else if (initialRecheck) {
+ afterCommit(() -> startLineProcess(quality.getQcLine(), quality.getBatchCode(), operatorId));
+ } else if (!initialRecheck) {
+ // 鍒濇涓嶅悎鏍肩殑澶嶆瀹屾垚鍚庯紝鍏堜氦鏈嚎閮ㄩ棬瀹℃壒銆�
+ afterCommit(() -> startLineProcess(quality.getQcLine(), quality.getBatchCode(), operatorId));
+ }
+ // 椤甸潰銆佸叕寮�杩芥函璇诲彇涓绘寚鏍囪〃锛涘悓姝ヤ负鏈�鏂颁竴娆℃祴鍊硷紝鍘嗘娴嬪�煎湪鎿嶄綔鐣欑棔琛ㄤ繚鐣欍��
for (MesQcSeedQualitySubmitReqVO.Indicator item : req.getIndicators()) {
MesQcSeedQualityIndicatorDO indicator = existing.get(item.getCode());
if (indicator == null) throw new IllegalArgumentException("璐ㄦ鎸囨爣璁板綍缂哄け");
@@ -404,6 +591,7 @@
validateLockedIds(ids, qualities);
String batchCode = null;
Integer workflowStatus = null;
+ Integer batchQcLine = null;
boolean first = true;
for (MesQcSeedQualityDO quality : qualities) {
if (!Set.of(WAIT_RETEST, WAIT_INITIAL_RECHECK).contains(quality.getWorkflowStatus()))
@@ -413,9 +601,12 @@
if (first) {
batchCode = quality.getBatchCode();
workflowStatus = quality.getWorkflowStatus();
+ batchQcLine = quality.getQcLine();
first = false;
- } else if (!Objects.equals(batchCode, quality.getBatchCode()) || !Objects.equals(workflowStatus, quality.getWorkflowStatus())) {
- throw new IllegalArgumentException("鎵归噺璐ㄦ鍙厑璁稿悓鐢熶骇鎵规銆佸悓娴佺▼鐘舵�佺殑璁板綍");
+ } else if (!Objects.equals(batchCode, quality.getBatchCode())
+ || !Objects.equals(workflowStatus, quality.getWorkflowStatus())
+ || !Objects.equals(batchQcLine, quality.getQcLine())) {
+ throw new IllegalArgumentException("鎵归噺璐ㄦ鍙厑璁稿悓鐢熶骇鎵规銆佸悓璐ㄦ绾垮拰鍚屾祦绋嬬姸鎬佺殑璁板綍");
}
}
applyRetestBatch(qualities, req.getIndicators(), req.getReason());
@@ -428,12 +619,19 @@
@Override
public Map<String, Object> resolveRetestScope(String code, String scanType) {
+ return resolveRetestScope(code, scanType, QC_LINE_PROCESS);
+ }
+
+ @Override
+ public Map<String, Object> resolveRetestScope(String code, String scanType, Integer qcLine) {
+ requireQcLine(qcLine);
checkRetestScanType(scanType);
Scope scope = scope(code, scanType, false);
if (scope.canceled()) throw invalidParamException("璐ㄦ瀵硅薄宸蹭綔搴�");
List<String> codes = scope.bags().stream().filter(b -> !Integer.valueOf(30).equals(b.getStatus()) && b.getInboundEventId() != null)
.map(MesProBagCodeDO::getCode).toList();
- List<MesQcSeedQualityDO> qualities = codes.isEmpty() ? List.of() : qualityMapper.selectListByCodes(codes);
+ List<MesQcSeedQualityDO> qualities = codes.isEmpty() ? List.of() : qualityMapper.selectListByCodes(codes).stream()
+ .filter(q -> Objects.equals(q.getQcLine(), qcLine) && !isReturnQuality(q)).toList();
List<Long> retestIds = qualities.stream().filter(q -> Objects.equals(q.getWorkflowStatus(), WAIT_RETEST))
.map(MesQcSeedQualityDO::getId).sorted().toList();
List<Long> initialRecheckIds = qualities.stream().filter(q -> Objects.equals(q.getWorkflowStatus(), WAIT_INITIAL_RECHECK))
@@ -454,11 +652,19 @@
result.put("pendingCompanyIds", pendingCompanyIds); result.put("pendingCompanyFailIds", pendingCompanyFailIds);
result.put("pendingProcessCount", pendingProcessIds.size() + pendingInitialFailIds.size());
result.put("pendingCompanyCount", pendingCompanyIds.size() + pendingCompanyFailIds.size());
+ Long itemId = qualities.stream().map(MesQcSeedQualityDO::getItemId).filter(Objects::nonNull).findFirst().orElse(null);
+ result.put("itemId", itemId);
+ MesQcSeedQualityDO actionable = qualities.stream()
+ .filter(q -> Set.of(WAIT_RETEST, WAIT_INITIAL_RECHECK).contains(q.getWorkflowStatus()))
+ .findFirst().orElse(null);
+ result.put("indicators", actionable == null ? List.of()
+ : toIndicatorPayload(indicatorMapper.selectListByQualityId(actionable.getId()), itemId));
return result;
}
@Override @Transactional(rollbackFor = Exception.class)
public Map<String, Object> retestScope(cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityScopeRetestReqVO req) {
+ requireQcLine(req.getQcLine());
checkRetestScanType(req.getScanType());
if (!Set.of(WAIT_RETEST, WAIT_INITIAL_RECHECK).contains(req.getWorkflowStatus()))
throw new IllegalArgumentException("鎵归噺璐ㄦ鐘舵�佹棤鏁�");
@@ -470,7 +676,8 @@
if (effective.isEmpty()) throw new IllegalArgumentException("褰撳墠鑼冨洿娌℃湁宸插叆搴撶殑鏈夋晥琚嬬爜");
Set<String> effectiveCodes = effective.stream().map(MesProBagCodeDO::getCode).collect(java.util.stream.Collectors.toSet());
List<MesQcSeedQualityDO> pendingPreview = qualityMapper.selectListByCodes(effectiveCodes).stream()
- .filter(q -> Objects.equals(q.getWorkflowStatus(), req.getWorkflowStatus()))
+ .filter(q -> Objects.equals(q.getQcLine(), req.getQcLine())
+ && !isReturnQuality(q) && Objects.equals(q.getWorkflowStatus(), req.getWorkflowStatus()))
.sorted(Comparator.comparing(MesQcSeedQualityDO::getId)).toList();
List<Long> expectedChunk = pendingPreview.stream().limit(MAX_BATCH_SIZE).map(MesQcSeedQualityDO::getId).toList();
if (expectedChunk.isEmpty() || !confirmed.equals(expectedChunk))
@@ -478,6 +685,7 @@
List<MesQcSeedQualityDO> pending = qualityMapper.selectListByIdsForUpdate(confirmed);
validateLockedIds(confirmed, pending);
if (pending.stream().anyMatch(quality -> !Objects.equals(quality.getWorkflowStatus(), req.getWorkflowStatus())
+ || !Objects.equals(quality.getQcLine(), req.getQcLine()) || isReturnQuality(quality)
|| !effectiveCodes.contains(quality.getCode())))
throw new IllegalArgumentException("寰呰川妫�璁板綍鐘舵�佹垨褰掑睘宸插彉鍖栵紝璇烽噸鏂版壂鎻忔牳瀵�");
applyRetestBatch(pending, req.getIndicators(), req.getReason());
@@ -486,29 +694,48 @@
private void applyRetestBatch(List<MesQcSeedQualityDO> qualities,
List<MesQcSeedQualitySubmitReqVO.Indicator> submittedIndicators, String reason) {
- boolean passed = validateIndicators(submittedIndicators);
- if (!passed && StrUtil.isBlank(reason)) throw new IllegalArgumentException("妫�楠屼笉鍚堟牸蹇呴』濉啓鍘熷洜");
List<Long> ids = qualities.stream().map(MesQcSeedQualityDO::getId).toList();
Map<Long, Map<String, MesQcSeedQualityIndicatorDO>> existingByQuality = new HashMap<>();
for (MesQcSeedQualityIndicatorDO indicator : indicatorMapper.selectListByQualityIds(ids)) {
existingByQuality.computeIfAbsent(indicator.getQualityId(), ignored -> new HashMap<>())
.put(indicator.getIndicatorCode(), indicator);
}
+ Map<String, MesQcSeedQualityIndicatorDO> firstIndicators = existingByQuality.get(qualities.get(0).getId());
+ Map<String, IndicatorMeta> expected = toMetaMap(
+ firstIndicators == null ? Collections.<MesQcSeedQualityIndicatorDO>emptyList() : firstIndicators.values(),
+ qualities.get(0).getItemId());
+ boolean passed = validateIndicators(submittedIndicators, expected);
+ if (!passed && StrUtil.isBlank(reason)) throw new IllegalArgumentException("妫�楠屼笉鍚堟牸蹇呴』濉啓鍘熷洜");
LocalDateTime now = LocalDateTime.now();
Long operatorId = getLoginUserId();
int result = passed ? 1 : 2;
List<MesQcSeedQualityDO> qualityUpdates = new ArrayList<>(qualities.size());
- List<MesQcSeedQualityIndicatorDO> indicatorUpdates = new ArrayList<>(qualities.size() * REQUIRED.size());
+ List<MesQcSeedQualityIndicatorDO> indicatorUpdates = new ArrayList<>(qualities.size() * submittedIndicators.size());
List<MesQcSeedQualityActionDO> actions = new ArrayList<>(qualities.size());
+ Set<String> lineProcessTargets = new HashSet<>();
+ List<MesQcSeedQualityDO> returnReady = new ArrayList<>();
for (MesQcSeedQualityDO quality : qualities) {
+ boolean returnQuality = Objects.equals(quality.getBizType(), BIZ_TYPE_RETURN);
boolean initialRecheck = Objects.equals(quality.getWorkflowStatus(), WAIT_INITIAL_RECHECK);
- if (!initialRecheck && !Objects.equals(quality.getWorkflowStatus(), WAIT_RETEST))
+ if (returnQuality && !Objects.equals(quality.getWorkflowStatus(), WAIT_RETEST))
throw new IllegalArgumentException("鎵�閫夎褰曞寘鍚笉鍙楠岀殑鐘舵�侊紝璇峰埛鏂板悗閲嶈瘯");
+ if (!returnQuality && !initialRecheck && !Objects.equals(quality.getWorkflowStatus(), WAIT_RETEST))
+ throw new IllegalArgumentException("鎵�閫夎褰曞寘鍚笉鍙楠岀殑鐘舵�侊紝璇峰埛鏂板悗閲嶈瘯");
+ int nextStatus;
+ if (returnQuality) {
+ nextStatus = WAIT_PROCESS;
+ returnReady.add(quality);
+ } else if (initialRecheck) {
+ nextStatus = passed ? WAIT_PROCESS : WAIT_INITIAL_FAIL_REVIEW;
+ lineProcessTargets.add(quality.getQcLine() + "#" + quality.getBatchCode());
+ } else {
+ nextStatus = passed ? WAIT_PROCESS : WAIT_INITIAL_FAIL_REVIEW;
+ lineProcessTargets.add(quality.getQcLine() + "#" + quality.getBatchCode());
+ }
MesQcSeedQualityDO update = MesQcSeedQualityDO.builder().id(quality.getId()).result(result)
.reason(passed ? "" : reason.trim()).inspectorId(operatorId).inspectedAt(now)
- .workflowStatus(initialRecheck ? (passed ? WAIT_PROCESS : WAIT_INITIAL_FAIL_REVIEW)
- : (passed ? WAIT_COMPANY : WAIT_COMPANY_FAIL)).build();
+ .workflowStatus(nextStatus).build();
if (!initialRecheck) {
update.setRetestResult(result);
update.setRetestedAt(now);
@@ -525,8 +752,14 @@
reason, submittedIndicators, operatorId, now));
}
qualityMapper.updateBatch(qualityUpdates, WRITE_BATCH_SIZE);
- indicatorMapper.updateBatch(indicatorUpdates, WRITE_BATCH_SIZE * REQUIRED.size());
+ indicatorMapper.updateBatch(indicatorUpdates, WRITE_BATCH_SIZE * submittedIndicators.size());
actionMapper.insertBatch(actions, WRITE_BATCH_SIZE);
+ // 澶嶆鎸夎褰曟墍灞炶川妫�绾垮垎鍒彂璧锋湰绾垮鎵癸紝閬垮厤鎻愬墠瑙﹀彂鍙︿竴鏉$嚎銆�
+ lineProcessTargets.forEach(target -> {
+ String[] parts = target.split("#", 2);
+ afterCommit(() -> startLineProcess(Integer.valueOf(parts[0]), parts[1], operatorId));
+ });
+ returnReady.forEach(quality -> afterCommit(() -> startReturnProcess(quality, operatorId)));
}
@Override @Transactional(rollbackFor = Exception.class)
@@ -534,28 +767,84 @@
MesQcSeedQualityDO quality = qualityMapper.selectByIdForUpdate(id);
if (quality == null || !Set.of(WAIT_PROCESS, WAIT_INITIAL_FAIL_REVIEW).contains(quality.getWorkflowStatus()))
throw new IllegalArgumentException("褰撳墠鐘舵�佷笉鑳借繘琛屽垵妫�瀹℃牳");
- approverService.validateApprover(MesQcApprovalTypeEnum.SEED_QUALITY.getType(),
- MesQcApproveNodeEnum.PROCESS.getNode(), getLoginUserId());
+ requireLegacyApproval(quality);
+ applyProcessApproval(quality, approved, opinion, true);
+ }
+
+ /**
+ * 鏈嚎棰嗗瀹℃壒锛氱敓浜ц川妫�閫氳繃鍚庤繘鍏ュ叕鍙歌川妫�瀹℃壒锛岄┏鍥炲悗閲嶆柊鍒濇锛涚粡閿�鍟嗛��璐ц川妫�鍒欑洿鎺ョ粓瀹°��
+ */
+ private void applyProcessApproval(MesQcSeedQualityDO quality, boolean approved, String opinion, boolean validateApprover) {
+ if (validateApprover) {
+ approverService.validateApprover(MesQcApprovalTypeEnum.SEED_QUALITY.getType(),
+ MesQcApproveNodeEnum.PROCESS.getNode(), getLoginUserId());
+ }
if (!approved && StrUtil.isBlank(opinion)) throw new IllegalArgumentException("椹冲洖鏃惰濉啓瀹℃壒鎰忚");
- int next = approved ? WAIT_RETEST : WAIT_INITIAL_RECHECK;
- qualityMapper.updateById(MesQcSeedQualityDO.builder().id(id).workflowStatus(next)
- .processApprovedAt(LocalDateTime.now()).build());
- recordAction(id, approved ? "PROCESS_APPROVE" : "PROCESS_REJECT", quality.getResult(), opinion, null);
+ LocalDateTime now = LocalDateTime.now();
+ Long operatorId = getLoginUserId();
+ if (Objects.equals(quality.getBizType(), BIZ_TYPE_RETURN)) {
+ if (!Objects.equals(quality.getWorkflowStatus(), WAIT_PROCESS))
+ throw new IllegalArgumentException("缁忛攢鍟嗛��璐ц川妫�褰撳墠鐘舵�佷笉鑳借繘琛岄攢鍞儴瀹℃壒");
+ applyReturnApproval(quality, approved, opinion, operatorId, now);
+ return;
+ }
+ int next = approved ? (Objects.equals(quality.getQcLine(), 0) ? WAIT_RETEST
+ : Objects.equals(quality.getResult(), 1) ? WAIT_COMPANY : WAIT_COMPANY_FAIL)
+ : WAIT_INITIAL_RECHECK;
+ qualityMapper.updateById(MesQcSeedQualityDO.builder().id(quality.getId()).workflowStatus(next)
+ .processApprovedAt(now).build());
+ if (!approved) qualityMapper.clearLineProcessInstance(quality.getId());
+ actionMapper.insert(newAction(quality.getId(), approved ? "PROCESS_APPROVE" : "PROCESS_REJECT",
+ quality.getResult(), opinion, null, operatorId, now));
+ if (approved && !Objects.equals(quality.getQcLine(), 0))
+ afterCommit(() -> maybeStartCompanyProcess(quality.getBatchCode(), operatorId));
}
@Override @Transactional(rollbackFor = Exception.class)
public void companyApprove(Long id, boolean approved, String opinion) {
MesQcSeedQualityDO quality = qualityMapper.selectByIdForUpdate(id);
- if (quality == null || !Set.of(WAIT_COMPANY, WAIT_COMPANY_FAIL).contains(quality.getWorkflowStatus()))
+ if (quality == null) throw new IllegalArgumentException("璐ㄦ璁板綍涓嶅瓨鍦�");
+ if (Objects.equals(quality.getBizType(), BIZ_TYPE_RETURN))
+ throw new IllegalArgumentException("缁忛攢鍟嗛��璐ц川妫�璇蜂娇鐢ㄩ攢鍞儴瀹℃壒");
+ if (!Set.of(WAIT_COMPANY, WAIT_COMPANY_FAIL).contains(quality.getWorkflowStatus()))
throw new IllegalArgumentException("褰撳墠鐘舵�佷笉鑳借繘琛屽妫�瀹℃牳");
+ requireLegacyApproval(quality);
approverService.validateApprover(MesQcApprovalTypeEnum.SEED_QUALITY.getType(),
MesQcApproveNodeEnum.COMPANY.getNode(), getLoginUserId());
+ applyCompanyApproval(quality.getCode(), approved, opinion, getLoginUserId());
+ }
+
+ /**
+ * 鍏徃璐ㄦ瀹℃壒锛氫互銆岃銆嶄负鍗曚綅鎴愬瀹℃壒锛屼袱鏉¤川妫�绾块兘璧板畬鎵嶅厑璁稿鎵广��
+ * 涓ゆ潯绾垮潎鍚堟牸鎵嶆斁琛屽叆搴擄紝浠讳竴鏉$嚎涓嶅悎鏍煎垯鏁磋鎶ュ簾锛涢┏鍥炲垯涓ゆ潯绾垮叏閮ㄩ��鍥炲妫�銆�
+ */
+ private void applyCompanyApproval(String code, boolean approved, String opinion, Long operatorId) {
if (!approved && StrUtil.isBlank(opinion)) throw new IllegalArgumentException("椹冲洖鏃惰濉啓瀹℃壒鎰忚");
- if (approved) finalizeStock(quality, quality.getWorkflowStatus() == WAIT_COMPANY);
- int next = approved ? (quality.getWorkflowStatus() == WAIT_COMPANY ? RELEASED : SCRAPPED) : WAIT_RETEST;
- qualityMapper.updateById(MesQcSeedQualityDO.builder().id(id).workflowStatus(next)
- .companyApprovedAt(LocalDateTime.now()).build());
- recordAction(id, approved ? "COMPANY_APPROVE" : "COMPANY_REJECT", quality.getResult(), opinion, null);
+ List<MesQcSeedQualityDO> pair = qualityMapper.selectListByCodeForUpdate(code).stream()
+ .filter(q -> !isReturnQuality(q)).toList();
+ if (pair.size() != 2 || pair.stream().anyMatch(q -> !Objects.equals(q.getQcLine(), QC_LINE_PROCESS)
+ && !Objects.equals(q.getQcLine(), QC_LINE_SALES)))
+ throw new IllegalArgumentException("琚嬬爜 " + code + " 鐨勫弻绾胯川妫�璁板綍涓嶅畬鏁达紝鏃犳硶鍏徃瀹℃壒");
+ if (pair.stream().anyMatch(q -> !Set.of(WAIT_COMPANY, WAIT_COMPANY_FAIL).contains(q.getWorkflowStatus())))
+ throw new IllegalArgumentException("琚嬬爜 " + code + " 鐨勫弻绾胯川妫�灏氭湭鍏ㄩ儴瀹屾垚锛屼笉鑳借繘琛屽叕鍙歌川妫�瀹℃壒");
+ boolean passed = pair.stream().allMatch(q -> Objects.equals(q.getWorkflowStatus(), WAIT_COMPANY));
+ MesQcSeedQualityDO representative = pair.stream()
+ .filter(q -> Objects.equals(q.getQcLine(), QC_LINE_PROCESS)).findFirst().orElse(pair.get(0));
+ LocalDateTime now = LocalDateTime.now();
+ if (approved) {
+ finalizeStock(representative, passed);
+ qualityMapper.updateBatch(pair.stream().map(quality -> MesQcSeedQualityDO.builder()
+ .id(quality.getId()).workflowStatus(passed ? RELEASED : SCRAPPED)
+ .companyApprovedAt(now).build()).toList(), WRITE_BATCH_SIZE);
+ } else {
+ qualityMapper.clearCompanyProcessInstance(code);
+ pair.forEach(quality -> qualityMapper.clearLineProcessInstance(quality.getId()));
+ qualityMapper.updateBatch(pair.stream().map(quality -> MesQcSeedQualityDO.builder()
+ .id(quality.getId()).workflowStatus(WAIT_RETEST).companyApprovedAt(now).build()).toList(), WRITE_BATCH_SIZE);
+ }
+ actionMapper.insertBatch(pair.stream().map(quality -> newAction(quality.getId(),
+ approved ? "COMPANY_APPROVE" : "COMPANY_REJECT", quality.getResult(), opinion, null, operatorId, now)).toList(),
+ WRITE_BATCH_SIZE);
}
@Override @Transactional(rollbackFor = Exception.class)
@@ -563,6 +852,7 @@
List<Long> confirmed = approvalIds(ids);
List<MesQcSeedQualityDO> qualities = qualityMapper.selectListByIdsForUpdate(confirmed);
validateLockedIds(confirmed, qualities);
+ qualities.forEach(MesQcSeedQualityServiceImpl::requireLegacyApproval);
if (qualities.stream().anyMatch(quality -> !Set.of(WAIT_PROCESS, WAIT_INITIAL_FAIL_REVIEW).contains(quality.getWorkflowStatus())))
throw new IllegalArgumentException("鎵�閫夎褰曞寘鍚笉鑳借繘琛屽垵妫�瀹℃牳鐨勭姸鎬侊紝璇峰埛鏂板悗閲嶈瘯");
approverService.validateApprover(MesQcApprovalTypeEnum.SEED_QUALITY.getType(),
@@ -570,10 +860,17 @@
if (!approved && StrUtil.isBlank(opinion)) throw new IllegalArgumentException("椹冲洖鏃惰濉啓瀹℃壒鎰忚");
LocalDateTime now = LocalDateTime.now();
Long operatorId = getLoginUserId();
+ List<MesQcSeedQualityDO> production = qualities.stream()
+ .filter(quality -> !Objects.equals(quality.getBizType(), BIZ_TYPE_RETURN)).toList();
+ qualities.stream().filter(quality -> Objects.equals(quality.getBizType(), BIZ_TYPE_RETURN))
+ .forEach(quality -> applyProcessApproval(quality, approved, opinion, false));
+ if (production.isEmpty()) return;
int next = approved ? WAIT_RETEST : WAIT_INITIAL_RECHECK;
- qualityMapper.updateBatch(qualities.stream().map(quality -> MesQcSeedQualityDO.builder().id(quality.getId())
- .workflowStatus(next).processApprovedAt(now).build()).toList(), WRITE_BATCH_SIZE);
- actionMapper.insertBatch(qualities.stream().map(quality -> newAction(quality.getId(),
+ qualityMapper.updateBatch(production.stream().map(quality -> MesQcSeedQualityDO.builder().id(quality.getId())
+ .workflowStatus(next)
+ .processApprovedAt(now).build()).toList(), WRITE_BATCH_SIZE);
+ if (!approved) production.forEach(quality -> qualityMapper.clearLineProcessInstance(quality.getId()));
+ actionMapper.insertBatch(production.stream().map(quality -> newAction(quality.getId(),
approved ? "PROCESS_APPROVE" : "PROCESS_REJECT", quality.getResult(), opinion, null, operatorId, now)).toList(),
WRITE_BATCH_SIZE);
}
@@ -583,23 +880,340 @@
List<Long> confirmed = approvalIds(ids);
List<MesQcSeedQualityDO> qualities = qualityMapper.selectListByIdsForUpdate(confirmed);
validateLockedIds(confirmed, qualities);
- if (qualities.stream().anyMatch(quality -> !Set.of(WAIT_COMPANY, WAIT_COMPANY_FAIL).contains(quality.getWorkflowStatus())))
- throw new IllegalArgumentException("鎵�閫夎褰曞寘鍚笉鑳借繘琛屽妫�瀹℃牳鐨勭姸鎬侊紝璇峰埛鏂板悗閲嶈瘯");
+ qualities.forEach(MesQcSeedQualityServiceImpl::requireLegacyApproval);
+ if (qualities.stream().anyMatch(quality -> Objects.equals(quality.getBizType(), BIZ_TYPE_RETURN)))
+ throw new IllegalArgumentException("缁忛攢鍟嗛��璐ц川妫�璇蜂娇鐢ㄩ攢鍞儴瀹℃壒");
approverService.validateApprover(MesQcApprovalTypeEnum.SEED_QUALITY.getType(),
MesQcApproveNodeEnum.COMPANY.getNode(), getLoginUserId());
if (!approved && StrUtil.isBlank(opinion)) throw new IllegalArgumentException("椹冲洖鏃惰濉啓瀹℃壒鎰忚");
- if (approved) {
- for (MesQcSeedQualityDO quality : qualities) finalizeStock(quality, quality.getWorkflowStatus() == WAIT_COMPANY);
- }
+ Long operatorId = getLoginUserId();
+ // 鍏徃瀹℃壒浠ヨ涓哄崟浣嶆垚瀵瑰鐞嗭紝鍚屼竴琚嬬殑涓ゆ潯绾胯褰曚竴娆″鎵�
+ qualities.stream().map(MesQcSeedQualityDO::getCode).distinct().sorted()
+ .forEach(code -> applyCompanyApproval(code, approved, opinion, operatorId));
+ }
+
+ // ==================== 缁忛攢鍟嗛��璐ц川妫� ====================
+
+ @Override
+ public Map<String, Object> resolveReturnQuality(Long returnSalesId) {
+ MesWmReturnSalesDO returnSales = returnSalesService.getReturnSales(returnSalesId);
+ if (returnSales == null) throw new IllegalArgumentException("閿�鍞��璐у崟涓嶅瓨鍦�");
+ List<MesWmReturnSalesLineDO> lines = returnSalesLineService.getReturnSalesLineListByReturnId(returnSalesId);
+ MesWmReturnSalesLineDO first = lines.stream().filter(line -> line.getItemId() != null).findFirst().orElse(null);
+ Long itemId = first == null ? null : first.getItemId();
+ MesQcSeedQualityDO quality = qualityMapper.selectByReturnSalesId(returnSalesId);
+ Map<String, Object> result = new HashMap<>();
+ result.put("returnSalesId", returnSales.getId());
+ result.put("returnSalesCode", returnSales.getCode());
+ result.put("returnSalesStatus", returnSales.getStatus());
+ result.put("itemId", itemId);
+ result.put("batchId", first == null ? null : first.getBatchId());
+ result.put("batchCode", first == null ? null : first.getBatchCode());
+ result.put("indicators", toRangePayload(itemId));
+ result.put("qualityId", quality == null ? null : quality.getId());
+ result.put("result", quality == null ? null : quality.getResult());
+ result.put("workflowStatus", quality == null ? null : quality.getWorkflowStatus());
+ return result;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long submitReturnQuality(MesQcSeedReturnQualitySubmitReqVO reqVO) {
+ MesWmReturnSalesDO returnSales = returnSalesService.getReturnSales(reqVO.getReturnSalesId());
+ if (returnSales == null) throw new IllegalArgumentException("閿�鍞��璐у崟涓嶅瓨鍦�");
+ if (qualityMapper.selectByReturnSalesId(returnSales.getId()) != null)
+ throw new IllegalArgumentException("璇ラ攢鍞��璐у崟宸插畬鎴愰��璐ц川妫�锛岀姝㈤噸澶嶆彁浜�");
+ if (!Set.of(MesWmReturnSalesStatusEnum.PREPARE.getStatus(),
+ MesWmReturnSalesStatusEnum.CONFIRMED.getStatus()).contains(returnSales.getStatus()))
+ throw new IllegalArgumentException("褰撳墠閿�鍞��璐у崟鐘舵�佷笉鑳借繘琛岄��璐ц川妫�");
+ List<MesWmReturnSalesLineDO> lines = returnSalesLineService.getReturnSalesLineListByReturnId(returnSales.getId());
+ if (CollUtil.isEmpty(lines)) throw new IllegalArgumentException("閿�鍞��璐у崟娌℃湁鏄庣粏锛屾棤娉曡川妫�");
+ MesWmReturnSalesLineDO first = lines.stream().filter(line -> line.getItemId() != null).findFirst()
+ .orElseThrow(() -> new IllegalArgumentException("閿�鍞��璐у崟鏄庣粏缂哄皯鐗╂枡锛屾棤娉曡川妫�"));
+ Map<String, IndicatorMeta> expected = requireEffectiveIndicators(first.getItemId());
+ boolean passed = validateIndicators(reqVO.getIndicators(), expected);
+ if (!passed && StrUtil.isBlank(reqVO.getReason())) throw new IllegalArgumentException("璐ㄦ涓嶅悎鏍煎繀椤诲~鍐欏師鍥�");
LocalDateTime now = LocalDateTime.now();
Long operatorId = getLoginUserId();
- List<MesQcSeedQualityDO> updates = qualities.stream().map(quality -> MesQcSeedQualityDO.builder().id(quality.getId())
- .workflowStatus(approved ? (quality.getWorkflowStatus() == WAIT_COMPANY ? RELEASED : SCRAPPED) : WAIT_RETEST)
- .companyApprovedAt(now).build()).toList();
- qualityMapper.updateBatch(updates, WRITE_BATCH_SIZE);
- actionMapper.insertBatch(qualities.stream().map(quality -> newAction(quality.getId(),
- approved ? "COMPANY_APPROVE" : "COMPANY_REJECT", quality.getResult(), opinion, null, operatorId, now)).toList(),
+ int result = passed ? 1 : 2;
+ MesQcSeedQualityDO quality = MesQcSeedQualityDO.builder()
+ .code(returnSales.getCode()).qcLine(QC_LINE_SALES).bizType(BIZ_TYPE_RETURN)
+ .itemId(first.getItemId()).batchId(first.getBatchId()).batchCode(first.getBatchCode())
+ .result(result).reason(passed ? "" : reqVO.getReason().trim())
+ // 鍒濇鍚堟牸杩涘叆閿�鍞儴瀹℃壒锛涗笉鍚堟牸鍏堝妫�銆�
+ .workflowStatus(passed ? WAIT_PROCESS : WAIT_RETEST)
+ .returnSalesId(returnSales.getId()).returnSalesCode(returnSales.getCode())
+ .inspectorId(operatorId).inspectedAt(now).build();
+ qualityMapper.insert(quality);
+ for (MesQcSeedQualitySubmitReqVO.Indicator item : reqVO.getIndicators()) {
+ IndicatorMeta meta = expected.get(item.getCode());
+ indicatorMapper.insert(MesQcSeedQualityIndicatorDO.builder().qualityId(quality.getId())
+ .indicatorCode(item.getCode()).indicatorName(meta.name()).unit(meta.unit())
+ .value(item.getValue()).minValue(item.getMinValue()).maxValue(item.getMaxValue()).build());
+ }
+ recordAction(quality.getId(), "INITIAL", result, reqVO.getReason(), reqVO.getIndicators());
+ returnSalesService.updateReturnSalesStatus(returnSales.getId(), MesWmReturnSalesStatusEnum.CONFIRMED.getStatus());
+ if (passed) afterCommit(() -> startReturnProcess(quality, operatorId));
+ return quality.getId();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void returnApprove(Long id, boolean approved, String opinion) {
+ MesQcSeedQualityDO quality = qualityMapper.selectByIdForUpdate(id);
+ if (quality == null || !Objects.equals(quality.getBizType(), BIZ_TYPE_RETURN))
+ throw new IllegalArgumentException("璐ㄦ璁板綍涓嶅瓨鍦ㄦ垨涓嶆槸缁忛攢鍟嗛��璐ц川妫�");
+ requireLegacyApproval(quality);
+ if (!Objects.equals(quality.getWorkflowStatus(), WAIT_PROCESS))
+ throw new IllegalArgumentException("褰撳墠鐘舵�佷笉鑳借繘琛岄攢鍞儴瀹℃壒");
+ approverService.validateApprover(MesQcApprovalTypeEnum.SEED_QUALITY.getType(),
+ MesQcApproveNodeEnum.PROCESS.getNode(), getLoginUserId());
+ applyReturnApproval(quality, approved, opinion, getLoginUserId(), LocalDateTime.now());
+ }
+
+ /**
+ * 閿�鍞儴棰嗗瀹℃壒锛氶�氳繃鍒欓��璐у崟杩涘叆鎵ц锛涗笉閫氳繃鍒欎笉浜堥��璐у苟鍙栨秷閫�璐у崟锛岃川妫�璁板綍鐣欏瓨銆�
+ */
+ private void applyReturnApproval(MesQcSeedQualityDO quality, boolean approved, String opinion,
+ Long operatorId, LocalDateTime now) {
+ if (!approved && StrUtil.isBlank(opinion)) throw new IllegalArgumentException("椹冲洖鏃惰濉啓瀹℃壒鎰忚");
+ if (approved && Objects.equals(quality.getResult(), 1)) {
+ returnSalesService.updateReturnSalesStatus(quality.getReturnSalesId(),
+ MesWmReturnSalesStatusEnum.APPROVING.getStatus());
+ qualityMapper.updateById(MesQcSeedQualityDO.builder().id(quality.getId())
+ .workflowStatus(RELEASED).processApprovedAt(now).build());
+ } else {
+ cancelReturnSalesQuietly(quality.getReturnSalesId());
+ qualityMapper.updateById(MesQcSeedQualityDO.builder().id(quality.getId())
+ .workflowStatus(SCRAPPED).processApprovedAt(now).build());
+ }
+ actionMapper.insert(newAction(quality.getId(), approved ? "RETURN_APPROVE" : "RETURN_REJECT",
+ quality.getResult(), opinion, null, operatorId, now));
+ }
+
+ // ==================== BPM 娴佺▼鍥炶皟 ====================
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void handleLineProcessResult(String processInstanceId, Integer qcLine, String batchCode, boolean approved, String reason) {
+ if (StrUtil.isBlank(processInstanceId) || qcLine == null || StrUtil.isBlank(batchCode)) return;
+ List<MesQcSeedQualityDO> pending = qualityMapper.selectListByProcessInstanceId(processInstanceId).stream()
+ .filter(quality -> Objects.equals(quality.getQcLine(), qcLine)
+ && Objects.equals(quality.getBatchCode(), batchCode)
+ && !isReturnQuality(quality)
+ && Set.of(WAIT_PROCESS, WAIT_INITIAL_FAIL_REVIEW).contains(quality.getWorkflowStatus()))
+ .toList();
+ if (pending.isEmpty()) {
+ log.info("[handleLineProcessResult][鎵规 {} 璐ㄦ绾� {} 鏃犲緟瀹℃壒璁板綍锛屽拷鐣� BPM 浜嬩欢]", batchCode, qcLine);
+ return;
+ }
+ List<Long> ids = pending.stream().map(MesQcSeedQualityDO::getId).sorted().toList();
+ List<MesQcSeedQualityDO> locked = qualityMapper.selectListByIdsForUpdate(ids);
+ validateLockedIds(ids, locked);
+ LocalDateTime now = LocalDateTime.now();
+ int next = approved ? WAIT_COMPANY : WAIT_INITIAL_RECHECK;
+ String finalReason = StrUtil.blankToDefault(reason, approved ? "瀹℃壒閫氳繃" : "瀹℃壒椹冲洖");
+ qualityMapper.updateBatch(locked.stream().map(quality -> MesQcSeedQualityDO.builder().id(quality.getId())
+ .workflowStatus(approved && Objects.equals(quality.getResult(), 2) ? WAIT_COMPANY_FAIL : next)
+ .processApprovedAt(now).build()).toList(), WRITE_BATCH_SIZE);
+ if (!approved) locked.forEach(quality -> qualityMapper.clearLineProcessInstance(quality.getId()));
+ actionMapper.insertBatch(locked.stream().map(quality -> newAction(quality.getId(),
+ approved ? "PROCESS_APPROVE" : "PROCESS_REJECT", quality.getResult(), finalReason, null, null, now)).toList(),
WRITE_BATCH_SIZE);
+ if (approved) {
+ Long inspectorId = locked.stream().map(MesQcSeedQualityDO::getInspectorId)
+ .filter(Objects::nonNull).findFirst().orElse(null);
+ afterCommit(() -> maybeStartCompanyProcess(batchCode, inspectorId));
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void handleCompanyProcessResult(String processInstanceId, String businessKey, boolean approved, String reason) {
+ if (StrUtil.isBlank(processInstanceId)) return;
+ // 鍏徃瀹℃壒鎸夌敓浜ф壒娆″彂璧凤紝涓�涓祦绋嬪疄渚嬭鐩栬鎵规鐨勬墍鏈夎锛�
+ // 鎸夋祦绋嬪疄渚嬬紪鍙峰洖鏌ュ彲鍚屾椂鍏煎鍘嗗彶鎸夎鐮佸彂璧风殑瀹℃壒銆�
+ List<MesQcSeedQualityDO> pending = qualityMapper.selectListByCompanyProcessInstanceId(processInstanceId).stream()
+ .filter(quality -> !isReturnQuality(quality)
+ && Set.of(WAIT_COMPANY, WAIT_COMPANY_FAIL).contains(quality.getWorkflowStatus()))
+ .toList();
+ if (pending.isEmpty()) {
+ log.info("[handleCompanyProcessResult][娴佺▼ {} 鏃犲緟鍏徃瀹℃壒璁板綍锛屽拷鐣� BPM 浜嬩欢]", processInstanceId);
+ return;
+ }
+ String finalReason = StrUtil.blankToDefault(reason, approved ? "鍏徃璐ㄦ瀹℃壒閫氳繃" : "鍏徃璐ㄦ瀹℃壒椹冲洖");
+ // 鏀捐/鎶ュ簾浠ヨ涓哄崟浣嶈惤搴擄紝鍚屼竴鎵规鐨勫涓渚濇澶勭悊
+ pending.stream().map(MesQcSeedQualityDO::getCode).distinct().sorted()
+ .forEach(code -> applyCompanyApproval(code, approved, finalReason, null));
+ log.info("[handleCompanyProcessResult][鍏徃璐ㄦ瀹℃壒 {} 瀹屾垚锛屾壒娆�/琚嬬爜 {} 鍏卞鐞� {} 鏉¤褰昡",
+ processInstanceId, businessKey, pending.size());
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void handleReturnProcessResult(String processInstanceId, Long returnSalesId, boolean approved, String reason) {
+ if (StrUtil.isBlank(processInstanceId) || returnSalesId == null) return;
+ MesQcSeedQualityDO quality = qualityMapper.selectByReturnSalesIdForUpdate(returnSalesId);
+ if (quality == null || !Objects.equals(quality.getBizType(), BIZ_TYPE_RETURN)
+ || !Objects.equals(quality.getProcessInstanceId(), processInstanceId)
+ || !Objects.equals(quality.getWorkflowStatus(), WAIT_PROCESS)) {
+ log.info("[handleReturnProcessResult][閿�鍞��璐у崟 {} 鏃犲緟瀹℃壒閫�璐ц川妫�锛屽拷鐣� BPM 浜嬩欢]", returnSalesId);
+ return;
+ }
+ applyReturnApproval(quality, approved, StrUtil.blankToDefault(reason, approved ? "瀹℃壒閫氳繃" : "瀹℃壒椹冲洖"),
+ null, LocalDateTime.now());
+ }
+
+ private void startLineProcess(Integer qcLine, String batchCode, Long operatorId) {
+ if (qcLine == null || StrUtil.isBlank(batchCode) || operatorId == null) return;
+ List<MesQcSeedQualityDO> pending = qualityMapper.selectListByBatchCode(batchCode).stream()
+ .filter(quality -> Objects.equals(quality.getQcLine(), qcLine)
+ && !isReturnQuality(quality)
+ && StrUtil.isBlank(quality.getProcessInstanceId())
+ && Set.of(WAIT_PROCESS, WAIT_INITIAL_FAIL_REVIEW).contains(quality.getWorkflowStatus()))
+ .toList();
+ if (pending.isEmpty()) return;
+ Map<String, Object> variables = new HashMap<>();
+ variables.put("qcLine", qcLine);
+ variables.put("batchCode", batchCode);
+ String processInstanceId = processInstanceApi.createProcessInstance(operatorId,
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(LINE_PROCESS_KEY)
+ .setBusinessKey(qcLine + "#" + batchCode)
+ .setVariables(variables));
+ for (MesQcSeedQualityDO quality : pending) {
+ qualityMapper.updateById(MesQcSeedQualityDO.builder().id(quality.getId())
+ .processInstanceId(processInstanceId).build());
+ }
+ log.info("[startLineProcess][鎵规 {} 璐ㄦ绾� {} 宸插彂璧锋湰绾块瀵煎鎵� {}", batchCode, qcLine, processInstanceId);
+ }
+
+ /**
+ * 鍙岀嚎閮ㄩ棬瀹℃壒鍏ㄩ儴瀹屾垚鍚庯紝鎸夌敓浜ф壒娆$粺涓�鍙戣捣涓�娆″叕鍙歌川妫�瀹℃壒銆�
+ * 鍚屼竴鎵规鐨勫琚嬪叡鐢ㄥ悓涓�涓祦绋嬪疄渚嬶紝閬垮厤姣忚鍚勫彂涓�鏉″鎵广��
+ */
+ private void maybeStartCompanyProcess(String batchCode, Long operatorId) {
+ if (StrUtil.isBlank(batchCode) || operatorId == null) return;
+ List<MesQcSeedQualityDO> records = qualityMapper.selectListByBatchCode(batchCode).stream()
+ .filter(quality -> !isReturnQuality(quality))
+ // 宸叉斁琛�/宸叉姤搴熺殑璁板綍灞炰簬宸茬粓缁撶殑鎵规锛屼笉鍐嶅弬涓庢柊鐨勫叕鍙稿鎵�
+ .filter(quality -> !Set.of(RELEASED, SCRAPPED).contains(quality.getWorkflowStatus()))
+ .toList();
+ if (records.isEmpty()) return;
+ if (records.stream().anyMatch(quality -> !Set.of(WAIT_COMPANY, WAIT_COMPANY_FAIL)
+ .contains(quality.getWorkflowStatus()))) return;
+ if (records.stream().anyMatch(quality -> StrUtil.isNotBlank(quality.getCompanyProcessInstanceId()))) return;
+ Map<String, Object> variables = new HashMap<>();
+ variables.put("batchCode", batchCode);
+ // 鍏煎娴佺▼鏉′欢涓紩鐢ㄧ殑 code 鍙橀噺
+ variables.put("code", batchCode);
+ variables.put("passed", records.stream().allMatch(quality -> Objects.equals(quality.getWorkflowStatus(), WAIT_COMPANY)));
+ String processInstanceId = processInstanceApi.createProcessInstance(operatorId,
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(COMPANY_PROCESS_KEY)
+ .setBusinessKey(batchCode)
+ .setVariables(variables));
+ for (MesQcSeedQualityDO quality : records) {
+ qualityMapper.updateById(MesQcSeedQualityDO.builder().id(quality.getId())
+ .companyProcessInstanceId(processInstanceId).build());
+ }
+ log.info("[maybeStartCompanyProcess][鎵规 {} 鍙岀嚎璐ㄦ瀹屾垚锛屽凡鍙戣捣鍏徃璐ㄦ瀹℃壒 {}锛岃鐩� {} 鏉¤褰昡",
+ batchCode, processInstanceId, records.size());
+ }
+
+ private void startReturnProcess(MesQcSeedQualityDO quality, Long operatorId) {
+ if (quality == null || quality.getReturnSalesId() == null || StrUtil.isNotBlank(quality.getProcessInstanceId()))
+ return;
+ Map<String, Object> variables = new HashMap<>();
+ variables.put("returnSalesId", quality.getReturnSalesId());
+ variables.put("returnSalesCode", quality.getReturnSalesCode());
+ variables.put("code", quality.getCode());
+ String processInstanceId = processInstanceApi.createProcessInstance(operatorId,
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(RETURN_PROCESS_KEY)
+ .setBusinessKey(String.valueOf(quality.getReturnSalesId()))
+ .setVariables(variables));
+ qualityMapper.updateById(MesQcSeedQualityDO.builder().id(quality.getId())
+ .processInstanceId(processInstanceId).build());
+ log.info("[startReturnProcess][閿�鍞��璐у崟 {} 宸插彂璧烽攢鍞儴棰嗗瀹℃壒 {}]", quality.getReturnSalesId(), processInstanceId);
+ }
+
+ @Override
+ public void retryBpmProcess(Long id) {
+ MesQcSeedQualityDO quality = qualityMapper.selectById(id);
+ if (quality == null) throw invalidParamException("璐ㄦ璁板綍涓嶅瓨鍦�");
+ Long operatorId = getLoginUserId();
+ if (Objects.equals(quality.getBizType(), BIZ_TYPE_RETURN)) {
+ if (!Objects.equals(quality.getWorkflowStatus(), WAIT_PROCESS))
+ throw invalidParamException("褰撳墠閫�璐ц川妫�涓嶉渶瑕佸彂璧峰鎵�");
+ if (StrUtil.isNotBlank(quality.getProcessInstanceId()))
+ throw invalidParamException("閫�璐ц川妫�瀹℃壒娴佺▼宸茬粡鍙戣捣");
+ startReturnProcess(quality, operatorId);
+ } else if (Set.of(WAIT_PROCESS, WAIT_INITIAL_FAIL_REVIEW).contains(quality.getWorkflowStatus())) {
+ if (StrUtil.isNotBlank(quality.getProcessInstanceId()))
+ throw invalidParamException("閮ㄩ棬瀹℃壒娴佺▼宸茬粡鍙戣捣");
+ startLineProcess(quality.getQcLine(), quality.getBatchCode(), operatorId);
+ } else if (Set.of(WAIT_COMPANY, WAIT_COMPANY_FAIL).contains(quality.getWorkflowStatus())) {
+ String batchCode = quality.getBatchCode();
+ if (StrUtil.isBlank(batchCode))
+ throw invalidParamException("璐ㄦ璁板綍鏈粦瀹氱敓浜ф壒娆★紝涓嶈兘鍙戣捣鍏徃瀹℃壒");
+ List<MesQcSeedQualityDO> batchRecords = qualityMapper.selectListByBatchCode(batchCode).stream()
+ .filter(q -> !isReturnQuality(q))
+ .filter(q -> !Set.of(RELEASED, SCRAPPED).contains(q.getWorkflowStatus()))
+ .toList();
+ if (batchRecords.isEmpty() || batchRecords.stream().anyMatch(q -> !Set.of(WAIT_COMPANY, WAIT_COMPANY_FAIL)
+ .contains(q.getWorkflowStatus())))
+ throw invalidParamException("鍚屾壒娆″弻绾块儴闂ㄥ鎵瑰皻鏈叏閮ㄥ畬鎴愶紝涓嶈兘鍙戣捣鍏徃瀹℃壒");
+ if (batchRecords.stream().anyMatch(q -> StrUtil.isNotBlank(q.getCompanyProcessInstanceId())))
+ throw invalidParamException("鍏徃璐ㄦ瀹℃壒娴佺▼宸茬粡鍙戣捣");
+ maybeStartCompanyProcess(batchCode, operatorId);
+ } else {
+ throw invalidParamException("褰撳墠璐ㄦ鐘舵�佷笉闇�瑕佸彂璧峰鎵�");
+ }
+ }
+
+ private void cancelReturnSalesQuietly(Long returnSalesId) {
+ if (returnSalesId == null) return;
+ try {
+ returnSalesService.cancelReturnSales(returnSalesId);
+ } catch (Exception ex) {
+ log.warn("[cancelReturnSalesQuietly][閿�鍞��璐у崟 {} 鍙栨秷澶辫触: {}]", returnSalesId, ex.getMessage());
+ }
+ }
+
+ private void afterCommit(Runnable action) {
+ TransactionSynchronization synchronization = new TransactionSynchronization() {
+ @Override
+ public void afterCommit() {
+ try {
+ action.run();
+ } catch (Exception ex) {
+ log.error("[afterCommit][BPM 娴佺▼鍚姩澶辫触锛岃淇娴佺▼閰嶇疆骞跺湪璐ㄦ璁板綍涓噸鏂板彂璧峰鎵筣", ex);
+ }
+ }
+ };
+ if (TransactionSynchronizationManager.isSynchronizationActive()) {
+ TransactionSynchronizationManager.registerSynchronization(synchronization);
+ } else {
+ synchronization.afterCommit();
+ }
+ }
+
+ /** 鍘嗗彶鏁版嵁 bizType 涓虹┖锛屾寜鐢熶骇鍏ュ簱璐ㄦ澶勭悊 */
+ private static void requireQcLine(Integer qcLine) {
+ if (!Objects.equals(qcLine, QC_LINE_PROCESS) && !Objects.equals(qcLine, QC_LINE_SALES))
+ throw new IllegalArgumentException("璐ㄦ绾垮繀椤讳负鍔犲伐閮ㄦ垨閿�鍞儴");
+ }
+
+ /** 鐢熶骇鍙岀嚎璁板綍鍙兘璧� BPM 瀹℃壒锛涚粡閿�鍟嗛��璐ц川妫�涓嶆媶鍒嗚川妫�绾匡紝浠嶅彲浣跨敤浜哄伐瀹℃壒鎺ュ彛銆� */
+ private static void requireLegacyApproval(MesQcSeedQualityDO quality) {
+ if (!isReturnQuality(quality) && (Objects.equals(quality.getQcLine(), QC_LINE_PROCESS)
+ || Objects.equals(quality.getQcLine(), QC_LINE_SALES)))
+ throw new IllegalArgumentException("璇ヨ川妫�璁板綍鐢� BPM 瀹℃壒锛岃鍦ㄦ祦绋嬪緟鍔炰腑澶勭悊");
+ }
+
+ private static boolean isReturnQuality(MesQcSeedQualityDO quality) {
+ return Objects.equals(quality.getBizType(), BIZ_TYPE_RETURN);
}
private List<Long> approvalIds(List<Long> ids) {
@@ -626,21 +1240,95 @@
return quality;
}
- private boolean validateIndicators(List<MesQcSeedQualitySubmitReqVO.Indicator> indicators) {
- if (indicators == null || indicators.size() != REQUIRED.size()) throw new IllegalArgumentException("蹇呴』鎻愪氦鍥涢」鎸囨爣");
+ private record IndicatorMeta(String code, String name, String unit) { }
+
+ private Map<String, IndicatorMeta> requireEffectiveIndicators(Long itemId) {
+ Map<String, IndicatorMeta> result = new LinkedHashMap<>();
+ for (MesQcSeedIndicatorRangeDO range : rangeService.getEffectiveRanges(itemId)) {
+ result.put(range.getIndicatorCode(), new IndicatorMeta(range.getIndicatorCode(),
+ StrUtil.blankToDefault(range.getIndicatorName(), range.getIndicatorCode()),
+ StrUtil.blankToDefault(range.getUnit(), "%")));
+ }
+ if (result.isEmpty())
+ throw new IllegalArgumentException("璇ヤ骇鍝佸皻鏈厤缃川妫�椤癸紝璇峰厛鍦ㄣ�岃川妫�椤瑰悎鏍艰寖鍥撮厤缃�嶄腑缁存姢");
+ return result;
+ }
+
+ private Map<String, IndicatorMeta> toMetaMap(Collection<MesQcSeedQualityIndicatorDO> indicators, Long itemId) {
+ Map<String, MesQcSeedIndicatorRangeDO> config = rangeService.getEffectiveMap(itemId);
+ Map<String, IndicatorMeta> result = new LinkedHashMap<>();
+ for (MesQcSeedQualityIndicatorDO indicator : indicators) {
+ MesQcSeedIndicatorRangeDO range = config.get(indicator.getIndicatorCode());
+ String name = StrUtil.blankToDefault(indicator.getIndicatorName(),
+ range == null ? indicator.getIndicatorCode() : range.getIndicatorName());
+ String unit = StrUtil.blankToDefault(indicator.getUnit(), range == null ? "%" : range.getUnit());
+ result.put(indicator.getIndicatorCode(), new IndicatorMeta(indicator.getIndicatorCode(), name, unit));
+ }
+ return result;
+ }
+
+ private boolean validateIndicators(List<MesQcSeedQualitySubmitReqVO.Indicator> indicators,
+ Map<String, IndicatorMeta> expected) {
+ if (indicators == null || indicators.isEmpty()) throw new IllegalArgumentException("璇疯嚦灏戞彁浜や竴椤硅川妫�鎸囨爣");
+ if (expected.isEmpty()) throw new IllegalArgumentException("璇ヤ骇鍝佸皻鏈厤缃川妫�椤�");
+ if (indicators.size() != expected.size())
+ throw new IllegalArgumentException("璐ㄦ椤规暟閲忎笌浜у搧閰嶇疆涓嶄竴鑷达紝璇峰埛鏂板悗閲嶆柊褰曞叆");
Set<String> codes = new HashSet<>();
boolean passed = true;
for (MesQcSeedQualitySubmitReqVO.Indicator item : indicators) {
- if (item == null || !REQUIRED.contains(item.getCode()) || !codes.add(item.getCode())
+ if (item == null || StrUtil.isBlank(item.getCode()) || !codes.add(item.getCode())
|| item.getValue() == null || item.getMinValue() == null || item.getMaxValue() == null)
- throw new IllegalArgumentException("鎸囨爣蹇呴』涓虹函搴︺�佸噣搴︺�佸彂鑺界巼銆佹按鍒嗕笖涓嶅彲閲嶅");
- if (item.getMinValue().compareTo(item.getMaxValue()) > 0) throw new IllegalArgumentException("鎸囨爣涓嬮檺涓嶈兘澶т簬涓婇檺");
- if (item.getValue().compareTo(BigDecimal.ZERO) < 0 || item.getValue().compareTo(new BigDecimal("100")) > 0
- || item.getMinValue().compareTo(BigDecimal.ZERO) < 0 || item.getMaxValue().compareTo(new BigDecimal("100")) > 0)
- throw new IllegalArgumentException("鐧惧垎姣旀寚鏍囧繀椤诲浜� 0鈥�100");
+ throw new IllegalArgumentException("璐ㄦ椤圭殑瀹炴祴鍊煎拰鍚堟牸鑼冨洿蹇呴』瀹屾暣涓斾笉鍙噸澶�");
+ if (!expected.containsKey(item.getCode()))
+ throw new IllegalArgumentException("璐ㄦ椤规湭鍦ㄤ骇鍝侀厤缃腑鍚敤锛�" + item.getCode());
+ if (item.getMinValue().compareTo(item.getMaxValue()) > 0) throw new IllegalArgumentException("璐ㄦ椤逛笅闄愪笉鑳藉ぇ浜庝笂闄�");
+ if (item.getValue().compareTo(BigDecimal.ZERO) < 0 || item.getMinValue().compareTo(BigDecimal.ZERO) < 0
+ || item.getMaxValue().compareTo(BigDecimal.ZERO) < 0)
+ throw new IllegalArgumentException("璐ㄦ椤规暟鍊间笉鑳戒负璐熸暟");
if (item.getValue().compareTo(item.getMinValue()) < 0 || item.getValue().compareTo(item.getMaxValue()) > 0) passed = false;
}
+ if (!codes.equals(expected.keySet())) throw new IllegalArgumentException("浜у搧璐ㄦ椤逛笉瀹屾暣锛岃鍒锋柊鍚庨噸鏂板綍鍏�");
return passed;
+ }
+
+ private Long resolveItemId(Scope scope) {
+ Long itemId = scope.bags().stream().map(MesProBagCodeDO::getItemId).filter(Objects::nonNull).findFirst().orElse(null);
+ if (itemId != null || scope.bags().isEmpty()) return itemId;
+ Long batchId = scope.bags().get(0).getBatchId();
+ if (batchId == null) return null;
+ MesProBatchDO batch = proBatchService.getBatch(batchId);
+ return batch == null ? null : batch.getItemId();
+ }
+
+ private List<Map<String, Object>> toRangePayload(Long itemId) {
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (MesQcSeedIndicatorRangeDO range : rangeService.getEffectiveRanges(itemId)) {
+ Map<String, Object> item = new HashMap<>();
+ item.put("code", range.getIndicatorCode());
+ item.put("name", StrUtil.blankToDefault(range.getIndicatorName(), range.getIndicatorCode()));
+ item.put("unit", StrUtil.blankToDefault(range.getUnit(), "%"));
+ item.put("minValue", range.getMinValue());
+ item.put("maxValue", range.getMaxValue());
+ result.add(item);
+ }
+ return result;
+ }
+
+ private List<Map<String, Object>> toIndicatorPayload(List<MesQcSeedQualityIndicatorDO> indicators, Long itemId) {
+ Map<String, MesQcSeedIndicatorRangeDO> config = rangeService.getEffectiveMap(itemId);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (MesQcSeedQualityIndicatorDO indicator : indicators) {
+ MesQcSeedIndicatorRangeDO range = config.get(indicator.getIndicatorCode());
+ Map<String, Object> item = new HashMap<>();
+ item.put("code", indicator.getIndicatorCode());
+ item.put("name", StrUtil.blankToDefault(indicator.getIndicatorName(),
+ range == null ? indicator.getIndicatorCode() : range.getIndicatorName()));
+ item.put("unit", StrUtil.blankToDefault(indicator.getUnit(), range == null ? "%" : range.getUnit()));
+ item.put("minValue", indicator.getMinValue());
+ item.put("maxValue", indicator.getMaxValue());
+ result.add(item);
+ }
+ return result;
}
private void recordAction(Long id, String action, Integer result, String opinion,
@@ -711,20 +1399,20 @@
/**
* 瑙f瀽鍚堟牸搴撶殑榛樿鍏ュ簱搴撳尯涓庡簱浣嶏細鍙栫涓�涓悓鏃堕厤缃簡搴撲綅鐨勯潪鍐荤粨搴撳尯銆�
*
- * 璐ㄦ鎸変粨搴撶淮搴﹂�夋嫨鍏ュ簱鐩爣锛屽簱鍖�/搴撲綅鐢辩郴缁熻嚜鍔ㄨ惤鐐癸紱鍚堟牸搴撶己灏戝彲鐢ㄥ簱鍖烘垨搴撲綅鏃讹紝
- * 搴撳瓨浜嬪姟鏃犳硶鍐欏叆锛岀洿鎺ユ彁绀虹鐞嗗憳瀹屽杽浠撳簱閰嶇疆銆�
+ * 搴撳尯/搴撲綅涓哄彲閫夐」锛屼粨搴撴湭閰嶇疆鏃舵寜浠撳簱灞傜骇鐩存帴鍏ュ簱锛岃繑鍥� null銆�
*/
private Long[] resolveQualifiedLocation(MesWmWarehouseDO qualifiedWarehouse) {
List<MesWmWarehouseLocationDO> locations = warehouseLocationService.getWarehouseLocationList(qualifiedWarehouse.getId())
.stream().filter(location -> !Boolean.TRUE.equals(location.getFrozen())).toList();
- if (CollUtil.isEmpty(locations))
- throw new IllegalArgumentException("鍚堟牸搴撱��" + qualifiedWarehouse.getName() + "銆嶆湭閰嶇疆鍙敤搴撳尯锛岃鍏堝湪浠撳簱绠$悊涓畬鍠勫簱鍖轰笌搴撲綅");
+ if (CollUtil.isEmpty(locations)) {
+ return new Long[]{null, null};
+ }
for (MesWmWarehouseLocationDO location : locations) {
List<MesWmWarehouseAreaDO> areas = warehouseAreaService.getWarehouseAreaList(location.getId())
.stream().filter(area -> !Boolean.TRUE.equals(area.getFrozen())).toList();
if (CollUtil.isNotEmpty(areas)) return new Long[]{location.getId(), areas.get(0).getId()};
}
- throw new IllegalArgumentException("鍚堟牸搴撱��" + qualifiedWarehouse.getName() + "銆嶆湭閰嶇疆鍙敤搴撲綅锛岃鍏堝湪浠撳簱绠$悊涓畬鍠勫簱鍖轰笌搴撲綅");
+ return new Long[]{null, null};
}
private MesWmMaterialStockDO getOrCreateQualifiedStock(MesWmMaterialStockDO tempStock, Long qualifiedWarehouseId,
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/listener/MesQcSeedCompanyStatusListener.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/listener/MesQcSeedCompanyStatusListener.java
new file mode 100644
index 0000000..8cf7fdc
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/listener/MesQcSeedCompanyStatusListener.java
@@ -0,0 +1,46 @@
+package cn.iocoder.yudao.module.mes.service.qc.seedquality.listener;
+
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
+import cn.iocoder.yudao.module.mes.service.qc.seedquality.MesQcSeedQualityService;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * 绉嶅瓙璐ㄦ鍏徃璐ㄦ瀹℃壒鐘舵�佺洃鍚櫒
+ *
+ * <p>娴佺▼瀹氫箟 key锛歮es_seed_quality_company_approve锛沚usinessKey 涓虹敓浜ф壒娆″彿銆�
+ * 璇ユ壒娆″弻绾胯川妫�鍏ㄩ儴瀹屾垚鍚庡彧鍙戣捣涓�娆¤娴佺▼锛屽鎵瑰畬鎴愬悗鎸夋瘡涓鐨勪袱鏉$嚎缁撴灉缁熶竴鏀捐鎴栨姤搴熴��
+ */
+@Component
+@Slf4j
+public class MesQcSeedCompanyStatusListener extends BpmProcessInstanceStatusEventListener {
+
+ private static final String BPM_PROCESS_DEFINITION_KEY = "mes_seed_quality_company_approve";
+
+ @Resource
+ private MesQcSeedQualityService seedQualityService;
+
+ @Override
+ protected String getProcessDefinitionKey() {
+ return BPM_PROCESS_DEFINITION_KEY;
+ }
+
+ @Override
+ protected void onEvent(BpmProcessInstanceStatusEvent event) {
+ if (!BpmProcessInstanceStatusEnum.isProcessEndStatus(event.getStatus())
+ || BpmProcessInstanceStatusEnum.CANCEL.getStatus().equals(event.getStatus())) {
+ return;
+ }
+ String businessKey = event.getBusinessKey();
+ if (businessKey == null || businessKey.isBlank()) {
+ log.warn("[onEvent][鍏徃璐ㄦ瀹℃壒 businessKey 涓虹┖锛屽拷鐣");
+ return;
+ }
+ boolean approved = BpmProcessInstanceStatusEnum.APPROVE.getStatus().equals(event.getStatus());
+ log.info("[onEvent][鍏徃璐ㄦ瀹℃壒瀹屾垚锛屾壒娆�={} 缁撴灉={}]", businessKey, event.getStatus());
+ seedQualityService.handleCompanyProcessResult(event.getId(), businessKey, approved, event.getReason());
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/listener/MesQcSeedLineStatusListener.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/listener/MesQcSeedLineStatusListener.java
new file mode 100644
index 0000000..1948ab6
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/listener/MesQcSeedLineStatusListener.java
@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.mes.service.qc.seedquality.listener;
+
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
+import cn.iocoder.yudao.module.mes.service.qc.seedquality.MesQcSeedQualityService;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * 绉嶅瓙璐ㄦ鏈嚎棰嗗瀹℃壒鐘舵�佺洃鍚櫒
+ *
+ * <p>娴佺▼瀹氫箟 key锛歮es_seed_quality_line_approve锛沚usinessKey 鏍煎紡锛歿璐ㄦ绾縸#{鐢熶骇鎵规鍙穧銆�
+ * 瀹℃壒閫氳繃鍚庢湰绾胯繘鍏ュ妫�锛岄┏鍥炲悗鏈嚎閲嶆柊鍒濇銆�
+ */
+@Component
+@Slf4j
+public class MesQcSeedLineStatusListener extends BpmProcessInstanceStatusEventListener {
+
+ private static final String BPM_PROCESS_DEFINITION_KEY = "mes_seed_quality_line_approve";
+
+ @Resource
+ private MesQcSeedQualityService seedQualityService;
+
+ @Override
+ protected String getProcessDefinitionKey() {
+ return BPM_PROCESS_DEFINITION_KEY;
+ }
+
+ @Override
+ protected void onEvent(BpmProcessInstanceStatusEvent event) {
+ if (!BpmProcessInstanceStatusEnum.isProcessEndStatus(event.getStatus())
+ || BpmProcessInstanceStatusEnum.CANCEL.getStatus().equals(event.getStatus())) {
+ return;
+ }
+ String businessKey = event.getBusinessKey();
+ int index = businessKey == null ? -1 : businessKey.indexOf('#');
+ if (index <= 0 || index == businessKey.length() - 1) {
+ log.warn("[onEvent][鏈嚎瀹℃壒 businessKey({}) 鏍煎紡鏃犳晥锛屽簲涓� 璐ㄦ绾�#鎵规鍙穄", businessKey);
+ return;
+ }
+ Integer qcLine;
+ try {
+ qcLine = Integer.valueOf(businessKey.substring(0, index));
+ } catch (NumberFormatException ex) {
+ log.warn("[onEvent][鏈嚎瀹℃壒 businessKey({}) 璐ㄦ绾挎棤鏁圿", businessKey);
+ return;
+ }
+ String batchCode = businessKey.substring(index + 1);
+ boolean approved = BpmProcessInstanceStatusEnum.APPROVE.getStatus().equals(event.getStatus());
+ log.info("[onEvent][鏈嚎瀹℃壒瀹屾垚锛屾壒娆�={} 璐ㄦ绾�={} 缁撴灉={}]", batchCode, qcLine, event.getStatus());
+ seedQualityService.handleLineProcessResult(event.getId(), qcLine, batchCode, approved, event.getReason());
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/listener/MesQcSeedReturnStatusListener.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/listener/MesQcSeedReturnStatusListener.java
new file mode 100644
index 0000000..5cc7595
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/listener/MesQcSeedReturnStatusListener.java
@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.mes.service.qc.seedquality.listener;
+
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
+import cn.iocoder.yudao.module.mes.service.qc.seedquality.MesQcSeedQualityService;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * 缁忛攢鍟嗛��璐х瀛愯川妫�閿�鍞儴瀹℃壒鐘舵�佺洃鍚櫒
+ *
+ * <p>娴佺▼瀹氫箟 key锛歮es_seed_return_approve锛沚usinessKey 涓洪攢鍞��璐у崟缂栧彿銆�
+ */
+@Component
+@Slf4j
+public class MesQcSeedReturnStatusListener extends BpmProcessInstanceStatusEventListener {
+
+ private static final String BPM_PROCESS_DEFINITION_KEY = "mes_seed_return_approve";
+
+ @Resource
+ private MesQcSeedQualityService seedQualityService;
+
+ @Override
+ protected String getProcessDefinitionKey() {
+ return BPM_PROCESS_DEFINITION_KEY;
+ }
+
+ @Override
+ protected void onEvent(BpmProcessInstanceStatusEvent event) {
+ if (!BpmProcessInstanceStatusEnum.isProcessEndStatus(event.getStatus())
+ || BpmProcessInstanceStatusEnum.CANCEL.getStatus().equals(event.getStatus())) {
+ return;
+ }
+ Long returnSalesId;
+ try {
+ returnSalesId = Long.parseLong(event.getBusinessKey());
+ } catch (NumberFormatException ex) {
+ log.warn("[onEvent][閫�璐ц川妫�瀹℃壒 businessKey({}) 涓嶆槸鏈夋晥鐨勯攢鍞��璐у崟缂栧彿]", event.getBusinessKey());
+ return;
+ }
+ boolean approved = BpmProcessInstanceStatusEnum.APPROVE.getStatus().equals(event.getStatus());
+ log.info("[onEvent][閫�璐ц川妫�瀹℃壒瀹屾垚锛岄攢鍞��璐у崟={} 缁撴灉={}]", returnSalesId, event.getStatus());
+ seedQualityService.handleReturnProcessResult(event.getId(), returnSalesId, approved, event.getReason());
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/trace/MesProTracePublicServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/trace/MesProTracePublicServiceImpl.java
index c02c100..62969d0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/trace/MesProTracePublicServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/trace/MesProTracePublicServiceImpl.java
@@ -372,16 +372,22 @@
}
private MesProTracePublicRespVO.QualityVO buildQuality(MesProBatchDO batch) {
- List<MesQcSeedQualityDO> list = qcSeedQualityService.getQualityByBatchCode(batch.getCode());
+ // 鍙岀嚎璐ㄦ锛氬悓涓�琚嬪瓨鍦ㄥ姞宸ラ儴銆侀攢鍞儴涓ゆ潯璁板綍锛屽叏閮ㄦ斁琛屾墠绠楀悎鏍硷紝浠讳竴鏉℃姤搴熷嵆涓嶅悎鏍�
+ List<MesQcSeedQualityDO> list = qcSeedQualityService.getQualityByBatchCode(batch.getCode()).stream()
+ .filter(quality -> quality.getBizType() == null || Integer.valueOf(1).equals(quality.getBizType()))
+ .toList();
if (CollUtil.isEmpty(list)) {
return null;
}
MesQcSeedQualityDO quality = list.get(0);
+ boolean released = list.stream().allMatch(item -> Integer.valueOf(40).equals(item.getWorkflowStatus()));
+ boolean scrapped = list.stream().anyMatch(item -> Integer.valueOf(70).equals(item.getWorkflowStatus()));
MesProTracePublicRespVO.QualityVO vo = new MesProTracePublicRespVO.QualityVO();
- Integer finalResult = Integer.valueOf(40).equals(quality.getWorkflowStatus()) ? 1
- : Integer.valueOf(70).equals(quality.getWorkflowStatus()) ? 2 : 0;
+ Integer finalResult = scrapped ? 2 : released ? 1 : 0;
+ String reason = list.stream().map(MesQcSeedQualityDO::getReason)
+ .filter(StrUtil::isNotBlank).findFirst().orElse(quality.getReason());
vo.setResult(finalResult).setResultName(finalResult == 0 ? "澶嶆鎴栧鎵逛腑" : qualityResultName(finalResult))
- .setReason(quality.getReason()).setInspectorName(userName(quality.getInspectorId()))
+ .setReason(reason).setInspectorName(userName(quality.getInspectorId()))
.setInspectedAt(quality.getInspectedAt());
List<MesQcSeedQualityIndicatorDO> indicators = qcSeedQualityService.getIndicatorsByQualityId(quality.getId());
vo.setIndicators(convertList(indicators, ind -> {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
index b3b7ec6..a84494a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
@@ -347,8 +347,11 @@
@Override
public void checkAreaMixingRule(Long areaId, Long itemId, Long batchId) {
- // 1.1 鏍¢獙搴撲綅蹇呴』瀛樺湪
+ // 1.1 鏍¢獙搴撲綅蹇呴』瀛樺湪锛堟湭浣跨敤搴撲綅鏃惰烦杩囨贩鏀炬牎楠岋級
MesWmWarehouseAreaDO area = areaService.validateWarehouseAreaExists(areaId);
+ if (area == null) {
+ return;
+ }
// 2. 鏌ヨ褰撳墠搴撲綅涓婂凡鏈夌殑搴撳瓨璁板綍
List<MesWmMaterialStockDO> stockList = getMaterialStockListByAreaId(areaId);
@@ -388,8 +391,8 @@
|| ObjUtil.notEqual(stock.getBatchId(), batchId)
|| (batchCode != null && ObjUtil.notEqual(stock.getBatchCode(), batchCode))
|| ObjUtil.notEqual(stock.getWarehouseId(), warehouseId)
- || ObjUtil.notEqual(stock.getLocationId(), locationId)
- || ObjUtil.notEqual(stock.getAreaId(), areaId)) {
+ || (locationId != null && ObjUtil.notEqual(stock.getLocationId(), locationId))
+ || (areaId != null && ObjUtil.notEqual(stock.getAreaId(), areaId))) {
throw exception(WM_MATERIAL_STOCK_SELECTION_MISMATCH);
}
// 3. 鏍¢獙搴撳瓨璁板綍蹇呴』鏄悎鏍煎簱锛堟殏瀛樺簱瀛樻湭璐ㄦ锛屼笉鍙敤浜庡嚭搴�/鍗犵敤锛�
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesDetailServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesDetailServiceImpl.java
index 7303e8d..4d712e9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesDetailServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesDetailServiceImpl.java
@@ -6,6 +6,10 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDetailDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesLineDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesDetailMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.materialstockbag.MesWmMaterialStockBagMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesMapper;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductSalesStatusEnum;
+import org.springframework.transaction.annotation.Transactional;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
@@ -40,9 +44,26 @@
private MesWmMaterialStockService materialStockService;
@Resource
private MesWmWarehouseAreaService warehouseAreaService;
+ @Resource
+ private MesWmMaterialStockBagMapper stockBagMapper;
+ @Resource
+ private MesWmProductSalesMapper productSalesMapper;
@Override
+ @Transactional(rollbackFor = Exception.class)
public Long createProductSalesDetail(MesWmProductSalesDetailSaveReqVO createReqVO) {
+ lockPickingOrder(createReqVO.getSalesId());
+ if (createReqVO.getRemark() != null && createReqVO.getRemark().matches("绉诲姩绔棤琚嬬爜鎷h揣 #[a-f0-9-]{36}")) {
+ var existing = productSalesDetailMapper.selectListBySalesId(createReqVO.getSalesId()).stream()
+ .filter(d -> createReqVO.getRemark().equals(d.getRemark())).findFirst().orElse(null);
+ if (existing != null) {
+ if (ObjUtil.notEqual(existing.getLineId(), createReqVO.getLineId())
+ || ObjUtil.notEqual(existing.getMaterialStockId(), createReqVO.getMaterialStockId())
+ || existing.getQuantity().compareTo(createReqVO.getQuantity()) != 0)
+ throw new IllegalArgumentException("鎷h揣璇锋眰鏍囪瘑宸茬敤浜庡叾浠栨槑缁�");
+ return existing.getId();
+ }
+ }
// 鏍¢獙鏁版嵁
validateProductSalesDetailSaveData(createReqVO);
@@ -53,9 +74,13 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void updateProductSalesDetail(MesWmProductSalesDetailSaveReqVO updateReqVO) {
// 鏍¢獙瀛樺湪
MesWmProductSalesDetailDO existing = validateProductSalesDetailExists(updateReqVO.getId());
+ lockPickingOrder(existing.getSalesId());
+ if (existing.getShipmentId() != null) throw new IllegalArgumentException("宸插垎閰嶅彂璐ц褰曠殑鏄庣粏涓嶈兘淇敼");
+ if (ObjUtil.notEqual(existing.getSalesId(), updateReqVO.getSalesId())) throw exception(WM_PRODUCT_SALES_DETAIL_LINE_NOT_MATCH);
if (existing.getBagCodeId() != null) throw new IllegalArgumentException("鎵爜琚嬬爜鏄庣粏涓嶈兘鎵嬪伐淇敼鏁伴噺鎴栧簱瀛橈紝璇峰垹闄ゅ悗閲嶆柊鎵爜閫夋嫨");
// 鏍¢獙鏁版嵁
validateProductSalesDetailSaveData(updateReqVO);
@@ -66,9 +91,12 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void deleteProductSalesDetail(Long id) {
// 鏍¢獙瀛樺湪
- validateProductSalesDetailExists(id);
+ MesWmProductSalesDetailDO detail = validateProductSalesDetailExists(id);
+ lockPickingOrder(detail.getSalesId());
+ if (detail.getShipmentId() != null) throw new IllegalArgumentException("宸插垎閰嶅彂璐ц褰曠殑鏄庣粏涓嶈兘鍒犻櫎");
// 鍒犻櫎
productSalesDetailMapper.deleteById(id);
}
@@ -106,7 +134,19 @@
return detail;
}
+ private void lockPickingOrder(Long salesId) {
+ var sales = productSalesMapper.selectByIdForUpdate(salesId);
+ if (sales == null) throw exception(WM_PRODUCT_SALES_NOT_EXISTS);
+ if (!MesWmProductSalesStatusEnum.APPROVING.getStatus().equals(sales.getStatus())) {
+ throw exception(WM_PRODUCT_SALES_CANNOT_PICK);
+ }
+ }
+
private void validateProductSalesDetailSaveData(MesWmProductSalesDetailSaveReqVO reqVO) {
+ if (reqVO.getQuantity() == null || reqVO.getQuantity().signum() <= 0) throw new IllegalArgumentException("鎷h揣鏁伴噺蹇呴』澶т簬闆�");
+ if (reqVO.getMaterialStockId() != null && stockBagMapper.selectOneActiveByMaterialStockId(reqVO.getMaterialStockId()) != null) {
+ throw new IllegalArgumentException("璇ュ簱瀛樺瓨鍦ㄨ鐮佹槑缁嗭紝璇烽�夋嫨瀹為檯鎷e嚭鐨勮鐮�");
+ }
// 鏍¢獙鐖舵暟鎹紙琛岋級瀛樺湪
MesWmProductSalesLineDO line = productSalesLineService.getProductSalesLine(reqVO.getLineId());
if (line == null) {
@@ -115,11 +155,19 @@
if (ObjUtil.notEqual(line.getSalesId(), reqVO.getSalesId())) {
throw exception(WM_PRODUCT_SALES_DETAIL_LINE_NOT_MATCH);
}
+ var picked = productSalesDetailMapper.selectListByLineId(line.getId()).stream()
+ .filter(d -> !java.util.Objects.equals(d.getId(), reqVO.getId()))
+ .map(MesWmProductSalesDetailDO::getQuantity).reduce(java.math.BigDecimal.ZERO, java.math.BigDecimal::add);
+ if (line.getQuantity() == null || picked.add(reqVO.getQuantity()).compareTo(line.getQuantity()) > 0)
+ throw new IllegalArgumentException("绱鎷h揣鏁伴噺涓嶈兘瓒呰繃鍑哄簱鍗曡璁″垝鏁伴噺");
// 鏍¢獙鐗╂枡瀛樺湪
mdmItemService.validateItemExistsAndEnable(reqVO.getItemId());
if (ObjUtil.notEqual(line.getItemId(), reqVO.getItemId())) {
throw exception(WM_PRODUCT_SALES_DETAIL_ITEM_MISMATCH);
}
+ if (line.getBatchCode() != null && !line.getBatchCode().isBlank()
+ && !java.util.Objects.equals(line.getBatchCode(), reqVO.getBatchCode()))
+ throw new IllegalArgumentException("鎵�閫夊簱瀛樻壒娆′笌鍑哄簱鍗曡鎵规涓嶄竴鑷�");
// 鏍¢獙搴撲綅瀛樺湪
warehouseAreaService.validateWarehouseAreaExists(
reqVO.getWarehouseId(), reqVO.getLocationId(), reqVO.getAreaId());
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesService.java
index a7976e1..b72507d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesService.java
@@ -78,6 +78,8 @@
*/
void stockProductSales(Long id);
+ List<cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesShipmentDO> getShipments(Long id);
+
MesWmProductSalesScanRespVO scanProductSales(@Valid MesWmProductSalesScanReqVO reqVO);
MesWmProductSalesScanRespVO previewScan(String code);
@@ -104,6 +106,10 @@
*/
void cancelProductSales(Long id);
+ void closeRemaining(Long id, String reason);
+
+ void cancelShipment(Long id);
+
/**
* OQC 妫�楠屽畬鎴愬悗锛岃嚜鍔ㄦ祦杞紙寰呮娴� 鈫� 寰呮嫞璐э級
*
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java
index 1b67a0c..1b8abc1 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java
@@ -71,6 +71,7 @@
@Validated
@Slf4j
public class MesWmProductSalesServiceImpl implements MesWmProductSalesService {
+ @Resource private cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesShipmentMapper shipmentMapper;
@Resource
private MesWmProductSalesMapper productSalesMapper;
@@ -181,20 +182,26 @@
@Override
public boolean checkProductSalesQuantity(Long id) {
- // 鏍¢獙姣忚鏄庣粏鏁伴噺涔嬪拰鏄惁绛変簬琛屽嚭搴撴暟閲�
+ // 鏈鑷冲皯鎷d竴鏉★紝绱鎷h揣涓嶈秴杩囪鍒掞紱鍏佽璺ㄨ銆佸垎娆″彂璐с��
List<MesWmProductSalesLineDO> lines = productSalesLineService.getProductSalesLineListBySalesId(id);
+ boolean hasPending = false;
for (MesWmProductSalesLineDO line : lines) {
List<MesWmProductSalesDetailDO> details = productSalesDetailService.getProductSalesDetailListByLineId(line.getId());
- if (CollUtil.isEmpty(details)) {
- return false;
- }
+ if (details.stream().anyMatch(d -> d.getShipmentId() == null)) hasPending = true;
+ if (details.stream().anyMatch(d -> d.getQuantity() == null || d.getQuantity().signum() <= 0)) return false;
BigDecimal totalDetailQty = CollectionUtils.getSumValue(details,
MesWmProductSalesDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
- if (line.getQuantity() != null && totalDetailQty.compareTo(line.getQuantity()) != 0) {
+ if (line.getQuantity() == null || totalDetailQty.compareTo(line.getQuantity()) > 0) {
return false;
}
}
- return true;
+ return hasPending;
+ }
+
+ @Override
+ public List<cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesShipmentDO> getShipments(Long id) {
+ validateProductSalesExists(id);
+ return shipmentMapper.selectBySalesId(id);
}
private record PickingScope(String type, Long id, MesProBatchDO batch, List<MesProBagCodeDO> bags) { }
@@ -272,7 +279,8 @@
List<MesWmProductSalesScanRespVO.BagOption> options = scope.bags().stream().map(b -> {
String reason = unavailable(b, stockBags.get(b.getId()), stocks, occupied, scope.batch());
return new MesWmProductSalesScanRespVO.BagOption().setId(b.getId()).setCode(b.getCode()).setBusinessCode(b.getBusinessCode())
- .setPalletId(b.getPalletId()).setSelectable(reason == null).setUnavailableReason(reason);
+ .setPalletId(b.getPalletId()).setMaterialStockId(stockBags.get(b.getId()) == null ? null : stockBags.get(b.getId()).getMaterialStockId())
+ .setSelectable(reason == null).setUnavailableReason(reason);
}).toList();
return new MesWmProductSalesScanRespVO().setScanType(scope.type()).setCodeId(scope.id()).setScanContent(code)
.setBatchCode(scope.batch().getCode()).setItemId(scope.batch().getItemId()).setBagCount(options.size()).setBags(options)
@@ -282,6 +290,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
public MesWmProductSalesScanRespVO scanProductSales(MesWmProductSalesScanReqVO reqVO) {
+ if (Boolean.TRUE.equals(reqVO.getManual()) && (reqVO.getLineId() == null || reqVO.getMaterialStockId() == null))
+ throw new IllegalArgumentException("鎵嬪伐閫夋嫨琚嬬爜蹇呴』鎸囧畾鍑哄簱鍗曡鍜屽簱瀛樿褰�");
MesWmProductSalesDO sales = productSalesMapper.selectByIdForUpdate(reqVO.getSalesId());
if (sales == null) throw exception(WM_PRODUCT_SALES_NOT_EXISTS);
if (!Integer.valueOf(2).equals(sales.getStatus())) throw exception(WM_PRODUCT_SALES_CANNOT_PICK);
@@ -302,6 +312,10 @@
List<MesWmProductSalesDetailDO> occupied = productSalesDetailMapper.selectPickingByBatchCodeForUpdate(scope.batch().getCode());
List<MesWmProductSalesDetailDO> own = occupied.stream().filter(d -> Objects.equals(d.getSalesId(), sales.getId())).toList();
long already = selected.stream().filter(b -> own.stream().anyMatch(d -> Objects.equals(d.getBagCodeId(), b.getId()))).count();
+ if (already > 0 && own.stream().anyMatch(d -> selectedIds.contains(d.getBagCodeId())
+ && (reqVO.getLineId() != null && !Objects.equals(reqVO.getLineId(), d.getLineId())
+ || reqVO.getMaterialStockId() != null && !Objects.equals(reqVO.getMaterialStockId(), d.getMaterialStockId()))))
+ throw new IllegalArgumentException("鎵�閫夎鐮佸凡鍔犲叆鏈崟鍏朵粬琛屾垨搴撳瓨璁板綍");
if (already == selected.size()) return new MesWmProductSalesScanRespVO().setScanType(scope.type()).setCodeId(scope.id())
.setScanContent(reqVO.getScanContent()).setSelectedBagIds(ids).setAlreadyScanned(true).setOutboundQuantity(quantity)
.setDetailId(own.stream().filter(d -> selectedIds.contains(d.getBagCodeId())).findFirst().orElseThrow().getId()).setMessage("鎵�閫夎鐮佸凡鍦ㄦ湰鍗曟嫞璐ф槑缁嗕腑");
@@ -313,9 +327,17 @@
for (MesProBagCodeDO bag : selected) {
String reason = unavailable(bag, stockBags.get(bag.getId()), stocks, occupied, scope.batch());
if (reason != null) throw new IllegalArgumentException("琚嬬爜 " + bag.getCode() + "锛�" + reason);
+ if (reqVO.getMaterialStockId() != null && !Objects.equals(reqVO.getMaterialStockId(), stockBags.get(bag.getId()).getMaterialStockId()))
+ throw new IllegalArgumentException("鎵�閫夎鐮佷笉灞炰簬鎸囧畾搴撳瓨璁板綍");
}
MesWmProductSalesLineDO line = productSalesLineService.getProductSalesLineListBySalesId(sales.getId()).stream()
- .filter(l -> Objects.equals(l.getItemId(), scope.batch().getItemId())).findFirst().orElse(null);
+ .filter(l -> Objects.equals(l.getItemId(), scope.batch().getItemId())
+ && (reqVO.getLineId() == null || Objects.equals(l.getId(), reqVO.getLineId()))
+ && (l.getBatchCode() == null || l.getBatchCode().isBlank() || Objects.equals(l.getBatchCode(), wmBatch.getCode())))
+ .filter(l -> l.getQuantity() != null && productSalesDetailService.getProductSalesDetailListByLineId(l.getId()).stream()
+ .map(MesWmProductSalesDetailDO::getQuantity).reduce(BigDecimal.ZERO, BigDecimal::add)
+ .add(quantity).compareTo(l.getQuantity()) <= 0)
+ .findFirst().orElse(null);
if (line == null) throw exception(WM_PRODUCT_SALES_DETAIL_ITEM_MISMATCH);
BigDecimal scanned = productSalesDetailService.getProductSalesDetailListByLineId(line.getId()).stream()
.map(MesWmProductSalesDetailDO::getQuantity).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -334,7 +356,11 @@
.setItemId(scope.batch().getItemId()).setQuantity(BigDecimal.ONE).setBagCodeId(bag.getId())
.setPalletCodeId(bag.getPalletId()).setBatchId(wmBatch.getId()).setBatchCode(wmBatch.getCode()).setMaterialStockId(stock.getId())
.setWarehouseId(stock.getWarehouseId()).setLocationId(stock.getLocationId()).setAreaId(stock.getAreaId())
- .setRemark("鎵爜绫诲瀷 " + scope.type() + "锛涙潵婧愮爜 " + reqVO.getScanContent() + "锛涜鐮� " + bag.getCode());
+ .setRemark((Boolean.TRUE.equals(reqVO.getManual()) ? "鎵嬪伐閫夋嫨锛�" : "") + "鎵爜绫诲瀷 " + scope.type() + "锛�" + switch (scope.type()) {
+ case "BATCH" -> "鏉ユ簮鎵规鐮� ";
+ case "PALLET" -> "鏉ユ簮鎵樼洏鐮� ";
+ default -> "鏉ユ簮琚嬬爜 ";
+ } + reqVO.getScanContent() + "锛涜鐮� " + bag.getCode());
productSalesDetailMapper.insert(detail);
if (firstDetail == null) firstDetail = detail.getId();
}
@@ -347,19 +373,21 @@
@Transactional(rollbackFor = Exception.class)
public void stockProductSales(Long id) {
// 鏍¢獙瀛樺湪
- MesWmProductSalesDO sales = validateProductSalesExists(id);
+ MesWmProductSalesDO sales = productSalesMapper.selectByIdForUpdate(id);
+ if (sales == null) throw exception(WM_PRODUCT_SALES_NOT_EXISTS);
if (ObjUtil.notEqual(MesWmProductSalesStatusEnum.APPROVING.getStatus(), sales.getStatus())) {
throw exception(WM_PRODUCT_SALES_CANNOT_PICK);
}
+ if (!checkProductSalesQuantity(id)) throw new IllegalArgumentException("璇锋嫞閫夋湰娆″彂璐ф槑缁嗭紝涓旂疮璁℃暟閲忎笉鑳借秴杩囪鍒掓暟閲�");
+ var shipment = new cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesShipmentDO();
+ shipment.setSalesId(id); shipment.setStatus(10); shipmentMapper.insert(shipment);
// 鏍¢獙姣忚鑷冲皯鏈夋嫞璐ф槑缁嗭紝骞舵牎楠屽簱瀛樺厖瓒�
List<MesWmProductSalesLineDO> lines = productSalesLineService.getProductSalesLineListBySalesId(id);
for (MesWmProductSalesLineDO line : lines) {
List<MesWmProductSalesDetailDO> details = productSalesDetailService.getProductSalesDetailListByLineId(line.getId());
- if (CollUtil.isEmpty(details)) {
- throw exception(WM_PRODUCT_SALES_DETAILS_EMPTY);
- }
// 鏍¢獙搴撳瓨鍏呰冻骞跺垱寤哄崰鐢�
for (MesWmProductSalesDetailDO detail : details) {
+ if (detail.getShipmentId() != null) continue;
materialStockService.validateSelectedStock(
detail.getMaterialStockId(),
detail.getItemId(),
@@ -380,6 +408,7 @@
detail.getItemId(),
detail.getQuantity()
);
+ productSalesDetailMapper.updateById(new MesWmProductSalesDetailDO().setId(detail.getId()).setShipmentId(shipment.getId()));
}
}
@@ -392,10 +421,15 @@
@Transactional(rollbackFor = Exception.class)
public void shippingProductSales(MesWmProductSalesShippingReqVO reqVO) {
// 鏍¢獙瀛樺湪
- MesWmProductSalesDO sales = validateProductSalesExists(reqVO.getId());
+ MesWmProductSalesDO sales = productSalesMapper.selectByIdForUpdate(reqVO.getId());
+ if (sales == null) throw exception(WM_PRODUCT_SALES_NOT_EXISTS);
if (ObjUtil.notEqual(MesWmProductSalesStatusEnum.SHIPPING.getStatus(), sales.getStatus())) {
throw exception(WM_PRODUCT_SALES_CANNOT_SHIPPING);
}
+
+ var shipment = ensureActiveShipment(sales, 10);
+ shipmentMapper.updateById(new cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesShipmentDO()
+ .setId(shipment.getId()).setStatus(20).setCarrier(reqVO.getCarrier()).setShippingNumber(reqVO.getShippingNumber()));
// 濉啓杩愬崟锛堝緟濉啓杩愬崟 鈫� 寰呮墽琛屽嚭搴擄級
productSalesMapper.updateById(new MesWmProductSalesDO()
@@ -409,16 +443,31 @@
@Transactional(rollbackFor = Exception.class)
public void finishProductSales(Long id) {
// 1. 鏍¢獙瀛樺湪
- MesWmProductSalesDO sales = validateProductSalesExists(id);
+ MesWmProductSalesDO sales = productSalesMapper.selectByIdForUpdate(id);
+ if (sales == null) throw exception(WM_PRODUCT_SALES_NOT_EXISTS);
if (ObjUtil.notEqual(MesWmProductSalesStatusEnum.APPROVED.getStatus(), sales.getStatus())) {
throw exception(WM_PRODUCT_SALES_CANNOT_FINISH);
}
+ var shipment = ensureActiveShipment(sales, 20);
+ List<MesWmProductSalesDetailDO> outDetails = productSalesDetailService.getProductSalesDetailListBySalesId(id).stream()
+ .filter(d -> Objects.equals(d.getShipmentId(), shipment.getId())).toList();
+ if (outDetails.isEmpty()) throw new IllegalArgumentException("鏈鍙戣揣娌℃湁鍑哄簱鏄庣粏");
// 2. 纭鍗犵敤杞嚭搴擄紙閲婃斁鍗犵敤閲忥級
stockReserveService.confirmReserveToOutbound(MesWmStockReserveBizTypeEnum.PRODUCT_SALES.getType(), id);
// 3. 閬嶅巻鎵�鏈夋槑缁嗭紝鍒涘缓搴撳瓨浜嬪姟锛堟墸鍑忓簱瀛� + 璁板綍娴佹按锛�
- createTransactionList(sales);
+ createTransactionList(sales, outDetails);
+
+ shipmentMapper.updateById(new cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesShipmentDO()
+ .setId(shipment.getId()).setStatus(30).setOutboundTime(java.time.LocalDateTime.now())
+ .setOutboundUserId(SecurityFrameworkUtils.getLoginUserId()));
+ boolean complete = productSalesLineService.getProductSalesLineListBySalesId(id).stream().allMatch(line -> {
+ BigDecimal total = productSalesDetailService.getProductSalesDetailListByLineId(line.getId()).stream()
+ .filter(d -> d.getShipmentId() != null).map(MesWmProductSalesDetailDO::getQuantity)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ return line.getQuantity() != null && total.compareTo(line.getQuantity()) == 0;
+ });
// 4. 鍥哄寲缁忛攢鍟嗕笌瀹為檯鍑哄簱鎿嶄綔淇℃伅
CrmCustomerRespDTO customer = customerApi.getCustomer(sales.getClientId());
@@ -427,15 +476,14 @@
.setClientName(customer != null ? customer.getName() : null)
.setOutboundTime(java.time.LocalDateTime.now())
.setOutboundUserId(SecurityFrameworkUtils.getLoginUserId())
- .setStatus(MesWmProductSalesStatusEnum.FINISHED.getStatus()));
+ .setStatus(complete ? MesWmProductSalesStatusEnum.FINISHED.getStatus() : MesWmProductSalesStatusEnum.APPROVING.getStatus()));
// 5. 鏇存柊鍏宠仈鐨勫彂璐ч�氱煡鍗曞嚭搴撴暟閲忓拰鐘舵��
if (sales.getNoticeId() != null) {
- updateSalesNoticeOutCount(sales);
+ updateSalesNoticeOutCount(sales, outDetails);
}
// 6. 鍥炲啓琚嬬爜/鎵樼洏鍑哄簱鍘诲悜锛堜緵绐滆揣绋芥煡瀹氫綅缁忛攢鍟嗗湴鍖猴級锛屽苟鐢熸垚鍑哄簱瀹屾暣鎬ф憳瑕�
- List<MesWmProductSalesDetailDO> outDetails = productSalesDetailService.getProductSalesDetailListBySalesId(id);
for (MesWmProductSalesDetailDO detail : outDetails) {
if (detail.getBagCodeId() != null) {
bagCodeService.markOutbound(detail.getBagCodeId(), id);
@@ -445,13 +493,13 @@
palletService.markOutbound(detail.getPalletCodeId(), id);
}
}
- integrityService.recordSalesIntegrity(id);
+ if (complete) integrityService.recordSalesIntegrity(id);
}
/**
* 鏇存柊鍙戣揣閫氱煡鍗曠殑鍑哄簱鏁伴噺鍜岀姸鎬�
*/
- private void updateSalesNoticeOutCount(MesWmProductSalesDO sales) {
+ private void updateSalesNoticeOutCount(MesWmProductSalesDO sales, List<MesWmProductSalesDetailDO> outDetails) {
// 鑾峰彇鍑哄簱鍗曡
List<MesWmProductSalesLineDO> lines = productSalesLineService.getProductSalesLineListBySalesId(sales.getId());
if (CollUtil.isEmpty(lines)) {
@@ -459,44 +507,109 @@
}
// 閬嶅巻琛岋紝鎸� noticeLineId 鏇存柊鍑哄簱鏁伴噺
for (MesWmProductSalesLineDO line : lines) {
- if (line.getNoticeLineId() != null && line.getQuantity() != null) {
- salesNoticeService.updateSalesNoticeLineOutCount(line.getNoticeLineId(), line.getQuantity());
+ BigDecimal quantity = outDetails.stream().filter(d -> Objects.equals(d.getLineId(), line.getId()))
+ .map(MesWmProductSalesDetailDO::getQuantity).reduce(BigDecimal.ZERO, BigDecimal::add);
+ if (line.getNoticeLineId() != null && quantity.signum() > 0) {
+ salesNoticeService.updateSalesNoticeLineOutCount(line.getNoticeLineId(), quantity);
}
}
}
- private void createTransactionList(MesWmProductSalesDO sales) {
- List<MesWmProductSalesDetailDO> details = productSalesDetailService.getProductSalesDetailListBySalesId(sales.getId());
+ private void createTransactionList(MesWmProductSalesDO sales, List<MesWmProductSalesDetailDO> details) {
+ Set<Long> bagIds = details.stream().map(MesWmProductSalesDetailDO::getBagCodeId).filter(Objects::nonNull).collect(Collectors.toSet());
+ Map<Long, MesProBagCodeDO> bags = bagIds.isEmpty() ? Map.of() : pickingBagMapper.selectBatchIds(bagIds).stream()
+ .collect(Collectors.toMap(MesProBagCodeDO::getId, b -> b));
wmTransactionService.createTransactionList(convertList(details, detail -> new MesWmTransactionSaveReqDTO()
.setType(MesWmTransactionTypeEnum.OUT.getType()).setItemId(detail.getItemId())
.setQuantity(detail.getQuantity().negate()) // 鍑哄簱鏁伴噺涓鸿礋鏁�
.setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode())
.setBagCodeId(detail.getBagCodeId()) // 鏂版壂鐮佹槑缁嗛�愯鍏宠仈锛屾墽琛屽嚭搴撻�愯鏇存柊搴撳瓨鐘舵��
+ .setShipmentId(detail.getShipmentId())
+ .setBagCode(detail.getBagCodeId() == null || !bags.containsKey(detail.getBagCodeId()) ? null : bags.get(detail.getBagCodeId()).getCode())
.setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId())
.setBizType(MesBizTypeConstants.WM_PRODUCT_SALES).setBizId(sales.getId())
.setBizCode(sales.getCode()).setBizLineId(detail.getLineId())
.setMaterialStockId(detail.getMaterialStockId()))); // 鎸囧畾搴撳瓨璁板綍ID锛岄伩鍏嶉噸鏂板尮閰�
}
+ /** 鍏煎鍗囩骇鍓嶅凡杩涘叆寰呰繍鍗曟垨寰呭嚭搴撶姸鎬佺殑鏃у崟鎹�傝皟鐢ㄦ柟椤绘寔鏈夊嚭搴撳崟琛岄攣銆� */
+ private cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesShipmentDO ensureActiveShipment(
+ MesWmProductSalesDO sales, int expectedStatus) {
+ var shipment = shipmentMapper.selectActive(sales.getId());
+ if (shipment != null) {
+ if (!Integer.valueOf(expectedStatus).equals(shipment.getStatus())) throw new IllegalArgumentException("鍙戣揣璁板綍鐘舵�佸紓甯革紝璇峰埛鏂板悗閲嶈瘯");
+ return shipment;
+ }
+ shipment = new cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesShipmentDO();
+ shipment.setSalesId(sales.getId()); shipment.setStatus(expectedStatus);
+ shipment.setCarrier(sales.getCarrier()); shipment.setShippingNumber(sales.getShippingNumber());
+ shipmentMapper.insert(shipment);
+ for (MesWmProductSalesDetailDO detail : productSalesDetailService.getProductSalesDetailListBySalesId(sales.getId())) {
+ if (detail.getShipmentId() == null)
+ productSalesDetailMapper.updateById(new MesWmProductSalesDetailDO().setId(detail.getId()).setShipmentId(shipment.getId()));
+ }
+ return shipment;
+ }
+
@Override
@Transactional(rollbackFor = Exception.class)
public void cancelProductSales(Long id) {
// 鏍¢獙瀛樺湪
- MesWmProductSalesDO sales = validateProductSalesExists(id);
+ MesWmProductSalesDO sales = productSalesMapper.selectByIdForUpdate(id);
+ if (sales == null) throw exception(WM_PRODUCT_SALES_NOT_EXISTS);
// 宸插畬鎴愬拰宸插彇娑堜笉鍏佽鍙栨秷
if (ObjectUtils.equalsAny(sales.getStatus(),
MesWmProductSalesStatusEnum.FINISHED.getStatus(),
- MesWmProductSalesStatusEnum.CANCELED.getStatus())) {
+ MesWmProductSalesStatusEnum.CANCELED.getStatus(), MesWmProductSalesStatusEnum.CLOSED.getStatus())) {
throw exception(WM_PRODUCT_SALES_CANNOT_CANCEL);
}
+ if (shipmentMapper.selectBySalesId(id).stream().anyMatch(s -> Integer.valueOf(30).equals(s.getStatus())))
+ throw new IllegalArgumentException("璇ュ崟宸叉湁鍑哄簱璁板綍锛岃鍏抽棴鍓╀綑鏁伴噺锛屼笉鑳藉彇娑堝凡鍙戣揣鍗曟嵁");
// 閲婃斁搴撳瓨鍗犵敤
stockReserveService.releaseReserve(MesWmStockReserveBizTypeEnum.PRODUCT_SALES.getType(), id);
+ var shipment = shipmentMapper.selectActive(id);
+ if (shipment != null) shipmentMapper.updateById(new cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesShipmentDO()
+ .setId(shipment.getId()).setStatus(40));
// 鍙栨秷
productSalesMapper.updateById(new MesWmProductSalesDO()
.setId(id).setStatus(MesWmProductSalesStatusEnum.CANCELED.getStatus()));
}
@Override
+ @Transactional(rollbackFor = Exception.class)
+ public void closeRemaining(Long id, String reason) {
+ var sales = productSalesMapper.selectByIdForUpdate(id);
+ if (sales == null) throw exception(WM_PRODUCT_SALES_NOT_EXISTS);
+ if (!MesWmProductSalesStatusEnum.APPROVING.getStatus().equals(sales.getStatus()))
+ throw new IllegalArgumentException("浠呭緟鎷h揣鐘舵�佸彲鍏抽棴鍓╀綑鏁伴噺");
+ if (reason == null || reason.isBlank() || reason.trim().length() > 500)
+ throw new IllegalArgumentException("璇峰~鍐欎笉瓒呰繃500瀛楃殑鍏抽棴鍘熷洜");
+ if (shipmentMapper.selectBySalesId(id).stream().noneMatch(s -> Integer.valueOf(30).equals(s.getStatus())))
+ throw new IllegalArgumentException("灏氭湭鍙戠敓鍑哄簱锛岃浣跨敤鍙栨秷鎿嶄綔");
+ if (productSalesDetailService.getProductSalesDetailListBySalesId(id).stream().anyMatch(d -> d.getShipmentId() == null))
+ throw new IllegalArgumentException("璇峰厛鍒犻櫎鏈鏈彂璐х殑鎷h揣鏄庣粏");
+ productSalesMapper.updateById(new MesWmProductSalesDO().setId(id)
+ .setStatus(MesWmProductSalesStatusEnum.CLOSED.getStatus()).setCloseReason(reason.trim()));
+ integrityService.recordSalesIntegrity(id);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void cancelShipment(Long id) {
+ var sales = productSalesMapper.selectByIdForUpdate(id);
+ if (sales == null) throw exception(WM_PRODUCT_SALES_NOT_EXISTS);
+ if (!ObjectUtils.equalsAny(sales.getStatus(), MesWmProductSalesStatusEnum.SHIPPING.getStatus(), MesWmProductSalesStatusEnum.APPROVED.getStatus()))
+ throw new IllegalArgumentException("浠呭緟杩愬崟鎴栧緟鍑哄簱鐨勫彂璐ц褰曞彲鍙栨秷");
+ int expected = MesWmProductSalesStatusEnum.SHIPPING.getStatus().equals(sales.getStatus()) ? 10 : 20;
+ var shipment = ensureActiveShipment(sales, expected);
+ stockReserveService.releaseReserve(MesWmStockReserveBizTypeEnum.PRODUCT_SALES.getType(), id);
+ productSalesDetailMapper.unassignShipment(shipment.getId());
+ shipmentMapper.updateById(new cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesShipmentDO()
+ .setId(shipment.getId()).setStatus(40));
+ productSalesMapper.updateById(new MesWmProductSalesDO().setId(id).setStatus(MesWmProductSalesStatusEnum.APPROVING.getStatus()));
+ }
+
+ @Override
public void confirmProductSales(Long id) {
// 鏍¢獙瀛樺湪 + 寰呮娴嬬姸鎬�
MesWmProductSalesDO sales = validateProductSalesExists(id);
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/MesWmTransactionServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/MesWmTransactionServiceImpl.java
index eb43c7e..a6341be 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/MesWmTransactionServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/MesWmTransactionServiceImpl.java
@@ -94,10 +94,11 @@
throw exception(WM_MATERIAL_STOCK_NOT_EXISTS);
}
// 鏍¢獙鐗╂枡銆佹壒娆°�佷粨搴撶瓑缁村害涓�鑷达紙闃叉浼犲叆閿欒鐨� materialStockId锛�
+ // 搴撳尯/搴撲綅涓哄彲閫夌淮搴︼紝鏈寚瀹氭椂涓嶅弬涓庢瘮瀵�
if (ObjUtil.notEqual(materialStock.getItemId(), reqDTO.getItemId())
|| ObjUtil.notEqual(materialStock.getWarehouseId(), reqDTO.getWarehouseId())
- || ObjUtil.notEqual(materialStock.getLocationId(), reqDTO.getLocationId())
- || ObjUtil.notEqual(materialStock.getAreaId(), reqDTO.getAreaId())) {
+ || (reqDTO.getLocationId() != null && ObjUtil.notEqual(materialStock.getLocationId(), reqDTO.getLocationId()))
+ || (reqDTO.getAreaId() != null && ObjUtil.notEqual(materialStock.getAreaId(), reqDTO.getAreaId()))) {
throw exception(WM_MATERIAL_STOCK_SELECTION_MISMATCH);
}
} else if (isInbound) {
@@ -154,6 +155,7 @@
.type(reqDTO.getType()).quantity(reqDTO.getQuantity()).transactionTime(LocalDateTime.now())
.itemId(reqDTO.getItemId()).batchId(reqDTO.getBatchId()).batchCode(reqDTO.getBatchCode())
.bagCodeId(reqDTO.getBagCodeId()).bagCode(reqDTO.getBagCode())
+ .shipmentId(reqDTO.getShipmentId())
.warehouseId(reqDTO.getWarehouseId()).locationId(reqDTO.getLocationId()).areaId(reqDTO.getAreaId())
.bizType(reqDTO.getBizType()).bizId(reqDTO.getBizId()).bizCode(reqDTO.getBizCode()).bizLineId(reqDTO.getBizLineId())
.materialStockId(materialStock.getId()).relatedTransactionId(reqDTO.getRelatedTransactionId())
@@ -279,20 +281,21 @@
if (Boolean.TRUE.equals(warehouse.getFrozen())) {
throw exception(WM_TRANSACTION_WAREHOUSE_FROZEN, warehouse.getName());
}
- // 1.2 妫�鏌ュ簱鍖哄喕缁�
+ // 1.2 妫�鏌ュ簱鍖哄喕缁擄紙鏈娇鐢ㄥ簱鍖烘椂璺宠繃锛�
MesWmWarehouseLocationDO location = locationService.validateWarehouseLocationExists(reqDTO.getLocationId());
- if (Boolean.TRUE.equals(location.getFrozen())) {
+ if (location != null && Boolean.TRUE.equals(location.getFrozen())) {
throw exception(WM_TRANSACTION_LOCATION_FROZEN, location.getName());
}
- // 1.3 妫�鏌ュ簱浣嶅喕缁�
+ // 1.3 妫�鏌ュ簱浣嶅喕缁擄紙鏈娇鐢ㄥ簱浣嶆椂璺宠繃锛�
MesWmWarehouseAreaDO area = areaService.validateWarehouseAreaExists(reqDTO.getAreaId());
- if (Boolean.TRUE.equals(area.getFrozen())) {
+ if (area != null && Boolean.TRUE.equals(area.getFrozen())) {
throw exception(WM_TRANSACTION_AREA_FROZEN, area.getName());
}
// 2. 妫�鏌ュ簱瀛樿褰曞喕缁�
if (Boolean.TRUE.equals(materialStock.getFrozen())) {
- throw exception(WM_TRANSACTION_STOCK_FROZEN, warehouse.getName(), location.getName(), area.getName());
+ throw exception(WM_TRANSACTION_STOCK_FROZEN, warehouse.getName(),
+ location != null ? location.getName() : "", area != null ? area.getName() : "");
}
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/dto/MesWmTransactionSaveReqDTO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/dto/MesWmTransactionSaveReqDTO.java
index 6ac1ead..6a09af8 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/dto/MesWmTransactionSaveReqDTO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/dto/MesWmTransactionSaveReqDTO.java
@@ -73,6 +73,7 @@
private Long bagCodeId;
/** 琚嬬爜 */
private String bagCode;
+ private Long shipmentId;
// ===== 搴撳瓨浣嶇疆 =====
@@ -82,14 +83,12 @@
@NotNull(message = "浠撳簱 ID 涓嶈兘涓虹┖")
private Long warehouseId;
/**
- * 搴撳尯 ID
+ * 搴撳尯 ID锛堝彲閫夛級
*/
- @NotNull(message = "搴撳尯 ID 涓嶈兘涓虹┖")
private Long locationId;
/**
- * 搴撲綅 ID
+ * 搴撲綅 ID锛堝彲閫夛級
*/
- @NotNull(message = "搴撲綅 ID 涓嶈兘涓虹┖")
private Long areaId;
// ===== 鍙拌处琛ュ厖瀛楁锛堝叆搴撴椂鐢ㄤ簬鍒濆鍖� MesWmMaterialStockDO锛� =====
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseAreaServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseAreaServiceImpl.java
index 33a7a47..6deb613 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseAreaServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseAreaServiceImpl.java
@@ -116,6 +116,9 @@
@Override
public MesWmWarehouseAreaDO validateWarehouseAreaExists(Long id) {
+ if (id == null) {
+ return null;
+ }
MesWmWarehouseAreaDO area = areaMapper.selectById(id);
if (area == null) {
throw exception(WM_WAREHOUSE_AREA_NOT_EXISTS);
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseLocationServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseLocationServiceImpl.java
index b2f7617..72a7ec6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseLocationServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseLocationServiceImpl.java
@@ -119,6 +119,9 @@
@Override
public MesWmWarehouseLocationDO validateWarehouseLocationExists(Long id) {
+ if (id == null) {
+ return null;
+ }
MesWmWarehouseLocationDO location = locationMapper.selectById(id);
if (location == null) {
throw exception(WM_WAREHOUSE_LOCATION_NOT_EXISTS);
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseServiceImpl.java
index 5ca72bd..af16596 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseServiceImpl.java
@@ -37,8 +37,6 @@
private MesWmWarehouseMapper warehouseMapper;
@Resource
- private MesWmWarehouseLocationService locationService;
- @Resource
@Lazy
private MesMdWorkstationService workstationService;
@Resource
@@ -96,10 +94,6 @@
MesWmWarehouseDO warehouse = validateWarehouseExists(id);
// 鏍¢獙铏氭嫙浠撳簱涓嶅厑璁稿垹闄�
validateNotVirtual(warehouse.getCode());
- // 鏍¢獙鏄惁鏈夊簱鍖�
- if (locationService.getWarehouseLocationCountByWarehouseId(id) > 0) {
- throw exception(WM_WAREHOUSE_HAS_LOCATION);
- }
// 鏍¢獙鏄惁琚伐浣滅珯寮曠敤
if (workstationService.getWorkstationCountByWarehouseId(id) > 0) {
throw exception(WM_WAREHOUSE_HAS_WORKSTATION);
diff --git a/yudao-module-mes/src/main/resources/bpm/mes_seed_quality_company_approve.bpmn20.xml b/yudao-module-mes/src/main/resources/bpm/mes_seed_quality_company_approve.bpmn20.xml
new file mode 100644
index 0000000..c78fad2
--- /dev/null
+++ b/yudao-module-mes/src/main/resources/bpm/mes_seed_quality_company_approve.bpmn20.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:flowable="http://flowable.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" targetNamespace="http://www.flowable.org/processdef">
+ <process id="mes_seed_quality_company_approve" name="绉嶅瓙鍏徃璐ㄦ瀹℃壒" isExecutable="true">
+ <startEvent id="start" />
+ <sequenceFlow id="start_to_review" sourceRef="start" targetRef="review" />
+ <userTask id="review" name="鍏徃璐ㄦ瀹℃壒锛堟殏鐢� admin 澶勭悊锛�" flowable:candidateStrategy="30" flowable:candidateParam="1" />
+ <sequenceFlow id="review_to_end" sourceRef="review" targetRef="end" />
+ <endEvent id="end" />
+ </process>
+ <bpmndi:BPMNDiagram id="BPMNDiagram_mes_seed_quality_company_approve">
+ <bpmndi:BPMNPlane bpmnElement="mes_seed_quality_company_approve" id="BPMNPlane_mes_seed_quality_company_approve">
+ <bpmndi:BPMNShape bpmnElement="start" id="BPMNShape_start">
+ <omgdc:Bounds height="36.0" width="36.0" x="160.0" y="182.0"></omgdc:Bounds>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape bpmnElement="review" id="BPMNShape_review">
+ <omgdc:Bounds height="80.0" width="100.0" x="250.0" y="160.0"></omgdc:Bounds>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape bpmnElement="end" id="BPMNShape_end">
+ <omgdc:Bounds height="36.0" width="36.0" x="400.0" y="182.0"></omgdc:Bounds>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge bpmnElement="start_to_review" id="BPMNEdge_start_to_review">
+ <omgdi:waypoint x="196.0" y="200.0"></omgdi:waypoint>
+ <omgdi:waypoint x="250.0" y="200.0"></omgdi:waypoint>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge bpmnElement="review_to_end" id="BPMNEdge_review_to_end">
+ <omgdi:waypoint x="350.0" y="200.0"></omgdi:waypoint>
+ <omgdi:waypoint x="400.0" y="200.0"></omgdi:waypoint>
+ </bpmndi:BPMNEdge>
+ </bpmndi:BPMNPlane>
+ </bpmndi:BPMNDiagram>
+</definitions>
diff --git a/yudao-module-mes/src/main/resources/bpm/mes_seed_quality_line_approve.bpmn20.xml b/yudao-module-mes/src/main/resources/bpm/mes_seed_quality_line_approve.bpmn20.xml
new file mode 100644
index 0000000..187796c
--- /dev/null
+++ b/yudao-module-mes/src/main/resources/bpm/mes_seed_quality_line_approve.bpmn20.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:flowable="http://flowable.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" targetNamespace="http://www.flowable.org/processdef">
+ <process id="mes_seed_quality_line_approve" name="绉嶅瓙璐ㄦ閮ㄩ棬瀹℃壒" isExecutable="true">
+ <startEvent id="start" />
+ <sequenceFlow id="start_to_review" sourceRef="start" targetRef="review" />
+ <userTask id="review" name="閮ㄩ棬棰嗗瀹℃壒锛堟殏鐢� admin 澶勭悊锛�" flowable:candidateStrategy="30" flowable:candidateParam="1" />
+ <sequenceFlow id="review_to_end" sourceRef="review" targetRef="end" />
+ <endEvent id="end" />
+ </process>
+ <bpmndi:BPMNDiagram id="BPMNDiagram_mes_seed_quality_line_approve">
+ <bpmndi:BPMNPlane bpmnElement="mes_seed_quality_line_approve" id="BPMNPlane_mes_seed_quality_line_approve">
+ <bpmndi:BPMNShape bpmnElement="start" id="BPMNShape_start">
+ <omgdc:Bounds height="36.0" width="36.0" x="160.0" y="182.0"></omgdc:Bounds>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape bpmnElement="review" id="BPMNShape_review">
+ <omgdc:Bounds height="80.0" width="100.0" x="250.0" y="160.0"></omgdc:Bounds>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape bpmnElement="end" id="BPMNShape_end">
+ <omgdc:Bounds height="36.0" width="36.0" x="400.0" y="182.0"></omgdc:Bounds>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge bpmnElement="start_to_review" id="BPMNEdge_start_to_review">
+ <omgdi:waypoint x="196.0" y="200.0"></omgdi:waypoint>
+ <omgdi:waypoint x="250.0" y="200.0"></omgdi:waypoint>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge bpmnElement="review_to_end" id="BPMNEdge_review_to_end">
+ <omgdi:waypoint x="350.0" y="200.0"></omgdi:waypoint>
+ <omgdi:waypoint x="400.0" y="200.0"></omgdi:waypoint>
+ </bpmndi:BPMNEdge>
+ </bpmndi:BPMNPlane>
+ </bpmndi:BPMNDiagram>
+</definitions>
diff --git a/yudao-module-mes/src/main/resources/bpm/mes_seed_return_approve.bpmn20.xml b/yudao-module-mes/src/main/resources/bpm/mes_seed_return_approve.bpmn20.xml
new file mode 100644
index 0000000..52ed403
--- /dev/null
+++ b/yudao-module-mes/src/main/resources/bpm/mes_seed_return_approve.bpmn20.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:flowable="http://flowable.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" targetNamespace="http://www.flowable.org/processdef">
+ <process id="mes_seed_return_approve" name="缁忛攢鍟嗛��璐х瀛愯川妫�瀹℃壒" isExecutable="true">
+ <startEvent id="start" />
+ <sequenceFlow id="start_to_review" sourceRef="start" targetRef="review" />
+ <userTask id="review" name="閿�鍞儴棰嗗瀹℃壒锛堟殏鐢� admin 澶勭悊锛�" flowable:candidateStrategy="30" flowable:candidateParam="1" />
+ <sequenceFlow id="review_to_end" sourceRef="review" targetRef="end" />
+ <endEvent id="end" />
+ </process>
+ <bpmndi:BPMNDiagram id="BPMNDiagram_mes_seed_return_approve">
+ <bpmndi:BPMNPlane bpmnElement="mes_seed_return_approve" id="BPMNPlane_mes_seed_return_approve">
+ <bpmndi:BPMNShape bpmnElement="start" id="BPMNShape_start">
+ <omgdc:Bounds height="36.0" width="36.0" x="160.0" y="182.0"></omgdc:Bounds>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape bpmnElement="review" id="BPMNShape_review">
+ <omgdc:Bounds height="80.0" width="100.0" x="250.0" y="160.0"></omgdc:Bounds>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape bpmnElement="end" id="BPMNShape_end">
+ <omgdc:Bounds height="36.0" width="36.0" x="400.0" y="182.0"></omgdc:Bounds>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge bpmnElement="start_to_review" id="BPMNEdge_start_to_review">
+ <omgdi:waypoint x="196.0" y="200.0"></omgdi:waypoint>
+ <omgdi:waypoint x="250.0" y="200.0"></omgdi:waypoint>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge bpmnElement="review_to_end" id="BPMNEdge_review_to_end">
+ <omgdi:waypoint x="350.0" y="200.0"></omgdi:waypoint>
+ <omgdi:waypoint x="400.0" y="200.0"></omgdi:waypoint>
+ </bpmndi:BPMNEdge>
+ </bpmndi:BPMNPlane>
+ </bpmndi:BPMNDiagram>
+</definitions>
diff --git a/yudao-module-mes/src/main/resources/mapper/wm/batch/MesWmBatchMapper.xml b/yudao-module-mes/src/main/resources/mapper/wm/batch/MesWmBatchMapper.xml
index 2576322..fc31ec1 100644
--- a/yudao-module-mes/src/main/resources/mapper/wm/batch/MesWmBatchMapper.xml
+++ b/yudao-module-mes/src/main/resources/mapper/wm/batch/MesWmBatchMapper.xml
@@ -63,26 +63,15 @@
-->
<select id="selectSalesTargetList" parameterType="String"
resultType="cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchSalesTargetRespVO">
- SELECT s.code AS sales_code, s.sales_date, s.sales_order_code, s.client_id, s.client_name, s.contact_name,
- oqc.code AS oqc_code, oqc.check_result AS check_result,
- sl.batch_code, sl.item_id, sl.quantity, sl.quality_status
- FROM mes_wm_product_sales_line sl
- JOIN mes_wm_product_sales s ON s.id = sl.sales_id AND s.deleted = 0
- LEFT JOIN mes_qc_oqc oqc ON oqc.id = sl.oqc_id AND oqc.deleted = 0
- WHERE sl.batch_code = #{batchCode} AND sl.deleted = 0 AND s.status != 5
- AND NOT EXISTS (SELECT 1 FROM mes_wm_product_sales_detail d
- WHERE d.line_id = sl.id AND d.batch_code = #{batchCode} AND d.deleted = 0)
- UNION ALL
- SELECT s.code AS sales_code, s.sales_date, s.sales_order_code, s.client_id, s.client_name, s.contact_name,
- oqc.code AS oqc_code, oqc.check_result AS check_result,
- d.batch_code, d.item_id, SUM(d.quantity) AS quantity, MAX(sl.quality_status) AS quality_status
- FROM mes_wm_product_sales_detail d
- JOIN mes_wm_product_sales s ON s.id = d.sales_id AND s.deleted = 0
- JOIN mes_wm_product_sales_line sl ON sl.id = d.line_id AND sl.deleted = 0
- LEFT JOIN mes_qc_oqc oqc ON oqc.id = sl.oqc_id AND oqc.deleted = 0
- WHERE d.batch_code = #{batchCode} AND d.deleted = 0 AND s.status != 5
- GROUP BY s.id, s.code, s.sales_date, s.sales_order_code, s.client_id, s.client_name, s.contact_name,
- oqc.code, oqc.check_result, d.batch_code, d.item_id
+ SELECT s.code AS sales_code, tx.shipment_id, COALESCE(sh.outbound_time, MAX(tx.transaction_time)) AS sales_date,
+ s.sales_order_code, s.client_id, s.client_name, s.contact_name,
+ tx.batch_code, tx.item_id, -SUM(tx.quantity) AS quantity
+ FROM mes_wm_transaction tx
+ JOIN mes_wm_product_sales s ON s.id = tx.biz_id AND s.deleted = 0
+ LEFT JOIN mes_wm_product_sales_shipment sh ON sh.id = tx.shipment_id AND sh.deleted = 0
+ WHERE tx.batch_code = #{batchCode} AND tx.deleted = 0 AND tx.biz_type = 119 AND tx.type = 2
+ GROUP BY s.id, s.code, tx.shipment_id, sh.outbound_time, s.sales_order_code,
+ s.client_id, s.client_name, s.contact_name, tx.batch_code, tx.item_id
ORDER BY sales_date
</select>
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedIndicatorRangeServiceTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedIndicatorRangeServiceTest.java
index 308e1d4..c714b75 100644
--- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedIndicatorRangeServiceTest.java
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedIndicatorRangeServiceTest.java
@@ -1,34 +1,37 @@
package cn.iocoder.yudao.module.mes.service.qc.seedquality;
import cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedIndicatorRangeSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.seedquality.MesQcSeedIndicatorRangeDO;
import cn.iocoder.yudao.module.mes.dal.mysql.qc.seedquality.MesQcSeedIndicatorRangeMapper;
+import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import org.junit.jupiter.api.Test;
import org.springframework.test.util.ReflectionTestUtils;
import java.math.BigDecimal;
-import java.util.List;
import static org.mockito.Mockito.*;
class MesQcSeedIndicatorRangeServiceTest {
private final MesQcSeedIndicatorRangeService service = new MesQcSeedIndicatorRangeService();
private final MesQcSeedIndicatorRangeMapper mapper = mock(MesQcSeedIndicatorRangeMapper.class);
+ private final MesMdmItemService itemService = mock(MesMdmItemService.class);
@Test
- void savesTemplateWithoutRestrictingActualInspection() {
+ void createsIndicatorRangeForProduct() {
ReflectionTestUtils.setField(service, "mapper", mapper);
+ ReflectionTestUtils.setField(service, "mdmItemService", itemService);
+ MesMdmItemDO item = new MesMdmItemDO();
+ item.setId(1L);
+ when(itemService.getItem(1L)).thenReturn(item);
+ when(mapper.selectByItemIdAndCode(1L, "purity")).thenReturn(null);
MesQcSeedIndicatorRangeSaveReqVO request = new MesQcSeedIndicatorRangeSaveReqVO();
- request.setRanges(List.of(item("purity"), item("cleanliness"), item("germination_rate"), item("moisture")));
- service.saveRanges(request);
- verify(mapper, times(4)).insert(any(MesQcSeedIndicatorRangeDO.class));
- }
-
- private MesQcSeedIndicatorRangeSaveReqVO.Item item(String code) {
- MesQcSeedIndicatorRangeSaveReqVO.Item row = new MesQcSeedIndicatorRangeSaveReqVO.Item();
- row.setIndicatorCode(code);
- row.setMinValue(new BigDecimal("90"));
- row.setMaxValue(new BigDecimal("100"));
- return row;
+ request.setItemId(1L);
+ request.setIndicatorCode("purity");
+ request.setIndicatorName("绾害");
+ request.setMinValue(new BigDecimal("90"));
+ request.setMaxValue(new BigDecimal("100"));
+ service.create(request);
+ verify(mapper, times(1)).insert(any(MesQcSeedIndicatorRangeDO.class));
}
}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/SeedQualityGroupTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/SeedQualityGroupTest.java
index 5189d27..50aff13 100644
--- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/SeedQualityGroupTest.java
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/SeedQualityGroupTest.java
@@ -4,6 +4,7 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.bagcode.MesProBagCodeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.batch.MesProBatchDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.pallet.MesProPalletDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.seedquality.MesQcSeedIndicatorRangeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.seedquality.MesQcSeedQualityDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.seedquality.MesQcSeedQualityIndicatorDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
@@ -17,6 +18,7 @@
import cn.iocoder.yudao.module.mes.dal.mysql.wm.batch.MesWmBatchMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.materialstock.MesWmMaterialStockMapper;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmWarehouseTypeEnum;
+import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.pro.batch.MesProBatchService;
import cn.iocoder.yudao.module.mes.service.qc.approver.MesQcApproverService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
@@ -40,11 +42,19 @@
private final MesWmMaterialStockMapper stocks=mock(MesWmMaterialStockMapper.class);
private final MesWmWarehouseService warehouses=mock(MesWmWarehouseService.class);
private final MesQcApproverService approvers=mock(MesQcApproverService.class);
+ private final MesQcSeedIndicatorRangeService ranges=mock(MesQcSeedIndicatorRangeService.class);
+ private final MesMdmItemService items=mock(MesMdmItemService.class);
private final MesProBagCodeDO first=bag(1L),second=bag(2L),canceled=bag(3L).setStatus(30);
private MesQcSeedQualityGroupSubmitReqVO req;
private MesProBagCodeDO bag(Long id) {return new MesProBagCodeDO().setId(id).setCode("B"+id).setBatchId(10L).setPalletId(20L).setStatus(20).setInboundEventId(9L);}
private List<MesQcSeedQualitySubmitReqVO.Indicator> validIndicators() {
return List.of(indicator("purity"), indicator("cleanliness"), indicator("germination_rate"), indicator("moisture"));
+ }
+ private MesQcSeedIndicatorRangeDO range(String code) {
+ var range = new MesQcSeedIndicatorRangeDO();
+ range.setIndicatorCode(code); range.setIndicatorName(code); range.setUnit("%");
+ range.setMinValue(java.math.BigDecimal.ZERO); range.setMaxValue(java.math.BigDecimal.TEN);
+ return range;
}
private MesQcSeedQualitySubmitReqVO.Indicator indicator(String code) {
var item = new MesQcSeedQualitySubmitReqVO.Indicator(); item.setCode(code);
@@ -65,6 +75,11 @@
ReflectionTestUtils.setField(service,"proBatchService",batchService);ReflectionTestUtils.setField(service,"mesWmBatchMapper",wmBatches);
ReflectionTestUtils.setField(service,"materialStockMapper",stocks);ReflectionTestUtils.setField(service,"warehouseService",warehouses);
ReflectionTestUtils.setField(service,"approverService",approvers);
+ ReflectionTestUtils.setField(service,"rangeService",ranges);
+ ReflectionTestUtils.setField(service,"mdmItemService",items);
+ when(ranges.getEffectiveRanges(any())).thenReturn(List.of(range("purity"),range("cleanliness"),range("germination_rate"),range("moisture")));
+ when(ranges.getEffectiveMap(any())).thenReturn(java.util.Map.of());
+ when(items.getItem(any())).thenReturn(null);
var batch=new MesProBatchDO().setId(10L).setCode("BATCH").setBusinessCode("BATCH-BUS").setItemId(99L).setStatus(30);
when(batches.selectByScanCode(anyString())).thenReturn(batch);when(batches.selectByScanCodeForUpdate(anyString())).thenReturn(batch);
when(batchService.getBatch(10L)).thenReturn(batch);
@@ -84,24 +99,27 @@
java.util.Collection<Long> ids = invocation.getArgument(0);
return List.of(first, second).stream().filter(bag -> ids.contains(bag.getId())).toList();
});
- req=new MesQcSeedQualityGroupSubmitReqVO();req.setCode("BATCH-BUS");req.setScanType("BATCH");req.setBagIds(List.of(1L,2L));
+ req=new MesQcSeedQualityGroupSubmitReqVO();req.setCode("BATCH-BUS");req.setQcLine(1);req.setScanType("BATCH");req.setBagIds(List.of(1L,2L));
req.setQualifiedWarehouseId(8L);req.setIndicators(validIndicators());
}
@Test void batchPreviewCountsEffectiveInspectedAndPendingBags() {
- when(qualities.selectListByCodes(any())).thenReturn(List.of(MesQcSeedQualityDO.builder().code("B1").build()));
+ when(qualities.selectListByCodes(any())).thenReturn(List.of(MesQcSeedQualityDO.builder().code("B1").qcLine(1).build()));
var result=service.resolveScan("BATCH-BUS","BATCH");assertEquals(2,result.get("totalCount"));
assertEquals(List.of(1L),result.get("completedBagIds"));assertEquals(List.of(2L),result.get("pendingBagIds"));
verify(qualities,never()).insertBatch(anyCollection(),anyInt());
}
@Test void palletProcessesOnlyConfirmedUninspectedBags() {
req.setScanType("PALLET");req.setCode("PALLET-BUS");req.setBagIds(List.of(2L));
- when(qualities.selectListByCodes(any())).thenReturn(List.of(MesQcSeedQualityDO.builder().code("B1").build()));
+ when(qualities.selectListByCodes(any())).thenReturn(List.of(MesQcSeedQualityDO.builder().code("B1").qcLine(1).build()));
when(qualities.selectListByCodesForUpdate(List.of("B2"))).thenReturn(List.of());
assertEquals(1,service.submitGroup(req).get("processedCount"));
- verify(qualities).insertBatch(argThat(rows -> rows.size() == 1 && rows.iterator().next().getCode().equals("B2")
- && rows.iterator().next().getQualifiedWarehouseId().equals(8L)),eq(100));
- verify(indicators).insertBatch(argThat(rows -> rows.size() == 4),eq(400));
- verify(actions).insertBatch(argThat(rows -> rows.size() == 1),eq(100));
+ // 涓�娆℃彁浜ゅ悓鏃剁敓鎴愬姞宸ラ儴銆侀攢鍞儴涓ゆ潯璁板綍锛屾寚鏍囦笌缁撹涓�鑷淬��
+ verify(qualities).insertBatch(argThat(rows -> rows.size() == 2 && rows.stream().allMatch(row -> row.getCode().equals("B2")
+ && row.getQualifiedWarehouseId().equals(8L))
+ && rows.stream().map(MesQcSeedQualityDO::getQcLine).collect(java.util.stream.Collectors.toSet())
+ .equals(java.util.Set.of(1, 2))),eq(100));
+ verify(indicators).insertBatch(argThat(rows -> rows.size() == 8),eq(400));
+ verify(actions).insertBatch(argThat(rows -> rows.size() == 2),eq(100));
}
@Test void changedConfirmedListDoesNotSubmitAnyBag() {
req.setBagIds(List.of(1L));assertThrows(IllegalArgumentException.class,()->service.submitGroup(req));verify(qualities,never()).insertBatch(anyCollection(),anyInt());
@@ -138,8 +156,8 @@
}
@Test void retestScopePreviewSeparatesWorkflowStages() {
when(qualities.selectListByCodes(any())).thenReturn(List.of(
- MesQcSeedQualityDO.builder().id(11L).code("B1").workflowStatus(10).build(),
- MesQcSeedQualityDO.builder().id(12L).code("B2").workflowStatus(50).build()));
+ MesQcSeedQualityDO.builder().id(11L).code("B1").qcLine(1).workflowStatus(10).build(),
+ MesQcSeedQualityDO.builder().id(12L).code("B2").qcLine(1).workflowStatus(50).build()));
var result = service.resolveRetestScope("PALLET-BUS", "PALLET");
assertEquals(List.of(11L), result.get("retestIds"));
assertEquals(List.of(12L), result.get("initialRecheckIds"));
@@ -148,10 +166,10 @@
var third = bag(3L); var fourth = bag(4L);
when(bags.selectListByPalletId(20L)).thenReturn(List.of(first, second, third, fourth));
when(qualities.selectListByCodes(any())).thenReturn(List.of(
- MesQcSeedQualityDO.builder().id(11L).code("B1").workflowStatus(20).build(),
- MesQcSeedQualityDO.builder().id(12L).code("B2").workflowStatus(25).build(),
- MesQcSeedQualityDO.builder().id(13L).code("B3").workflowStatus(30).build(),
- MesQcSeedQualityDO.builder().id(14L).code("B4").workflowStatus(60).build()));
+ MesQcSeedQualityDO.builder().id(11L).code("B1").qcLine(1).workflowStatus(20).build(),
+ MesQcSeedQualityDO.builder().id(12L).code("B2").qcLine(1).workflowStatus(25).build(),
+ MesQcSeedQualityDO.builder().id(13L).code("B3").qcLine(1).workflowStatus(30).build(),
+ MesQcSeedQualityDO.builder().id(14L).code("B4").qcLine(1).workflowStatus(60).build()));
var result = service.resolveRetestScope("PALLET-BUS", "PALLET");
assertEquals(List.of(11L), result.get("pendingProcessIds"));
assertEquals(List.of(12L), result.get("pendingInitialFailIds"));
@@ -162,22 +180,22 @@
}
@Test void retestScopeRejectsStaleConfirmedList() {
when(qualities.selectListByCodes(any())).thenReturn(List.of(
- MesQcSeedQualityDO.builder().id(11L).code("B1").workflowStatus(10).build(),
- MesQcSeedQualityDO.builder().id(12L).code("B2").workflowStatus(10).build()));
+ MesQcSeedQualityDO.builder().id(11L).code("B1").qcLine(1).workflowStatus(10).build(),
+ MesQcSeedQualityDO.builder().id(12L).code("B2").qcLine(1).workflowStatus(10).build()));
var request = new MesQcSeedQualityScopeRetestReqVO();
- request.setCode("BATCH-BUS"); request.setScanType("BATCH"); request.setWorkflowStatus(10);
+ request.setCode("BATCH-BUS"); request.setScanType("BATCH"); request.setQcLine(1); request.setWorkflowStatus(10);
request.setQualityIds(List.of(11L)); request.setIndicators(validIndicators());
assertThrows(IllegalArgumentException.class, () -> service.retestScope(request));
verify(indicators, never()).updateBatch(anyCollection(), anyInt());
}
@Test void retestScopeProcessesAllConfirmedBags() {
- var pending = List.of(MesQcSeedQualityDO.builder().id(11L).code("B1").workflowStatus(10).build(),
- MesQcSeedQualityDO.builder().id(12L).code("B2").workflowStatus(10).build());
+ var pending = List.of(MesQcSeedQualityDO.builder().id(11L).code("B1").qcLine(1).workflowStatus(10).build(),
+ MesQcSeedQualityDO.builder().id(12L).code("B2").qcLine(1).workflowStatus(10).build());
when(qualities.selectListByCodes(any())).thenReturn(pending);
when(qualities.selectListByIdsForUpdate(List.of(11L, 12L))).thenReturn(pending);
when(indicators.selectListByQualityIds(any())).thenReturn(storedIndicators(11L, 12L));
var request = new MesQcSeedQualityScopeRetestReqVO();
- request.setCode("BATCH-BUS"); request.setScanType("BATCH"); request.setWorkflowStatus(10);
+ request.setCode("BATCH-BUS"); request.setScanType("BATCH"); request.setQcLine(1); request.setWorkflowStatus(10);
request.setQualityIds(List.of(11L, 12L)); request.setIndicators(validIndicators());
assertEquals(2, service.retestScope(request).get("processedCount"));
verify(indicators).selectListByQualityIds(List.of(11L, 12L));
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/SeedQualityScanTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/SeedQualityScanTest.java
index c1d5b84..887c717 100644
--- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/SeedQualityScanTest.java
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/SeedQualityScanTest.java
@@ -6,10 +6,13 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.seedquality.MesQcSeedQualityDO;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.bagcode.MesProBagCodeMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.qc.seedquality.MesQcSeedQualityMapper;
+import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
+import cn.iocoder.yudao.module.mes.service.qc.seedquality.MesQcSeedIndicatorRangeService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.test.util.ReflectionTestUtils;
import java.util.Collections;
+import java.util.List;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -17,11 +20,19 @@
private final MesQcSeedQualityServiceImpl service = new MesQcSeedQualityServiceImpl();
private final MesProBagCodeMapper bags = mock(MesProBagCodeMapper.class);
private final MesQcSeedQualityMapper qualities = mock(MesQcSeedQualityMapper.class);
- @BeforeEach void setup() { ReflectionTestUtils.setField(service,"bagCodeMapper",bags); ReflectionTestUtils.setField(service,"qualityMapper",qualities); }
+ private final MesMdmItemService items = mock(MesMdmItemService.class);
+ private final MesQcSeedIndicatorRangeService ranges = mock(MesQcSeedIndicatorRangeService.class);
+ @BeforeEach void setup() {
+ ReflectionTestUtils.setField(service,"bagCodeMapper",bags);
+ ReflectionTestUtils.setField(service,"qualityMapper",qualities);
+ ReflectionTestUtils.setField(service,"mdmItemService",items);
+ ReflectionTestUtils.setField(service,"rangeService",ranges);
+ when(ranges.getEffectiveRanges(any())).thenReturn(List.of());
+ }
private MesProBagCodeDO bag() { return new MesProBagCodeDO().setId(1L).setCode("TRACE").setBusinessCode("BUSINESS").setStatus(20).setInboundEventId(9L).setBatchCode("BATCH"); }
@Test void businessScanReturnsCanonicalCodeAndPreviousResultWithoutWrites() {
when(bags.selectByScanCode("BUSINESS")).thenReturn(bag());
- when(qualities.selectByCode("TRACE")).thenReturn(MesQcSeedQualityDO.builder().id(2L).result(1).build());
+ when(qualities.selectListByCode("TRACE")).thenReturn(List.of(MesQcSeedQualityDO.builder().id(2L).result(1).build()));
var result = service.resolveScan("BUSINESS");
assertEquals("TRACE",result.get("code"));assertEquals(2L,result.get("qualityId"));assertEquals(true,result.get("inbound"));
verify(qualities,never()).insert(any(MesQcSeedQualityDO.class));
@@ -33,14 +44,14 @@
}
@Test void duplicateQualityIsRejectedAfterLockingSameBagForBothCodes() {
when(bags.selectByScanCodeForUpdate("BUSINESS")).thenReturn(bag());
- var req = new MesQcSeedQualitySubmitReqVO();req.setCode("BUSINESS");
- when(qualities.selectByCodeForUpdate("TRACE")).thenReturn(MesQcSeedQualityDO.builder().id(2L).result(1).build());
+ var req = new MesQcSeedQualitySubmitReqVO();req.setCode("BUSINESS");req.setQcLine(1);
+ when(qualities.selectListByCodeForUpdate("TRACE")).thenReturn(List.of(MesQcSeedQualityDO.builder().id(2L).result(1).build()));
req.setIndicators(Collections.nCopies(4,new MesQcSeedQualitySubmitReqVO.Indicator()));
assertThrows(IllegalArgumentException.class,()->service.submit(req));
- verify(qualities).selectByCodeForUpdate("TRACE");verify(qualities,never()).insert(any(MesQcSeedQualityDO.class));
+ verify(qualities).selectListByCodeForUpdate("TRACE");verify(qualities,never()).insert(any(MesQcSeedQualityDO.class));
}
@Test void unenteredAndCanceledBagsCannotSubmit() {
- var req = new MesQcSeedQualitySubmitReqVO();req.setCode("BUSINESS");req.setIndicators(Collections.nCopies(4,new MesQcSeedQualitySubmitReqVO.Indicator()));
+ var req = new MesQcSeedQualitySubmitReqVO();req.setCode("BUSINESS");req.setQcLine(1);req.setIndicators(Collections.nCopies(4,new MesQcSeedQualitySubmitReqVO.Indicator()));
when(bags.selectByScanCodeForUpdate("BUSINESS")).thenReturn(bag().setInboundEventId(null));
assertThrows(IllegalArgumentException.class,()->service.submit(req));
when(bags.selectByScanCodeForUpdate("BUSINESS")).thenReturn(bag().setStatus(30));
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/SeedQualityWorkflowTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/SeedQualityWorkflowTest.java
index 7e92e63..3afc4c6 100644
--- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/SeedQualityWorkflowTest.java
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/SeedQualityWorkflowTest.java
@@ -11,7 +11,9 @@
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.springframework.test.util.ReflectionTestUtils;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -32,18 +34,28 @@
}
@Test
- void initialApprovalOnlyQueuesRetestAndFailedRetestCanReturnToRetest() {
+ void failedProcessStartDoesNotPreventOtherStarts() {
+ AtomicBoolean secondStarted = new AtomicBoolean();
+ TransactionSynchronizationManager.initSynchronization();
+ try {
+ ReflectionTestUtils.invokeMethod(service, "afterCommit", (Runnable) () -> {
+ throw new IllegalStateException("BPM unavailable");
+ });
+ ReflectionTestUtils.invokeMethod(service, "afterCommit", (Runnable) () -> secondStarted.set(true));
+ TransactionSynchronizationManager.getSynchronizations().forEach(sync -> sync.afterCommit());
+ assertTrue(secondStarted.get());
+ } finally {
+ TransactionSynchronizationManager.clearSynchronization();
+ }
+ }
+
+ @Test
+ void newDualLineRecordsRequireBpmApproval() {
when(qualityMapper.selectByIdForUpdate(1L)).thenReturn(
- MesQcSeedQualityDO.builder().id(1L).code("B1").result(2).workflowStatus(20).build(),
- MesQcSeedQualityDO.builder().id(1L).code("B1").result(2).workflowStatus(60).build());
- service.processApprove(1L, true, "");
+ MesQcSeedQualityDO.builder().id(1L).code("B1").qcLine(1).result(2).workflowStatus(20).build());
+ assertThrows(IllegalArgumentException.class, () -> service.processApprove(1L, true, ""));
verifyNoInteractions(transactionService);
- service.companyApprove(1L, false, "澶嶆涓嶅悎鏍硷紝閲嶆柊鍙栨牱");
- ArgumentCaptor<MesQcSeedQualityDO> update = ArgumentCaptor.forClass(MesQcSeedQualityDO.class);
- verify(qualityMapper, times(2)).updateById(update.capture());
- assertEquals(10, update.getAllValues().get(0).getWorkflowStatus());
- assertEquals(10, update.getAllValues().get(1).getWorkflowStatus());
- verifyNoInteractions(transactionService);
+ verify(qualityMapper, never()).updateById(any(MesQcSeedQualityDO.class));
}
@Test
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/appearance/SystemAppearanceController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/appearance/SystemAppearanceController.java
new file mode 100644
index 0000000..c074c79
--- /dev/null
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/appearance/SystemAppearanceController.java
@@ -0,0 +1,51 @@
+package cn.iocoder.yudao.module.system.controller.admin.appearance;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.system.controller.admin.appearance.vo.SystemAppearanceRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.appearance.vo.SystemAppearanceSaveReqVO;
+import cn.iocoder.yudao.module.system.service.appearance.SystemAppearanceService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.annotation.security.PermitAll;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 绠$悊鍚庡彴 - 绯荤粺澶栬锛堢櫥褰曡儗鏅浘銆佷紒涓� Logo锛�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Tag(name = "绠$悊鍚庡彴 - 绯荤粺澶栬")
+@RestController
+@RequestMapping("/system/appearance")
+@Validated
+public class SystemAppearanceController {
+
+ @Resource
+ private SystemAppearanceService appearanceService;
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱绯荤粺澶栬")
+ @PermitAll
+ public CommonResult<SystemAppearanceRespVO> getAppearance() {
+ return success(appearanceService.getAppearance());
+ }
+
+ @PostMapping("/save")
+ @Operation(summary = "淇濆瓨绯荤粺澶栬")
+ @PreAuthorize("@ss.hasPermission('system:appearance:update')")
+ public CommonResult<Boolean> saveAppearance(@Valid @RequestBody SystemAppearanceSaveReqVO reqVO) {
+ appearanceService.saveAppearance(reqVO);
+ return success(true);
+ }
+
+}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/appearance/vo/SystemAppearanceRespVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/appearance/vo/SystemAppearanceRespVO.java
new file mode 100644
index 0000000..f58396a
--- /dev/null
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/appearance/vo/SystemAppearanceRespVO.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.system.controller.admin.appearance.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "绠$悊鍚庡彴 - 绯荤粺澶栬 Response VO")
+@Data
+public class SystemAppearanceRespVO {
+
+ @Schema(description = "浼佷笟 Logo 鏂囦欢缂栧彿")
+ private Long logoBlobId;
+
+ @Schema(description = "浼佷笟 Logo 璁块棶鍦板潃")
+ private String logoUrl;
+
+ @Schema(description = "鐧诲綍鑳屾櫙鍥炬枃浠剁紪鍙�")
+ private Long loginBackgroundBlobId;
+
+ @Schema(description = "鐧诲綍鑳屾櫙鍥捐闂湴鍧�")
+ private String loginBackgroundUrl;
+
+}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/appearance/vo/SystemAppearanceSaveReqVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/appearance/vo/SystemAppearanceSaveReqVO.java
new file mode 100644
index 0000000..c93c40f
--- /dev/null
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/appearance/vo/SystemAppearanceSaveReqVO.java
@@ -0,0 +1,16 @@
+package cn.iocoder.yudao.module.system.controller.admin.appearance.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "绠$悊鍚庡彴 - 绯荤粺澶栬淇濆瓨 Request VO")
+@Data
+public class SystemAppearanceSaveReqVO {
+
+ @Schema(description = "浼佷笟 Logo 鏂囦欢缂栧彿锛屼紶绌鸿〃绀烘竻闄�")
+ private Long logoBlobId;
+
+ @Schema(description = "鐧诲綍鑳屾櫙鍥炬枃浠剁紪鍙凤紝浼犵┖琛ㄧず娓呴櫎")
+ private Long loginBackgroundBlobId;
+
+}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageApplicationTypeEnum.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageApplicationTypeEnum.java
index 538375f..2c9fd19 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageApplicationTypeEnum.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageApplicationTypeEnum.java
@@ -13,7 +13,9 @@
FILE("file", "閫氱敤鏂囦欢"),
IMAGE("image", "鍥剧墖"),
- AVATAR("avatar", "澶村儚");
+ AVATAR("avatar", "澶村儚"),
+ LOGO("logo", "浼佷笟Logo"),
+ LOGIN_BACKGROUND("login_background", "鐧诲綍鑳屾櫙鍥�");
private final String type;
private final String description;
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageRecordTypeEnum.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageRecordTypeEnum.java
index 0806302..8f27d4b 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageRecordTypeEnum.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageRecordTypeEnum.java
@@ -32,6 +32,9 @@
// ===== 澶村儚 =====
AVATAR("avatar", "澶村儚"),
+ // ===== 绯荤粺澶栬 =====
+ SYSTEM_APPEARANCE("system_appearance", "绯荤粺澶栬"),
+
// ===== ERP 閲囪喘 =====
ERP_PURCHASE_REQUEST("erp_purchase_request", "ERP 閲囪喘鐢宠"),
ERP_PURCHASE_ORDER("erp_purchase_order", "ERP 閲囪喘璁㈠崟"),
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/appearance/SystemAppearanceService.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/appearance/SystemAppearanceService.java
new file mode 100644
index 0000000..dc48d3e
--- /dev/null
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/appearance/SystemAppearanceService.java
@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.system.service.appearance;
+
+import cn.iocoder.yudao.module.system.controller.admin.appearance.vo.SystemAppearanceRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.appearance.vo.SystemAppearanceSaveReqVO;
+
+/**
+ * 绯荤粺澶栬 Service 鎺ュ彛
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface SystemAppearanceService {
+
+ /**
+ * 鑾峰緱褰撳墠绯荤粺澶栬锛堢櫥褰曢〉鑳屾櫙鍥俱�佷紒涓� Logo锛�
+ *
+ * @return 绯荤粺澶栬
+ */
+ SystemAppearanceRespVO getAppearance();
+
+ /**
+ * 淇濆瓨绯荤粺澶栬
+ *
+ * @param reqVO 淇濆瓨淇℃伅
+ */
+ void saveAppearance(SystemAppearanceSaveReqVO reqVO);
+
+}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/appearance/SystemAppearanceServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/appearance/SystemAppearanceServiceImpl.java
new file mode 100644
index 0000000..9f873ff
--- /dev/null
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/appearance/SystemAppearanceServiceImpl.java
@@ -0,0 +1,94 @@
+package cn.iocoder.yudao.module.system.service.appearance;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.module.system.controller.admin.appearance.vo.SystemAppearanceRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.appearance.vo.SystemAppearanceSaveReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.storage.vo.SystemStorageAttachmentListReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.storage.vo.SystemStorageAttachmentSaveReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.storage.vo.SystemStorageBlobRespVO;
+import cn.iocoder.yudao.module.system.enums.storage.StorageApplicationTypeEnum;
+import cn.iocoder.yudao.module.system.enums.storage.StorageRecordTypeEnum;
+import cn.iocoder.yudao.module.system.service.storage.SystemStorageAttachmentService;
+import cn.iocoder.yudao.module.system.util.storage.StorageFileUtil;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 绯荤粺澶栬 Service 瀹炵幇绫�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+public class SystemAppearanceServiceImpl implements SystemAppearanceService {
+
+ /**
+ * 绯荤粺澶栬鍥哄畾璁板綍缂栧彿锛氬瑙傛槸鍏ㄥ眬鍞竴閰嶇疆锛岀敤涓�鏉¢檮浠惰褰曟壙杞�
+ */
+ private static final Long RECORD_ID = 1L;
+
+ @Resource
+ private SystemStorageAttachmentService storageAttachmentService;
+ @Resource
+ private StorageFileUtil storageFileUtil;
+
+ @Override
+ public SystemAppearanceRespVO getAppearance() {
+ SystemAppearanceRespVO respVO = new SystemAppearanceRespVO();
+ SystemStorageBlobRespVO logo = getSingleBlob(StorageApplicationTypeEnum.LOGO);
+ if (logo != null) {
+ respVO.setLogoBlobId(logo.getId());
+ respVO.setLogoUrl(buildPermanentUrl(logo));
+ }
+ SystemStorageBlobRespVO background = getSingleBlob(StorageApplicationTypeEnum.LOGIN_BACKGROUND);
+ if (background != null) {
+ respVO.setLoginBackgroundBlobId(background.getId());
+ respVO.setLoginBackgroundUrl(buildPermanentUrl(background));
+ }
+ return respVO;
+ }
+
+ @Override
+ public void saveAppearance(SystemAppearanceSaveReqVO reqVO) {
+ saveBlob(StorageApplicationTypeEnum.LOGO, reqVO.getLogoBlobId());
+ saveBlob(StorageApplicationTypeEnum.LOGIN_BACKGROUND, reqVO.getLoginBackgroundBlobId());
+ }
+
+ private SystemStorageBlobRespVO getSingleBlob(StorageApplicationTypeEnum application) {
+ SystemStorageAttachmentListReqVO reqVO = new SystemStorageAttachmentListReqVO();
+ reqVO.setApplication(application.getType());
+ reqVO.setRecordType(StorageRecordTypeEnum.SYSTEM_APPEARANCE.getType());
+ reqVO.setRecordId(RECORD_ID);
+ List<SystemStorageBlobRespVO> blobs = storageAttachmentService.listAttachments(reqVO);
+ return CollUtil.isEmpty(blobs) ? null : blobs.get(0);
+ }
+
+ /**
+ * 澶栬鍥鹃渶瑕佺櫥褰曞墠灏辫兘璁块棶锛屽洜姝や娇鐢ㄦ案涔呭叕寮�鍦板潃
+ */
+ private String buildPermanentUrl(SystemStorageBlobRespVO blob) {
+ return storageFileUtil.buildSignedUrl(blob, "/preview/", BigDecimal.valueOf(-1));
+ }
+
+ private void saveBlob(StorageApplicationTypeEnum application, Long blobId) {
+ SystemStorageAttachmentSaveReqVO reqVO = new SystemStorageAttachmentSaveReqVO();
+ reqVO.setApplication(application.getType());
+ reqVO.setRecordType(StorageRecordTypeEnum.SYSTEM_APPEARANCE.getType());
+ reqVO.setRecordId(RECORD_ID);
+ reqVO.setBlobItems(blobId == null
+ ? Collections.emptyList()
+ : Collections.singletonList(buildBlobItem(blobId, application)));
+ storageAttachmentService.bindAttachments(reqVO);
+ }
+
+ private SystemStorageAttachmentSaveReqVO.BlobItem buildBlobItem(Long blobId, StorageApplicationTypeEnum application) {
+ SystemStorageAttachmentSaveReqVO.BlobItem item = new SystemStorageAttachmentSaveReqVO.BlobItem();
+ item.setBlobId(blobId);
+ item.setApplication(application.getType());
+ return item;
+ }
+
+}
--
Gitblit v1.9.3