From 8c65f898ed6e5b0c7a94c792c4562f6ec831dccd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 07 十一月 2026 08:50:53 +0800
Subject: [PATCH] feat: 完善质检、生产、销售、财务与人事模块并接入审批流程
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/wage/MesProWageQualityRuleMapper.java | 38
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java | 179
docs/project-business/mermaid/05-quality-flow.mmd | 17
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java | 95
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProFeedbackQualityResult.java | 16
yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/feedback/MesProFeedbackWageApi.java | 48
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProFeedbackWageBreakdown.java | 132
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProWageQualityRuleSaveReqVO.java | 56
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/template/MesQcTemplateProcessMapper.java | 31
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/vo/MesProMpsRespVO.java | 8
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java | 23
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/feedback/MesProFeedbackDO.java | 80
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java | 98
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/template/MesQcTemplateProcessDO.java | 64
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/MesQcNcrController.java | 11
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrService.java | 18
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java | 8
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java | 15
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/patrol/MesQcPatrolService.java | 53
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleService.java | 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeController.java | 197
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/finance/vo/CrmCustomerStatementRespVO.java | 75
sql/mysql/20261105_mdm_item_code_sequence.sql | 7
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketFlowService.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/salesnotice/MesWmSalesNoticeDO.java | 19
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java | 13
yudao-module-qcreport/src/test/java/cn/iocoder/yudao/module/qcreport/engine/FrontendConformanceTest.java | 10
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationService.java | 13
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceServiceImpl.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessServiceImpl.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/process/MesProProcessDO.java | 52
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/worktime/MesProWorktimeAuxService.java | 35
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmEmployeeSocialSecurityServiceImpl.java | 16
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/patrol/vo/MesQcPatrolPageReqVO.java | 42
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcIndicatorResultDetailServiceImpl.java | 5
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/CrmSaleQuotationController.java | 57
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/AfterSaleTicketController.java | 10
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/vo/invoice/CrmInvoiceSaveReqVO.java | 1
docs/project-business/data/modules.json | 28
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailStateTest.java | 82
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcWageFieldServiceImpl.java | 158
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessSaveReqVO.java | 39
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerAddressServiceImpl.java | 107
sql/mysql/20261106_wm_transaction_work_order.sql | 37
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessRespVO.java | 34
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeSaveReqVO.java | 14
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateProcessServiceImpl.java | 286
yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/sale/dto/ErpSaleOrderRespDTO.java | 3
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java | 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/feedback/MesProFeedbackAuxDO.java | 67
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/CrmSaleQuotationServiceImpl.java | 140
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeReportRespVO.java | 52
scripts/quotation_template_20261106/gen_wm_documents.py | 213
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplateProcessSaveListReqVO.java | 22
sql/mysql/20261106_crm_customer_address.sql | 18
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/api/AfterSaleTicketApiImpl.java | 19
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageRuleRespVO.java | 59
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesNcrStatusEnum.java | 1
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackService.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ipqc/MesQcIpqcWageFieldDO.java | 98
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmEmployeeSocialSecurityController.java | 95
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerAddressMapper.java | 32
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderPageReqVO.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeService.java | 23
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryServiceImpl.java | 1
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/wage/MesProProcessWageFieldDO.java | 96
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/worktime/MesProWorktimeAuxDO.java | 119
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/CrmSaleQuotationService.java | 24
sql/mysql/20261106_material_stock_freeze_claim.sql | 23
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/listener/CrmReceivableStatusListener.java | 43
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/MesProWageQualityRuleController.java | 81
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java | 32
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcWageFieldSaveReqVO.java | 38
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/worktime/MesProWorktimeAuxMapper.java | 66
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java | 31
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcTemplateProcessRespVO.java | 78
docs/project-business/mermaid/08-module-relation.mmd | 1
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcWageFieldRespVO.java | 45
scripts/yudao-module-crm/src/main/resources/templates/quotation/sale-quotation.docx | 0
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageFieldSaveReqVO.java | 55
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleServiceTest.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/worktime/MesProWorktimeServiceImpl.java | 444 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProProcessWageRuleService.java | 57
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/CrmSaleQuotationDocumentRenderer.java | 271
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeAuxSaveReqVO.java | 67
docs/project-business/index.html | 43
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/patrol/MesQcPatrolServiceImpl.java | 81
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/statistics/MesQcStatisticsServiceImpl.java | 134
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/vo/MesQcNcrRespVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/transaction/MesWmTransactionDO.java | 7
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierDO.java | 1
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/statistics/vo/MesQcStatisticsOverallVO.java | 41
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApiImpl.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/md/autocode/MesMdAutoCodeRuleCodeEnum.java | 1
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java | 54
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/address/CrmCustomerAddressRespVO.java | 44
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpSaleTypeEnum.java | 51
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcService.java | 8
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java | 105
yudao-module-qcreport/src/test/resources/qcreport/expected-rules.json | 3
yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/BiWarehouseCoordinateController.java | 1
sql/mysql/20261105_crm_invoice_missing_links.sql | 39
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/feedback/MesProFeedbackAuxMapper.java | 41
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/quotation/CrmSaleQuotationStatusEnum.java | 8
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java | 75
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketService.java | 6
yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/dto/ErpPurchaseOrderCreateReqDTO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProProcessWageFieldServiceImpl.java | 172
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferVendorTraceTest.java | 62
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java | 17
yudao-module-mes/src/main/resources/templates/wm/product-outbound.docx | 0
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockFreezeClaimMapper.java | 24
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesNcrDispositionEnum.java | 5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/feedback/MesProFeedbackMapper.java | 33
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockService.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/MesWmTransactionServiceImpl.java | 1
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java | 26
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderSaveReqVO.java | 6
scripts/quotation_template_20261106/gen_quotation_template.py | 223
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseOrderApiImpl.java | 9
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java | 6
yudao-module-aftersales-api/src/main/java/cn/iocoder/yudao/module/aftersales/api/AfterSaleTicketApi.java | 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java | 2
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/ticket/AfterSaleTicketMapper.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskServiceImpl.java | 57
sql/mysql/20261106_customer_statement_finance_menus.sql | 20
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/DictTypeConstants.java | 1
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/worktime/MesProWorktimeAuxServiceImpl.java | 149
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java | 66
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplateProcessSaveReqVO.java | 38
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/statistics/vo/MesQcStatisticsRespVO.java | 28
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerAddressService.java | 53
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProWageQualityRuleServiceImpl.java | 156
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/MesProWorktimeAuxController.java | 119
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java | 11
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/statistics/MesQcStatisticsService.java | 23
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryConfirmReqVO.java | 5
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/finance/vo/CrmCustomerStatementSummaryRespVO.java | 42
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageRulePageReqVO.java | 28
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProWageQualityRulePageReqVO.java | 25
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierSaveReqVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackSaveReqVO.java | 42
docs/project-business/mermaid/02-sales-flow.mmd | 12
docs/project-business/mermaid/01-business-mindmap.mmd | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProProcessBillingTypeEnum.java | 56
docs/project-business/data/objects.json | 1709 +++--
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/document/MesWmDocumentRenderer.java | 290 +
sql/mysql/20261106_qc_patrol_code_rule.sql | 26
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierStatementServiceImpl.java | 14
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmEmployeeSocialSecurityPageReqVO.java | 8
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketServiceImpl.java | 80
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/MesProWorktimeController.java | 49
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmEmployeeSocialSecurityDO.java | 12
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/MesProProcessWageFieldController.java | 47
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java | 4
yudao-module-qcreport/src/main/java/cn/iocoder/yudao/module/qcreport/engine/report/ReportEvaluator.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/dto/MesWmTransactionSaveReqDTO.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/stocktaking/task/MesWmStockTakingTaskDO.java | 5
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableService.java | 17
docs/project-business/mermaid/04-production-flow.mmd | 17
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java | 12
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java | 27
sql/mysql/20261105_sales_out_price_backfill.sql | 14
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageRuleResolveRespVO.java | 33
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/patrol/MesQcPatrolMapper.java | 34
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageRuleSaveReqVO.java | 52
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProWageQualityRuleService.java | 54
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorApprovalTest.java | 109
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcSaveReqVO.java | 8
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java | 39
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeReportReqVO.java | 39
sql/mysql/mes_qc_ncr_approval_migration.sql | 56
yudao-module-mes/src/main/resources/templates/wm/sales-delivery.docx | 0
sql/mysql/20261106_mes_worktime.sql | 172
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmResignationApplicationMapper.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryController.java | 14
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/wage/MesProProcessWageRuleDO.java | 73
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/finance/CrmFinanceReportService.java | 17
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplateProcessRespVO.java | 48
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java | 7
docs/project-business/data/flows.json | 990 +-
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageRecordTypeEnum.java | 1
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineService.java | 8
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/vo/MesQcNcrReviewReqVO.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/statistics/MesQcStatisticsMapper.java | 50
yudao-module-qcreport/src/main/java/cn/iocoder/yudao/module/qcreport/engine/rule/RuleEvaluator.java | 23
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferServiceImpl.java | 5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java | 411 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskResultServiceImpl.java | 79
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/listener/MesWmSalesNoticeStatusListener.java | 42
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/patrol/MesQcPatrolDO.java | 77
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProFeedbackWageCalculator.java | 409 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/wage/MesProProcessWageFieldMapper.java | 32
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java | 7
yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/BiChartConfigController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskLineServiceImpl.java | 23
yudao-module-qcreport/src/test/java/cn/iocoder/yudao/module/qcreport/engine/ReportEvaluatorTest.java | 22
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcIndicatorResultDetailService.java | 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/MesProProcessWageRuleController.java | 84
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorLineServiceImpl.java | 38
scripts/quotation_template_20261106/gen_project_tracking.py | 186
yudao-module-erp/src/test/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseOrderReturnCountTest.java | 33
docs/project-business/mermaid/06-warehouse-flow.mmd | 3
yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/BiDataSourceConfigController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/statistics/MesQcStatisticsController.java | 49
yudao-server/src/main/resources/application-local.yaml | 4
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/customer/CrmCustomerAddressDO.java | 64
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerAddressController.java | 69
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/listener/MesQcNcrStatusListener.java | 73
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/mps/MesProMpsApiImpl.java | 5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/statistics/vo/MesQcStatisticsTypeVO.java | 43
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeAuxPageReqVO.java | 25
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/finance/vo/CrmCustomerStatementSummaryReqVO.java | 24
sql/mysql/20261106_bi_dashboard_theme_permissions.sql | 12
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageFieldSaveListReqVO.java | 22
docs/project-business/data/business.json | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ncr/MesQcNcrDO.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/worktime/MesProWorktimeService.java | 44
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/listener/CrmSaleQuotationStatusListener.java | 52
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/wage/MesProWageQualityRuleDO.java | 76
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmSalesNoticeStatusEnum.java | 8
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApi.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/patrol/MesQcPatrolController.java | 121
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmEmployeeSocialSecuritySaveReqVO.java | 10
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcWageFieldService.java | 43
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackWagePreviewRespVO.java | 56
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/worktime/MesProWorktimeReportService.java | 21
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java | 36
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java | 4
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java | 1
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/MesQcTemplateProcessController.java | 100
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/wage/MesProProcessWageRuleMapper.java | 39
yudao-module-qcreport/src/test/resources/qcreport/expected-html.html | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageFieldRespVO.java | 52
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicatorresult/MesQcIndicatorResultController.java | 12
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplateProcessSaveByTemplateReqVO.java | 43
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/attachment/MesQcAttachmentController.java | 51
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProProcessWageFieldService.java | 30
sql/mysql/20261106_sales_notice_delivery_enhance.sql | 42
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/salesnotice/MesWmSalesNoticeLineMapper.java | 13
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/worktime/MesProWorktimeReportServiceImpl.java | 179
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ipqc/MesQcIpqcWageFieldMapper.java | 37
yudao-module-aftersales-api/src/main/java/cn/iocoder/yudao/module/aftersales/api/dto/AfterSaleWarehouseReturnStageReqDTO.java | 19
yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/dashboard/DashboardController.java | 13
yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/productsales/MesWmProductSalesApi.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java | 131
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/finance/CrmFinanceReportServiceImpl.java | 349 +
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryCalculationDO.java | 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsService.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineServiceImpl.java | 5
yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/feedback/dto/MesProFeedbackWageDetailRespDTO.java | 118
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/patrol/vo/MesQcPatrolRespVO.java | 64
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/statistics/vo/MesQcStatisticsByProcessVO.java | 37
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivableController.java | 9
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmEmployeeSocialSecurityRespVO.java | 11
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeRespVO.java | 13
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/productsales/MesWmProductSalesApiImpl.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeCalcRespVO.java | 64
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkOrderMapper.java | 5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeCalcReqVO.java | 51
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/finance/vo/CrmCustomerStatementReqVO.java | 29
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java | 158
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackWagePreviewReqVO.java | 40
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeLedgerRespVO.java | 66
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/salary/HrmEmployeeSocialSecurityMapper.java | 24
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskMapper.java | 6
yudao-module-mes/src/main/resources/templates/pd/project-tracking.docx | 0
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingDifferenceTest.java | 65
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImpl.java | 5
yudao-module-mes/src/main/resources/mapper/qc/statistics/MesQcStatisticsMapper.xml | 119
sql/mysql/20261106_erp_sale_ledger.sql | 42
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/address/CrmCustomerAddressSaveReqVO.java | 50
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingCompletionTest.java | 85
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/vo/MesQcNcrDisposeReqVO.java | 4
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/bidbond/CrmBidBondServiceImpl.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackQuickCreateReqVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProWageQualityRuleResolveRespVO.java | 33
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProProcessWageRuleServiceImpl.java | 193
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailServiceImpl.java | 31
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java | 12
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationServiceImpl.java | 101
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProWageQualityRuleRespVO.java | 55
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeAuxRespVO.java | 67
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackMpsAllocationTest.java | 184
sql/mysql/20261106_mes_wage_setting.sql | 81
sql/mysql/20261106_stock_taking_schema.sql | 33
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/patrol/vo/MesQcPatrolSaveReqVO.java | 64
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmEmployeeSocialSecurityService.java | 28
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskLineMapper.java | 11
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/feedback/MesProFeedbackWageApiImpl.java | 138
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesMapper.java | 11
yudao-module-hrm/pom.xml | 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackRespVO.java | 108
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskLineService.java | 11
/dev/null | 108
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/finance/CrmFinanceReportController.java | 19
yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/mps/MesProMpsApi.java | 11
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/statistics/vo/MesQcStatisticsByWorkOrderVO.java | 40
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierRespVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/vo/MesWmTransactionRespVO.java | 6
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentMapper.java | 12
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationSaveReqVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcIndicatorResultServiceImpl.java | 28
yudao-module-crm/src/main/resources/templates/quotation/sale-quotation.docx | 0
sql/mysql/mes_qc_ncr_init.sql | 25
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateProcessService.java | 72
310 files changed, 15,396 insertions(+), 1,950 deletions(-)
diff --git a/docs/project-business/data/business.json b/docs/project-business/data/business.json
index 32b9eb4..d5a4bf8 100644
--- a/docs/project-business/data/business.json
+++ b/docs/project-business/data/business.json
@@ -51,7 +51,7 @@
],
[
"鐢熶骇濡備綍浜х敓搴撳瓨",
- "鎶ュ伐瀹℃壒閫氳繃鍚庤嚜鍔ㄧ敓鎴愪骇鍝佷骇鍑哄崟鍏ュ簱锛堣川妫�宸ュ簭鍏堝緟妫�銆両PQC 鍚庢媶琛屽叆搴擄級锛涘�掑啿宸ュ簭鎸� BOM 鎵g嚎杈瑰簱"
+ "鎶ュ伐瀹℃壒閫氳繃鍚庤嚜鍔ㄧ敓鎴愪骇鍝佷骇鍑哄崟锛氭垚鍝佸厛寰呮銆佸畬鎴� IPQC 鍚庢媶琛屽叆搴擄紱鍗婃垚鍝佺洿鎺ユ寜鐢熶骇 BOM 鐩爣搴撲綅鑷姩鍏ュ簱锛屼笉绛夎川妫�锛涘伐鍗曞瓨鍦ㄧ敓浜� BOM 鍗宠嚜鍔ㄦ墸绾胯竟搴�"
],
[
"璐ㄩ噺鍦ㄥ摢閲屼粙鍏�",
diff --git a/docs/project-business/data/flows.json b/docs/project-business/data/flows.json
index 3c6da0c..85f6184 100644
--- a/docs/project-business/data/flows.json
+++ b/docs/project-business/data/flows.json
@@ -1,507 +1,515 @@
{
- "flows": [
- {
- "id": "sales",
- "name": "閿�鍞祦绋�",
- "mermaid": "mermaid/02-sales-flow.mmd",
- "color": "#4f9cff",
- "summary": "绾跨储杞寲瀹㈡埛 鈫� 鍟嗘満鎺ㄨ繘 鈫� 鎶ヤ环(鍙疉I璇嗗埆) 鈫� 鍚堝悓 BPM 瀹℃壒 鈫� 鐢熸垚 ERP 閿�鍞鍗曞苟瀹℃壒 鈫� 闇�鐢熶骇琛岃嚜鍔ㄥ缓 MPS 鈫� 鍙戣揣閫氱煡 鈫� 閿�鍞嚭搴撴彁浜�(闇�妫�楠岃杞緟妫�娴�) 鈫� 鐙珛褰曞叆 OQC 鍚庢寜鐗╂枡+鐩樺彿+鏁伴噺鍏宠仈鍥炲啓 鈫� 鎷h揣鍙戣繍 鈫� 寮�绁�(BPM) 鈫� 鍥炴(鍏堝紑绁ㄦ牎楠�)锛涙姇鏍囦繚璇侀噾鎸夊鎴风櫥璁颁腑鏍囩粨鏋滀笌閫�鍥炶繘搴﹀苟鍏宠仈宸插鏍搁攢鍞鍗曘��",
- "steps": [
+ "flows": [
{
- "stage": "鑾峰",
- "action": "绾跨储杞寲瀹㈡埛銆佸缓鑱旂郴浜恒�佺珛椤瑰晢鏈�",
- "roles": [
- "閿�鍞唴鍕�"
- ]
+ "id": "sales",
+ "name": "閿�鍞祦绋�",
+ "mermaid": "mermaid/02-sales-flow.mmd",
+ "color": "#4f9cff",
+ "summary": "绾跨储杞寲瀹㈡埛 鈫� 鍟嗘満鎺ㄨ繘 鈫� 鎶ヤ环(鍙疉I璇嗗埆) 鈫� 鍚堝悓 BPM 瀹℃壒 鈫� 鐢熸垚 ERP 閿�鍞鍗曞苟瀹℃壒锛堝彴璐﹀惈閿�鍞被鍨嬨�佹墜宸ュ悎鍚屽彿銆佷骇鍝佺紪鍙蜂笌鐢熶骇鏁伴噺锛� 鈫� 闇�鐢熶骇琛岃嚜鍔ㄥ缓 MPS 鈫� 鍙戣揣閫氱煡锛堢墿娴佸叕鍙�/蹇�掕垂/寮�绁ㄧ姸鎬侊紝瀹℃壒榛樿鐗╂祦锛� 鈫� 鍙戣揣鍙拌处鎸変骇鍝佸钩閾� 鈫� 閿�鍞嚭搴撴彁浜�(闇�妫�楠岃杞緟妫�娴�) 鈫� 鐙珛褰曞叆 OQC 鍚庢寜鐗╂枡+鐩樺彿+鏁伴噺鍏宠仈鍥炲啓 鈫� 鎷h揣鍙戣繍 鈫� 寮�绁�(BPM) 鈫� 褰曞叆鍙戠エ涓庢椤硅妭鐐� 鈫� 鍥炴(鍏堝紑绁ㄦ牎楠岋紝鍒涘缓涓烘湭鎻愪氦锛屾樉寮忔彁浜� BPM 鍗忓悓瀹℃壒锛屽鎵归�氳繃鎵嶅洖鍐欏洖娆捐鍒�)锛涘彂璐у崟/鎴愬搧鍑哄簱鍗曞彲瀵煎嚭甯︾數瀛愮珷鐨� Word 渚涙墜濉瀛楀綊妗o紱瀹㈡埛妗f鏀寔澶氭敹璐у湴鍧�銆�",
+ "steps": [
+ {
+ "stage": "鑾峰",
+ "action": "绾跨储杞寲瀹㈡埛銆佸缓鑱旂郴浜恒�佺珛椤瑰晢鏈�",
+ "roles": [
+ "閿�鍞唴鍕�"
+ ]
+ },
+ {
+ "stage": "鎶ヤ环",
+ "action": "鍟嗘満璧㈠崟鍚庡缓鎶ヤ环鍗�(AI OCR 棰勫~)锛岃浆鍚堝悓",
+ "roles": [
+ "閿�鍞唴鍕�"
+ ]
+ },
+ {
+ "stage": "鎶曟爣",
+ "action": "鎸夊鎴�(鎷涙爣鏂�)鐧昏鎶曟爣淇濊瘉閲戯細椤圭洰/鎷涙爣缂栧彿/閲戦/缂寸撼鏃ユ湡锛屽彲鍏宠仈璇ュ鎴峰凡瀹℃牳鐨勯攢鍞鍗曪紱寮�鏍囧悗鍥炲~涓爣缁撴灉锛屾湭涓爣璺熻釜閫�鍥炵姸鎬併�侀噾棰濅笌鏃ユ湡",
+ "roles": [
+ "閿�鍞唴鍕�"
+ ]
+ },
+ {
+ "stage": "绛剧害",
+ "action": "鍚堝悓鏉ユ簮锛氭墜宸ユ柊寤� / 鎶ヤ环鍗曡浆鍏� / Excel 瀵煎叆(涓�鍚堝悓澶氫骇鍝佹槑缁嗚)锛涙彁浜� BPM 瀹℃壒(鍙�夋祦绋嬪畾涔�)锛岄�氳繃=20",
+ "roles": [
+ "閿�鍞�",
+ "瀹℃壒浜�"
+ ]
+ },
+ {
+ "stage": "鎺ュ崟",
+ "action": "鍚堝悓涓�閿敓鎴愰攢鍞鍗�(XSDD)锛岄攢鍞鍗曞啀璧� BPM锛涘鎵归�氳繃鑷姩涓� needProduction 鏄庣粏鍒涘缓 MPS",
+ "roles": [
+ "閿�鍞�",
+ "璁″垝鍛�"
+ ]
+ },
+ {
+ "stage": "浜や粯",
+ "action": "鍙戣揣閫氱煡瀹℃牳(鍗犵敤)鈫� 閿�鍞嚭搴撴彁浜わ細鏈� oqcCheckFlag 琛岃浆寰呮娴嬶紝鎻愪氦鏃朵笉鍐嶈嚜鍔ㄥ缓 OQC锛涜川妫�鍛樼嫭绔嬪綍鍏ュ苟瀹屾垚 OQC 鍚庯紝鍦ㄦ楠屽崟璇︽儏鎸夌墿鏂�+鐩樺彿+鏁伴噺涓�鑷撮�夋嫨寰呮鍑哄簱琛屽叧鑱旓紝鍏ㄩ儴寰呮琛屽悎鏍煎悗鍑哄簱鍗曡浆寰呮嫞璐� 鈫� 鍙戣繍 鈫� 鍑哄簱鍥炲啓閮ㄥ垎/鍏ㄩ儴鍑哄簱",
+ "roles": [
+ "浠撶",
+ "璐ㄦ"
+ ]
+ },
+ {
+ "stage": "鍥炴",
+ "action": "寮�绁� BPM(绱鈮ゅ悎鍚岄) 鈫� 鍥炴寮哄埗鍏堝紑绁�(绱鈮ゅ悎鍚屽墿浣欎笌寮�绁ㄥ墿浣�)锛涘洖娆惧垱寤轰负鏈彁浜わ紝鎻愪氦鏃堕噸鏂版牎楠屽苟鍒涘缓 BPM 瀹炰緥锛屽鎵归�氳繃鎵嶅洖鍐欏洖娆捐鍒掞紝瀹℃壒涓殑鍥炴绂佹椤甸潰鍐呮墜宸ュ鏍�/鍙嶅鏍�",
+ "roles": [
+ "璐㈠姟",
+ "閿�鍞�"
+ ]
+ }
+ ]
},
{
- "stage": "鎶ヤ环",
- "action": "鍟嗘満璧㈠崟鍚庡缓鎶ヤ环鍗�(AI OCR 棰勫~)锛岃浆鍚堝悓",
- "roles": [
- "閿�鍞唴鍕�"
- ]
+ "id": "purchase",
+ "name": "閲囪喘娴佺▼",
+ "mermaid": "mermaid/03-purchase-flow.mmd",
+ "color": "#5fc79e",
+ "summary": "渚涘簲鍟嗘。妗�(澶氳仈绯讳汉/澶氶摱琛屄峰惈閾惰琛屽彿) 鈫� 璇环姣斾环(浜у搧脳渚涘簲鍟嗘í鍚戞姤浠凤紝鎸変骇鍝侀�変腑鏍�) 鈫� 纭鍚庢寜涓爣渚涘簲鍟嗘媶閲囪喘璁㈠崟鑽夌骞惰蛋鐜版湁 BPM 鈫� 纭鏀惰揣鐢熸垚 MES 鍒拌揣閫氱煡 鈫� IQC(鍚堟牸/鐗归噰鍏ュ簱路閫�璐�/鎶ュ簾) 鈫� 閲囪喘鍏ュ簱鍥炲啓璁㈠崟涓庣敵璇� 鈫� 鏉ョエ(AI OCR) 鈫� 浠樻鍗� BPM 鈫� 渚涘簲鍟嗗線鏉ュ璐︺��",
+ "steps": [
+ {
+ "stage": "瀵绘簮",
+ "action": "渚涘簲鍟嗘。妗堢淮鎶ゅ涓仈绯讳汉涓庡涓摱琛岃处鎴�(鍚摱琛岃鍙�)锛涙柊澧炶浠峰崟鏃朵竴骞跺綍鍏ヤ骇鍝伱楀弬涓庝緵搴斿晢鎶ヤ环骞堕�夊畾姣忎釜浜у搧鐨勪腑鏍囦緵搴斿晢锛屽垪琛ㄧ洿鎺ョ‘璁ゅ悗鎸変腑鏍囦緵搴斿晢鐢熸垚閲囪喘璁㈠崟鑽夌",
+ "roles": [
+ "閲囪喘鍛�",
+ "渚涘簲鍟嗙鐞嗗憳"
+ ]
+ },
+ {
+ "stage": "鐢宠",
+ "action": "閲囪喘鐢宠(CGSQ)鎻愪氦 BPM锛岄┏鍥炲彲閲嶇疆鍥炶崏绋匡紱閫氳繃涓旀湁渚涘簲鍟嗚嚜鍔ㄧ敓鎴愯鍗�",
+ "roles": [
+ "閲囪喘鍛�",
+ "瀹℃壒浜�"
+ ]
+ },
+ {
+ "stage": "涓嬪崟",
+ "action": "閲囪喘璁㈠崟(CGDD)鑷姩鎻愪氦 BPM(15鈫�20)",
+ "roles": [
+ "閲囪喘鍛�"
+ ]
+ },
+ {
+ "stage": "鏀惰揣",
+ "action": "纭鏀惰揣鐢熸垚鍒拌揣閫氱煡(0鈫掑緟璐ㄦ2/寰呭叆搴�3鈫�4)锛涢渶妫�鐗╂枡鑷姩鍒涘缓 IQC",
+ "roles": [
+ "浠撶",
+ "IQC 璐ㄦ鍛�"
+ ]
+ },
+ {
+ "stage": "鍏ュ簱",
+ "action": "IQC 鍚堟牸/鐗归噰鈫掗噰璐叆搴�(寰呬笂鏋垛啋寰呮墽琛屸啋瀹屾垚)搴撳瓨+锛屽洖鍐欒鍗� inCount/inStatus 涓庣敵璇锋槑缁�",
+ "roles": [
+ "浠撶"
+ ]
+ },
+ {
+ "stage": "閫�璐�",
+ "action": "IQC 涓嶅悎鏍奸��璐р啋渚涘簲鍟嗛��璐у嚭搴�(閫夋枡閿佸畾鍒拌鍗曡)锛涙姤搴熻蛋 NCR",
+ "roles": [
+ "浠撶"
+ ]
+ },
+ {
+ "stage": "浠樻",
+ "action": "閲囪喘鏉ョエ(FPD, AI OCR, 鈮よ鍗曟�讳环) 鈫� 浠樻鍗�(FKD 鍏宠仈鏉ョエ+闄勪欢, 鈮ゆ潵绁ㄩ噾棰�) BPM 瀹℃壒",
+ "roles": [
+ "璐㈠姟",
+ "瀹℃壒浜�"
+ ]
+ },
+ {
+ "stage": "瀵硅处",
+ "action": "渚涘簲鍟嗗線鏉ユ寜渚涘簲鍟嗘眹鎬伙細宸︿晶閲囪喘璁㈠崟娴佹按鍚凡寮�绁�/鏈紑绁ㄩ噾棰濓紝鍙充晶鏉ョエ娴佹按鍚紑绁ㄩ噾棰�/宸蹭粯/鍓╀綑搴斾粯骞堕檮浠樻娴佹按锛岄《閮ㄦ眹鎬荤疮璁¢噰璐�/寮�绁�/浠樻/鏈粯浣欓",
+ "roles": [
+ "璐㈠姟",
+ "閲囪喘鍛�"
+ ]
+ }
+ ]
},
{
- "stage": "鎶曟爣",
- "action": "鎸夊鎴�(鎷涙爣鏂�)鐧昏鎶曟爣淇濊瘉閲戯細椤圭洰/鎷涙爣缂栧彿/閲戦/缂寸撼鏃ユ湡锛屽彲鍏宠仈璇ュ鎴峰凡瀹℃牳鐨勯攢鍞鍗曪紱寮�鏍囧悗鍥炲~涓爣缁撴灉锛屾湭涓爣璺熻釜閫�鍥炵姸鎬併�侀噾棰濅笌鏃ユ湡",
- "roles": [
- "閿�鍞唴鍕�"
- ]
+ "id": "production",
+ "name": "鐢熶骇娴佺▼",
+ "mermaid": "mermaid/04-production-flow.mmd",
+ "color": "#e0b34f",
+ "summary": "閿�鍞鍗曢┍鍔� MPS(浠呭垱寤轰汉鎴栬秴绠″彲涓嬪彂) 鈫� 涓嬪彂宸ュ崟 鈫� 鎸夊伐鑹鸿矾绾挎媶宸ュ簭浠诲姟 鈫� 棰嗘枡/绾胯竟澶囨枡 鈫� 鎶ュ伐(宸ュ簭椤哄簭纭牎楠�+BPM锛屾寜宸ュ簭宸ヨ祫瀛楁+宸ヨ壓璺嚎缁戝畾+涓昏浠疯澶囪В鏋愬崟浠峰揩鐓ф姤宸ュ伐璧�) 鈫� BOM 娑堣��/鍗婃垚鍝佽嚜鍔ㄥ叆搴�/鎴愬搧寰呮 鈫� 鏈亾宸ュ簭鍥炲啓杩涘害 鈫� 鑷姩瀹屽伐 鈫� ProductionFinishedEvent 鍥炲啓閿�鍞鍗曪紱鎶ュ伐宸ヨ祫鍦ㄨ柂閰牳绠楁椂鎸夋姤宸ヤ汉姹囨�伙紝鍙汉宸ヨ皟鏁村悗璁″叆瀹炲彂锛涙姤宸ユ彁浜や笉鍐嶈嚜鍔ㄧ敓鎴� IPQC锛岃繃绋嬫楠岀敱璐ㄩ噺閮ㄩ棬鎵嬪伐寤哄崟锛屾垚鍝佷骇鍑鸿蹇呴』瀹屾垚 IPQC 鎵嶅彲鍏ュ簱锛屽崐鎴愬搧浜у嚭鐩存帴 PASS 骞舵寜鐢熶骇 BOM 鐩爣搴撲綅鑷姩鍏ュ簱銆佷笉渚濊禆鍊掑啿寮�鍏炽�佷笉璧板鎵癸紝鍚堟牸鐜囨寜璐ㄩ噺瑙勫垯璋冩暣宸ヨ祫(绯绘暟鎴栦笉鍚堟牸鎵f)銆傛姤宸ュ悓鏃舵寜宸ュ簭鏍囧噯宸ユ椂閰嶇疆+鐢熶骇闀垮害+杈呭姪椤规鏁板揩鐓ф爣鍑嗗伐鏃讹紝瀹為檯宸ユ椂涓庢爣鍑嗗伐鏃剁殑宸紓杩涘叆宸ユ椂鑰冩牳鎶ヨ〃(鎸変汉/宸ュ簭/鏈哄彴/鍛ㄦ湡)锛屾爣鍑嗗伐鏃跺彧鐢ㄤ簬鑰冩牳瀵规瘮銆佷笉鍙備笌宸ヨ祫璁$畻銆�",
+ "steps": [
+ {
+ "stage": "璁″垝",
+ "action": "MPS 鍒涘缓(鎵嬪伐鎴栭攢鍞鍗曡嚜鍔�)鈫掍笅鍙戞垨鍚堝苟涓嬪彂涓哄伐鍗�",
+ "roles": [
+ "璁″垝鍛�"
+ ]
+ },
+ {
+ "stage": "娲惧伐",
+ "action": "宸ュ崟纭鎸夊伐鑹鸿矾绾块�愬伐搴忕敓鎴愪换鍔★紝鍙寚娲�/鏆傚仠/鍙栨秷",
+ "roles": [
+ "杞﹂棿涓讳换"
+ ]
+ },
+ {
+ "stage": "澶囨枡",
+ "action": "鐢熶骇棰嗘枡鍗曞嚭搴撴垨绾胯竟铏氭嫙搴撳鏂�",
+ "roles": [
+ "浠撶"
+ ]
+ },
+ {
+ "stage": "鎶ュ伐",
+ "action": "鎻愪氦鎶ュ伐锛氫笂涓�閬撳伐搴忔湭鎶ユ弧鐩存帴鎷︽埅锛涘惎鐢� BPM 璧板鎵癸紱鎸夊伐搴忚璐圭被鍨嬪揩鐓у伐璧勶紙璁℃椂=宸ユ椂脳瀹氶锛岃浠�=鏁伴噺脳瀹氶锛夛紝璁板埌鎶ュ伐浜哄悕涓嬶紱鍚屾椂褰曞叆鐢熶骇闀垮害涓庤緟鍔╅」娆℃暟锛屾寜宸ュ簭鏍囧噯宸ユ椂閰嶇疆璁$畻骞跺揩鐓ф爣鍑嗗伐鏃讹紙涓诲伐鏃�+杈呭姪宸ユ椂锛変笌璁$畻渚濇嵁锛岄厤缃己澶辨椂涓嶉樆鏂紝杞汉宸ュ~宸ユ椂骞惰褰曠己澶卞師鍥�",
+ "roles": [
+ "鎿嶄綔宸�"
+ ]
+ },
+ {
+ "stage": "宸ユ椂鑰冩牳",
+ "action": "瀹為檯宸ユ椂 vs 鏍囧噯宸ユ椂瀹炴椂姣斿锛屽樊寮傜巼瓒呴槇鍊�(榛樿20%)鎻愮ず锛涙姤琛ㄦ寜浜�/宸ュ簭/鏈哄彴/鍛ㄦ湡姹囨�绘姤宸ュ崟鏁般�佺敓浜ч暱搴︺�佸疄闄呭伐鏃躲�佹爣鍑嗗伐鏃躲�佸樊寮備笌宸紓鐜囷紝渚涜溅闂翠富浠讳笌宸ヨ壓鍛樻牳瀵�",
+ "roles": [
+ "杞﹂棿涓讳换",
+ "宸ヨ壓鍛�"
+ ]
+ },
+ {
+ "stage": "鑱斿姩",
+ "action": "瀹℃壒閫氳繃: 宸ュ崟瀛樺湪鐢熶骇BOM鍗宠嚜鍔ㄧ墿鏂欐秷鑰楁墸绾胯竟搴�(鍏佽璐熷簱瀛橈紝涓嶅啀渚濊禆鍊掑啿/璐ㄦ寮�鍏�)锛涙垚鍝佷骇鍑鸿浆寰呮楠屽苟鐢熸垚 PENDING 浜у嚭琛岋紝绛夊緟璐ㄩ噺閮ㄩ棬鎵嬪伐寤� IPQC 骞跺洖鍐欙紱鍗婃垚鍝佷骇鍑�(鎶ュ伐鐗╂枡鈮犲伐鍗曟垚鍝�)鐩存帴 PASS 骞舵寜 BOM 鐩爣搴撲綅绔嬪嵆鍏ュ簱锛屼笉绛夎川妫�",
+ "roles": [
+ "绯荤粺鑷姩"
+ ]
+ },
+ {
+ "stage": "妫�楠�",
+ "action": "宸插畬鎴� IPQC 鍦ㄨ鎯呴〉鎸夌墿鏂�+鐩樺彿+鏁伴噺涓�鑷撮�夋嫨寰呮浜у嚭琛屽叧鑱旓細鍥炲啓鎶ュ伐瀹屾垚骞舵媶鍒嗗悎鏍�/涓嶅悎鏍间骇鍑哄叆搴擄紱鏈叧鑱旂殑宸插畬鎴愭楠屽崟涓嶅洖鍐�",
+ "roles": [
+ "IPQC 璐ㄦ鍛�"
+ ]
+ },
+ {
+ "stage": "瀹屽伐",
+ "action": "浠呮湯閬撳伐搴忓洖鍐欏伐鍗曞凡鐢熶骇鏁伴噺锛岃揪鏍囪嚜鍔ㄥ畬鎴愶紱MPS 绱鍒ゆ柇瀹屾垚骞跺彂浜嬩欢缁欓攢鍞鍗�",
+ "roles": [
+ "绯荤粺鑷姩"
+ ]
+ }
+ ]
},
{
- "stage": "绛剧害",
- "action": "鍚堝悓鏉ユ簮锛氭墜宸ユ柊寤� / 鎶ヤ环鍗曡浆鍏� / Excel 瀵煎叆(涓�鍚堝悓澶氫骇鍝佹槑缁嗚)锛涙彁浜� BPM 瀹℃壒(鍙�夋祦绋嬪畾涔�)锛岄�氳繃=20",
- "roles": [
- "閿�鍞�",
- "瀹℃壒浜�"
- ]
+ "id": "quality",
+ "name": "璐ㄩ噺娴佺▼",
+ "mermaid": "mermaid/05-quality-flow.mmd",
+ "color": "#e06c6c",
+ "summary": "鍥涢亾妫�楠岄椄鍙�(IQC/IPQC/OQC/RQC锛屼簩鎬� 0鈫�4) + 瀹屾垚鏃舵寜鍚堟牸/涓嶅悎鏍兼暟閲忚嚜鍔ㄥ垽瀹�(1 鏍¢獙閫氳繃/2 鏍¢獙涓嶉�氳繃) + NCR 鎻愪氦 BPM 瀹℃壒鍚庣敱璐ㄩ噺閮ㄥ缃啀鍏抽棴锛汭PQC 鐢辫川閲忛儴闂ㄦ墜宸ユ柊寤哄苟缁戝畾宸ュ崟/宸ュ簭/鍗婃垚鍝�/鐩樺彿锛屾柊寤�/缂栬緫閫夊伐浣嶅嵆鎸夊伐搴忓甫鍑鸿宸ュ簭缁存姢鐨勮嚜瀹氫箟宸ヨ祫瀛楁锛屾楠屼俊鎭彲鎸夎澧炲垹涓旀瘡琛屽彧涓婁紶妫�楠岄檮浠讹紙涓嶅~妫�娴嬪�硷紝闄勪欢鎸夋楠岃鏄庣粏 ID 鐙珛缁戝畾锛夛紱IPQC 瀹屾垚鍚庢寜鐗╂枡+鐩樺彿+鏁伴噺鍏宠仈鎶ュ伐寰呮琛岋紱鎶ュ伐鎻愪氦涓嶅啀鑷姩鐢熸垚 IPQC锛屾垚鍝佷骇鍑鸿 PENDING 涓斿繀椤诲畬鎴� IPQC 鎵嶈兘鍏ュ簱锛屽悎鏍肩巼鍙備笌鎶ュ伐宸ヨ祫璐ㄩ噺璋冩暣锛孫QC 瀹屾垚鍚庢寜鍚屾牱瑙勫垯鍏宠仈閿�鍞嚭搴撳緟妫�琛岋紱璐ㄩ噺缁熻鎻愪緵鏁翠綋鍚堟牸鐜�/涓嶅悎鏍肩巼骞舵寜宸ュ簭銆佹寜鐢熶骇宸ュ崟姹囨�伙紱AI 鎻愪緵鍒ゅ畾寤鸿锛汵CR 瀹℃壒鎰忚鐢� BPM 娴佽浆璁板綍鎵胯浇锛屽缃柟寮忛檺瀹氳姝ユ斁琛�/杩斾慨/杩斿伐/鎶ュ簾锛涙楠屽崟鍙敱鏅鸿兘璐ㄦ鎶ュ憡骞冲彴涓�閿嚭浠讹紙generate-from-qc锛氭暟鎹粠 MES 鍙栵紝浜旈亾鏍¢獙鍚庢覆鏌撹惤搴擄級銆� 璐ㄩ噺宸℃涓虹嫭绔嬭褰� mes_qc_patrol锛屾寜 XJ_+鏃ユ湡+娴佹按缂栫爜锛屼笉鐢熸垚搴撳瓨涓氬姟鍗曟嵁銆�",
+ "steps": [
+ {
+ "stage": "鏉ユ枡",
+ "action": "鍒拌揣閫氱煡/澶栧崗鍏ュ簱鈫扞QC锛岀粨璁哄洖鍐欐帹杩涘緟鍏ュ簱鎴栬Е鍙戦��璐�",
+ "roles": [
+ "IQC 璐ㄦ鍛�"
+ ]
+ },
+ {
+ "stage": "杩囩▼",
+ "action": "鎶ュ伐浜у嚭琛�(鎴愬搧 PENDING銆佸崐鎴愬搧鐩存帴 PASS 鑷姩鍏ュ簱)鈫掕川閲忛儴闂ㄦ墜宸ユ柊寤� IPQC 骞剁粦瀹氬伐鍗�/宸ュ簭/鍗婃垚鍝�/鐩樺彿鈫掗�愯涓婁紶妫�楠岄檮浠讹紱瀹屾垚鍚庢寜鐗╂枡+鐩樺彿+鏁伴噺涓�鑷村叧鑱旀姤宸ュ緟妫�琛岋紝鍚堟牸鎷嗚鍏ュ簱銆佷笉鍚堟牸鐢熸垚 NCR",
+ "roles": [
+ "IPQC 璐ㄦ鍛�"
+ ]
+ },
+ {
+ "stage": "鍑鸿揣",
+ "action": "閿�鍞嚭搴撴彁浜ゅ悗琛岃浆寰呮娴嬧啋璐ㄦ鍛樼嫭绔嬪綍鍏� OQC锛涘畬鎴愬悗鎸夌墿鏂�+鐩樺彿+鏁伴噺涓�鑷村叧鑱斿嚭搴撳緟妫�琛岋紝鍏ㄩ儴鍚堟牸鍚庡嚭搴撳崟杩涘叆寰呮嫞璐�",
+ "roles": [
+ "OQC 璐ㄦ鍛�"
+ ]
+ },
+ {
+ "stage": "閫�璐�",
+ "action": "閫�鏂�/閿�鍞��璐�/鍞悗閫�璐р啋RQC锛岀粨璁哄洖璋冨崟鎹笌鍞悗",
+ "roles": [
+ "RQC 璐ㄦ鍛�"
+ ]
+ },
+ {
+ "stage": "瀵煎叆",
+ "action": "IQC/IPQC/OQC 涓夊垪琛ㄥ悇鏀寔 Excel 鎵归噺瀵煎叆(鎸夐挳鍦ㄣ�屾柊澧炪�嶄笌銆屽鍑恒�嶄箣闂达紝绾柊澧炰笉鍋氭洿鏂拌鐩�)锛氫竴琛屼竴寮犲崟锛岀紪鍙风暀绌鸿嚜鍔ㄧ敓鎴愶紝璐ㄦ鏂规鐣欑┖鎸夌墿鏂�+妫�楠岀被鍨嬭嚜鍔ㄥ尮閰嶏紝妫�娴嬩汉鍛樼暀绌哄彇褰撳墠鐧诲綍鐢ㄦ埛锛涚墿鏂�/渚涘簲鍟�/瀹㈡埛/宸ュ崟/宸ヤ綅鎸夌紪鐮佹垨鍚嶇О绮剧‘鍖归厤(IPQC 鐗╂枡鐢卞伐鍗曟帹瀵硷紝妯℃澘涓嶅~)锛屽悎鏍�+涓嶅悎鏍�=妫�娴�/鎺ユ敹鏁伴噺銆両PQC 宸ュ簾+鏂欏簾+鍏朵粬搴熷搧鈮や笉鍚堟牸銆丱QC 瀹㈡埛椤诲湪鏈汉鏁版嵁鏉冮檺鍐咃紱閫愯瀵煎叆閮ㄥ垎鎴愬姛锛屽け璐ヨ杩� failureList 甯﹁鍙蜂笌鍙墽琛屽姩浣滐紝鎴愬姛鍗曚竴寰嬪緟妫�楠�0锛涘悓涓�鎵规暟鎹笉鍙噸澶嶅鍏ワ細鏂囦欢鍐呴噸澶嶈涓庡簱鍐呭凡瀛樺湪鍚屼笟鍔¢敭鍗曟嵁锛圛QC 鐗╂枡+渚涘簲鍟�+渚涘簲鍟嗘壒娆�+鏉ユ枡鏃ユ湡銆両PQC 鐢熶骇宸ュ崟+妫�楠岀被鍨�+宸ヤ綅+妫�娴嬫棩鏈熴�丱QC 鐗╂枡+瀹㈡埛+鎵规鍙�+鍑鸿揣鏃ユ湡锛夊潎鎷掕琛岋紝鎻愮ず鍚淮搴︺�佸弻鏂瑰疄闄呭�间笌銆屽厛鍒犻櫎璇ュ崟鎹啀閲嶈瘯銆嶅姩浣�",
+ "roles": [
+ "璐ㄦ鍛�",
+ "IQC 璐ㄦ鍛�",
+ "IPQC 璐ㄦ鍛�",
+ "OQC 璐ㄦ鍛�"
+ ]
+ },
+ {
+ "stage": "涓嶅悎鏍�",
+ "action": "NCR: 寰呰瘎瀹�(0)鈫掓彁浜PM瀹℃壒(2)鈫掑鎵归�氳繃宸茶瘎瀹�(6)/椹冲洖鍥炲緟璇勫鈫掕川閲忛儴澶勭疆(璁╂鏀捐/杩斾慨/杩斿伐/鎶ュ簾)鈫掑凡澶勭疆(7)鈫掑叧闂�(8)锛涘鎵规剰瑙佺敱 BPM 娴佽浆璁板綍鎵胯浇锛屾湭鍙戝竷娴佺▼瀹氫箟鎴栧叏灞�鍏嶅鎵规椂鎻愪氦鍚庤嚜鍔ㄩ�氳繃",
+ "roles": [
+ "璐ㄩ噺宸ョ▼甯�"
+ ]
+ },
+ {
+ "stage": "鍑轰欢",
+ "action": "涓ゆ潯鍑轰欢鍏ュ彛锛氣憼閫氱敤 generate/preview(璋冪敤鏂硅嚜甯︿笂涓嬫枃) 娓叉煋 HTML 骞跺喕缁撴暟鎹揩鐓э紝缂栧彿 QR+鏃ユ湡+4浣嶆祦姘存寜澶╃嫭绔嬶紝preview 鍙覆鏌撲笉钀藉簱涓嶆秷鑰楃紪鍙凤紝regenerate 鐢ㄥ喕缁撳揩鐓ч噸娓蹭笖鏁版嵁涓庣紪鍙蜂笉鍙樺苟浣滃簾宸插綊妗� PDF锛屽鍑� PDF 鐢卞悗绔皟 Chromium 鎵撳嵃瀹炰緥宸插瓨鐨� HTML 鍚庡綊妗i檮浠朵腑蹇冿紱鈶enerate-from-qc 鐢辫川妫�鍗曠洿鎺ュ嚭浠�(鏁版嵁缁� MesQcReportApi 浠� MES 鍙栵紝鍓嶇涓嶆嫾涓婁笅鏂�)锛屽嚭浠跺墠浜旈亾鏍¢獙鎸変笟鍔′紭鍏堢骇鍙姤绗竴澶勶細绫诲瀷闈炴硶/鍗曟嵁涓嶅瓨鍦�/鏈畬鎴愭楠�/鏈~鍒ゅ畾/妯℃澘绫诲瀷涓嶇/鏃犲彲鐢ㄦ楠岄」锛屾姤鍛婂ご鍙﹀甫鍗曟嵁鍘熷垽瀹� qcResult+qcResultText 涓庡紩鎿庡垽瀹氬苟瀛橈紝鍝嶅簲鍥� undecidableCount 寰呭垽瀹氶」鏁颁笌 warnings(鍒嗙粍鏍囬璺宠繃/鎸囨爣宸插垹/鏈綍瀹炴祴鍊�/鏍峰搧瓒�3)锛屽悓涓�寮犲崟鎹彲鍙嶅鍑哄浠�",
+ "roles": [
+ "璐ㄦ鍛�"
+ ]
+ },
+ {
+ "stage": "寤烘ā鏉�",
+ "action": "AI 瀵煎叆锛氫笂浼犳棦鏈夋楠屾姤鍛婃枃浠�(鎵弿浠�/鐓х墖銆佺數瀛愮増 PDF銆乄ord/Excel) 鈫� 璇嗗埆鎴愭ā鏉胯崏绋�(涓嶈惤搴�) 鈫� 浜哄伐鍦ㄨ璁″櫒纭璋冩暣鍚庝繚瀛樹负鐗堟湰锛�.doc/.xls 鏃ф牸寮忎笉鏀寔",
+ "roles": [
+ "璐ㄦ鍛�",
+ "璐ㄩ噺宸ョ▼甯�"
+ ]
+ }
+ ]
},
{
- "stage": "鎺ュ崟",
- "action": "鍚堝悓涓�閿敓鎴愰攢鍞鍗�(XSDD)锛岄攢鍞鍗曞啀璧� BPM锛涘鎵归�氳繃鑷姩涓� needProduction 鏄庣粏鍒涘缓 MPS",
- "roles": [
- "閿�鍞�",
- "璁″垝鍛�"
- ]
+ "id": "warehouse",
+ "name": "浠撳偍娴佺▼",
+ "mermaid": "mermaid/06-warehouse-flow.mmd",
+ "color": "#7e6bd6",
+ "summary": "15 绫诲崟鎹┍鍔ㄥ簱瀛樺彴璐�(鍏厓缁勩�佸洓閲�)鍙樺姩锛屽叏閮ㄧ粡浜嬪姟娴佹按鐣欑棔锛涙敮鎸佽皟鎷ㄥ湪閫斻�佺洏鐐硅皟鏁淬�佹壒娆�/SN 杩芥函銆佸簱瀛樺崰鐢ㄤ笌鍥涚骇鍐荤粨銆佺嚎杈硅櫄鎷熷簱璐熷簱瀛橈紱瀵瑰 WmsStockApi 渚� ERP 鏀跺彂銆� 搴撳瓨鍐荤粨鎸夋潵婧愶紙浜哄伐/鐩樼偣/璋冩嫧锛夌嫭绔嬬櫥璁颁簬 mes_wm_material_stock_freeze_claim锛涘簱瀛樹簨鍔″啑浣� work_order_id锛屽嚭搴撳彴璐﹀彲鐩存帴灞曠ず鐢熶骇璁㈠崟鍙枫��",
+ "steps": [
+ {
+ "stage": "鍏ュ簱",
+ "action": "閲囪喘鍏ュ簱/鐢熶骇鍏ュ簱/浜у嚭鍏ュ簱/閫�璐у叆搴�/澶栧崗鍏ュ簱/鏉傞」鍏ュ簱 鈫� IN 浜嬪姟锛屾壒娆℃贩鏀炬牎楠屻�佸洓绾у喕缁撴牎楠�",
+ "roles": [
+ "浠撶"
+ ]
+ },
+ {
+ "stage": "鍑哄簱",
+ "action": "閿�鍞嚭搴�/棰嗘枡/娑堣��/澶栧崗鍙戞枡/渚涘簲鍟嗛��璐�/鏉傞」鍑哄簱 鈫� OUT 浜嬪姟锛宑heckFlag 鎺у埗鍙惁璐熷簱瀛�",
+ "roles": [
+ "浠撶",
+ "绯荤粺鑷姩"
+ ]
+ },
+ {
+ "stage": "绉诲簱",
+ "action": "鍐呴儴/澶栭儴璋冩嫧鎴愬 MOVE 浜嬪姟锛屽湪閫旀暟閲忚窡韪�",
+ "roles": [
+ "浠撶"
+ ]
+ },
+ {
+ "stage": "鐩樼偣",
+ "action": "鏂规鈫掍换鍔♀啋鏄庣粏琛屸啋缁撴灉锛岀洏鐩� ADJUST_IN銆佺洏浜� ADJUST_OUT锛屽彲鍐荤粨涓庣洸鐩�",
+ "roles": [
+ "鐩樼偣鍛�"
+ ]
+ },
+ {
+ "stage": "杩芥函",
+ "action": "鎵规/SN(uuid)/鏉$爜(18绫�)/瑁呯宓屽鏀拺姝e弽鍚戣拷婧�",
+ "roles": [
+ "璐ㄩ噺",
+ "鍞悗"
+ ]
+ }
+ ]
},
{
- "stage": "浜や粯",
- "action": "鍙戣揣閫氱煡瀹℃牳(鍗犵敤)鈫� 閿�鍞嚭搴撴彁浜わ細鏈� oqcCheckFlag 琛岃浆寰呮娴嬶紝鎻愪氦鏃朵笉鍐嶈嚜鍔ㄥ缓 OQC锛涜川妫�鍛樼嫭绔嬪綍鍏ュ苟瀹屾垚 OQC 鍚庯紝鍦ㄦ楠屽崟璇︽儏鎸夌墿鏂�+鐩樺彿+鏁伴噺涓�鑷撮�夋嫨寰呮鍑哄簱琛屽叧鑱旓紝鍏ㄩ儴寰呮琛屽悎鏍煎悗鍑哄簱鍗曡浆寰呮嫞璐� 鈫� 鍙戣繍 鈫� 鍑哄簱鍥炲啓閮ㄥ垎/鍏ㄩ儴鍑哄簱",
- "roles": [
- "浠撶",
- "璐ㄦ"
- ]
+ "id": "aftersales",
+ "name": "鍞悗娴佺▼",
+ "mermaid": "mermaid/07-after-sales-flow.mmd",
+ "color": "#c78bd6",
+ "summary": "宸ュ崟(鍏��+闂鍒ゅ畾) 鈫� 瀹㈡埛璇夋眰/澶勭悊缁撴灉闄勪欢涓庢祦杞褰曠暀鐥� 鈫� 缁翠慨涓夌被鍨嬫垨鐢变粨鍌ㄧ墿娴佸彂璧烽攢鍞��璐�(閫�璐у崟鍒涘缓鍗冲洖鍐欏伐鍗曟祦杞褰�) 鈫� RQC 璐ㄦ/鍏ュ簱/閫�娆句笁鍥炶皟閫愮骇鎺ㄨ繘 鈫� 宸ュ崟瀹岀粨鍏抽棴銆�",
+ "steps": [
+ {
+ "stage": "鍙楃悊",
+ "action": "浜哄伐褰曞叆宸ュ崟(鍏宠仈瀹㈡埛/璁㈠崟/鍚堝悓)锛屽~鍐欏鎴疯瘔姹傚弽棣堟弿杩板苟涓婁紶闄勪欢锛屽垱寤烘椂鎸囧畾鐨勫鐞嗕汉鐩存帴杩涘叆澶勭悊涓�",
+ "roles": [
+ "瀹㈡湇"
+ ]
+ },
+ {
+ "stage": "鍒ゅ畾",
+ "action": "闂鍒ゅ畾: 涓�鑸�/缁翠慨/閫�璐э紝涓ラ噸搴� 0-3",
+ "roles": [
+ "鍞悗宸ョ▼甯�"
+ ]
+ },
+ {
+ "stage": "澶勭悊",
+ "action": "濉啓澶勭悊缁撴灉骞朵笂浼犲鐞嗙粨鏋滈檮浠讹紱鍒涘缓銆佹洿鏂般�佸垽瀹氥�佸畬缁撱�佸綊妗c�佸彇娑堛�佸洖璁垮潎鍐欏叆娴佽浆璁板綍",
+ "roles": [
+ "鍞悗宸ョ▼甯�"
+ ]
+ },
+ {
+ "stage": "缁翠慨",
+ "action": "鐜板満/杩斿巶/杩滅▼缁翠慨锛岃垂鐢ㄤ笌缁撴灉璁板綍锛屽畬鎴愯仈鍔ㄥ伐鍗曞畬缁�",
+ "roles": [
+ "缁翠慨宸ョ▼甯�"
+ ]
+ },
+ {
+ "stage": "閫�璐�",
+ "action": "鍞悗涓嶅啀鍙戣捣閫�璐х敵璇凤紝鐢变粨鍌ㄧ墿娴佸彂璧烽攢鍞��璐у崟(RQC)鈫掕川妫�/鍏ュ簱鍥炶皟鈫掗��娆惧洖璋冣啋鍏抽棴锛涘垱寤洪��璐у崟鏃舵寜閿�鍞鍗曞尮閰嶆渶杩戜竴寮犳湭鍏抽棴/鏈彇娑堝伐鍗曪紝鍐欏叆銆屼粨鍌ㄩ��璐с�嶆祦杞褰曪紝鑽夌鎴栧鐞嗕腑宸ュ崟鎺ㄨ繘涓哄緟閫�璐�",
+ "roles": [
+ "浠撳偍",
+ "璐ㄦ",
+ "璐㈠姟"
+ ]
+ }
+ ]
},
{
- "stage": "鍥炴",
- "action": "寮�绁� BPM(绱鈮ゅ悎鍚岄) 鈫� 鍥炴寮哄埗鍏堝紑绁�(绱鈮ゅ悎鍚屽墿浣欎笌寮�绁ㄥ墿浣�)",
- "roles": [
- "璐㈠姟",
- "閿�鍞�"
- ]
+ "id": "finance",
+ "name": "浼氳鏍哥畻娴佺▼",
+ "mermaid": "mermaid/12-finance-flow.mmd",
+ "color": "#3ec9a7",
+ "summary": "浼氳鏍哥畻锛氬嚟璇�/鍒嗗綍/鍊熻捶骞宠 -> 杩囪处 -> 鎬昏处/鏄庣粏璐�/鎶ヨ〃锛涘浐瀹氳祫浜ф姌鏃с�佹棤褰㈣祫浜ф憡閿�銆傞攢鍞噰璐储鍔¢棴鐜細ERP 閿�鍞鍗� + MES 宸插畬鎴愬嚭搴撳崟 -> CRM 寮�绁ㄧ敵璇凤紙缁戝畾璁㈠崟+鍑哄簱鍗曪級-> 瀹℃壒閫氳繃 -> 褰曞叆鍙戠エ骞跺~鍐欏悎鍚屾/棰勪粯娆�/鍒拌揣娆�/楠屾敹娆�/璐ㄤ繚閲戞敹娆捐妭鐐� -> CRM 鍥炴鎸夋牳閿�鏄庣粏鍒嗘憡鍒拌鍗�/鍑哄簱/寮�绁� -> 瀹㈡埛搴旀敹瀵硅处銆佸凡鍙戣揣鏈紑绁ㄣ�佹湭鏍搁攢搴旀敹璐﹂緞銆佷笅鏈堝洖娆捐鍒掞紱鏉ョエ蹇呴』鍚屾椂缁戝畾閲囪喘璁㈠崟涓� MES 閲囪喘鍏ュ簱鍗曪紱鍑瘉鍙叧鑱旀潵婧愬崟鎹紙寮�绁�/鍥炴/鏉ョエ/浠樻锛夈��",
+ "steps": [
+ {
+ "stage": "寤鸿处",
+ "action": "缁存姢浼氳绉戠洰 tree(subjectCode 鍞竴锛屽彲寤轰笅绾�)锛岄娆″彲瀵煎叆绾� 68 鏉′竴绾х鐩瀛�",
+ "roles": [
+ "浼氳"
+ ]
+ },
+ {
+ "stage": "璁拌处",
+ "action": "褰曞叆鍑瘉(瀛楀彿鐣欑┖鑷姩鐢熸垚)+鍒嗗綍锛屽垎褰曢�愯閫夌鐩苟濉��/璐凤紱鏍¢獙鑷冲皯涓�琛屻�佸�熻捶閮戒笉寰楀悓鏃跺ぇ浜�0銆佸悎璁$浉绛変笖澶т簬0",
+ "roles": [
+ "浼氳"
+ ]
+ },
+ {
+ "stage": "杩囪处",
+ "action": "鏈繃璐�0 鈫� post 杩囪处 鈫� 宸茶繃璐�10(涓嶅彲鍐嶄慨鏀�)锛涙湭杩囪处0 鎴� 宸茶繃璐�10 鍧囧彲 cancel 浣滃簾 鈫� 宸蹭綔搴�20",
+ "roles": [
+ "浼氳",
+ "璐㈠姟涓荤"
+ ]
+ },
+ {
+ "stage": "鏌ヨ处",
+ "action": "鎬昏处鎸夋湡闂撮�愭湀姹囨�汇�佹槑缁嗚处閫愭潯鍒嗗綍骞剁粨杞綑棰濓紝涓よ�呭彧缁熻宸茶繃璐�10鐨勫嚟璇侊紝骞舵敮鎸佸鍑�",
+ "roles": [
+ "浼氳",
+ "璐㈠姟涓荤"
+ ]
+ },
+ {
+ "stage": "璧勪骇",
+ "action": "鍥哄畾璧勪骇(1鍦ㄧ敤/2闂茬疆/3缁翠慨涓�/4宸叉姤搴�)涓庢棤褰㈣祫浜�(1鍦ㄧ敤/2宸插け鏁�/3宸叉憡閿�瀹�)璁℃彁锛氫紶 ids 鎸夐�変腑璁℃彁锛宨ds 涓虹┖瀵瑰叏閮ㄦ湭鎶ュ簾/鏈け鏁堣祫浜ц鎻愪竴涓湀",
+ "roles": [
+ "璧勪骇浼氳"
+ ]
+ },
+ {
+ "stage": "鎶ヨ〃",
+ "action": "鐪嬫澘姹囨�昏祫浜т笌鍑瘉鏃剁偣鏁� + 缁� ErpFinanceStatisticsApi 鍙� ERP 宸插鏍告敹璐т粯娆句笌璐攢閲戦锛岃緭鍑烘湀搴︽敹鏀秼鍔�",
+ "roles": [
+ "璐㈠姟涓荤",
+ "绠$悊灞�"
+ ]
+ },
+ {
+ "stage": "鏉ョエ",
+ "action": "閫夋嫨閲囪喘璁㈠崟 -> 閫夋嫨璇ヨ鍗曚笅宸插畬鎴� MES 閲囪喘鍏ュ簱鍗� -> 淇濆瓨鏉ョエ锛坕tem_receipt_id/item_receipt_code锛�",
+ "roles": [
+ "閲囪喘",
+ "璐㈠姟"
+ ]
+ },
+ {
+ "stage": "寮�绁ㄧ敵璇�",
+ "action": "閫夋嫨鍚堝悓銆侀攢鍞鍗曘�佽璁㈠崟涓嬪凡瀹屾垚鍑哄簱鍗曪紝濉啓寮�绁ㄩ噾棰濆悗鎻愪氦 BPM 瀹℃壒",
+ "roles": [
+ "閿�鍞�",
+ "璐㈠姟"
+ ]
+ },
+ {
+ "stage": "褰曞叆鍙戠エ",
+ "action": "瀹℃壒閫氳繃鍚庡綍鍏ュ彂绁ㄥ彿鐮併�佹棩鏈熴�侀檮浠讹紝骞舵寜閿�鍞鍗曞~鍐欏悎鍚屾/棰勪粯娆�/鍒拌揣娆�/楠屾敹娆�/璐ㄤ繚閲戝強鍚勮嚜鏃堕棿鑺傜偣",
+ "roles": [
+ "璐㈠姟"
+ ]
+ },
+ {
+ "stage": "鍥炴鏍搁攢",
+ "action": "鍥炴鍗曢�氳繃 items 鎶婇噾棰濇牳閿�鍒伴攢鍞鍗�/閿�鍞嚭搴�/寮�绁紝鏄庣粏鍚堣蹇呴』绛変簬鍥炴閲戦锛涘鏍搁�氳繃鍥炲啓鍥炴璁″垝瀹為檯閲戦涓庣姸鎬�",
+ "roles": [
+ "璐㈠姟"
+ ]
+ },
+ {
+ "stage": "瀵硅处鎶ヨ〃",
+ "action": "鎸夊鎴锋眹鎬昏鍗曘�佸嚭搴撱�佸紑绁ㄣ�佸洖娆撅紝杈撳嚭鏈牳閿�搴旀敹銆佸凡鍙戣揣鏈紑绁ㄣ�佽处榫勩�佷笅鏈堝洖娆捐鍒掍笌鏈堝害瓒嬪娍",
+ "roles": [
+ "璐㈠姟",
+ "閿�鍞�"
+ ]
+ },
+ {
+ "stage": "鍏ヨ处",
+ "action": "璁拌处鍑瘉濉啓 sourceType/sourceId/sourceNo 鍏宠仈寮�绁ㄣ�佸洖娆俱�佹潵绁ㄣ�佷粯娆剧瓑鏉ユ簮鍗曟嵁",
+ "roles": [
+ "璐㈠姟"
+ ]
+ }
+ ]
+ },
+ {
+ "id": "ai",
+ "name": "AI 涓氬姟娴佺▼",
+ "mermaid": "mermaid/11-ai-business-flow.mmd",
+ "color": "#56c8d8",
+ "summary": "缁熶竴妯″紡锛氫笟鍔′晶鏀堕泦涓婁笅鏂�(蹇呰鏃惰皟 MDM/SRM/CRM API 鍙栧悕绉�)鈫掔粍瑁� Prompt鈫抍hat/chatWithImage鈫掕В鏋� JSON鈫掑墠绔濉垨寤鸿锛涙棤 Function Calling锛汻AG 鐭ヨ瘑搴撳凡寤烘垚浣嗘殏鏃犱笟鍔℃秷璐广�傛櫤鑳戒綋鐗╂枡瀵煎叆涓鸿鍒�+Java 棰勬閾捐矾锛岀粡浜哄伐纭鍚庡箓绛夋彁浜ゃ��",
+ "steps": [
+ {
+ "stage": "褰曞叆鎻愭晥",
+ "action": "鍙戠エ OCR(鍥剧墖澶氭ā鎬�/PDF鏂囨湰)銆佹姤浠峰崟 OCR 鈫� 缁撴瀯鍖栭濉�",
+ "roles": [
+ "閲囪喘鍛�",
+ "閿�鍞�"
+ ]
+ },
+ {
+ "stage": "涓绘暟鎹鍏�",
+ "action": "涓婁紶鐗╂枡 CSV/XLSX 鈫� Python 瑙f瀽鍊欓�� 鈫� Java 鍙棰勬鍒嗙被/鍗曚綅/閲嶅缂栫爜 鈫� 浜哄伐淇纭 鈫� 骞傜瓑鎻愪氦 鈫� 閫愯鍥炴墽锛涘彧鏂板缓銆佷笉鏇存柊銆佷笉鍚屾 MES",
+ "roles": [
+ "鐗╂枡绠$悊鍛�"
+ ]
+ },
+ {
+ "stage": "杈呭姪鍒ゅ畾",
+ "action": "璐ㄦ鍗�+鎸囨爣+缂洪櫡 鈫� 寤鸿鍚堟牸/鐗归噰/閫�璐�/鎶ュ簾+鐞嗙敱",
+ "roles": [
+ "璐ㄦ鍛�"
+ ]
+ },
+ {
+ "stage": "鍐崇瓥棰勬祴",
+ "action": "缂烘枡/鐢熶骇鏃堕暱/鐢熶骇椋庨櫓/浜や粯鍥涚被棰勬祴渚涜鍒掓帓浜у弬鑰�",
+ "roles": [
+ "璁″垝鍛�"
+ ]
+ },
+ {
+ "stage": "妯℃澘璇嗗埆",
+ "action": "涓婁紶鏃㈡湁妫�楠屾姤鍛婃枃浠�(鎵弿浠�/鐓х墖銆佺數瀛愮増 PDF銆乄ord/Excel) 鈫� 鍒嗛�氶亾鎶藉彇(鏈夋枃鏈眰璧版枃鏈�佹壂鎻忕増閫愰〉杞浘) 鈫� 澶фā鍨嬫寜鍓嶇涓婁紶鐨勭粍浠舵竻鍗曚骇鍑烘墎骞崇粍浠惰崏绋� 鈫� 浜哄伐鍦ㄨ璁″櫒纭鍚庝繚瀛樹负妯℃澘鐗堟湰",
+ "roles": [
+ "璐ㄦ鍛�",
+ "璐ㄩ噺宸ョ▼甯�"
+ ]
+ },
+ {
+ "stage": "鐭ヨ瘑妫�绱�",
+ "action": "鏂囨。鈫掑垏鐗団啋Milvus 鍚戦噺鈫掓绱㈡帴鍙�(棰勭暀)",
+ "roles": [
+ "鈥�"
+ ]
+ }
+ ]
}
- ]
- },
- {
- "id": "purchase",
- "name": "閲囪喘娴佺▼",
- "mermaid": "mermaid/03-purchase-flow.mmd",
- "color": "#5fc79e",
- "summary": "渚涘簲鍟嗘。妗�(澶氳仈绯讳汉/澶氶摱琛屄峰惈閾惰琛屽彿) 鈫� 璇环姣斾环(浜у搧脳渚涘簲鍟嗘í鍚戞姤浠凤紝鎸変骇鍝侀�変腑鏍�) 鈫� 纭鍚庢寜涓爣渚涘簲鍟嗘媶閲囪喘璁㈠崟鑽夌骞惰蛋鐜版湁 BPM 鈫� 纭鏀惰揣鐢熸垚 MES 鍒拌揣閫氱煡 鈫� IQC(鍚堟牸/鐗归噰鍏ュ簱路閫�璐�/鎶ュ簾) 鈫� 閲囪喘鍏ュ簱鍥炲啓璁㈠崟涓庣敵璇� 鈫� 鏉ョエ(AI OCR) 鈫� 浠樻鍗� BPM 鈫� 渚涘簲鍟嗗線鏉ュ璐︺��",
- "steps": [
- {
- "stage": "瀵绘簮",
- "action": "渚涘簲鍟嗘。妗堢淮鎶ゅ涓仈绯讳汉涓庡涓摱琛岃处鎴�(鍚摱琛岃鍙�)锛涙柊澧炶浠峰崟鏃朵竴骞跺綍鍏ヤ骇鍝伱楀弬涓庝緵搴斿晢鎶ヤ环骞堕�夊畾姣忎釜浜у搧鐨勪腑鏍囦緵搴斿晢锛屽垪琛ㄧ洿鎺ョ‘璁ゅ悗鎸変腑鏍囦緵搴斿晢鐢熸垚閲囪喘璁㈠崟鑽夌",
- "roles": [
- "閲囪喘鍛�",
- "渚涘簲鍟嗙鐞嗗憳"
- ]
- },
- {
- "stage": "鐢宠",
- "action": "閲囪喘鐢宠(CGSQ)鎻愪氦 BPM锛岄┏鍥炲彲閲嶇疆鍥炶崏绋匡紱閫氳繃涓旀湁渚涘簲鍟嗚嚜鍔ㄧ敓鎴愯鍗�",
- "roles": [
- "閲囪喘鍛�",
- "瀹℃壒浜�"
- ]
- },
- {
- "stage": "涓嬪崟",
- "action": "閲囪喘璁㈠崟(CGDD)鑷姩鎻愪氦 BPM(15鈫�20)",
- "roles": [
- "閲囪喘鍛�"
- ]
- },
- {
- "stage": "鏀惰揣",
- "action": "纭鏀惰揣鐢熸垚鍒拌揣閫氱煡(0鈫掑緟璐ㄦ2/寰呭叆搴�3鈫�4)锛涢渶妫�鐗╂枡鑷姩鍒涘缓 IQC",
- "roles": [
- "浠撶",
- "IQC 璐ㄦ鍛�"
- ]
- },
- {
- "stage": "鍏ュ簱",
- "action": "IQC 鍚堟牸/鐗归噰鈫掗噰璐叆搴�(寰呬笂鏋垛啋寰呮墽琛屸啋瀹屾垚)搴撳瓨+锛屽洖鍐欒鍗� inCount/inStatus 涓庣敵璇锋槑缁�",
- "roles": [
- "浠撶"
- ]
- },
- {
- "stage": "閫�璐�",
- "action": "IQC 涓嶅悎鏍奸��璐р啋渚涘簲鍟嗛��璐у嚭搴�(閫夋枡閿佸畾鍒拌鍗曡)锛涙姤搴熻蛋 NCR",
- "roles": [
- "浠撶"
- ]
- },
- {
- "stage": "浠樻",
- "action": "閲囪喘鏉ョエ(FPD, AI OCR, 鈮よ鍗曟�讳环) 鈫� 浠樻鍗�(FKD 鍏宠仈鏉ョエ+闄勪欢, 鈮ゆ潵绁ㄩ噾棰�) BPM 瀹℃壒",
- "roles": [
- "璐㈠姟",
- "瀹℃壒浜�"
- ]
- },
- {
- "stage": "瀵硅处",
- "action": "渚涘簲鍟嗗線鏉ユ寜渚涘簲鍟嗘眹鎬伙細宸︿晶閲囪喘璁㈠崟娴佹按鍚凡寮�绁�/鏈紑绁ㄩ噾棰濓紝鍙充晶鏉ョエ娴佹按鍚紑绁ㄩ噾棰�/宸蹭粯/鍓╀綑搴斾粯骞堕檮浠樻娴佹按锛岄《閮ㄦ眹鎬荤疮璁¢噰璐�/寮�绁�/浠樻/鏈粯浣欓",
- "roles": [
- "璐㈠姟",
- "閲囪喘鍛�"
- ]
- }
- ]
- },
- {
- "id": "production",
- "name": "鐢熶骇娴佺▼",
- "mermaid": "mermaid/04-production-flow.mmd",
- "color": "#e0b34f",
- "summary": "閿�鍞鍗曢┍鍔� MPS 鈫� 涓嬪彂宸ュ崟 鈫� 鎸夊伐鑹鸿矾绾挎媶宸ュ簭浠诲姟 鈫� 棰嗘枡/绾胯竟澶囨枡 鈫� 鎶ュ伐(宸ュ簭椤哄簭纭牎楠�+BPM) 鈫� 鍊掑啿娑堣��/浜у嚭鍏ュ簱/IPQC 鈫� 鏈亾宸ュ簭鍥炲啓杩涘害 鈫� 鑷姩瀹屽伐 鈫� ProductionFinishedEvent 鍥炲啓閿�鍞鍗曘��",
- "steps": [
- {
- "stage": "璁″垝",
- "action": "MPS 鍒涘缓(鎵嬪伐鎴栭攢鍞鍗曡嚜鍔�)鈫掍笅鍙戞垨鍚堝苟涓嬪彂涓哄伐鍗�",
- "roles": [
- "璁″垝鍛�"
- ]
- },
- {
- "stage": "娲惧伐",
- "action": "宸ュ崟纭鎸夊伐鑹鸿矾绾块�愬伐搴忕敓鎴愪换鍔★紝鍙寚娲�/鏆傚仠/鍙栨秷",
- "roles": [
- "杞﹂棿涓讳换"
- ]
- },
- {
- "stage": "澶囨枡",
- "action": "鐢熶骇棰嗘枡鍗曞嚭搴撴垨绾胯竟铏氭嫙搴撳鏂�",
- "roles": [
- "浠撶"
- ]
- },
- {
- "stage": "鎶ュ伐",
- "action": "鎻愪氦鎶ュ伐锛氫笂涓�閬撳伐搴忔湭鎶ユ弧鐩存帴鎷︽埅锛涘惎鐢� BPM 璧板鎵�",
- "roles": [
- "鎿嶄綔宸�"
- ]
- },
- {
- "stage": "鑱斿姩",
- "action": "瀹℃壒閫氳繃鎸夊伐搴忔爣璁�: 鍊掑啿鈫掕嚜鍔ㄧ墿鏂欐秷鑰楁墸绾胯竟搴�(鍏佽璐熷簱瀛�)锛涜川妫�鈫掓姤宸ヨ浆寰呮楠屽苟鐢熸垚 PENDING 浜у嚭琛岋紝绛夊緟璐ㄦ鍛樼嫭绔嬪綍鍏� IPQC锛涘叧閿潪妫�鈫掔洿鎺ヤ骇鍑哄叆搴�",
- "roles": [
- "绯荤粺鑷姩"
- ]
- },
- {
- "stage": "妫�楠�",
- "action": "宸插畬鎴� IPQC 鍦ㄨ鎯呴〉鎸夌墿鏂�+鐩樺彿+鏁伴噺涓�鑷撮�夋嫨寰呮浜у嚭琛屽叧鑱旓細鍥炲啓鎶ュ伐瀹屾垚骞舵媶鍒嗗悎鏍�/涓嶅悎鏍间骇鍑哄叆搴擄紱鏈叧鑱旂殑宸插畬鎴愭楠屽崟涓嶅洖鍐�",
- "roles": [
- "IPQC 璐ㄦ鍛�"
- ]
- },
- {
- "stage": "瀹屽伐",
- "action": "浠呮湯閬撳伐搴忓洖鍐欏伐鍗曞凡鐢熶骇鏁伴噺锛岃揪鏍囪嚜鍔ㄥ畬鎴愶紱MPS 绱鍒ゆ柇瀹屾垚骞跺彂浜嬩欢缁欓攢鍞鍗�",
- "roles": [
- "绯荤粺鑷姩"
- ]
- }
- ]
- },
- {
- "id": "quality",
- "name": "璐ㄩ噺娴佺▼",
- "mermaid": "mermaid/05-quality-flow.mmd",
- "color": "#e06c6c",
- "summary": "鍥涢亾妫�楠岄椄鍙�(IQC/IPQC/OQC/RQC锛屼簩鎬� 0鈫�4) + 瀹屾垚鏃舵寜鍚堟牸/涓嶅悎鏍兼暟閲忚嚜鍔ㄥ垽瀹�(1 鏍¢獙閫氳繃/2 鏍¢獙涓嶉�氳繃) + NCR 璇勫澶勭疆鍏抽棴锛汭PQC 瀹屾垚鍚庢寜鐗╂枡+鐩樺彿+鏁伴噺鍏宠仈鎶ュ伐寰呮琛岋紝OQC 瀹屾垚鍚庢寜鍚屾牱瑙勫垯鍏宠仈閿�鍞嚭搴撳緟妫�琛岋紱AI 鎻愪緵鍒ゅ畾寤鸿锛汵CR 褰撳墠浠呭彴璐︿笉瑙﹀彂杩斿伐鍗曪紱妫�楠屽崟鍙敱鏅鸿兘璐ㄦ鎶ュ憡骞冲彴涓�閿嚭浠讹紙generate-from-qc锛氭暟鎹粠 MES 鍙栵紝浜旈亾鏍¢獙鍚庢覆鏌撹惤搴擄級銆�",
- "steps": [
- {
- "stage": "鏉ユ枡",
- "action": "鍒拌揣閫氱煡/澶栧崗鍏ュ簱鈫扞QC锛岀粨璁哄洖鍐欐帹杩涘緟鍏ュ簱鎴栬Е鍙戦��璐�",
- "roles": [
- "IQC 璐ㄦ鍛�"
- ]
- },
- {
- "stage": "杩囩▼",
- "action": "鎶ュ伐璐ㄦ宸ュ簭浜у嚭琛屽緟妫�鈫掕川妫�鍛樼嫭绔嬪綍鍏� IPQC锛涘畬鎴愬悗鎸夌墿鏂�+鐩樺彿+鏁伴噺涓�鑷村叧鑱旀姤宸ュ緟妫�琛岋紝鍚堟牸鎷嗚鍏ュ簱銆佷笉鍚堟牸鐢熸垚 NCR",
- "roles": [
- "IPQC 璐ㄦ鍛�"
- ]
- },
- {
- "stage": "鍑鸿揣",
- "action": "閿�鍞嚭搴撴彁浜ゅ悗琛岃浆寰呮娴嬧啋璐ㄦ鍛樼嫭绔嬪綍鍏� OQC锛涘畬鎴愬悗鎸夌墿鏂�+鐩樺彿+鏁伴噺涓�鑷村叧鑱斿嚭搴撳緟妫�琛岋紝鍏ㄩ儴鍚堟牸鍚庡嚭搴撳崟杩涘叆寰呮嫞璐�",
- "roles": [
- "OQC 璐ㄦ鍛�"
- ]
- },
- {
- "stage": "閫�璐�",
- "action": "閫�鏂�/閿�鍞��璐�/鍞悗閫�璐р啋RQC锛岀粨璁哄洖璋冨崟鎹笌鍞悗",
- "roles": [
- "RQC 璐ㄦ鍛�"
- ]
- },
- {
- "stage": "瀵煎叆",
- "action": "IQC/IPQC/OQC 涓夊垪琛ㄥ悇鏀寔 Excel 鎵归噺瀵煎叆(鎸夐挳鍦ㄣ�屾柊澧炪�嶄笌銆屽鍑恒�嶄箣闂达紝绾柊澧炰笉鍋氭洿鏂拌鐩�)锛氫竴琛屼竴寮犲崟锛岀紪鍙风暀绌鸿嚜鍔ㄧ敓鎴愶紝璐ㄦ鏂规鐣欑┖鎸夌墿鏂�+妫�楠岀被鍨嬭嚜鍔ㄥ尮閰嶏紝妫�娴嬩汉鍛樼暀绌哄彇褰撳墠鐧诲綍鐢ㄦ埛锛涚墿鏂�/渚涘簲鍟�/瀹㈡埛/宸ュ崟/宸ヤ綅鎸夌紪鐮佹垨鍚嶇О绮剧‘鍖归厤(IPQC 鐗╂枡鐢卞伐鍗曟帹瀵硷紝妯℃澘涓嶅~)锛屽悎鏍�+涓嶅悎鏍�=妫�娴�/鎺ユ敹鏁伴噺銆両PQC 宸ュ簾+鏂欏簾+鍏朵粬搴熷搧鈮や笉鍚堟牸銆丱QC 瀹㈡埛椤诲湪鏈汉鏁版嵁鏉冮檺鍐咃紱閫愯瀵煎叆閮ㄥ垎鎴愬姛锛屽け璐ヨ杩� failureList 甯﹁鍙蜂笌鍙墽琛屽姩浣滐紝鎴愬姛鍗曚竴寰嬪緟妫�楠�0锛涘悓涓�鎵规暟鎹笉鍙噸澶嶅鍏ワ細鏂囦欢鍐呴噸澶嶈涓庡簱鍐呭凡瀛樺湪鍚屼笟鍔¢敭鍗曟嵁锛圛QC 鐗╂枡+渚涘簲鍟�+渚涘簲鍟嗘壒娆�+鏉ユ枡鏃ユ湡銆両PQC 鐢熶骇宸ュ崟+妫�楠岀被鍨�+宸ヤ綅+妫�娴嬫棩鏈熴�丱QC 鐗╂枡+瀹㈡埛+鎵规鍙�+鍑鸿揣鏃ユ湡锛夊潎鎷掕琛岋紝鎻愮ず鍚淮搴︺�佸弻鏂瑰疄闄呭�间笌銆屽厛鍒犻櫎璇ュ崟鎹啀閲嶈瘯銆嶅姩浣�",
- "roles": [
- "璐ㄦ鍛�",
- "IQC 璐ㄦ鍛�",
- "IPQC 璐ㄦ鍛�",
- "OQC 璐ㄦ鍛�"
- ]
- },
- {
- "stage": "涓嶅悎鏍�",
- "action": "NCR: 寰呰瘎瀹♀啋璇勫鈫掑缃�(閫�璐�/鎶ュ簾/杩斿伐/璁╂鎺ユ敹/闄嶇骇)鈫掑叧闂�",
- "roles": [
- "璐ㄩ噺宸ョ▼甯�"
- ]
- },
- {
- "stage": "鍑轰欢",
- "action": "涓ゆ潯鍑轰欢鍏ュ彛锛氣憼閫氱敤 generate/preview(璋冪敤鏂硅嚜甯︿笂涓嬫枃) 娓叉煋 HTML 骞跺喕缁撴暟鎹揩鐓э紝缂栧彿 QR+鏃ユ湡+4浣嶆祦姘存寜澶╃嫭绔嬶紝preview 鍙覆鏌撲笉钀藉簱涓嶆秷鑰楃紪鍙凤紝regenerate 鐢ㄥ喕缁撳揩鐓ч噸娓蹭笖鏁版嵁涓庣紪鍙蜂笉鍙樺苟浣滃簾宸插綊妗� PDF锛屽鍑� PDF 鐢卞悗绔皟 Chromium 鎵撳嵃瀹炰緥宸插瓨鐨� HTML 鍚庡綊妗i檮浠朵腑蹇冿紱鈶enerate-from-qc 鐢辫川妫�鍗曠洿鎺ュ嚭浠�(鏁版嵁缁� MesQcReportApi 浠� MES 鍙栵紝鍓嶇涓嶆嫾涓婁笅鏂�)锛屽嚭浠跺墠浜旈亾鏍¢獙鎸変笟鍔′紭鍏堢骇鍙姤绗竴澶勶細绫诲瀷闈炴硶/鍗曟嵁涓嶅瓨鍦�/鏈畬鎴愭楠�/鏈~鍒ゅ畾/妯℃澘绫诲瀷涓嶇/鏃犲彲鐢ㄦ楠岄」锛屾姤鍛婂ご鍙﹀甫鍗曟嵁鍘熷垽瀹� qcResult+qcResultText 涓庡紩鎿庡垽瀹氬苟瀛橈紝鍝嶅簲鍥� undecidableCount 寰呭垽瀹氶」鏁颁笌 warnings(鍒嗙粍鏍囬璺宠繃/鎸囨爣宸插垹/鏈綍瀹炴祴鍊�/鏍峰搧瓒�3)锛屽悓涓�寮犲崟鎹彲鍙嶅鍑哄浠�",
- "roles": [
- "璐ㄦ鍛�"
- ]
- },
- {
- "stage": "寤烘ā鏉�",
- "action": "AI 瀵煎叆锛氫笂浼犳棦鏈夋楠屾姤鍛婃枃浠�(鎵弿浠�/鐓х墖銆佺數瀛愮増 PDF銆乄ord/Excel) 鈫� 璇嗗埆鎴愭ā鏉胯崏绋�(涓嶈惤搴�) 鈫� 浜哄伐鍦ㄨ璁″櫒纭璋冩暣鍚庝繚瀛樹负鐗堟湰锛�.doc/.xls 鏃ф牸寮忎笉鏀寔",
- "roles": [
- "璐ㄦ鍛�",
- "璐ㄩ噺宸ョ▼甯�"
- ]
- }
- ]
- },
- {
- "id": "warehouse",
- "name": "浠撳偍娴佺▼",
- "mermaid": "mermaid/06-warehouse-flow.mmd",
- "color": "#7e6bd6",
- "summary": "15 绫诲崟鎹┍鍔ㄥ簱瀛樺彴璐�(鍏厓缁勩�佸洓閲�)鍙樺姩锛屽叏閮ㄧ粡浜嬪姟娴佹按鐣欑棔锛涙敮鎸佽皟鎷ㄥ湪閫斻�佺洏鐐硅皟鏁淬�佹壒娆�/SN 杩芥函銆佸簱瀛樺崰鐢ㄤ笌鍥涚骇鍐荤粨銆佺嚎杈硅櫄鎷熷簱璐熷簱瀛橈紱瀵瑰 WmsStockApi 渚� ERP 鏀跺彂銆�",
- "steps": [
- {
- "stage": "鍏ュ簱",
- "action": "閲囪喘鍏ュ簱/鐢熶骇鍏ュ簱/浜у嚭鍏ュ簱/閫�璐у叆搴�/澶栧崗鍏ュ簱/鏉傞」鍏ュ簱 鈫� IN 浜嬪姟锛屾壒娆℃贩鏀炬牎楠屻�佸洓绾у喕缁撴牎楠�",
- "roles": [
- "浠撶"
- ]
- },
- {
- "stage": "鍑哄簱",
- "action": "閿�鍞嚭搴�/棰嗘枡/娑堣��/澶栧崗鍙戞枡/渚涘簲鍟嗛��璐�/鏉傞」鍑哄簱 鈫� OUT 浜嬪姟锛宑heckFlag 鎺у埗鍙惁璐熷簱瀛�",
- "roles": [
- "浠撶",
- "绯荤粺鑷姩"
- ]
- },
- {
- "stage": "绉诲簱",
- "action": "鍐呴儴/澶栭儴璋冩嫧鎴愬 MOVE 浜嬪姟锛屽湪閫旀暟閲忚窡韪�",
- "roles": [
- "浠撶"
- ]
- },
- {
- "stage": "鐩樼偣",
- "action": "鏂规鈫掍换鍔♀啋鏄庣粏琛屸啋缁撴灉锛岀洏鐩� ADJUST_IN銆佺洏浜� ADJUST_OUT锛屽彲鍐荤粨涓庣洸鐩�",
- "roles": [
- "鐩樼偣鍛�"
- ]
- },
- {
- "stage": "杩芥函",
- "action": "鎵规/SN(uuid)/鏉$爜(18绫�)/瑁呯宓屽鏀拺姝e弽鍚戣拷婧�",
- "roles": [
- "璐ㄩ噺",
- "鍞悗"
- ]
- }
- ]
- },
- {
- "id": "aftersales",
- "name": "鍞悗娴佺▼",
- "mermaid": "mermaid/07-after-sales-flow.mmd",
- "color": "#c78bd6",
- "summary": "宸ュ崟(鍏��+闂鍒ゅ畾) 鈫� 瀹㈡埛璇夋眰/澶勭悊缁撴灉闄勪欢涓庢祦杞褰曠暀鐥� 鈫� 缁翠慨涓夌被鍨嬫垨鐢变粨鍌ㄧ墿娴佸彂璧烽攢鍞��璐�(閫�璐у崟鍒涘缓鍗冲洖鍐欏伐鍗曟祦杞褰�) 鈫� RQC 璐ㄦ/鍏ュ簱/閫�娆句笁鍥炶皟閫愮骇鎺ㄨ繘 鈫� 宸ュ崟瀹岀粨鍏抽棴銆�",
- "steps": [
- {
- "stage": "鍙楃悊",
- "action": "浜哄伐褰曞叆宸ュ崟(鍏宠仈瀹㈡埛/璁㈠崟/鍚堝悓)锛屽~鍐欏鎴疯瘔姹傚弽棣堟弿杩板苟涓婁紶闄勪欢锛屽垱寤烘椂鎸囧畾鐨勫鐞嗕汉鐩存帴杩涘叆澶勭悊涓�",
- "roles": [
- "瀹㈡湇"
- ]
- },
- {
- "stage": "鍒ゅ畾",
- "action": "闂鍒ゅ畾: 涓�鑸�/缁翠慨/閫�璐э紝涓ラ噸搴� 0-3",
- "roles": [
- "鍞悗宸ョ▼甯�"
- ]
- },
- {
- "stage": "澶勭悊",
- "action": "濉啓澶勭悊缁撴灉骞朵笂浼犲鐞嗙粨鏋滈檮浠讹紱鍒涘缓銆佹洿鏂般�佸垽瀹氥�佸畬缁撱�佸綊妗c�佸彇娑堛�佸洖璁垮潎鍐欏叆娴佽浆璁板綍",
- "roles": [
- "鍞悗宸ョ▼甯�"
- ]
- },
- {
- "stage": "缁翠慨",
- "action": "鐜板満/杩斿巶/杩滅▼缁翠慨锛岃垂鐢ㄤ笌缁撴灉璁板綍锛屽畬鎴愯仈鍔ㄥ伐鍗曞畬缁�",
- "roles": [
- "缁翠慨宸ョ▼甯�"
- ]
- },
- {
- "stage": "閫�璐�",
- "action": "鍞悗涓嶅啀鍙戣捣閫�璐х敵璇凤紝鐢变粨鍌ㄧ墿娴佸彂璧烽攢鍞��璐у崟(RQC)鈫掕川妫�/鍏ュ簱鍥炶皟鈫掗��娆惧洖璋冣啋鍏抽棴锛涘垱寤洪��璐у崟鏃舵寜閿�鍞鍗曞尮閰嶆渶杩戜竴寮犳湭鍏抽棴/鏈彇娑堝伐鍗曪紝鍐欏叆銆屼粨鍌ㄩ��璐с�嶆祦杞褰曪紝鑽夌鎴栧鐞嗕腑宸ュ崟鎺ㄨ繘涓哄緟閫�璐�",
- "roles": [
- "浠撳偍",
- "璐ㄦ",
- "璐㈠姟"
- ]
- }
- ]
- },
- {
- "id": "finance",
- "name": "浼氳鏍哥畻娴佺▼",
- "mermaid": "mermaid/12-finance-flow.mmd",
- "color": "#3ec9a7",
- "summary": "浼氳鏍哥畻锛氬嚟璇�/鍒嗗綍/鍊熻捶骞宠 -> 杩囪处 -> 鎬昏处/鏄庣粏璐�/鎶ヨ〃锛涘浐瀹氳祫浜ф姌鏃с�佹棤褰㈣祫浜ф憡閿�銆傞攢鍞噰璐储鍔¢棴鐜細ERP 閿�鍞鍗� + MES 宸插畬鎴愬嚭搴撳崟 -> CRM 寮�绁ㄧ敵璇凤紙缁戝畾璁㈠崟+鍑哄簱鍗曪級-> 瀹℃壒閫氳繃 -> 褰曞叆鍙戠エ骞跺~鍐欏悎鍚屾/棰勪粯娆�/鍒拌揣娆�/楠屾敹娆�/璐ㄤ繚閲戞敹娆捐妭鐐� -> CRM 鍥炴鎸夋牳閿�鏄庣粏鍒嗘憡鍒拌鍗�/鍑哄簱/寮�绁� -> 瀹㈡埛搴旀敹瀵硅处銆佸凡鍙戣揣鏈紑绁ㄣ�佹湭鏍搁攢搴旀敹璐﹂緞銆佷笅鏈堝洖娆捐鍒掞紱鏉ョエ蹇呴』鍚屾椂缁戝畾閲囪喘璁㈠崟涓� MES 閲囪喘鍏ュ簱鍗曪紱鍑瘉鍙叧鑱旀潵婧愬崟鎹紙寮�绁�/鍥炴/鏉ョエ/浠樻锛夈��",
- "steps": [
- {
- "stage": "寤鸿处",
- "action": "缁存姢浼氳绉戠洰 tree(subjectCode 鍞竴锛屽彲寤轰笅绾�)锛岄娆″彲瀵煎叆绾� 68 鏉′竴绾х鐩瀛�",
- "roles": [
- "浼氳"
- ]
- },
- {
- "stage": "璁拌处",
- "action": "褰曞叆鍑瘉(瀛楀彿鐣欑┖鑷姩鐢熸垚)+鍒嗗綍锛屽垎褰曢�愯閫夌鐩苟濉��/璐凤紱鏍¢獙鑷冲皯涓�琛屻�佸�熻捶閮戒笉寰楀悓鏃跺ぇ浜�0銆佸悎璁$浉绛変笖澶т簬0",
- "roles": [
- "浼氳"
- ]
- },
- {
- "stage": "杩囪处",
- "action": "鏈繃璐�0 鈫� post 杩囪处 鈫� 宸茶繃璐�10(涓嶅彲鍐嶄慨鏀�)锛涙湭杩囪处0 鎴� 宸茶繃璐�10 鍧囧彲 cancel 浣滃簾 鈫� 宸蹭綔搴�20",
- "roles": [
- "浼氳",
- "璐㈠姟涓荤"
- ]
- },
- {
- "stage": "鏌ヨ处",
- "action": "鎬昏处鎸夋湡闂撮�愭湀姹囨�汇�佹槑缁嗚处閫愭潯鍒嗗綍骞剁粨杞綑棰濓紝涓よ�呭彧缁熻宸茶繃璐�10鐨勫嚟璇侊紝骞舵敮鎸佸鍑�",
- "roles": [
- "浼氳",
- "璐㈠姟涓荤"
- ]
- },
- {
- "stage": "璧勪骇",
- "action": "鍥哄畾璧勪骇(1鍦ㄧ敤/2闂茬疆/3缁翠慨涓�/4宸叉姤搴�)涓庢棤褰㈣祫浜�(1鍦ㄧ敤/2宸插け鏁�/3宸叉憡閿�瀹�)璁℃彁锛氫紶 ids 鎸夐�変腑璁℃彁锛宨ds 涓虹┖瀵瑰叏閮ㄦ湭鎶ュ簾/鏈け鏁堣祫浜ц鎻愪竴涓湀",
- "roles": [
- "璧勪骇浼氳"
- ]
- },
- {
- "stage": "鎶ヨ〃",
- "action": "鐪嬫澘姹囨�昏祫浜т笌鍑瘉鏃剁偣鏁� + 缁� ErpFinanceStatisticsApi 鍙� ERP 宸插鏍告敹璐т粯娆句笌璐攢閲戦锛岃緭鍑烘湀搴︽敹鏀秼鍔�",
- "roles": [
- "璐㈠姟涓荤",
- "绠$悊灞�"
- ]
- },
- {
- "stage": "鏉ョエ",
- "action": "閫夋嫨閲囪喘璁㈠崟 -> 閫夋嫨璇ヨ鍗曚笅宸插畬鎴� MES 閲囪喘鍏ュ簱鍗� -> 淇濆瓨鏉ョエ锛坕tem_receipt_id/item_receipt_code锛�",
- "roles": [
- "閲囪喘",
- "璐㈠姟"
- ]
- },
- {
- "stage": "寮�绁ㄧ敵璇�",
- "action": "閫夋嫨鍚堝悓銆侀攢鍞鍗曘�佽璁㈠崟涓嬪凡瀹屾垚鍑哄簱鍗曪紝濉啓寮�绁ㄩ噾棰濆悗鎻愪氦 BPM 瀹℃壒",
- "roles": [
- "閿�鍞�",
- "璐㈠姟"
- ]
- },
- {
- "stage": "褰曞叆鍙戠エ",
- "action": "瀹℃壒閫氳繃鍚庡綍鍏ュ彂绁ㄥ彿鐮併�佹棩鏈熴�侀檮浠讹紝骞舵寜閿�鍞鍗曞~鍐欏悎鍚屾/棰勪粯娆�/鍒拌揣娆�/楠屾敹娆�/璐ㄤ繚閲戝強鍚勮嚜鏃堕棿鑺傜偣",
- "roles": [
- "璐㈠姟"
- ]
- },
- {
- "stage": "鍥炴鏍搁攢",
- "action": "鍥炴鍗曢�氳繃 items 鎶婇噾棰濇牳閿�鍒伴攢鍞鍗�/閿�鍞嚭搴�/寮�绁紝鏄庣粏鍚堣蹇呴』绛変簬鍥炴閲戦锛涘鏍搁�氳繃鍥炲啓鍥炴璁″垝瀹為檯閲戦涓庣姸鎬�",
- "roles": [
- "璐㈠姟"
- ]
- },
- {
- "stage": "瀵硅处鎶ヨ〃",
- "action": "鎸夊鎴锋眹鎬昏鍗曘�佸嚭搴撱�佸紑绁ㄣ�佸洖娆撅紝杈撳嚭鏈牳閿�搴旀敹銆佸凡鍙戣揣鏈紑绁ㄣ�佽处榫勩�佷笅鏈堝洖娆捐鍒掍笌鏈堝害瓒嬪娍",
- "roles": [
- "璐㈠姟",
- "閿�鍞�"
- ]
- },
- {
- "stage": "鍏ヨ处",
- "action": "璁拌处鍑瘉濉啓 sourceType/sourceId/sourceNo 鍏宠仈寮�绁ㄣ�佸洖娆俱�佹潵绁ㄣ�佷粯娆剧瓑鏉ユ簮鍗曟嵁",
- "roles": [
- "璐㈠姟"
- ]
- }
- ]
- },
- {
- "id": "ai",
- "name": "AI 涓氬姟娴佺▼",
- "mermaid": "mermaid/11-ai-business-flow.mmd",
- "color": "#56c8d8",
- "summary": "缁熶竴妯″紡锛氫笟鍔′晶鏀堕泦涓婁笅鏂�(蹇呰鏃惰皟 MDM/SRM/CRM API 鍙栧悕绉�)鈫掔粍瑁� Prompt鈫抍hat/chatWithImage鈫掕В鏋� JSON鈫掑墠绔濉垨寤鸿锛涙棤 Function Calling锛汻AG 鐭ヨ瘑搴撳凡寤烘垚浣嗘殏鏃犱笟鍔℃秷璐广�傛櫤鑳戒綋鐗╂枡瀵煎叆涓鸿鍒�+Java 棰勬閾捐矾锛岀粡浜哄伐纭鍚庡箓绛夋彁浜ゃ��",
- "steps": [
- {
- "stage": "褰曞叆鎻愭晥",
- "action": "鍙戠エ OCR(鍥剧墖澶氭ā鎬�/PDF鏂囨湰)銆佹姤浠峰崟 OCR 鈫� 缁撴瀯鍖栭濉�",
- "roles": [
- "閲囪喘鍛�",
- "閿�鍞�"
- ]
- },
- {
- "stage": "涓绘暟鎹鍏�",
- "action": "涓婁紶鐗╂枡 CSV/XLSX 鈫� Python 瑙f瀽鍊欓�� 鈫� Java 鍙棰勬鍒嗙被/鍗曚綅/閲嶅缂栫爜 鈫� 浜哄伐淇纭 鈫� 骞傜瓑鎻愪氦 鈫� 閫愯鍥炴墽锛涘彧鏂板缓銆佷笉鏇存柊銆佷笉鍚屾 MES",
- "roles": [
- "鐗╂枡绠$悊鍛�"
- ]
- },
- {
- "stage": "杈呭姪鍒ゅ畾",
- "action": "璐ㄦ鍗�+鎸囨爣+缂洪櫡 鈫� 寤鸿鍚堟牸/鐗归噰/閫�璐�/鎶ュ簾+鐞嗙敱",
- "roles": [
- "璐ㄦ鍛�"
- ]
- },
- {
- "stage": "鍐崇瓥棰勬祴",
- "action": "缂烘枡/鐢熶骇鏃堕暱/鐢熶骇椋庨櫓/浜や粯鍥涚被棰勬祴渚涜鍒掓帓浜у弬鑰�",
- "roles": [
- "璁″垝鍛�"
- ]
- },
- {
- "stage": "妯℃澘璇嗗埆",
- "action": "涓婁紶鏃㈡湁妫�楠屾姤鍛婃枃浠�(鎵弿浠�/鐓х墖銆佺數瀛愮増 PDF銆乄ord/Excel) 鈫� 鍒嗛�氶亾鎶藉彇(鏈夋枃鏈眰璧版枃鏈�佹壂鎻忕増閫愰〉杞浘) 鈫� 澶фā鍨嬫寜鍓嶇涓婁紶鐨勭粍浠舵竻鍗曚骇鍑烘墎骞崇粍浠惰崏绋� 鈫� 浜哄伐鍦ㄨ璁″櫒纭鍚庝繚瀛樹负妯℃澘鐗堟湰",
- "roles": [
- "璐ㄦ鍛�",
- "璐ㄩ噺宸ョ▼甯�"
- ]
- },
- {
- "stage": "鐭ヨ瘑妫�绱�",
- "action": "鏂囨。鈫掑垏鐗団啋Milvus 鍚戦噺鈫掓绱㈡帴鍙�(棰勭暀)",
- "roles": [
- "鈥�"
- ]
- }
- ]
- }
- ]
+ ]
}
\ No newline at end of file
diff --git a/docs/project-business/data/modules.json b/docs/project-business/data/modules.json
index 0733404..1acca3e 100644
--- a/docs/project-business/data/modules.json
+++ b/docs/project-business/data/modules.json
@@ -468,47 +468,40 @@
},
{
"key": "dv",
- "name": "璁惧涓庡伐瑁呮帓鐝�",
+ "name": "璁惧涓庡伐瑁�",
"color": "#59a8b8",
- "tag": "MES-DV/TM/CAL",
+ "tag": "MES-DV/TM",
"flow": null,
"positioning": "璁惧璧勪骇鍋ュ悍涓庣敓浜ц祫婧愪繚闅�",
- "problem": "璁惧鐐规淇濆吇缁翠慨鍙墽琛屻�佸伐瑁呯姸鎬佸彲鎺с�佺彮缁勬帓鐝湁渚濇嵁",
+ "problem": "璁惧鐐规淇濆吇缁翠慨鍙墽琛屻�佸伐瑁呯姸鎬佸彲鎺�",
"features": [
"璁惧鍙拌处(鍋滄満/鐢熶骇涓�/淇濆吇涓�)",
"鐐规路淇濆吇鏂规涓庤褰�",
"缁翠慨宸ュ崟(鑽夌鈫掔淮淇啋寰呴獙鏀垛啋宸茬‘璁�)",
"璁¢噺鍣ㄥ叿妫�瀹�",
- "宸ヨ澶瑰叿(鍦ㄥ簱/棰嗙敤/缁翠慨/鎶ュ簾)",
- "鐝粍路鐝路鎺掔彮璁″垝路鑺傚亣鏃�"
+ "宸ヨ澶瑰叿(鍦ㄥ簱/棰嗙敤/缁翠慨/鎶ュ簾)"
],
"objects": [
"璁惧",
"鐐规璁板綍",
"缁翠慨宸ュ崟",
- "宸ヨ",
- "鎺掔彮璁″垝"
+ "宸ヨ"
],
"roles": [
"璁惧鍛�",
"缁翠慨宸�",
- "宸ヨ绠$悊鍛�",
- "鎺掔彮鍛�"
+ "宸ヨ绠$悊鍛�"
],
"upstream": [],
"downstream": [
- "鐢熶骇(AI 椋庨櫓棰勬祴娑堣垂璁惧鏁版嵁)",
- "钖叕(鎺掔彮宸ユ椂)"
+ "鐢熶骇(AI 椋庨櫓棰勬祴娑堣垂璁惧鏁版嵁)"
],
"coreTables": [
"mes_dv_machinery",
"mes_dv_check_plan",
"mes_dv_check_record",
"mes_dv_repair",
- "mes_tm_tool",
- "mes_cal_plan",
- "mes_cal_team",
- "mes_cal_shift"
+ "mes_tm_tool"
]
},
{
@@ -574,6 +567,7 @@
"绂昏亴鍒版湡鑷姩鎶婂憳宸ョ姸鎬佹敼涓虹鑱屽苟鍋滅敤绯荤粺璐﹀彿",
"鑰冨嫟(绉诲姩绔垜鐨勮�冨嫟鐘舵�伮锋墦鍗÷疯鍒櫬锋帓鐝疯ˉ鍗″鎵孤锋湀搴︽眹鎬�)",
"钖叕(搴斿彂-绀句繚鍏Н閲�-涓◣-璇峰亣鎵f路1.5/2/3鍊嶅姞鐝垂路鍙戞斁鍙拌处)",
+ "绀句繚鍏Н閲戞。妗堟寜閮ㄩ棬缁存姢(閮ㄩ棬涓嬪憳宸ュ叡鐢ㄦ渶鏂扮敓鏁堟。妗�)",
"鍩硅璇佷功(SQL鍏堣寰呭疄鐜�)"
],
"objects": [
@@ -582,6 +576,7 @@
"绂昏亴鐢宠",
"浜ゆ帴鏄犲皠",
"鑰冨嫟璁板綍",
+ "閮ㄩ棬绀句繚妗f",
"钖叕鏍哥畻"
],
"roles": [
@@ -601,7 +596,8 @@
"hrm_user_handover",
"hrm_attendance_record",
"hrm_salary_calculation",
- "hrm_salary_payment"
+ "hrm_salary_payment",
+ "hrm_employee_social_security"
]
},
{
diff --git a/docs/project-business/data/objects.json b/docs/project-business/data/objects.json
index 27fd7a8..7270654 100644
--- a/docs/project-business/data/objects.json
+++ b/docs/project-business/data/objects.json
@@ -1,822 +1,891 @@
{
- "objects": [
- {
- "name": "鐗╂枡",
- "module": "鍩虹涓绘暟鎹�",
- "table": "mdm_item",
- "doc": "MDM 鏉冨▉鐗╂枡/浜у搧/鍗婃垚鍝佹。妗堬紝鍚� SKU銆佹壒娆″睘鎬с�佷环鏍笺�佸畨鍏ㄥ簱瀛�",
- "upstream": [
- "MES 鐗╂枡鍙嶅悜鍚屾"
- ],
- "downstream": [
- "鎶ヤ环鍗�",
- "閿�鍞鍗�",
- "閲囪喘璁㈠崟",
- "宸ュ崟BOM",
- "搴撳瓨鍙拌处"
- ],
- "keywords": "鐗╂枡 浜у搧 鍘熸潗鏂� item"
- },
- {
- "name": "浠撳簱",
- "module": "鍩虹涓绘暟鎹�",
- "table": "mdm_warehouse",
- "doc": "浠撳簱涓绘暟鎹紝type: 1鍘熸枡/2鎴愬搧/3鍗婃垚鍝�/4绾胯竟锛汳ES 鑷湁 mes_wm_warehouse 鎵胯浇搴撳尯搴撲綅",
- "upstream": [],
- "downstream": [
- "搴撳瓨鍙拌处",
- "鍑哄叆搴撳崟鎹�"
- ],
- "keywords": "浠撳簱 warehouse 鍘熸枡浠� 鎴愬搧浠� 绾胯竟浠�"
- },
- {
- "name": "瀹㈡埛",
- "module": "閿�鍞鐞�",
- "table": "crm_customer",
- "doc": "瀹㈡埛涓绘。锛屽叕娴锋睜/閿佸畾/鎴愪氦鐘舵�侊紝璐熻矗浜烘暟鎹潈闄愶紱瀹㈡埛鍒楄〃鎸夈�屽鏍搁�氳繃銆嶅悎鍚屽疄鏃剁粺璁″凡绛捐鍚堝悓浠芥暟涓庨噾棰濆悎璁�",
- "upstream": [
- "绾跨储"
- ],
- "downstream": [
- "鑱旂郴浜�",
- "鍟嗘満",
- "鎶ヤ环鍗�",
- "鍚堝悓",
- "鍞悗宸ュ崟",
- "鏀舵鍗�"
- ],
- "keywords": "瀹㈡埛 customer 鍏捣"
- },
- {
- "name": "绾跨储",
- "module": "閿�鍞鐞�",
- "table": "crm_clue",
- "doc": "鍘熷閿�鍞嚎绱紝浠呬竴娆¤浆鍖栦负瀹㈡埛",
- "upstream": [],
- "downstream": [
- "瀹㈡埛"
- ],
- "keywords": "绾跨储 clue"
- },
- {
- "name": "鑱旂郴浜�",
- "module": "閿�鍞鐞�",
- "table": "crm_contact",
- "doc": "瀹㈡埛涓嬭仈绯讳汉锛屼笌鍟嗘満澶氬澶�",
- "upstream": [
- "瀹㈡埛"
- ],
- "downstream": [
- "鍟嗘満"
- ],
- "keywords": "鑱旂郴浜� contact"
- },
- {
- "name": "鍟嗘満",
- "module": "閿�鍞鐞�",
- "table": "crm_business",
- "doc": "閿�鍞満浼氾紝DB 閰嶇疆寮忛樁娈垫帹杩涳紝缁撴潫鎬�: 璧�/杈�/鏃犳晥",
- "upstream": [
- "瀹㈡埛"
- ],
- "downstream": [
- "鎶ヤ环鍗�",
- "鍚堝悓"
- ],
- "keywords": "鍟嗘満 business 璧㈠崟 杈撳崟 闃舵"
- },
- {
- "name": "鎶ヤ环鍗�",
- "module": "閿�鍞鐞�",
- "table": "crm_sale_quotation",
- "doc": "QT缂栧彿锛岄�� MDM 鐗╂枡鎶ヤ环锛孉I OCR 褰曞叆锛岃崏绋库啋宸茶浆鍚堝悓",
- "upstream": [
- "鍟嗘満"
- ],
- "downstream": [
- "鍚堝悓"
- ],
- "keywords": "鎶ヤ环 quotation QT"
- },
- {
- "name": "鍚堝悓",
- "module": "閿�鍞鐞�",
- "table": "crm_contract",
- "doc": "HT缂栧彿锛孊PM 瀹℃壒(0鑽夌/10瀹℃壒涓�/20閫氳繃/30椹冲洖/40鍙栨秷/50浣滃簾)锛岄�氳繃鍚庡彲鐢熸垚閿�鍞鍗曪紱鏀寔 Excel 瀵煎叆锛堜竴鍚堝悓澶氫骇鍝佹槑缁嗚銆佸悎骞跺崟鍏冩牸鑷姩鎷夊钩锛屽鎴蜂笌鐗╂枡鎸夊悕绉�/缂栫爜鏍¢獙锛夛紱浜у搧鏄庣粏甯﹀嚭鐗╂枡鍚嶇О/缂栫爜/鏉$爜/瑙勬牸鍨嬪彿/璁¢噺鍗曚綅锛涘垹闄ゅ悎鍚屾椂杩炲甫鍒犻櫎浜у搧鏄庣粏锛屼笉鐣欏鍎挎暟鎹�",
- "upstream": [
- "鎶ヤ环鍗�"
- ],
- "downstream": [
- "閿�鍞鍗�",
- "鍥炴璁″垝",
- "寮�绁�"
- ],
- "keywords": "鍚堝悓 contract 瀹℃壒 瀵煎叆"
- },
- {
- "name": "鍙戠エ",
- "module": "閿�鍞鐞�",
- "table": "crm_invoice",
- "doc": "KP缂栧彿锛堝彲鐣欑┖鑷姩鐢熸垚銆佺郴缁熷唴鍞竴锛夛紝BPM 瀹℃壒锛岀疮璁″紑绁ㄢ墹鍚堝悓棰濓紝闄勪欢蹇呬紶锛涘紑绁ㄧ敵璇烽』缁戝畾 ERP 閿�鍞鍗曚笌 MES 閿�鍞嚭搴撳崟锛屽鎵归�氳繃鍚庤繘鍏ュ綍鍏ュ彂绁ㄩ樁娈�(entry_status 0寰呭綍鍏モ啋10宸插綍鍏�)锛屽綍鍏ユ椂濉啓鍙戠エ鍙风爜/鏃ユ湡/闄勪欢骞惰缃悎鍚屾/棰勪粯娆�/鍒拌揣娆�/楠屾敹娆�/璐ㄤ繚閲戞敹娆捐妭鐐癸紱鏀寔 Excel 瀵煎叆锛堜粎鏂板涓嶆洿鏂帮紝鍚堝悓椤诲鏍搁�氳繃涓旀湰娆¢噾棰濃墹鍚堝悓鍓╀綑鍙紑绁ㄩ锛涘悓涓�鎵规暟鎹笉鍙噸澶嶅鍏モ�斺�斿悓鍚堝悓涓嬪彂绁ㄥ彿鐮佺浉鍚屻�佹垨鍙戠エ鍙风爜鐣欑┖鏃跺紑绁ㄩ噾棰�+鍙戠エ鎶ご+寮�绁ㄦ棩鏈熺浉鍚屽嵆鍒ら噸澶嶏紝鏂囦欢鍐呴噸澶嶈涓庡簱鍐呭凡鏈夊崟閮芥嫆璇ヨ骞跺洖鏄剧淮搴︿笌瀹為檯鍊硷級",
- "upstream": [
- "鍚堝悓",
- "閿�鍞鍗�",
- "閿�鍞嚭搴撳崟"
- ],
- "downstream": [
- "鍥炴",
- "鍥炴璁″垝",
- "璁拌处鍑瘉"
- ],
- "keywords": "寮�绁� 鍙戠エ invoice 瀵煎叆 鍘婚噸 寮�绁ㄧ敵璇� 褰曞叆鍙戠エ 鍑哄簱鍗�"
- },
- {
- "name": "鍥炴",
- "module": "閿�鍞鐞�",
- "table": "crm_receivable",
- "doc": "HK缂栧彿锛屽垱寤哄嵆瀹℃壒涓�(鎵嬪姩瀹℃牳)锛屽己鍒跺厛寮�绁紝閲戦鍙屾牎楠岋紱鏂板/缂栬緫鍙甫鏍搁攢鏄庣粏 items(20閿�鍞鍗�/21閿�鍞嚭搴�/23寮�绁�)锛屾槑缁嗗悎璁″繀椤荤瓑浜庡洖娆鹃噾棰濓紝瀹℃牳閫氳繃鍚庡洖鍐欏洖娆捐鍒掑凡鍥炴棰�/瀹為檯鍥炴鏃堕棿/鐘舵��(0鏈洖娆�10閮ㄥ垎鍥炴20宸插洖娓�)",
- "upstream": [
- "鍚堝悓",
- "鍙戠エ",
- "閿�鍞鍗�",
- "閿�鍞嚭搴撳崟"
- ],
- "downstream": [
- "鏀舵鍗�(鍏宠仈)",
- "鍥炴鏍搁攢鏄庣粏",
- "鍥炴璁″垝",
- "璁拌处鍑瘉"
- ],
- "keywords": "鍥炴 鏀舵璁″垝 receivable 鏍搁攢"
- },
- {
- "name": "鍥炴鏍搁攢鏄庣粏",
- "module": "閿�鍞鐞�",
- "table": "crm_receivable_item",
- "doc": "姣忚鎶婂洖娆鹃噾棰濇牳閿�鍒颁竴寮犱笟鍔″崟鎹細biz_type 20閿�鍞鍗�/21閿�鍞嚭搴�/23寮�绁紝biz_no銆佸崟鎹噾棰濄�佸凡鏍搁攢閲戦鐢卞悗绔寜 biz_id 鍥炲~锛涙瘡琛屾牳閿�棰濅笉寰楄秴杩囪鍗曟嵁鍓╀綑搴旀敹锛涗笉浼� items 涓斿甫 invoice_id 鏃惰嚜鍔ㄧ敓鎴愪竴鏉″紑绁ㄦ牳閿�琛�",
- "upstream": [
- "鍥炴",
- "閿�鍞鍗�",
- "閿�鍞嚭搴撳崟",
- "鍙戠エ"
- ],
- "downstream": [
- "瀹㈡埛搴旀敹瀵硅处",
- "鏈牳閿�搴旀敹鎶ヨ〃"
- ],
- "keywords": "鏍搁攢 鏍搁攢鏄庣粏 write off item receivable_item"
- },
- {
- "name": "閿�鍞洰鏍�",
- "module": "閿�鍞鐞�",
- "table": "crm_sales_target",
- "doc": "骞�/瀛�/鏈埫椾釜浜�/閮ㄩ棬/浜у搧缁村害鐨勫悎鍚屽洖娆剧瓑鐩爣",
- "upstream": [],
- "downstream": [
- "涓氱哗缁熻"
- ],
- "keywords": "鐩爣 target 涓氱哗"
- },
- {
- "name": "渚涘簲鍟�",
- "module": "渚涘簲鍟嗙鐞�",
- "table": "srm_supplier",
- "doc": "渚涘簲鍟嗘。妗堬細鎵х収/绋庡彿锛涘涓仈绯讳汉(srm_supplier_contact)涓庡涓摱琛岃处鎴�(srm_supplier_bank路鍚摱琛岃鍙�)锛屼富琛ㄤ繚鐣欓粯璁よ仈绯讳汉/榛樿閾惰瀛楁锛孍RP 涓� MES 鍏辩敤",
- "upstream": [
- "鎵嬪伐寤烘。/Excel 瀵煎叆"
- ],
- "downstream": [
- "璇环姣斾环",
- "鎶曟爣淇濊瘉閲�",
- "閲囪喘璁㈠崟",
- "鍒拌揣閫氱煡",
- "渚涘簲鍟嗛��璐�",
- "渚涘簲鍟嗗線鏉�"
- ],
- "keywords": "渚涘簲鍟� supplier vendor 鑱旂郴浜� 寮�鎴疯 閾惰琛屽彿"
- },
- {
- "name": "璇环姣斾环",
- "module": "渚涘簲鍟嗙鐞�",
- "table": "srm_inquiry",
- "doc": "XJ缂栧彿锛岃崏绋�0鈫掑凡杞鍗�20鈫掑凡鍙栨秷30(10璇环涓负鍘嗗彶鐘舵��)锛涙柊澧�/缂栬緫鏃朵竴骞跺綍鍏ヤ骇鍝佽脳鍙備笌渚涘簲鍟嗘姤浠�(srm_inquiry_quote)骞堕�夊畾姣忎釜浜у搧鐨勪腑鏍囦緵搴斿晢锛屾棤闇�鍗曠嫭鐨勬姤浠�/姣斾环姝ラ锛岀‘璁ゅ悗鎸変腑鏍囦緵搴斿晢鎷嗗垎鐢熸垚閲囪喘璁㈠崟鑽夌骞惰褰� srm_inquiry_order",
- "upstream": [
- "渚涘簲鍟�",
- "涓绘暟鎹�(鐗╂枡)"
- ],
- "downstream": [
- "閲囪喘璁㈠崟(鑽夌)"
- ],
- "keywords": "璇环 姣斾环 鎶ヤ环 涓爣 inquiry quote"
- },
- {
- "name": "鎶曟爣淇濊瘉閲�",
- "module": "閿�鍞鐞�",
- "table": "crm_bid_bond",
- "doc": "BZ缂栧彿鍙拌处锛屾寜瀹㈡埛(鎷涙爣鏂�)鐧昏鎶曟爣淇濊瘉閲戯細椤圭洰鍚嶇О/鎷涙爣缂栧彿/淇濊瘉閲戦噾棰�/缂寸撼鏃ユ湡锛屽彲鍏宠仈璇ュ鎴峰凡瀹℃牳鐨勯攢鍞鍗�(閿�鍞彴璐︼紝鍥炲~璁㈠崟鍙蜂笌璁㈠崟閲戦)锛涗腑鏍囩粨鏋�(0寰呭紑鏍�1宸蹭腑鏍�2鏈腑鏍�)锛屾湭涓爣璺熻釜閫�鍥炵姸鎬�(0鏈��1閮ㄥ垎2宸查��3鏃犻渶閫�)/閫�鍥為噾棰�/閫�鍥炴棩鏈燂紱閫夐攢鍞鍗曡嚜鍔ㄧ疆涓哄凡涓爣涓斾笉鍙笌鏈腑鏍囧苟瀛�",
- "upstream": [
- "瀹㈡埛",
- "閿�鍞鍗�(閿�鍞彴璐�)"
- ],
- "downstream": [
- "瀹㈡埛寰�鏉�/搴旀敹瀵硅处(鍙傝��)"
- ],
- "keywords": "鎶曟爣淇濊瘉閲� 涓爣 鏈腑鏍� 閫�鍥� 閫�娆� 鎷涙爣 bid bond"
- },
- {
- "name": "閲囪喘鐢宠",
- "module": "杩涢攢瀛�",
- "table": "erp_purchase_request",
- "doc": "CGSQ缂栧彿锛孊PM 瀹℃壒锛岄�氳繃鍚庢湁渚涘簲鍟嗚嚜鍔ㄧ敓鎴愯鍗�",
- "upstream": [
- "鐢熶骇缂哄彛(浜哄伐)"
- ],
- "downstream": [
- "閲囪喘璁㈠崟"
- ],
- "keywords": "閲囪喘鐢宠 璇疯喘 request"
- },
- {
- "name": "閲囪喘璁㈠崟",
- "module": "杩涢攢瀛�",
- "table": "erp_purchase_order",
- "doc": "鑿滃崟鍚嶃�岄噰璐彴璐︺�嶏紝CGDD缂栧彿锛孊PM 瀹℃壒(鑽夌0鈫掑鎵逛腑15鈫掑凡瀹℃牳20)锛屽叆搴撶姸鎬�:鏈�0閮ㄥ垎1鍏ㄩ儴2锛涜〃澶村惈閲囪喘绫诲瀷(鐢熶骇/鍔炲叕鐢ㄥ搧/鍏朵粬)銆佸悎鍚屽彿(鎵嬪伐杈撳叆涓嶈嚜鍔ㄧ敓鎴�)銆侀」鐩悕绉般�佷粯娆炬棩鏈�(蹇呭~锛岃秴30澶╄处鏈熸爣绾�)銆佷粯娆炬柟寮�(鐢垫眹/姹囩エ/鐜伴噾/鎵嬫満鏀粯)锛涙槑缁嗕骇鍝佺紪鍙峰揩鐓� MDM 鐗╂枡缂栫爜锛涙潵婧愬彲涓洪噰璐敵璇枫�佽浠锋瘮浠风‘璁ょ敓鎴愮殑鑽夌鎴栭攢鍞鍗�/鐢熶骇宸ュ崟(鏉ユ簮鍗曞彿鍥炴函)锛涘崟浠蜂负鍚◣鍗曚环锛屼环绋庡悎璁�=鍗曚环脳鏁伴噺锛岀◣棰濅粠鍚◣閲戦涓弽绠�(涓嶅啀棰濆鍔犵◣)",
- "upstream": [
- "閲囪喘鐢宠",
- "璇环姣斾环(纭涓爣)"
- ],
- "downstream": [
- "鍒拌揣閫氱煡",
- "閲囪喘鏉ョエ",
- "渚涘簲鍟嗛��璐�(绾︽潫鐗╂枡)",
- "渚涘簲鍟嗗線鏉�"
- ],
- "keywords": "閲囪喘璁㈠崟 purchase"
- },
- {
- "name": "閲囪喘鏉ョエ",
- "module": "杩涢攢瀛�",
- "table": "erp_purchase_invoice",
- "doc": "FPD缂栧彿锛孉I OCR 棰勫~锛岀疮璁♀墹璁㈠崟鎬讳环锛屼粯娆惧崟鐨勫墠缃紱蹇呴』鍚屾椂缁戝畾閲囪喘璁㈠崟涓� MES 閲囪喘鍏ュ簱鍗�(item_receipt_id)锛屾寜璁㈠崟涓庡叆搴撳崟涓ゅ眰鍓╀綑鍙潵绁ㄩ搴︽牎楠岋紱渚涘簲鍟嗗線鏉ュ彸渚у睍绀哄紑绁ㄩ噾棰�/宸蹭粯/鍓╀綑搴斾粯",
- "upstream": [
- "閲囪喘璁㈠崟",
- "MES 閲囪喘鍏ュ簱鍗�"
- ],
- "downstream": [
- "浠樻鍗�",
- "渚涘簲鍟嗗線鏉�",
- "璁拌处鍑瘉"
- ],
- "keywords": "鏉ョエ 鍙戠エ 閲囪喘鍙戠エ 鍏ュ簱鍗�"
- },
- {
- "name": "浠樻鍗�",
- "module": "璐㈠姟",
- "table": "erp_finance_payment",
- "doc": "FKD缂栧彿锛屽繀椤诲叧鑱旀潵绁�+闄勪欢锛岀疮璁♀墹鏉ョエ閲戦锛孊PM 瀹℃壒",
- "upstream": [
- "閲囪喘鏉ョエ"
- ],
- "downstream": [
- "缁撶畻璐︽埛",
- "渚涘簲鍟嗗線鏉�"
- ],
- "keywords": "浠樻 搴斾粯 payment"
- },
- {
- "name": "渚涘簲鍟嗗線鏉�",
- "module": "杩涢攢瀛�",
- "table": "鏃犵嫭绔嬭〃(鑱氬悎瑙嗗浘)",
- "doc": "鎸変緵搴斿晢+鏃堕棿鑼冨洿鑱氬悎閲囪喘璁㈠崟/鏉ョエ/浠樻锛氭眹鎬荤疮璁¢噰璐銆佺疮璁″紑绁ㄩ銆佺疮璁′粯娆鹃銆佹湭浠樹綑棰濓紱宸︿晶璁㈠崟琛屽惈宸插紑绁�/鏈紑绁ㄩ噾棰濓紝鍙充晶鏉ョエ琛屽惈寮�绁ㄩ噾棰�/宸蹭粯/鍓╀綑搴斾粯",
- "upstream": [
- "閲囪喘璁㈠崟",
- "閲囪喘鏉ョエ",
- "浠樻鍗�"
- ],
- "downstream": [],
- "keywords": "渚涘簲鍟嗗線鏉� 瀵硅处 寮�绁ㄩ噾棰� 搴斾粯 statement"
- },
- {
- "name": "鏀舵鍗�",
- "module": "璐㈠姟",
- "table": "erp_finance_receipt",
- "doc": "SKD缂栧彿锛屽叧鑱� CRM 瀹㈡埛鏍¢獙锛屾棤 BPM(鎵嬪姩瀹℃牳)",
- "upstream": [
- "閿�鍞�(寮卞叧鑱�)"
- ],
- "downstream": [
- "缁撶畻璐︽埛"
- ],
- "keywords": "鏀舵 搴旀敹 receipt"
- },
- {
- "name": "浼氳绉戠洰",
- "module": "浼氳鏍哥畻",
- "table": "fin_account_subject",
- "doc": "绉戠洰鏍戯紝parent_id 鑷叧鑱旓紱绉戠洰绫诲瀷1璧勪骇2璐熷��3鏉冪泭4鎴愭湰5鎹熺泭锛屼綑棰濇柟鍚�1鍊�2璐凤紝鐘舵��0鍚敤1绂佺敤锛涜处琛ㄤ笌鍒嗗綍缁熶竴鎸� subject_code 鍙栨暟",
- "upstream": [
- "浼氳绉戠洰绉嶅瓙绾�68鏉′竴绾х鐩�"
- ],
- "downstream": [
- "璁拌处鍑瘉鍒嗗綍",
- "鎬昏处",
- "鏄庣粏璐�"
- ],
- "keywords": "浼氳绉戠洰 绉戠洰 subject account 璧勪骇绫� 璐熷�虹被 鎹熺泭绫�"
- },
- {
- "name": "璁拌处鍑瘉",
- "module": "浼氳鏍哥畻",
- "table": "fin_voucher",
- "doc": "鍑瘉瀛楀彿鍙暀绌虹敱鍚庣鑷姩鐢熸垚锛涚姸鎬� 鏈繃璐�0/宸茶繃璐�10/宸蹭綔搴�20锛涘凡杩囪处涓嶅彲鏀癸紝鏈繃璐︿笌宸茶繃璐﹀潎鍙綔搴燂紝鏈繃璐︿笌宸蹭綔搴熷彲鍒犻櫎锛涘彲閫氳繃 source_type/source_id/source_no 鍏宠仈寮�绁�/鍥炴/鏉ョエ/浠樻绛夋潵婧愬崟鎹苟鏀寔鎸夋潵婧愬崟鍙锋绱紱闄勪欢鎸� recordType=fin_voucher 鎸傜郴缁熼檮浠朵腑蹇�",
- "upstream": [
- "浼氳绉戠洰",
- "寮�绁�",
- "鍥炴",
- "閲囪喘鏉ョエ",
- "浠樻鍗�"
- ],
- "downstream": [
- "鎬昏处",
- "鏄庣粏璐�",
- "璐㈠姟鎶ヨ〃鐪嬫澘"
- ],
- "keywords": "璁拌处鍑瘉 鍑瘉 voucher 杩囪处 浣滃簾 鍊熻捶骞宠 "
- },
- {
- "name": "鍑瘉鍒嗗綍",
- "module": "浼氳鏍哥畻",
- "table": "fin_voucher_entry",
- "doc": "鍑瘉涓嬮�愯鍒嗗綍锛氱鐩紪鐮�+鍊�/璐烽噾棰�+杈呭姪鏍哥畻(1瀹㈡埛2渚涘簲鍟�3閮ㄩ棬4鍛樺伐5椤圭洰)锛涗竴琛屼笉鍙�熻捶鍚屾椂澶т簬0锛屽叏琛ㄥ�熻捶鍚堣蹇呴』鐩哥瓑涓斿ぇ浜�0",
- "upstream": [
- "璁拌处鍑瘉",
- "浼氳绉戠洰"
- ],
- "downstream": [
- "鎬昏处",
- "鏄庣粏璐�"
- ],
- "keywords": "鍑瘉鍒嗗綍 鍒嗗綍 entry 鍊熸柟 璐锋柟 杈呭姪鏍哥畻"
- },
- {
- "name": "鍥哄畾璧勪骇",
- "module": "浼氳鏍哥畻",
- "table": "fin_fixed_asset",
- "doc": "璧勪骇鍗$墖锛岀姸鎬� 1鍦ㄧ敤/2闂茬疆/3缁翠慨涓�/4宸叉姤搴燂紱鏈堟姌鏃ч=(鍘熷�济�(1-娈嬪�肩巼))梅(骞撮檺脳12)锛岀疮璁℃姌鏃т笌鍑�鍊肩敱璁℃彁绱姞锛屼笉鎺ユ敹鍓嶇浼犲��",
- "upstream": [],
- "downstream": [
- "璐㈠姟鎶ヨ〃鐪嬫澘",
- "鎬昏处"
- ],
- "keywords": "鍥哄畾璧勪骇 鎶樻棫 璧勪骇鍗$墖 fixed asset 娈嬪�肩巼"
- },
- {
- "name": "鏃犲舰璧勪骇",
- "module": "浼氳鏍哥畻",
- "table": "fin_intangible_asset",
- "doc": "鏃犲舰璧勪骇鍗$墖(璇佷功缂栧彿/鏈夋晥鏈�)锛岀姸鎬� 1鍦ㄧ敤/2宸插け鏁�/3宸叉憡閿�瀹岋紱鏈堟憡閿�棰�=(鍘熷�济�(1-娈嬪�肩巼))梅(鎽婇攢骞撮檺脳12)锛岀疮璁℃憡閿�涓庡噣鍊肩敱璁℃彁绱姞",
- "upstream": [],
- "downstream": [
- "璐㈠姟鎶ヨ〃鐪嬫澘",
- "鎬昏处"
- ],
- "keywords": "鏃犲舰璧勪骇 鎽婇攢 杞欢钁椾綔鏉� 涓撳埄 intangible 鏈夋晥鏈�"
- },
- {
- "name": "閿�鍞鍗�",
- "module": "杩涢攢瀛�",
- "table": "erp_sale_order",
- "doc": "XSDD缂栧彿锛孊PM 瀹℃壒锛岄渶鐢熶骇琛岃嚜鍔ㄥ缓 MPS锛屽嚭搴撶姸鎬�:鏈�0宸查鐣�1閮ㄥ垎2鍏ㄩ儴3锛岀敓浜у畬鎴愪簨浠跺洖鍐�",
- "upstream": [
- "鍚堝悓"
- ],
- "downstream": [
- "MPS",
- "鍙戣揣閫氱煡",
- "閿�鍞嚭搴�",
- "鍞悗宸ュ崟"
- ],
- "keywords": "閿�鍞鍗� sale"
- },
- {
- "name": "涓荤敓浜ц鍒�",
- "module": "鐢熶骇",
- "table": "mes_pro_mps",
- "doc": "MPS璁″垝锛岃崏绋�0鈫掑凡涓嬪彂1鈫掑畬鎴�2/鍙栨秷3锛屽彲鍚堝苟涓嬪彂",
- "upstream": [
- "閿�鍞鍗�"
- ],
- "downstream": [
- "鐢熶骇宸ュ崟"
- ],
- "keywords": "MPS 涓昏鍒� 鐢熶骇璁″垝"
- },
- {
- "name": "鐢熶骇宸ュ崟",
- "module": "鐢熶骇",
- "table": "mes_pro_work_order",
- "doc": "鑽夌0鈫掑凡纭1鈫掑畬鎴�2/鍙栨秷3锛岀‘璁ゆ椂鎸夊伐鑹鸿矾绾跨敓鎴愪换鍔★紝鏈�鍚庝竴閬撳伐搴忔姤宸ュ洖鍐欏凡鐢熶骇鏁伴噺",
- "upstream": [
- "MPS"
- ],
- "downstream": [
- "鐢熶骇浠诲姟",
- "棰嗘枡",
- "瀹屽伐鍏ュ簱"
- ],
- "keywords": "宸ュ崟 鐢熶骇宸ュ崟 work order"
- },
- {
- "name": "鐢熶骇浠诲姟",
- "module": "鐢熶骇",
- "table": "mes_pro_task",
- "doc": "宸ュ簭绮掑害锛岄澶�0鈫掔敓浜т腑1鈫掗儴鍒�2鈫掑畬鎴�4锛屽彲鏆傚仠9鍙栨秷5",
- "upstream": [
- "鐢熶骇宸ュ崟"
- ],
- "downstream": [
- "鎶ュ伐"
- ],
- "keywords": "浠诲姟 task 宸ュ簭"
- },
- {
- "name": "鎶ュ伐鍗�",
- "module": "鐢熶骇",
- "table": "mes_pro_feedback",
- "doc": "鑽夌0鈫掑鎵逛腑2鈫掑緟妫�3/瀹屾垚4锛屾寜宸ュ簭椤哄簭鏍¢獙(涓婇亾宸ュ簭鎶ユ弧鎵嶅彲鎶�)锛岃仈鍔ㄥ�掑啿娑堣��/浜у嚭鍏ュ簱/IPQC锛涜川妫�宸ュ簭鎶ュ伐瀹℃壒鍚庤浆寰呮楠屽苟鐢熸垚 PENDING 浜у嚭琛岋紝绛夊凡瀹屾垚 IPQC 鎸夌墿鏂�+鐩樺彿+鏁伴噺鍏宠仈鍚庢墠鍥炲啓瀹屾垚",
- "upstream": [
- "鐢熶骇浠诲姟"
- ],
- "downstream": [
- "浜у搧浜у嚭",
- "鐗╂枡娑堣��",
- "IPQC"
- ],
- "keywords": "鎶ュ伐 feedback"
- },
- {
- "name": "宸ヨ壓璺嚎",
- "module": "鐢熶骇",
- "table": "mes_pro_route",
- "doc": "宸ュ簭椤哄簭+璐ㄦ/鍏抽敭/鍊掑啿鏍囪锛岄┍鍔ㄥ伐鍗曚换鍔′笌鎶ュ伐瑙勫垯",
- "upstream": [],
- "downstream": [
- "鐢熶骇宸ュ崟"
- ],
- "keywords": "宸ヨ壓 璺嚎 route 宸ュ簭"
- },
- {
- "name": "鍒拌揣閫氱煡鍗�",
- "module": "浠撳偍",
- "table": "mes_wm_arrival_notice",
- "doc": "閲囪喘璁㈠崟纭鏀惰揣鐢熸垚锛岃崏绋�0鈫掑緟璐ㄦ2鈫掑緟鍏ュ簱3鈫掑畬鎴�4锛涜〃澶村甫閲囪喘鍚堝悓鍙�(閫夋嫨閲囪喘璁㈠崟鑷姩甯﹀叆锛屾崲璐у埌璐ф部鐢ㄥ師閫�璐у崟鍚堝悓鍙�)锛屽彲鎸夊悎鍚屽彿妫�绱�",
- "upstream": [
- "閲囪喘璁㈠崟",
- "渚涘簲鍟嗛��璐�(鎹㈣揣)"
- ],
- "downstream": [
- "IQC",
- "閲囪喘鍏ュ簱"
- ],
- "keywords": "鍒拌揣 鏀惰揣 arrival 鍚堝悓鍙�"
- },
- {
- "name": "閲囪喘鍏ュ簱鍗�",
- "module": "浠撳偍",
- "table": "mes_wm_item_receipt",
- "doc": "鑽夌0鈫掑緟涓婃灦2鈫掑緟鎵ц3鈫掑畬鎴�4锛屽畬鎴愬悗搴撳瓨+骞跺洖鍐� ERP inCount/inStatus",
- "upstream": [
- "鍒拌揣閫氱煡"
- ],
- "downstream": [
- "搴撳瓨鍙拌处",
- "閲囪喘璁㈠崟(鍥炲啓)"
- ],
- "keywords": "閲囪喘鍏ュ簱 鏀惰揣鍏ュ簱 receipt"
- },
- {
- "name": "鐢熶骇棰嗘枡鍗�",
- "module": "浠撳偍",
- "table": "mes_wm_product_issue",
- "doc": "鑽夌0鈫掑緟鎷h揣2鈫掑緟鎵ц3鈫掑畬鎴�4锛屽簱瀛�-",
- "upstream": [
- "鐢熶骇宸ュ崟"
- ],
- "downstream": [
- "搴撳瓨鍙拌处"
- ],
- "keywords": "棰嗘枡 issue"
- },
- {
- "name": "閿�鍞嚭搴撳崟",
- "module": "浠撳偍",
- "table": "mes_wm_product_sales",
- "doc": "鍙戣揣閫氱煡瀹℃牳鍚庣敓鎴愶紝鎻愪氦鍚庢湁 oqcCheckFlag 琛岃浆寰呮娴�1锛堟彁浜ゆ椂涓嶅啀鑷姩寤� OQC锛夛紝闇�璐ㄦ鍛樼嫭绔嬪綍鍏� OQC 骞跺湪妫�楠屽崟璇︽儏鎸夌墿鏂�+鐩樺彿+鏁伴噺鍏宠仈寰呮琛岋紱鍏ㄩ儴寰呮琛屽悎鏍煎悗杞緟鎷h揣2鈫掑彂杩�10鈫掑緟鎵ц3鈫掑畬鎴�4锛屽洖鍐欓攢鍞鍗曞嚭搴撴暟涓庣姸鎬�",
- "upstream": [
- "鍙戣揣閫氱煡",
- "閿�鍞鍗�"
- ],
- "downstream": [
- "搴撳瓨鍙拌处",
- "OQC"
- ],
- "keywords": "閿�鍞嚭搴� 鍙戣揣 鍑哄簱鍗� sales"
- },
- {
- "name": "閿�鍞��璐у崟",
- "module": "浠撳偍",
- "table": "mes_wm_return_sales",
- "doc": "鑽夌鈫掑緟妫�楠�(RQC)鈫掑緟涓婃灦鈫掑緟鍏ュ簱鈫掑畬鎴愶紝鍞悗涓庢墜宸ヤ袱鏉ユ簮",
- "upstream": [
- "鍞悗閫�璐�(浠撳偍鍙戣捣)"
- ],
- "downstream": [
- "搴撳瓨鍙拌处",
- "RQC"
- ],
- "keywords": "閿�鍞��璐� 閫�璐у叆搴�"
- },
- {
- "name": "渚涘簲鍟嗛��璐у崟",
- "module": "浠撳偍",
- "table": "mes_wm_return_vendor",
- "doc": "璐ㄩ噺閮ㄥ彂璧烽��璐э紝鑽夌0鈫掑鎵逛腑1(BPM锛氶噰璐啋璐ㄩ噺鈫掍粨搴�)鈫掑緟鎷h揣2鈫掑緟鎵ц閫�璐�3鈫掑畬鎴�4锛屽彲鍙栨秷5锛屽簱瀛�-锛涗笂浼犻檮浠惰蛋 storage-attachment锛涘鐞嗘柟寮� 1閫�娆�(瀹屾垚鍚庤嚜鍔ㄧ敓鎴愯礋鏁板啿绾粯娆惧崟) / 2鎹㈣揣(瀹屾垚鍚庤嚜鍔ㄧ敓鎴愬緟璐ㄦ鍒拌揣閫氱煡鍗曞苟鍒涘缓 IQC锛岄噸鏂板叆搴撹川妫�)锛涘悎鍚屽彿浠庨噰璐鍗曞揩鐓�",
- "upstream": [
- "IQC",
- "閲囪喘璁㈠崟(鍚堝悓鍙�)"
- ],
- "downstream": [
- "搴撳瓨鍙拌处",
- "閲囪喘璁㈠崟(returnCount)",
- "浠樻鍗�(鍐茬孩)",
- "鍒拌揣閫氱煡(鎹㈣揣)"
- ],
- "keywords": "渚涘簲鍟嗛��璐� 閫�鏂� 閫�璐� vendor"
- },
- {
- "name": "璋冩嫧鍗�",
- "module": "浠撳偍",
- "table": "mes_wm_transfer",
- "doc": "鍐呴儴/澶栭儴璋冩嫧锛屾垚瀵� MOVE_OUT+MOVE_IN 浜嬪姟锛屽湪閫旀暟閲�",
- "upstream": [],
- "downstream": [
- "搴撳瓨鍙拌处"
- ],
- "keywords": "璋冩嫧 绉诲簱 transfer"
- },
- {
- "name": "鐩樼偣浠诲姟",
- "module": "浠撳偍",
- "table": "mes_wm_stock_taking_task",
- "doc": "闈欐��/鍔ㄦ�佺洏鐐癸紝琛岀粨鏋�:姝e父/鐩樼泩(ADJUST_IN)/鐩樹簭(ADJUST_OUT)锛屽彲鍐荤粨搴撳瓨銆佺洸鐩�",
- "upstream": [
- "搴撳瓨鍙拌处"
- ],
- "downstream": [
- "搴撳瓨鍙拌处(璋冩暣)"
- ],
- "keywords": "鐩樼偣 鐩樼泩 鐩樹簭 stock taking"
- },
- {
- "name": "搴撳瓨鍙拌处",
- "module": "浠撳偍",
- "table": "mes_wm_material_stock",
- "doc": "鐗╂枡脳浠撳簱脳搴撳尯脳搴撲綅脳鎵规脳渚涘簲鍟嗗叚鍏冪粍锛屾暟閲�/鍐荤粨/鍗犵敤/鍦ㄩ�斿洓閲�",
- "upstream": [
- "鍏ㄩ儴鍏ュ簱鍗�"
- ],
- "downstream": [
- "鍏ㄩ儴鍑哄簱鍗�",
- "浜嬪姟娴佹按"
- ],
- "keywords": "搴撳瓨 鍙拌处 stock 鍙敤閲�"
- },
- {
- "name": "鎵规",
- "module": "浠撳偍",
- "table": "mes_wm_batch",
- "doc": "鍏宠仈鐗╂枡/宸ュ崟/渚涘簲鍟�/瀹㈡埛/璐ㄩ噺鐘舵�侊紱SN 鐮佸惈鎵规 uuid锛涙潯鐮佹敮鎸�18绉嶄笟鍔″璞�",
- "upstream": [
- "鍏ュ簱鍗曟嵁"
- ],
- "downstream": [
- "搴撳瓨鍙拌处"
- ],
- "keywords": "鎵规 batch SN 鏉$爜 杩芥函"
- },
- {
- "name": "IQC鏉ユ枡妫�楠�",
- "module": "璐ㄩ噺",
- "table": "mes_qc_iqc",
- "doc": "鍒拌揣閫氱煡/澶栧崗鍏ュ簱瑙﹀彂锛岃崏绋�0鈫掑畬鎴�4锛岀粨璁哄洖鍐欐潵婧愬崟鎹紱琛屾搷浣溿�屽嚭鎶ュ憡銆嶄粎鍦ㄥ凡瀹屾垚鏃跺彲瑙侊紱鏀寔 Excel 鎵归噺瀵煎叆锛堝伐鍏锋爮銆屾壒閲忓鍏ャ�嶏紝绾柊澧炪�佸鍏ュ崟涓鸿崏绋裤�佺紪鍙峰彲鐣欑┖鑷姩鐢熸垚锛夛紱鍚屼竴鎵规暟鎹笉鍙噸澶嶅鍏ワ紙鐗╂枡+渚涘簲鍟�+渚涘簲鍟嗘壒娆�+鏉ユ枡鏃ユ湡锛屾枃浠跺唴閲嶅琛屼笌搴撳唴宸叉湁鍗曢兘鎷掕琛岋級",
- "upstream": [
- "鍒拌揣閫氱煡",
- "澶栧崗鍏ュ簱",
- "Excel 鎵归噺瀵煎叆"
- ],
- "downstream": [
- "閲囪喘鍏ュ簱",
- "渚涘簲鍟嗛��璐�",
- "NCR",
- "鎶ュ憡瀹炰緥(鍑烘姤鍛�)"
- ],
- "keywords": "IQC 鏉ユ枡妫�楠� 鍑烘姤鍛� 鎵归噺瀵煎叆 瀵煎叆妯℃澘"
- },
- {
- "name": "IPQC杩囩▼妫�楠�",
- "module": "璐ㄩ噺",
- "table": "mes_qc_ipqc",
- "doc": "鎶ュ伐璐ㄦ宸ュ簭浜у嚭琛屽緟妫�鍚庣嫭绔嬪綍鍏ワ紝瀹屾垚鏃舵寜鍚堟牸+涓嶅悎鏍�=妫�娴嬫暟閲忚嚜鍔ㄥ垽瀹� 1 閫氳繃/2 涓嶉�氳繃锛堥渶宸蹭笂浼犳楠岄檮浠讹級锛涘凡瀹屾垚涓旀湭缁戝畾鏉ユ簮鐨勫崟鎹紝鍦ㄨ鎯呮寜鐗╂枡+鐩樺彿+鏁伴噺涓�鑷撮�夋嫨寰呮浜у嚭琛屽叧鑱旓紝鍥炲啓鎶ュ伐瀹屾垚涓庝骇鍑哄叆搴擄紱鏈叧鑱斾笉鍥炲啓銆傝鎿嶄綔銆屽嚭鎶ュ憡銆嶄粎鍦ㄥ凡瀹屾垚鏃跺彲瑙侊紱鏀寔 Excel 鎵归噺瀵煎叆锛堜骇鍝佺墿鏂欑敱鐢熶骇宸ュ崟鎺ㄥ锛屾ā鏉夸笉濉墿鏂欙紱宸ュ簾+鏂欏簾+鍏朵粬搴熷搧涓嶅緱瓒呰繃涓嶅悎鏍煎搧鏁伴噺锛夛紱鍚屼竴鎵规暟鎹笉鍙噸澶嶅鍏ワ紙鐢熶骇宸ュ崟+妫�楠岀被鍨�+宸ヤ綅+妫�娴嬫棩鏈燂紝鏂囦欢鍐呴噸澶嶈涓庡簱鍐呭凡鏈夊崟閮芥嫆璇ヨ锛�",
- "upstream": [
- "鎶ュ伐",
- "Excel 鎵归噺瀵煎叆"
- ],
- "downstream": [
- "浜у嚭鍏ュ簱",
- "NCR",
- "鎶ュ憡瀹炰緥(鍑烘姤鍛�)"
- ],
- "keywords": "IPQC 杩囩▼妫�楠� 宸℃ 鐩樺彿鍏宠仈 鎶ュ伐鍏宠仈 鍑烘姤鍛� 鎵归噺瀵煎叆 瀵煎叆妯℃澘"
- },
- {
- "name": "OQC鍑鸿揣妫�楠�",
- "module": "璐ㄩ噺",
- "table": "mes_qc_oqc",
- "doc": "閿�鍞嚭搴撴彁浜ゅ悗寰呮娴嬭鐙珛褰曞叆锛屽畬鎴愭椂鎸夊悎鏍�+涓嶅悎鏍�=妫�娴嬫暟閲忚嚜鍔ㄥ垽瀹� 1 閫氳繃/2 涓嶉�氳繃锛堥渶宸蹭笂浼犳楠岄檮浠讹級锛涘凡瀹屾垚涓旀湭缁戝畾鏉ユ簮鐨勫崟鎹紝鍦ㄨ鎯呮寜鐗╂枡+鐩樺彿+鏁伴噺涓�鑷撮�夋嫨寰呮鍑哄簱琛屽叧鑱旓紝鍥炲啓鍑哄簱琛岃川閲忕姸鎬� PASS/FAIL锛屽叏閮ㄥ緟妫�琛屽悎鏍煎悗鍑哄簱鍗曡浆寰呮嫞璐э紱涓嶅悎鏍艰鐣欏緟鍚庣画澶勭疆锛屼笉鑷姩鍙栨秷鍑哄簱鍗曘�傝鎿嶄綔銆屽嚭鎶ュ憡銆嶄粎鍦ㄥ凡瀹屾垚鏃跺彲瑙侊紱鏀寔 Excel 鎵归噺瀵煎叆锛堝鎴烽』鍦ㄥ綋鍓嶇櫥褰曠敤鎴风殑瀹㈡埛鏁版嵁鏉冮檺鑼冨洿鍐咃級锛涘悓涓�鎵规暟鎹笉鍙噸澶嶅鍏ワ紙鐗╂枡+瀹㈡埛+鎵规鍙�+鍑鸿揣鏃ユ湡锛屾枃浠跺唴閲嶅琛屼笌搴撳唴宸叉湁鍗曢兘鎷掕琛岋級",
- "upstream": [
- "閿�鍞嚭搴撳崟",
- "Excel 鎵归噺瀵煎叆"
- ],
- "downstream": [
- "閿�鍞嚭搴撳崟(鎺ㄨ繘)",
- "鎶ュ憡瀹炰緥(鍑烘姤鍛�)"
- ],
- "keywords": "OQC 鍑鸿揣妫�楠� 鍑哄巶妫�楠� 鐩樺彿鍏宠仈 鍑哄簱鍏宠仈 鍑烘姤鍛� 鎵归噺瀵煎叆 瀵煎叆妯℃澘"
- },
- {
- "name": "RQC閫�璐ф楠�",
- "module": "璐ㄩ噺",
- "table": "mes_qc_rqc",
- "doc": "鐢熶骇閫�鏂�/閿�鍞��璐�/鍞悗閫�璐цЕ鍙戯紝缁撹鍥炶皟鍞悗锛涜鎿嶄綔銆屽嚭鎶ュ憡銆嶄粎鍦ㄥ凡瀹屾垚鏃跺彲瑙併�傛帾杈炲凡缁熶竴涓恒�岄��璐ф楠屻�嶏紙鍘熻彍鍗曠埗椤逛笌 mes_qc_type 瀛楀吀鍐欍�岄��鏂欐楠屻�嶏紝涓庡悗绔灇涓�/琛ㄦ敞閲�/鑿滃崟鏉冮檺瀛愰」涓嶄竴鑷达紱RQC 涓夎�呴兘瑕嗙洊锛屾晠鍙栥�岄��璐ф楠屻�嶏級",
- "upstream": [
- "閫�鏂�",
- "閫�璐�"
- ],
- "downstream": [
- "閫�璐у叆搴�",
- "鍞悗鍥炶皟",
- "鎶ュ憡瀹炰緥(鍑烘姤鍛�)"
- ],
- "keywords": "RQC 閫�璐ф楠� 閫�鏂欐楠� 鍑烘姤鍛�"
- },
- {
- "name": "NCR涓嶅悎鏍煎搧",
- "module": "璐ㄩ噺",
- "table": "mes_qc_ncr",
- "doc": "寰呰瘎瀹�0鈫掑凡璇勫6鈫掑凡澶勭疆7鈫掑凡鍏抽棴8锛屽缃�:閫�璐�/鎶ュ簾/杩斿伐/璁╂鎺ユ敹/闄嶇骇",
- "upstream": [
- "IQC/IPQC/OQC/RQC"
- ],
- "downstream": [
- "閫�璐�/鎶ュ簾/杩斿伐(鍙拌处)"
- ],
- "keywords": "NCR 涓嶅悎鏍� 澶勭疆 鐗归噰 鎶ュ簾"
- },
- {
- "name": "璁惧",
- "module": "璁惧",
- "table": "mes_dv_machinery",
- "doc": "鍙拌处鐘舵��:鍋滄満/鐢熶骇涓�/淇濆吇涓紱鐐规路淇濆吇路缁翠慨宸ュ崟锛汚I 椋庨櫓棰勬祴娑堣垂鍏舵暟鎹�",
- "upstream": [],
- "downstream": [
- "鐐规",
- "缁翠慨",
- "鐢熶骇椋庨櫓棰勬祴"
- ],
- "keywords": "璁惧 鐐规 淇濆吇 缁翠慨 machinery"
- },
- {
- "name": "鍞悗宸ュ崟",
- "module": "鍞悗",
- "table": "after_sale_ticket",
- "doc": "鑽夌0鈫掑鐞嗕腑10鈫掑緟鍏ュ簱30鈫掑緟閫�娆�40鈫掑畬缁�50鈫掑叧闂�60/鍙栨秷99锛屽垽瀹�:涓�鑸�/缁翠慨/閫�璐э紱瀹㈡埛璇夋眰鍙嶉鎻忚堪+闄勪欢銆佸鐞嗙粨鏋�+闄勪欢锛涘垱寤�/鏇存柊/鍒ゅ畾/瀹岀粨/褰掓。/鍙栨秷/鍥炶鍐欏叆娴佽浆璁板綍",
- "upstream": [
- "瀹㈡埛鍙嶉(浜哄伐褰曞叆)"
- ],
- "downstream": [
- "缁翠慨璁板綍",
- "浠撳偍閿�鍞��璐�(鍘熼��璐х敵璇烽〉闈㈠凡涓嬬嚎)"
- ],
- "keywords": "鍞悗 宸ュ崟 ticket 缁翠慨 瀹㈡埛璇夋眰 澶勭悊缁撴灉 娴佽浆璁板綍"
- },
- {
- "name": "宸ュ崟娴佽浆璁板綍",
- "module": "鍞悗",
- "table": "after_sale_ticket_flow",
- "doc": "鍞悗宸ュ崟姣忔鍔ㄤ綔鐣欑棔锛氬姩浣滅紪鐮�/鍚嶇О銆佸彉鏇村墠鍚庣姸鎬併�佸唴瀹广�佹搷浣滀汉銆佹椂闂�",
- "upstream": [
- "鍞悗宸ュ崟"
- ],
- "downstream": [],
- "keywords": "鍞悗 娴佽浆璁板綍 flow"
- },
- {
- "name": "閫�璐х敵璇�",
- "module": "鍞悗",
- "table": "after_sale_return",
- "doc": "鍚庡彴淇濈暀锛屽敭鍚庨〉闈㈠凡涓嬬嚎锛涜崏绋�0鈫掑凡瀹℃牳20(鑷姩寤篗ES閫�璐у崟)鈫掑凡璐ㄦ40鈫掑凡鍏ュ簱50鈫掑凡閫�娆�60鈫掑叧闂�70锛涚被鍨�:閫�娆鹃��璐�/鎹㈣揣/浠呴��娆�",
- "upstream": [
- "鍞悗宸ュ崟"
- ],
- "downstream": [
- "閿�鍞��璐у崟",
- "閫�娆�"
- ],
- "keywords": "鍞悗閫�璐� return"
- },
- {
- "name": "鍛樺伐",
- "module": "浜哄姏",
- "table": "hrm_employee",
- "doc": "鍦ㄨ亴1/璇曠敤2/绂昏亴3锛屽叆鑱岃嚜鍔ㄥ缓绯荤粺璐﹀彿锛涚鑱岀敵璇峰埌鏈熻嚜鍔ㄧ疆涓虹鑱�3骞跺仠鐢ㄧ郴缁熻处鍙�",
- "upstream": [],
- "downstream": [
- "浜ゆ帴鏄犲皠",
- "鑰冨嫟",
- "钖叕"
- ],
- "keywords": "鍛樺伐 鍏ヨ亴 employee 绂昏亴"
- },
- {
- "name": "绂昏亴鐢宠",
- "module": "浜哄姏",
- "table": "hrm_resignation_application",
- "doc": "鑽夌0鈫掑鎵逛腑10鈫掗�氳繃20/椹冲洖30/鎾ら攢40锛涘鎵归�氳繃鍚庡彲浜ゆ帴0鈫�10鈫�20锛涘埌鏈熶换鍔″啓瀹為檯绂昏亴鏃ユ湡銆佹妸鍛樺伐鐘舵�佹敼涓虹鑱�3骞跺仠鐢ㄧ郴缁熻处鍙�",
- "upstream": [
- "鍛樺伐"
- ],
- "downstream": [
- "鍛樺伐妗f鐘舵��",
- "绂昏亴浜ゆ帴"
- ],
- "keywords": "绂昏亴 resignation 瀹℃壒 浜ゆ帴 鑷姩绂昏亴"
- },
- {
- "name": "绂昏亴浜ゆ帴",
- "module": "浜哄姏",
- "table": "hrm_user_handover",
- "doc": "鍚屾椂璁板綍绂昏亴/浜ゆ帴鍙屾柟鍛樺伐ID涓庣敤鎴稩D锛涗氦鎺ュ畬鎴�20 鍚� expandUserIds 鎵╁睍浜ゆ帴浜哄彲瑙佹暟鎹紱瀹℃壒閫氳繃涓斿埌棰勮绂昏亴鏃ユ湡鍚庤嚜鍔ㄦ妸鍛樺伐鐘舵�佹敼涓虹鑱�3骞跺仠鐢ㄧ郴缁熻处鍙�",
- "upstream": [
- "绂昏亴鐢宠"
- ],
- "downstream": [
- "鍚勬ā鍧楁垜鐨勬暟鎹煡璇�",
- "鍛樺伐妗f鐘舵��"
- ],
- "keywords": "浜ゆ帴 绂昏亴 handover expandUserIds 鑷姩绂昏亴"
- },
- {
- "name": "鎺掔彮璁″垝",
- "module": "璁惧",
- "table": "mes_cal_plan",
- "doc": "鐝粍脳鐝脳鏃ユ湡鎺掔彮锛屼緵鐢熶骇涓庤�冨嫟寮曠敤",
- "upstream": [],
- "downstream": [
- "鐢熶骇浠诲姟",
- "鑰冨嫟"
- ],
- "keywords": "鎺掔彮 鐝粍 鐝 鏃ュ巻"
- },
- {
- "name": "鎶ュ憡妯℃澘",
- "module": "璐ㄦ鎶ュ憡",
- "table": "qc_report_template",
- "doc": "鏅鸿兘璐ㄦ鎶ュ憡妯℃澘锛屽惎鐢�0/鍋滅敤1锛涚敾甯冨唴瀹瑰瓨鍦� qc_report_template_version锛堣崏绋�0/宸插彂甯�1/宸插仠鐢�2锛屽凡鍙戝竷涓嶅彲瑕嗙洊锛夛紝currentVersion 鎸囧悜褰撳墠宸插彂甯冪増鏈紱婧愭枃浠剁粡 AI 瀵煎叆璇嗗埆鎴愯崏绋垮悗鐢变汉宸ョ‘璁ゆ墠鎴愪负鐗堟湰锛涘悓涓�妯℃澘閲嶅瀵煎叆鎸夈�愭浛鎹€�戝鐞嗏�斺�斿厛鍒犳棫闄勪欢锛堣繛甯� blob 琛屼笌纾佺洏鏂囦欢锛夊啀缁戞柊鐨勶紝涓嶇暀瀛ゅ効鏂囦欢锛涘垹闄ゆā鏉夸細杩炲甫娓呴檮浠�",
- "upstream": [
- "浜哄伐璁捐(GrapesJS 璁捐鍣�)",
- "AI 瀵煎叆鑽夌(qc-report/ai-import/draft)"
- ],
- "downstream": [
- "妯℃澘鐗堟湰",
- "鎶ュ憡瀹炰緥"
- ],
- "keywords": "鎶ュ憡妯℃澘 璐ㄦ鎶ュ憡 template 璁捐鍣� 鐗堟湰 AI瀵煎叆 璇嗗埆 鑽夌 婧愭枃浠舵浛鎹�"
- },
- {
- "name": "鎶ュ憡瀹炰緥",
- "module": "璐ㄦ鎶ュ憡",
- "table": "qc_report_instance",
- "doc": "鍑轰欢浜х墿锛岀紪鍙� QR+yyyyMMdd+4浣嶆祦姘存寜澶╃嫭绔嬩笖涓氬姟鍞竴锛屽彲鏄惧紡鎸囧畾瑕嗙洊锛堟敞鎰� uk_report_no 涓嶅尯鍒嗚蒋鍒犻櫎锛屽垹鎺夌殑鍙蜂笉鍥炴敹锛夛紱涓ゆ潯鍑轰欢鍏ュ彛锛氶�氱敤 generate锛堣皟鐢ㄦ柟鑷甫 context锛変笌 generate-from-qc锛堟暟鎹粠 MES 璐ㄦ鍗曞彇锛屾潈闄愮爜 qc-report:instance:generate 宸插叆 system_menu id=1075416锛屼簲閬撴牎楠屾寜涓氬姟浼樺厛绾у彧鎶ョ涓�澶勶細105_000 绫诲瀷闈炴硶 / 105_001 鍗曟嵁涓嶅瓨鍦� / 105_002 鏈畬鎴� / 105_003 鏈垽瀹� / 105_005 妯℃澘绫诲瀷涓嶇 / 105_006 鏃犲彲鐢ㄦ楠岄」锛涘洓寮犺川妫�鍗曞垪琛ㄧ殑琛屾搷浣溿�屽嚭鎶ュ憡銆嶄粎鍦� status=宸插畬鎴愭椂鍙锛屽脊绐楀彧鍒� reportType 涓�鑷淬�佹ā鏉垮惎鐢ㄣ�佷笖 currentVersion 鎸囧悜鐨勭増鏈凡鍙戝竷鐨勬ā鏉匡紙鍚庣 /qc-report/template/selectable 鍒ゅ畾鈥斺�斿仠鐢ㄧ増鏈笉娓呯┖ currentVersion锛屽墠绔嬁鍒嗛〉缁撴灉鑷繁鎺ㄥ浼氭紡锛夛紝缁撴灉灏卞湴灞曠ず骞惰烦鏈〉鍒楄〃锛夛紱鍐荤粨 data_snapshot锛堝垽瀹氬悗鏁版嵁锛屽惈鍚庣绠楀ソ鐨� PASS/FAIL 涓庡悎鏍肩巼锛変笌 render_html锛況egenerate 鍙噸娓叉帓鐗堛�佹暟鎹笌缂栧彿涓嶅彉锛沚usiness_id/business_type 瀛� MES 琛ㄥ悕锛坢es_qc_iqc 绛夛級涓庡崟鎹� ID锛屽彲鍙嶆煡銆佷竴鍗曞彲鍑哄浠斤紱鎶ュ憡澶村彟甯﹀崟鎹師鍒ゅ畾 qcResult(鏁�)/qcResultText(涓枃锛屽悎鏍�/鐗归噰/涓嶅悎鏍奸��璐�/涓嶅悎鏍兼姤搴�)锛屼笌寮曟搸涓夋�佸垽瀹氬苟瀛樹簰涓嶈鐩栵紱鍝嶅簲甯� undecidableCount=蹇収涓� result 涓虹┖涓茬殑椤规暟涓� warnings锛堝垎缁勬爣棰樿烦杩�/鎸囨爣宸插垹/鏈綍瀹炴祴鍊�/鏍峰搧瓒�3锛夛紝涓よ�呴兘涓嶈惤搴撱�佷簨鍚庣湅涓嶅埌",
- "upstream": [
- "鎶ュ憡妯℃澘鐗堟湰",
- "璐ㄦ鍗曚笂涓嬫枃(閫氱敤 generate 鐢辫皟鐢ㄦ柟浼犲叆)",
- "MES 璐ㄦ鍗� IQC/IPQC/OQC/RQC(generate-from-qc 缁� MesQcReportApi 鍙栨暟)"
- ],
- "downstream": [
- "鍓嶇瀹炰緥椤� /qc/report-instance(鍒楄〃路iframe棰勮路蹇収椤电路瀵煎嚭PDF)",
- "PDF褰掓。(system_storage_attachment recordType=qc_report_instance)"
- ],
- "keywords": "鎶ュ憡瀹炰緥 鍑轰欢 QR缂栧彿 蹇収 澶嶇幇 regenerate PDF褰掓。 鎶ュ憡瀹炰緥椤� 瀵煎嚭PDF generate-from-qc 璐ㄦ鍗曞嚭鎶ュ憡 鍑烘姤鍛婂脊绐� qcResult undecidableCount warnings 寰呭垽瀹� 鍙嶆煡 涓氬姟鍗曟嵁绛涢��"
- }
- ]
+ "objects": [
+ {
+ "name": "鐗╂枡",
+ "module": "鍩虹涓绘暟鎹�",
+ "table": "mdm_item",
+ "doc": "MDM 鏉冨▉鐗╂枡/浜у搧/鍗婃垚鍝佹。妗堬紝鍚� SKU銆佹壒娆″睘鎬с�佷环鏍笺�佸畨鍏ㄥ簱瀛�",
+ "upstream": [
+ "MES 鐗╂枡鍙嶅悜鍚屾"
+ ],
+ "downstream": [
+ "鎶ヤ环鍗�",
+ "閿�鍞鍗�",
+ "閲囪喘璁㈠崟",
+ "宸ュ崟BOM",
+ "搴撳瓨鍙拌处"
+ ],
+ "keywords": "鐗╂枡 浜у搧 鍘熸潗鏂� item"
+ },
+ {
+ "name": "浠撳簱",
+ "module": "鍩虹涓绘暟鎹�",
+ "table": "mdm_warehouse",
+ "doc": "浠撳簱涓绘暟鎹紝type: 1鍘熸枡/2鎴愬搧/3鍗婃垚鍝�/4绾胯竟锛汳ES 鑷湁 mes_wm_warehouse 鎵胯浇搴撳尯搴撲綅",
+ "upstream": [],
+ "downstream": [
+ "搴撳瓨鍙拌处",
+ "鍑哄叆搴撳崟鎹�"
+ ],
+ "keywords": "浠撳簱 warehouse 鍘熸枡浠� 鎴愬搧浠� 绾胯竟浠�"
+ },
+ {
+ "name": "瀹㈡埛",
+ "module": "閿�鍞鐞�",
+ "table": "crm_customer",
+ "doc": "瀹㈡埛涓绘。锛屽叕娴锋睜/閿佸畾/鎴愪氦鐘舵�侊紝璐熻矗浜烘暟鎹潈闄愶紱瀹㈡埛鍒楄〃鎸夈�屽鏍搁�氳繃銆嶅悎鍚屽疄鏃剁粺璁″凡绛捐鍚堝悓浠芥暟涓庨噾棰濆悎璁�",
+ "upstream": [
+ "绾跨储"
+ ],
+ "downstream": [
+ "鑱旂郴浜�",
+ "鍟嗘満",
+ "鎶ヤ环鍗�",
+ "鍚堝悓",
+ "鍞悗宸ュ崟",
+ "鏀舵鍗�"
+ ],
+ "keywords": "瀹㈡埛 customer 鍏捣"
+ },
+ {
+ "name": "绾跨储",
+ "module": "閿�鍞鐞�",
+ "table": "crm_clue",
+ "doc": "鍘熷閿�鍞嚎绱紝浠呬竴娆¤浆鍖栦负瀹㈡埛",
+ "upstream": [],
+ "downstream": [
+ "瀹㈡埛"
+ ],
+ "keywords": "绾跨储 clue"
+ },
+ {
+ "name": "鑱旂郴浜�",
+ "module": "閿�鍞鐞�",
+ "table": "crm_contact",
+ "doc": "瀹㈡埛涓嬭仈绯讳汉锛屼笌鍟嗘満澶氬澶�",
+ "upstream": [
+ "瀹㈡埛"
+ ],
+ "downstream": [
+ "鍟嗘満"
+ ],
+ "keywords": "鑱旂郴浜� contact"
+ },
+ {
+ "name": "鍟嗘満",
+ "module": "閿�鍞鐞�",
+ "table": "crm_business",
+ "doc": "閿�鍞満浼氾紝DB 閰嶇疆寮忛樁娈垫帹杩涳紝缁撴潫鎬�: 璧�/杈�/鏃犳晥",
+ "upstream": [
+ "瀹㈡埛"
+ ],
+ "downstream": [
+ "鎶ヤ环鍗�",
+ "鍚堝悓"
+ ],
+ "keywords": "鍟嗘満 business 璧㈠崟 杈撳崟 闃舵"
+ },
+ {
+ "name": "鎶ヤ环鍗�",
+ "module": "閿�鍞鐞�",
+ "table": "crm_sale_quotation",
+ "doc": "QT缂栧彿锛岄�� MDM 鐗╂枡鎶ヤ环锛孉I OCR 褰曞叆锛岃崏绋库啋宸茶浆鍚堝悓",
+ "upstream": [
+ "鍟嗘満"
+ ],
+ "downstream": [
+ "鍚堝悓"
+ ],
+ "keywords": "鎶ヤ环 quotation QT"
+ },
+ {
+ "name": "鍚堝悓",
+ "module": "閿�鍞鐞�",
+ "table": "crm_contract",
+ "doc": "HT缂栧彿锛孊PM 瀹℃壒(0鑽夌/10瀹℃壒涓�/20閫氳繃/30椹冲洖/40鍙栨秷/50浣滃簾)锛岄�氳繃鍚庡彲鐢熸垚閿�鍞鍗曪紱鏀寔 Excel 瀵煎叆锛堜竴鍚堝悓澶氫骇鍝佹槑缁嗚銆佸悎骞跺崟鍏冩牸鑷姩鎷夊钩锛屽鎴蜂笌鐗╂枡鎸夊悕绉�/缂栫爜鏍¢獙锛夛紱浜у搧鏄庣粏甯﹀嚭鐗╂枡鍚嶇О/缂栫爜/鏉$爜/瑙勬牸鍨嬪彿/璁¢噺鍗曚綅锛涘垹闄ゅ悎鍚屾椂杩炲甫鍒犻櫎浜у搧鏄庣粏锛屼笉鐣欏鍎挎暟鎹�",
+ "upstream": [
+ "鎶ヤ环鍗�"
+ ],
+ "downstream": [
+ "閿�鍞鍗�",
+ "鍥炴璁″垝",
+ "寮�绁�"
+ ],
+ "keywords": "鍚堝悓 contract 瀹℃壒 瀵煎叆"
+ },
+ {
+ "name": "鍙戠エ",
+ "module": "閿�鍞鐞�",
+ "table": "crm_invoice",
+ "doc": "KP缂栧彿锛堝彲鐣欑┖鑷姩鐢熸垚銆佺郴缁熷唴鍞竴锛夛紝BPM 瀹℃壒锛岀疮璁″紑绁ㄢ墹鍚堝悓棰濓紝闄勪欢蹇呬紶锛涘紑绁ㄧ敵璇烽』缁戝畾 ERP 閿�鍞鍗曚笌 MES 閿�鍞嚭搴撳崟锛屽鎵归�氳繃鍚庤繘鍏ュ綍鍏ュ彂绁ㄩ樁娈�(entry_status 0寰呭綍鍏モ啋10宸插綍鍏�)锛屽綍鍏ユ椂濉啓鍙戠エ鍙风爜/鏃ユ湡/闄勪欢骞惰缃悎鍚屾/棰勪粯娆�/鍒拌揣娆�/楠屾敹娆�/璐ㄤ繚閲戞敹娆捐妭鐐癸紱鏀寔 Excel 瀵煎叆锛堜粎鏂板涓嶆洿鏂帮紝鍚堝悓椤诲鏍搁�氳繃涓旀湰娆¢噾棰濃墹鍚堝悓鍓╀綑鍙紑绁ㄩ锛涘悓涓�鎵规暟鎹笉鍙噸澶嶅鍏モ�斺�斿悓鍚堝悓涓嬪彂绁ㄥ彿鐮佺浉鍚屻�佹垨鍙戠エ鍙风爜鐣欑┖鏃跺紑绁ㄩ噾棰�+鍙戠エ鎶ご+寮�绁ㄦ棩鏈熺浉鍚屽嵆鍒ら噸澶嶏紝鏂囦欢鍐呴噸澶嶈涓庡簱鍐呭凡鏈夊崟閮芥嫆璇ヨ骞跺洖鏄剧淮搴︿笌瀹為檯鍊硷級",
+ "upstream": [
+ "鍚堝悓",
+ "閿�鍞鍗�",
+ "閿�鍞嚭搴撳崟"
+ ],
+ "downstream": [
+ "鍥炴",
+ "鍥炴璁″垝",
+ "璁拌处鍑瘉"
+ ],
+ "keywords": "寮�绁� 鍙戠エ invoice 瀵煎叆 鍘婚噸 寮�绁ㄧ敵璇� 褰曞叆鍙戠エ 鍑哄簱鍗�"
+ },
+ {
+ "name": "鍥炴",
+ "module": "閿�鍞鐞�",
+ "table": "crm_receivable",
+ "doc": "HK缂栧彿锛屽垱寤轰负鏈彁浜�0锛屾樉寮忔彁浜ゅ悗璧� BPM 鍗忓悓瀹℃壒(10瀹℃壒涓啋20閫氳繃/30椹冲洖/40鍙栨秷)锛屽己鍒跺厛寮�绁紝鎻愪氦鏃堕噸鏂版牎楠岄噾棰濋搴︼紱鏂板/缂栬緫鍙甫鏍搁攢鏄庣粏 items(20閿�鍞鍗�/21閿�鍞嚭搴�/23寮�绁�)锛屾槑缁嗗悎璁″繀椤荤瓑浜庡洖娆鹃噾棰濓紱瀹℃壒閫氳繃鎵嶅洖鍐欏洖娆捐鍒掑凡鍥炴棰�/瀹為檯鍥炴鏃堕棿/鐘舵��(0鏈洖娆�10閮ㄥ垎鍥炴20宸插洖娓�)锛涘鎵逛腑鐨勫洖娆剧姝㈤〉闈㈠唴鎵嬪伐瀹℃牳/鍙嶅鏍�",
+ "upstream": [
+ "鍚堝悓",
+ "鍙戠エ",
+ "閿�鍞鍗�",
+ "閿�鍞嚭搴撳崟"
+ ],
+ "downstream": [
+ "鏀舵鍗�(鍏宠仈)",
+ "鍥炴鏍搁攢鏄庣粏",
+ "鍥炴璁″垝",
+ "璁拌处鍑瘉"
+ ],
+ "keywords": "鍥炴 鏀舵璁″垝 receivable 鏍搁攢"
+ },
+ {
+ "name": "鍥炴鏍搁攢鏄庣粏",
+ "module": "閿�鍞鐞�",
+ "table": "crm_receivable_item",
+ "doc": "姣忚鎶婂洖娆鹃噾棰濇牳閿�鍒颁竴寮犱笟鍔″崟鎹細biz_type 20閿�鍞鍗�/21閿�鍞嚭搴�/23寮�绁紝biz_no銆佸崟鎹噾棰濄�佸凡鏍搁攢閲戦鐢卞悗绔寜 biz_id 鍥炲~锛涙瘡琛屾牳閿�棰濅笉寰楄秴杩囪鍗曟嵁鍓╀綑搴旀敹锛涗笉浼� items 涓斿甫 invoice_id 鏃惰嚜鍔ㄧ敓鎴愪竴鏉″紑绁ㄦ牳閿�琛�",
+ "upstream": [
+ "鍥炴",
+ "閿�鍞鍗�",
+ "閿�鍞嚭搴撳崟",
+ "鍙戠エ"
+ ],
+ "downstream": [
+ "瀹㈡埛搴旀敹瀵硅处",
+ "鏈牳閿�搴旀敹鎶ヨ〃"
+ ],
+ "keywords": "鏍搁攢 鏍搁攢鏄庣粏 write off item receivable_item"
+ },
+ {
+ "name": "閿�鍞洰鏍�",
+ "module": "閿�鍞鐞�",
+ "table": "crm_sales_target",
+ "doc": "骞�/瀛�/鏈埫椾釜浜�/閮ㄩ棬/浜у搧缁村害鐨勫悎鍚屽洖娆剧瓑鐩爣",
+ "upstream": [],
+ "downstream": [
+ "涓氱哗缁熻"
+ ],
+ "keywords": "鐩爣 target 涓氱哗"
+ },
+ {
+ "name": "渚涘簲鍟�",
+ "module": "渚涘簲鍟嗙鐞�",
+ "table": "srm_supplier",
+ "doc": "渚涘簲鍟嗘。妗堬細鎵х収/绋庡彿锛涘涓仈绯讳汉(srm_supplier_contact)涓庡涓摱琛岃处鎴�(srm_supplier_bank路鍚摱琛岃鍙�)锛屼富琛ㄤ繚鐣欓粯璁よ仈绯讳汉/榛樿閾惰瀛楁锛孍RP 涓� MES 鍏辩敤",
+ "upstream": [
+ "鎵嬪伐寤烘。/Excel 瀵煎叆"
+ ],
+ "downstream": [
+ "璇环姣斾环",
+ "鎶曟爣淇濊瘉閲�",
+ "閲囪喘璁㈠崟",
+ "鍒拌揣閫氱煡",
+ "渚涘簲鍟嗛��璐�",
+ "渚涘簲鍟嗗線鏉�"
+ ],
+ "keywords": "渚涘簲鍟� supplier vendor 鑱旂郴浜� 寮�鎴疯 閾惰琛屽彿"
+ },
+ {
+ "name": "璇环姣斾环",
+ "module": "渚涘簲鍟嗙鐞�",
+ "table": "srm_inquiry",
+ "doc": "XJ缂栧彿锛岃崏绋�0鈫掑凡杞鍗�20鈫掑凡鍙栨秷30(10璇环涓负鍘嗗彶鐘舵��)锛涙柊澧�/缂栬緫鏃朵竴骞跺綍鍏ヤ骇鍝佽脳鍙備笌渚涘簲鍟嗘姤浠�(srm_inquiry_quote)骞堕�夊畾姣忎釜浜у搧鐨勪腑鏍囦緵搴斿晢锛屾棤闇�鍗曠嫭鐨勬姤浠�/姣斾环姝ラ锛岀‘璁ゅ悗鎸変腑鏍囦緵搴斿晢鎷嗗垎鐢熸垚閲囪喘璁㈠崟鑽夌骞惰褰� srm_inquiry_order",
+ "upstream": [
+ "渚涘簲鍟�",
+ "涓绘暟鎹�(鐗╂枡)"
+ ],
+ "downstream": [
+ "閲囪喘璁㈠崟(鑽夌)"
+ ],
+ "keywords": "璇环 姣斾环 鎶ヤ环 涓爣 inquiry quote"
+ },
+ {
+ "name": "鎶曟爣淇濊瘉閲�",
+ "module": "閿�鍞鐞�",
+ "table": "crm_bid_bond",
+ "doc": "BZ缂栧彿鍙拌处锛屾寜瀹㈡埛(鎷涙爣鏂�)鐧昏鎶曟爣淇濊瘉閲戯細椤圭洰鍚嶇О/鎷涙爣缂栧彿/淇濊瘉閲戦噾棰�/缂寸撼鏃ユ湡锛屽彲鍏宠仈璇ュ鎴峰凡瀹℃牳鐨勯攢鍞鍗�(閿�鍞彴璐︼紝鍥炲~璁㈠崟鍙蜂笌璁㈠崟閲戦)锛涗腑鏍囩粨鏋�(0寰呭紑鏍�1宸蹭腑鏍�2鏈腑鏍�)锛屾湭涓爣璺熻釜閫�鍥炵姸鎬�(0鏈��1閮ㄥ垎2宸查��3鏃犻渶閫�)/閫�鍥為噾棰�/閫�鍥炴棩鏈燂紱閫夐攢鍞鍗曡嚜鍔ㄧ疆涓哄凡涓爣涓斾笉鍙笌鏈腑鏍囧苟瀛�",
+ "upstream": [
+ "瀹㈡埛",
+ "閿�鍞鍗�(閿�鍞彴璐�)"
+ ],
+ "downstream": [
+ "瀹㈡埛寰�鏉�/搴旀敹瀵硅处(鍙傝��)"
+ ],
+ "keywords": "鎶曟爣淇濊瘉閲� 涓爣 鏈腑鏍� 閫�鍥� 閫�娆� 鎷涙爣 bid bond"
+ },
+ {
+ "name": "閲囪喘鐢宠",
+ "module": "杩涢攢瀛�",
+ "table": "erp_purchase_request",
+ "doc": "CGSQ缂栧彿锛孊PM 瀹℃壒锛岄�氳繃鍚庢湁渚涘簲鍟嗚嚜鍔ㄧ敓鎴愯鍗�",
+ "upstream": [
+ "鐢熶骇缂哄彛(浜哄伐)"
+ ],
+ "downstream": [
+ "閲囪喘璁㈠崟"
+ ],
+ "keywords": "閲囪喘鐢宠 璇疯喘 request"
+ },
+ {
+ "name": "閲囪喘璁㈠崟",
+ "module": "杩涢攢瀛�",
+ "table": "erp_purchase_order",
+ "doc": "鑿滃崟鍚嶃�岄噰璐彴璐︺�嶏紝CGDD缂栧彿锛孊PM 瀹℃壒(鑽夌0鈫掑鎵逛腑15鈫掑凡瀹℃牳20)锛屽叆搴撶姸鎬�:鏈�0閮ㄥ垎1鍏ㄩ儴2锛涜〃澶村惈閲囪喘绫诲瀷(鐢熶骇/鍔炲叕鐢ㄥ搧/鍏朵粬)銆佸悎鍚屽彿(鎵嬪伐杈撳叆涓嶈嚜鍔ㄧ敓鎴�)銆侀」鐩悕绉般�佷粯娆炬棩鏈�(蹇呭~锛岃秴30澶╄处鏈熸爣绾�)銆佷粯娆炬柟寮�(鐢垫眹/姹囩エ/鐜伴噾/鎵嬫満鏀粯)锛涙槑缁嗕骇鍝佺紪鍙峰揩鐓� MDM 鐗╂枡缂栫爜锛涙潵婧愬彲涓洪噰璐敵璇枫�佽浠锋瘮浠风‘璁ょ敓鎴愮殑鑽夌鎴栭攢鍞鍗�/鐢熶骇宸ュ崟(鏉ユ簮鍗曞彿鍥炴函)锛涘崟浠蜂负鍚◣鍗曚环锛屼环绋庡悎璁�=鍗曚环脳鏁伴噺锛岀◣棰濅粠鍚◣閲戦涓弽绠�(涓嶅啀棰濆鍔犵◣)",
+ "upstream": [
+ "閲囪喘鐢宠",
+ "璇环姣斾环(纭涓爣)"
+ ],
+ "downstream": [
+ "鍒拌揣閫氱煡",
+ "閲囪喘鏉ョエ",
+ "渚涘簲鍟嗛��璐�(绾︽潫鐗╂枡)",
+ "渚涘簲鍟嗗線鏉�"
+ ],
+ "keywords": "閲囪喘璁㈠崟 purchase"
+ },
+ {
+ "name": "閲囪喘鏉ョエ",
+ "module": "杩涢攢瀛�",
+ "table": "erp_purchase_invoice",
+ "doc": "FPD缂栧彿锛孉I OCR 棰勫~锛岀疮璁♀墹璁㈠崟鎬讳环锛屼粯娆惧崟鐨勫墠缃紱蹇呴』鍚屾椂缁戝畾閲囪喘璁㈠崟涓� MES 閲囪喘鍏ュ簱鍗�(item_receipt_id)锛屾寜璁㈠崟涓庡叆搴撳崟涓ゅ眰鍓╀綑鍙潵绁ㄩ搴︽牎楠岋紱渚涘簲鍟嗗線鏉ュ彸渚у睍绀哄紑绁ㄩ噾棰�/宸蹭粯/鍓╀綑搴斾粯",
+ "upstream": [
+ "閲囪喘璁㈠崟",
+ "MES 閲囪喘鍏ュ簱鍗�"
+ ],
+ "downstream": [
+ "浠樻鍗�",
+ "渚涘簲鍟嗗線鏉�",
+ "璁拌处鍑瘉"
+ ],
+ "keywords": "鏉ョエ 鍙戠エ 閲囪喘鍙戠エ 鍏ュ簱鍗�"
+ },
+ {
+ "name": "浠樻鍗�",
+ "module": "璐㈠姟",
+ "table": "erp_finance_payment",
+ "doc": "FKD缂栧彿锛屽繀椤诲叧鑱旀潵绁�+闄勪欢锛岀疮璁♀墹鏉ョエ閲戦锛孊PM 瀹℃壒",
+ "upstream": [
+ "閲囪喘鏉ョエ"
+ ],
+ "downstream": [
+ "缁撶畻璐︽埛",
+ "渚涘簲鍟嗗線鏉�"
+ ],
+ "keywords": "浠樻 搴斾粯 payment"
+ },
+ {
+ "name": "渚涘簲鍟嗗線鏉�",
+ "module": "杩涢攢瀛�",
+ "table": "鏃犵嫭绔嬭〃(鑱氬悎瑙嗗浘)",
+ "doc": "鎸変緵搴斿晢+鏃堕棿鑼冨洿鑱氬悎閲囪喘璁㈠崟/鏉ョエ/浠樻锛氭眹鎬荤疮璁¢噰璐銆佺疮璁″紑绁ㄩ銆佺疮璁′粯娆鹃銆佹湭浠樹綑棰濓紱宸︿晶璁㈠崟琛屽惈宸插紑绁�/鏈紑绁ㄩ噾棰濓紝鍙充晶鏉ョエ琛屽惈寮�绁ㄩ噾棰�/宸蹭粯/鍓╀綑搴斾粯",
+ "upstream": [
+ "閲囪喘璁㈠崟",
+ "閲囪喘鏉ョエ",
+ "浠樻鍗�"
+ ],
+ "downstream": [],
+ "keywords": "渚涘簲鍟嗗線鏉� 瀵硅处 寮�绁ㄩ噾棰� 搴斾粯 statement"
+ },
+ {
+ "name": "鏀舵鍗�",
+ "module": "璐㈠姟",
+ "table": "erp_finance_receipt",
+ "doc": "SKD缂栧彿锛屽叧鑱� CRM 瀹㈡埛鏍¢獙锛屾棤 BPM(鎵嬪姩瀹℃牳)",
+ "upstream": [
+ "閿�鍞�(寮卞叧鑱�)"
+ ],
+ "downstream": [
+ "缁撶畻璐︽埛"
+ ],
+ "keywords": "鏀舵 搴旀敹 receipt"
+ },
+ {
+ "name": "浼氳绉戠洰",
+ "module": "浼氳鏍哥畻",
+ "table": "fin_account_subject",
+ "doc": "绉戠洰鏍戯紝parent_id 鑷叧鑱旓紱绉戠洰绫诲瀷1璧勪骇2璐熷��3鏉冪泭4鎴愭湰5鎹熺泭锛屼綑棰濇柟鍚�1鍊�2璐凤紝鐘舵��0鍚敤1绂佺敤锛涜处琛ㄤ笌鍒嗗綍缁熶竴鎸� subject_code 鍙栨暟",
+ "upstream": [
+ "浼氳绉戠洰绉嶅瓙绾�68鏉′竴绾х鐩�"
+ ],
+ "downstream": [
+ "璁拌处鍑瘉鍒嗗綍",
+ "鎬昏处",
+ "鏄庣粏璐�"
+ ],
+ "keywords": "浼氳绉戠洰 绉戠洰 subject account 璧勪骇绫� 璐熷�虹被 鎹熺泭绫�"
+ },
+ {
+ "name": "璁拌处鍑瘉",
+ "module": "浼氳鏍哥畻",
+ "table": "fin_voucher",
+ "doc": "鍑瘉瀛楀彿鍙暀绌虹敱鍚庣鑷姩鐢熸垚锛涚姸鎬� 鏈繃璐�0/宸茶繃璐�10/宸蹭綔搴�20锛涘凡杩囪处涓嶅彲鏀癸紝鏈繃璐︿笌宸茶繃璐﹀潎鍙綔搴燂紝鏈繃璐︿笌宸蹭綔搴熷彲鍒犻櫎锛涘彲閫氳繃 source_type/source_id/source_no 鍏宠仈寮�绁�/鍥炴/鏉ョエ/浠樻绛夋潵婧愬崟鎹苟鏀寔鎸夋潵婧愬崟鍙锋绱紱闄勪欢鎸� recordType=fin_voucher 鎸傜郴缁熼檮浠朵腑蹇�",
+ "upstream": [
+ "浼氳绉戠洰",
+ "寮�绁�",
+ "鍥炴",
+ "閲囪喘鏉ョエ",
+ "浠樻鍗�"
+ ],
+ "downstream": [
+ "鎬昏处",
+ "鏄庣粏璐�",
+ "璐㈠姟鎶ヨ〃鐪嬫澘"
+ ],
+ "keywords": "璁拌处鍑瘉 鍑瘉 voucher 杩囪处 浣滃簾 鍊熻捶骞宠 "
+ },
+ {
+ "name": "鍑瘉鍒嗗綍",
+ "module": "浼氳鏍哥畻",
+ "table": "fin_voucher_entry",
+ "doc": "鍑瘉涓嬮�愯鍒嗗綍锛氱鐩紪鐮�+鍊�/璐烽噾棰�+杈呭姪鏍哥畻(1瀹㈡埛2渚涘簲鍟�3閮ㄩ棬4鍛樺伐5椤圭洰)锛涗竴琛屼笉鍙�熻捶鍚屾椂澶т簬0锛屽叏琛ㄥ�熻捶鍚堣蹇呴』鐩哥瓑涓斿ぇ浜�0",
+ "upstream": [
+ "璁拌处鍑瘉",
+ "浼氳绉戠洰"
+ ],
+ "downstream": [
+ "鎬昏处",
+ "鏄庣粏璐�"
+ ],
+ "keywords": "鍑瘉鍒嗗綍 鍒嗗綍 entry 鍊熸柟 璐锋柟 杈呭姪鏍哥畻"
+ },
+ {
+ "name": "鍥哄畾璧勪骇",
+ "module": "浼氳鏍哥畻",
+ "table": "fin_fixed_asset",
+ "doc": "璧勪骇鍗$墖锛岀姸鎬� 1鍦ㄧ敤/2闂茬疆/3缁翠慨涓�/4宸叉姤搴燂紱鏈堟姌鏃ч=(鍘熷�济�(1-娈嬪�肩巼))梅(骞撮檺脳12)锛岀疮璁℃姌鏃т笌鍑�鍊肩敱璁℃彁绱姞锛屼笉鎺ユ敹鍓嶇浼犲��",
+ "upstream": [],
+ "downstream": [
+ "璐㈠姟鎶ヨ〃鐪嬫澘",
+ "鎬昏处"
+ ],
+ "keywords": "鍥哄畾璧勪骇 鎶樻棫 璧勪骇鍗$墖 fixed asset 娈嬪�肩巼"
+ },
+ {
+ "name": "鏃犲舰璧勪骇",
+ "module": "浼氳鏍哥畻",
+ "table": "fin_intangible_asset",
+ "doc": "鏃犲舰璧勪骇鍗$墖(璇佷功缂栧彿/鏈夋晥鏈�)锛岀姸鎬� 1鍦ㄧ敤/2宸插け鏁�/3宸叉憡閿�瀹岋紱鏈堟憡閿�棰�=(鍘熷�济�(1-娈嬪�肩巼))梅(鎽婇攢骞撮檺脳12)锛岀疮璁℃憡閿�涓庡噣鍊肩敱璁℃彁绱姞",
+ "upstream": [],
+ "downstream": [
+ "璐㈠姟鎶ヨ〃鐪嬫澘",
+ "鎬昏处"
+ ],
+ "keywords": "鏃犲舰璧勪骇 鎽婇攢 杞欢钁椾綔鏉� 涓撳埄 intangible 鏈夋晥鏈�"
+ },
+ {
+ "name": "閿�鍞鍗�",
+ "module": "杩涢攢瀛�",
+ "table": "erp_sale_order",
+ "doc": "XSDD缂栧彿锛孊PM 瀹℃壒锛岄渶鐢熶骇琛岃嚜鍔ㄥ缓 MPS锛屽嚭搴撶姸鎬�:鏈�0宸查鐣�1閮ㄥ垎2鍏ㄩ儴3锛岀敓浜у畬鎴愪簨浠跺洖鍐�",
+ "upstream": [
+ "鍚堝悓"
+ ],
+ "downstream": [
+ "MPS",
+ "鍙戣揣閫氱煡",
+ "閿�鍞嚭搴�",
+ "鍞悗宸ュ崟"
+ ],
+ "keywords": "閿�鍞鍗� sale"
+ },
+ {
+ "name": "涓荤敓浜ц鍒�",
+ "module": "鐢熶骇",
+ "table": "mes_pro_mps",
+ "doc": "MPS璁″垝锛岃崏绋�0鈫掑凡涓嬪彂1鈫掑畬鎴�2/鍙栨秷3锛屽彲鍚堝苟涓嬪彂",
+ "upstream": [
+ "閿�鍞鍗�"
+ ],
+ "downstream": [
+ "鐢熶骇宸ュ崟"
+ ],
+ "keywords": "MPS 涓昏鍒� 鐢熶骇璁″垝"
+ },
+ {
+ "name": "鐢熶骇宸ュ崟",
+ "module": "鐢熶骇",
+ "table": "mes_pro_work_order",
+ "doc": "鑽夌0鈫掑凡纭1鈫掑畬鎴�2/鍙栨秷3锛岀‘璁ゆ椂鎸夊伐鑹鸿矾绾跨敓鎴愪换鍔★紝鏈�鍚庝竴閬撳伐搴忔姤宸ュ洖鍐欏凡鐢熶骇鏁伴噺",
+ "upstream": [
+ "MPS"
+ ],
+ "downstream": [
+ "鐢熶骇浠诲姟",
+ "棰嗘枡",
+ "瀹屽伐鍏ュ簱"
+ ],
+ "keywords": "宸ュ崟 鐢熶骇宸ュ崟 work order"
+ },
+ {
+ "name": "鐢熶骇浠诲姟",
+ "module": "鐢熶骇",
+ "table": "mes_pro_task",
+ "doc": "宸ュ簭绮掑害锛岄澶�0鈫掔敓浜т腑1鈫掗儴鍒�2鈫掑畬鎴�4锛屽彲鏆傚仠9鍙栨秷5",
+ "upstream": [
+ "鐢熶骇宸ュ崟"
+ ],
+ "downstream": [
+ "鎶ュ伐"
+ ],
+ "keywords": "浠诲姟 task 宸ュ簭"
+ },
+ {
+ "name": "鎶ュ伐鍗�",
+ "module": "鐢熶骇",
+ "table": "mes_pro_feedback",
+ "doc": "鑽夌0鈫掑鎵逛腑2鈫掑緟妫�3/瀹屾垚4锛屾寜宸ュ簭椤哄簭鏍¢獙(涓婇亾宸ュ簭鎶ユ弧鎵嶅彲鎶�)锛岃仈鍔ㄥ�掑啿娑堣��/浜у嚭鍏ュ簱/IPQC锛涜川妫�宸ュ簭鎶ュ伐瀹℃壒鍚庤浆寰呮楠屽苟鐢熸垚 PENDING 浜у嚭琛岋紝绛夊凡瀹屾垚 IPQC 鎸夌墿鏂�+鐩樺彿+鏁伴噺鍏宠仈鍚庢墠鍥炲啓瀹屾垚銆傛姤宸ユ椂蹇収宸ュ簭璁¤垂绫诲瀷/宸ヨ祫瀹氶骞惰绠楁姤宸ュ伐璧勶細鍗曚环浼樺厛鎸夊伐鑹鸿矾绾�+涓昏浠疯澶�+鐢熸晥鏃ユ湡鍖归厤鍗曚环瑙勫垯锛屾湭鍛戒腑鍥為��宸ュ簭宸ヨ祫瀹氶锛涘伐璧勫瓧娈�(绯绘暟/鍔犲噺閲戦/璁′环鏁伴噺)璋冩暣涓�+杈呭伐璧勶紱璁′欢鎸夊悎鏍兼暟閲忚浠凤紝璐ㄦ宸ュ簭鎸夊悎鏍肩巼搴旂敤璐ㄩ噺绯绘暟鎴栦笉鍚堟牸鎵f锛屽伐璧勮鍦ㄦ姤宸ヤ汉(feedback_user_id)鍚嶄笅锛屽鎵归�氳繃鍚庤繘鍏ヨ柂閰牳绠椼�傝川妫�宸ュ簭鎻愪氦鏃惰嚜鍔ㄧ敓鎴愯崏绋胯繃绋嬫楠屽崟锛屽鎵瑰墠蹇呴』瀹屾垚銆備繚瀛樻椂鎸夊伐搴忔爣鍑嗗伐鏃堕厤缃�+鐢熶骇闀垮害+杈呭姪椤规鏁板揩鐓ф爣鍑嗗伐鏃�(涓诲伐鏃�+杈呭姪宸ユ椂)涓庤绠椾緷鎹紝瀹為檯宸ユ椂涓庢爣鍑嗗伐鏃剁殑宸紓浠呯敤浜庤�冩牳瀵规瘮锛屼笉鍙備笌宸ヨ祫璁$畻",
+ "upstream": [
+ "鐢熶骇浠诲姟",
+ "鐢熶骇宸ュ簭"
+ ],
+ "downstream": [
+ "浜у搧浜у嚭",
+ "鐗╂枡娑堣��",
+ "IPQC",
+ "钖叕鏍哥畻"
+ ],
+ "keywords": "鎶ュ伐 feedback 宸ヨ祫 璁′欢 璁℃椂 宸ユ椂 鍗曚环瑙勫垯 璁惧 鍚堟牸鐜� 杈呭姪宸ヨ祫 杩囩▼妫�楠�"
+ },
+ {
+ "name": "鐢熶骇宸ュ簭",
+ "module": "鐢熶骇",
+ "table": "mes_pro_process",
+ "doc": "宸ュ簭涓绘暟鎹紝璁¤垂绫诲瀷 1-璁℃椂/2-璁′欢锛屽伐璧勫畾棰濓紙璁℃椂鍏�/灏忔椂銆佽浠跺厓/浠讹級锛涙姤宸ユ椂鎸夋湰宸ュ簭閰嶇疆蹇収骞惰绠楁姤宸ュ伐璧勶紱鍙︾淮鎶よ嚜瀹氫箟宸ヨ祫瀛楁銆佹寜宸ヨ壓璺嚎/璁惧/鐢熸晥鏃ユ湡鐨勫崟浠疯鍒欍�佽川閲忓伐璧勮鍒欎笌杈呭姪灏忔椂宸ヨ祫锛屽伐鑹鸿矾绾挎寜宸ュ簭鎺掑簭椹卞姩浠诲姟銆傛爣鍑嗗伐鏃堕厤缃� std_time_mode(0鏈惎鐢�/1杞�熋楄妭璺�/2绾块�熷害鐩村彇/3婊¢�熺櫨鍒嗘瘮脳鑺傝窛)銆佹姌绠楃郴鏁般�佹弧杞�熶笌鍙傛暟缂栫爜锛岀敤浜庢姤宸ユ椂璁$畻鑰冩牳鐢ㄦ爣鍑嗗伐鏃�",
+ "upstream": [],
+ "downstream": [
+ "宸ヨ壓璺嚎",
+ "鎶ュ伐",
+ "杈呭姪宸ユ椂閰嶇疆"
+ ],
+ "keywords": "宸ュ簭 process 璁¤垂绫诲瀷 宸ヨ祫瀹氶 宸ヨ祫瀛楁 鍗曚环瑙勫垯 璐ㄩ噺瑙勫垯 杈呭姪灏忔椂宸ヨ祫 璁′欢 璁℃椂 鏍囧噯宸ユ椂 鎶樼畻绯绘暟"
+ },
+ {
+ "name": "杈呭姪宸ユ椂閰嶇疆",
+ "module": "鐢熶骇",
+ "table": "mes_pro_worktime_aux",
+ "doc": "鎸夊伐搴�(鍙�夋満鍙�)缁存姢杈呭姪宸ユ椂椤圭洰锛氭寜娆�/鎸変釜/鎸夌洏璁¢噺鏃堕暱锛屾垨鎸夌背浠ユ姌绠楅�熷害璁℃椂锛涙崲鑹插満鏅寜鏉愭枡瀵�(鏉愭枡鈫掓潗鏂�)閰嶇疆銆傛姤宸ユ椂鎿嶄綔宸ユ墜宸ュ綍鍏ユ鏁�/绫虫暟锛岀郴缁熸姌绠楄緟鍔╁伐鏃跺苟璁″叆鏍囧噯宸ユ椂蹇収",
+ "upstream": [
+ "鐢熶骇宸ュ簭"
+ ],
+ "downstream": [
+ "鎶ュ伐"
+ ],
+ "keywords": "杈呭姪宸ユ椂 鎹㈣壊 娆℃暟 鎶樼畻 worktime aux"
+ },
+ {
+ "name": "宸ヨ壓璺嚎",
+ "module": "鐢熶骇",
+ "table": "mes_pro_route",
+ "doc": "宸ュ簭椤哄簭+璐ㄦ/鍏抽敭/鍊掑啿鏍囪锛岄┍鍔ㄥ伐鍗曚换鍔′笌鎶ュ伐瑙勫垯",
+ "upstream": [],
+ "downstream": [
+ "鐢熶骇宸ュ崟"
+ ],
+ "keywords": "宸ヨ壓 璺嚎 route 宸ュ簭"
+ },
+ {
+ "name": "鍒拌揣閫氱煡鍗�",
+ "module": "浠撳偍",
+ "table": "mes_wm_arrival_notice",
+ "doc": "閲囪喘璁㈠崟纭鏀惰揣鐢熸垚锛岃崏绋�0鈫掑緟璐ㄦ2鈫掑緟鍏ュ簱3鈫掑畬鎴�4锛涜〃澶村甫閲囪喘鍚堝悓鍙�(閫夋嫨閲囪喘璁㈠崟鑷姩甯﹀叆锛屾崲璐у埌璐ф部鐢ㄥ師閫�璐у崟鍚堝悓鍙�)锛屽彲鎸夊悎鍚屽彿妫�绱�",
+ "upstream": [
+ "閲囪喘璁㈠崟",
+ "渚涘簲鍟嗛��璐�(鎹㈣揣)"
+ ],
+ "downstream": [
+ "IQC",
+ "閲囪喘鍏ュ簱"
+ ],
+ "keywords": "鍒拌揣 鏀惰揣 arrival 鍚堝悓鍙�"
+ },
+ {
+ "name": "閲囪喘鍏ュ簱鍗�",
+ "module": "浠撳偍",
+ "table": "mes_wm_item_receipt",
+ "doc": "鑽夌0鈫掑緟涓婃灦2鈫掑緟鎵ц3鈫掑畬鎴�4锛屽畬鎴愬悗搴撳瓨+骞跺洖鍐� ERP inCount/inStatus",
+ "upstream": [
+ "鍒拌揣閫氱煡"
+ ],
+ "downstream": [
+ "搴撳瓨鍙拌处",
+ "閲囪喘璁㈠崟(鍥炲啓)"
+ ],
+ "keywords": "閲囪喘鍏ュ簱 鏀惰揣鍏ュ簱 receipt"
+ },
+ {
+ "name": "鐢熶骇棰嗘枡鍗�",
+ "module": "浠撳偍",
+ "table": "mes_wm_product_issue",
+ "doc": "鑽夌0鈫掑緟鎷h揣2鈫掑緟鎵ц3鈫掑畬鎴�4锛屽簱瀛�-",
+ "upstream": [
+ "鐢熶骇宸ュ崟"
+ ],
+ "downstream": [
+ "搴撳瓨鍙拌处"
+ ],
+ "keywords": "棰嗘枡 issue"
+ },
+ {
+ "name": "閿�鍞嚭搴撳崟",
+ "module": "浠撳偍",
+ "table": "mes_wm_product_sales",
+ "doc": "鍙戣揣閫氱煡瀹℃牳鍚庣敓鎴愶紝鎻愪氦鍚庢湁 oqcCheckFlag 琛岃浆寰呮娴�1锛堟彁浜ゆ椂涓嶅啀鑷姩寤� OQC锛夛紝闇�璐ㄦ鍛樼嫭绔嬪綍鍏� OQC 骞跺湪妫�楠屽崟璇︽儏鎸夌墿鏂�+鐩樺彿+鏁伴噺鍏宠仈寰呮琛岋紱鍏ㄩ儴寰呮琛屽悎鏍煎悗杞緟鎷h揣2鈫掑彂杩�10鈫掑緟鎵ц3鈫掑畬鎴�4锛屽洖鍐欓攢鍞鍗曞嚭搴撴暟涓庣姸鎬�",
+ "upstream": [
+ "鍙戣揣閫氱煡",
+ "閿�鍞鍗�"
+ ],
+ "downstream": [
+ "搴撳瓨鍙拌处",
+ "OQC"
+ ],
+ "keywords": "閿�鍞嚭搴� 鍙戣揣 鍑哄簱鍗� sales"
+ },
+ {
+ "name": "閿�鍞��璐у崟",
+ "module": "浠撳偍",
+ "table": "mes_wm_return_sales",
+ "doc": "鑽夌鈫掑緟妫�楠�(RQC)鈫掑緟涓婃灦鈫掑緟鍏ュ簱鈫掑畬鎴愶紝鍞悗涓庢墜宸ヤ袱鏉ユ簮",
+ "upstream": [
+ "鍞悗閫�璐�(浠撳偍鍙戣捣)"
+ ],
+ "downstream": [
+ "搴撳瓨鍙拌处",
+ "RQC"
+ ],
+ "keywords": "閿�鍞��璐� 閫�璐у叆搴�"
+ },
+ {
+ "name": "渚涘簲鍟嗛��璐у崟",
+ "module": "浠撳偍",
+ "table": "mes_wm_return_vendor",
+ "doc": "璐ㄩ噺閮ㄥ彂璧烽��璐э紝鑽夌0鈫掑鎵逛腑1(BPM锛氶噰璐啋璐ㄩ噺鈫掍粨搴�)鈫掑緟鎷h揣2鈫掑緟鎵ц閫�璐�3鈫掑畬鎴�4锛屽彲鍙栨秷5锛屽簱瀛�-锛涗笂浼犻檮浠惰蛋 storage-attachment锛涘鐞嗘柟寮� 1閫�娆�(瀹屾垚鍚庤嚜鍔ㄧ敓鎴愯礋鏁板啿绾粯娆惧崟) / 2鎹㈣揣(瀹屾垚鍚庤嚜鍔ㄧ敓鎴愬緟璐ㄦ鍒拌揣閫氱煡鍗曞苟鍒涘缓 IQC锛岄噸鏂板叆搴撹川妫�)锛涘悎鍚屽彿浠庨噰璐鍗曞揩鐓�",
+ "upstream": [
+ "IQC",
+ "閲囪喘璁㈠崟(鍚堝悓鍙�)"
+ ],
+ "downstream": [
+ "搴撳瓨鍙拌处",
+ "閲囪喘璁㈠崟(returnCount)",
+ "浠樻鍗�(鍐茬孩)",
+ "鍒拌揣閫氱煡(鎹㈣揣)"
+ ],
+ "keywords": "渚涘簲鍟嗛��璐� 閫�鏂� 閫�璐� vendor"
+ },
+ {
+ "name": "璋冩嫧鍗�",
+ "module": "浠撳偍",
+ "table": "mes_wm_transfer",
+ "doc": "鍐呴儴/澶栭儴璋冩嫧锛屾垚瀵� MOVE_OUT+MOVE_IN 浜嬪姟锛屽湪閫旀暟閲�",
+ "upstream": [],
+ "downstream": [
+ "搴撳瓨鍙拌处"
+ ],
+ "keywords": "璋冩嫧 绉诲簱 transfer"
+ },
+ {
+ "name": "鐩樼偣浠诲姟",
+ "module": "浠撳偍",
+ "table": "mes_wm_stock_taking_task",
+ "doc": "闈欐��/鍔ㄦ�佺洏鐐癸紝琛岀粨鏋�:姝e父/鐩樼泩(ADJUST_IN)/鐩樹簭(ADJUST_OUT)锛屽彲鍐荤粨搴撳瓨銆佺洸鐩�",
+ "upstream": [
+ "搴撳瓨鍙拌处"
+ ],
+ "downstream": [
+ "搴撳瓨鍙拌处(璋冩暣)"
+ ],
+ "keywords": "鐩樼偣 鐩樼泩 鐩樹簭 stock taking"
+ },
+ {
+ "name": "搴撳瓨鍙拌处",
+ "module": "浠撳偍",
+ "table": "mes_wm_material_stock",
+ "doc": "鐗╂枡脳浠撳簱脳搴撳尯脳搴撲綅脳鎵规脳渚涘簲鍟嗗叚鍏冪粍锛屾暟閲�/鍐荤粨/鍗犵敤/鍦ㄩ�斿洓閲�",
+ "upstream": [
+ "鍏ㄩ儴鍏ュ簱鍗�"
+ ],
+ "downstream": [
+ "鍏ㄩ儴鍑哄簱鍗�",
+ "浜嬪姟娴佹按"
+ ],
+ "keywords": "搴撳瓨 鍙拌处 stock 鍙敤閲�"
+ },
+ {
+ "name": "鎵规",
+ "module": "浠撳偍",
+ "table": "mes_wm_batch",
+ "doc": "鍏宠仈鐗╂枡/宸ュ崟/渚涘簲鍟�/瀹㈡埛/璐ㄩ噺鐘舵�侊紱SN 鐮佸惈鎵规 uuid锛涙潯鐮佹敮鎸�18绉嶄笟鍔″璞�",
+ "upstream": [
+ "鍏ュ簱鍗曟嵁"
+ ],
+ "downstream": [
+ "搴撳瓨鍙拌处"
+ ],
+ "keywords": "鎵规 batch SN 鏉$爜 杩芥函"
+ },
+ {
+ "name": "IQC鏉ユ枡妫�楠�",
+ "module": "璐ㄩ噺",
+ "table": "mes_qc_iqc",
+ "doc": "鍒拌揣閫氱煡/澶栧崗鍏ュ簱瑙﹀彂锛岃崏绋�0鈫掑畬鎴�4锛岀粨璁哄洖鍐欐潵婧愬崟鎹紱琛屾搷浣溿�屽嚭鎶ュ憡銆嶄粎鍦ㄥ凡瀹屾垚鏃跺彲瑙侊紱鏀寔 Excel 鎵归噺瀵煎叆锛堝伐鍏锋爮銆屾壒閲忓鍏ャ�嶏紝绾柊澧炪�佸鍏ュ崟涓鸿崏绋裤�佺紪鍙峰彲鐣欑┖鑷姩鐢熸垚锛夛紱鍚屼竴鎵规暟鎹笉鍙噸澶嶅鍏ワ紙鐗╂枡+渚涘簲鍟�+渚涘簲鍟嗘壒娆�+鏉ユ枡鏃ユ湡锛屾枃浠跺唴閲嶅琛屼笌搴撳唴宸叉湁鍗曢兘鎷掕琛岋級",
+ "upstream": [
+ "鍒拌揣閫氱煡",
+ "澶栧崗鍏ュ簱",
+ "Excel 鎵归噺瀵煎叆"
+ ],
+ "downstream": [
+ "閲囪喘鍏ュ簱",
+ "渚涘簲鍟嗛��璐�",
+ "NCR",
+ "鎶ュ憡瀹炰緥(鍑烘姤鍛�)"
+ ],
+ "keywords": "IQC 鏉ユ枡妫�楠� 鍑烘姤鍛� 鎵归噺瀵煎叆 瀵煎叆妯℃澘"
+ },
+ {
+ "name": "IPQC杩囩▼妫�楠�",
+ "module": "璐ㄩ噺",
+ "table": "mes_qc_ipqc",
+ "doc": "鎶ュ伐璐ㄦ宸ュ簭浜у嚭琛屽緟妫�鍚庣嫭绔嬪綍鍏ワ紝瀹屾垚鏃舵寜鍚堟牸+涓嶅悎鏍�=妫�娴嬫暟閲忚嚜鍔ㄥ垽瀹� 1 閫氳繃/2 涓嶉�氳繃锛堥渶宸蹭笂浼犳楠岄檮浠讹級锛涘凡瀹屾垚涓旀湭缁戝畾鏉ユ簮鐨勫崟鎹紝鍦ㄨ鎯呮寜鐗╂枡+鐩樺彿+鏁伴噺涓�鑷撮�夋嫨寰呮浜у嚭琛屽叧鑱旓紝鍥炲啓鎶ュ伐瀹屾垚涓庝骇鍑哄叆搴擄紱鏈叧鑱斾笉鍥炲啓銆傝鎿嶄綔銆屽嚭鎶ュ憡銆嶄粎鍦ㄥ凡瀹屾垚鏃跺彲瑙侊紱鏀寔 Excel 鎵归噺瀵煎叆锛堜骇鍝佺墿鏂欑敱鐢熶骇宸ュ崟鎺ㄥ锛屾ā鏉夸笉濉墿鏂欙紱宸ュ簾+鏂欏簾+鍏朵粬搴熷搧涓嶅緱瓒呰繃涓嶅悎鏍煎搧鏁伴噺锛夛紱鍚屼竴鎵规暟鎹笉鍙噸澶嶅鍏ワ紙鐢熶骇宸ュ崟+妫�楠岀被鍨�+宸ヤ綅+妫�娴嬫棩鏈燂紝鏂囦欢鍐呴噸澶嶈涓庡簱鍐呭凡鏈夊崟閮芥嫆璇ヨ锛�",
+ "upstream": [
+ "鎶ュ伐",
+ "Excel 鎵归噺瀵煎叆"
+ ],
+ "downstream": [
+ "浜у嚭鍏ュ簱",
+ "NCR",
+ "鎶ュ憡瀹炰緥(鍑烘姤鍛�)"
+ ],
+ "keywords": "IPQC 杩囩▼妫�楠� 宸℃ 鐩樺彿鍏宠仈 鎶ュ伐鍏宠仈 鍑烘姤鍛� 鎵归噺瀵煎叆 瀵煎叆妯℃澘"
+ },
+ {
+ "name": "OQC鍑鸿揣妫�楠�",
+ "module": "璐ㄩ噺",
+ "table": "mes_qc_oqc",
+ "doc": "閿�鍞嚭搴撴彁浜ゅ悗寰呮娴嬭鐙珛褰曞叆锛屽畬鎴愭椂鎸夊悎鏍�+涓嶅悎鏍�=妫�娴嬫暟閲忚嚜鍔ㄥ垽瀹� 1 閫氳繃/2 涓嶉�氳繃锛堥渶宸蹭笂浼犳楠岄檮浠讹級锛涘凡瀹屾垚涓旀湭缁戝畾鏉ユ簮鐨勫崟鎹紝鍦ㄨ鎯呮寜鐗╂枡+鐩樺彿+鏁伴噺涓�鑷撮�夋嫨寰呮鍑哄簱琛屽叧鑱旓紝鍥炲啓鍑哄簱琛岃川閲忕姸鎬� PASS/FAIL锛屽叏閮ㄥ緟妫�琛屽悎鏍煎悗鍑哄簱鍗曡浆寰呮嫞璐э紱涓嶅悎鏍艰鐣欏緟鍚庣画澶勭疆锛屼笉鑷姩鍙栨秷鍑哄簱鍗曘�傝鎿嶄綔銆屽嚭鎶ュ憡銆嶄粎鍦ㄥ凡瀹屾垚鏃跺彲瑙侊紱鏀寔 Excel 鎵归噺瀵煎叆锛堝鎴烽』鍦ㄥ綋鍓嶇櫥褰曠敤鎴风殑瀹㈡埛鏁版嵁鏉冮檺鑼冨洿鍐咃級锛涘悓涓�鎵规暟鎹笉鍙噸澶嶅鍏ワ紙鐗╂枡+瀹㈡埛+鎵规鍙�+鍑鸿揣鏃ユ湡锛屾枃浠跺唴閲嶅琛屼笌搴撳唴宸叉湁鍗曢兘鎷掕琛岋級",
+ "upstream": [
+ "閿�鍞嚭搴撳崟",
+ "Excel 鎵归噺瀵煎叆"
+ ],
+ "downstream": [
+ "閿�鍞嚭搴撳崟(鎺ㄨ繘)",
+ "鎶ュ憡瀹炰緥(鍑烘姤鍛�)"
+ ],
+ "keywords": "OQC 鍑鸿揣妫�楠� 鍑哄巶妫�楠� 鐩樺彿鍏宠仈 鍑哄簱鍏宠仈 鍑烘姤鍛� 鎵归噺瀵煎叆 瀵煎叆妯℃澘"
+ },
+ {
+ "name": "RQC閫�璐ф楠�",
+ "module": "璐ㄩ噺",
+ "table": "mes_qc_rqc",
+ "doc": "鐢熶骇閫�鏂�/閿�鍞��璐�/鍞悗閫�璐цЕ鍙戯紝缁撹鍥炶皟鍞悗锛涜鎿嶄綔銆屽嚭鎶ュ憡銆嶄粎鍦ㄥ凡瀹屾垚鏃跺彲瑙併�傛帾杈炲凡缁熶竴涓恒�岄��璐ф楠屻�嶏紙鍘熻彍鍗曠埗椤逛笌 mes_qc_type 瀛楀吀鍐欍�岄��鏂欐楠屻�嶏紝涓庡悗绔灇涓�/琛ㄦ敞閲�/鑿滃崟鏉冮檺瀛愰」涓嶄竴鑷达紱RQC 涓夎�呴兘瑕嗙洊锛屾晠鍙栥�岄��璐ф楠屻�嶏級",
+ "upstream": [
+ "閫�鏂�",
+ "閫�璐�"
+ ],
+ "downstream": [
+ "閫�璐у叆搴�",
+ "鍞悗鍥炶皟",
+ "鎶ュ憡瀹炰緥(鍑烘姤鍛�)"
+ ],
+ "keywords": "RQC 閫�璐ф楠� 閫�鏂欐楠� 鍑烘姤鍛�"
+ },
+ {
+ "name": "NCR涓嶅悎鏍煎搧",
+ "module": "璐ㄩ噺",
+ "table": "mes_qc_ncr",
+ "doc": "寰呰瘎瀹�0鈫掓彁浜PM瀹℃壒涓�2鈫掑鎵归�氳繃宸茶瘎瀹�6(椹冲洖/鍙栨秷鍥炲緟璇勫)鈫掑凡澶勭疆7鈫掑凡鍏抽棴8锛涘鎵规剰瑙佺敱 BPM 娴佽浆璁板綍鎵胯浇锛岃川閲忛儴鏈�缁堝缃�:璁╂鏀捐/杩斾慨/杩斿伐/鎶ュ簾(閫�璐�/闄嶇骇浠呭巻鍙插睍绀�)",
+ "upstream": [
+ "IQC/IPQC/OQC/RQC"
+ ],
+ "downstream": [
+ "閫�璐�/鎶ュ簾/杩斿伐(鍙拌处)"
+ ],
+ "keywords": "NCR 涓嶅悎鏍� 澶勭疆 鐗归噰 鎶ュ簾"
+ },
+ {
+ "name": "璁惧",
+ "module": "璁惧",
+ "table": "mes_dv_machinery",
+ "doc": "鍙拌处鐘舵��:鍋滄満/鐢熶骇涓�/淇濆吇涓紱鐐规路淇濆吇路缁翠慨宸ュ崟锛汚I 椋庨櫓棰勬祴娑堣垂鍏舵暟鎹�",
+ "upstream": [],
+ "downstream": [
+ "鐐规",
+ "缁翠慨",
+ "鐢熶骇椋庨櫓棰勬祴"
+ ],
+ "keywords": "璁惧 鐐规 淇濆吇 缁翠慨 machinery"
+ },
+ {
+ "name": "鍞悗宸ュ崟",
+ "module": "鍞悗",
+ "table": "after_sale_ticket",
+ "doc": "鑽夌0鈫掑鐞嗕腑10鈫掑緟鍏ュ簱30鈫掑緟閫�娆�40鈫掑畬缁�50鈫掑叧闂�60/鍙栨秷99锛屽垽瀹�:涓�鑸�/缁翠慨/閫�璐э紱瀹㈡埛璇夋眰鍙嶉鎻忚堪+闄勪欢銆佸鐞嗙粨鏋�+闄勪欢锛涘垱寤�/鏇存柊/鍒ゅ畾/瀹岀粨/褰掓。/鍙栨秷/鍥炶鍐欏叆娴佽浆璁板綍",
+ "upstream": [
+ "瀹㈡埛鍙嶉(浜哄伐褰曞叆)"
+ ],
+ "downstream": [
+ "缁翠慨璁板綍",
+ "浠撳偍閿�鍞��璐�(鍘熼��璐х敵璇烽〉闈㈠凡涓嬬嚎)"
+ ],
+ "keywords": "鍞悗 宸ュ崟 ticket 缁翠慨 瀹㈡埛璇夋眰 澶勭悊缁撴灉 娴佽浆璁板綍"
+ },
+ {
+ "name": "宸ュ崟娴佽浆璁板綍",
+ "module": "鍞悗",
+ "table": "after_sale_ticket_flow",
+ "doc": "鍞悗宸ュ崟姣忔鍔ㄤ綔鐣欑棔锛氬姩浣滅紪鐮�/鍚嶇О銆佸彉鏇村墠鍚庣姸鎬併�佸唴瀹广�佹搷浣滀汉銆佹椂闂�",
+ "upstream": [
+ "鍞悗宸ュ崟"
+ ],
+ "downstream": [],
+ "keywords": "鍞悗 娴佽浆璁板綍 flow"
+ },
+ {
+ "name": "閫�璐х敵璇�",
+ "module": "鍞悗",
+ "table": "after_sale_return",
+ "doc": "鍚庡彴淇濈暀锛屽敭鍚庨〉闈㈠凡涓嬬嚎锛涜崏绋�0鈫掑凡瀹℃牳20(鑷姩寤篗ES閫�璐у崟)鈫掑凡璐ㄦ40鈫掑凡鍏ュ簱50鈫掑凡閫�娆�60鈫掑叧闂�70锛涚被鍨�:閫�娆鹃��璐�/鎹㈣揣/浠呴��娆�",
+ "upstream": [
+ "鍞悗宸ュ崟"
+ ],
+ "downstream": [
+ "閿�鍞��璐у崟",
+ "閫�娆�"
+ ],
+ "keywords": "鍞悗閫�璐� return"
+ },
+ {
+ "name": "鍛樺伐",
+ "module": "浜哄姏",
+ "table": "hrm_employee",
+ "doc": "鍦ㄨ亴1/璇曠敤2/绂昏亴3锛屽叆鑱岃嚜鍔ㄥ缓绯荤粺璐﹀彿锛涚鑱岀敵璇峰埌鏈熻嚜鍔ㄧ疆涓虹鑱�3骞跺仠鐢ㄧ郴缁熻处鍙�",
+ "upstream": [],
+ "downstream": [
+ "浜ゆ帴鏄犲皠",
+ "鑰冨嫟",
+ "钖叕"
+ ],
+ "keywords": "鍛樺伐 鍏ヨ亴 employee 绂昏亴"
+ },
+ {
+ "name": "绂昏亴鐢宠",
+ "module": "浜哄姏",
+ "table": "hrm_resignation_application",
+ "doc": "鑽夌0鈫掑鎵逛腑10鈫掗�氳繃20/椹冲洖30/鎾ら攢40锛涘鎵归�氳繃鍚庡彲浜ゆ帴0鈫�10鈫�20锛涘埌鏈熶换鍔″啓瀹為檯绂昏亴鏃ユ湡銆佹妸鍛樺伐鐘舵�佹敼涓虹鑱�3骞跺仠鐢ㄧ郴缁熻处鍙�",
+ "upstream": [
+ "鍛樺伐"
+ ],
+ "downstream": [
+ "鍛樺伐妗f鐘舵��",
+ "绂昏亴浜ゆ帴"
+ ],
+ "keywords": "绂昏亴 resignation 瀹℃壒 浜ゆ帴 鑷姩绂昏亴"
+ },
+ {
+ "name": "绂昏亴浜ゆ帴",
+ "module": "浜哄姏",
+ "table": "hrm_user_handover",
+ "doc": "鍚屾椂璁板綍绂昏亴/浜ゆ帴鍙屾柟鍛樺伐ID涓庣敤鎴稩D锛涗氦鎺ュ畬鎴�20 鍚� expandUserIds 鎵╁睍浜ゆ帴浜哄彲瑙佹暟鎹紱瀹℃壒閫氳繃涓斿埌棰勮绂昏亴鏃ユ湡鍚庤嚜鍔ㄦ妸鍛樺伐鐘舵�佹敼涓虹鑱�3骞跺仠鐢ㄧ郴缁熻处鍙�",
+ "upstream": [
+ "绂昏亴鐢宠"
+ ],
+ "downstream": [
+ "鍚勬ā鍧楁垜鐨勬暟鎹煡璇�",
+ "鍛樺伐妗f鐘舵��"
+ ],
+ "keywords": "浜ゆ帴 绂昏亴 handover expandUserIds 鑷姩绂昏亴"
+ },
+ {
+ "name": "鎶ュ憡妯℃澘",
+ "module": "璐ㄦ鎶ュ憡",
+ "table": "qc_report_template",
+ "doc": "鏅鸿兘璐ㄦ鎶ュ憡妯℃澘锛屽惎鐢�0/鍋滅敤1锛涚敾甯冨唴瀹瑰瓨鍦� qc_report_template_version锛堣崏绋�0/宸插彂甯�1/宸插仠鐢�2锛屽凡鍙戝竷涓嶅彲瑕嗙洊锛夛紝currentVersion 鎸囧悜褰撳墠宸插彂甯冪増鏈紱婧愭枃浠剁粡 AI 瀵煎叆璇嗗埆鎴愯崏绋垮悗鐢变汉宸ョ‘璁ゆ墠鎴愪负鐗堟湰锛涘悓涓�妯℃澘閲嶅瀵煎叆鎸夈�愭浛鎹€�戝鐞嗏�斺�斿厛鍒犳棫闄勪欢锛堣繛甯� blob 琛屼笌纾佺洏鏂囦欢锛夊啀缁戞柊鐨勶紝涓嶇暀瀛ゅ効鏂囦欢锛涘垹闄ゆā鏉夸細杩炲甫娓呴檮浠�",
+ "upstream": [
+ "浜哄伐璁捐(GrapesJS 璁捐鍣�)",
+ "AI 瀵煎叆鑽夌(qc-report/ai-import/draft)"
+ ],
+ "downstream": [
+ "妯℃澘鐗堟湰",
+ "鎶ュ憡瀹炰緥"
+ ],
+ "keywords": "鎶ュ憡妯℃澘 璐ㄦ鎶ュ憡 template 璁捐鍣� 鐗堟湰 AI瀵煎叆 璇嗗埆 鑽夌 婧愭枃浠舵浛鎹�"
+ },
+ {
+ "name": "鎶ュ憡瀹炰緥",
+ "module": "璐ㄦ鎶ュ憡",
+ "table": "qc_report_instance",
+ "doc": "鍑轰欢浜х墿锛岀紪鍙� QR+yyyyMMdd+4浣嶆祦姘存寜澶╃嫭绔嬩笖涓氬姟鍞竴锛屽彲鏄惧紡鎸囧畾瑕嗙洊锛堟敞鎰� uk_report_no 涓嶅尯鍒嗚蒋鍒犻櫎锛屽垹鎺夌殑鍙蜂笉鍥炴敹锛夛紱涓ゆ潯鍑轰欢鍏ュ彛锛氶�氱敤 generate锛堣皟鐢ㄦ柟鑷甫 context锛変笌 generate-from-qc锛堟暟鎹粠 MES 璐ㄦ鍗曞彇锛屾潈闄愮爜 qc-report:instance:generate 宸插叆 system_menu id=1075416锛屼簲閬撴牎楠屾寜涓氬姟浼樺厛绾у彧鎶ョ涓�澶勶細105_000 绫诲瀷闈炴硶 / 105_001 鍗曟嵁涓嶅瓨鍦� / 105_002 鏈畬鎴� / 105_003 鏈垽瀹� / 105_005 妯℃澘绫诲瀷涓嶇 / 105_006 鏃犲彲鐢ㄦ楠岄」锛涘洓寮犺川妫�鍗曞垪琛ㄧ殑琛屾搷浣溿�屽嚭鎶ュ憡銆嶄粎鍦� status=宸插畬鎴愭椂鍙锛屽脊绐楀彧鍒� reportType 涓�鑷淬�佹ā鏉垮惎鐢ㄣ�佷笖 currentVersion 鎸囧悜鐨勭増鏈凡鍙戝竷鐨勬ā鏉匡紙鍚庣 /qc-report/template/selectable 鍒ゅ畾鈥斺�斿仠鐢ㄧ増鏈笉娓呯┖ currentVersion锛屽墠绔嬁鍒嗛〉缁撴灉鑷繁鎺ㄥ浼氭紡锛夛紝缁撴灉灏卞湴灞曠ず骞惰烦鏈〉鍒楄〃锛夛紱鍐荤粨 data_snapshot锛堝垽瀹氬悗鏁版嵁锛屽惈鍚庣绠楀ソ鐨� PASS/FAIL 涓庡悎鏍肩巼锛変笌 render_html锛況egenerate 鍙噸娓叉帓鐗堛�佹暟鎹笌缂栧彿涓嶅彉锛沚usiness_id/business_type 瀛� MES 琛ㄥ悕锛坢es_qc_iqc 绛夛級涓庡崟鎹� ID锛屽彲鍙嶆煡銆佷竴鍗曞彲鍑哄浠斤紱鎶ュ憡澶村彟甯﹀崟鎹師鍒ゅ畾 qcResult(鏁�)/qcResultText(涓枃锛屽悎鏍�/鐗归噰/涓嶅悎鏍奸��璐�/涓嶅悎鏍兼姤搴�)锛屼笌寮曟搸涓夋�佸垽瀹氬苟瀛樹簰涓嶈鐩栵紱鍝嶅簲甯� undecidableCount=蹇収涓� result 涓虹┖涓茬殑椤规暟涓� warnings锛堝垎缁勬爣棰樿烦杩�/鎸囨爣宸插垹/鏈綍瀹炴祴鍊�/鏍峰搧瓒�3锛夛紝涓よ�呴兘涓嶈惤搴撱�佷簨鍚庣湅涓嶅埌",
+ "upstream": [
+ "鎶ュ憡妯℃澘鐗堟湰",
+ "璐ㄦ鍗曚笂涓嬫枃(閫氱敤 generate 鐢辫皟鐢ㄦ柟浼犲叆)",
+ "MES 璐ㄦ鍗� IQC/IPQC/OQC/RQC(generate-from-qc 缁� MesQcReportApi 鍙栨暟)"
+ ],
+ "downstream": [
+ "鍓嶇瀹炰緥椤� /qc/report-instance(鍒楄〃路iframe棰勮路蹇収椤电路瀵煎嚭PDF)",
+ "PDF褰掓。(system_storage_attachment recordType=qc_report_instance)"
+ ],
+ "keywords": "鎶ュ憡瀹炰緥 鍑轰欢 QR缂栧彿 蹇収 澶嶇幇 regenerate PDF褰掓。 鎶ュ憡瀹炰緥椤� 瀵煎嚭PDF generate-from-qc 璐ㄦ鍗曞嚭鎶ュ憡 鍑烘姤鍛婂脊绐� qcResult undecidableCount warnings 寰呭垽瀹� 鍙嶆煡 涓氬姟鍗曟嵁绛涢��"
+ },
+ {
+ "name": "鍙戣揣閫氱煡鍗�",
+ "module": "浠撳偍鐗╂祦",
+ "table": "mes_wm_sales_notice",
+ "doc": "閿�鍞鍗曞鏍稿悗鐢熸垚锛岃褰曠墿娴佸叕鍙搞�佸揩閫掕垂銆佸紑绁ㄧ姸鎬侊紝缁忛粯璁ょ墿娴佸鎵瑰悗鍑哄簱锛涘垪琛ㄦ敮鎸佹寜浜у搧骞抽摵鍙拌处涓庡甫绔� Word 瀵煎嚭",
+ "upstream": [
+ "閿�鍞鍗�"
+ ],
+ "downstream": [
+ "閿�鍞嚭搴撳崟",
+ "鍙戣揣鍙拌处"
+ ],
+ "keywords": "鍙戣揣 鍙戣揣鍗� 鐗╂祦 蹇�掕垂 寮�绁ㄧ姸鎬� sales_notice"
+ },
+ {
+ "name": "瀹㈡埛鏀惰揣鍦板潃",
+ "module": "瀹㈡埛鍏崇郴",
+ "table": "crm_customer_address",
+ "doc": "瀹㈡埛妗f鐨勪竴鎴峰鏀惰揣鍦板潃锛屽惈鏀惰揣浜恒�佹墜鏈哄彿銆佸湴鍖轰笌璇︾粏鍦板潃锛屽彲璁鹃粯璁ゅ湴鍧�",
+ "upstream": [
+ "瀹㈡埛"
+ ],
+ "downstream": [
+ "鍙戣揣閫氱煡鍗�"
+ ],
+ "keywords": "鏀惰揣鍦板潃 澶氬湴鍧� 榛樿鍦板潃"
+ },
+ {
+ "name": "璐ㄩ噺宸℃",
+ "module": "璐ㄩ噺绠$悊",
+ "table": "mes_qc_patrol",
+ "doc": "鐙珛鐨勫贰妫�璁板綍锛屾寜鐗╂枡+鐩樺彿鐧昏鍚堟牸/涓嶅悎鏍兼暟閲忥紝涓嶇敓鎴愬簱瀛樹笟鍔″崟鎹�",
+ "upstream": [
+ "鐗╂枡",
+ "鎵规"
+ ],
+ "downstream": [],
+ "keywords": "宸℃ 璐ㄩ噺宸℃ patrol"
+ },
+ {
+ "name": "搴撳瓨鍐荤粨鏉ユ簮",
+ "module": "浠撳偍鐗╂祦",
+ "table": "mes_wm_material_stock_freeze_claim",
+ "doc": "鎸変汉宸�/鐩樼偣/璋冩嫧鏉ユ簮鍒嗗埆鎸佹湁搴撳瓨鍐荤粨锛岃В鍐诲彧閲婃斁瀵瑰簲鏉ユ簮锛岄伩鍏嶄簰鐩歌鐩�",
+ "upstream": [
+ "搴撳瓨鍙拌处"
+ ],
+ "downstream": [
+ "鐩樼偣浠诲姟",
+ "璋冩嫧鍗�"
+ ],
+ "keywords": "鍐荤粨 瑙e喕 鍐荤粨鏉ユ簮 freeze"
+ }
+ ]
}
\ No newline at end of file
diff --git a/docs/project-business/index.html b/docs/project-business/index.html
index c57eef9..d64a8c8 100644
--- a/docs/project-business/index.html
+++ b/docs/project-business/index.html
@@ -376,11 +376,11 @@
{"key": "pro", "name": "鐢熶骇绠$悊", "color": "#e0b34f", "tag": "MES-PRO", "flow": "production",
"positioning": "鐢熶骇鎵ц鏍稿績锛氳鍒�-宸ュ崟-浠诲姟-鎶ュ伐",
"problem": "璁㈠崟鍒拌溅闂存墽琛岀殑閫愬眰鎷嗚В涓庤繃绋嬪彲鎺�",
- "features": ["MPS涓荤敓浜ц鍒�(鍙敱閿�鍞鍗曡嚜鍔ㄥ垱寤郝峰悎骞朵笅鍙�)", "宸ュ崟(鎸夊伐鑹鸿矾绾胯嚜鍔ㄧ敓鎴愬伐搴忎换鍔�)", "鎶ュ伐(鎸夊伐搴忛『搴忔帶鍒堵稡PM瀹℃壒)", "鍊掑啿鎵g嚎杈瑰簱/浜у嚭鍏ュ簱", "瀹夌伅", "宸ヨ壓璺嚎路宸ュ簭路宸ュ崟BOM", "鐮斿彂璁捐椤圭洰(PD路瀹℃壒褰掓。)", "AI 鍥涚被棰勬祴"],
- "objects": ["MPS", "鐢熶骇宸ュ崟", "鐢熶骇浠诲姟", "鎶ュ伐鍗�", "宸ヨ壓璺嚎", "宸ュ崟BOM", "璁捐椤圭洰"],
+ "features": ["MPS涓荤敓浜ц鍒�(鍙敱閿�鍞鍗曡嚜鍔ㄥ垱寤郝峰悎骞朵笅鍙�)", "宸ュ崟(鎸夊伐鑹鸿矾绾胯嚜鍔ㄧ敓鎴愬伐搴忎换鍔�)", "鎶ュ伐(鎸夊伐搴忛『搴忔帶鍒堵稡PM瀹℃壒路鎸夎鏃�/璁′欢宸ヨ祫瀹氶璁¤柂)", "鏍囧噯宸ユ椂(杞�熋楄妭璺�/绾块�熷害/婊¢�熺櫨鍒嗘瘮+杈呭姪宸ユ椂)涓庡伐鏃惰�冩牳瀵规瘮", "鍊掑啿鎵g嚎杈瑰簱/浜у嚭鍏ュ簱", "瀹夌伅", "宸ヨ壓璺嚎路宸ュ簭路宸ュ崟BOM", "鐮斿彂璁捐椤圭洰(PD路瀹℃壒褰掓。)", "AI 鍥涚被棰勬祴"],
+ "objects": ["MPS", "鐢熶骇宸ュ崟", "鐢熶骇浠诲姟", "鎶ュ伐鍗�", "鐢熶骇宸ュ簭", "杈呭姪宸ユ椂閰嶇疆", "宸ヨ壓璺嚎", "宸ュ崟BOM", "璁捐椤圭洰"],
"roles": ["璁″垝鍛�", "杞﹂棿涓讳换", "鎿嶄綔宸�", "宸ヨ壓鍛�"],
"upstream": ["杩涢攢瀛�(閿�鍞鍗�)"], "downstream": ["浠撳偍(棰嗘枡/鍏ュ簱)", "璐ㄩ噺(IPQC)"],
- "coreTables": ["mes_pro_mps", "mes_pro_work_order", "mes_pro_task", "mes_pro_feedback", "mes_pro_route", "mes_pro_process", "mes_pro_work_order_bom", "mes_pd_project"]},
+ "coreTables": ["mes_pro_mps", "mes_pro_work_order", "mes_pro_task", "mes_pro_feedback", "mes_pro_worktime_aux", "mes_pro_feedback_aux", "mes_pro_route", "mes_pro_process", "mes_pro_work_order_bom", "mes_pd_project"]},
{"key": "wm", "name": "浠撳偍绠$悊", "color": "#7e6bd6", "tag": "MES-WM", "flow": "warehouse",
"positioning": "鍘傚唴 WMS锛氬崟鎹┍鍔ㄧ殑搴撳瓨璐﹀疄涓�鑷�",
"problem": "澶氭潵婧愬嚭鍏ュ簱銆佹壒娆�/SN 杩芥函銆佸簱瀛樼簿纭埌搴撲綅",
@@ -405,14 +405,14 @@
"roles": ["鎶ュ憡璁捐鍛�", "璐ㄦ鍛橈紙鍑轰欢锛�"],
"upstream": ["璐ㄩ噺锛堣川妫�鍗曚笂涓嬫枃锛屾湰杞敱璋冪敤鏂逛紶鍏ワ級"], "downstream": ["闄勪欢涓績锛圥DF 褰掓。路鍚庣画杞锛�", "BI"],
"coreTables": ["qc_report_template", "qc_report_template_version", "qc_report_instance", "qc_report_data_source", "qc_report_rule", "qc_report_render_record"]},
- {"key": "dv", "name": "璁惧涓庡伐瑁呮帓鐝�", "color": "#59a8b8", "tag": "MES-DV/TM/CAL", "flow": null,
+ {"key": "dv", "name": "璁惧涓庡伐瑁�", "color": "#59a8b8", "tag": "MES-DV/TM", "flow": null,
"positioning": "璁惧璧勪骇鍋ュ悍涓庣敓浜ц祫婧愪繚闅�",
- "problem": "璁惧鐐规淇濆吇缁翠慨鍙墽琛屻�佸伐瑁呯姸鎬佸彲鎺с�佺彮缁勬帓鐝湁渚濇嵁",
- "features": ["璁惧鍙拌处(鍋滄満/鐢熶骇涓�/淇濆吇涓�)", "鐐规路淇濆吇鏂规涓庤褰�", "缁翠慨宸ュ崟(鑽夌鈫掔淮淇啋寰呴獙鏀垛啋宸茬‘璁�)", "璁¢噺鍣ㄥ叿妫�瀹�", "宸ヨ澶瑰叿(鍦ㄥ簱/棰嗙敤/缁翠慨/鎶ュ簾)", "鐝粍路鐝路鎺掔彮璁″垝路鑺傚亣鏃�"],
- "objects": ["璁惧", "鐐规璁板綍", "缁翠慨宸ュ崟", "宸ヨ", "鎺掔彮璁″垝"],
- "roles": ["璁惧鍛�", "缁翠慨宸�", "宸ヨ绠$悊鍛�", "鎺掔彮鍛�"],
- "upstream": [], "downstream": ["鐢熶骇(AI 椋庨櫓棰勬祴娑堣垂璁惧鏁版嵁)", "钖叕(鎺掔彮宸ユ椂)"],
- "coreTables": ["mes_dv_machinery", "mes_dv_check_plan", "mes_dv_check_record", "mes_dv_repair", "mes_tm_tool", "mes_cal_plan", "mes_cal_team", "mes_cal_shift"]},
+ "problem": "璁惧鐐规淇濆吇缁翠慨鍙墽琛屻�佸伐瑁呯姸鎬佸彲鎺�",
+ "features": ["璁惧鍙拌处(鍋滄満/鐢熶骇涓�/淇濆吇涓�)", "鐐规路淇濆吇鏂规涓庤褰�", "缁翠慨宸ュ崟(鑽夌鈫掔淮淇啋寰呴獙鏀垛啋宸茬‘璁�)", "璁¢噺鍣ㄥ叿妫�瀹�", "宸ヨ澶瑰叿(鍦ㄥ簱/棰嗙敤/缁翠慨/鎶ュ簾)"],
+ "objects": ["璁惧", "鐐规璁板綍", "缁翠慨宸ュ崟", "宸ヨ"],
+ "roles": ["璁惧鍛�", "缁翠慨宸�", "宸ヨ绠$悊鍛�"],
+ "upstream": [], "downstream": ["鐢熶骇(AI 椋庨櫓棰勬祴娑堣垂璁惧鏁版嵁)"],
+ "coreTables": ["mes_dv_machinery", "mes_dv_check_plan", "mes_dv_check_record", "mes_dv_repair", "mes_tm_tool"]},
{"key": "aftersales", "name": "鍞悗鏈嶅姟", "color": "#c78bd6", "tag": "AFTER", "flow": "aftersales",
"positioning": "瀹㈡埛鍙嶉鍒伴��璐�/缁翠慨/閫�娆鹃棴鐜�",
"problem": "鍞悗宸ュ崟娴佽浆銆侀��璐т笌璐ㄦ鍏ュ簱閫�娆剧殑璺ㄧ郴缁熻仈鍔�",
@@ -424,11 +424,11 @@
{"key": "hrm", "name": "浜哄姏璧勬簮", "color": "#9db85a", "tag": "HRM", "flow": null,
"positioning": "鍛樺伐鍏ヨ浆璋冪涓庤�冨嫟钖叕",
"problem": "浜轰簨娴佺▼瀹℃壒鍖栥�佺鑱屾暟鎹笉涓�(浜ゆ帴)銆佺畻钖嚜鍔ㄥ寲",
- "features": ["鍛樺伐妗f(鍏ヨ亴鑷姩寤虹郴缁熻处鍙�)", "璇峰亣/鍔犵彮/璋冨矖/绂昏亴 BPM 瀹℃壒", "绂昏亴浜ゆ帴鍚屾椂杞Щ鍛樺伐ID/鐢ㄦ埛ID/涓氬姟鏁版嵁 expandUserIds", "绂昏亴鍒版湡鑷姩鎶婂憳宸ョ姸鎬佹敼涓虹鑱屽苟鍋滅敤绯荤粺璐﹀彿", "鑰冨嫟(鎵撳崱路瑙勫垯路鎺掔彮路琛ュ崱瀹℃壒路鏈堝害姹囨��)", "钖叕(搴斿彂-绀句繚鍏Н閲�-涓◣-璇峰亣鎵f路1.5/2/3鍊嶅姞鐝垂路鍙戞斁鍙拌处)", "鍩硅璇佷功(SQL鍏堣寰呭疄鐜�)"],
- "objects": ["鍛樺伐", "璇峰亣鍗�", "绂昏亴鐢宠", "浜ゆ帴鏄犲皠", "鑰冨嫟璁板綍", "钖叕鏍哥畻"],
+ "features": ["鍛樺伐妗f(鍏ヨ亴鑷姩寤虹郴缁熻处鍙�)", "璇峰亣/鍔犵彮/璋冨矖/绂昏亴 BPM 瀹℃壒", "绂昏亴浜ゆ帴鍚屾椂杞Щ鍛樺伐ID/鐢ㄦ埛ID/涓氬姟鏁版嵁 expandUserIds", "绂昏亴鍒版湡鑷姩鎶婂憳宸ョ姸鎬佹敼涓虹鑱屽苟鍋滅敤绯荤粺璐﹀彿", "鑰冨嫟(鎵撳崱路瑙勫垯路鎺掔彮路琛ュ崱瀹℃壒路鏈堝害姹囨��)", "钖叕(搴斿彂-绀句繚鍏Н閲�-涓◣-璇峰亣鎵f路1.5/2/3鍊嶅姞鐝垂路鍙戞斁鍙拌处)", "绀句繚鍏Н閲戞。妗堟寜閮ㄩ棬缁存姢(閮ㄩ棬涓嬪憳宸ュ叡鐢ㄦ渶鏂扮敓鏁堟。妗�)", "鍩硅璇佷功(SQL鍏堣寰呭疄鐜�)"],
+ "objects": ["鍛樺伐", "璇峰亣鍗�", "绂昏亴鐢宠", "浜ゆ帴鏄犲皠", "鑰冨嫟璁板綍", "閮ㄩ棬绀句繚妗f", "钖叕鏍哥畻"],
"roles": ["HR", "閮ㄩ棬涓荤", "鍛樺伐鏈汉"],
"upstream": [], "downstream": ["鍚勬ā鍧�(鏁版嵁鍙鎬ф墿灞�)", "system(璐﹀彿)"],
- "coreTables": ["hrm_employee", "hrm_leave_application", "hrm_resignation_application", "hrm_user_handover", "hrm_attendance_record", "hrm_salary_calculation", "hrm_salary_payment"]},
+ "coreTables": ["hrm_employee", "hrm_leave_application", "hrm_resignation_application", "hrm_user_handover", "hrm_attendance_record", "hrm_salary_calculation", "hrm_salary_payment", "hrm_employee_social_security"]},
{"key": "bpm", "name": "鍗忓悓瀹℃壒", "color": "#e6a23c", "tag": "BPM", "flow": null,
"positioning": "鍏ㄧ郴缁熷崟鎹鎵逛腑鏋紙Flowable锛�",
"problem": "澶氭ā鍧楀崟鎹渶瑕佺伒娲诲彲閰嶇殑澶氱骇瀹℃壒",
@@ -484,7 +484,9 @@
{"name": "涓荤敓浜ц鍒�", "module": "鐢熶骇", "table": "mes_pro_mps", "doc": "MPS璁″垝锛岃崏绋�0鈫掑凡涓嬪彂1鈫掑畬鎴�2/鍙栨秷3锛屽彲鍚堝苟涓嬪彂", "upstream": ["閿�鍞鍗�"], "downstream": ["鐢熶骇宸ュ崟"], "keywords": "MPS 涓昏鍒� 鐢熶骇璁″垝"},
{"name": "鐢熶骇宸ュ崟", "module": "鐢熶骇", "table": "mes_pro_work_order", "doc": "鑽夌0鈫掑凡纭1鈫掑畬鎴�2/鍙栨秷3锛岀‘璁ゆ椂鎸夊伐鑹鸿矾绾跨敓鎴愪换鍔★紝鏈�鍚庝竴閬撳伐搴忔姤宸ュ洖鍐欏凡鐢熶骇鏁伴噺", "upstream": ["MPS"], "downstream": ["鐢熶骇浠诲姟", "棰嗘枡", "瀹屽伐鍏ュ簱"], "keywords": "宸ュ崟 鐢熶骇宸ュ崟 work order"},
{"name": "鐢熶骇浠诲姟", "module": "鐢熶骇", "table": "mes_pro_task", "doc": "宸ュ簭绮掑害锛岄澶�0鈫掔敓浜т腑1鈫掗儴鍒�2鈫掑畬鎴�4锛屽彲鏆傚仠9鍙栨秷5", "upstream": ["鐢熶骇宸ュ崟"], "downstream": ["鎶ュ伐"], "keywords": "浠诲姟 task 宸ュ簭"},
- {"name": "鎶ュ伐鍗�", "module": "鐢熶骇", "table": "mes_pro_feedback", "doc": "鑽夌0鈫掑鎵逛腑2鈫掑緟妫�3/瀹屾垚4锛屾寜宸ュ簭椤哄簭鏍¢獙(涓婇亾宸ュ簭鎶ユ弧鎵嶅彲鎶�)锛岃仈鍔ㄥ�掑啿娑堣��/浜у嚭鍏ュ簱/IPQC", "upstream": ["鐢熶骇浠诲姟"], "downstream": ["浜у搧浜у嚭", "鐗╂枡娑堣��", "IPQC"], "keywords": "鎶ュ伐 feedback"},
+ {"name": "鎶ュ伐鍗�", "module": "鐢熶骇", "table": "mes_pro_feedback", "doc": "鑽夌0鈫掑鎵逛腑2鈫掑緟妫�3/瀹屾垚4锛屾寜宸ュ簭椤哄簭鏍¢獙(涓婇亾宸ュ簭鎶ユ弧鎵嶅彲鎶�)锛岃仈鍔ㄥ�掑啿娑堣��/浜у嚭鍏ュ簱/IPQC锛涙姤宸ユ椂蹇収宸ュ簭璁¤垂绫诲瀷/宸ヨ祫瀹氶骞惰绠楁姤宸ュ伐璧�(璁℃椂=宸ユ椂脳瀹氶锛岃浠�=鏁伴噺脳瀹氶)锛屽伐璧勮鍦ㄦ姤浜哄悕涓嬶紝瀹℃壒閫氳繃鍚庤繘鍏ヨ柂閰牳绠楋紱淇濆瓨鏃舵寜宸ュ簭鏍囧噯宸ユ椂閰嶇疆+鐢熶骇闀垮害+杈呭姪椤规鏁板揩鐓ф爣鍑嗗伐鏃�(涓诲伐鏃�+杈呭姪宸ユ椂)涓庤绠椾緷鎹紝瀹為檯宸ユ椂涓庢爣鍑嗗伐鏃跺樊寮備粎鐢ㄤ簬鑰冩牳瀵规瘮銆佷笉鍙備笌宸ヨ祫璁$畻", "upstream": ["鐢熶骇浠诲姟", "鐢熶骇宸ュ簭"], "downstream": ["浜у搧浜у嚭", "鐗╂枡娑堣��", "IPQC", "钖叕鏍哥畻"], "keywords": "鎶ュ伐 feedback 宸ヨ祫 璁′欢 璁℃椂 宸ユ椂"},
+ {"name": "鐢熶骇宸ュ簭", "module": "鐢熶骇", "table": "mes_pro_process", "doc": "宸ュ簭涓绘暟鎹紝璁¤垂绫诲瀷 1-璁℃椂/2-璁′欢锛屽伐璧勫畾棰�(璁℃椂鍏�/灏忔椂銆佽浠跺厓/浠�)锛涙姤宸ユ椂鎸夋湰宸ュ簭閰嶇疆蹇収骞惰绠楁姤宸ュ伐璧勶紝宸ヨ壓璺嚎鎸夊伐搴忔帓搴忛┍鍔ㄤ换鍔°�傛爣鍑嗗伐鏃堕厤缃� std_time_mode(0鏈惎鐢�/1杞�熋楄妭璺�/2绾块�熷害鐩村彇/3婊¢�熺櫨鍒嗘瘮脳鑺傝窛)銆佹姌绠楃郴鏁般�佹弧杞�熶笌鍙傛暟缂栫爜锛岀敤浜庢姤宸ユ椂璁$畻鑰冩牳鐢ㄦ爣鍑嗗伐鏃�", "upstream": [], "downstream": ["宸ヨ壓璺嚎", "鎶ュ伐", "杈呭姪宸ユ椂閰嶇疆"], "keywords": "宸ュ簭 process 璁¤垂绫诲瀷 宸ヨ祫瀹氶 璁′欢 璁℃椂 鏍囧噯宸ユ椂 鎶樼畻绯绘暟"},
+ {"name": "杈呭姪宸ユ椂閰嶇疆", "module": "鐢熶骇", "table": "mes_pro_worktime_aux", "doc": "鎸夊伐搴�(鍙�夋満鍙�)缁存姢杈呭姪宸ユ椂椤圭洰锛氭寜娆�/鎸変釜/鎸夌洏璁¢噺鏃堕暱锛屾垨鎸夌背浠ユ姌绠楅�熷害璁℃椂锛涙崲鑹插満鏅寜鏉愭枡瀵�(鏉愭枡鈫掓潗鏂�)閰嶇疆銆傛姤宸ユ椂鎿嶄綔宸ユ墜宸ュ綍鍏ユ鏁�/绫虫暟锛岀郴缁熸姌绠楄緟鍔╁伐鏃跺苟璁″叆鏍囧噯宸ユ椂蹇収", "upstream": ["鐢熶骇宸ュ簭"], "downstream": ["鎶ュ伐"], "keywords": "杈呭姪宸ユ椂 鎹㈣壊 娆℃暟 鎶樼畻 worktime aux"},
{"name": "宸ヨ壓璺嚎", "module": "鐢熶骇", "table": "mes_pro_route", "doc": "宸ュ簭椤哄簭+璐ㄦ/鍏抽敭/鍊掑啿鏍囪锛岄┍鍔ㄥ伐鍗曚换鍔′笌鎶ュ伐瑙勫垯", "upstream": [], "downstream": ["鐢熶骇宸ュ崟"], "keywords": "宸ヨ壓 璺嚎 route 宸ュ簭"},
{"name": "鍒拌揣閫氱煡鍗�", "module": "浠撳偍", "table": "mes_wm_arrival_notice", "doc": "閲囪喘璁㈠崟纭鏀惰揣鐢熸垚锛岃崏绋�0鈫掑緟璐ㄦ2鈫掑緟鍏ュ簱3鈫掑畬鎴�4", "upstream": ["閲囪喘璁㈠崟"], "downstream": ["IQC", "閲囪喘鍏ュ簱"], "keywords": "鍒拌揣 鏀惰揣 arrival"},
{"name": "閲囪喘鍏ュ簱鍗�", "module": "浠撳偍", "table": "mes_wm_item_receipt", "doc": "鑽夌0鈫掑緟涓婃灦2鈫掑緟鎵ц3鈫掑畬鎴�4锛屽畬鎴愬悗搴撳瓨+骞跺洖鍐� ERP inCount/inStatus", "upstream": ["鍒拌揣閫氱煡"], "downstream": ["搴撳瓨鍙拌处", "閲囪喘璁㈠崟(鍥炲啓)"], "keywords": "閲囪喘鍏ュ簱 鏀惰揣鍏ュ簱 receipt"},
@@ -508,7 +510,6 @@
{"name": "鍛樺伐", "module": "浜哄姏", "table": "hrm_employee", "doc": "鍦ㄨ亴1/璇曠敤2/绂昏亴3锛屽叆鑱岃嚜鍔ㄥ缓绯荤粺璐﹀彿锛涚鑱岀敵璇峰埌鏈熻嚜鍔ㄧ疆涓虹鑱�3骞跺仠鐢ㄧ郴缁熻处鍙�", "upstream": [], "downstream": ["浜ゆ帴鏄犲皠", "鑰冨嫟", "钖叕"], "keywords": "鍛樺伐 鍏ヨ亴 employee 绂昏亴"},
{"name": "绂昏亴鐢宠", "module": "浜哄姏", "table": "hrm_resignation_application", "doc": "鑽夌0鈫掑鎵逛腑10鈫掗�氳繃20/椹冲洖30/鎾ら攢40锛涘鎵归�氳繃鍚庡彲浜ゆ帴0鈫�10鈫�20锛涘埌鏈熶换鍔″啓瀹為檯绂昏亴鏃ユ湡銆佹妸鍛樺伐鐘舵�佹敼涓虹鑱�3骞跺仠鐢ㄧ郴缁熻处鍙�", "upstream": ["鍛樺伐"], "downstream": ["鍛樺伐妗f鐘舵��", "绂昏亴浜ゆ帴"], "keywords": "绂昏亴 resignation 瀹℃壒 浜ゆ帴 鑷姩绂昏亴"},
{"name": "绂昏亴浜ゆ帴", "module": "浜哄姏", "table": "hrm_user_handover", "doc": "鍚屾椂璁板綍绂昏亴/浜ゆ帴鍙屾柟鍛樺伐ID涓庣敤鎴稩D锛涗氦鎺ュ畬鎴�20 鍚� expandUserIds 鎵╁睍浜ゆ帴浜哄彲瑙佹暟鎹紱瀹℃壒閫氳繃涓斿埌棰勮绂昏亴鏃ユ湡鍚庤嚜鍔ㄦ妸鍛樺伐鐘舵�佹敼涓虹鑱�3骞跺仠鐢ㄧ郴缁熻处鍙�", "upstream": ["绂昏亴鐢宠"], "downstream": ["鍚勬ā鍧楁垜鐨勬暟鎹煡璇�", "鍛樺伐妗f鐘舵��"], "keywords": "浜ゆ帴 绂昏亴 handover expandUserIds 鑷姩绂昏亴"},
- {"name": "鎺掔彮璁″垝", "module": "璁惧", "table": "mes_cal_plan", "doc": "鐝粍脳鐝脳鏃ユ湡鎺掔彮锛屼緵鐢熶骇涓庤�冨嫟寮曠敤", "upstream": [], "downstream": ["鐢熶骇浠诲姟", "鑰冨嫟"], "keywords": "鎺掔彮 鐝粍 鐝 鏃ュ巻"},
{"name": "鎶ュ憡妯℃澘", "module": "璐ㄦ鎶ュ憡", "table": "qc_report_template", "doc": "鏅鸿兘璐ㄦ鎶ュ憡妯℃澘锛屽惎鐢�0/鍋滅敤1锛涚敾甯冨唴瀹瑰瓨鍦� qc_report_template_version锛堣崏绋�0/宸插彂甯�1/宸插仠鐢�2锛屽凡鍙戝竷涓嶅彲瑕嗙洊锛夛紝currentVersion 鎸囧悜褰撳墠宸插彂甯冪増鏈紱婧愭枃浠剁粡 AI 瀵煎叆璇嗗埆鎴愯崏绋垮悗鐢变汉宸ョ‘璁ゆ墠鎴愪负鐗堟湰锛涘悓涓�妯℃澘閲嶅瀵煎叆鎸夈�愭浛鎹€�戝鐞嗏�斺�斿厛鍒犳棫闄勪欢锛堣繛甯� blob 琛屼笌纾佺洏鏂囦欢锛夊啀缁戞柊鐨勶紝涓嶇暀瀛ゅ効鏂囦欢锛涘垹闄ゆā鏉夸細杩炲甫娓呴檮浠�", "upstream": ["浜哄伐璁捐(GrapesJS 璁捐鍣�)", "AI 瀵煎叆鑽夌(qc-report/ai-import/draft)"], "downstream": ["妯℃澘鐗堟湰", "鎶ュ憡瀹炰緥"], "keywords": "鎶ュ憡妯℃澘 璐ㄦ鎶ュ憡 template 璁捐鍣� 鐗堟湰 AI瀵煎叆 璇嗗埆 鑽夌 婧愭枃浠舵浛鎹�"},
{"name": "鎶ュ憡瀹炰緥", "module": "璐ㄦ鎶ュ憡", "table": "qc_report_instance", "doc": "鍑轰欢浜х墿锛岀紪鍙� QR+yyyyMMdd+4浣嶆祦姘存寜澶╃嫭绔嬩笖涓氬姟鍞竴锛屽彲鏄惧紡鎸囧畾瑕嗙洊锛堟敞鎰� uk_report_no 涓嶅尯鍒嗚蒋鍒犻櫎锛屽垹鎺夌殑鍙蜂笉鍥炴敹锛夛紱涓ゆ潯鍑轰欢鍏ュ彛锛氶�氱敤 generate锛堣皟鐢ㄦ柟鑷甫 context锛変笌 generate-from-qc锛堟暟鎹粠 MES 璐ㄦ鍗曞彇锛屾潈闄愮爜 qc-report:instance:generate 宸插叆 system_menu id=1075416锛屼簲閬撴牎楠屾寜涓氬姟浼樺厛绾у彧鎶ョ涓�澶勶細105_000 绫诲瀷闈炴硶 / 105_001 鍗曟嵁涓嶅瓨鍦� / 105_002 鏈畬鎴� / 105_003 鏈垽瀹� / 105_005 妯℃澘绫诲瀷涓嶇 / 105_006 鏃犲彲鐢ㄦ楠岄」锛涘洓寮犺川妫�鍗曞垪琛ㄧ殑琛屾搷浣溿�屽嚭鎶ュ憡銆嶄粎鍦� status=宸插畬鎴愭椂鍙锛屽脊绐楀彧鍒� reportType 涓�鑷淬�佹ā鏉垮惎鐢ㄣ�佷笖 currentVersion 鎸囧悜鐨勭増鏈凡鍙戝竷鐨勬ā鏉匡紙鍚庣 /qc-report/template/selectable 鍒ゅ畾鈥斺�斿仠鐢ㄧ増鏈笉娓呯┖ currentVersion锛屽墠绔嬁鍒嗛〉缁撴灉鑷繁鎺ㄥ浼氭紡锛夛紝缁撴灉灏卞湴灞曠ず骞惰烦鏈〉鍒楄〃锛夛紱鍐荤粨 data_snapshot锛堝垽瀹氬悗鏁版嵁锛屽惈鍚庣绠楀ソ鐨� PASS/FAIL 涓庡悎鏍肩巼锛変笌 render_html锛況egenerate 鍙噸娓叉帓鐗堛�佹暟鎹笌缂栧彿涓嶅彉锛沚usiness_id/business_type 瀛� MES 琛ㄥ悕锛坢es_qc_iqc 绛夛級涓庡崟鎹� ID锛屽彲鍙嶆煡銆佷竴鍗曞彲鍑哄浠斤紱鎶ュ憡澶村彟甯﹀崟鎹師鍒ゅ畾 qcResult(鏁�)/qcResultText(涓枃锛屽悎鏍�/鐗归噰/涓嶅悎鏍奸��璐�/涓嶅悎鏍兼姤搴�)锛屼笌寮曟搸涓夋�佸垽瀹氬苟瀛樹簰涓嶈鐩栵紱鍝嶅簲甯� undecidableCount=蹇収涓� result 涓虹┖涓茬殑椤规暟涓� warnings锛堝垎缁勬爣棰樿烦杩�/鎸囨爣宸插垹/鏈綍瀹炴祴鍊�/鏍峰搧瓒�3锛夛紝涓よ�呴兘涓嶈惤搴撱�佷簨鍚庣湅涓嶅埌", "upstream": ["鎶ュ憡妯℃澘鐗堟湰", "璐ㄦ鍗曚笂涓嬫枃(閫氱敤 generate 鐢辫皟鐢ㄦ柟浼犲叆)", "MES 璐ㄦ鍗� IQC/IPQC/OQC/RQC(generate-from-qc 缁� MesQcReportApi 鍙栨暟)"], "downstream": ["鍓嶇瀹炰緥椤� /qc/report-instance(鍒楄〃路iframe棰勮路蹇収椤电路瀵煎嚭PDF)", "PDF褰掓。(system_storage_attachment recordType=qc_report_instance)"], "keywords": "鎶ュ憡瀹炰緥 鍑轰欢 QR缂栧彿 蹇収 澶嶇幇 regenerate PDF褰掓。 鎶ュ憡瀹炰緥椤� 瀵煎嚭PDF generate-from-qc 璐ㄦ鍗曞嚭鎶ュ憡 鍑烘姤鍛婂脊绐� qcResult undecidableCount warnings 寰呭垽瀹� 鍙嶆煡 涓氬姟鍗曟嵁绛涢��"}
]
@@ -537,12 +538,13 @@
{"stage": "浠樻", "action": "閲囪喘鏉ョエ(FPD, AI OCR, 鈮よ鍗曟�讳环) 鈫� 浠樻鍗�(FKD 鍏宠仈鏉ョエ+闄勪欢, 鈮ゆ潵绁ㄩ噾棰�) BPM 瀹℃壒", "roles": ["璐㈠姟", "瀹℃壒浜�"]},
{"stage": "瀵硅处", "action": "渚涘簲鍟嗗線鏉ユ寜渚涘簲鍟嗘眹鎬伙細宸︿晶閲囪喘璁㈠崟娴佹按鍚凡寮�绁�/鏈紑绁ㄩ噾棰濓紝鍙充晶鏉ョエ娴佹按鍚紑绁ㄩ噾棰�/宸蹭粯/鍓╀綑搴斾粯骞堕檮浠樻娴佹按锛岄《閮ㄦ眹鎬荤疮璁¢噰璐�/寮�绁�/浠樻/鏈粯浣欓", "roles": ["璐㈠姟", "閲囪喘鍛�"]}]},
{"id": "production", "name": "鐢熶骇娴佺▼", "mermaid": "mermaid/04-production-flow.mmd", "color": "#e0b34f",
- "summary": "閿�鍞鍗曢┍鍔� MPS 鈫� 涓嬪彂宸ュ崟 鈫� 鎸夊伐鑹鸿矾绾挎媶宸ュ簭浠诲姟 鈫� 棰嗘枡/绾胯竟澶囨枡 鈫� 鎶ュ伐(宸ュ簭椤哄簭纭牎楠�+BPM) 鈫� 鍊掑啿娑堣��/浜у嚭鍏ュ簱/IPQC 鈫� 鏈亾宸ュ簭鍥炲啓杩涘害 鈫� 鑷姩瀹屽伐 鈫� ProductionFinishedEvent 鍥炲啓閿�鍞鍗曘��",
+ "summary": "閿�鍞鍗曢┍鍔� MPS 鈫� 涓嬪彂宸ュ崟 鈫� 鎸夊伐鑹鸿矾绾挎媶宸ュ簭浠诲姟 鈫� 棰嗘枡/绾胯竟澶囨枡 鈫� 鎶ュ伐(宸ュ簭椤哄簭纭牎楠�+BPM锛屾寜宸ュ簭璁¤垂绫诲瀷蹇収鎶ュ伐宸ヨ祫) 鈫� 鍊掑啿娑堣��/浜у嚭鍏ュ簱/IPQC 鈫� 鏈亾宸ュ簭鍥炲啓杩涘害 鈫� 鑷姩瀹屽伐 鈫� ProductionFinishedEvent 鍥炲啓閿�鍞鍗曪紱鎶ュ伐宸ヨ祫鍦ㄨ柂閰牳绠楁椂鎸夋姤宸ヤ汉姹囨�伙紝鍙汉宸ヨ皟鏁村悗璁″叆瀹炲彂銆傛姤宸ュ悓鏃舵寜宸ュ簭鏍囧噯宸ユ椂閰嶇疆+鐢熶骇闀垮害+杈呭姪椤规鏁板揩鐓ф爣鍑嗗伐鏃讹紝瀹為檯宸ユ椂涓庢爣鍑嗗伐鏃剁殑宸紓杩涘叆宸ユ椂鑰冩牳鎶ヨ〃(鎸変汉/宸ュ簭/鏈哄彴/鍛ㄦ湡)锛屾爣鍑嗗伐鏃跺彧鐢ㄤ簬鑰冩牳瀵规瘮銆佷笉鍙備笌宸ヨ祫璁$畻銆�",
"steps": [
{"stage": "璁″垝", "action": "MPS 鍒涘缓(鎵嬪伐鎴栭攢鍞鍗曡嚜鍔�)鈫掍笅鍙戞垨鍚堝苟涓嬪彂涓哄伐鍗�", "roles": ["璁″垝鍛�"]},
{"stage": "娲惧伐", "action": "宸ュ崟纭鎸夊伐鑹鸿矾绾块�愬伐搴忕敓鎴愪换鍔★紝鍙寚娲�/鏆傚仠/鍙栨秷", "roles": ["杞﹂棿涓讳换"]},
{"stage": "澶囨枡", "action": "鐢熶骇棰嗘枡鍗曞嚭搴撴垨绾胯竟铏氭嫙搴撳鏂�", "roles": ["浠撶"]},
- {"stage": "鎶ュ伐", "action": "鎻愪氦鎶ュ伐锛氫笂涓�閬撳伐搴忔湭鎶ユ弧鐩存帴鎷︽埅锛涘惎鐢� BPM 璧板鎵�", "roles": ["鎿嶄綔宸�"]},
+ {"stage": "鎶ュ伐", "action": "鎻愪氦鎶ュ伐锛氫笂涓�閬撳伐搴忔湭鎶ユ弧鐩存帴鎷︽埅锛涘惎鐢� BPM 璧板鎵癸紱鎸夊伐搴忚璐圭被鍨嬪揩鐓у伐璧�(璁℃椂=宸ユ椂脳瀹氶锛岃浠�=鏁伴噺脳瀹氶)锛岃鍒版姤宸ヤ汉鍚嶄笅锛涘悓鏃跺綍鍏ョ敓浜ч暱搴︿笌杈呭姪椤规鏁帮紝鎸夊伐搴忔爣鍑嗗伐鏃堕厤缃绠楀苟蹇収鏍囧噯宸ユ椂(涓诲伐鏃�+杈呭姪宸ユ椂)涓庤绠椾緷鎹紝閰嶇疆缂哄け鏃朵笉闃绘柇锛岃浆浜哄伐濉伐鏃跺苟璁板綍缂哄け鍘熷洜", "roles": ["鎿嶄綔宸�"]},
+ {"stage": "宸ユ椂鑰冩牳", "action": "瀹為檯宸ユ椂 vs 鏍囧噯宸ユ椂瀹炴椂姣斿锛屽樊寮傜巼瓒呴槇鍊�(榛樿20%)鎻愮ず锛涙姤琛ㄦ寜浜�/宸ュ簭/鏈哄彴/鍛ㄦ湡姹囨�绘姤宸ュ崟鏁般�佺敓浜ч暱搴︺�佸疄闄呭伐鏃躲�佹爣鍑嗗伐鏃躲�佸樊寮備笌宸紓鐜囷紝渚涜溅闂翠富浠讳笌宸ヨ壓鍛樻牳瀵�", "roles": ["杞﹂棿涓讳换", "宸ヨ壓鍛�"]},
{"stage": "鑱斿姩", "action": "瀹℃壒閫氳繃鎸夊伐搴忔爣璁�: 鍊掑啿鈫掕嚜鍔ㄧ墿鏂欐秷鑰楁墸绾胯竟搴�(鍏佽璐熷簱瀛�)锛涜川妫�鈫掍骇鍑哄緟妫�琛岀瓑 IPQC锛涘叧閿潪妫�鈫掔洿鎺ヤ骇鍑哄叆搴�", "roles": ["绯荤粺鑷姩"]},
{"stage": "瀹屽伐", "action": "浠呮湯閬撳伐搴忓洖鍐欏伐鍗曞凡鐢熶骇鏁伴噺锛岃揪鏍囪嚜鍔ㄥ畬鎴愶紱MPS 绱鍒ゆ柇瀹屾垚骞跺彂浜嬩欢缁欓攢鍞鍗�", "roles": ["绯荤粺鑷姩"]}]},
{"id": "quality", "name": "璐ㄩ噺娴佺▼", "mermaid": "mermaid/05-quality-flow.mmd", "color": "#e06c6c",
@@ -686,12 +688,11 @@
HTML 娓叉煋寮曟搸
鎶ュ憡鍑轰欢涓庣紪鍙�
鏁版嵁蹇収鍐荤粨
- 璁惧涓庢帓鐝�
+ 璁惧涓庡伐瑁�
璁惧鍙拌处
鐐规涓庝繚鍏�
缁翠慨宸ュ崟
宸ヨ澶瑰叿
- 鐝粍鐝涓庢帓鐝�
鍞悗鏈嶅姟
鍞悗宸ュ崟(瀹㈡埛璇夋眰/澶勭悊缁撴灉闄勪欢)
宸ュ崟娴佽浆璁板綍
@@ -791,6 +792,9 @@
P6 -->|閫氳繃涓斿�掑啿宸ュ簭| P7[鎸夊伐鍗旴OM鑷姩鐢熸垚鐗╂枡娑堣�椔锋墸绾胯竟铏氭嫙搴揊IFO鍏佽璐熷簱瀛榏
P6 -->|閫氳繃涓旇川妫�宸ュ簭| P8[鎶ュ伐杞緟妫�楠屄蜂骇鍑鸿 PENDING]
P6 -->|閫氳繃涓旈潪璐ㄦ鍏抽敭宸ュ簭| P9[浜у搧浜у嚭鐩存帴瀹屽伐鍏ュ簱]
+ P6 -->|閫氳繃路鎸夊伐搴忚璐圭被鍨嬪揩鐓ф姤宸ュ伐璧剕 P6W[鎶ュ伐宸ヨ祫路璁℃椂=宸ユ椂脳宸ヨ祫瀹氶 / 璁′欢=鎶ュ伐鏁伴噺脳宸ヨ祫瀹氶路璁板埌鎶ュ伐浜哄悕涓媇
+ P6W -.->|鏍哥畻鍛ㄦ湡鍐呭凡瀹℃壒鎶ュ伐姹囨�粅 HRM[钖叕鏍哥畻路鎶ュ伐宸ヨ祫鍙汉宸ヨ皟鏁村悗璁″叆瀹炲彂]
+ HRM -.->|鐐规姤宸ュ伐璧勩�屾槑缁嗐�峾 HRMD[鎶ュ伐宸ヨ祫鏄庣粏路鎸夋姤宸ュ崟灞曞紑涓诲伐璧�+杈呭姪宸ヨ祫+宸ヨ祫瀛楁(鍊�/鍗曚环/閲戦)+璐ㄩ噺璋冩暣=鏈�缁堝伐璧劼蜂笌鏍哥畻閲戦姣斿]
P8 -->|宸插畬鎴� IPQC 鎸夌墿鏂�+鐩樺彿+鏁伴噺涓�鑷撮�夊緟妫�浜у嚭琛屽叧鑱攟 P8L[鍥炲啓鎶ュ伐瀹屾垚路鎶ュ伐鐘舵�佲啋瀹屾垚4]
P8L -->|鍚堟牸鏁伴噺>0| P10[鍚堟牸琛屽叆搴撀蜂笉鍚堟牸鏁伴噺鎷嗗嚭涓轰笉鍚堟牸琛宂
P8L -->|涓嶅悎鏍兼暟閲�>0| P11[NCR 涓嶅悎鏍煎搧路绛夊緟鍚庣画澶勭疆]
@@ -962,6 +966,7 @@
ERP -->|閿�鍞鍗曞鎵圭敓鎴怣PS| MES
MES -->|鍏ュ簱鍑哄簱鍥炲啓鍗曟嵁杩涘害| ERP
MES -->|ProductionFinishedEvent| ERP
+ MES -->|MesProFeedbackWageApi路鎸夋姤宸ヤ汉姹囨�绘牳绠楀懆鏈熷唴宸插鎵规姤宸ュ伐璧剕 HRM
ERP -->|ErpFinanceStatisticsApi.getMonthlyStatistics路鍙彇宸插鏍� status=20 鐨勬敹娆句粯娆句笌璐攢閲戦| FIN[璐㈠姟鏍哥畻 FIN 绉戠洰路鍑瘉路鎬昏处鏄庣粏璐β疯祫浜ф姌鏃ф憡閿�路鎶ヨ〃鐪嬫澘]
MES -->|閫�璐ц川妫�鍏ュ簱鍥炶皟| AS[鍞悗宸ュ崟缁翠慨閫�璐
CRM -->|瀹㈡埛涓绘暟鎹畖 AS
diff --git a/docs/project-business/mermaid/01-business-mindmap.mmd b/docs/project-business/mermaid/01-business-mindmap.mmd
index 97981a4..dd06bdb 100644
--- a/docs/project-business/mermaid/01-business-mindmap.mmd
+++ b/docs/project-business/mermaid/01-business-mindmap.mmd
@@ -68,12 +68,11 @@
HTML 娓叉煋寮曟搸
鎶ュ憡鍑轰欢涓庣紪鍙�
鏁版嵁蹇収鍐荤粨
- 璁惧涓庢帓鐝�
+ 璁惧涓庡伐瑁�
璁惧鍙拌处
鐐规涓庝繚鍏�
缁翠慨宸ュ崟
宸ヨ澶瑰叿
- 鐝粍鐝涓庢帓鐝�
鍞悗鏈嶅姟
鍞悗宸ュ崟(瀹㈡埛璇夋眰/澶勭悊缁撴灉闄勪欢)
宸ュ崟娴佽浆璁板綍
diff --git a/docs/project-business/mermaid/02-sales-flow.mmd b/docs/project-business/mermaid/02-sales-flow.mmd
index 960e412..d3b71fa 100644
--- a/docs/project-business/mermaid/02-sales-flow.mmd
+++ b/docs/project-business/mermaid/02-sales-flow.mmd
@@ -1,6 +1,7 @@
flowchart TD
A[绾跨储 crm_clue] -->|杞寲路浠呬竴娆 B[瀹㈡埛 crm_customer]
B --> C[鑱旂郴浜� crm_contact]
+ B --> BADDR[瀹㈡埛鏀惰揣鍦板潃 crm_customer_address路涓�鎴峰鍦板潃路榛樿鍦板潃]
B -.->|鎸夋嫑鏍囨柟鐧昏淇濊瘉閲憒 BB[鎶曟爣淇濊瘉閲� crm_bid_bond路涓爣缁撴灉0寰呭紑鏍�1宸蹭腑鏍�2鏈腑鏍�/閫�鍥炵姸鎬乚
BB -.->|鏈腑鏍嚶疯窡韪��鍥為噾棰濅笌鏃ユ湡| BB
BB -->|涓爣鍚庡叧鑱旇瀹㈡埛宸插鏍搁攢鍞鍗晐 H
@@ -13,9 +14,13 @@
Q[鍚堝悓 Excel 瀵煎叆路涓�鍚堝悓澶氫骇鍝佹槑缁嗚] -->|鎵归噺寤鸿崏绋垮悎鍚寍 G
G -->|BPM瀹℃壒閫氳繃20| H[鐢熸垚 ERP 閿�鍞鍗� XSDD]
H -->|鎻愪氦BPM| I[閿�鍞鍗曞鎵孤峰鎵逛腑15鈫掑凡瀹℃牳20]
+ H -.->|閿�鍞彴璐﹀睍绀簗 H1[閿�鍞被鍨� 1鍐呴攢2澶栭攢3鏍峰搧4鍏朵粬路鍚堝悓鍙峰彲鎵嬪伐濉蜂骇鍝佺紪鍙仿风敓浜ф暟閲廬
I -->|鏄庣粏闇�鐢熶骇路鑷姩鍒涘缓| J[MES 涓荤敓浜ц鍒� MPS]
- I --> K[鍙戣揣閫氱煡鍗昡
+ I --> K[鍙戣揣閫氱煡鍗暵风墿娴佸叕鍙�/蹇�掕垂/寮�绁ㄧ姸鎬伮峰鎵规祦榛樿鐗╂祦瀹℃壒]
+ K --> KWORD[鍙戣揣鍗� Word路鎸夊叕鍙镐俊鎭疄鏃剁敓鎴愮數瀛愮珷路鍙墜濉瀛梋
+ K --> KLEDGER[鍙戣揣鍙拌处路鎸変骇鍝佸钩閾郝蜂竴琛屼竴涓骇鍝乚
K -->|瀹℃牳閫氳繃| L0[閿�鍞嚭搴撳崟路鎻愪氦]
+ L0 --> LWORD[鎴愬搧鍑哄簱鍗� Word路甯︾數瀛愮珷]
L0 -->|闇�妫�楠岃 oqcCheckFlag=1| L1[寰呮娴�1路鍑哄簱琛岃川閲忕姸鎬� PENDING]
L0 -->|鏃犻渶妫�楠寍 L2[寰呮嫞璐�2]
L1 -->|宸插畬鎴� OQC 鎸夌墿鏂�+鐩樺彿+鏁伴噺涓�鑷撮�夊緟妫�琛屽叧鑱攟 L3[鍑哄簱琛岃川閲忕姸鎬� PASS/FAIL]
@@ -24,5 +29,6 @@
L -->|鍥炲啓鍑哄簱鏁伴噺涓庣姸鎬亅 M[閿�鍞鍗� 閮ㄥ垎鍑哄簱2/鍏ㄩ儴鍑哄簱3]
G --> N[鍥炴璁″垝路鎸夋湡鏁板垎鏈焆
G -->|鎻愪氦BPM| O[寮�绁� KP路瀹℃壒涓�10鈫掗�氳繃20路绱涓嶈秴鍚堝悓棰漖
- O -->|鍥炴鍓嶅繀椤诲厛寮�绁▅ P[鍥炴 HK路鍒涘缓鍗冲鎵逛腑10鈫掓墜鍔ㄥ鏍�20]
- P -->|鏍¢獙鍚堝悓鍓╀綑棰濅笌寮�绁ㄥ墿浣欓| N
+ O -->|鍥炴鍓嶅繀椤诲厛寮�绁▅ P[鍥炴 HK路鏈彁浜�0 鈫� 鎻愪氦BPM鍗忓悓瀹℃壒10 鈫� 閫氳繃20/椹冲洖30/鍙栨秷40]
+ P -.->|鎻愪氦鏃堕噸鏂版牎楠屽悎鍚屽墿浣欓涓庡紑绁ㄥ墿浣欓路瀹℃壒鎰忚鐢盉PM娴佽浆璁板綍鎵胯浇路椤甸潰鍐呮墜宸ュ鏍稿叧闂瓅 P
+ P -->|瀹℃壒閫氳繃鎵嶅洖鍐欏洖娆捐鍒掑凡鍥炴閲戦路瀹℃壒鑺傜偣銆岃储鍔$粡鐞嗗鎵广�嶆寜缁忕悊瑙掕壊鎴栫| N
diff --git a/docs/project-business/mermaid/04-production-flow.mmd b/docs/project-business/mermaid/04-production-flow.mmd
index 638920e..b13efc5 100644
--- a/docs/project-business/mermaid/04-production-flow.mmd
+++ b/docs/project-business/mermaid/04-production-flow.mmd
@@ -1,16 +1,25 @@
flowchart TD
P0[閿�鍞鍗曟槑缁� needProduction=1] -->|瀹℃壒閫氳繃鑷姩鍒涘缓| P1[MPS 涓荤敓浜ц鍒捖疯崏绋�0鈫掑凡涓嬪彂1]
- P1 -->|涓嬪彂鎴栧悎骞朵笅鍙憒 P2[鐢熶骇宸ュ崟路鑽夌0鈫掑凡纭1]
+ P1 -->|涓嬪彂鎴栧悎骞朵笅鍙懧蜂粎鍒涘缓浜烘垨瓒呯鍙搷浣渱 P2[鐢熶骇宸ュ崟路鑽夌0鈫掑凡纭1]
P2 -->|鎸夊伐鑹鸿矾绾垮伐搴忚嚜鍔ㄧ敓鎴恷 P3[鐢熶骇浠诲姟脳N路棰勫0鈫掔敓浜т腑1鈫掗儴鍒嗗畬鎴�2鈫掑畬鎴�4路鍙殏鍋�9]
P3 --> P4[鐢熶骇棰嗘枡 鎴� 绾胯竟铏氭嫙搴撳鏂橾
P4 --> P5[鎶ュ伐鎻愪氦路鑽夌0]
P5 -->|鏍¢獙:涓婁竴閬撳伐搴忔湭鎶ユ弧鍒欐嫤鎴獆 P5
+ P5 -->|淇濆瓨鏃舵寜宸ュ簭鏍囧噯宸ユ椂閰嶇疆+鐢熶骇闀垮害+杈呭姪椤规鏁皘 P5S[鏍囧噯宸ユ椂蹇収路涓诲伐鏃�+杈呭姪宸ユ椂路閰嶇疆缂哄け涓嶉樆鏂浆鎵嬪伐濉伐鏃禲
+ P5S -.->|瀹為檯宸ユ椂 vs 鏍囧噯宸ユ椂路宸紓鐜囪秴闃堝�奸粯璁�20%鎻愮ず| P5
+ P5S -.->|鎸変汉/宸ュ簭/鏈哄彴/鍛ㄦ湡姹囨�粅 P5R[宸ユ椂鑰冩牳鎶ヨ〃路鎶ュ伐鍗曟暟/鐢熶骇闀垮害/瀹為檯/鏍囧噯/宸紓鐜嘳
+ P5 -->|宸ュ崟缁戝畾鐨勫伐鑹鸿矾绾�+涓昏浠疯澶�+杈呭姪宸ユ椂| P5W[宸ヨ祫蹇収路鍗曚环瑙勫垯(宸ュ簭+璺嚎+璁惧+鐢熸晥鏃ユ湡)浼樺厛路鏈懡涓洖閫�宸ュ簭宸ヨ祫瀹氶路宸ヨ祫瀛楁绯绘暟/鍔犲噺/璁′环鏁伴噺路杈呭姪宸ユ椂璁¤柂路璇曠畻鎺ュ彛 preview-wage]
+ P5 -->|鎻愪氦鍚庝笉鍐嶈嚜鍔ㄧ敓鎴� IPQC路杩囩▼妫�楠岀敱璐ㄩ噺閮ㄩ棬鍦ㄨ川閲忕鐞嗛〉鎵嬪伐鏂板缓骞剁粦瀹氬伐鍗�/宸ュ簭/鍗婃垚鍝�/鐩樺彿| P5Q[杩囩▼妫�楠屽崟路鎵嬪伐鍒涘缓]
P5 -->|鍚敤BPM鍒欐彁浜ゅ鎵箌 P6{鎶ュ伐瀹℃壒}
P6 -->|椹冲洖| P5
- P6 -->|閫氳繃涓斿�掑啿宸ュ簭| P7[鎸夊伐鍗旴OM鑷姩鐢熸垚鐗╂枡娑堣�椔锋墸绾胯竟铏氭嫙搴揊IFO鍏佽璐熷簱瀛榏
- P6 -->|閫氳繃涓旇川妫�宸ュ簭| P8[鎶ュ伐杞緟妫�楠屄蜂骇鍑鸿 PENDING]
- P6 -->|閫氳繃涓旈潪璐ㄦ鍏抽敭宸ュ簭| P9[浜у搧浜у嚭鐩存帴瀹屽伐鍏ュ簱]
+ P6 -->|閫氳繃路宸ュ崟瀛樺湪鐢熶骇BOM鍗虫寜 BOM 鐢熸垚鐗╂枡娑堣�椔蜂笉鍐嶄緷璧栧�掑啿鎴栬川妫�寮�鍏硘 P7[鎸夊伐鍗旴OM鑷姩鐢熸垚鐗╂枡娑堣�椔锋墸绾胯竟铏氭嫙搴揊IFO鍏佽璐熷簱瀛榏
+ P6 -->|閫氳繃路鎴愬搧浜у嚭| P8[鎶ュ伐杞緟妫�楠屄蜂骇鍑鸿 PENDING]
+ P6 -->|閫氳繃路鍗婃垚鍝佷骇鍑郝锋姤宸ョ墿鏂欌墵宸ュ崟鎴愬搧| P8S[鍗婃垚鍝佷骇鍑鸿鐩存帴 PASS路鎸夌敓浜OM鐩爣搴撲綅鐢熸垚鍏ュ簱鏄庣粏骞剁珛鍗冲畬宸ヂ蜂笉绛夎川妫�涓嶅叆瀹℃壒]
+ P6 -->|閫氳繃路鎸夊揩鐓ч噸绠楀伐璧勫苟搴旂敤璐ㄩ噺璋冩暣| P6W[鎶ュ伐宸ヨ祫路璁′欢鎸夊悎鏍兼暟閲徛峰悎鏍肩巼鍛戒腑绯绘暟鎴栦笉鍚堟牸鎵f路璁板埌鎶ュ伐浜哄悕涓媇
+ P6W -.->|鏍哥畻鍛ㄦ湡鍐呭凡瀹℃壒鎶ュ伐姹囨�粅 HRM[钖叕鏍哥畻路鎶ュ伐宸ヨ祫鍙汉宸ヨ皟鏁村悗璁″叆瀹炲彂]
+ HRM -.->|鐐规姤宸ュ伐璧勩�屾槑缁嗐�峾 HRMD[鎶ュ伐宸ヨ祫鏄庣粏路鎸夋姤宸ュ崟灞曞紑涓诲伐璧�+杈呭姪宸ヨ祫+宸ヨ祫瀛楁(鍊�/鍗曚环/閲戦)+璐ㄩ噺璋冩暣=鏈�缁堝伐璧劼蜂笌鏍哥畻閲戦姣斿]
P8 -->|宸插畬鎴� IPQC 鎸夌墿鏂�+鐩樺彿+鏁伴噺涓�鑷撮�夊緟妫�浜у嚭琛屽叧鑱攟 P8L[鍥炲啓鎶ュ伐瀹屾垚路鎶ュ伐鐘舵�佲啋瀹屾垚4]
+ P8 -.->|浜у嚭琛� PENDING 鏃朵笉鍏佽瀹屽伐鍏ュ簱路蹇呴』瀹屾垚 IPQC 骞跺洖鍐欏悎鏍肩姸鎬亅 P8
P8L -->|鍚堟牸鏁伴噺>0| P10[鍚堟牸琛屽叆搴撀蜂笉鍚堟牸鏁伴噺鎷嗗嚭涓轰笉鍚堟牸琛宂
P8L -->|涓嶅悎鏍兼暟閲�>0| P11[NCR 涓嶅悎鏍煎搧路绛夊緟鍚庣画澶勭疆]
P8 -.->|鏈叧鑱旂殑宸插畬鎴� IPQC 涓嶅洖鍐櫬烽渶鍦ㄦ楠屽崟璇︽儏鎵嬪姩鍏宠仈| P8
diff --git a/docs/project-business/mermaid/05-quality-flow.mmd b/docs/project-business/mermaid/05-quality-flow.mmd
index fa07acb..b1b1a14 100644
--- a/docs/project-business/mermaid/05-quality-flow.mmd
+++ b/docs/project-business/mermaid/05-quality-flow.mmd
@@ -1,6 +1,11 @@
flowchart TD
T1[鍒拌揣閫氱煡鍗� 鎴� 澶栧崗鍏ュ簱鍗昡 --> A1[IQC 鏉ユ枡妫�楠屄疯崏绋�0鈫掑畬鎴�4]
- T2[鎶ュ伐璐ㄦ宸ュ簭閫氳繃鍚庝骇鍑鸿路鐙珛褰曞叆 IPQC] --> A2[IPQC 杩囩▼妫�楠屄疯崏绋�0鈫掑畬鎴�4]
+ T2[鎶ュ伐鍚庝骇鍑鸿路鐢辫川閲忛儴闂ㄦ墜宸ユ柊寤� IPQC] --> A2[IPQC 杩囩▼妫�楠屄疯崏绋�0鈫掑畬鎴�4]
+ T2 -.->|鏂板缓鏃剁粦瀹氱敓浜у伐鍗暵峰伐搴忕敱宸ュ崟宸ヨ壓璺嚎甯﹀嚭路鍗婃垚鍝佺敱璇ュ伐搴忎骇鍑虹墿鏂欏甫鍑郝风洏鍙锋墜宸ュ綍鍏 A2
+ A2 -.->|鏂板缓/缂栬緫路閫夊伐浣嶆寜宸ュ簭甯﹀嚭璇ュ伐搴忕淮鎶ょ殑鑷畾涔夊伐璧勫瓧娈德锋暟鍊�/鏂囨湰/涓嬫媺/甯冨皵鎺т欢鎸夊瓧娈电被鍨嬪喅瀹殀 QWF[宸ヨ祫瀛楁濉啓路鐢辫川妫�濉啓路鎶ュ伐瀹℃壒閲嶇畻宸ヨ祫浼樺厛鍙栨鍊悸锋湭濉洖閫�宸ュ簭鍥哄畾鍊糫
+ A2 -.->|妫�楠屼俊鎭彲鎵嬪伐澧炲垹妫�楠岃路姣忚鍙笂浼犳楠岄檮浠堵蜂笉鍐嶅~鍐欐娴嬪�紎 QFILL[妫�楠岃路妫�楠岄」+闄勪欢(姣忔潯妫�楠岃鐙珛缁戝畾)路淇濆瓨鍚庢寜鏄庣粏ID鍏宠仈]
+ A2 -.->|瀹屾垚鐘舵�佹槸浜у嚭鍏ュ簱鍓嶇疆鏉′欢| QW[鎴愬搧浜у嚭琛� PENDING路瀹屾垚 IPQC 鍥炲啓鍚堟牸鍚庢墠鍏佽瀹屽伐鍏ュ簱]
+ A2 -.->|鍚堟牸鐜囧弬涓庢姤宸ュ伐璧剕 QW2[鎸夊伐搴�+璺嚎鍖归厤璐ㄩ噺瑙勫垯路鍚堟牸鐜囩郴鏁版垨涓嶅悎鏍兼暟閲忔墸娆綸
T3[閿�鍞嚭搴撳崟寰呮娴嬭路鐙珛褰曞叆 OQC] --> A3[OQC 鍑鸿揣妫�楠屄疯崏绋�0鈫掑畬鎴�4]
T4[鐢熶骇閫�鏂欏崟 鎴� 閿�鍞��璐у崟 鎴� 鍞悗閫�璐 --> A4[RQC 閫�璐ф楠屄疯崏绋�0鈫掑畬鎴�4]
T5[Excel 鎵归噺瀵煎叆路IQC IPQC OQC 涓夊垪琛ㄥ悇涓�涓叆鍙B锋寜閽湪鏂板涓庡鍑轰箣闂碷 --> IMP{瀵煎叆闂搁棬路閫愯瑙f瀽路澶辫触琛屼簰涓嶅奖鍝峿
@@ -25,9 +30,12 @@
A2 -->|宸插畬鎴愪笖鏈粦瀹氭潵婧惵锋寜鐗╂枡+鐩樺彿+鏁伴噺涓�鑷磡 Q5[鍏宠仈鎶ュ伐寰呮琛屄峰洖鍐欐姤宸ュ畬鎴愪笌浜у嚭鍏ュ簱]
A3 -->|宸插畬鎴愪笖鏈粦瀹氭潵婧惵锋寜鐗╂枡+鐩樺彿+鏁伴噺涓�鑷磡 Q6[鍏宠仈閿�鍞嚭搴撳緟妫�琛屄峰洖鍐欏嚭搴撹璐ㄩ噺鐘舵�伮峰叏閮ㄥ悎鏍兼帹杩涘緟鎷h揣]
A4 -->|瀹屾垚| Q7[閫�璐у崟鎺ㄨ繘涓婃灦鎴栧叆搴撀峰敭鍚庡洖璋冪粨璁篯
- N1[NCR 寰呰瘎瀹�0] -->|璇勫| N2[宸茶瘎瀹�6]
- N2 -->|澶勭疆鏂瑰紡:閫�璐�1鎶ュ簾2杩斿伐3璁╂鎺ユ敹4闄嶇骇浣跨敤5| N3[宸插缃�7]
+ N1[NCR 寰呰瘎瀹�0] -->|鎻愪氦瀹℃壒路鍒涘缓 BPM 瀹炰緥 key=mes_ncr_approve| N1A[瀹℃壒涓�2]
+ N1A -->|BPM 椹冲洖/鍙栨秷路淇濈暀娴佺▼瀹炰緥鍙煡鎰忚| N1
+ N1A -->|BPM 瀹℃壒閫氳繃路瀹℃壒鑺傜偣銆岃川閲忛儴闂ㄥ鎵广�嶆寜璐ㄩ噺閮ㄩ棬瑙掕壊鎴栫路鎰忚鐢� BPM 娴佽浆璁板綍鎵胯浇| N2[宸茶瘎瀹�6路璐ㄩ噺閮ㄥ緟澶勭疆]
+ N2 -->|璐ㄩ噺閮ㄦ渶缁堝缃疯姝ユ斁琛�4/杩斾慨6/杩斿伐3/鎶ュ簾2| N3[宸插缃�7]
N3 -->|鍏抽棴| N4[宸插叧闂�8]
+ N1 -.->|鏈彂甯冩祦绋嬪畾涔夋垨鍏ㄥ眬鍏嶅鎵规椂路鎻愪氦鍚庤嚜鍔ㄧ疆涓哄凡璇勫| N2
Q8[鏀拺鏁版嵁:璐ㄦ鏂规路妫�楠屾寚鏍嚶风己闄峰簱路鎸囨爣缁撴灉] --- A1
Q8H["妫�楠屾寚鏍囩殑灞傜骇鍙湪璐ㄦ鎸囨爣椤电淮鎶ぢ锋潯鐩被鍨� 鎵�灞炲垎缁� 鍏紡 鎺掑簭鍙仿峰彧鍏佽涓ゅ眰路鍒犲垎缁勭骇鑱斿垹瀛愰」"] --- Q8
A1 -->|鍑轰欢 generate-from-qc| GATE{鍑轰欢鍏亾鏍¢獙路鎸変笟鍔′紭鍏堢骇鍙姤绗竴澶剗
@@ -92,3 +100,6 @@
RPTVSAVE -.->|璁捐鍣ㄧ敾甯冧笉璺戠粦瀹毬风粍鍚嶆牸鐨� hidden 鍗犱綅绗︿細琚祻瑙堝櫒褰撴垚鐪� hidden 璁╂暣琛屽乏绉汇�佹湯鍒楁尋鎴愮珫鎺掔粏鏉 CVNOTE
RPTVSAVE -.->|鑷畾鍒椾笉甯﹀搴﹀0鏄幝峰垪瀹藉彧鑳界敱鏈�灏忓唴瀹瑰搴﹀�掓帹路鑰屽�兼槸鍗犱綅绗﹁繖绫讳笉鍚┖鏍肩殑闀夸覆路鏁磋〃浼氳鎾戝嚭绾稿紶銆佹湯鍒楁尋鎴愮珫鏉 CVWIDTH
CVWIDTH["鏁呰嚜瀹氬垪鐨勫崟鍏冩牸甯� overflow-wrap:anywhere 鍏佽闀夸覆鎶樿路榛樿鍒楁湁鎵嬪伐瀹藉害澹版槑涓嶅姞路瀹炴祴鍔犱簡鍙嶈�屾妸妫�楠岄」鐩瓙椤规尋鍒� 30 浣欏儚绱犮�佽楂樼炕鍑犲��"] --- RPTVSAVE
+
+ PT[璐ㄩ噺宸℃ mes_qc_patrol路鐙珛璁板綍路涓嶇敓鎴愬簱瀛樹笟鍔″崟鎹甝 -->|缂栫爜瑙勫垯 QC_PATROL_CODE路XJ_+yyyyMMdd+3浣嶆祦姘磡 PT2[宸℃鏌ヨ/鏂板/淇敼/鍒犻櫎路鑿滃崟鎸傝川閲忕鐞� 5500]
+ STAT[璐ㄩ噺绠$悊銆岃川閲忕粺璁°�嵚疯彍鍗� 1080080 鏉冮檺 mes:qc-statistics:query] -->|GET /mes/qc/statistics/summary路鍙�夋娴嬫棩鏈熻寖鍥磡 STATD["鏁翠綋鍚堟牸鐜�/涓嶅悎鏍肩巼路鎸夋楠岀被鍨� IQC/IPQC/OQC/RQC路鎸夊伐搴�(IPQC process_id)路鎸夌敓浜у伐鍗�(IPQC work_order_id)路浠呯粺璁″凡瀹屾垚(status=4)妫�楠屽崟"]
diff --git a/docs/project-business/mermaid/06-warehouse-flow.mmd b/docs/project-business/mermaid/06-warehouse-flow.mmd
index d0e34c1..78ace28 100644
--- a/docs/project-business/mermaid/06-warehouse-flow.mmd
+++ b/docs/project-business/mermaid/06-warehouse-flow.mmd
@@ -22,7 +22,8 @@
W -->|鍗犵敤棰勭暀 reservedQuantity| RES[搴撳瓨鍗犵敤 閿�鍞嚭搴撀烽鏂櫬峰鍗徛锋潅椤孤疯皟鎷╙
MV[杞Щ璋冩嫧路鍐呴儴鎴栧閮╙ -->|鎴愬浜嬪姟 MOVE_OUT+MOVE_IN 鍦ㄩ�攟 W
ST[鐩樼偣 鏂规鈫掍换鍔♀啋鏄庣粏琛屸啋缁撴灉] -->|鐩樼泩 ADJUST_IN路鐩樹簭 ADJUST_OUT路鍙喕缁撳簱瀛榺 W
- W --> TX[浜嬪姟娴佹按 mes_wm_transaction 鍙鍏ㄩ噺鐣欑棔]
+ W --> TX[浜嬪姟娴佹按 mes_wm_transaction 鍙鍏ㄩ噺鐣欑棔路work_order_id 鍐椾綑鐢熶骇璁㈠崟鍙蜂緵鍑哄簱鍙拌处灞曠ず]
BT[鎵规 mes_wm_batch路SN鐮伮锋潯鐮伮疯绠卞祵濂梋 --- W
WIP[[绾胯竟铏氭嫙搴� WIP_VIRTUAL_WAREHOUSE路鎳掑垵濮嬪寲]] --- O3
FR[鍥涚骇鍐荤粨:浠撳簱路搴撳尯路搴撲綅路搴撳瓨璁板綍] --- W
+ FC[鍐荤粨鏉ユ簮 mes_wm_material_stock_freeze_claim路MANUAL/STOCK_TAKING/TRANSFER路澶氭潵婧愮嫭绔嬫寔鏈壜疯В鍐诲彧閲婃斁鏈潵婧怾 --- FR
diff --git a/docs/project-business/mermaid/08-module-relation.mmd b/docs/project-business/mermaid/08-module-relation.mmd
index 388112e..2b8dea1 100644
--- a/docs/project-business/mermaid/08-module-relation.mmd
+++ b/docs/project-business/mermaid/08-module-relation.mmd
@@ -9,6 +9,7 @@
ERP -->|閿�鍞鍗曞鎵圭敓鎴怣PS| MES
MES -->|鍏ュ簱鍑哄簱鍥炲啓鍗曟嵁杩涘害| ERP
MES -->|ProductionFinishedEvent| ERP
+ MES -->|MesProFeedbackWageApi路鎸夋姤宸ヤ汉姹囨�绘牳绠楀懆鏈熷唴宸插鎵规姤宸ュ伐璧剕 HRM
ERP -->|ErpFinanceStatisticsApi.getMonthlyStatistics路鍙彇宸插鏍� status=20 鐨勬敹娆句粯娆句笌璐攢閲戦| FIN[璐㈠姟鏍哥畻 FIN 绉戠洰路鍑瘉路鎬昏处鏄庣粏璐β疯祫浜ф姌鏃ф憡閿�路鎶ヨ〃鐪嬫澘]
MES -->|閫�璐ц川妫�鍏ュ簱鍥炶皟| AS[鍞悗宸ュ崟缁翠慨閫�璐
CRM -->|瀹㈡埛涓绘暟鎹畖 AS
diff --git a/scripts/quotation_template_20261106/gen_project_tracking.py b/scripts/quotation_template_20261106/gen_project_tracking.py
new file mode 100644
index 0000000..cf007c7
--- /dev/null
+++ b/scripts/quotation_template_20261106/gen_project_tracking.py
@@ -0,0 +1,186 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""鐢熸垚 MES 璁捐椤圭洰銆岄」鐩窡韪〃銆峎ord 妯℃澘锛堟渶灏� OOXML 鍖咃級銆�
+瀵煎嚭鏃剁敱鍚庣鏇挎崲 ${...} 妲戒綅涓� word/media/seal.png 鐢靛瓙绔狅紝绌虹櫧琛屽彲鎵嬪~杩涘害銆�
+"""
+import os
+import struct
+import zipfile
+import zlib
+
+W_NS = 'xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"'
+R_NS = 'xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"'
+WP_NS = 'xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"'
+A_NS = 'xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"'
+PIC_NS = 'xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"'
+
+
+def run(text, bold=False, size=20, align=None):
+ props = '<w:rPr>'
+ if bold:
+ props += '<w:b/>'
+ props += '<w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋"/><w:sz w:val="%d"/></w:rPr>' % size
+ return '<w:r>%s<w:t xml:space="preserve">%s</w:t></w:r>' % (props, text)
+
+
+def para(text, bold=False, size=20, align=None, space_after=0):
+ ppr = '<w:pPr>'
+ if align:
+ ppr += '<w:jc w:val="%s"/>' % align
+ if space_after:
+ ppr += '<w:spacing w:after="%d"/>' % space_after
+ ppr += '</w:pPr>'
+ return '<w:p>%s%s</w:p>' % (ppr, run(text, bold=bold, size=size))
+
+
+def cell(text, width, bold=False, size=18, align='center', shade=None):
+ tcpr = '<w:tcPr><w:tcW w:w="%d" w:type="dxa"/>' % width
+ if shade:
+ tcpr += '<w:shd w:val="clear" w:color="auto" w:fill="%s"/>' % shade
+ tcpr += '<w:vAlign w:val="center"/></w:tcPr>'
+ return '<w:tc>%s%s</w:tc>' % (tcpr, para(text, bold=bold, size=size, align=align))
+
+
+def row(cells, header=False):
+ trpr = '<w:trPr><w:tblHeader/></w:trPr>' if header else ''
+ return '<w:tr>%s%s</w:tr>' % (trpr, ''.join(cells))
+
+
+BORDERS = ('<w:tblBorders>'
+ '<w:top w:val="single" w:sz="4" w:color="000000"/>'
+ '<w:left w:val="single" w:sz="4" w:color="000000"/>'
+ '<w:bottom w:val="single" w:sz="4" w:color="000000"/>'
+ '<w:right w:val="single" w:sz="4" w:color="000000"/>'
+ '<w:insideH w:val="single" w:sz="4" w:color="000000"/>'
+ '<w:insideV w:val="single" w:sz="4" w:color="000000"/>'
+ '</w:tblBorders>')
+
+
+def info_table(fields):
+ widths = [1300, 2200, 1300, 2200]
+ rows = []
+ for i in range(0, len(fields), 2):
+ first = fields[i]
+ second = fields[i + 1] if i + 1 < len(fields) else ('', '')
+ rows.append(row([
+ cell(first[0], widths[0], shade='F2F2F2'),
+ cell('${%s}' % first[1], widths[1], align='left'),
+ cell(second[0], widths[2], shade='F2F2F2'),
+ cell('${%s}' % second[1] if second[1] else '', widths[3], align='left'),
+ ]))
+ return ('<w:tbl><w:tblPr><w:tblW w:w="0" w:type="auto"/>%s</w:tblPr>'
+ '<w:tblGrid>%s</w:tblGrid>%s</w:tbl>'
+ % (BORDERS, ''.join('<w:gridCol w:w="%d"/>' % w for w in widths), ''.join(rows)))
+
+
+def tracking_table():
+ columns = [
+ ('搴忓彿', 620), ('璺熻釜闃舵', 1300), ('璁″垝瀹屾垚鏃堕棿', 1400),
+ ('瀹為檯瀹屾垚鏃堕棿', 1400), ('璐熻矗浜�', 1100), ('瀹屾垚鎯呭喌璇存槑', 2600),
+ ]
+ widths = [c[1] for c in columns]
+ header = row([cell(c[0], c[1], bold=True, shade='D9E2F3') for c in columns], header=True)
+ blank_rows = ''.join(
+ row([cell(str(index), widths[0])] + [cell('', w) for w in widths[1:]])
+ for index in range(1, 9)
+ )
+ return ('<w:tbl><w:tblPr><w:tblW w:w="0" w:type="auto"/>%s</w:tblPr>'
+ '<w:tblGrid>%s</w:tblGrid>%s%s</w:tbl>'
+ % (BORDERS, ''.join('<w:gridCol w:w="%d"/>' % w for w in widths), header, blank_rows))
+
+
+def seal_drawing():
+ return (
+ '<w:p><w:pPr><w:jc w:val="center"/></w:pPr><w:r><w:drawing>'
+ '<wp:inline distT="0" distB="0" distL="0" distR="0">'
+ '<wp:extent cx="762000" cy="762000"/><wp:docPr id="1" name="seal"/>'
+ '<a:graphic %s>'
+ '<a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/picture">'
+ '<pic:pic><pic:nvPicPr><pic:cNvPr id="1" name="seal.png"/><pic:cNvPicPr/></pic:nvPicPr>'
+ '<pic:blipFill><a:blip r:embed="rIdSeal"/><a:stretch><a:fillRect/></a:stretch></pic:blipFill>'
+ '<pic:spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="762000" cy="762000"/></a:xfrm>'
+ '<a:prstGeom prst="rect"><a:avLst/></a:prstGeom></pic:spPr></pic:pic>'
+ '</a:graphicData></a:graphic></wp:inline></w:drawing></w:r></w:p>'
+ % A_NS)
+
+
+def tiny_png():
+ def chunk(tag, data):
+ return struct.pack('>I', len(data)) + tag + data + struct.pack('>I', zlib.crc32(tag + data) & 0xffffffff)
+ ihdr = struct.pack('>IIBBBBB', 1, 1, 8, 6, 0, 0, 0)
+ raw = b'\x00\x00\x00\x00\x00'
+ return (b'\x89PNG\r\n\x1a\n' + chunk(b'IHDR', ihdr)
+ + chunk(b'IDAT', zlib.compress(raw)) + chunk(b'IEND', b''))
+
+
+FIELDS = [
+ ('椤圭洰缂栫爜', 'taskCode'), ('椤圭洰鍚嶇О', 'taskName'),
+ ('浜у搧缂栫爜', 'productCode'), ('浜у搧鍚嶇О', 'productName'),
+ ('鐗堟湰鍙�', 'version'), ('椤圭洰鐘舵��', 'status'),
+ ('涓昏璁″笀', 'chiefDesigner'), ('瀹℃牳浜�', 'reviewer'),
+ ('璁″垝瀹屾垚鏃堕棿', 'planFinishTime'), ('鍒惰〃鏃ユ湡', 'printDate'),
+]
+
+
+def build_document():
+ sign_tbl = ('<w:tbl><w:tblPr><w:tblW w:w="0" w:type="auto"/><w:tblBorders>'
+ '<w:top w:val="none" w:sz="0" w:color="auto"/>'
+ '<w:left w:val="none" w:sz="0" w:color="auto"/>'
+ '<w:bottom w:val="none" w:sz="0" w:color="auto"/>'
+ '<w:right w:val="none" w:sz="0" w:color="auto"/>'
+ '<w:insideH w:val="none" w:sz="0" w:color="auto"/>'
+ '<w:insideV w:val="none" w:sz="0" w:color="auto"/>'
+ '</w:tblBorders></w:tblPr><w:tblGrid><w:gridCol w:w="4600"/><w:gridCol w:w="3400"/></w:tblGrid>'
+ '<w:tr><w:tc><w:tcPr><w:tcW w:w="4600" w:type="dxa"/></w:tcPr>%s</w:tc>'
+ '<w:tc><w:tcPr><w:tcW w:w="3400" w:type="dxa"/></w:tcPr>%s%s</w:tc></w:tr></w:tbl>'
+ % (para('鍒惰〃浜猴細____________ 瀹℃牳浜猴細____________', size=18),
+ seal_drawing(), para('${companyName}', size=18, align='center')))
+ sect = ('<w:sectPr><w:pgSz w:w="11906" w:h="16838"/>'
+ '<w:pgMar w:top="1134" w:right="1134" w:bottom="1134" w:left="1134" '
+ 'w:header="851" w:footer="992" w:gutter="0"/></w:sectPr>')
+ return ('<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'
+ '<w:document %s %s %s %s><w:body>' % (W_NS, R_NS, WP_NS, PIC_NS)
+ + para('${companyName}', bold=True, size=32, align='center', space_after=60)
+ + para('椤� 鐩� 璺� 韪� 琛�', bold=True, size=28, align='center', space_after=120)
+ + info_table(FIELDS) + '<w:p>' + run('', size=12) + '</w:p>'
+ + para('璺熻釜璁板綍锛堝彲鎵嬪啓琛ュ厖锛�', bold=True, size=20, space_after=40)
+ + tracking_table() + '<w:p>' + run('', size=12) + '</w:p>'
+ + para('澶囨敞锛�${remark}', size=18)
+ + sign_tbl + sect + '</w:body></w:document>')
+
+
+CONTENT_TYPES = '''<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
+<Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>
+<Default Extension="xml" ContentType="application/xml"/>
+<Default Extension="png" ContentType="image/png"/>
+<Override PartName="/word/document.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"/>
+</Types>'''
+
+ROOT_RELS = '''<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="word/document.xml"/>
+</Relationships>'''
+
+DOC_RELS = '''<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+<Relationship Id="rIdSeal" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="media/seal.png"/>
+</Relationships>'''
+
+
+def main():
+ base = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..',
+ 'yudao-module-mes', 'src', 'main', 'resources', 'templates', 'pd')
+ os.makedirs(base, exist_ok=True)
+ path = os.path.join(base, 'project-tracking.docx')
+ with zipfile.ZipFile(path, 'w', zipfile.ZIP_DEFLATED) as z:
+ z.writestr('[Content_Types].xml', CONTENT_TYPES)
+ z.writestr('_rels/.rels', ROOT_RELS)
+ z.writestr('word/document.xml', build_document())
+ z.writestr('word/_rels/document.xml.rels', DOC_RELS)
+ z.writestr('word/media/seal.png', tiny_png())
+ print(path)
+
+
+if __name__ == '__main__':
+ main()
diff --git a/scripts/quotation_template_20261106/gen_quotation_template.py b/scripts/quotation_template_20261106/gen_quotation_template.py
new file mode 100644
index 0000000..7438b2c
--- /dev/null
+++ b/scripts/quotation_template_20261106/gen_quotation_template.py
@@ -0,0 +1,223 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""鐢熸垚 CRM 閿�鍞姤浠峰崟 Word 妯℃澘锛堟渶灏� OOXML 鍖咃級銆�
+鍗犱綅绗︼細companyName / customerName / quotationNo / quotationName / quotationDate /
+validUntil / contactName / ownerUserName / productTotal / discountPrice /
+taxRate / taxPrice / totalPrice / totalUpper / remark
+鏄庣粏琛屽崰浣嶇锛歩ndex / itemName / itemSpecification / unitName / count / price / amount / itemRemark
+绛剧珷鍥剧墖锛歸ord/media/seal.png锛堝鍑烘椂鐢卞悗绔浛鎹负鍏徃鐢靛瓙绔狅級
+"""
+import os
+import struct
+import zipfile
+import zlib
+
+W_NS = 'xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"'
+R_NS = 'xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"'
+WP_NS = 'xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"'
+A_NS = 'xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"'
+PIC_NS = 'xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"'
+
+
+def run(text, bold=False, size=20, align_bold_color=None):
+ props = '<w:rPr>'
+ if bold:
+ props += '<w:b/>'
+ if align_bold_color:
+ props += '<w:color w:val="%s"/>' % align_bold_color
+ props += '<w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋"/><w:sz w:val="%d"/></w:rPr>' % size
+ return '<w:r>%s<w:t xml:space="preserve">%s</w:t></w:r>' % (props, text)
+
+
+def para(text, bold=False, size=20, align=None, space_after=0, color=None):
+ ppr = '<w:pPr>'
+ if align:
+ ppr += '<w:jc w:val="%s"/>' % align
+ if space_after:
+ ppr += '<w:spacing w:after="%d"/>' % space_after
+ ppr += '</w:pPr>'
+ return '<w:p>%s%s</w:p>' % (ppr, run(text, bold=bold, size=size, align_bold_color=color))
+
+
+def cell(text, width, bold=False, size=18, align='center', shade=None, span=None):
+ tcpr = '<w:tcPr><w:tcW w:w="%d" w:type="dxa"/>' % width
+ if span:
+ tcpr += '<w:gridSpan w:val="%d"/>' % span
+ if shade:
+ tcpr += '<w:shd w:val="clear" w:color="auto" w:fill="%s"/>' % shade
+ tcpr += '<w:vAlign w:val="center"/></w:tcPr>'
+ return ('<w:tc>%s%s</w:tc>' % (tcpr, para(text, bold=bold, size=size, align=align)))
+
+
+def row(cells, header=False):
+ trpr = '<w:trPr><w:tblHeader/></w:trPr>' if header else ''
+ return '<w:tr>%s%s</w:tr>' % (trpr, ''.join(cells))
+
+
+def table_grid(widths):
+ return '<w:tblGrid>%s</w:tblGrid>' % ''.join('<w:gridCol w:w="%d"/>' % w for w in widths)
+
+
+# ---------- 1x1 閫忔槑 PNG锛堝崰浣嶇數瀛愮珷锛屽鍑烘椂鏇挎崲锛� ----------
+def tiny_png():
+ def chunk(tag, data):
+ return struct.pack('>I', len(data)) + tag + data + struct.pack('>I', zlib.crc32(tag + data) & 0xffffffff)
+ ihdr = struct.pack('>IIBBBBB', 1, 1, 8, 6, 0, 0, 0)
+ raw = b'\x00\x00\x00\x00\x00'
+ return (b'\x89PNG\r\n\x1a\n' + chunk(b'IHDR', ihdr)
+ + chunk(b'IDAT', zlib.compress(raw)) + chunk(b'IEND', b''))
+
+
+def seal_drawing():
+ return (
+ '<w:p><w:pPr><w:jc w:val="center"/></w:pPr><w:r><w:drawing>'
+ '<wp:inline distT="0" distB="0" distL="0" distR="0">'
+ '<wp:extent cx="762000" cy="762000"/><wp:docPr id="1" name="seal"/>'
+ '<a:graphic %s>'
+ '<a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/picture">'
+ '<pic:pic><pic:nvPicPr><pic:cNvPr id="1" name="seal.png"/><pic:cNvPicPr/></pic:nvPicPr>'
+ '<pic:blipFill><a:blip r:embed="rIdSeal"/><a:stretch><a:fillRect/></a:stretch></pic:blipFill>'
+ '<pic:spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="762000" cy="762000"/></a:xfrm>'
+ '<a:prstGeom prst="rect"><a:avLst/></a:prstGeom></pic:spPr></pic:pic>'
+ '</a:graphicData></a:graphic></wp:inline></w:drawing></w:r></w:p>'
+ % A_NS)
+
+
+def build_document():
+ info_widths = [1300, 2200, 1300, 2200]
+ item_widths = [620, 2450, 1500, 700, 950, 1150, 1300]
+
+ info_rows = [
+ row([cell('瀹㈡埛鍚嶇О', info_widths[0], shade='F2F2F2'),
+ cell('${customerName}', info_widths[1] + info_widths[2] + info_widths[3], span=3, align='left')]),
+ row([cell('鎶ヤ环鍗曞彿', info_widths[0], shade='F2F2F2'),
+ cell('${quotationNo}', info_widths[1], align='left'),
+ cell('鎶ヤ环鏃ユ湡', info_widths[2], shade='F2F2F2'),
+ cell('${quotationDate}', info_widths[3], align='left')]),
+ row([cell('鎶ヤ环鍚嶇О', info_widths[0], shade='F2F2F2'),
+ cell('${quotationName}', info_widths[1], align='left'),
+ cell('鏈夋晥鏈熻嚦', info_widths[2], shade='F2F2F2'),
+ cell('${validUntil}', info_widths[3], align='left')]),
+ row([cell('鑱旂郴浜�', info_widths[0], shade='F2F2F2'),
+ cell('${contactName}', info_widths[1], align='left'),
+ cell('璐熻矗浜�', info_widths[2], shade='F2F2F2'),
+ cell('${ownerUserName}', info_widths[3], align='left')]),
+ ]
+ info_tbl = ('<w:tbl><w:tblPr><w:tblW w:w="0" w:type="auto"/><w:tblBorders>'
+ '<w:top w:val="single" w:sz="4" w:color="000000"/>'
+ '<w:left w:val="single" w:sz="4" w:color="000000"/>'
+ '<w:bottom w:val="single" w:sz="4" w:color="000000"/>'
+ '<w:right w:val="single" w:sz="4" w:color="000000"/>'
+ '<w:insideH w:val="single" w:sz="4" w:color="000000"/>'
+ '<w:insideV w:val="single" w:sz="4" w:color="000000"/>'
+ '</w:tblBorders></w:tblPr>%s%s</w:tbl>'
+ % (table_grid(info_widths), ''.join(info_rows)))
+
+ item_header = row([cell('搴忓彿', item_widths[0], bold=True, shade='D9E2F3'),
+ cell('浜у搧鍚嶇О', item_widths[1], bold=True, shade='D9E2F3'),
+ cell('瑙勬牸鍨嬪彿', item_widths[2], bold=True, shade='D9E2F3'),
+ cell('鍗曚綅', item_widths[3], bold=True, shade='D9E2F3'),
+ cell('鏁伴噺', item_widths[4], bold=True, shade='D9E2F3'),
+ cell('鍗曚环锛堝厓锛�', item_widths[5], bold=True, shade='D9E2F3'),
+ cell('閲戦锛堝厓锛�', item_widths[6], bold=True, shade='D9E2F3')], header=True)
+ item_template = row([cell('${index}', item_widths[0]),
+ cell('${itemName}', item_widths[1], align='left'),
+ cell('${itemSpecification}', item_widths[2]),
+ cell('${unitName}', item_widths[3]),
+ cell('${count}', item_widths[4]),
+ cell('${price}', item_widths[5], align='right'),
+ cell('${amount}', item_widths[6], align='right')])
+ total_rows = ''.join([
+ row([cell('浜у搧閲戦', sum(item_widths[:6]), shade='F2F2F2'),
+ cell('${productTotal}', item_widths[6], align='right')]),
+ row([cell('浼樻儬閲戦', sum(item_widths[:6]), shade='F2F2F2'),
+ cell('${discountPrice}', item_widths[6], align='right')]),
+ row([cell('绋庣巼 / 绋庨', sum(item_widths[:6]), shade='F2F2F2'),
+ cell('${taxRate}% / ${taxPrice}', item_widths[6], align='right')]),
+ row([cell('鎶ヤ环鎬婚', sum(item_widths[:6]), bold=True, shade='F2F2F2'),
+ cell('${totalPrice}', item_widths[6], bold=True, align='right')]),
+ row([cell('澶у啓閲戦', sum(item_widths[:6]), bold=True, shade='F2F2F2'),
+ cell('${totalUpper}', item_widths[6], align='left')]),
+ ])
+ item_tbl = ('<w:tbl><w:tblPr><w:tblW w:w="0" w:type="auto"/><w:tblBorders>'
+ '<w:top w:val="single" w:sz="4" w:color="000000"/>'
+ '<w:left w:val="single" w:sz="4" w:color="000000"/>'
+ '<w:bottom w:val="single" w:sz="4" w:color="000000"/>'
+ '<w:right w:val="single" w:sz="4" w:color="000000"/>'
+ '<w:insideH w:val="single" w:sz="4" w:color="000000"/>'
+ '<w:insideV w:val="single" w:sz="4" w:color="000000"/>'
+ '</w:tblBorders></w:tblPr>%s%s%s%s</w:tbl>'
+ % (table_grid(item_widths), item_header, item_template, total_rows))
+
+ remark = ('<w:p><w:r><w:rPr><w:b/><w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋"/>'
+ '<w:sz w:val="18"/></w:rPr><w:t xml:space="preserve">澶囨敞锛�</w:t></w:r>'
+ + run('${remark}', size=18) + '</w:p>')
+ terms = ('<w:p>' + run('鎶ヤ环璇存槑锛�', bold=True, size=18) + '</w:p>'
+ '<w:p>' + run('1. 鏈姤浠疯嚜鎶ヤ环鏃ユ湡璧风敓鏁堬紝鏈夋晥鏈熶互鈥滄湁鏁堟湡鑷斥�濅负鍑嗭紝閫炬湡璇烽噸鏂拌浠枫��', size=18) + '</w:p>'
+ '<w:p>' + run('2. 浠ヤ笂浠锋牸涓哄惈绋庝环锛岀◣鐜囨寜琛ㄤ腑鍒楃ず锛涜繍杈撴柟寮忓強杩愯垂鍙﹁绾﹀畾銆�', size=18) + '</w:p>'
+ '<w:p>' + run('3. 浠樻鏂瑰紡銆佷氦璐у懆鏈熶互鍙屾柟纭鍚庣殑姝e紡鍚堝悓涓哄噯銆�', size=18) + '</w:p>'
+ '<w:p>' + run('4. 鏈姤浠峰崟缁忔湰鍏徃鐩栫珷鍚庣敓鏁堬紝浼犵湡浠躲�佹壂鎻忎欢鍏锋湁鍚岀瓑鏁堝姏銆�', size=18) + '</w:p>')
+ sign_tbl = ('<w:tbl><w:tblPr><w:tblW w:w="0" w:type="auto"/>'
+ '<w:tblBorders><w:top w:val="none" w:sz="0" w:color="auto"/>'
+ '<w:left w:val="none" w:sz="0" w:color="auto"/>'
+ '<w:bottom w:val="none" w:sz="0" w:color="auto"/>'
+ '<w:right w:val="none" w:sz="0" w:color="auto"/>'
+ '<w:insideH w:val="none" w:sz="0" w:color="auto"/>'
+ '<w:insideV w:val="none" w:sz="0" w:color="auto"/>'
+ '</w:tblBorders></w:tblPr><w:tblGrid><w:gridCol w:w="4600"/><w:gridCol w:w="3400"/></w:tblGrid>'
+ '<w:tr><w:tc><w:tcPr><w:tcW w:w="4600" w:type="dxa"/></w:tcPr>%s</w:tc>'
+ '<w:tc><w:tcPr><w:tcW w:w="3400" w:type="dxa"/></w:tcPr>%s%s</w:tc></w:tr></w:tbl>'
+ % (terms, seal_drawing(),
+ para('${companyName}', size=18, align='center')))
+
+ sect = ('<w:sectPr><w:pgSz w:w="11906" w:h="16838"/>'
+ '<w:pgMar w:top="1134" w:right="1134" w:bottom="1134" w:left="1134" '
+ 'w:header="851" w:footer="992" w:gutter="0"/></w:sectPr>')
+
+ return ('<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'
+ '<w:document %s %s %s %s><w:body>'
+ % (W_NS, R_NS, WP_NS, PIC_NS)
+ + para('${companyName}', bold=True, size=32, align='center', space_after=60)
+ + para('鎶� 浠� 鍗�', bold=True, size=28, align='center', space_after=120)
+ + info_tbl + '<w:p>' + run('', size=12) + '</w:p>'
+ + para('浜у搧鏄庣粏', bold=True, size=20, space_after=40)
+ + item_tbl + '<w:p>' + run('', size=12) + '</w:p>'
+ + remark + '<w:p>' + run('', size=12) + '</w:p>'
+ + sign_tbl + sect + '</w:body></w:document>')
+
+
+CONTENT_TYPES = '''<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
+<Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>
+<Default Extension="xml" ContentType="application/xml"/>
+<Default Extension="png" ContentType="image/png"/>
+<Override PartName="/word/document.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"/>
+</Types>'''
+
+ROOT_RELS = '''<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="word/document.xml"/>
+</Relationships>'''
+
+DOC_RELS = '''<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+<Relationship Id="rIdSeal" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="media/seal.png"/>
+</Relationships>'''
+
+
+def main():
+ base = os.path.dirname(os.path.abspath(__file__))
+ out = os.path.join(base, '..', '..', 'yudao-module-crm', 'src', 'main', 'resources',
+ 'templates', 'quotation', 'sale-quotation.docx')
+ os.makedirs(os.path.dirname(out), exist_ok=True)
+ with zipfile.ZipFile(out, 'w', zipfile.ZIP_DEFLATED) as z:
+ z.writestr('[Content_Types].xml', CONTENT_TYPES)
+ z.writestr('_rels/.rels', ROOT_RELS)
+ z.writestr('word/document.xml', build_document())
+ z.writestr('word/_rels/document.xml.rels', DOC_RELS)
+ z.writestr('word/media/seal.png', tiny_png())
+ print(out)
+
+
+if __name__ == '__main__':
+ main()
diff --git a/scripts/quotation_template_20261106/gen_wm_documents.py b/scripts/quotation_template_20261106/gen_wm_documents.py
new file mode 100644
index 0000000..230c8f5
--- /dev/null
+++ b/scripts/quotation_template_20261106/gen_wm_documents.py
@@ -0,0 +1,213 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""鐢熸垚 MES 鍙戣揣鍗� / 鎴愬搧鍑哄簱鍗� Word 妯℃澘锛堟渶灏� OOXML 鍖咃級銆�
+瀵煎嚭鏃剁敱鍚庣鏇挎崲 ${...} 妲戒綅涓� word/media/seal.png 鐢靛瓙绔犮��
+"""
+import os
+import struct
+import zipfile
+import zlib
+
+W_NS = 'xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"'
+R_NS = 'xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"'
+WP_NS = 'xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"'
+A_NS = 'xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"'
+PIC_NS = 'xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"'
+
+
+def run(text, bold=False, size=20, color=None):
+ props = '<w:rPr>'
+ if bold:
+ props += '<w:b/>'
+ if color:
+ props += '<w:color w:val="%s"/>' % color
+ props += '<w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋"/><w:sz w:val="%d"/></w:rPr>' % size
+ return '<w:r>%s<w:t xml:space="preserve">%s</w:t></w:r>' % (props, text)
+
+
+def para(text, bold=False, size=20, align=None, space_after=0):
+ ppr = '<w:pPr>'
+ if align:
+ ppr += '<w:jc w:val="%s"/>' % align
+ if space_after:
+ ppr += '<w:spacing w:after="%d"/>' % space_after
+ ppr += '</w:pPr>'
+ return '<w:p>%s%s</w:p>' % (ppr, run(text, bold=bold, size=size))
+
+
+def cell(text, width, bold=False, size=18, align='center', shade=None, span=None):
+ tcpr = '<w:tcPr><w:tcW w:w="%d" w:type="dxa"/>' % width
+ if span:
+ tcpr += '<w:gridSpan w:val="%d"/>' % span
+ if shade:
+ tcpr += '<w:shd w:val="clear" w:color="auto" w:fill="%s"/>' % shade
+ tcpr += '<w:vAlign w:val="center"/></w:tcPr>'
+ return '<w:tc>%s%s</w:tc>' % (tcpr, para(text, bold=bold, size=size, align=align))
+
+
+def row(cells, header=False):
+ trpr = '<w:trPr><w:tblHeader/></w:trPr>' if header else ''
+ return '<w:tr>%s%s</w:tr>' % (trpr, ''.join(cells))
+
+
+def table_grid(widths):
+ return '<w:tblGrid>%s</w:tblGrid>' % ''.join('<w:gridCol w:w="%d"/>' % w for w in widths)
+
+
+BORDERS = ('<w:tblBorders>'
+ '<w:top w:val="single" w:sz="4" w:color="000000"/>'
+ '<w:left w:val="single" w:sz="4" w:color="000000"/>'
+ '<w:bottom w:val="single" w:sz="4" w:color="000000"/>'
+ '<w:right w:val="single" w:sz="4" w:color="000000"/>'
+ '<w:insideH w:val="single" w:sz="4" w:color="000000"/>'
+ '<w:insideV w:val="single" w:sz="4" w:color="000000"/>'
+ '</w:tblBorders>')
+
+
+def info_table(fields):
+ """fields: [(label, placeholder)]锛屼袱鍒椾竴缁勩��"""
+ widths = [1300, 2200, 1300, 2200]
+ rows = []
+ for i in range(0, len(fields), 2):
+ first = fields[i]
+ second = fields[i + 1] if i + 1 < len(fields) else ('', '')
+ rows.append(row([
+ cell(first[0], widths[0], shade='F2F2F2'),
+ cell('${%s}' % first[1], widths[1], align='left'),
+ cell(second[0], widths[2], shade='F2F2F2'),
+ cell('${%s}' % second[1] if second[1] else '', widths[3], align='left'),
+ ]))
+ return ('<w:tbl><w:tblPr><w:tblW w:w="0" w:type="auto"/>%s</w:tblPr>%s%s</w:tbl>'
+ % (BORDERS, table_grid(widths), ''.join(rows)))
+
+
+def item_table(columns):
+ """columns: [(title, placeholder, width, align)]"""
+ widths = [c[2] for c in columns]
+ header = row([cell(c[0], c[2], bold=True, shade='D9E2F3') for c in columns], header=True)
+ template = row([cell('${%s}' % c[1], c[2], align=c[3]) for c in columns])
+ return ('<w:tbl><w:tblPr><w:tblW w:w="0" w:type="auto"/>%s</w:tblPr>%s%s%s</w:tbl>'
+ % (BORDERS, table_grid(widths), header, template))
+
+
+def seal_drawing():
+ return (
+ '<w:p><w:pPr><w:jc w:val="center"/></w:pPr><w:r><w:drawing>'
+ '<wp:inline distT="0" distB="0" distL="0" distR="0">'
+ '<wp:extent cx="762000" cy="762000"/><wp:docPr id="1" name="seal"/>'
+ '<a:graphic %s>'
+ '<a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/picture">'
+ '<pic:pic><pic:nvPicPr><pic:cNvPr id="1" name="seal.png"/><pic:cNvPicPr/></pic:nvPicPr>'
+ '<pic:blipFill><a:blip r:embed="rIdSeal"/><a:stretch><a:fillRect/></a:stretch></pic:blipFill>'
+ '<pic:spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="762000" cy="762000"/></a:xfrm>'
+ '<a:prstGeom prst="rect"><a:avLst/></a:prstGeom></pic:spPr></pic:pic>'
+ '</a:graphicData></a:graphic></wp:inline></w:drawing></w:r></w:p>'
+ % A_NS)
+
+
+def tiny_png():
+ def chunk(tag, data):
+ return struct.pack('>I', len(data)) + tag + data + struct.pack('>I', zlib.crc32(tag + data) & 0xffffffff)
+ ihdr = struct.pack('>IIBBBBB', 1, 1, 8, 6, 0, 0, 0)
+ raw = b'\x00\x00\x00\x00\x00'
+ return (b'\x89PNG\r\n\x1a\n' + chunk(b'IHDR', ihdr)
+ + chunk(b'IDAT', zlib.compress(raw)) + chunk(b'IEND', b''))
+
+
+def build_document(title, fields, columns, footer_lines):
+ sign_tbl = ('<w:tbl><w:tblPr><w:tblW w:w="0" w:type="auto"/><w:tblBorders>'
+ '<w:top w:val="none" w:sz="0" w:color="auto"/>'
+ '<w:left w:val="none" w:sz="0" w:color="auto"/>'
+ '<w:bottom w:val="none" w:sz="0" w:color="auto"/>'
+ '<w:right w:val="none" w:sz="0" w:color="auto"/>'
+ '<w:insideH w:val="none" w:sz="0" w:color="auto"/>'
+ '<w:insideV w:val="none" w:sz="0" w:color="auto"/>'
+ '</w:tblBorders></w:tblPr><w:tblGrid><w:gridCol w:w="4600"/><w:gridCol w:w="3400"/></w:tblGrid>'
+ '<w:tr><w:tc><w:tcPr><w:tcW w:w="4600" w:type="dxa"/></w:tcPr>%s</w:tc>'
+ '<w:tc><w:tcPr><w:tcW w:w="3400" w:type="dxa"/></w:tcPr>%s%s</w:tc></w:tr></w:tbl>'
+ % (''.join(para(line, size=18) for line in footer_lines), seal_drawing(),
+ para('${companyName}', size=18, align='center')))
+ sect = ('<w:sectPr><w:pgSz w:w="11906" w:h="16838"/>'
+ '<w:pgMar w:top="1134" w:right="1134" w:bottom="1134" w:left="1134" '
+ 'w:header="851" w:footer="992" w:gutter="0"/></w:sectPr>')
+ return ('<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'
+ '<w:document %s %s %s %s><w:body>' % (W_NS, R_NS, WP_NS, PIC_NS)
+ + para('${companyName}', bold=True, size=32, align='center', space_after=60)
+ + para(title, bold=True, size=28, align='center', space_after=120)
+ + info_table(fields) + '<w:p>' + run('', size=12) + '</w:p>'
+ + para('璐х墿鏄庣粏', bold=True, size=20, space_after=40)
+ + item_table(columns) + '<w:p>' + run('', size=12) + '</w:p>'
+ + para('澶囨敞锛�${remark}', size=18)
+ + sign_tbl + sect + '</w:body></w:document>')
+
+
+CONTENT_TYPES = '''<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
+<Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>
+<Default Extension="xml" ContentType="application/xml"/>
+<Default Extension="png" ContentType="image/png"/>
+<Override PartName="/word/document.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"/>
+</Types>'''
+
+ROOT_RELS = '''<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="word/document.xml"/>
+</Relationships>'''
+
+DOC_RELS = '''<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+<Relationship Id="rIdSeal" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="media/seal.png"/>
+</Relationships>'''
+
+DELIVERY_FIELDS = [
+ ('瀹㈡埛鍚嶇О', 'clientName'), ('鍙戣揣鍗曞彿', 'code'),
+ ('鍙戣揣鏃ユ湡', 'salesDate'), ('閿�鍞鍗曞彿', 'saleOrderCode'),
+ ('鏀惰揣浜�', 'recipientName'), ('鑱旂郴鐢佃瘽', 'recipientTelephone'),
+ ('鏀惰揣鍦板潃', 'recipientAddress'), ('鐗╂祦鍏徃', 'logisticsCompany'),
+ ('蹇�掕垂', 'expressFee'), ('寮�鍗曚汉', 'creator'),
+]
+DELIVERY_COLUMNS = [
+ ('搴忓彿', 'index', 620, 'center'), ('浜у搧鍚嶇О', 'itemName', 2600, 'left'),
+ ('瑙勬牸鍨嬪彿', 'itemSpecification', 1600, 'center'), ('鍗曚綅', 'unitName', 700, 'center'),
+ ('鍙戣揣鏁伴噺', 'quantity', 1100, 'right'), ('鎵规鍙�', 'batchCode', 1400, 'center'),
+ ('澶囨敞', 'itemRemark', 1400, 'left'),
+]
+
+OUTBOUND_FIELDS = [
+ ('瀹㈡埛鍚嶇О', 'clientName'), ('鍑哄簱鍗曞彿', 'code'),
+ ('鍑哄簱鏃ユ湡', 'salesDate'), ('閿�鍞鍗曞彿', 'saleOrderCode'),
+ ('鍙戣揣鍗曞彿', 'noticeCode'), ('鑱旂郴浜�', 'contactName'),
+ ('鑱旂郴鐢佃瘽', 'contactTelephone'), ('鏀惰揣鍦板潃', 'contactAddress'),
+ ('鐗╂祦鍏徃', 'carrier'), ('杩愯緭鍗曞彿', 'shippingNumber'),
+]
+OUTBOUND_COLUMNS = [
+ ('搴忓彿', 'index', 620, 'center'), ('浜у搧鍚嶇О', 'itemName', 2400, 'left'),
+ ('瑙勬牸鍨嬪彿', 'itemSpecification', 1400, 'center'), ('鍗曚綅', 'unitName', 650, 'center'),
+ ('鏁伴噺', 'quantity', 900, 'right'), ('鍗曚环', 'price', 1000, 'right'),
+ ('閲戦', 'amount', 1100, 'right'), ('鎵规鍙�', 'batchCode', 1300, 'center'),
+]
+
+FOOTER = ['鍒跺崟浜猴細____________ 瀹℃牳浜猴細____________',
+ '鏀惰揣浜虹瀛楋細____________ 鏃ユ湡锛歘_______骞確___鏈坃___鏃�']
+
+
+def write_docx(path, title, fields, columns):
+ os.makedirs(os.path.dirname(path), exist_ok=True)
+ with zipfile.ZipFile(path, 'w', zipfile.ZIP_DEFLATED) as z:
+ z.writestr('[Content_Types].xml', CONTENT_TYPES)
+ z.writestr('_rels/.rels', ROOT_RELS)
+ z.writestr('word/document.xml', build_document(title, fields, columns, FOOTER))
+ z.writestr('word/_rels/document.xml.rels', DOC_RELS)
+ z.writestr('word/media/seal.png', tiny_png())
+
+
+def main():
+ base = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..',
+ 'yudao-module-mes', 'src', 'main', 'resources', 'templates', 'wm')
+ write_docx(os.path.join(base, 'sales-delivery.docx'), '鍙� 璐� 鍗�', DELIVERY_FIELDS, DELIVERY_COLUMNS)
+ write_docx(os.path.join(base, 'product-outbound.docx'), '鎴� 鍝� 鍑� 搴� 鍗�', OUTBOUND_FIELDS, OUTBOUND_COLUMNS)
+ print(base)
+
+
+if __name__ == '__main__':
+ main()
diff --git a/scripts/yudao-module-crm/src/main/resources/templates/quotation/sale-quotation.docx b/scripts/yudao-module-crm/src/main/resources/templates/quotation/sale-quotation.docx
new file mode 100644
index 0000000..0c1ac08
--- /dev/null
+++ b/scripts/yudao-module-crm/src/main/resources/templates/quotation/sale-quotation.docx
Binary files differ
diff --git a/sql/mysql/20261105_crm_invoice_missing_links.sql b/sql/mysql/20261105_crm_invoice_missing_links.sql
new file mode 100644
index 0000000..3cbab0a
--- /dev/null
+++ b/sql/mysql/20261105_crm_invoice_missing_links.sql
@@ -0,0 +1,39 @@
+-- Repair CRM invoice columns missing from the local integration database.
+-- Safe to rerun; existing invoices retain NULL links.
+SET @db_name = DATABASE();
+
+SET @ddl = (SELECT IF(COUNT(*) = 0,
+ 'ALTER TABLE crm_invoice ADD COLUMN sale_order_id BIGINT NULL COMMENT ''鍏宠仈閿�鍞鍗�'' AFTER contract_id',
+ 'SELECT 1') FROM information_schema.columns
+ WHERE table_schema = @db_name AND table_name = 'crm_invoice' AND column_name = 'sale_order_id');
+PREPARE invoice_stmt FROM @ddl; EXECUTE invoice_stmt; DEALLOCATE PREPARE invoice_stmt;
+
+SET @ddl = (SELECT IF(COUNT(*) = 0,
+ 'ALTER TABLE crm_invoice ADD COLUMN contract_amount DECIMAL(18,2) NULL AFTER price',
+ 'SELECT 1') FROM information_schema.columns
+ WHERE table_schema = @db_name AND table_name = 'crm_invoice' AND column_name = 'contract_amount');
+PREPARE invoice_stmt FROM @ddl; EXECUTE invoice_stmt; DEALLOCATE PREPARE invoice_stmt;
+
+SET @ddl = (SELECT IF(COUNT(*) = 0,
+ 'ALTER TABLE crm_invoice ADD COLUMN prepayment_amount DECIMAL(18,2) NULL AFTER contract_amount',
+ 'SELECT 1') FROM information_schema.columns
+ WHERE table_schema = @db_name AND table_name = 'crm_invoice' AND column_name = 'prepayment_amount');
+PREPARE invoice_stmt FROM @ddl; EXECUTE invoice_stmt; DEALLOCATE PREPARE invoice_stmt;
+
+SET @ddl = (SELECT IF(COUNT(*) = 0,
+ 'ALTER TABLE crm_invoice ADD COLUMN delivery_amount DECIMAL(18,2) NULL AFTER prepayment_amount',
+ 'SELECT 1') FROM information_schema.columns
+ WHERE table_schema = @db_name AND table_name = 'crm_invoice' AND column_name = 'delivery_amount');
+PREPARE invoice_stmt FROM @ddl; EXECUTE invoice_stmt; DEALLOCATE PREPARE invoice_stmt;
+
+SET @ddl = (SELECT IF(COUNT(*) = 0,
+ 'ALTER TABLE crm_invoice ADD COLUMN acceptance_amount DECIMAL(18,2) NULL AFTER delivery_amount',
+ 'SELECT 1') FROM information_schema.columns
+ WHERE table_schema = @db_name AND table_name = 'crm_invoice' AND column_name = 'acceptance_amount');
+PREPARE invoice_stmt FROM @ddl; EXECUTE invoice_stmt; DEALLOCATE PREPARE invoice_stmt;
+
+SET @ddl = (SELECT IF(COUNT(*) = 0,
+ 'ALTER TABLE crm_invoice ADD COLUMN sale_out_id BIGINT NULL COMMENT ''鍏宠仈閿�鍞嚭搴撳崟'' AFTER sale_order_id',
+ 'SELECT 1') FROM information_schema.columns
+ WHERE table_schema = @db_name AND table_name = 'crm_invoice' AND column_name = 'sale_out_id');
+PREPARE invoice_stmt FROM @ddl; EXECUTE invoice_stmt; DEALLOCATE PREPARE invoice_stmt;
diff --git a/sql/mysql/20261105_mdm_item_code_sequence.sql b/sql/mysql/20261105_mdm_item_code_sequence.sql
new file mode 100644
index 0000000..925fc0a
--- /dev/null
+++ b/sql/mysql/20261105_mdm_item_code_sequence.sql
@@ -0,0 +1,7 @@
+-- MDM item numbering: one transactionally locked counter per four-digit item type prefix.
+-- Existing item codes are considered by MdmItemServiceImpl when the next code is generated.
+CREATE TABLE IF NOT EXISTS `mdm_item_code_sequence` (
+ `prefix` VARCHAR(4) NOT NULL COMMENT '鐗╂枡绫诲瀷鍓嶇紑 1001-1005',
+ `current_value` INT NOT NULL DEFAULT 0 COMMENT '褰撳墠浜斾綅娴佹按鍙�',
+ PRIMARY KEY (`prefix`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MDM 鐗╂枡缂栫爜鍒嗘娴佹按';
diff --git a/sql/mysql/20261105_sales_out_price_backfill.sql b/sql/mysql/20261105_sales_out_price_backfill.sql
new file mode 100644
index 0000000..a7ef839
--- /dev/null
+++ b/sql/mysql/20261105_sales_out_price_backfill.sql
@@ -0,0 +1,14 @@
+-- Restore the price snapshot for the verified historical sale out line.
+-- The source order item and material must match; reruns do not overwrite prices.
+UPDATE mes_wm_product_sales_line AS sales_line
+JOIN erp_sale_order_items AS order_item
+ ON order_item.id = sales_line.sale_order_item_id
+ AND order_item.product_id = sales_line.item_id
+SET sales_line.price = order_item.product_price,
+ sales_line.total_price = order_item.product_price * sales_line.quantity
+WHERE sales_line.id = 2
+ AND sales_line.sales_id = 2
+ AND sales_line.deleted = b'0'
+ AND sales_line.price IS NULL
+ AND sales_line.total_price IS NULL
+ AND order_item.product_price IS NOT NULL;
diff --git a/sql/mysql/20261106_bi_dashboard_theme_permissions.sql b/sql/mysql/20261106_bi_dashboard_theme_permissions.sql
new file mode 100644
index 0000000..c460b83
--- /dev/null
+++ b/sql/mysql/20261106_bi_dashboard_theme_permissions.sql
@@ -0,0 +1,12 @@
+-- 灏嗗凡鏈変簲涓� BI 椤甸潰鑿滃崟浣滀负鍚勪富棰樼殑鏈嶅姟绔彇鏁版潈闄愩��
+-- 淇濈暀鏃㈡湁瑙掕壊-鑿滃崟鍏宠仈锛氬凡鎺堟潈椤甸潰鐨勮鑹茶嚜鍔ㄨ幏寰楀搴斾富棰樻潈闄愩��
+UPDATE system_menu
+SET permission = CASE id
+ WHEN 1063001 THEN 'bi:dashboard:purchase_sales:query'
+ WHEN 1063002 THEN 'bi:dashboard:warehouse:query'
+ WHEN 1063003 THEN 'bi:dashboard:production_equipment:query'
+ WHEN 1063004 THEN 'bi:dashboard:quality:query'
+ WHEN 1063005 THEN 'bi:dashboard:hr_oa:query'
+END
+WHERE id IN (1063001, 1063002, 1063003, 1063004, 1063005)
+ AND deleted = 0;
diff --git a/sql/mysql/20261106_crm_customer_address.sql b/sql/mysql/20261106_crm_customer_address.sql
new file mode 100644
index 0000000..fedde46
--- /dev/null
+++ b/sql/mysql/20261106_crm_customer_address.sql
@@ -0,0 +1,18 @@
+-- 瀹㈡埛妗f澶氭敹璐у湴鍧�
+CREATE TABLE IF NOT EXISTS crm_customer_address (
+ id BIGINT NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ customer_id BIGINT NOT NULL COMMENT '瀹㈡埛缂栧彿',
+ receiver_name VARCHAR(64) NOT NULL COMMENT '鏀惰揣浜哄鍚�',
+ receiver_mobile VARCHAR(32) NOT NULL COMMENT '鏀惰揣浜烘墜鏈哄彿',
+ area_id INT NULL COMMENT '鎵�鍦ㄥ湴缂栧彿',
+ detail_address VARCHAR(255) NOT NULL COMMENT '璇︾粏鍦板潃',
+ default_flag BIT(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁榛樿鏀惰揣鍦板潃',
+ remark VARCHAR(500) NULL COMMENT '澶囨敞',
+ creator VARCHAR(64) NULL DEFAULT '' COMMENT '鍒涘缓鑰�',
+ create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ updater VARCHAR(64) NULL DEFAULT '' COMMENT '鏇存柊鑰�',
+ update_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ deleted BIT(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
+ PRIMARY KEY (id),
+ KEY idx_customer_id (customer_id)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT = 'CRM 瀹㈡埛鏀惰揣鍦板潃';
diff --git a/sql/mysql/20261106_customer_statement_finance_menus.sql b/sql/mysql/20261106_customer_statement_finance_menus.sql
new file mode 100644
index 0000000..b982b4c
--- /dev/null
+++ b/sql/mysql/20261106_customer_statement_finance_menus.sql
@@ -0,0 +1,20 @@
+-- 瀹㈡埛寰�鏉ャ�侀攢鍞璐︺�佹牳閿�绠$悊鑿滃崟
+-- 骞傜瓑锛氭寜 id 鍒ゆ柇锛屽凡瀛樺湪鍒欒烦杩�
+
+-- 瀹㈡埛寰�鏉ワ紙鎸傚湪 鍥炴涓庡紑绁� 1075497 涓嬶級
+INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, status, visible, keep_alive, always_show)
+SELECT 1075660, '瀹㈡埛寰�鏉�', 'crm:receivable:query', 2, 6, 1075497, 'customer-statement', '', 'crm/customerStatement/index', 0, 1, 1, 1
+FROM DUAL
+WHERE NOT EXISTS (SELECT 1 FROM system_menu WHERE id = 1075660);
+
+-- 閿�鍞璐︼紙鎸傚湪 璐㈠姟绠$悊 2645 涓嬶級
+INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, status, visible, keep_alive, always_show)
+SELECT 1075661, '閿�鍞璐�', 'crm:receivable:query', 2, 8, 2645, 'sale-reconciliation', '', 'erp/finance/reconciliation/index', 0, 1, 1, 1
+FROM DUAL
+WHERE NOT EXISTS (SELECT 1 FROM system_menu WHERE id = 1075661);
+
+-- 鏍搁攢绠$悊锛堟寕鍦� 璐㈠姟绠$悊 2645 涓嬶級
+INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, status, visible, keep_alive, always_show)
+SELECT 1075662, '鏍搁攢绠$悊', 'crm:receivable:query', 2, 9, 2645, 'write-off', '', 'erp/finance/writeoff/index', 0, 1, 1, 1
+FROM DUAL
+WHERE NOT EXISTS (SELECT 1 FROM system_menu WHERE id = 1075662);
diff --git a/sql/mysql/20261106_erp_sale_ledger.sql b/sql/mysql/20261106_erp_sale_ledger.sql
new file mode 100644
index 0000000..23aef74
--- /dev/null
+++ b/sql/mysql/20261106_erp_sale_ledger.sql
@@ -0,0 +1,42 @@
+-- 閿�鍞彴璐﹀寮猴細閿�鍞被鍨嬨�佸悎鍚屽彿鎵嬪伐濉啓
+-- 閫傜敤搴擄細mom-ntsh / mom-trt锛堝彧鍏佽鍦� mom-trt 涓婃墽琛岀敓浜э級
+
+-- ---------------------------------------------
+-- 涓�銆乪rp_sale_order 閿�鍞被鍨�
+-- ---------------------------------------------
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'erp_sale_order' AND column_name = 'sale_type');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE erp_sale_order ADD COLUMN sale_type TINYINT NULL COMMENT ''閿�鍞被鍨嬶細1鍐呴攢 2澶栭攢 3鏍峰搧 4鍏朵粬'' AFTER contract_no',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- 鍚堝悓鍙峰厑璁告墜宸ュ~鍐欙紙涓嶄緷璧栧叧鑱斿悎鍚岃嚜鍔ㄧ敓鎴愶級锛屾斁瀹藉埌 64 瀛楃
+SET @sql = IF((SELECT CHARACTER_MAXIMUM_LENGTH FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'erp_sale_order' AND column_name = 'contract_no') < 64,
+ 'ALTER TABLE erp_sale_order MODIFY COLUMN contract_no VARCHAR(64) NULL COMMENT ''鍚堝悓鍙凤紙鍙墜宸ュ~鍐欙紝鍏宠仈鍚堝悓鏃惰嚜鍔ㄥ甫鍑猴級''',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- ---------------------------------------------
+-- 浜屻�佸瓧鍏革細閿�鍞被鍨�
+-- ---------------------------------------------
+
+INSERT INTO system_dict_type (name, type, status, remark)
+SELECT 'ERP 閿�鍞被鍨�', 'erp_sale_type', 0, '閿�鍞彴璐�-閿�鍞被鍨嬶細1鍐呴攢 2澶栭攢 3鏍峰搧 4鍏朵粬'
+FROM DUAL
+WHERE NOT EXISTS (SELECT 1 FROM system_dict_type WHERE type = 'erp_sale_type' AND deleted = 0);
+
+INSERT INTO system_dict_data (sort, label, value, dict_type, status, color_type, css_class)
+SELECT 0, '鍐呴攢', '1', 'erp_sale_type', 0, '', ''
+FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM system_dict_data WHERE dict_type = 'erp_sale_type' AND value = '1' AND deleted = 0);
+INSERT INTO system_dict_data (sort, label, value, dict_type, status, color_type, css_class)
+SELECT 1, '澶栭攢', '2', 'erp_sale_type', 0, '', ''
+FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM system_dict_data WHERE dict_type = 'erp_sale_type' AND value = '2' AND deleted = 0);
+INSERT INTO system_dict_data (sort, label, value, dict_type, status, color_type, css_class)
+SELECT 2, '鏍峰搧', '3', 'erp_sale_type', 0, '', ''
+FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM system_dict_data WHERE dict_type = 'erp_sale_type' AND value = '3' AND deleted = 0);
+INSERT INTO system_dict_data (sort, label, value, dict_type, status, color_type, css_class)
+SELECT 3, '鍏朵粬', '4', 'erp_sale_type', 0, '', ''
+FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM system_dict_data WHERE dict_type = 'erp_sale_type' AND value = '4' AND deleted = 0);
diff --git a/sql/mysql/20261106_material_stock_freeze_claim.sql b/sql/mysql/20261106_material_stock_freeze_claim.sql
new file mode 100644
index 0000000..76cae9d
--- /dev/null
+++ b/sql/mysql/20261106_material_stock_freeze_claim.sql
@@ -0,0 +1,23 @@
+-- 搴撳瓨鍐荤粨鏉ユ簮鎸佹湁琛紱閲嶅鎵ц瀹夊叏锛屼繚鐣欐棦鏈夊喕缁撶姸鎬併��
+CREATE TABLE IF NOT EXISTS mes_wm_material_stock_freeze_claim (
+ stock_id BIGINT NOT NULL COMMENT '搴撳瓨璁板綍 ID',
+ source_type VARCHAR(32) NOT NULL COMMENT 'MANUAL / STOCK_TAKING / TRANSFER',
+ source_id BIGINT NOT NULL COMMENT '鏉ユ簮鍗曟嵁 ID锛涗汉宸ュ喕缁撲负 0',
+ create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ PRIMARY KEY (stock_id, source_type, source_id),
+ KEY idx_freeze_claim_source (source_type, source_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='搴撳瓨鍐荤粨鏉ユ簮';
+
+CREATE TABLE IF NOT EXISTS mes_wm_material_stock_freeze_migration (
+ name VARCHAR(64) NOT NULL PRIMARY KEY,
+ create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='搴撳瓨鍐荤粨鏉ユ簮杩佺Щ鏍囪';
+
+-- 浠呴娆℃墽琛屾椂灏嗗師鏈夊竷灏斿喕缁撶姸鎬佽浆鎴愮嫭绔嬬殑浜哄伐鍐荤粨鏉ユ簮銆�
+INSERT IGNORE INTO mes_wm_material_stock_freeze_claim (stock_id, source_type, source_id)
+SELECT id, 'MANUAL', 0 FROM mes_wm_material_stock
+WHERE frozen = b'1' AND deleted = b'0'
+ AND NOT EXISTS (SELECT 1 FROM mes_wm_material_stock_freeze_migration
+ WHERE name = '20261106_freeze_claim_backfill');
+INSERT IGNORE INTO mes_wm_material_stock_freeze_migration (name)
+VALUES ('20261106_freeze_claim_backfill');
diff --git a/sql/mysql/20261106_mes_wage_setting.sql b/sql/mysql/20261106_mes_wage_setting.sql
new file mode 100644
index 0000000..9c2ae72
--- /dev/null
+++ b/sql/mysql/20261106_mes_wage_setting.sql
@@ -0,0 +1,81 @@
+-- ============================================================
+-- 宸ュ簭璁¤垂绫诲瀷/宸ヨ祫瀹氶 鈫� 鐢熶骇鎶ュ伐宸ヨ祫 鈫� 钖叕鏍哥畻鎶ュ伐宸ヨ祫
+-- 閫傜敤锛歁ySQL 8.4锛圓DD COLUMN 涓嶆敮鎸� IF NOT EXISTS锛岀粺涓�鐢� information_schema 鍒ゆ柇锛�
+-- 鍙噸澶嶆墽琛�
+-- ============================================================
+
+-- 1. 宸ュ簭璁剧疆锛氳璐圭被鍨嬶紙1-璁℃椂 2-璁′欢锛夈�佸伐璧勫畾棰濓紙璁℃椂=鍏�/灏忔椂锛岃浠�=鍏�/浠讹級
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_pro_process' AND column_name = 'billing_type');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_pro_process` ADD COLUMN `billing_type` TINYINT NOT NULL DEFAULT 1 COMMENT ''璁¤垂绫诲瀷锛�1-璁℃椂 2-璁′欢'' AFTER `attention`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_pro_process' AND column_name = 'wage_rate');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_pro_process` ADD COLUMN `wage_rate` DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT ''宸ヨ祫瀹氶锛氳鏃朵负鍏�/灏忔椂锛岃浠朵负鍏�/浠�'' AFTER `billing_type`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+-- 2. 鐢熶骇鎶ュ伐锛氬伐搴忚璐瑰揩鐓� + 宸ユ椂 + 鏈鎶ュ伐宸ヨ祫
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_pro_feedback' AND column_name = 'billing_type');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_pro_feedback` ADD COLUMN `billing_type` TINYINT NOT NULL DEFAULT 1 COMMENT ''璁¤垂绫诲瀷蹇収锛�1-璁℃椂 2-璁′欢'' AFTER `feedback_user_id`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_pro_feedback' AND column_name = 'wage_rate');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_pro_feedback` ADD COLUMN `wage_rate` DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT ''宸ヨ祫瀹氶蹇収锛氳鏃朵负鍏�/灏忔椂锛岃浠朵负鍏�/浠�'' AFTER `billing_type`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_pro_feedback' AND column_name = 'work_hours');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_pro_feedback` ADD COLUMN `work_hours` DECIMAL(10,2) NOT NULL DEFAULT 0 COMMENT ''鏈鎶ュ伐宸ユ椂锛堝皬鏃讹級锛岃鏃惰钖繀濉�'' AFTER `wage_rate`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_pro_feedback' AND column_name = 'wage_amount');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_pro_feedback` ADD COLUMN `wage_amount` DECIMAL(18,2) NOT NULL DEFAULT 0 COMMENT ''鏈鎶ュ伐宸ヨ祫 = 璁℃椂 宸ユ椂脳瀹氶 / 璁′欢 鎶ュ伐鏁伴噺脳瀹氶'' AFTER `work_hours`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+-- 3. 钖叕鏍哥畻锛氭姤宸ュ伐璧�
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'hrm_salary_calculation' AND column_name = 'work_wage');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `hrm_salary_calculation` ADD COLUMN `work_wage` DECIMAL(18,2) NOT NULL DEFAULT 0 COMMENT ''鎶ュ伐宸ヨ祫锛堟牳绠楁椂鍙寜浜鸿皟鏁达級'' AFTER `other_allowance`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+-- 4. 姹囨�荤储寮曠敤锛氭寜鎶ュ伐浜�+鎶ュ伐鏃堕棿鍙栨湀搴︽姤宸ュ伐璧�
+SET @exists = (SELECT COUNT(*) FROM information_schema.statistics
+ WHERE table_schema = DATABASE() AND table_name = 'mes_pro_feedback' AND index_name = 'idx_feedback_user_time');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_pro_feedback` ADD INDEX `idx_feedback_user_time` (`feedback_user_id`, `feedback_time`)',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
diff --git a/sql/mysql/20261106_mes_worktime.sql b/sql/mysql/20261106_mes_worktime.sql
new file mode 100644
index 0000000..2e99d88
--- /dev/null
+++ b/sql/mysql/20261106_mes_worktime.sql
@@ -0,0 +1,172 @@
+-- ============================================================
+-- 宸ユ椂鎶ュ伐锛氭爣鍑嗗伐鏃讹紙鑰冩牳瀵规瘮锛�+ 杈呭姪宸ユ椂 + 宸ユ椂鑰冩牳鎶ヨ〃
+-- 閫傜敤锛歁ySQL 8.4锛圓DD COLUMN 涓嶆敮鎸� IF NOT EXISTS锛岀粺涓�鐢� information_schema 鍒ゆ柇锛�
+-- 鍙噸澶嶆墽琛�
+-- ============================================================
+
+-- 1. 宸ュ簭璁剧疆锛氭爣鍑嗗伐鏃惰绠楁柟寮忎笌鍙傛暟缁戝畾
+-- std_time_mode锛�0-鏈惎鐢� 1-杞�熋楄妭璺� 2-绾块�熷害鐩村彇 3-婊¢�熺櫨鍒嗘瘮脳鑺傝窛
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_pro_process' AND column_name = 'std_time_mode');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_pro_process` ADD COLUMN `std_time_mode` TINYINT NOT NULL DEFAULT 0 COMMENT ''鏍囧噯宸ユ椂璁$畻鏂瑰紡锛�0-鏈惎鐢� 1-杞�熋楄妭璺� 2-绾块�熷害鐩村彇 3-婊¢�熺櫨鍒嗘瘮脳鑺傝窛'' AFTER `wage_rate`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_pro_process' AND column_name = 'std_time_factor');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_pro_process` ADD COLUMN `std_time_factor` DECIMAL(18,4) NOT NULL DEFAULT 1 COMMENT ''鏍囧噯宸ユ椂鎶樼畻绯绘暟锛堟潫涓� 1.8锛屽叾浣� 1锛�'' AFTER `std_time_mode`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_pro_process' AND column_name = 'max_rpm');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_pro_process` ADD COLUMN `max_rpm` DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT ''鏈哄彴婊¤浆閫燂紙r/min锛夛紝鏂瑰紡3浣跨敤'' AFTER `std_time_factor`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_pro_process' AND column_name = 'std_rpm_param_code');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_pro_process` ADD COLUMN `std_rpm_param_code` VARCHAR(64) NULL COMMENT ''杞�熷弬鏁扮紪鐮�'' AFTER `max_rpm`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_pro_process' AND column_name = 'std_pitch_param_code');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_pro_process` ADD COLUMN `std_pitch_param_code` VARCHAR(64) NULL COMMENT ''鑺傝窛鍙傛暟缂栫爜'' AFTER `std_rpm_param_code`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_pro_process' AND column_name = 'std_speed_param_code');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_pro_process` ADD COLUMN `std_speed_param_code` VARCHAR(64) NULL COMMENT ''绾块�熷害锛堢背/鍒嗭級鍙傛暟缂栫爜'' AFTER `std_pitch_param_code`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_pro_process' AND column_name = 'std_percent_param_code');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_pro_process` ADD COLUMN `std_percent_param_code` VARCHAR(64) NULL COMMENT ''杞�熺櫨鍒嗘瘮鍙傛暟缂栫爜锛屾柟寮�3浣跨敤'' AFTER `std_speed_param_code`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+-- 2. 鐢熶骇鎶ュ伐锛氱敓浜ч暱搴� + 鏍囧噯宸ユ椂锛堝彧鐢ㄤ簬鑰冩牳瀵规瘮锛屼笉鍙備笌宸ヨ祫锛�
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_pro_feedback' AND column_name = 'production_length');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_pro_feedback` ADD COLUMN `production_length` DECIMAL(18,2) NOT NULL DEFAULT 0 COMMENT ''鏈鐢熶骇闀垮害锛堢背锛夛紝浠呯敤浜庤绠楁爣鍑嗗伐鏃�'' AFTER `wage_amount`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_pro_feedback' AND column_name = 'standard_work_hours');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_pro_feedback` ADD COLUMN `standard_work_hours` DECIMAL(10,2) NOT NULL DEFAULT 0 COMMENT ''鏍囧噯宸ユ椂锛堝皬鏃讹級锛屽彧鐢ㄤ簬鑰冩牳瀵规瘮'' AFTER `production_length`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_pro_feedback' AND column_name = 'standard_primary_hours');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_pro_feedback` ADD COLUMN `standard_primary_hours` DECIMAL(10,2) NOT NULL DEFAULT 0 COMMENT ''鏍囧噯宸ユ椂-涓诲伐鏃讹紙灏忔椂锛�'' AFTER `standard_work_hours`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_pro_feedback' AND column_name = 'standard_aux_hours');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_pro_feedback` ADD COLUMN `standard_aux_hours` DECIMAL(10,2) NOT NULL DEFAULT 0 COMMENT ''鏍囧噯宸ユ椂-杈呭姪宸ユ椂锛堝皬鏃讹級'' AFTER `standard_primary_hours`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_pro_feedback' AND column_name = 'std_calc_note');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE `mes_pro_feedback` ADD COLUMN `std_calc_note` VARCHAR(500) NULL COMMENT ''鏍囧噯宸ユ椂璁$畻渚濇嵁蹇収'' AFTER `standard_aux_hours`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+-- 3. 杈呭姪宸ユ椂閰嶇疆琛�
+CREATE TABLE IF NOT EXISTS `mes_pro_worktime_aux` (
+ `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `process_id` BIGINT NOT NULL COMMENT '宸ュ簭缂栧彿',
+ `workstation_id` BIGINT NULL COMMENT '宸ヤ綔绔欙紙鏈哄彴锛夌紪鍙凤紝绌�=涓嶉檺鏈哄彴',
+ `item_code` VARCHAR(64) NOT NULL COMMENT '杈呭姪椤圭洰缂栫爜',
+ `item_name` VARCHAR(100) NOT NULL COMMENT '杈呭姪椤圭洰鍚嶇О',
+ `measure_type` TINYINT NOT NULL DEFAULT 1 COMMENT '璁¢噺鏂瑰紡锛�1-鎸夋 2-鎸変釜 3-鎸夌洏 4-鎸夌背鎶樼畻',
+ `duration_minutes` DECIMAL(10,2) NOT NULL DEFAULT 0 COMMENT '鍗曟/鍗曚釜/鍗曠洏鍒嗛挓鏁帮紙鏂瑰紡4涓嶇敤锛�',
+ `speed_m_per_min` DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT '鎶樼畻閫熷害锛堢背/鍒嗭級锛屾柟寮�4鐢細鏃堕棿=绫虫暟梅閫熷害',
+ `material_from` VARCHAR(100) NULL COMMENT '鎹㈣壊/鎹㈡枡璧峰鏉愭枡',
+ `material_to` VARCHAR(100) NULL COMMENT '鎹㈣壊/鎹㈡枡鐩爣鏉愭枡',
+ `status` TINYINT NOT NULL DEFAULT 0 COMMENT '鐘舵�侊細0-鍚敤 1-绂佺敤',
+ `sort` INT NOT NULL DEFAULT 0 COMMENT '鎺掑簭',
+ `remark` VARCHAR(250) NULL COMMENT '澶囨敞',
+ `creator` VARCHAR(64) NULL DEFAULT '',
+ `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `updater` VARCHAR(64) NULL DEFAULT '',
+ `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ `deleted` BIT(1) NOT NULL DEFAULT b'0',
+ PRIMARY KEY (`id`),
+ KEY `idx_worktime_aux_process` (`process_id`, `workstation_id`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT = 'MES 杈呭姪宸ユ椂閰嶇疆';
+
+-- 4. 鎶ュ伐杈呭姪宸ユ椂鏄庣粏锛堟姤宸ユ椂褰曞叆鐨勬鏁板揩鐓э級
+CREATE TABLE IF NOT EXISTS `mes_pro_feedback_aux` (
+ `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `feedback_id` BIGINT NOT NULL COMMENT '鎶ュ伐缂栧彿',
+ `aux_item_id` BIGINT NOT NULL COMMENT '杈呭姪宸ユ椂椤圭洰缂栧彿',
+ `item_name` VARCHAR(100) NOT NULL COMMENT '杈呭姪椤圭洰鍚嶇О蹇収',
+ `measure_type` TINYINT NOT NULL DEFAULT 1 COMMENT '璁¢噺鏂瑰紡锛�1-鎸夋 2-鎸変釜 3-鎸夌洏 4-鎸夌背鎶樼畻',
+ `quantity` DECIMAL(18,2) NOT NULL DEFAULT 0 COMMENT '娆℃暟/涓暟/鐩樻暟/绫虫暟',
+ `material_from` VARCHAR(100) NULL COMMENT '鎹㈣壊璧峰鏉愭枡',
+ `material_to` VARCHAR(100) NULL COMMENT '鎹㈣壊鐩爣鏉愭枡',
+ `minutes` DECIMAL(10,2) NOT NULL DEFAULT 0 COMMENT '鎶樼畻鍒嗛挓鏁�',
+ `remark` VARCHAR(250) NULL COMMENT '澶囨敞',
+ `creator` VARCHAR(64) NULL DEFAULT '',
+ `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `updater` VARCHAR(64) NULL DEFAULT '',
+ `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ `deleted` BIT(1) NOT NULL DEFAULT b'0',
+ PRIMARY KEY (`id`),
+ KEY `idx_feedback_aux_feedback` (`feedback_id`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT = 'MES 鎶ュ伐杈呭姪宸ユ椂鏄庣粏';
+
+-- 5. 鑿滃崟锛氳緟鍔╁伐鏃堕厤缃�佸伐鏃惰�冩牳鎶ヨ〃
+INSERT IGNORE 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`)
+VALUES
+(1075650, '杈呭姪宸ユ椂閰嶇疆', 'mes:pro-worktime-aux:query', 2, 8, 5700, 'worktime-aux', 'ep:timer', 'mes/pro/worktime-aux/index', 'MesProWorktimeAux', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075651, '宸ユ椂鑰冩牳鎶ヨ〃', '', 2, 9, 5700, 'worktime-report', 'ep:data-analysis', 'mes/pro/worktime-report/index', 'MesProWorktimeReport', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075652, '杈呭姪宸ユ椂鏂板', 'mes:pro-worktime-aux:create', 3, 1, 1075650, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075653, '杈呭姪宸ユ椂淇敼', 'mes:pro-worktime-aux:update', 3, 2, 1075650, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075654, '杈呭姪宸ユ椂鍒犻櫎', 'mes:pro-worktime-aux:delete', 3, 3, 1075650, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075655, '宸ユ椂鑰冩牳鏌ヨ', 'mes:pro-worktime-report:query', 3, 1, 1075651, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0');
diff --git a/sql/mysql/20261106_qc_patrol_code_rule.sql b/sql/mysql/20261106_qc_patrol_code_rule.sql
new file mode 100644
index 0000000..bc2946e
--- /dev/null
+++ b/sql/mysql/20261106_qc_patrol_code_rule.sql
@@ -0,0 +1,26 @@
+-- 璐ㄩ噺宸℃鍗曡嚜鍔ㄧ紪鐮佽鍒欙細XJ_ + yyyyMMdd + 3 浣嶆祦姘达紝渚嬪 XJ_20261106001
+-- 鍙噸澶嶆墽琛岋細宸插瓨鍦ㄥ垯璺宠繃銆�
+INSERT INTO mes_md_auto_code_rule (code, name, description, max_length, padded, padded_char, padded_method, status, creator, create_time, update_time)
+SELECT 'QC_PATROL_CODE', '璐ㄩ噺宸℃鍗曠紪鐮�', '璐ㄩ噺宸℃鍗曡嚜鍔ㄧ紪鐮�', 16, 1, '0', 1, 0, '1', NOW(), NOW()
+FROM DUAL
+WHERE NOT EXISTS (SELECT 1 FROM mes_md_auto_code_rule WHERE code = 'QC_PATROL_CODE' AND deleted = 0);
+
+SET @patrol_rule_id = (SELECT id FROM mes_md_auto_code_rule WHERE code = 'QC_PATROL_CODE' AND deleted = 0 LIMIT 1);
+
+INSERT INTO mes_md_auto_code_part (rule_id, sort, type, length, fix_character, creator, create_time, update_time)
+SELECT @patrol_rule_id, 1, 3, 4, 'XJ_', '1', NOW(), NOW()
+FROM DUAL
+WHERE @patrol_rule_id IS NOT NULL
+ AND NOT EXISTS (SELECT 1 FROM mes_md_auto_code_part WHERE rule_id = @patrol_rule_id AND sort = 1 AND deleted = 0);
+
+INSERT INTO mes_md_auto_code_part (rule_id, sort, type, length, date_format, creator, create_time, update_time)
+SELECT @patrol_rule_id, 2, 2, 8, 'yyyyMMdd', '1', NOW(), NOW()
+FROM DUAL
+WHERE @patrol_rule_id IS NOT NULL
+ AND NOT EXISTS (SELECT 1 FROM mes_md_auto_code_part WHERE rule_id = @patrol_rule_id AND sort = 2 AND deleted = 0);
+
+INSERT INTO mes_md_auto_code_part (rule_id, sort, type, length, serial_start_no, serial_step, cycle_flag, cycle_method, creator, create_time, update_time)
+SELECT @patrol_rule_id, 3, 4, 3, 1, 1, 1, 3, '1', NOW(), NOW()
+FROM DUAL
+WHERE @patrol_rule_id IS NOT NULL
+ AND NOT EXISTS (SELECT 1 FROM mes_md_auto_code_part WHERE rule_id = @patrol_rule_id AND sort = 3 AND deleted = 0);
diff --git a/sql/mysql/20261106_sales_notice_delivery_enhance.sql b/sql/mysql/20261106_sales_notice_delivery_enhance.sql
new file mode 100644
index 0000000..efcf6f3
--- /dev/null
+++ b/sql/mysql/20261106_sales_notice_delivery_enhance.sql
@@ -0,0 +1,42 @@
+-- 鍙戣揣閫氱煡鍗曪紙鍙戣揣鍗曪級澧炲己锛氱墿娴佸叕鍙搞�佸揩閫掕垂銆佸紑绁ㄧ姸鎬併�佸鎵规祦绋嬪疄渚�
+-- 閫傜敤搴擄細mom-ntsh / mom-trt锛堝彧鍏佽鍦� mom-trt 涓婃墽琛岀敓浜э級
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_wm_sales_notice' AND column_name = 'logistics_company');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE mes_wm_sales_notice ADD COLUMN logistics_company VARCHAR(128) NULL COMMENT ''鐗╂祦鍏徃'' AFTER recipient_address',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_wm_sales_notice' AND column_name = 'express_fee');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE mes_wm_sales_notice ADD COLUMN express_fee DECIMAL(18,2) NULL DEFAULT 0 COMMENT ''蹇�掕垂'' AFTER logistics_company',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_wm_sales_notice' AND column_name = 'invoice_status');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE mes_wm_sales_notice ADD COLUMN invoice_status TINYINT NOT NULL DEFAULT 0 COMMENT ''寮�绁ㄧ姸鎬侊細0鏈紑绁� 1閮ㄥ垎寮�绁� 2宸插紑绁�'' AFTER express_fee',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_wm_sales_notice' AND column_name = 'process_instance_id');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE mes_wm_sales_notice ADD COLUMN process_instance_id VARCHAR(64) NULL COMMENT ''BPM 娴佺▼瀹炰緥缂栧彿'' AFTER invoice_status',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- 鍙戣揣瀹℃壒娴佺▼鍒嗙被锛堟祦绋嬫ā鍨嬪湪銆屾祦绋嬬鐞嗐�嶄腑鎸傚埌璇ュ垎绫讳笅锛屽鎵逛汉榛樿鐗╂祦锛�
+INSERT INTO bpm_category (id, name, code, description, status, sort, creator, create_time, updater, update_time, deleted)
+SELECT 86, '鍙戣揣瀹℃壒', 'sales_delivery_approve', 'MES 鍙戣揣鍗曞鎵癸紙榛樿鐗╂祦瀹℃壒锛�', 0, 31, 1, NOW(), 1, NOW(), 0
+WHERE NOT EXISTS (SELECT 1 FROM bpm_category WHERE code = 'sales_delivery_approve' AND deleted = 0);
+
+-- 鍙戣揣閫氱煡鍗曠姸鎬佸瓧鍏歌ˉ鍏呫�屽鎵逛腑銆�
+UPDATE system_dict_data SET sort = 3 WHERE dict_type = 'mes_wm_sales_notice_status' AND value = '3' AND deleted = 0;
+UPDATE system_dict_data SET sort = 4 WHERE dict_type = 'mes_wm_sales_notice_status' AND value = '4' AND deleted = 0;
+INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted)
+SELECT 1065510, 2, '瀹℃壒涓�', '2', 'mes_wm_sales_notice_status', 0, 'warning', '', 'MES 鍙戣揣閫氱煡鍗曞鎵逛腑', '1', NOW(), '1', NOW(), 0
+WHERE NOT EXISTS (SELECT 1 FROM system_dict_data WHERE dict_type = 'mes_wm_sales_notice_status' AND value = '2' AND deleted = 0);
diff --git a/sql/mysql/20261106_stock_taking_schema.sql b/sql/mysql/20261106_stock_taking_schema.sql
new file mode 100644
index 0000000..ca73780
--- /dev/null
+++ b/sql/mysql/20261106_stock_taking_schema.sql
@@ -0,0 +1,33 @@
+-- 鐩樼偣浠诲姟銆佷换鍔¤鍜岀粨鏋滆〃澧為噺杩佺Щ锛涗繚鐣欑幇鏈夋暟鎹紝鍙噸澶嶆墽琛屻��
+DROP PROCEDURE IF EXISTS add_stock_taking_column;
+DELIMITER //
+CREATE PROCEDURE add_stock_taking_column(IN p_table VARCHAR(64), IN p_column VARCHAR(64), IN p_definition VARCHAR(255))
+BEGIN
+ IF NOT EXISTS (SELECT 1 FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = p_table AND column_name = p_column) THEN
+ SET @ddl = CONCAT('ALTER TABLE `', p_table, '` ADD COLUMN `', p_column, '` ', p_definition);
+ PREPARE statement FROM @ddl;
+ EXECUTE statement;
+ DEALLOCATE PREPARE statement;
+ END IF;
+END//
+DELIMITER ;
+
+CALL add_stock_taking_column('mes_wm_stock_taking_task', 'taking_date', 'datetime NULL COMMENT ''鐩樼偣鏃ユ湡''');
+CALL add_stock_taking_column('mes_wm_stock_taking_task', 'type', 'int NULL COMMENT ''鐩樼偣绫诲瀷''');
+CALL add_stock_taking_column('mes_wm_stock_taking_task', 'user_id', 'bigint NULL COMMENT ''鐩樼偣浜�''');
+CALL add_stock_taking_column('mes_wm_stock_taking_task', 'blind_flag', 'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''鏄惁鐩茬洏''');
+CALL add_stock_taking_column('mes_wm_stock_taking_task', 'frozen', 'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''鏄惁鍐荤粨搴撳瓨''');
+CALL add_stock_taking_column('mes_wm_stock_taking_task', 'start_time', 'datetime NULL COMMENT ''寮�濮嬫椂闂�''');
+CALL add_stock_taking_column('mes_wm_stock_taking_task', 'end_time', 'datetime NULL COMMENT ''缁撴潫鏃堕棿''');
+CALL add_stock_taking_column('mes_wm_stock_taking_task', 'difference_processed', 'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''宸紓宸插叆璐�''');
+UPDATE mes_wm_stock_taking_task SET taking_date = task_date WHERE taking_date IS NULL AND task_date IS NOT NULL;
+
+CALL add_stock_taking_column('mes_wm_stock_taking_task_line', 'batch_code', 'varchar(64) NULL COMMENT ''鎵规鍙�''');
+CALL add_stock_taking_column('mes_wm_stock_taking_task_line', 'taking_quantity', 'decimal(24,6) NULL COMMENT ''鐩樼偣鏁伴噺''');
+CALL add_stock_taking_column('mes_wm_stock_taking_task_line', 'status', 'int NULL COMMENT ''鐩樼偣鐘舵��''');
+
+CALL add_stock_taking_column('mes_wm_stock_taking_task_result', 'batch_code', 'varchar(64) NULL COMMENT ''鎵规鍙�''');
+CALL add_stock_taking_column('mes_wm_stock_taking_task_result', 'taking_quantity', 'decimal(24,6) NULL COMMENT ''鐩樼偣鏁伴噺''');
+
+DROP PROCEDURE IF EXISTS add_stock_taking_column;
diff --git a/sql/mysql/20261106_wm_transaction_work_order.sql b/sql/mysql/20261106_wm_transaction_work_order.sql
new file mode 100644
index 0000000..0369ae3
--- /dev/null
+++ b/sql/mysql/20261106_wm_transaction_work_order.sql
@@ -0,0 +1,37 @@
+-- 鍑哄簱鍙拌处灞曠ず鐢熶骇璁㈠崟鍙凤細搴撳瓨浜嬪姟娴佹按鍐椾綑鐢熶骇璁㈠崟锛堝伐鍗曪級ID
+-- MySQL 8.4 涓嶆敮鎸� ADD COLUMN IF NOT EXISTS锛屽厛鏌� information_schema 鍐嶆墽琛�
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_wm_transaction' AND column_name = 'work_order_id');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE mes_wm_transaction ADD COLUMN work_order_id BIGINT NULL COMMENT ''鐢熶骇璁㈠崟锛堝伐鍗曪級缂栧彿'' AFTER biz_line_id',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+-- 鍥炲~鍘嗗彶娴佹按锛氱敓浜ч鏂� / 鐢熶骇閫�鏂� / 鐢熶骇鍏ュ簱 / 鐢熶骇娑堣�� / 浜у搧浜у嚭
+UPDATE mes_wm_transaction t
+ JOIN mes_wm_product_issue i ON t.biz_id = i.id
+SET t.work_order_id = i.work_order_id
+WHERE t.biz_type = 116 AND t.work_order_id IS NULL AND i.work_order_id IS NOT NULL;
+
+UPDATE mes_wm_transaction t
+ JOIN mes_wm_return_issue i ON t.biz_id = i.id
+SET t.work_order_id = i.work_order_id
+WHERE t.biz_type = 117 AND t.work_order_id IS NULL AND i.work_order_id IS NOT NULL;
+
+UPDATE mes_wm_transaction t
+ JOIN mes_wm_product_receipt i ON t.biz_id = i.id
+SET t.work_order_id = i.work_order_id
+WHERE t.biz_type = 118 AND t.work_order_id IS NULL AND i.work_order_id IS NOT NULL;
+
+UPDATE mes_wm_transaction t
+ JOIN mes_wm_item_consume i ON t.biz_id = i.id
+SET t.work_order_id = i.work_order_id
+WHERE t.biz_type = 123 AND t.work_order_id IS NULL AND i.work_order_id IS NOT NULL;
+
+UPDATE mes_wm_transaction t
+ JOIN mes_wm_product_produce i ON t.biz_id = i.id
+SET t.work_order_id = i.work_order_id
+WHERE t.biz_type = 124 AND t.work_order_id IS NULL AND i.work_order_id IS NOT NULL;
diff --git a/sql/mysql/mes_qc_ncr_approval_migration.sql b/sql/mysql/mes_qc_ncr_approval_migration.sql
new file mode 100644
index 0000000..9399156
--- /dev/null
+++ b/sql/mysql/mes_qc_ncr_approval_migration.sql
@@ -0,0 +1,56 @@
+-- =============================================================================
+-- 鏂囦欢锛歮es_qc_ncr_approval_migration.sql
+-- 鐢ㄩ�旓細MES 涓嶅悎鏍煎搧澶勭悊鍗曪紙NCR锛夋帴鍏� BPM 鍗忓悓瀹℃壒 + 澶勭疆鏂瑰紡璋冩暣
+-- 鐩爣搴擄細鐜版湁杩愯搴擄紙ruoyi-vue-pro / 鍚勯儴缃插搴� MES 搴擄級
+-- 鐗规�э細骞傜瓑锛屽彲閲嶅鎵ц锛涗笉鍚� tenant_id锛堥」鐩湭鍚敤澶氱鎴凤級
+-- 璇存槑锛�
+-- 1) 澶勭疆鏂瑰紡锛�4 璁╂鎺ユ敹 -> 璁╂鏀捐锛涙柊澧� 6 杩斾慨銆�
+-- 2) NCR 鐘舵�佷笌鍚庣 MesNcrStatusEnum 瀵归綈锛�0 寰呰瘎瀹°��2 瀹℃壒涓��6 宸茶瘎瀹°��7 宸插缃��8 宸插叧闂��
+-- 3) 鏂板 BPM 娴佺▼鍒嗙被 mes_ncr_approve銆傛祦绋嬪畾涔夐渶鍦ㄣ�屽崗鍚屽姙鍏� -> 娴佺▼妯″瀷銆嶄腑
+-- 浠� key=mes_ncr_approve 鍒涘缓骞跺彂甯冿紙Flowable 浼氳嚜琛岀敓鎴� ACT_RE_* 涓婚敭锛�
+-- 绂佹鎵嬪伐缂栭�犳祦绋嬪畾涔� ID锛夈�傛湭鍙戝竷鏃跺悗绔細璧般�岃嚜鍔ㄩ�氳繃銆嶅厹搴曘��
+-- =============================================================================
+
+SET NAMES utf8mb4;
+
+-- -----------------------------------------------------------------------------
+-- 鈶� 澶勭疆鏂瑰紡瀛楀吀锛氫慨姝� 4 鐨勬枃妗堬紝骞舵柊澧� 6 杩斾慨
+-- -----------------------------------------------------------------------------
+DELETE FROM `system_dict_data` WHERE `dict_type` = 'mes_ncr_disposition';
+
+INSERT INTO `system_dict_data`
+(`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+VALUES
+(1, '閫�璐�', '1', 'mes_ncr_disposition', 0, '', '', '閫�璐�', '1', NOW(), '1', NOW(), b'0'),
+(2, '鎶ュ簾', '2', 'mes_ncr_disposition', 0, '', '', '鎶ュ簾', '1', NOW(), '1', NOW(), b'0'),
+(3, '杩斿伐', '3', 'mes_ncr_disposition', 0, '', '', '杩斿伐', '1', NOW(), '1', NOW(), b'0'),
+(4, '璁╂鏀捐', '4', 'mes_ncr_disposition', 0, '', '', '璁╂鏀捐', '1', NOW(), '1', NOW(), b'0'),
+(5, '闄嶇骇浣跨敤', '5', 'mes_ncr_disposition', 0, '', '', '闄嶇骇浣跨敤', '1', NOW(), '1', NOW(), b'0'),
+(6, '杩斾慨', '6', 'mes_ncr_disposition', 0, '', '', '杩斾慨', '1', NOW(), '1', NOW(), b'0');
+
+-- -----------------------------------------------------------------------------
+-- 鈶� NCR 鐘舵�佸瓧鍏革細涓庡悗绔灇涓� 0/2/6/7/8 瀵归綈锛堟柊澧炲鎵逛腑锛�
+-- -----------------------------------------------------------------------------
+DELETE FROM `system_dict_data` WHERE `dict_type` = 'mes_ncr_status';
+
+INSERT INTO `system_dict_data`
+(`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+VALUES
+(1, '寰呰瘎瀹�', '0', 'mes_ncr_status', 0, '', '', '寰呰瘎瀹�', '1', NOW(), '1', NOW(), b'0'),
+(2, '瀹℃壒涓�', '2', 'mes_ncr_status', 0, 'processing', '', '瀹℃壒涓�', '1', NOW(), '1', NOW(), b'0'),
+(3, '宸茶瘎瀹�', '6', 'mes_ncr_status', 0, '', '', '宸茶瘎瀹★紙瀹℃壒閫氳繃锛屽緟澶勭疆锛�', '1', NOW(), '1', NOW(), b'0'),
+(4, '宸插缃�', '7', 'mes_ncr_status', 0, '', '', '宸插缃�', '1', NOW(), '1', NOW(), b'0'),
+(5, '宸插叧闂�', '8', 'mes_ncr_status', 0, '', '', '宸插叧闂�', '1', NOW(), '1', NOW(), b'0');
+
+-- -----------------------------------------------------------------------------
+-- 鈶� BPM 娴佺▼鍒嗙被锛歂CR 瀹℃壒
+-- -----------------------------------------------------------------------------
+INSERT INTO `bpm_category`
+(`name`, `code`, `description`, `status`, `sort`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+SELECT '涓嶅悎鏍煎搧澶勭悊瀹℃壒', 'mes_ncr_approve', 'MES 涓嶅悎鏍煎搧澶勭悊鍗曪紙NCR锛夊崗鍚屽鎵�', 0, 80, '1', NOW(), '1', NOW(), 0
+ WHERE NOT EXISTS (SELECT 1 FROM `bpm_category` WHERE `code` = 'mes_ncr_approve' AND `deleted` = 0);
+
+-- 娴佺▼瀹氫箟璇存槑锛堜笉鍐欐娴佺▼瀹氫箟 ID锛夛細
+-- 鍦� BPM 娴佺▼妯″瀷涓娇鐢� key = 'mes_ncr_approve' 鍒涘缓/鍙戝竷娴佺▼锛�
+-- 娴佺▼鍒嗙被閫夋嫨涓婇潰鐨勩�屼笉鍚堟牸鍝佸鐞嗗鎵广�嶏紝涓氬姟琛ㄥ崟鍙暀绌猴紙瀹℃壒鎰忚鐢� BPM 瀹℃壒璁板綍鎵胯浇锛夈��
+-- 鍙戝竷鍚庢棤闇�淇敼浠g爜锛涙湭鍙戝竷鎴栧紑鍚叏灞�鍏嶅鎵规椂锛屾彁浜ゅ鎵逛細鑷姩缃负銆屽凡璇勫锛堝緟澶勭疆锛夈�嶃��
diff --git a/sql/mysql/mes_qc_ncr_init.sql b/sql/mysql/mes_qc_ncr_init.sql
index 353d5d3..d5ebc74 100644
--- a/sql/mysql/mes_qc_ncr_init.sql
+++ b/sql/mysql/mes_qc_ncr_init.sql
@@ -21,7 +21,7 @@
`defect_description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '涓嶅悎鏍兼弿杩�',
-- 璇勫淇℃伅
- `disposition` int NULL DEFAULT NULL COMMENT '澶勭疆鏂瑰紡锛堥��璐�/鎶ュ簾/杩斿伐/璁╂鎺ユ敹/闄嶇骇浣跨敤锛夛紝瀛楀吀 mes_ncr_disposition',
+ `disposition` int NULL DEFAULT NULL COMMENT '澶勭疆鏂瑰紡锛堥��璐�/鎶ュ簾/杩斿伐/璁╂鏀捐/闄嶇骇浣跨敤/杩斾慨锛夛紝瀛楀吀 mes_ncr_disposition',
`responsible_dept_id` bigint NULL DEFAULT NULL COMMENT '璐d换閮ㄩ棬ID',
`reviewer_user_id` bigint NULL DEFAULT NULL COMMENT '璇勫浜篒D',
`review_date` datetime NULL DEFAULT NULL COMMENT '璇勫鏃ユ湡',
@@ -43,8 +43,8 @@
`close_opinion` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '鍏抽棴鎰忚',
-- 鐘舵�佷笌娴佺▼
- `status` int NULL DEFAULT NULL COMMENT '鐘舵�侊紙寰呰瘎瀹�/宸茶瘎瀹�/宸插缃�/宸插叧闂級锛屽瓧鍏� mes_ncr_status',
- `process_instance_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'BPM娴佺▼瀹炰緥ID锛堥鐣欙級',
+ `status` int NULL DEFAULT NULL COMMENT '鐘舵�侊紙寰呰瘎瀹�/瀹℃壒涓�/宸茶瘎瀹�/宸插缃�/宸插叧闂級锛屽瓧鍏� mes_ncr_status',
+ `process_instance_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'BPM娴佺▼瀹炰緥ID',
`remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '澶囨敞',
-- 鏍囧噯瀛楁
@@ -84,11 +84,20 @@
INSERT INTO `system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
VALUES
(1, '寰呰瘎瀹�', '0', 'mes_ncr_status', 0, '', '', '寰呰瘎瀹�', '1', NOW(), '1', NOW(), b'0'),
-(2, '宸茶瘎瀹�', '1', 'mes_ncr_status', 0, '', '', '宸茶瘎瀹�', '1', NOW(), '1', NOW(), b'0'),
-(3, '宸插缃�', '2', 'mes_ncr_status', 0, '', '', '宸插缃�', '1', NOW(), '1', NOW(), b'0'),
-(4, '宸插叧闂�', '3', 'mes_ncr_status', 0, '', '', '宸插叧闂�', '1', NOW(), '1', NOW(), b'0'),
+(2, '瀹℃壒涓�', '2', 'mes_ncr_status', 0, 'processing', '', '瀹℃壒涓�', '1', NOW(), '1', NOW(), b'0'),
+(3, '宸茶瘎瀹�', '6', 'mes_ncr_status', 0, '', '', '宸茶瘎瀹★紙瀹℃壒閫氳繃锛屽緟澶勭疆锛�', '1', NOW(), '1', NOW(), b'0'),
+(4, '宸插缃�', '7', 'mes_ncr_status', 0, '', '', '宸插缃�', '1', NOW(), '1', NOW(), b'0'),
+(5, '宸插叧闂�', '8', 'mes_ncr_status', 0, '', '', '宸插叧闂�', '1', NOW(), '1', NOW(), b'0'),
(1, '閫�璐�', '1', 'mes_ncr_disposition', 0, '', '', '閫�璐�', '1', NOW(), '1', NOW(), b'0'),
(2, '鎶ュ簾', '2', 'mes_ncr_disposition', 0, '', '', '鎶ュ簾', '1', NOW(), '1', NOW(), b'0'),
(3, '杩斿伐', '3', 'mes_ncr_disposition', 0, '', '', '杩斿伐', '1', NOW(), '1', NOW(), b'0'),
-(4, '璁╂鎺ユ敹', '4', 'mes_ncr_disposition', 0, '', '', '璁╂鎺ユ敹', '1', NOW(), '1', NOW(), b'0'),
-(5, '闄嶇骇浣跨敤', '5', 'mes_ncr_disposition', 0, '', '', '闄嶇骇浣跨敤', '1', NOW(), '1', NOW(), b'0');
+(4, '璁╂鏀捐', '4', 'mes_ncr_disposition', 0, '', '', '璁╂鏀捐', '1', NOW(), '1', NOW(), b'0'),
+(5, '闄嶇骇浣跨敤', '5', 'mes_ncr_disposition', 0, '', '', '闄嶇骇浣跨敤', '1', NOW(), '1', NOW(), b'0'),
+(6, '杩斾慨', '6', 'mes_ncr_disposition', 0, '', '', '杩斾慨', '1', NOW(), '1', NOW(), b'0');
+
+-- 5. BPM 娴佺▼鍒嗙被锛圢CR 鍗忓悓瀹℃壒锛�
+INSERT INTO `bpm_category` (`name`, `code`, `description`, `status`, `sort`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+SELECT '涓嶅悎鏍煎搧澶勭悊瀹℃壒', 'mes_ncr_approve', 'MES 涓嶅悎鏍煎搧澶勭悊鍗曪紙NCR锛夊崗鍚屽鎵�', 0, 80, '1', NOW(), '1', NOW(), 0
+ WHERE NOT EXISTS (SELECT 1 FROM `bpm_category` WHERE `code` = 'mes_ncr_approve' AND `deleted` = 0);
+-- 娴佺▼瀹氫箟锛氬湪 BPM 娴佺▼妯″瀷涓互 key='mes_ncr_approve' 鍒涘缓骞跺彂甯冿紱
+-- 鏈彂甯冩垨寮�鍚叏灞�鍏嶅鎵规椂锛屽悗绔彁浜ゅ鎵逛細鑷姩缃负銆屽凡璇勫锛堝緟澶勭疆锛夈�嶃��
diff --git a/yudao-module-aftersales-api/src/main/java/cn/iocoder/yudao/module/aftersales/api/AfterSaleTicketApi.java b/yudao-module-aftersales-api/src/main/java/cn/iocoder/yudao/module/aftersales/api/AfterSaleTicketApi.java
index 05bb024..8dd93e7 100644
--- a/yudao-module-aftersales-api/src/main/java/cn/iocoder/yudao/module/aftersales/api/AfterSaleTicketApi.java
+++ b/yudao-module-aftersales-api/src/main/java/cn/iocoder/yudao/module/aftersales/api/AfterSaleTicketApi.java
@@ -4,6 +4,7 @@
import cn.iocoder.yudao.module.aftersales.api.dto.AfterSaleReturnRespDTO;
import cn.iocoder.yudao.module.aftersales.api.dto.AfterSaleTicketRespDTO;
import cn.iocoder.yudao.module.aftersales.api.dto.AfterSaleWarehouseReturnCreateReqDTO;
+import cn.iocoder.yudao.module.aftersales.api.dto.AfterSaleWarehouseReturnStageReqDTO;
import java.math.BigDecimal;
@@ -45,6 +46,12 @@
*/
CommonResult<Boolean> onWarehouseReturnCreated(AfterSaleWarehouseReturnCreateReqDTO reqDTO);
+ CommonResult<Boolean> onWarehouseReturnQualityFinished(AfterSaleWarehouseReturnStageReqDTO reqDTO);
+
+ CommonResult<Boolean> onWarehouseReturnInboundFinished(AfterSaleWarehouseReturnStageReqDTO reqDTO);
+
+ CommonResult<Boolean> onWarehouseReturnRefundCompleted(AfterSaleWarehouseReturnStageReqDTO reqDTO);
+
/**
* 鏌ヨ鍞悗宸ュ崟锛堜緵 MES/ERP 鏌ヨ鍏宠仈淇℃伅锛�
*
diff --git a/yudao-module-aftersales-api/src/main/java/cn/iocoder/yudao/module/aftersales/api/dto/AfterSaleWarehouseReturnStageReqDTO.java b/yudao-module-aftersales-api/src/main/java/cn/iocoder/yudao/module/aftersales/api/dto/AfterSaleWarehouseReturnStageReqDTO.java
new file mode 100644
index 0000000..c5e5dc3
--- /dev/null
+++ b/yudao-module-aftersales-api/src/main/java/cn/iocoder/yudao/module/aftersales/api/dto/AfterSaleWarehouseReturnStageReqDTO.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.aftersales.api.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import jakarta.validation.constraints.NotNull;
+
+import java.math.BigDecimal;
+
+/** 浠撳偍鐩村缓閿�鍞��璐у崟鐨勫悗缁川妫�銆佸叆搴撳拰閫�娆惧洖璋冦�� */
+@Data
+@Accessors(chain = true)
+public class AfterSaleWarehouseReturnStageReqDTO {
+ private Long saleOrderId;
+ @NotNull(message = "閿�鍞��璐у崟 ID 涓嶈兘涓虹┖")
+ private Long returnSalesId;
+ private String returnSalesCode;
+ private String qualityResult;
+ private BigDecimal refundAmount;
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/api/AfterSaleTicketApiImpl.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/api/AfterSaleTicketApiImpl.java
index d171108..9827d8d 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/api/AfterSaleTicketApiImpl.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/api/AfterSaleTicketApiImpl.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.module.aftersales.api.dto.AfterSaleReturnRespDTO;
import cn.iocoder.yudao.module.aftersales.api.dto.AfterSaleTicketRespDTO;
import cn.iocoder.yudao.module.aftersales.api.dto.AfterSaleWarehouseReturnCreateReqDTO;
+import cn.iocoder.yudao.module.aftersales.api.dto.AfterSaleWarehouseReturnStageReqDTO;
import cn.iocoder.yudao.module.aftersales.dal.dataobject.returnobj.AfterSaleReturnDO;
import cn.iocoder.yudao.module.aftersales.dal.dataobject.ticket.AfterSaleTicketDO;
import cn.iocoder.yudao.module.aftersales.service.returnobj.AfterSaleReturnService;
@@ -53,6 +54,24 @@
}
@Override
+ public CommonResult<Boolean> onWarehouseReturnQualityFinished(AfterSaleWarehouseReturnStageReqDTO reqDTO) {
+ ticketService.onWarehouseReturnQualityFinished(reqDTO);
+ return success(true);
+ }
+
+ @Override
+ public CommonResult<Boolean> onWarehouseReturnInboundFinished(AfterSaleWarehouseReturnStageReqDTO reqDTO) {
+ ticketService.onWarehouseReturnInboundFinished(reqDTO);
+ return success(true);
+ }
+
+ @Override
+ public CommonResult<Boolean> onWarehouseReturnRefundCompleted(AfterSaleWarehouseReturnStageReqDTO reqDTO) {
+ ticketService.onWarehouseReturnRefundCompleted(reqDTO);
+ return success(true);
+ }
+
+ @Override
public CommonResult<AfterSaleTicketRespDTO> getTicket(Long id) {
AfterSaleTicketDO ticket = ticketService.getTicket(id);
return success(BeanUtils.toBean(ticket, AfterSaleTicketRespDTO.class));
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/AfterSaleTicketController.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/AfterSaleTicketController.java
index 20eda4f..c88daf7 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/AfterSaleTicketController.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/AfterSaleTicketController.java
@@ -9,6 +9,7 @@
import cn.iocoder.yudao.module.aftersales.controller.admin.ticket.vo.ticket.AfterSaleTicketPageReqVO;
import cn.iocoder.yudao.module.aftersales.controller.admin.ticket.vo.ticket.AfterSaleTicketRespVO;
import cn.iocoder.yudao.module.aftersales.controller.admin.ticket.vo.ticket.AfterSaleTicketSaveReqVO;
+import cn.iocoder.yudao.module.aftersales.api.dto.AfterSaleWarehouseReturnStageReqDTO;
import cn.iocoder.yudao.module.aftersales.dal.dataobject.ticket.AfterSaleTicketDO;
import cn.iocoder.yudao.module.aftersales.dal.dataobject.ticket.AfterSaleTicketFlowDO;
import cn.iocoder.yudao.module.aftersales.dal.dataobject.ticket.AfterSaleTicketItemDO;
@@ -145,6 +146,15 @@
return success(true);
}
+ @PutMapping("/warehouse-refund-completed")
+ @Operation(summary = "鐧昏浠撳偍閿�鍞��璐ч��娆惧畬鎴愬洖璋�")
+ @PreAuthorize("@ss.hasPermission('aftersales:ticket:update')")
+ public CommonResult<Boolean> onWarehouseReturnRefundCompleted(
+ @Valid @RequestBody AfterSaleWarehouseReturnStageReqDTO reqDTO) {
+ ticketService.onWarehouseReturnRefundCompleted(reqDTO);
+ return success(true);
+ }
+
// ========== 鍐呴儴鏂规硶锛氭祦杞褰� / 鎵归噺鎷艰鍏宠仈鍚嶇О ==========
private List<AfterSaleTicketFlowRespVO> buildFlowList(Long ticketId) {
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/ticket/AfterSaleTicketMapper.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/ticket/AfterSaleTicketMapper.java
index 2eadd72..1c036b9 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/ticket/AfterSaleTicketMapper.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/ticket/AfterSaleTicketMapper.java
@@ -9,6 +9,7 @@
import cn.iocoder.yudao.module.aftersales.enums.AfterSaleBizTypeEnum;
import cn.iocoder.yudao.module.aftersales.util.AfterSalePermissionUtils;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
import java.util.List;
@@ -18,6 +19,9 @@
@Mapper
public interface AfterSaleTicketMapper extends BaseMapperX<AfterSaleTicketDO> {
+ @Select("SELECT id FROM after_sale_ticket WHERE id = #{id} AND deleted = 0 FOR UPDATE")
+ Long lockById(Long id);
+
default AfterSaleTicketDO selectByNo(String no) {
return selectOne(AfterSaleTicketDO::getNo, no);
}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketFlowService.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketFlowService.java
index 744bd15..44c1214 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketFlowService.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketFlowService.java
@@ -20,6 +20,9 @@
String ACTION_CANCEL = "CANCEL";
String ACTION_VISIT = "VISIT";
String ACTION_RETURN = "RETURN";
+ String ACTION_RETURN_QUALITY = "RETURN_QUALITY";
+ String ACTION_RETURN_INBOUND = "RETURN_INBOUND";
+ String ACTION_RETURN_REFUND = "RETURN_REFUND";
/**
* 璁板綍涓�鏉℃祦杞棩蹇�
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketService.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketService.java
index af99f36..294540c 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketService.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketService.java
@@ -82,6 +82,12 @@
void onWarehouseReturnCreated(Long saleOrderId, Long returnSalesId,
String returnSalesCode, String returnReason);
+ void onWarehouseReturnQualityFinished(cn.iocoder.yudao.module.aftersales.api.dto.AfterSaleWarehouseReturnStageReqDTO reqDTO);
+
+ void onWarehouseReturnInboundFinished(cn.iocoder.yudao.module.aftersales.api.dto.AfterSaleWarehouseReturnStageReqDTO reqDTO);
+
+ void onWarehouseReturnRefundCompleted(cn.iocoder.yudao.module.aftersales.api.dto.AfterSaleWarehouseReturnStageReqDTO reqDTO);
+
/**
* 闂鍒ゅ畾锛堢‘瀹氶棶棰樼被鍨嬨�佸垎绫汇�佷弗閲嶇▼搴︼級
*
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketServiceImpl.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketServiceImpl.java
index cbf4c26..d55bffa 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketServiceImpl.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketServiceImpl.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.aftersales.controller.admin.ticket.vo.ticket.AfterSaleTicketPageReqVO;
import cn.iocoder.yudao.module.aftersales.controller.admin.ticket.vo.ticket.AfterSaleTicketSaveReqVO;
+import cn.iocoder.yudao.module.aftersales.api.dto.AfterSaleWarehouseReturnStageReqDTO;
import cn.iocoder.yudao.module.aftersales.dal.dataobject.problem.AfterSaleProblemDO;
import cn.iocoder.yudao.module.aftersales.dal.dataobject.ticket.AfterSaleTicketDO;
import cn.iocoder.yudao.module.aftersales.dal.dataobject.ticket.AfterSaleTicketItemDO;
@@ -29,6 +30,7 @@
import org.springframework.validation.annotation.Validated;
import java.time.LocalDateTime;
+import java.math.BigDecimal;
import java.util.Collection;
import java.util.Comparator;
import java.util.List;
@@ -249,6 +251,84 @@
ticket.getStatus(), targetStatus, content);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void onWarehouseReturnQualityFinished(AfterSaleWarehouseReturnStageReqDTO reqDTO) {
+ AfterSaleTicketDO ticket = findWarehouseReturnTicket(reqDTO);
+ if (ticket == null || hasWarehouseReturnStage(ticket.getId(), reqDTO,
+ AfterSaleTicketFlowService.ACTION_RETURN_QUALITY)) return;
+ ticketFlowService.record(ticket.getId(), AfterSaleTicketFlowService.ACTION_RETURN_QUALITY, "閫�璐ц川妫�瀹屾垚",
+ ticket.getStatus(), ticket.getStatus(), "閿�鍞��璐у崟銆�" + warehouseReturnKey(reqDTO)
+ + "銆戣川妫�瀹屾垚锛岀粨璁猴細" + reqDTO.getQualityResult());
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void onWarehouseReturnInboundFinished(AfterSaleWarehouseReturnStageReqDTO reqDTO) {
+ AfterSaleTicketDO ticket = findWarehouseReturnTicket(reqDTO);
+ if (ticket == null || hasWarehouseReturnStage(ticket.getId(), reqDTO,
+ AfterSaleTicketFlowService.ACTION_RETURN_INBOUND)) return;
+ Integer targetStatus = ticket.getStatus();
+ if (AfterSaleTicketStatusEnum.WAITING_RETURN.getStatus().equals(targetStatus)) {
+ targetStatus = AfterSaleTicketStatusEnum.WAITING_REFUND.getStatus();
+ ticketMapper.updateById(new AfterSaleTicketDO().setId(ticket.getId()).setStatus(targetStatus));
+ }
+ ticketFlowService.record(ticket.getId(), AfterSaleTicketFlowService.ACTION_RETURN_INBOUND, "閫�璐у叆搴撳畬鎴�",
+ ticket.getStatus(), targetStatus, "閿�鍞��璐у崟銆�" + warehouseReturnKey(reqDTO) + "銆戝凡瀹屾垚涓婃灦鍏ュ簱");
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void onWarehouseReturnRefundCompleted(AfterSaleWarehouseReturnStageReqDTO reqDTO) {
+ if (reqDTO.getRefundAmount() == null || reqDTO.getRefundAmount().compareTo(BigDecimal.ZERO) < 0) {
+ throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400, "瀹為檯閫�娆鹃噾棰濅笉鑳藉皬浜� 0");
+ }
+ AfterSaleTicketDO ticket = findWarehouseReturnTicket(reqDTO);
+ if (ticket == null) {
+ throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400,
+ "閿�鍞��璐у崟鏈叧鑱斿敭鍚庡伐鍗曪紝璇锋牳瀵归攢鍞鍗曞拰閫�璐у崟鍙�");
+ }
+ if (hasWarehouseReturnStage(ticket.getId(), reqDTO,
+ AfterSaleTicketFlowService.ACTION_RETURN_REFUND)) return;
+ if (!AfterSaleTicketStatusEnum.WAITING_REFUND.getStatus().equals(ticket.getStatus())) {
+ throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400,
+ "閫�璐у叆搴撳畬鎴愬悗鎵嶈兘鍥炲啓閫�娆剧粨鏋�");
+ }
+ ticketMapper.updateById(new AfterSaleTicketDO().setId(ticket.getId())
+ .setStatus(AfterSaleTicketStatusEnum.COMPLETED.getStatus())
+ .setResolvedTime(LocalDateTime.now())
+ .setVisitStatus(AfterSaleVisitStatusEnum.WAITING.getStatus()));
+ ticketFlowService.record(ticket.getId(), AfterSaleTicketFlowService.ACTION_RETURN_REFUND, "閫�娆惧畬鎴�",
+ ticket.getStatus(), AfterSaleTicketStatusEnum.COMPLETED.getStatus(),
+ "閿�鍞��璐у崟銆�" + warehouseReturnKey(reqDTO) + "銆戝疄閫�閲戦锛�" + reqDTO.getRefundAmount());
+ }
+
+ private AfterSaleTicketDO findWarehouseReturnTicket(AfterSaleWarehouseReturnStageReqDTO reqDTO) {
+ if (reqDTO.getSaleOrderId() == null || reqDTO.getReturnSalesId() == null) return null;
+ String key = warehouseReturnKey(reqDTO);
+ for (AfterSaleTicketDO candidate : ticketMapper.selectListBySaleOrderId(reqDTO.getSaleOrderId())) {
+ boolean linked = ticketFlowService.getFlowList(candidate.getId()).stream()
+ .anyMatch(flow -> AfterSaleTicketFlowService.ACTION_RETURN.equals(flow.getAction())
+ && flow.getContent() != null && flow.getContent().contains("銆�" + key + "銆�"));
+ if (linked) {
+ ticketMapper.lockById(candidate.getId());
+ return ticketMapper.selectById(candidate.getId());
+ }
+ }
+ return null;
+ }
+
+ private boolean hasWarehouseReturnStage(Long ticketId, AfterSaleWarehouseReturnStageReqDTO reqDTO, String action) {
+ return ticketFlowService.getFlowList(ticketId).stream()
+ .anyMatch(flow -> action.equals(flow.getAction()) && flow.getContent() != null
+ && flow.getContent().contains("銆�" + warehouseReturnKey(reqDTO) + "銆�"));
+ }
+
+ private String warehouseReturnKey(AfterSaleWarehouseReturnStageReqDTO reqDTO) {
+ return reqDTO.getReturnSalesCode() != null && !reqDTO.getReturnSalesCode().isBlank()
+ ? reqDTO.getReturnSalesCode() : "ID=" + reqDTO.getReturnSalesId();
+ }
+
private String getHandlerName(Long handlerUserId) {
AdminUserRespDTO handler = adminUserApi.getUser(handlerUserId);
return handler != null ? handler.getNickname() : "鐢ㄦ埛(ID=" + handlerUserId + ")";
diff --git a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/BiChartConfigController.java b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/BiChartConfigController.java
index b7b128a..dc9b03b 100644
--- a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/BiChartConfigController.java
+++ b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/BiChartConfigController.java
@@ -50,6 +50,7 @@
}
@GetMapping("/get")
+ @PreAuthorize("@ss.hasPermission('bi:chart-config:query')")
@Operation(summary = "鑾峰彇鍥捐〃閰嶇疆")
@Parameter(name = "id", description = "缂栧彿", required = true)
public CommonResult<BiChartConfigDO> get(@RequestParam("id") Long id) {
@@ -57,6 +58,7 @@
}
@GetMapping("/page")
+ @PreAuthorize("@ss.hasPermission('bi:chart-config:query')")
@Operation(summary = "鍒嗛〉鏌ヨ鍥捐〃閰嶇疆")
public CommonResult<PageResult<BiChartConfigDO>> getPage(
@RequestParam(value = "dashboardId", required = false) Long dashboardId,
diff --git a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/BiDataSourceConfigController.java b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/BiDataSourceConfigController.java
index bbdac29..829aa69 100644
--- a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/BiDataSourceConfigController.java
+++ b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/BiDataSourceConfigController.java
@@ -49,6 +49,7 @@
}
@GetMapping("/get")
+ @PreAuthorize("@ss.hasPermission('bi:data-source-config:query')")
@Operation(summary = "鑾峰彇鏁版嵁婧愰厤缃�")
@Parameter(name = "id", description = "缂栧彿", required = true)
public CommonResult<BiDataSourceConfigDO> get(@RequestParam("id") Long id) {
@@ -56,6 +57,7 @@
}
@GetMapping("/page")
+ @PreAuthorize("@ss.hasPermission('bi:data-source-config:query')")
@Operation(summary = "鍒嗛〉鏌ヨ鏁版嵁婧愰厤缃�")
public CommonResult<PageResult<BiDataSourceConfigDO>> getPage(
@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
diff --git a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/BiWarehouseCoordinateController.java b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/BiWarehouseCoordinateController.java
index fc68a81..39f7dd4 100644
--- a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/BiWarehouseCoordinateController.java
+++ b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/BiWarehouseCoordinateController.java
@@ -24,6 +24,7 @@
private BiWarehouseCoordinateService service;
@GetMapping("/list")
+ @PreAuthorize("@ss.hasAnyPermissions('bi:dashboard:warehouse:query', 'bi:warehouse-coordinate:update')")
@Operation(summary = "鑾峰彇鍏ㄩ儴浠撳簱鍧愭爣")
public CommonResult<List<BiWarehouseCoordinateDO>> list() {
return success(service.listAll());
diff --git a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/dashboard/DashboardController.java b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/dashboard/DashboardController.java
index 712b3d3..cb66d07 100644
--- a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/dashboard/DashboardController.java
+++ b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/dashboard/DashboardController.java
@@ -3,6 +3,7 @@
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.bi.dal.dataobject.BiDashboardDO;
import cn.iocoder.yudao.module.bi.service.dashboard.DashboardService;
+import cn.iocoder.yudao.framework.security.core.service.SecurityFrameworkService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -25,16 +26,24 @@
@Resource
private DashboardService dashboardService;
+ @Resource
+ private SecurityFrameworkService securityFrameworkService;
+
@GetMapping("/list")
@Operation(summary = "鑾峰彇浠〃鐩樺垪琛�")
public CommonResult<List<BiDashboardDO>> getDashboardList() {
- return success(dashboardService.getDashboardList());
+ return success(dashboardService.getDashboardList().stream()
+ .filter(dashboard -> securityFrameworkService.hasPermission(
+ "bi:dashboard:" + dashboard.getCode() + ":query"))
+ .toList());
}
@PostMapping("/{dashboardCode}/data")
+ @PreAuthorize("@ss.hasPermission('bi:dashboard:' + #dashboardCode + ':query')")
@Operation(summary = "鑾峰彇浠〃鐩樻暟鎹�")
@Parameter(name = "dashboardCode", description = "浠〃鐩樼紪鐮�", required = true,
- example = "purchase_sales")
public CommonResult<List<Map<String, Object>>> getDashboardData(
+ example = "purchase_sales")
+ public CommonResult<List<Map<String, Object>>> getDashboardData(
@PathVariable("dashboardCode") String dashboardCode,
@RequestBody(required = false) Map<String, Object> params) {
List<Map<String, Object>> data = dashboardService.getDashboardData(dashboardCode, params);
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApi.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApi.java
index 0cc7638..3ac984b 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApi.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApi.java
@@ -24,6 +24,15 @@
*/
String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqDTO reqDTO);
+ /**
+ * 鐢辨祦绋嬪彂璧蜂汉鎾ら攢杩愯涓殑娴佺▼瀹炰緥銆�
+ *
+ * @param userId 鍙戣捣浜虹敤鎴风紪鍙�
+ * @param processInstanceId 娴佺▼瀹炰緥缂栧彿
+ * @param reason 鎾ら攢鍘熷洜
+ */
+ void cancelProcessInstanceByStartUser(Long userId, String processInstanceId, String reason);
+
}
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApiImpl.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApiImpl.java
index 706675f..04ea2b9 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApiImpl.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApiImpl.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.bpm.api.task;
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceCancelReqVO;
import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessAutoApproveService;
import jakarta.annotation.Resource;
@@ -34,4 +35,12 @@
return processInstanceService.createProcessInstance(userId, reqDTO);
}
+ @Override
+ public void cancelProcessInstanceByStartUser(Long userId, String processInstanceId, String reason) {
+ BpmProcessInstanceCancelReqVO reqVO = new BpmProcessInstanceCancelReqVO();
+ reqVO.setId(processInstanceId);
+ reqVO.setReason(reason);
+ processInstanceService.cancelProcessInstanceByStartUser(userId, reqVO);
+ }
+
}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerAddressController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerAddressController.java
new file mode 100644
index 0000000..9824bc6
--- /dev/null
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerAddressController.java
@@ -0,0 +1,69 @@
+package cn.iocoder.yudao.module.crm.controller.admin.customer;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.crm.controller.admin.customer.vo.address.CrmCustomerAddressRespVO;
+import cn.iocoder.yudao.module.crm.controller.admin.customer.vo.address.CrmCustomerAddressSaveReqVO;
+import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerAddressDO;
+import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerAddressService;
+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.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 绠$悊鍚庡彴 - CRM 瀹㈡埛鏀惰揣鍦板潃
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Tag(name = "绠$悊鍚庡彴 - CRM 瀹㈡埛鏀惰揣鍦板潃")
+@RestController
+@RequestMapping("/crm/customer-address")
+@Validated
+public class CrmCustomerAddressController {
+
+ @Resource
+ private CrmCustomerAddressService customerAddressService;
+
+ @PostMapping("/create")
+ @Operation(summary = "鍒涘缓瀹㈡埛鏀惰揣鍦板潃")
+ @PreAuthorize("@ss.hasPermission('crm:customer:update')")
+ public CommonResult<Long> createCustomerAddress(@Valid @RequestBody CrmCustomerAddressSaveReqVO createReqVO) {
+ return success(customerAddressService.createCustomerAddress(createReqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "淇敼瀹㈡埛鏀惰揣鍦板潃")
+ @PreAuthorize("@ss.hasPermission('crm:customer:update')")
+ public CommonResult<Boolean> updateCustomerAddress(@Valid @RequestBody CrmCustomerAddressSaveReqVO updateReqVO) {
+ customerAddressService.updateCustomerAddress(updateReqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎瀹㈡埛鏀惰揣鍦板潃")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('crm:customer:update')")
+ public CommonResult<Boolean> deleteCustomerAddress(@RequestParam("id") Long id) {
+ customerAddressService.deleteCustomerAddress(id);
+ return success(true);
+ }
+
+ @GetMapping("/list")
+ @Operation(summary = "鑾峰緱瀹㈡埛鏀惰揣鍦板潃鍒楄〃")
+ @Parameter(name = "customerId", description = "瀹㈡埛缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('crm:customer:query')")
+ public CommonResult<List<CrmCustomerAddressRespVO>> getCustomerAddressList(@RequestParam("customerId") Long customerId) {
+ List<CrmCustomerAddressDO> list = customerAddressService.getCustomerAddressList(customerId);
+ return success(BeanUtils.toBean(list, CrmCustomerAddressRespVO.class));
+ }
+
+}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/address/CrmCustomerAddressRespVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/address/CrmCustomerAddressRespVO.java
new file mode 100644
index 0000000..d53dc0a
--- /dev/null
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/address/CrmCustomerAddressRespVO.java
@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.crm.controller.admin.customer.vo.address;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 绠$悊鍚庡彴 - 瀹㈡埛鏀惰揣鍦板潃 Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 瀹㈡埛鏀惰揣鍦板潃 Response VO")
+@Data
+public class CrmCustomerAddressRespVO {
+
+ @Schema(description = "缂栧彿", example = "1024")
+ private Long id;
+
+ @Schema(description = "瀹㈡埛缂栧彿", example = "1")
+ private Long customerId;
+
+ @Schema(description = "鏀惰揣浜哄鍚�", example = "寮犱笁")
+ private String receiverName;
+
+ @Schema(description = "鏀惰揣浜烘墜鏈哄彿", example = "13800138000")
+ private String receiverMobile;
+
+ @Schema(description = "鎵�鍦ㄥ湴缂栧彿", example = "110000")
+ private Integer areaId;
+
+ @Schema(description = "璇︾粏鍦板潃", example = "鍖椾含甯傛湞闃冲尯鏌愭煇璺� 1 鍙�")
+ private String detailAddress;
+
+ @Schema(description = "鏄惁榛樿鏀惰揣鍦板潃", example = "true")
+ private Boolean defaultFlag;
+
+ @Schema(description = "澶囨敞", example = "宸ヤ綔鏃ラ�佽揣")
+ private String remark;
+
+ @Schema(description = "鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/address/CrmCustomerAddressSaveReqVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/address/CrmCustomerAddressSaveReqVO.java
new file mode 100644
index 0000000..7f4dd7f
--- /dev/null
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/address/CrmCustomerAddressSaveReqVO.java
@@ -0,0 +1,50 @@
+package cn.iocoder.yudao.module.crm.controller.admin.customer.vo.address;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+/**
+ * 绠$悊鍚庡彴 - 瀹㈡埛鏀惰揣鍦板潃 鍒涘缓/淇敼 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 瀹㈡埛鏀惰揣鍦板潃 Request VO")
+@Data
+public class CrmCustomerAddressSaveReqVO {
+
+ @Schema(description = "缂栧彿", example = "1024")
+ private Long id;
+
+ @Schema(description = "瀹㈡埛缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "瀹㈡埛缂栧彿涓嶈兘涓虹┖")
+ private Long customerId;
+
+ @Schema(description = "鏀惰揣浜哄鍚�", requiredMode = Schema.RequiredMode.REQUIRED, example = "寮犱笁")
+ @NotBlank(message = "鏀惰揣浜哄鍚嶄笉鑳戒负绌�")
+ @Size(max = 64, message = "鏀惰揣浜哄鍚嶄笉鑳借秴杩� 64 涓瓧绗�")
+ private String receiverName;
+
+ @Schema(description = "鏀惰揣浜烘墜鏈哄彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "13800138000")
+ @NotBlank(message = "鏀惰揣浜烘墜鏈哄彿涓嶈兘涓虹┖")
+ @Size(max = 32, message = "鏀惰揣浜烘墜鏈哄彿涓嶈兘瓒呰繃 32 涓瓧绗�")
+ private String receiverMobile;
+
+ @Schema(description = "鎵�鍦ㄥ湴缂栧彿", example = "110000")
+ private Integer areaId;
+
+ @Schema(description = "璇︾粏鍦板潃", requiredMode = Schema.RequiredMode.REQUIRED, example = "鍖椾含甯傛湞闃冲尯鏌愭煇璺� 1 鍙�")
+ @NotBlank(message = "璇︾粏鍦板潃涓嶈兘涓虹┖")
+ @Size(max = 255, message = "璇︾粏鍦板潃涓嶈兘瓒呰繃 255 涓瓧绗�")
+ private String detailAddress;
+
+ @Schema(description = "鏄惁榛樿鏀惰揣鍦板潃", example = "true")
+ private Boolean defaultFlag;
+
+ @Schema(description = "澶囨敞", example = "宸ヤ綔鏃ラ�佽揣")
+ @Size(max = 500, message = "澶囨敞涓嶈兘瓒呰繃 500 涓瓧绗�")
+ private String remark;
+
+}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/finance/CrmFinanceReportController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/finance/CrmFinanceReportController.java
index c5d7174..bda9299 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/finance/CrmFinanceReportController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/finance/CrmFinanceReportController.java
@@ -1,7 +1,10 @@
package cn.iocoder.yudao.module.crm.controller.admin.finance;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.crm.controller.admin.finance.vo.CrmCustomerStatementReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.finance.vo.CrmCustomerStatementRespVO;
+import cn.iocoder.yudao.module.crm.controller.admin.finance.vo.CrmCustomerStatementSummaryReqVO;
+import cn.iocoder.yudao.module.crm.controller.admin.finance.vo.CrmCustomerStatementSummaryRespVO;
import cn.iocoder.yudao.module.crm.controller.admin.finance.vo.CrmFinanceTrendRespVO;
import cn.iocoder.yudao.module.crm.controller.admin.finance.vo.CrmShippedNotInvoicedRespVO;
import cn.iocoder.yudao.module.crm.controller.admin.finance.vo.CrmUnwrittenOffRespVO;
@@ -10,6 +13,7 @@
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.GetMapping;
@@ -36,11 +40,18 @@
private CrmFinanceReportService financeReportService;
@GetMapping("/customer-statement")
- @Operation(summary = "鑾峰緱瀹㈡埛搴旀敹瀵硅处鍗�", description = "鎸夊鎴风粺璁℃墍鏈夊凡瀹℃牳閿�鍞鍗曠殑璁㈠崟閲戦銆佸嚭搴撻噾棰濄�佸紑绁ㄩ噾棰濄�佸洖娆鹃噾棰濄�佹湭鏍搁攢搴旀敹鍙婁笅鏈堝洖娆捐鍒�")
- @Parameter(name = "customerId", description = "瀹㈡埛缂栧彿", required = true)
+ @Operation(summary = "鑾峰緱瀹㈡埛寰�鏉ュ璐︽暟鎹�", description = "鎸夊鎴风粺璁¢攢鍞鍗曘�佸紑绁ㄣ�佸洖娆炬祦姘达紝鍙寜涓嬪崟/寮�绁�/鍥炴鏃堕棿杩囨护")
@PreAuthorize("@ss.hasPermission('crm:receivable:query')")
- public CommonResult<CrmCustomerStatementRespVO> getCustomerStatement(@RequestParam("customerId") Long customerId) {
- return success(financeReportService.getCustomerStatement(customerId));
+ public CommonResult<CrmCustomerStatementRespVO> getCustomerStatement(@Valid CrmCustomerStatementReqVO reqVO) {
+ return success(financeReportService.getCustomerStatement(reqVO));
+ }
+
+ @GetMapping("/customer-statement/summary-list")
+ @Operation(summary = "鑾峰緱鍚勫鎴峰線鏉ユ眹鎬诲垪琛紙宸︿晶瀹㈡埛鎬昏锛�")
+ @PreAuthorize("@ss.hasPermission('crm:receivable:query')")
+ public CommonResult<List<CrmCustomerStatementSummaryRespVO>> getCustomerSummaryList(
+ @Valid CrmCustomerStatementSummaryReqVO reqVO) {
+ return success(financeReportService.getCustomerSummaryList(reqVO));
}
@GetMapping("/shipped-not-invoiced")
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/finance/vo/CrmCustomerStatementReqVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/finance/vo/CrmCustomerStatementReqVO.java
new file mode 100644
index 0000000..cd965b8
--- /dev/null
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/finance/vo/CrmCustomerStatementReqVO.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.crm.controller.admin.finance.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹㈡埛寰�鏉ュ璐︽煡璇� Request VO
+ */
+@Schema(description = "绠$悊鍚庡彴 - 瀹㈡埛寰�鏉ュ璐︽煡璇� Request VO")
+@Data
+public class CrmCustomerStatementReqVO {
+
+ @Schema(description = "瀹㈡埛缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ @NotNull(message = "瀹㈡埛缂栧彿涓嶈兘涓虹┖")
+ private Long customerId;
+
+ @Schema(description = "寮�濮嬫椂闂达紙鎸変笅鍗�/寮�绁�/鍥炴鏃堕棿杩囨护锛�")
+ private LocalDateTime beginTime;
+
+ @Schema(description = "缁撴潫鏃堕棿锛堟寜涓嬪崟/寮�绁�/鍥炴鏃堕棿杩囨护锛�")
+ private LocalDateTime endTime;
+
+ @Schema(description = "鏄惁鍖呭惈鏈鏍搁攢鍞鍗�", example = "false")
+ private Boolean includeUnapprovedOrder;
+
+}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/finance/vo/CrmCustomerStatementRespVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/finance/vo/CrmCustomerStatementRespVO.java
index 8f8d04c..6ff3fc1 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/finance/vo/CrmCustomerStatementRespVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/finance/vo/CrmCustomerStatementRespVO.java
@@ -47,6 +47,12 @@
@Schema(description = "璁㈠崟鏄庣粏")
private List<OrderRow> orders;
+ @Schema(description = "寮�绁ㄦ祦姘�")
+ private List<InvoiceRow> invoices;
+
+ @Schema(description = "鍥炴娴佹按")
+ private List<ReceiptRow> receipts;
+
@Schema(description = "璁㈠崟琛�")
@Data
public static class OrderRow {
@@ -78,9 +84,78 @@
@Schema(description = "宸插嚭搴撴湭寮�绁ㄩ噾棰�")
private BigDecimal shippedNotInvoicedAmount;
+ @Schema(description = "鏈紑绁ㄩ噾棰濓紙璁㈠崟閲戦 - 宸插紑绁級")
+ private BigDecimal uninvoicedAmount;
+
@Schema(description = "鏈牳閿�搴旀敹閲戦")
private BigDecimal outstandingAmount;
+ @Schema(description = "璁㈠崟鐘舵�侊紙ERP 瀹℃牳鐘舵�侊級")
+ private Integer status;
+
+ }
+
+ @Schema(description = "寮�绁ㄦ祦姘�")
+ @Data
+ public static class InvoiceRow {
+
+ @Schema(description = "寮�绁ㄧ紪鍙�")
+ private Long id;
+
+ @Schema(description = "寮�绁ㄥ崟鍙�")
+ private String no;
+
+ @Schema(description = "鍙戠エ鍙�")
+ private String invoiceNo;
+
+ @Schema(description = "寮�绁ㄦ椂闂�")
+ private LocalDateTime invoiceTime;
+
+ @Schema(description = "寮�绁ㄩ噾棰�")
+ private BigDecimal invoiceAmount;
+
+ @Schema(description = "宸插洖娆鹃噾棰�")
+ private BigDecimal collectedAmount;
+
+ @Schema(description = "鍓╀綑搴旀敹")
+ private BigDecimal remainingReceivable;
+
+ @Schema(description = "閿�鍞鍗曠紪鍙�")
+ private Long saleOrderId;
+
+ @Schema(description = "閿�鍞鍗曞彿")
+ private String saleOrderNo;
+
+ @Schema(description = "瀹℃壒鐘舵��")
+ private Integer status;
+
+ }
+
+ @Schema(description = "鍥炴娴佹按")
+ @Data
+ public static class ReceiptRow {
+
+ @Schema(description = "鍥炴缂栧彿")
+ private Long id;
+
+ @Schema(description = "鍥炴鍗曞彿")
+ private String no;
+
+ @Schema(description = "鍥炴鏃堕棿")
+ private LocalDateTime returnTime;
+
+ @Schema(description = "鍥炴閲戦")
+ private BigDecimal amount;
+
+ @Schema(description = "鍏宠仈寮�绁ㄧ紪鍙�")
+ private Long invoiceId;
+
+ @Schema(description = "鍏宠仈鍙戠エ鍙�")
+ private String invoiceNo;
+
+ @Schema(description = "瀹℃壒鐘舵��")
+ private Integer status;
+
}
}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/finance/vo/CrmCustomerStatementSummaryReqVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/finance/vo/CrmCustomerStatementSummaryReqVO.java
new file mode 100644
index 0000000..f4575ea
--- /dev/null
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/finance/vo/CrmCustomerStatementSummaryReqVO.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.crm.controller.admin.finance.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹㈡埛寰�鏉ユ眹鎬诲垪琛ㄦ煡璇� Request VO
+ */
+@Schema(description = "绠$悊鍚庡彴 - 瀹㈡埛寰�鏉ユ眹鎬诲垪琛ㄦ煡璇� Request VO")
+@Data
+public class CrmCustomerStatementSummaryReqVO {
+
+ @Schema(description = "寮�濮嬫椂闂达紙鎸変笅鍗�/寮�绁�/鍥炴鏃堕棿杩囨护锛�")
+ private LocalDateTime beginTime;
+
+ @Schema(description = "缁撴潫鏃堕棿锛堟寜涓嬪崟/寮�绁�/鍥炴鏃堕棿杩囨护锛�")
+ private LocalDateTime endTime;
+
+ @Schema(description = "鏄惁鍖呭惈鏈鏍搁攢鍞鍗�", example = "false")
+ private Boolean includeUnapprovedOrder;
+
+}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/finance/vo/CrmCustomerStatementSummaryRespVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/finance/vo/CrmCustomerStatementSummaryRespVO.java
new file mode 100644
index 0000000..ab930c0
--- /dev/null
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/finance/vo/CrmCustomerStatementSummaryRespVO.java
@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.module.crm.controller.admin.finance.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 瀹㈡埛寰�鏉ユ眹鎬� Response VO锛堝搴斿乏渚у鎴锋�昏锛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 瀹㈡埛寰�鏉ユ眹鎬� Response VO")
+@Data
+public class CrmCustomerStatementSummaryRespVO {
+
+ @Schema(description = "瀹㈡埛缂栧彿")
+ private Long customerId;
+
+ @Schema(description = "瀹㈡埛鍚嶇О")
+ private String customerName;
+
+ @Schema(description = "閿�鍞鍗曟暟閲�")
+ private Integer orderCount;
+
+ @Schema(description = "寮�绁ㄦ暟閲�")
+ private Integer invoiceCount;
+
+ @Schema(description = "鍥炴鏁伴噺")
+ private Integer receiptCount;
+
+ @Schema(description = "绱璁㈠崟閲戦")
+ private BigDecimal totalOrderAmount;
+
+ @Schema(description = "绱寮�绁ㄩ噾棰�")
+ private BigDecimal totalInvoiceAmount;
+
+ @Schema(description = "绱鍥炴閲戦")
+ private BigDecimal totalCollectedAmount;
+
+ @Schema(description = "鏈敹浣欓锛堝紑绁� - 鍥炴锛�")
+ private BigDecimal uncollectedAmount;
+
+}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/vo/invoice/CrmInvoiceSaveReqVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/vo/invoice/CrmInvoiceSaveReqVO.java
index 7fa05cd..bc2d4ad 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/vo/invoice/CrmInvoiceSaveReqVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/vo/invoice/CrmInvoiceSaveReqVO.java
@@ -35,6 +35,7 @@
private String saleOutCode;
@Schema(description = "璐熻矗浜虹紪鍙�", example = "25682")
+ @NotNull(message = "寮�绁ㄨ礋璐d汉涓嶈兘涓虹┖锛岃閫夋嫨璐熻矗浜�")
private Long ownerUserId;
@Schema(description = "鍙戠エ绫诲瀷", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/CrmSaleQuotationController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/CrmSaleQuotationController.java
index e2d5fc2..0d039ed 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/CrmSaleQuotationController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/CrmSaleQuotationController.java
@@ -17,7 +17,10 @@
import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO;
import cn.iocoder.yudao.module.crm.service.business.CrmBusinessService;
import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerService;
+import cn.iocoder.yudao.module.crm.enums.quotation.CrmSaleQuotationStatusEnum;
+import cn.iocoder.yudao.module.crm.service.quotation.CrmSaleQuotationDocumentRenderer;
import cn.iocoder.yudao.module.crm.service.quotation.CrmSaleQuotationService;
+import cn.iocoder.yudao.module.system.service.companyconfig.SystemCompanyConfigService;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
@@ -38,6 +41,8 @@
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
@@ -47,7 +52,10 @@
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMultiMap;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+import static cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants.SALE_QUOTATION_EXPORT_FAIL_NOT_APPROVE;
+import static cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants.SALE_QUOTATION_NOT_EXISTS;
@Tag(name = "绠$悊鍚庡彴 - CRM 閿�鍞姤浠峰崟")
@RestController
@@ -72,6 +80,8 @@
private CrmBusinessService businessService;
@Resource
private StorageAttachmentApi storageAttachmentApi;
+ @Resource
+ private SystemCompanyConfigService companyConfigService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓閿�鍞姤浠峰崟")
@@ -156,6 +166,53 @@
ExcelUtils.write(response, "閿�鍞姤浠峰崟.xls", "鏁版嵁", CrmSaleQuotationRespVO.class, list);
}
+ @GetMapping("/export-word")
+ @Operation(summary = "瀵煎嚭閿�鍞姤浠峰崟 Word锛堝甫鐢靛瓙绔狅級")
+ @Parameter(name = "id", description = "鎶ヤ环鍗曠紪鍙�", required = true)
+ @PreAuthorize("@ss.hasPermission('crm:sale-quotation:export')")
+ @ApiAccessLog(operateType = EXPORT)
+ public void exportSaleQuotationWord(@RequestParam("id") Long id,
+ HttpServletResponse response) throws IOException {
+ CrmSaleQuotationDO saleQuotation = saleQuotationService.getSaleQuotation(id);
+ if (saleQuotation == null) {
+ throw exception(SALE_QUOTATION_NOT_EXISTS);
+ }
+ if (!CrmSaleQuotationStatusEnum.APPROVE.getStatus().equals(saleQuotation.getStatus())
+ && !CrmSaleQuotationStatusEnum.CONVERTED.getStatus().equals(saleQuotation.getStatus())) {
+ CrmSaleQuotationStatusEnum current = CrmSaleQuotationStatusEnum.getByStatus(saleQuotation.getStatus());
+ throw exception(SALE_QUOTATION_EXPORT_FAIL_NOT_APPROVE, saleQuotation.getNo(),
+ current != null ? current.getName() : String.valueOf(saleQuotation.getStatus()));
+ }
+ CrmSaleQuotationRespVO respVO = buildSaleQuotationRespVO(saleQuotation,
+ saleQuotationService.getSaleQuotationProductListByQuotationId(id));
+ var companyConfig = companyConfigService.getCompanyConfig();
+ String companyName = companyConfig != null ? companyConfig.getCompanyName() : null;
+ byte[] content = CrmSaleQuotationDocumentRenderer.render(respVO, companyName);
+
+ String filename = "鎶ヤ环鍗�-" + saleQuotation.getNo()
+ + (respVO.getCustomerName() != null ? "-" + respVO.getCustomerName() : "") + ".docx";
+ String encoded = URLEncoder.encode(filename, StandardCharsets.UTF_8).replace("+", "%20");
+ response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+ response.setHeader("Content-Disposition", "attachment;filename*=UTF-8''" + encoded);
+ response.getOutputStream().write(content);
+ }
+
+ @PutMapping("/submit")
+ @Operation(summary = "鎻愪氦閿�鍞姤浠峰鎵�")
+ @Parameter(name = "id", description = "鎶ヤ环鍗曠紪鍙�", required = true)
+ @PreAuthorize("@ss.hasPermission('crm:sale-quotation:update')")
+ public CommonResult<Boolean> submitSaleQuotation(@RequestParam("id") Long id,
+ @RequestParam(value = "processDefinitionKey", required = false) String processDefinitionKey) {
+ saleQuotationService.submitSaleQuotation(id, processDefinitionKey, getLoginUserId());
+ return success(true);
+ }
+
+ @GetMapping("/approve-process-list")
+ @Operation(summary = "鑾峰彇閿�鍞姤浠峰鎵规祦绋嬪垪琛�")
+ public CommonResult<List<Map<String, Object>>> getSaleQuotationApproveProcessList() {
+ return success(saleQuotationService.getSaleQuotationApproveProcessDefinitionList());
+ }
+
@PostMapping("/convert-contract")
@Operation(summary = "杞负鍚堝悓")
@Parameter(name = "id", description = "鎶ヤ环鍗曠紪鍙�", required = true)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivableController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivableController.java
index dbeaee9..594a18f 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivableController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivableController.java
@@ -177,6 +177,15 @@
});
}
+ @PutMapping("/submit")
+ @Operation(summary = "鎻愪氦鍥炴瀹℃壒")
+ @PreAuthorize("@ss.hasPermission('crm:receivable:update')")
+ public CommonResult<Boolean> submitReceivable(@RequestParam("id") Long id,
+ @RequestParam(value = "remark", required = false) String remark) {
+ receivableService.submitReceivable(id, remark, getLoginUserId());
+ return success(true);
+ }
+
@PutMapping("/update-status")
@Operation(summary = "鏇存柊鍥炴鐨勭姸鎬侊紙瀹℃牳/鍙嶅鏍革級")
@PreAuthorize("@ss.hasPermission('crm:receivable:update')")
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/customer/CrmCustomerAddressDO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/customer/CrmCustomerAddressDO.java
new file mode 100644
index 0000000..22843f5
--- /dev/null
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/customer/CrmCustomerAddressDO.java
@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.crm.dal.dataobject.customer;
+
+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.*;
+
+/**
+ * CRM 瀹㈡埛鏀惰揣鍦板潃 DO
+ *
+ * 涓�涓鎴峰彲浠ョ淮鎶ゅ涓敹璐у湴鍧�锛屽彂璐ф椂鎸夊湴鍧�閫夋嫨銆�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("crm_customer_address")
+@KeySequence("crm_customer_address_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CrmCustomerAddressDO extends BaseDO {
+
+ /**
+ * 缂栧彿
+ */
+ @TableId
+ private Long id;
+ /**
+ * 瀹㈡埛缂栧彿
+ *
+ * 鍏宠仈 {@link CrmCustomerDO#getId()}
+ */
+ private Long customerId;
+ /**
+ * 鏀惰揣浜哄鍚�
+ */
+ private String receiverName;
+ /**
+ * 鏀惰揣浜烘墜鏈哄彿
+ */
+ private String receiverMobile;
+ /**
+ * 鎵�鍦ㄥ湴
+ *
+ * 鍏宠仈 {@link cn.iocoder.yudao.framework.ip.core.Area#getId()} 瀛楁
+ */
+ private Integer areaId;
+ /**
+ * 璇︾粏鍦板潃
+ */
+ private String detailAddress;
+ /**
+ * 鏄惁榛樿鏀惰揣鍦板潃
+ */
+ private Boolean defaultFlag;
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerAddressMapper.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerAddressMapper.java
new file mode 100644
index 0000000..d794515
--- /dev/null
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerAddressMapper.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.crm.dal.mysql.customer;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerAddressDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * CRM 瀹㈡埛鏀惰揣鍦板潃 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface CrmCustomerAddressMapper extends BaseMapperX<CrmCustomerAddressDO> {
+
+ default List<CrmCustomerAddressDO> selectListByCustomerId(Long customerId) {
+ return selectList(new LambdaQueryWrapperX<CrmCustomerAddressDO>()
+ .eq(CrmCustomerAddressDO::getCustomerId, customerId)
+ .orderByDesc(CrmCustomerAddressDO::getDefaultFlag)
+ .orderByAsc(CrmCustomerAddressDO::getId));
+ }
+
+ default CrmCustomerAddressDO selectDefaultByCustomerId(Long customerId) {
+ return selectOne(new LambdaQueryWrapperX<CrmCustomerAddressDO>()
+ .eq(CrmCustomerAddressDO::getCustomerId, customerId)
+ .eq(CrmCustomerAddressDO::getDefaultFlag, true)
+ .last("LIMIT 1"));
+ }
+
+}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java
index b6d1038..62ca092 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java
@@ -133,6 +133,32 @@
}
/**
+ * 鎵归噺鏌ヨ澶氫釜閿�鍞鍗曚笅銆佹寚瀹氬鎵圭姸鎬佺殑寮�绁紙璐㈠姟瀵硅处鎶ヨ〃浣跨敤锛岄伩鍏嶉�愬崟鏌ヨ锛�
+ */
+ default List<CrmInvoiceDO> selectListBySaleOrderIdsAndStatus(Collection<Long> saleOrderIds,
+ Collection<Integer> auditStatuses) {
+ if (CollUtil.isEmpty(saleOrderIds)) {
+ return Collections.emptyList();
+ }
+ return selectList(new LambdaQueryWrapperX<CrmInvoiceDO>()
+ .in(CrmInvoiceDO::getSaleOrderId, saleOrderIds)
+ .in(CrmInvoiceDO::getAuditStatus, auditStatuses));
+ }
+
+ /**
+ * 鎵归噺鏌ヨ澶氫釜閿�鍞嚭搴撳崟涓嬨�佹寚瀹氬鎵圭姸鎬佺殑寮�绁紙璐㈠姟瀵硅处鎶ヨ〃浣跨敤锛岄伩鍏嶉�愬崟鏌ヨ锛�
+ */
+ default List<CrmInvoiceDO> selectListBySaleOutIdsAndStatus(Collection<Long> saleOutIds,
+ Collection<Integer> auditStatuses) {
+ if (CollUtil.isEmpty(saleOutIds)) {
+ return Collections.emptyList();
+ }
+ return selectList(new LambdaQueryWrapperX<CrmInvoiceDO>()
+ .in(CrmInvoiceDO::getSaleOutId, saleOutIds)
+ .in(CrmInvoiceDO::getAuditStatus, auditStatuses));
+ }
+
+ /**
* 鏌ヨ鍚堝悓涓嬬殑鍏ㄩ儴寮�绁紙瀵煎叆鍘婚噸鐢級
*/
default List<CrmInvoiceDO> selectListByContractId(Long contractId) {
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 39dcd12..2da8efc 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
@@ -39,9 +39,9 @@
// ========== 鍥炴 1-020-004-000 ==========
ErrorCode RECEIVABLE_NOT_EXISTS = new ErrorCode(1_020_004_000, "鍥炴涓嶅瓨鍦�");
- ErrorCode RECEIVABLE_UPDATE_FAIL_EDITING_PROHIBITED = new ErrorCode(1_020_004_001, "鏇存柊鍥炴澶辫触锛屽師鍥狅細绂佹缂栬緫");
+ ErrorCode RECEIVABLE_UPDATE_FAIL_EDITING_PROHIBITED = new ErrorCode(1_020_004_001, "鏇存柊鍥炴澶辫触锛屽師鍥狅細褰撳墠鐘舵�佷负銆恵}銆戯紝浠呫�愭湭鎻愪氦銆戞垨銆愬鏍镐笉閫氳繃銆戠殑鍥炴鍙紪杈戙�傚鎵逛腑鐨勮绛夊緟瀹℃壒缁撴潫锛涘凡瀹℃牳閫氳繃鐨勮鍏堝弽瀹℃牳");
ErrorCode RECEIVABLE_DELETE_FAIL = new ErrorCode(1_020_004_002, "鍒犻櫎鍥炴澶辫触锛屽師鍥狅細 琚洖娆捐鍒掓墍浣跨敤锛屼笉鍏佽鍒犻櫎");
- ErrorCode RECEIVABLE_SUBMIT_FAIL_NOT_DRAFT = new ErrorCode(1_020_004_003, "鍥炴鎻愪氦瀹℃牳澶辫触锛屽師鍥狅細鍥炴娌″鍦ㄦ湭鎻愪氦鐘舵��");
+ ErrorCode RECEIVABLE_SUBMIT_FAIL_NOT_DRAFT = new ErrorCode(1_020_004_003, "鎻愪氦鍥炴瀹℃壒澶辫触锛屽師鍥狅細褰撳墠鐘舵�佷负銆恵}銆戯紝浠呫�愭湭鎻愪氦銆戞垨銆愬鏍镐笉閫氳繃銆戠殑鍥炴鍙彁浜ゅ鎵广�傚鎵逛腑鐨勮鍒般�屽崗鍚屽姙鍏� 鈫� 寰呭姙浠诲姟銆嶆煡鐪嬭繘搴︼紱宸插鏍搁�氳繃鐨勬棤闇�閲嶅鎻愪氦");
ErrorCode RECEIVABLE_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS = new ErrorCode(1_020_004_004, "鏇存柊鍥炴瀹℃牳鐘舵�佸け璐ワ紝鍘熷洜锛氬洖娆句笉鏄鏍镐腑鐘舵��");
ErrorCode RECEIVABLE_NO_EXISTS = new ErrorCode(1_020_004_005, "鐢熸垚鍥炴搴忓垪鍙烽噸澶嶏紝璇烽噸璇�");
ErrorCode RECEIVABLE_CREATE_FAIL_CONTRACT_NOT_APPROVE = new ErrorCode(1_020_004_006, "鍒涘缓鍥炴澶辫触锛屽師鍥狅細鍚堝悓涓嶆槸瀹℃牳閫氳繃鐘舵��");
@@ -54,6 +54,8 @@
ErrorCode RECEIVABLE_ITEM_PRICE_INVALID = new ErrorCode(1_020_004_013, "鏍搁攢鏄庣粏鏍¢獙澶辫触锛屽師鍥狅細绗� {} 琛寋}[{}]鐨勬湰娆℃牳閿�閲戦涓� {}锛屽繀椤诲ぇ浜� 0銆傝淇敼璇ヨ鏍搁攢閲戦");
ErrorCode RECEIVABLE_ITEM_SUM_MISMATCH = new ErrorCode(1_020_004_014, "鏍搁攢鏄庣粏鏍¢獙澶辫触锛屽師鍥狅細鏍搁攢鏄庣粏鍚堣 {} 鍏冿紝涓庡洖娆鹃噾棰� {} 鍏冧笉涓�鑷淬�傝璋冩暣鏄庣粏閲戦锛屼娇涓よ�呯浉绛�");
ErrorCode RECEIVABLE_ITEM_PRICE_EXCEEDS = new ErrorCode(1_020_004_015, "鏍搁攢鏄庣粏鏍¢獙澶辫触锛屽師鍥狅細绗� {} 琛寋}[{}]鏈鏍搁攢 {} 鍏冿紝瓒呭嚭璇ュ崟鎹墿浣欏簲鏀� {} 鍏冿紙搴旀敹 {} 鍏冿紝宸叉牳閿� {} 鍏冿級銆傝璋冨皬璇ヨ閲戦锛屾垨鏀归�夊叾浠栧崟鎹�");
+ ErrorCode RECEIVABLE_MANUAL_AUDIT_FAIL_BPM_PROCESSING = new ErrorCode(1_020_004_016, "瀹℃牳鍥炴澶辫触锛屽師鍥狅細璇ュ洖娆惧凡鎻愪氦 BPM 鍗忓悓瀹℃壒锛堟祦绋嬪疄渚嬪彿銆恵}銆戯級锛屽鎵圭粨鏋滅敱娴佺▼鑷姩椹卞姩锛屼笉鑳芥墜宸ュ鏍搞�傝鍦ㄣ�屽崗鍚屽姙鍏� 鈫� 寰呭姙浠诲姟銆嶄腑鏌ョ湅骞跺鐞嗗鎵癸紝鎴栫瓑寰呭鎵圭粨鏉�");
+ ErrorCode RECEIVABLE_MANUAL_REVERSE_FAIL_BPM_PROCESSING = new ErrorCode(1_020_004_017, "鍙嶅鏍稿洖娆惧け璐ワ紝鍘熷洜锛氳鍥炴褰撳墠姝e湪 BPM 鍗忓悓瀹℃壒涓紙娴佺▼瀹炰緥鍙枫�恵}銆戯級锛屽彧鏈夊鎵归�氳繃鍚庢墠鑳藉弽瀹℃牳銆傝鍏堝湪銆屽崗鍚屽姙鍏� 鈫� 寰呭姙浠诲姟銆嶄腑澶勭悊瀹℃壒锛屾垨鍦ㄦ祦绋嬭鎯呬腑鎾ゅ洖娴佺▼");
// ========== 鍥炴璁″垝 1-020-005-000 ==========
ErrorCode RECEIVABLE_PLAN_NOT_EXISTS = new ErrorCode(1_020_005_000, "鍥炴璁″垝涓嶅瓨鍦�");
@@ -77,6 +79,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_ADDRESS_NOT_EXISTS = new ErrorCode(1_020_006_016, "瀹㈡埛鏀惰揣鍦板潃涓嶅瓨鍦�");
// ========== 鏉冮檺绠$悊 1_020_007_000 ==========
ErrorCode CRM_PERMISSION_NOT_EXISTS = new ErrorCode(1_020_007_000, "鏁版嵁鏉冮檺涓嶅瓨鍦�");
@@ -122,9 +125,13 @@
ErrorCode SALE_QUOTATION_NO_EXISTS = new ErrorCode(1_020_015_001, "鎶ヤ环鍗曞彿銆恵}銆戝凡琚崰鐢紝涓嶈兘閲嶅浣跨敤銆傝鎹竴涓紪鍙凤紝鎴栨竻绌虹紪鍙风敱绯荤粺鑷姩鐢熸垚锛堝凡鍒犻櫎鐨勬姤浠峰崟涔熶細鍗犵敤鍏跺師缂栧彿锛�");
ErrorCode SALE_QUOTATION_UPDATE_FAIL_NOT_DRAFT = new ErrorCode(1_020_015_002, "閿�鍞姤浠峰崟({})涓嶆槸鑽夌鐘舵�侊紝鏃犳硶淇敼");
ErrorCode SALE_QUOTATION_DELETE_FAIL_NOT_DRAFT = new ErrorCode(1_020_015_003, "閿�鍞姤浠峰崟({})涓嶆槸鑽夌鐘舵�侊紝鏃犳硶鍒犻櫎");
- ErrorCode SALE_QUOTATION_CONVERT_FAIL_NOT_DRAFT = new ErrorCode(1_020_015_004, "閿�鍞姤浠峰崟({})涓嶆槸鑽夌鐘舵�侊紝鏃犳硶杞悎鍚�");
+ ErrorCode SALE_QUOTATION_CONVERT_FAIL_NOT_DRAFT = new ErrorCode(1_020_015_004, "閿�鍞姤浠峰崟({})褰撳墠鐘舵�佷负[{}]锛屽彧鏈夎崏绋挎垨瀹℃壒閫氳繃鐘舵�佹墠鑳借浆鍚堝悓");
ErrorCode SALE_QUOTATION_ITEM_NOT_EXISTS = new ErrorCode(1_020_015_005, "鐗╂枡涓嶅瓨鍦ㄦ垨鏈惎鐢�");
ErrorCode SALE_QUOTATION_CONTRACT_EXISTS = new ErrorCode(1_020_015_006, "閿�鍞姤浠峰崟宸茶浆鍚堝悓锛岃鍕块噸澶嶆搷浣�");
+ ErrorCode SALE_QUOTATION_SUBMIT_FAIL_NOT_DRAFT = new ErrorCode(1_020_015_007, "閿�鍞姤浠峰崟({})涓嶆槸鑽夌鐘舵�侊紝鏃犳硶鎻愪氦瀹℃壒");
+ ErrorCode SALE_QUOTATION_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS = new ErrorCode(1_020_015_008, "閿�鍞姤浠峰崟({})涓嶅浜庡鎵逛腑锛屾棤娉曟洿鏂板鎵圭粨鏋�");
+ ErrorCode SALE_QUOTATION_BPM_PROCESS_DEFINITION_NOT_EXISTS = new ErrorCode(1_020_015_009, "閿�鍞姤浠峰鎵规祦绋嬫湭閰嶇疆锛岃鍏堝湪娴佺▼绠$悊涓璁″苟鍚敤銆岄攢鍞姤浠峰鎵广�嶆祦绋�");
+ ErrorCode SALE_QUOTATION_EXPORT_FAIL_NOT_APPROVE = new ErrorCode(1_020_015_010, "閿�鍞姤浠峰崟({})褰撳墠鐘舵�佷负[{}]锛屽彧鏈夊鎵归�氳繃鍚庢墠鑳藉鍑哄甫绔犳姤浠峰崟");
// ========== 寮�绁� 1_020_016_000 ==========
ErrorCode INVOICE_NOT_EXISTS = new ErrorCode(1_020_016_000, "寮�绁ㄤ笉瀛樺湪");
@@ -144,6 +151,8 @@
ErrorCode INVOICE_CREATE_FAIL_SALE_ORDER_NOT_APPROVE = new ErrorCode(1_020_016_014, "鍒涘缓寮�绁ㄥけ璐ワ紝鍘熷洜锛氶攢鍞鍗昜{}]褰撳墠鐘舵�佷负銆恵}銆戯紝鍙湁銆屽凡瀹℃牳銆嶇殑閿�鍞鍗曟墠鑳藉紑绁ㄣ�傝鍏堝畬鎴愯璁㈠崟瀹℃牳锛屾垨鏀归�夊叾浠栧凡瀹℃牳璁㈠崟");
ErrorCode INVOICE_CREATE_FAIL_SALE_ORDER_MISMATCH = new ErrorCode(1_020_016_015, "鍒涘缓寮�绁ㄥけ璐ワ紝鍘熷洜锛氶攢鍞鍗昜{}]鐨勫鎴锋垨鍚堝悓涓庡綋鍓嶅紑绁ㄥ崟涓嶄竴鑷达紙璁㈠崟瀹㈡埛={}銆佽鍗曞悎鍚�={}锛涘紑绁ㄥ鎴�={}銆佸紑绁ㄥ悎鍚�={}锛夈�傝鏀归�変笌褰撳墠鍚堝悓銆佸鎴蜂竴鑷寸殑閿�鍞鍗�");
ErrorCode INVOICE_CREATE_FAIL_SALE_OUT_NOT_EXISTS = new ErrorCode(1_020_016_016, "鍒涘缓寮�绁ㄥけ璐ワ紝鍘熷洜锛氬嚭搴撳崟(ID={})涓嶅瓨鍦ㄦ垨宸插垹闄ゃ�傝閲嶆柊閫夋嫨璇ラ攢鍞鍗曚笅鐨勫嚭搴撳崟");
+ ErrorCode INVOICE_CREATE_FAIL_SALE_ORDER_REQUIRED = new ErrorCode(1_020_016_029, "寮�绁ㄧ敵璇峰繀椤诲叧鑱斿凡瀹℃牳鐨勯攢鍞鍗曘�傝鍏堥�夋嫨褰撳墠鍚堝悓涓嬬殑閿�鍞鍗�");
+ ErrorCode INVOICE_CREATE_FAIL_SALE_OUT_REQUIRED = new ErrorCode(1_020_016_030, "寮�绁ㄧ敵璇峰繀椤诲叧鑱斿凡瀹屾垚鐨勯攢鍞嚭搴撳崟銆傝鍏堝畬鎴愬嚭搴擄紝鍐嶉�夋嫨瀵瑰簲鍑哄簱鍗�");
ErrorCode INVOICE_CREATE_FAIL_SALE_OUT_NOT_FINISHED = new ErrorCode(1_020_016_017, "鍒涘缓寮�绁ㄥけ璐ワ紝鍘熷洜锛氬嚭搴撳崟[{}]褰撳墠鐘舵�佷负銆恵}銆戯紝鍙湁銆屽凡瀹屾垚銆嶇殑鍑哄簱鍗曟墠鑳藉紑绁ㄣ�傝绛夊緟鍑哄簱瀹屾垚鍚庡啀寮�绁紝鎴栨敼閫夊叾浠栧凡瀹屾垚鍑哄簱鍗�");
ErrorCode INVOICE_CREATE_FAIL_SALE_OUT_MISMATCH_ORDER = new ErrorCode(1_020_016_018, "鍒涘缓寮�绁ㄥけ璐ワ紝鍘熷洜锛氬嚭搴撳崟[{}]涓嶅睘浜庢墍閫夐攢鍞鍗昜{}]锛堝嚭搴撳崟瀹為檯璁㈠崟={}锛夈�傝鏀归�夎閿�鍞鍗曚笅鐨勫嚭搴撳崟");
ErrorCode INVOICE_CREATE_FAIL_SALE_OUT_MISMATCH_CUSTOMER = new ErrorCode(1_020_016_019, "鍒涘缓寮�绁ㄥけ璐ワ紝鍘熷洜锛氬嚭搴撳崟[{}]鐨勫鎴�(ID={})涓庡紑绁ㄥ鎴�(ID={})涓嶄竴鑷淬�傝鏀归�夊綋鍓嶅鎴峰悕涓嬬殑鍑哄簱鍗�");
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/quotation/CrmSaleQuotationStatusEnum.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/quotation/CrmSaleQuotationStatusEnum.java
index ecccdab..0292951 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/quotation/CrmSaleQuotationStatusEnum.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/quotation/CrmSaleQuotationStatusEnum.java
@@ -16,6 +16,10 @@
public enum CrmSaleQuotationStatusEnum implements ArrayValuable<Integer> {
DRAFT(0, "鑽夌"),
+ PROCESS(1, "瀹℃壒涓�"),
+ APPROVE(2, "瀹℃壒閫氳繃"),
+ REJECT(3, "瀹℃壒涓嶉�氳繃"),
+ CANCEL(4, "宸插彇娑�"),
CONVERTED(10, "宸茶浆鍚堝悓");
private final Integer status;
@@ -29,4 +33,8 @@
return ARRAYS;
}
+ public static CrmSaleQuotationStatusEnum getByStatus(Integer status) {
+ return Arrays.stream(values()).filter(e -> e.getStatus().equals(status)).findFirst().orElse(null);
+ }
+
}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/bidbond/CrmBidBondServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/bidbond/CrmBidBondServiceImpl.java
index 05f3e7c..12e86b7 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/bidbond/CrmBidBondServiceImpl.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/bidbond/CrmBidBondServiceImpl.java
@@ -288,7 +288,7 @@
if (customer != null) {
respVO.setCustomerName(customer.getName());
}
- ErpSaleOrderRespDTO order = orderMap.get(bond.getSaleOrderId());
+ ErpSaleOrderRespDTO order = bond.getSaleOrderId() == null ? null : orderMap.get(bond.getSaleOrderId());
if (order != null) {
respVO.setSaleOrderNo(order.getNo());
respVO.setSaleOrderAmount(order.getTotalPrice());
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerAddressService.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerAddressService.java
new file mode 100644
index 0000000..e7cc213
--- /dev/null
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerAddressService.java
@@ -0,0 +1,53 @@
+package cn.iocoder.yudao.module.crm.service.customer;
+
+import cn.iocoder.yudao.module.crm.controller.admin.customer.vo.address.CrmCustomerAddressSaveReqVO;
+import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerAddressDO;
+
+import java.util.List;
+
+/**
+ * CRM 瀹㈡埛鏀惰揣鍦板潃 Service 鎺ュ彛
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface CrmCustomerAddressService {
+
+ /**
+ * 鍒涘缓瀹㈡埛鏀惰揣鍦板潃
+ *
+ * @param reqVO 鍒涘缓淇℃伅
+ * @return 缂栧彿
+ */
+ Long createCustomerAddress(CrmCustomerAddressSaveReqVO reqVO);
+
+ /**
+ * 淇敼瀹㈡埛鏀惰揣鍦板潃
+ *
+ * @param reqVO 淇敼淇℃伅
+ */
+ void updateCustomerAddress(CrmCustomerAddressSaveReqVO reqVO);
+
+ /**
+ * 鍒犻櫎瀹㈡埛鏀惰揣鍦板潃
+ *
+ * @param id 缂栧彿
+ */
+ void deleteCustomerAddress(Long id);
+
+ /**
+ * 鑾峰緱瀹㈡埛鏀惰揣鍦板潃鍒楄〃
+ *
+ * @param customerId 瀹㈡埛缂栧彿
+ * @return 鏀惰揣鍦板潃鍒楄〃
+ */
+ List<CrmCustomerAddressDO> getCustomerAddressList(Long customerId);
+
+ /**
+ * 鑾峰緱瀹㈡埛榛樿鏀惰揣鍦板潃
+ *
+ * @param customerId 瀹㈡埛缂栧彿
+ * @return 榛樿鏀惰揣鍦板潃锛屼笉瀛樺湪杩斿洖 null
+ */
+ CrmCustomerAddressDO getDefaultCustomerAddress(Long customerId);
+
+}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerAddressServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerAddressServiceImpl.java
new file mode 100644
index 0000000..60be1bc
--- /dev/null
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerAddressServiceImpl.java
@@ -0,0 +1,107 @@
+package cn.iocoder.yudao.module.crm.service.customer;
+
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.crm.controller.admin.customer.vo.address.CrmCustomerAddressSaveReqVO;
+import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerAddressDO;
+import cn.iocoder.yudao.module.crm.dal.mysql.customer.CrmCustomerAddressMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants.CUSTOMER_ADDRESS_NOT_EXISTS;
+import static cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants.CUSTOMER_NOT_EXISTS;
+
+/**
+ * CRM 瀹㈡埛鏀惰揣鍦板潃 Service 瀹炵幇绫�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class CrmCustomerAddressServiceImpl implements CrmCustomerAddressService {
+
+ @Resource
+ private CrmCustomerAddressMapper customerAddressMapper;
+ @Resource
+ private CrmCustomerService customerService;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long createCustomerAddress(CrmCustomerAddressSaveReqVO reqVO) {
+ // 1. 鏍¢獙瀹㈡埛瀛樺湪
+ validateCustomerExists(reqVO.getCustomerId());
+ // 2. 榛樿鍦板潃鍙繚鐣欎竴涓�
+ clearDefaultIfNeeded(reqVO.getCustomerId(), reqVO.getDefaultFlag(), null);
+ // 3. 鎻掑叆
+ CrmCustomerAddressDO address = BeanUtils.toBean(reqVO, CrmCustomerAddressDO.class);
+ address.setDefaultFlag(Boolean.TRUE.equals(reqVO.getDefaultFlag()));
+ customerAddressMapper.insert(address);
+ return address.getId();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateCustomerAddress(CrmCustomerAddressSaveReqVO reqVO) {
+ // 1. 鏍¢獙瀛樺湪
+ CrmCustomerAddressDO oldAddress = validateAddressExists(reqVO.getId());
+ // 2. 鏍¢獙瀹㈡埛瀛樺湪锛堜笉鍏佽淇敼鎵�灞炲鎴凤級
+ validateCustomerExists(oldAddress.getCustomerId());
+ // 3. 榛樿鍦板潃鍙繚鐣欎竴涓�
+ clearDefaultIfNeeded(oldAddress.getCustomerId(), reqVO.getDefaultFlag(), reqVO.getId());
+ // 4. 鏇存柊锛堝鎴风紪鍙蜂互搴撲腑涓哄噯锛岄槻姝㈣法瀹㈡埛淇敼锛�
+ CrmCustomerAddressDO updateObj = BeanUtils.toBean(reqVO, CrmCustomerAddressDO.class);
+ updateObj.setCustomerId(oldAddress.getCustomerId());
+ updateObj.setDefaultFlag(Boolean.TRUE.equals(reqVO.getDefaultFlag()));
+ customerAddressMapper.updateById(updateObj);
+ }
+
+ @Override
+ public void deleteCustomerAddress(Long id) {
+ validateAddressExists(id);
+ customerAddressMapper.deleteById(id);
+ }
+
+ @Override
+ public List<CrmCustomerAddressDO> getCustomerAddressList(Long customerId) {
+ return customerAddressMapper.selectListByCustomerId(customerId);
+ }
+
+ @Override
+ public CrmCustomerAddressDO getDefaultCustomerAddress(Long customerId) {
+ return customerAddressMapper.selectDefaultByCustomerId(customerId);
+ }
+
+ private CrmCustomerAddressDO validateAddressExists(Long id) {
+ CrmCustomerAddressDO address = id == null ? null : customerAddressMapper.selectById(id);
+ if (address == null) {
+ throw exception(CUSTOMER_ADDRESS_NOT_EXISTS);
+ }
+ return address;
+ }
+
+ private void validateCustomerExists(Long customerId) {
+ if (customerService.getCustomer(customerId) == null) {
+ throw exception(CUSTOMER_NOT_EXISTS);
+ }
+ }
+
+ /**
+ * 璁剧疆涓洪粯璁ゅ湴鍧�鏃讹紝娓呴櫎鍚屼竴瀹㈡埛鐨勫叾浠栭粯璁ゅ湴鍧�
+ */
+ private void clearDefaultIfNeeded(Long customerId, Boolean defaultFlag, Long excludeId) {
+ if (!Boolean.TRUE.equals(defaultFlag)) {
+ return;
+ }
+ for (CrmCustomerAddressDO address : customerAddressMapper.selectListByCustomerId(customerId)) {
+ if (Boolean.TRUE.equals(address.getDefaultFlag()) && !address.getId().equals(excludeId)) {
+ customerAddressMapper.updateById(new CrmCustomerAddressDO()
+ .setId(address.getId()).setDefaultFlag(false));
+ }
+ }
+ }
+
+}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/finance/CrmFinanceReportService.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/finance/CrmFinanceReportService.java
index ebd2af0..f77736b 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/finance/CrmFinanceReportService.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/finance/CrmFinanceReportService.java
@@ -1,6 +1,9 @@
package cn.iocoder.yudao.module.crm.service.finance;
+import cn.iocoder.yudao.module.crm.controller.admin.finance.vo.CrmCustomerStatementReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.finance.vo.CrmCustomerStatementRespVO;
+import cn.iocoder.yudao.module.crm.controller.admin.finance.vo.CrmCustomerStatementSummaryReqVO;
+import cn.iocoder.yudao.module.crm.controller.admin.finance.vo.CrmCustomerStatementSummaryRespVO;
import cn.iocoder.yudao.module.crm.controller.admin.finance.vo.CrmFinanceTrendRespVO;
import cn.iocoder.yudao.module.crm.controller.admin.finance.vo.CrmShippedNotInvoicedRespVO;
import cn.iocoder.yudao.module.crm.controller.admin.finance.vo.CrmUnwrittenOffRespVO;
@@ -21,12 +24,20 @@
public interface CrmFinanceReportService {
/**
- * 鑾峰緱瀹㈡埛搴旀敹瀵硅处鍗�
+ * 鑾峰緱瀹㈡埛寰�鏉ュ璐︽暟鎹�
*
- * @param customerId 瀹㈡埛缂栧彿
+ * @param reqVO 鏌ヨ鏉′欢
* @return 瀵硅处鍗�
*/
- CrmCustomerStatementRespVO getCustomerStatement(Long customerId);
+ CrmCustomerStatementRespVO getCustomerStatement(CrmCustomerStatementReqVO reqVO);
+
+ /**
+ * 鑾峰緱鍚勫鎴峰線鏉ユ眹鎬诲垪琛紙宸︿晶瀹㈡埛鎬昏锛�
+ *
+ * @param reqVO 鏌ヨ鏉′欢
+ * @return 姹囨�诲垪琛�
+ */
+ List<CrmCustomerStatementSummaryRespVO> getCustomerSummaryList(CrmCustomerStatementSummaryReqVO reqVO);
/**
* 鑾峰緱宸插彂璐ф湭寮�绁ㄦ槑缁�
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/finance/CrmFinanceReportServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/finance/CrmFinanceReportServiceImpl.java
index b525fa9..8c4b726 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/finance/CrmFinanceReportServiceImpl.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/finance/CrmFinanceReportServiceImpl.java
@@ -2,7 +2,10 @@
import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.crm.controller.admin.finance.vo.CrmCustomerStatementReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.finance.vo.CrmCustomerStatementRespVO;
+import cn.iocoder.yudao.module.crm.controller.admin.finance.vo.CrmCustomerStatementSummaryReqVO;
+import cn.iocoder.yudao.module.crm.controller.admin.finance.vo.CrmCustomerStatementSummaryRespVO;
import cn.iocoder.yudao.module.crm.controller.admin.finance.vo.CrmFinanceTrendRespVO;
import cn.iocoder.yudao.module.crm.controller.admin.finance.vo.CrmShippedNotInvoicedRespVO;
import cn.iocoder.yudao.module.crm.controller.admin.finance.vo.CrmUnwrittenOffRespVO;
@@ -67,9 +70,23 @@
private CrmCustomerService customerService;
@Override
- public CrmCustomerStatementRespVO getCustomerStatement(Long customerId) {
- List<ErpSaleOrderRespDTO> orders = getApprovedOrders(customerId);
- Map<Long, BigDecimal> collectedByOrder = getCollectedAmountByOrder(orders, customerId);
+ public CrmCustomerStatementRespVO getCustomerStatement(CrmCustomerStatementReqVO reqVO) {
+ Long customerId = reqVO.getCustomerId();
+ LocalDateTime beginTime = reqVO.getBeginTime();
+ LocalDateTime endTime = reqVO.getEndTime();
+ List<ErpSaleOrderRespDTO> orders = getStatementOrders(customerId, beginTime, endTime,
+ reqVO.getIncludeUnapprovedOrder());
+ List<CrmInvoiceDO> invoices = getStatementInvoices(customerId, beginTime, endTime);
+ List<CrmReceivableDO> receipts = getStatementReceipts(customerId, beginTime, endTime);
+
+ Map<Long, BigDecimal> shippedByOrder = getShippedAmountByOrder(orders.stream()
+ .map(ErpSaleOrderRespDTO::getId).filter(Objects::nonNull)
+ .collect(java.util.stream.Collectors.toSet()));
+ Map<Long, BigDecimal> invoicedByOrder = new HashMap<>();
+ invoices.stream().filter(invoice -> invoice.getSaleOrderId() != null)
+ .forEach(invoice -> mergeAmount(invoicedByOrder, invoice.getSaleOrderId(), zeroIfNull(invoice.getPrice())));
+ Map<Long, BigDecimal> collectedByOrder = getCollectedByOrder(receipts, customerId);
+ Map<Long, BigDecimal> collectedByInvoice = getCollectedByInvoice(receipts);
CrmCustomerStatementRespVO result = new CrmCustomerStatementRespVO();
result.setCustomerId(customerId);
@@ -81,33 +98,138 @@
result.setShippedNotInvoicedAmount(BigDecimal.ZERO);
result.setOutstandingAmount(BigDecimal.ZERO);
result.setNextMonthPlanAmount(getNextMonthPlanAmount(customerId));
- List<CrmCustomerStatementRespVO.OrderRow> rows = new ArrayList<>(orders.size());
+
+ // 1. 閿�鍞鍗曟祦姘�
+ List<CrmCustomerStatementRespVO.OrderRow> orderRows = new ArrayList<>(orders.size());
for (ErpSaleOrderRespDTO order : orders) {
CrmCustomerStatementRespVO.OrderRow row = new CrmCustomerStatementRespVO.OrderRow();
row.setSaleOrderId(order.getId());
row.setSaleOrderNo(order.getNo());
row.setContractId(order.getContractId());
+ row.setOrderTime(order.getOrderTime());
row.setOrderAmount(zeroIfNull(order.getTotalPrice()));
- row.setShippedAmount(getShippedAmount(order.getId()));
- row.setInvoicedAmount(getInvoicedAmount(order.getId()));
+ row.setShippedAmount(shippedByOrder.getOrDefault(order.getId(), BigDecimal.ZERO));
+ row.setInvoicedAmount(invoicedByOrder.getOrDefault(order.getId(), BigDecimal.ZERO));
row.setCollectedAmount(collectedByOrder.getOrDefault(order.getId(), BigDecimal.ZERO));
row.setShippedNotInvoicedAmount(maxZero(row.getShippedAmount().subtract(row.getInvoicedAmount())));
+ row.setUninvoicedAmount(maxZero(row.getOrderAmount().subtract(row.getInvoicedAmount())));
row.setOutstandingAmount(maxZero(row.getOrderAmount().subtract(row.getCollectedAmount())));
- rows.add(row);
-
+ row.setStatus(order.getStatus());
+ orderRows.add(row);
result.setOrderTotalAmount(result.getOrderTotalAmount().add(row.getOrderAmount()));
result.setShippedAmount(result.getShippedAmount().add(row.getShippedAmount()));
- result.setInvoicedAmount(result.getInvoicedAmount().add(row.getInvoicedAmount()));
- result.setCollectedAmount(result.getCollectedAmount().add(row.getCollectedAmount()));
result.setShippedNotInvoicedAmount(result.getShippedNotInvoicedAmount().add(row.getShippedNotInvoicedAmount()));
- result.setOutstandingAmount(result.getOutstandingAmount().add(row.getOutstandingAmount()));
}
- result.setOrders(rows);
- if (customerId != null) {
- CrmCustomerDO customer = customerService.getCustomer(customerId);
- result.setCustomerName(customer == null ? null : customer.getName());
+ result.setOrders(orderRows);
+
+ // 2. 寮�绁ㄦ祦姘�
+ Map<Long, String> orderNoMap = new HashMap<>();
+ orders.forEach(order -> orderNoMap.put(order.getId(), order.getNo()));
+ List<CrmCustomerStatementRespVO.InvoiceRow> invoiceRows = new ArrayList<>(invoices.size());
+ for (CrmInvoiceDO invoice : invoices) {
+ CrmCustomerStatementRespVO.InvoiceRow row = new CrmCustomerStatementRespVO.InvoiceRow();
+ row.setId(invoice.getId());
+ row.setNo(invoice.getNo());
+ row.setInvoiceNo(invoice.getInvoiceNo());
+ row.setInvoiceTime(invoice.getInvoiceTime());
+ row.setInvoiceAmount(zeroIfNull(invoice.getPrice()));
+ row.setCollectedAmount(collectedByInvoice.getOrDefault(invoice.getId(), BigDecimal.ZERO));
+ row.setRemainingReceivable(maxZero(row.getInvoiceAmount().subtract(row.getCollectedAmount())));
+ row.setSaleOrderId(invoice.getSaleOrderId());
+ row.setSaleOrderNo(orderNoMap.get(invoice.getSaleOrderId()));
+ row.setStatus(invoice.getAuditStatus());
+ invoiceRows.add(row);
+ result.setInvoicedAmount(result.getInvoicedAmount().add(row.getInvoiceAmount()));
}
+ result.setInvoices(invoiceRows);
+
+ // 3. 鍥炴娴佹按
+ Map<Long, String> invoiceNoMap = new HashMap<>();
+ invoices.forEach(invoice -> invoiceNoMap.put(invoice.getId(), invoice.getInvoiceNo()));
+ List<CrmCustomerStatementRespVO.ReceiptRow> receiptRows = new ArrayList<>(receipts.size());
+ for (CrmReceivableDO receipt : receipts) {
+ CrmCustomerStatementRespVO.ReceiptRow row = new CrmCustomerStatementRespVO.ReceiptRow();
+ row.setId(receipt.getId());
+ row.setNo(receipt.getNo());
+ row.setReturnTime(receipt.getReturnTime());
+ row.setAmount(zeroIfNull(receipt.getPrice()));
+ row.setInvoiceId(receipt.getInvoiceId());
+ row.setInvoiceNo(invoiceNoMap.get(receipt.getInvoiceId()));
+ row.setStatus(receipt.getAuditStatus());
+ receiptRows.add(row);
+ result.setCollectedAmount(result.getCollectedAmount().add(row.getAmount()));
+ }
+ result.setReceipts(receiptRows);
+
+ // 鏈敹浣欓 = 绱寮�绁� - 绱鍥炴锛堜笌渚涘簲鍟嗗線鏉ョ殑鏈粯浣欓鍙e緞涓�鑷达級
+ result.setOutstandingAmount(maxZero(result.getInvoicedAmount().subtract(result.getCollectedAmount())));
+
+ CrmCustomerDO customer = customerService.getCustomer(customerId);
+ result.setCustomerName(customer == null ? null : customer.getName());
return result;
+ }
+
+ @Override
+ public List<CrmCustomerStatementSummaryRespVO> getCustomerSummaryList(CrmCustomerStatementSummaryReqVO reqVO) {
+ LocalDateTime beginTime = reqVO.getBeginTime();
+ LocalDateTime endTime = reqVO.getEndTime();
+ List<ErpSaleOrderRespDTO> orders = getStatementOrders(null, beginTime, endTime,
+ reqVO.getIncludeUnapprovedOrder());
+ List<CrmInvoiceDO> invoices = getStatementInvoices(null, beginTime, endTime);
+ List<CrmReceivableDO> receipts = getStatementReceipts(null, beginTime, endTime);
+
+ Map<Long, CrmCustomerStatementSummaryRespVO> summaryMap = new HashMap<>();
+ for (ErpSaleOrderRespDTO order : orders) {
+ if (order.getCustomerId() == null) {
+ continue;
+ }
+ CrmCustomerStatementSummaryRespVO item = summaryMap.computeIfAbsent(order.getCustomerId(),
+ this::newSummary);
+ item.setOrderCount(item.getOrderCount() + 1);
+ item.setTotalOrderAmount(item.getTotalOrderAmount().add(zeroIfNull(order.getTotalPrice())));
+ }
+ for (CrmInvoiceDO invoice : invoices) {
+ if (invoice.getCustomerId() == null) {
+ continue;
+ }
+ CrmCustomerStatementSummaryRespVO item = summaryMap.computeIfAbsent(invoice.getCustomerId(),
+ this::newSummary);
+ item.setInvoiceCount(item.getInvoiceCount() + 1);
+ item.setTotalInvoiceAmount(item.getTotalInvoiceAmount().add(zeroIfNull(invoice.getPrice())));
+ }
+ for (CrmReceivableDO receipt : receipts) {
+ if (receipt.getCustomerId() == null) {
+ continue;
+ }
+ CrmCustomerStatementSummaryRespVO item = summaryMap.computeIfAbsent(receipt.getCustomerId(),
+ this::newSummary);
+ item.setReceiptCount(item.getReceiptCount() + 1);
+ item.setTotalCollectedAmount(item.getTotalCollectedAmount().add(zeroIfNull(receipt.getPrice())));
+ }
+ if (summaryMap.isEmpty()) {
+ return Collections.emptyList();
+ }
+ Map<Long, String> customerNameMap = getCustomerNameMap(summaryMap.keySet());
+ List<CrmCustomerStatementSummaryRespVO> result = new ArrayList<>(summaryMap.values());
+ result.forEach(item -> {
+ item.setCustomerName(customerNameMap.get(item.getCustomerId()));
+ item.setUncollectedAmount(maxZero(item.getTotalInvoiceAmount().subtract(item.getTotalCollectedAmount())));
+ });
+ result.sort(Comparator.comparing(item -> Objects.requireNonNullElse(item.getCustomerName(), "")));
+ return result;
+ }
+
+ private CrmCustomerStatementSummaryRespVO newSummary(Long customerId) {
+ CrmCustomerStatementSummaryRespVO item = new CrmCustomerStatementSummaryRespVO();
+ item.setCustomerId(customerId);
+ item.setOrderCount(0);
+ item.setInvoiceCount(0);
+ item.setReceiptCount(0);
+ item.setTotalOrderAmount(BigDecimal.ZERO);
+ item.setTotalInvoiceAmount(BigDecimal.ZERO);
+ item.setTotalCollectedAmount(BigDecimal.ZERO);
+ item.setUncollectedAmount(BigDecimal.ZERO);
+ return item;
}
@Override
@@ -121,29 +243,44 @@
Map<Long, String> customerNameMap = getCustomerNameMap(orders.stream()
.map(ErpSaleOrderRespDTO::getCustomerId).filter(Objects::nonNull).toList());
+ // 涓�娆℃�ф壒閲忔煡鍑哄簱鍗曪紝閬垮厤鎸夎鍗曢�愭潯鏌ヨ锛堣鍗曢噺澶ф椂浼氬鑷存帴鍙h秴鏃讹級
+ List<MesWmProductSalesRespDTO> saleOuts = productSalesApi
+ .getProductSalesListBySaleOrderIds(orderMap.keySet()).stream()
+ .filter(saleOut -> ObjectUtilEqual(saleOut.getStatus(), MES_STATUS_FINISHED))
+ .toList();
+ if (CollUtil.isEmpty(saleOuts)) {
+ return Collections.emptyList();
+ }
+ // 涓�娆℃�ф壒閲忔煡寮�绁ㄩ噾棰濓紝鎸夊嚭搴撳崟姹囨��
+ Map<Long, BigDecimal> invoicedBySaleOut = new HashMap<>();
+ invoiceMapper.selectListBySaleOutIdsAndStatus(
+ saleOuts.stream().map(MesWmProductSalesRespDTO::getId).toList(), List.of(AUDIT_APPROVE))
+ .forEach(invoice -> mergeAmount(invoicedBySaleOut, invoice.getSaleOutId(), zeroIfNull(invoice.getPrice())));
+
List<CrmShippedNotInvoicedRespVO> result = new ArrayList<>();
- for (ErpSaleOrderRespDTO order : orders) {
- for (MesWmProductSalesRespDTO saleOut : getFinishedSaleOuts(order.getId())) {
- BigDecimal outAmount = zeroIfNull(saleOut.getTotalPrice());
- BigDecimal invoicedAmount = sumInvoicePrice(invoiceMapper.selectListBySaleOutIdAndStatus(
- saleOut.getId(), List.of(AUDIT_APPROVE)));
- BigDecimal remainAmount = outAmount.subtract(invoicedAmount);
- if (remainAmount.compareTo(BigDecimal.ZERO) <= 0) {
- continue;
- }
- CrmShippedNotInvoicedRespVO vo = new CrmShippedNotInvoicedRespVO();
- vo.setSaleOutId(saleOut.getId());
- vo.setSaleOutCode(saleOut.getCode());
- vo.setSalesDate(saleOut.getSalesDate());
- vo.setSaleOrderId(order.getId());
- vo.setSaleOrderNo(order.getNo());
- vo.setCustomerId(order.getCustomerId());
- vo.setCustomerName(customerNameMap.get(order.getCustomerId()));
- vo.setOutAmount(outAmount);
- vo.setInvoicedAmount(invoicedAmount);
- vo.setRemainInvoiceAmount(remainAmount);
- result.add(vo);
+ for (MesWmProductSalesRespDTO saleOut : saleOuts) {
+ ErpSaleOrderRespDTO order = orderMap.get(saleOut.getSaleOrderId());
+ if (order == null) {
+ continue;
}
+ BigDecimal outAmount = zeroIfNull(saleOut.getTotalPrice());
+ BigDecimal invoicedAmount = invoicedBySaleOut.getOrDefault(saleOut.getId(), BigDecimal.ZERO);
+ BigDecimal remainAmount = outAmount.subtract(invoicedAmount);
+ if (remainAmount.compareTo(BigDecimal.ZERO) <= 0) {
+ continue;
+ }
+ CrmShippedNotInvoicedRespVO vo = new CrmShippedNotInvoicedRespVO();
+ vo.setSaleOutId(saleOut.getId());
+ vo.setSaleOutCode(saleOut.getCode());
+ vo.setSalesDate(saleOut.getSalesDate());
+ vo.setSaleOrderId(order.getId());
+ vo.setSaleOrderNo(order.getNo());
+ vo.setCustomerId(order.getCustomerId());
+ vo.setCustomerName(customerNameMap.get(order.getCustomerId()));
+ vo.setOutAmount(outAmount);
+ vo.setInvoicedAmount(invoicedAmount);
+ vo.setRemainInvoiceAmount(remainAmount);
+ result.add(vo);
}
return result;
}
@@ -245,22 +382,19 @@
.toList();
}
- private List<MesWmProductSalesRespDTO> getFinishedSaleOuts(Long saleOrderId) {
- List<MesWmProductSalesRespDTO> saleOuts = productSalesApi.getProductSalesListBySaleOrderId(saleOrderId);
- if (CollUtil.isEmpty(saleOuts)) {
- return Collections.emptyList();
- }
- return saleOuts.stream().filter(saleOut -> ObjectUtilEqual(saleOut.getStatus(), MES_STATUS_FINISHED)).toList();
+ private Map<Long, BigDecimal> getShippedAmountByOrder(Collection<Long> saleOrderIds) {
+ Map<Long, BigDecimal> result = new HashMap<>();
+ productSalesApi.getProductSalesListBySaleOrderIds(saleOrderIds).stream()
+ .filter(saleOut -> ObjectUtilEqual(saleOut.getStatus(), MES_STATUS_FINISHED))
+ .forEach(saleOut -> mergeAmount(result, saleOut.getSaleOrderId(), zeroIfNull(saleOut.getTotalPrice())));
+ return result;
}
- private BigDecimal getShippedAmount(Long saleOrderId) {
- return getFinishedSaleOuts(saleOrderId).stream()
- .map(saleOut -> zeroIfNull(saleOut.getTotalPrice()))
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- }
-
- private BigDecimal getInvoicedAmount(Long saleOrderId) {
- return sumInvoicePrice(invoiceMapper.selectListBySaleOrderIdAndStatus(saleOrderId, List.of(AUDIT_APPROVE)));
+ private Map<Long, BigDecimal> getInvoicedAmountByOrder(Collection<Long> saleOrderIds) {
+ Map<Long, BigDecimal> result = new HashMap<>();
+ invoiceMapper.selectListBySaleOrderIdsAndStatus(saleOrderIds, List.of(AUDIT_APPROVE))
+ .forEach(invoice -> mergeAmount(result, invoice.getSaleOrderId(), zeroIfNull(invoice.getPrice())));
+ return result;
}
/**
@@ -385,6 +519,109 @@
.reduce(BigDecimal.ZERO, BigDecimal::add);
}
+ private List<ErpSaleOrderRespDTO> getStatementOrders(Long customerId, LocalDateTime beginTime,
+ LocalDateTime endTime, Boolean includeUnapprovedOrder) {
+ List<ErpSaleOrderRespDTO> orders = customerId == null
+ ? saleOrderApi.getSaleOrderList().getCheckedData()
+ : saleOrderApi.getSaleOrderListByCustomerId(customerId).getCheckedData();
+ if (CollUtil.isEmpty(orders)) {
+ return Collections.emptyList();
+ }
+ boolean includeUnapproved = Boolean.TRUE.equals(includeUnapprovedOrder);
+ return orders.stream()
+ .filter(order -> includeUnapproved || ObjectUtilEqual(order.getStatus(), ERP_STATUS_APPROVE))
+ .filter(order -> inTimeRange(order.getOrderTime(), beginTime, endTime))
+ .toList();
+ }
+
+ private List<CrmInvoiceDO> getStatementInvoices(Long customerId, LocalDateTime beginTime,
+ LocalDateTime endTime) {
+ return invoiceMapper.selectList(new LambdaQueryWrapperX<CrmInvoiceDO>()
+ .eq(CrmInvoiceDO::getAuditStatus, AUDIT_APPROVE)
+ .eqIfPresent(CrmInvoiceDO::getCustomerId, customerId)
+ .betweenIfPresent(CrmInvoiceDO::getInvoiceTime, beginTime, endTime)
+ .orderByAsc(CrmInvoiceDO::getInvoiceTime));
+ }
+
+ private List<CrmReceivableDO> getStatementReceipts(Long customerId, LocalDateTime beginTime,
+ LocalDateTime endTime) {
+ return receivableMapper.selectList(new LambdaQueryWrapperX<CrmReceivableDO>()
+ .eq(CrmReceivableDO::getAuditStatus, AUDIT_APPROVE)
+ .eqIfPresent(CrmReceivableDO::getCustomerId, customerId)
+ .betweenIfPresent(CrmReceivableDO::getReturnTime, beginTime, endTime)
+ .orderByAsc(CrmReceivableDO::getReturnTime));
+ }
+
+ private static boolean inTimeRange(LocalDateTime time, LocalDateTime beginTime, LocalDateTime endTime) {
+ if (beginTime != null && (time == null || time.isBefore(beginTime))) {
+ return false;
+ }
+ return endTime == null || (time != null && !time.isAfter(endTime));
+ }
+
+ /**
+ * 鎸夊洖娆惧崟璁$畻姣忓紶寮�绁ㄧ殑宸插洖娆鹃噾棰�
+ */
+ private Map<Long, BigDecimal> getCollectedByInvoice(List<CrmReceivableDO> receipts) {
+ Map<Long, BigDecimal> result = new HashMap<>();
+ if (CollUtil.isEmpty(receipts)) {
+ return result;
+ }
+ Map<Long, CrmReceivableDO> receiptMap = new HashMap<>();
+ receipts.forEach(receipt -> receiptMap.put(receipt.getId(), receipt));
+ Set<Long> withItems = new HashSet<>();
+ for (CrmReceivableItemDO item : receivableItemMapper.selectListByReceivableIds(receiptMap.keySet())) {
+ withItems.add(item.getReceivableId());
+ if (CrmReceivableBizTypeEnum.SALE_INVOICE.getType().equals(item.getBizType()) && item.getBizId() != null) {
+ result.merge(item.getBizId(), zeroIfNull(item.getReceiptPrice()), BigDecimal::add);
+ }
+ }
+ for (CrmReceivableDO receipt : receipts) {
+ if (!withItems.contains(receipt.getId()) && receipt.getInvoiceId() != null) {
+ result.merge(receipt.getInvoiceId(), zeroIfNull(receipt.getPrice()), BigDecimal::add);
+ }
+ }
+ return result;
+ }
+
+ /**
+ * 鎸夊洖娆惧崟璁$畻姣忓紶閿�鍞鍗曠殑宸插洖娆鹃噾棰�
+ */
+ private Map<Long, BigDecimal> getCollectedByOrder(List<CrmReceivableDO> receipts, Long customerId) {
+ Map<Long, BigDecimal> result = new HashMap<>();
+ if (CollUtil.isEmpty(receipts)) {
+ return result;
+ }
+ Map<Long, CrmReceivableDO> receiptMap = new HashMap<>();
+ receipts.forEach(receipt -> receiptMap.put(receipt.getId(), receipt));
+ // 鍥炴鍙兘鍏宠仈鍒版椂闂磋寖鍥村鐨勫紑绁紝杩欓噷鍙栧鎴峰叏閮ㄥ紑绁ㄥ仛鏄犲皠
+ List<CrmInvoiceDO> allInvoices = invoiceMapper.selectList(new LambdaQueryWrapperX<CrmInvoiceDO>()
+ .eqIfPresent(CrmInvoiceDO::getCustomerId, customerId));
+ Map<Long, Long> invoiceOrderMap = new HashMap<>();
+ allInvoices.forEach(invoice -> {
+ if (invoice.getSaleOrderId() != null) {
+ invoiceOrderMap.put(invoice.getId(), invoice.getSaleOrderId());
+ }
+ });
+ Set<Long> withItems = new HashSet<>();
+ for (CrmReceivableItemDO item : receivableItemMapper.selectListByReceivableIds(receiptMap.keySet())) {
+ withItems.add(item.getReceivableId());
+ if (CrmReceivableBizTypeEnum.SALE_ORDER.getType().equals(item.getBizType()) && item.getBizId() != null) {
+ result.merge(item.getBizId(), zeroIfNull(item.getReceiptPrice()), BigDecimal::add);
+ } else if (CrmReceivableBizTypeEnum.SALE_INVOICE.getType().equals(item.getBizType())
+ && item.getBizId() != null && invoiceOrderMap.containsKey(item.getBizId())) {
+ result.merge(invoiceOrderMap.get(item.getBizId()), zeroIfNull(item.getReceiptPrice()), BigDecimal::add);
+ }
+ }
+ for (CrmReceivableDO receipt : receipts) {
+ if (!withItems.contains(receipt.getId()) && receipt.getInvoiceId() != null
+ && invoiceOrderMap.containsKey(receipt.getInvoiceId())) {
+ result.merge(invoiceOrderMap.get(receipt.getInvoiceId()), zeroIfNull(receipt.getPrice()), BigDecimal::add);
+ }
+ }
+ return result;
+ }
+
private Map<Long, String> getCustomerNameMap(Collection<Long> customerIds) {
if (CollUtil.isEmpty(customerIds)) {
return Collections.emptyMap();
@@ -395,14 +632,14 @@
return result;
}
- private static BigDecimal sumInvoicePrice(List<CrmInvoiceDO> invoices) {
- if (CollUtil.isEmpty(invoices)) {
- return BigDecimal.ZERO;
- }
- return invoices.stream().map(invoice -> zeroIfNull(invoice.getPrice())).reduce(BigDecimal.ZERO, BigDecimal::add);
+ private static void mergeAmount(Map<String, BigDecimal> map, String key, BigDecimal amount) {
+ map.merge(key, amount, BigDecimal::add);
}
- private static void mergeAmount(Map<String, BigDecimal> map, String key, BigDecimal amount) {
+ private static void mergeAmount(Map<Long, BigDecimal> map, Long key, BigDecimal amount) {
+ if (key == null) {
+ return;
+ }
map.merge(key, amount, BigDecimal::add);
}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java
index b2cb267..4cc7f69 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java
@@ -444,7 +444,7 @@
*/
private void validateSaleOrderAndOut(CrmInvoiceSaveReqVO reqVO) {
if (reqVO.getSaleOrderId() == null) {
- return;
+ throw exception(INVOICE_CREATE_FAIL_SALE_ORDER_REQUIRED);
}
// 1. 閿�鍞鍗�
ErpSaleOrderRespDTO saleOrder = saleOrderApi.getSaleOrder(reqVO.getSaleOrderId()).getCheckedData();
@@ -471,9 +471,9 @@
formatPrice(orderRemainPrice), formatPrice(orderTotalPrice), formatPrice(orderInvoicedPrice));
}
- // 2. 閿�鍞嚭搴撳崟锛堝彲閫夛級
+ // 2. 寮�绁ㄧ敵璇峰繀椤荤粦瀹氬凡瀹屾垚鐨勯攢鍞嚭搴撳崟
if (reqVO.getSaleOutId() == null) {
- return;
+ throw exception(INVOICE_CREATE_FAIL_SALE_OUT_REQUIRED);
}
MesWmProductSalesRespDTO saleOut = productSalesApi.getProductSales(reqVO.getSaleOutId());
if (saleOut == null) {
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/CrmSaleQuotationDocumentRenderer.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/CrmSaleQuotationDocumentRenderer.java
new file mode 100644
index 0000000..c7d4fbd
--- /dev/null
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/CrmSaleQuotationDocumentRenderer.java
@@ -0,0 +1,271 @@
+package cn.iocoder.yudao.module.crm.service.quotation;
+
+import cn.hutool.core.convert.Convert;
+import cn.iocoder.yudao.module.crm.controller.admin.quotation.vo.CrmSaleQuotationRespVO;
+import org.springframework.core.io.ClassPathResource;
+import org.w3c.dom.Node;
+
+import javax.imageio.ImageIO;
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.awt.*;
+import java.awt.geom.Path2D;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * 閿�鍞姤浠峰崟 Word 瀵煎嚭锛氬熀浜� {@code templates/quotation/sale-quotation.docx} 妯℃澘濉啓涓氬姟妲戒綅锛�
+ * 骞跺湪瀵煎嚭鏃舵寜鍏徃鍚嶇О瀹炴椂缁樺埗鐢靛瓙绔狅紙涓嶄緷璧栭潤鎬佺珷鍥剧墖璧勬簮锛夈��
+ */
+public final class CrmSaleQuotationDocumentRenderer {
+
+ private static final String W = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
+ private static final String TEMPLATE = "templates/quotation/sale-quotation.docx";
+ private static final String SEAL_ENTRY = "word/media/seal.png";
+
+ private CrmSaleQuotationDocumentRenderer() {
+ }
+
+ public static byte[] render(CrmSaleQuotationRespVO quotation, String companyName) throws IOException {
+ if (quotation == null) {
+ throw new IllegalArgumentException("鎶ヤ环鍗曚笉瀛樺湪锛屾棤娉曠敓鎴愭姤浠锋枃浠�");
+ }
+ if (quotation.getItems() == null || quotation.getItems().isEmpty()) {
+ throw new IllegalArgumentException("鎶ヤ环鍗曟病鏈変骇鍝佹槑缁嗭紝鏃犳硶鐢熸垚鎶ヤ环鏂囦欢");
+ }
+ byte[] seal = renderSeal(companyName);
+ try (var input = new ClassPathResource(TEMPLATE).getInputStream();
+ var zip = new ZipInputStream(input);
+ var output = new ByteArrayOutputStream();
+ var result = new ZipOutputStream(output)) {
+ ZipEntry entry;
+ while ((entry = zip.getNextEntry()) != null) {
+ byte[] content = zip.readAllBytes();
+ if ("word/document.xml".equals(entry.getName())) {
+ content = fillDocument(content, quotation, companyName);
+ } else if (SEAL_ENTRY.equals(entry.getName())) {
+ content = seal;
+ }
+ result.putNextEntry(new ZipEntry(entry.getName()));
+ result.write(content);
+ result.closeEntry();
+ }
+ result.finish();
+ return output.toByteArray();
+ }
+ }
+
+ private static byte[] fillDocument(byte[] xml, CrmSaleQuotationRespVO quotation, String companyName)
+ throws IOException {
+ try {
+ var factory = DocumentBuilderFactory.newInstance();
+ factory.setNamespaceAware(true);
+ factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+ factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
+ factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
+ var document = factory.newDocumentBuilder().parse(new ByteArrayInputStream(xml));
+
+ // 1. 浜у搧鏄庣粏琛�
+ Node rowTemplate = null;
+ var rows = document.getElementsByTagNameNS(W, "tr");
+ for (int i = 0; i < rows.getLength(); i++) {
+ if (rows.item(i).getTextContent().contains("${itemName}")) {
+ rowTemplate = rows.item(i);
+ break;
+ }
+ }
+ if (rowTemplate == null) {
+ throw new IOException("鎶ヤ环鍗曟ā鏉跨己灏戜骇鍝佹槑缁嗘Ы浣�");
+ }
+ int index = 0;
+ for (var item : quotation.getItems()) {
+ Node row = rowTemplate.cloneNode(true);
+ BigDecimal price = item.getQuotationPrice() == null ? BigDecimal.ZERO : item.getQuotationPrice();
+ BigDecimal count = item.getCount() == null ? BigDecimal.ZERO : item.getCount();
+ BigDecimal amount = item.getTotalPrice() != null ? item.getTotalPrice()
+ : price.multiply(count).setScale(2, RoundingMode.HALF_UP);
+ String name = text(item.getItemName());
+ if (name.isBlank()) {
+ name = text(item.getItemCode());
+ }
+ Map<String, String> values = new HashMap<>();
+ values.put("index", String.valueOf(++index));
+ values.put("itemName", name);
+ values.put("itemSpecification", text(item.getItemSpecification()));
+ values.put("unitName", text(item.getItemUnitName()));
+ values.put("count", count.stripTrailingZeros().toPlainString());
+ values.put("price", money(price));
+ values.put("amount", money(amount));
+ replace(row, values);
+ rowTemplate.getParentNode().insertBefore(row, rowTemplate);
+ }
+ rowTemplate.getParentNode().removeChild(rowTemplate);
+
+ // 2. 琛ㄥご涓庨噾棰�
+ BigDecimal productTotal = quotation.getTotalProductPrice() == null ? BigDecimal.ZERO
+ : quotation.getTotalProductPrice();
+ BigDecimal discount = quotation.getDiscountPrice() == null ? BigDecimal.ZERO
+ : quotation.getDiscountPrice();
+ BigDecimal taxRate = quotation.getTaxRate() == null ? BigDecimal.ZERO : quotation.getTaxRate();
+ BigDecimal taxPrice = quotation.getTaxPrice() == null ? BigDecimal.ZERO : quotation.getTaxPrice();
+ BigDecimal total = quotation.getTotalPrice() == null ? BigDecimal.ZERO : quotation.getTotalPrice();
+ Map<String, String> values = new HashMap<>();
+ values.put("companyName", text(companyName));
+ values.put("customerName", text(quotation.getCustomerName()));
+ values.put("quotationNo", text(quotation.getNo()));
+ values.put("quotationName", text(quotation.getName()));
+ values.put("quotationDate", date(quotation.getQuotationTime()));
+ values.put("validUntil", date(quotation.getValidUntil()));
+ values.put("contactName", text(quotation.getContactName()));
+ values.put("ownerUserName", text(quotation.getOwnerUserName()));
+ values.put("productTotal", money(productTotal));
+ values.put("discountPrice", money(discount));
+ values.put("taxRate", taxRate.stripTrailingZeros().toPlainString());
+ values.put("taxPrice", money(taxPrice));
+ values.put("totalPrice", money(total));
+ values.put("totalUpper", Convert.digitToChinese(total));
+ values.put("remark", text(quotation.getRemark()).isBlank() ? "鏃�" : quotation.getRemark());
+ replace(document, values);
+ if (document.getDocumentElement().getTextContent().contains("${")) {
+ throw new IOException("鎶ヤ环鍗曟ā鏉垮瓨鍦ㄦ湭濉啓妲戒綅");
+ }
+
+ var transformerFactory = TransformerFactory.newInstance();
+ transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
+ transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, "");
+ var output = new ByteArrayOutputStream();
+ transformerFactory.newTransformer().transform(new DOMSource(document), new StreamResult(output));
+ return output.toByteArray();
+ } catch (IOException exception) {
+ throw exception;
+ } catch (Exception exception) {
+ throw new IOException("鐢熸垚鎶ヤ环鍗� Word 鏂囦欢澶辫触", exception);
+ }
+ }
+
+ // ==================== 鐢靛瓙绔犵粯鍒� ====================
+
+ /**
+ * 鎸夊叕鍙稿悕绉板疄鏃剁粯鍒剁孩鑹插渾褰㈢數瀛愮珷锛氬弻鍦嗙幆 + 涓婃柟鐜粫鍏徃鍚� + 涓ぎ浜旇鏄� + 涓嬫柟鈥滄姤浠蜂笓鐢ㄧ珷鈥濄��
+ * 涓嶄緷璧栦换浣曢潤鎬佺珷鍥剧墖锛岄伩鍏嶆崲鍏徃鍝佺墝鍚庝粛闇�鍗曠嫭缁存姢鍥剧墖璧勬簮銆�
+ */
+ private static byte[] renderSeal(String companyName) throws IOException {
+ int size = 400;
+ var image = new BufferedImage(size, size, BufferedImage.TYPE_INT_ARGB);
+ Graphics2D g = image.createGraphics();
+ try {
+ g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+ g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
+ var red = new Color(200, 16, 46);
+ g.setColor(red);
+ g.setStroke(new BasicStroke(9f));
+ g.drawOval(12, 12, size - 24, size - 24);
+ g.setStroke(new BasicStroke(3f));
+ g.drawOval(38, 38, size - 76, size - 76);
+
+ String name = text(companyName).isBlank() ? "鍏徃" : companyName.trim();
+ int fontSize = Math.max(16, Math.min(30, 560 / Math.max(1, name.length())));
+ g.setFont(new Font("SimSun", Font.BOLD, fontSize));
+ drawArcText(g, name, size / 2, size / 2, size / 2 - 62, 195, 150);
+
+ drawStar(g, size / 2, size / 2 - 8, 34, 14);
+ g.setFont(new Font("SimSun", Font.BOLD, 27));
+ drawCentered(g, "鎶ヤ环涓撶敤绔�", size / 2, (int) (size * 0.68));
+ } finally {
+ g.dispose();
+ }
+ var output = new ByteArrayOutputStream();
+ ImageIO.write(image, "png", output);
+ return output.toByteArray();
+ }
+
+ /** 娌垮渾寮ф帓甯冩枃瀛楋紝startDeg 璧枫�侀『鏃堕拡 sweepDeg 搴︼紱瀛楃鍩虹嚎鏈濆渾蹇冦�� */
+ private static void drawArcText(Graphics2D g, String text, int cx, int cy, int radius,
+ double startDeg, double sweepDeg) {
+ FontMetrics fm = g.getFontMetrics();
+ int[] widths = new int[text.length()];
+ double totalWidth = 0;
+ for (int i = 0; i < text.length(); i++) {
+ widths[i] = Math.max(1, fm.charWidth(text.charAt(i)));
+ totalWidth += widths[i];
+ }
+ double angle = startDeg;
+ for (int i = 0; i < text.length(); i++) {
+ double span = widths[i] / totalWidth * sweepDeg;
+ double center = angle + span / 2;
+ double rad = Math.toRadians(center);
+ int x = (int) (cx + radius * Math.cos(rad));
+ int y = (int) (cy + radius * Math.sin(rad));
+ var transform = g.getTransform();
+ g.rotate(Math.toRadians(center + 90), x, y);
+ g.drawString(String.valueOf(text.charAt(i)), x - widths[i] / 2, y + fm.getAscent() / 2 - 3);
+ g.setTransform(transform);
+ angle += span;
+ }
+ }
+
+ private static void drawStar(Graphics2D g, int cx, int cy, int outer, int inner) {
+ var path = new Path2D.Double();
+ for (int i = 0; i < 10; i++) {
+ double r = i % 2 == 0 ? outer : inner;
+ double angle = Math.toRadians(-90 + i * 36);
+ double x = cx + r * Math.cos(angle);
+ double y = cy + r * Math.sin(angle);
+ if (i == 0) {
+ path.moveTo(x, y);
+ } else {
+ path.lineTo(x, y);
+ }
+ }
+ path.closePath();
+ g.fill(path);
+ }
+
+ private static void drawCentered(Graphics2D g, String text, int cx, int baseline) {
+ FontMetrics fm = g.getFontMetrics();
+ g.drawString(text, cx - fm.stringWidth(text) / 2, baseline);
+ }
+
+ // ==================== 宸ュ叿鏂规硶 ====================
+
+ private static void replace(Node node, Map<String, String> values) {
+ if (node.getNodeType() == Node.ELEMENT_NODE && "t".equals(node.getLocalName())
+ && W.equals(node.getNamespaceURI())) {
+ String value = node.getTextContent();
+ for (var entry : values.entrySet()) {
+ value = value.replace("${" + entry.getKey() + "}", entry.getValue());
+ }
+ node.setTextContent(value);
+ return;
+ }
+ for (Node child = node.getFirstChild(); child != null; child = child.getNextSibling()) {
+ replace(child, values);
+ }
+ }
+
+ private static String money(BigDecimal value) {
+ return value.setScale(2, RoundingMode.HALF_UP).toPlainString();
+ }
+
+ private static String date(java.time.LocalDateTime value) {
+ return value == null ? "____________" : value.format(DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�"));
+ }
+
+ private static String text(String value) {
+ return Objects.requireNonNullElse(value, "");
+ }
+}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/CrmSaleQuotationService.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/CrmSaleQuotationService.java
index 5230d9f..735e13c 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/CrmSaleQuotationService.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/CrmSaleQuotationService.java
@@ -48,6 +48,30 @@
CrmSaleQuotationDO getSaleQuotation(Long id);
/**
+ * 鎻愪氦閿�鍞姤浠峰崟瀹℃壒
+ *
+ * @param id 缂栧彿
+ * @param processDefinitionKey 娴佺▼瀹氫箟 Key
+ * @param userId 鐢ㄦ埛缂栧彿
+ */
+ void submitSaleQuotation(Long id, String processDefinitionKey, Long userId);
+
+ /**
+ * 鏇存柊閿�鍞姤浠峰崟瀹℃壒缁撴灉
+ *
+ * @param id 缂栧彿
+ * @param bpmResult BPM 瀹℃壒缁撴灉
+ */
+ void updateSaleQuotationAuditStatus(Long id, Integer bpmResult);
+
+ /**
+ * 鑾峰彇閿�鍞姤浠峰鎵瑰彲鐢ㄧ殑娴佺▼瀹氫箟鍒楄〃
+ *
+ * @return 娴佺▼瀹氫箟鍒楄〃
+ */
+ java.util.List<java.util.Map<String, Object>> getSaleQuotationApproveProcessDefinitionList();
+
+ /**
* 鑾峰緱閿�鍞姤浠峰崟鍒嗛〉
*
* @param pageReqVO 鍒嗛〉鏌ヨ
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/CrmSaleQuotationServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/CrmSaleQuotationServiceImpl.java
index b4a4ab5..cba49d1 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/CrmSaleQuotationServiceImpl.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/CrmSaleQuotationServiceImpl.java
@@ -1,10 +1,17 @@
package cn.iocoder.yudao.module.crm.service.quotation;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
+import cn.iocoder.yudao.module.bpm.service.definition.BpmCategoryService;
+import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractSaveReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.quotation.vo.CrmSaleQuotationPageReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.quotation.vo.CrmSaleQuotationSaveReqVO;
@@ -30,6 +37,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.repository.ProcessDefinition;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@@ -50,6 +58,11 @@
@Validated
@Slf4j
public class CrmSaleQuotationServiceImpl implements CrmSaleQuotationService {
+
+ /**
+ * BPM 閿�鍞姤浠峰鎵瑰垎绫荤紪鐮�
+ */
+ private static final String SALE_QUOTATION_APPROVE_CATEGORY_CODE = "sale_quotation_approve";
@Resource
private CrmSaleQuotationMapper saleQuotationMapper;
@@ -76,6 +89,13 @@
private StorageAttachmentApi storageAttachmentApi;
@Resource
private CrmContractService contractService;
+
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
+ @Resource
+ private BpmCategoryService bpmCategoryService;
+ @Resource
+ private BpmProcessDefinitionService bpmProcessDefinitionService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -165,6 +185,117 @@
// 2.3 鍒犻櫎鏁版嵁鏉冮檺
permissionService.deletePermission(CrmBizTypeEnum.CRM_SALE_QUOTATION.getType(), saleQuotation.getId());
});
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void submitSaleQuotation(Long id, String processDefinitionKey, Long userId) {
+ // 1. 鏍¢獙鎶ヤ环鍗曞瓨鍦ㄤ笖涓鸿崏绋跨姸鎬�
+ CrmSaleQuotationDO saleQuotation = validateSaleQuotationExists(id);
+ if (ObjUtil.notEqual(saleQuotation.getStatus(), CrmSaleQuotationStatusEnum.DRAFT.getStatus())) {
+ throw exception(SALE_QUOTATION_SUBMIT_FAIL_NOT_DRAFT, saleQuotation.getNo());
+ }
+
+ // 2. 鍏ㄥ眬鍏嶅鎵癸細鐩存帴缃负瀹℃壒閫氳繃锛屾棤闇�娴佺▼妯″瀷
+ if (bpmProcessInstanceApi.isGlobalAutoApprove()) {
+ saleQuotationMapper.updateById(new CrmSaleQuotationDO().setId(id).setProcessInstanceId("")
+ .setStatus(CrmSaleQuotationStatusEnum.PROCESS.getStatus()));
+ updateSaleQuotationAuditStatus(id, BpmProcessInstanceStatusEnum.APPROVE.getStatus());
+ return;
+ }
+
+ // 3. 鏍¢獙瀹℃壒鍒嗙被鍜屾祦绋嬪畾涔�
+ validateSaleQuotationApproveCategoryAndProcessDefinition();
+ ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
+ if (processDefinition == null) {
+ throw exception(SALE_QUOTATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+
+ // 4. 鍒涘缓瀹℃壒娴佺▼瀹炰緥
+ String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(processDefinitionKey).setBusinessKey(String.valueOf(id)));
+
+ // 5. 鏇存柊娴佺▼瀹炰緥缂栧彿鍜岀姸鎬�
+ saleQuotationMapper.updateById(new CrmSaleQuotationDO().setId(id).setProcessInstanceId(processInstanceId)
+ .setStatus(CrmSaleQuotationStatusEnum.PROCESS.getStatus()));
+ }
+
+ @Override
+ public void updateSaleQuotationAuditStatus(Long id, Integer bpmResult) {
+ // 1.1 鏍¢獙鎶ヤ环鍗曟槸鍚﹀瓨鍦�
+ CrmSaleQuotationDO saleQuotation = validateSaleQuotationExists(id);
+ // 1.2 鍙湁瀹℃壒涓紝鎵嶅彲浠ユ洿鏂板鎵圭粨鏋�
+ if (ObjUtil.notEqual(saleQuotation.getStatus(), CrmSaleQuotationStatusEnum.PROCESS.getStatus())) {
+ log.error("[updateSaleQuotationAuditStatus][鎶ヤ环鍗�({}) 涓嶅浜庡鎵逛腑锛屾棤娉曟洿鏂板鎵圭粨鏋�({})]",
+ saleQuotation.getNo(), bpmResult);
+ throw exception(SALE_QUOTATION_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS, saleQuotation.getNo());
+ }
+
+ // 2. 杞崲 BPM 瀹℃壒缁撴灉骞舵洿鏂�
+ Integer status;
+ if (ObjUtil.equal(bpmResult, BpmProcessInstanceStatusEnum.APPROVE.getStatus())) {
+ status = CrmSaleQuotationStatusEnum.APPROVE.getStatus();
+ } else if (ObjUtil.equal(bpmResult, BpmProcessInstanceStatusEnum.REJECT.getStatus())) {
+ status = CrmSaleQuotationStatusEnum.REJECT.getStatus();
+ } else if (ObjUtil.equal(bpmResult, BpmProcessInstanceStatusEnum.CANCEL.getStatus())) {
+ status = CrmSaleQuotationStatusEnum.CANCEL.getStatus();
+ } else {
+ log.warn("[updateSaleQuotationAuditStatus][鎶ヤ环鍗�({}) 鏀跺埌鏈煡瀹℃壒缁撴灉({})锛屽拷鐣", id, bpmResult);
+ return;
+ }
+ saleQuotationMapper.updateById(new CrmSaleQuotationDO().setId(id).setStatus(status));
+ }
+
+ @Override
+ public List<Map<String, Object>> getSaleQuotationApproveProcessDefinitionList() {
+ validateSaleQuotationApproveCategoryAndProcessDefinition();
+ List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(SALE_QUOTATION_APPROVE_CATEGORY_CODE);
+ Set<String> processDefinitionIds = convertSet(definitionInfoList, BpmProcessDefinitionInfoDO::getProcessDefinitionId);
+ List<ProcessDefinition> processDefinitions = bpmProcessDefinitionService.getProcessDefinitionList(processDefinitionIds);
+ // 鍙繚鐣欐縺娲荤姸鎬侊紝涓旂浉鍚� key 鍙繚鐣欐渶鏂扮増鏈�
+ Map<String, ProcessDefinition> latestVersionMap = new HashMap<>();
+ for (ProcessDefinition pd : processDefinitions) {
+ if (pd.isSuspended()) {
+ continue;
+ }
+ ProcessDefinition existing = latestVersionMap.get(pd.getKey());
+ if (existing == null || pd.getVersion() > existing.getVersion()) {
+ latestVersionMap.put(pd.getKey(), pd);
+ }
+ }
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (ProcessDefinition pd : latestVersionMap.values()) {
+ Map<String, Object> item = new HashMap<>();
+ item.put("id", pd.getId());
+ item.put("key", pd.getKey());
+ item.put("name", pd.getName());
+ item.put("version", pd.getVersion());
+ result.add(item);
+ }
+ return result;
+ }
+
+ /**
+ * 鏍¢獙 BPM 閿�鍞姤浠峰鎵瑰垎绫诲拰娴佺▼瀹氫箟鏄惁瀛樺湪
+ */
+ private void validateSaleQuotationApproveCategoryAndProcessDefinition() {
+ List<String> codes = Collections.singletonList(SALE_QUOTATION_APPROVE_CATEGORY_CODE);
+ Map<String, ?> categoryMap = bpmCategoryService.getCategoryMap(codes);
+ if (!categoryMap.containsKey(SALE_QUOTATION_APPROVE_CATEGORY_CODE)) {
+ throw exception(SALE_QUOTATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+ List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(SALE_QUOTATION_APPROVE_CATEGORY_CODE);
+ if (CollUtil.isEmpty(definitionInfoList)) {
+ throw exception(SALE_QUOTATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+ Set<String> processDefinitionIds = convertSet(definitionInfoList, BpmProcessDefinitionInfoDO::getProcessDefinitionId);
+ List<ProcessDefinition> processDefinitions = bpmProcessDefinitionService.getProcessDefinitionList(processDefinitionIds);
+ boolean hasActiveDefinition = processDefinitions.stream().anyMatch(pd -> !pd.isSuspended());
+ if (!hasActiveDefinition) {
+ throw exception(SALE_QUOTATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
}
private CrmSaleQuotationDO validateSaleQuotationExists(Long id) {
@@ -293,10 +424,13 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Long convertToContract(Long id, Long userId) {
- // 1. 鏍¢獙鎶ヤ环鍗曞瓨鍦ㄤ笖涓鸿崏绋跨姸鎬�
+ // 1. 鏍¢獙鎶ヤ环鍗曞瓨鍦紝涓斾负鑽夌鎴栧鎵归�氳繃鐘舵��
CrmSaleQuotationDO saleQuotation = validateSaleQuotationExists(id);
- if (!CrmSaleQuotationStatusEnum.DRAFT.getStatus().equals(saleQuotation.getStatus())) {
- throw exception(SALE_QUOTATION_CONVERT_FAIL_NOT_DRAFT, saleQuotation.getNo());
+ if (!CrmSaleQuotationStatusEnum.DRAFT.getStatus().equals(saleQuotation.getStatus())
+ && !CrmSaleQuotationStatusEnum.APPROVE.getStatus().equals(saleQuotation.getStatus())) {
+ CrmSaleQuotationStatusEnum current = CrmSaleQuotationStatusEnum.getByStatus(saleQuotation.getStatus());
+ throw exception(SALE_QUOTATION_CONVERT_FAIL_NOT_DRAFT, saleQuotation.getNo(),
+ current != null ? current.getName() : String.valueOf(saleQuotation.getStatus()));
}
// 鏍¢獙鏄惁宸茶浆鍚堝悓
if (saleQuotation.getContractId() != null) {
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/listener/CrmSaleQuotationStatusListener.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/listener/CrmSaleQuotationStatusListener.java
new file mode 100644
index 0000000..5688fb0
--- /dev/null
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/listener/CrmSaleQuotationStatusListener.java
@@ -0,0 +1,52 @@
+package cn.iocoder.yudao.module.crm.service.quotation.listener;
+
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
+import cn.iocoder.yudao.module.crm.dal.dataobject.quotation.CrmSaleQuotationDO;
+import cn.iocoder.yudao.module.crm.dal.mysql.quotation.CrmSaleQuotationMapper;
+import cn.iocoder.yudao.module.crm.enums.quotation.CrmSaleQuotationStatusEnum;
+import cn.iocoder.yudao.module.crm.service.quotation.CrmSaleQuotationService;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+
+/**
+ * 閿�鍞姤浠峰鎵圭殑缁撴灉鐩戝惉鍣�
+ *
+ * 閫氳繃 businessKey锛堟姤浠峰崟 ID锛夊尮閰嶏紝鑰屼笉鏄浐瀹氱殑娴佺▼瀹氫箟 Key锛�
+ * 杩欐牱鍙互鏀寔銆岄攢鍞姤浠峰鎵广�嶅垎绫讳笅浠绘剰 Key 鐨勬祦绋嬫ā鍨嬨��
+ */
+@Component
+@Slf4j
+public class CrmSaleQuotationStatusListener implements ApplicationListener<BpmProcessInstanceStatusEvent> {
+
+ @Resource
+ private CrmSaleQuotationService saleQuotationService;
+ @Resource
+ private CrmSaleQuotationMapper saleQuotationMapper;
+
+ @Override
+ public void onApplicationEvent(BpmProcessInstanceStatusEvent event) {
+ // 閫氳繃 businessKey 鏌ヨ鎶ヤ环鍗�
+ Long quotationId;
+ try {
+ quotationId = Long.parseLong(event.getBusinessKey());
+ } catch (NumberFormatException e) {
+ return; // businessKey 涓嶆槸鏁板瓧锛屽拷鐣�
+ }
+
+ CrmSaleQuotationDO quotation = saleQuotationMapper.selectById(quotationId);
+ if (quotation == null) {
+ return; // 涓嶆槸鎶ヤ环鍗曪紝蹇界暐
+ }
+ // 鍙湁瀹℃壒涓姸鎬佺殑鎶ヤ环鍗曟墠澶勭悊
+ if (!CrmSaleQuotationStatusEnum.PROCESS.getStatus().equals(quotation.getStatus())) {
+ log.warn("[onApplicationEvent] 鎶ヤ环鍗�({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝褰撳墠鐘舵��: {}", quotationId, quotation.getStatus());
+ return;
+ }
+
+ log.info("[onApplicationEvent] 鎶ヤ环鍗�({}) 瀹℃壒鐘舵�佹洿鏂�: {}", quotationId, event.getStatus());
+ saleQuotationService.updateSaleQuotationAuditStatus(quotationId, event.getStatus());
+ }
+
+}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableService.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableService.java
index 62670f6..1c1637e 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableService.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableService.java
@@ -38,6 +38,23 @@
void updateReceivable(@Valid CrmReceivableSaveReqVO updateReqVO);
/**
+ * 鎻愪氦鍥炴瀹℃壒锛堝垱寤� BPM 娴佺▼瀹炰緥锛�
+ *
+ * @param id 缂栧彿
+ * @param remark 瀹℃壒澶囨敞锛屽彲涓虹┖
+ * @param userId 鍙戣捣浜虹紪鍙�
+ */
+ void submitReceivable(Long id, String remark, Long userId);
+
+ /**
+ * 鏇存柊鍥炴瀹℃壒缁撴灉锛堢敱 BPM 娴佺▼鐘舵�佺洃鍚櫒璋冪敤锛�
+ *
+ * @param id 缂栧彿
+ * @param bpmResult BPM 瀹℃壒缁撴灉
+ */
+ void updateReceivableAuditStatus(Long id, Integer bpmResult);
+
+ /**
* 鏇存柊鍥炴鐨勭姸鎬侊紙瀹℃牳/鍙嶅鏍革級
*
* @param id 缂栧彿
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
index 08d647c..8922271 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
@@ -5,9 +5,14 @@
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.receivable.CrmReceivablePageReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.receivable.CrmReceivableSaveReqVO;
import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractDO;
@@ -38,6 +43,7 @@
import com.mzt.logapi.service.impl.DiffParseFunction;
import com.mzt.logapi.starter.annotation.LogRecord;
import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -57,7 +63,15 @@
*/
@Service
@Validated
+@Slf4j
public class CrmReceivableServiceImpl implements CrmReceivableService {
+
+ /**
+ * BPM 鍥炴瀹℃壒娴佺▼鏍囪瘑
+ *
+ * 瀵瑰簲 act_re_procdef.KEY_ = crm-receivable-audit锛汢PM 鍒嗙被銆屽洖娆惧鎵广�嶇殑缂栫爜涓� 1111锛坆pm_category.id=76锛�
+ */
+ public static final String BPM_PROCESS_DEFINITION_KEY = "crm-receivable-audit";
@Resource
private CrmReceivableMapper receivableMapper;
@@ -86,6 +100,8 @@
private AdminUserApi adminUserApi;
@Resource
private StorageAttachmentApi storageAttachmentApi;
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -106,9 +122,9 @@
throw exception(RECEIVABLE_NO_EXISTS);
}
- // 2.1 鎻掑叆鍥炴锛堝垱寤哄悗鍗充负鏈鏍哥姸鎬侊級
+ // 2.1 鎻掑叆鍥炴锛堝垱寤哄悗涓烘湭鎻愪氦锛岄渶鏄惧紡銆屾彁浜ゅ鎵广�嶆墠杩涘叆 BPM 瀹℃壒涓級
CrmReceivableDO receivable = BeanUtils.toBean(createReqVO, CrmReceivableDO.class)
- .setNo(no).setAuditStatus(CrmAuditStatusEnum.PROCESS.getStatus());
+ .setNo(no).setAuditStatus(CrmAuditStatusEnum.DRAFT.getStatus());
receivableMapper.insert(receivable);
// 2.2 淇濆瓨鏍搁攢鏄庣粏锛堟湭浼犳椂鎸夊叧鑱斿紑绁ㄨ嚜鍔ㄧ敓鎴愪竴鏉★級
syncReceivableItems(receivable, createReqVO.getItems());
@@ -266,9 +282,10 @@
* 鏍¢獙鍏宠仈寮�绁ㄥ悎鏍硷細瀛樺湪銆佸鎵归�氳繃銆佸凡涓婁紶鍙戠エ闄勪欢銆佷笌鎵�閫夊悎鍚屼竴鑷�
*/
private void validateInvoiceForReceivable(CrmReceivableSaveReqVO reqVO) {
- // 鏈叧鑱斿紑绁ㄦ椂鐩存帴璺宠繃锛堝厑璁稿厛鍥炴鍚庡紑绁級
+ // 鍥炴蹇呴』鍏堝叧鑱斿凡瀹℃壒涓斿凡褰曞叆鐨勫紑绁ㄥ崟銆�
if (reqVO.getInvoiceId() == null) {
- return;
+ throw new ServiceException(RECEIVABLE_CREATE_FAIL_INVOICE_NOT_EXISTS.getCode(),
+ "鍥炴蹇呴』鍏堝叧鑱斿紑绁ㄥ崟銆傝鍏堝畬鎴愬紑绁ㄧ敵璇枫�佸鎵瑰拰鍙戠エ褰曞叆锛屽啀鍒涘缓鍥炴銆�");
}
// 1. 鏍¢獙寮�绁ㄥ瓨鍦�
CrmInvoiceDO invoice = invoiceService.getInvoice(reqVO.getInvoiceId());
@@ -278,6 +295,10 @@
// 2. 鏍¢獙寮�绁ㄥ鎵归�氳繃
if (ObjectUtil.notEqual(invoice.getAuditStatus(), CrmAuditStatusEnum.APPROVE.getStatus())) {
throw exception(RECEIVABLE_CREATE_FAIL_INVOICE_NOT_APPROVE);
+ }
+ if (!Objects.equals(invoice.getEntryStatus(), 10)) {
+ throw new ServiceException(RECEIVABLE_CREATE_FAIL_INVOICE_NOT_APPROVE.getCode(),
+ "鍏宠仈寮�绁ㄥ崟灏氭湭褰曞叆鍙戠エ銆傝鍏堝~鍐欏彂绁ㄥ彿鐮併�佹棩鏈熷苟涓婁紶闄勪欢锛屽啀鍒涘缓鍥炴銆�");
}
// 3. 鏍¢獙寮�绁ㄥ凡涓婁紶鍙戠エ闄勪欢
if (CollUtil.isEmpty(storageAttachmentApi.listAttachments(
@@ -365,9 +386,11 @@
// 1.5 鏍¢獙鍙洖娆鹃噾棰濅笉瓒呰繃璇ュ紑绁ㄥ墿浣欏彲鍥炴閲戦
validateReceivablePriceExceedsInvoiceRemaining(updateReqVO);
- // 1.6 鍙湁鏈鏍革紝鍙互缂栬緫锛�
- if (ObjectUtil.notEqual(oldReceivable.getAuditStatus(), CrmAuditStatusEnum.PROCESS.getStatus())) {
- throw exception(RECEIVABLE_UPDATE_FAIL_EDITING_PROHIBITED);
+ // 1.6 浠呮湭鎻愪氦銆佸鏍镐笉閫氳繃鍙互缂栬緫锛涘鎵逛腑绛夊緟 BPM锛屽鏍搁�氳繃闇�鍏堝弽瀹℃牳
+ if (ObjectUtil.notEqual(oldReceivable.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus())
+ && ObjectUtil.notEqual(oldReceivable.getAuditStatus(), CrmAuditStatusEnum.REJECT.getStatus())) {
+ throw exception(RECEIVABLE_UPDATE_FAIL_EDITING_PROHIBITED,
+ StrUtil.blankToDefault(CrmAuditStatusEnum.getNameByStatus(oldReceivable.getAuditStatus()), "鏈煡鐘舵��"));
}
// 2. 鏇存柊鍥炴
@@ -396,30 +419,150 @@
@Override
@Transactional(rollbackFor = Exception.class)
+ @LogRecord(type = CRM_RECEIVABLE_TYPE, subType = CRM_RECEIVABLE_SUBMIT_SUB_TYPE, bizNo = "{{#id}}",
+ success = CRM_RECEIVABLE_SUBMIT_SUCCESS)
+ public void submitReceivable(Long id, String remark, Long userId) {
+ // 1.1 鏍¢獙鍥炴瀛樺湪
+ CrmReceivableDO receivable = validateReceivableExists(id);
+ // 1.2 浠呮湭鎻愪氦銆佸鏍镐笉閫氳繃鍙互鎻愪氦瀹℃壒
+ if (ObjectUtil.notEqual(receivable.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus())
+ && ObjectUtil.notEqual(receivable.getAuditStatus(), CrmAuditStatusEnum.REJECT.getStatus())) {
+ throw exception(RECEIVABLE_SUBMIT_FAIL_NOT_DRAFT,
+ StrUtil.blankToDefault(CrmAuditStatusEnum.getNameByStatus(receivable.getAuditStatus()), "鏈煡鐘舵��"));
+ }
+
+ // 1.3 鎻愪氦鍓嶉噸鏂版牎楠屽紑绁ㄣ�佸悎鍚�/寮�绁ㄥ墿浣欏彲鍥炴閲戦锛岄伩鍏嶈崏绋挎湡闂撮搴﹁鍏朵粬鍗曟嵁鍗犵敤
+ CrmReceivableSaveReqVO submitReqVO = new CrmReceivableSaveReqVO()
+ .setId(receivable.getId()).setCustomerId(receivable.getCustomerId())
+ .setContractId(receivable.getContractId()).setInvoiceId(receivable.getInvoiceId())
+ .setPrice(receivable.getPrice());
+ validateInvoiceForReceivable(submitReqVO);
+ validateReceivablePriceExceedsLimit(submitReqVO);
+ validateReceivablePriceExceedsInvoiceRemaining(submitReqVO);
+
+ // 2. 鍏ㄥ眬鍏嶅鎵癸細涓氬姟鏍¢獙閫氳繃鍚庣洿鎺ユ墽琛屽鎵归�氳繃閫昏緫锛屾棤闇�娴佺▼妯″瀷
+ if (bpmProcessInstanceApi.isGlobalAutoApprove()) {
+ receivableMapper.updateById(new CrmReceivableDO().setId(id).setProcessInstanceId("")
+ .setAuditStatus(CrmAuditStatusEnum.PROCESS.getStatus()));
+ updateReceivableAuditStatus(id, BpmProcessInstanceStatusEnum.APPROVE.getStatus());
+ LogRecordContext.putVariable("receivableNo", receivable.getNo());
+ return;
+ }
+
+ // 3. 鍒涘缓 BPM 鍥炴瀹℃壒娴佺▼瀹炰緥
+ Map<String, Object> variables = new HashMap<>();
+ if (StrUtil.isNotBlank(remark)) {
+ variables.put("submitRemark", remark);
+ }
+ String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId,
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(BPM_PROCESS_DEFINITION_KEY)
+ .setBusinessKey(String.valueOf(id))
+ .setVariables(variables.isEmpty() ? null : variables));
+
+ // 4. 鏇存柊宸ヤ綔娴佺紪鍙� + 瀹℃壒鐘舵��
+ receivableMapper.updateById(new CrmReceivableDO().setId(id)
+ .setProcessInstanceId(processInstanceId)
+ .setAuditStatus(CrmAuditStatusEnum.PROCESS.getStatus()));
+
+ // 5. 璁板綍鎿嶄綔鏃ュ織涓婁笅鏂�
+ LogRecordContext.putVariable("receivableNo", receivable.getNo());
+ LogRecordContext.putVariable("submitRemark", remark);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateReceivableAuditStatus(Long id, Integer bpmResult) {
+ // 1.1 鏍¢獙瀛樺湪锛氬洖娆惧彲鑳藉湪瀹℃壒鏈熼棿琚垹闄わ紝姝ゆ椂闈欓粯蹇界暐锛岄伩鍏嶅奖鍝� BPM 娴佺▼瀹屾垚
+ CrmReceivableDO receivable = receivableMapper.selectById(id);
+ if (receivable == null) {
+ log.warn("[updateReceivableAuditStatus][鍥炴({}) 涓嶅瓨鍦紝蹇界暐 BPM 瀹℃壒缁撴灉({})]", id, bpmResult);
+ return;
+ }
+ // 1.2 鍙湁瀹℃壒涓墠澶勭悊锛氶伩鍏嶆祦绋嬩簨浠堕噸澶嶆姇閫掋�佹垨浜哄伐鍙嶅鏍稿悗杩熷埌鐨勬祦绋嬩簨浠跺鑷撮噸澶嶅洖鍐�
+ if (ObjectUtil.notEqual(receivable.getAuditStatus(), CrmAuditStatusEnum.PROCESS.getStatus())) {
+ log.warn("[updateReceivableAuditStatus][鍥炴({}) 褰撳墠鐘舵��({}) 涓嶆槸瀹℃壒涓紝蹇界暐 BPM 瀹℃壒缁撴灉({})]",
+ id, receivable.getAuditStatus(), bpmResult);
+ return;
+ }
+
+ // 2. 杞崲 BPM 瀹℃壒缁撴灉锛堜笉澶嶇敤 CrmAuditStatusUtils锛氬叾 CANCEL 鍒嗘敮璇繑鍥� BPM 鐘舵�� 4锛岃�岄潪 CRM 鐘舵�� 40锛�
+ Integer auditStatus;
+ if (BpmProcessInstanceStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
+ auditStatus = CrmAuditStatusEnum.APPROVE.getStatus();
+ } else if (BpmProcessInstanceStatusEnum.REJECT.getStatus().equals(bpmResult)) {
+ auditStatus = CrmAuditStatusEnum.REJECT.getStatus();
+ } else if (BpmProcessInstanceStatusEnum.CANCEL.getStatus().equals(bpmResult)) {
+ auditStatus = CrmAuditStatusEnum.CANCEL.getStatus();
+ } else {
+ log.warn("[updateReceivableAuditStatus][鍥炴({}) 鐨� BPM 瀹℃壒缁撴灉({}) 涓嶆槸缁堟�侊紝蹇界暐]", id, bpmResult);
+ return;
+ }
+
+ // 3. 鏉′欢鏇存柊锛岀‘淇濆苟鍙�/閲嶅浜嬩欢鍙湁涓�娆$敓鏁�
+ int updateCount = receivableMapper.updateByIdAndStatus(id, CrmAuditStatusEnum.PROCESS.getStatus(),
+ new CrmReceivableDO().setAuditStatus(auditStatus));
+ if (updateCount == 0) {
+ log.warn("[updateReceivableAuditStatus][鍥炴({}) 鐘舵�佸凡琚叾浠栨搷浣滃彉鏇达紝蹇界暐 BPM 瀹℃壒缁撴灉({})]", id, bpmResult);
+ return;
+ }
+
+ // 4. 浠呭鎵归�氳繃鏃跺洖鍐欏洖娆捐鍒掞紱椹冲洖銆佸彇娑堜笉鍥炲啓閲戦
+ if (ObjectUtil.equal(auditStatus, CrmAuditStatusEnum.APPROVE.getStatus())) {
+ syncReceivablePlanReceipted(receivable, true);
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
public void updateReceivableStatus(Long id, Integer status) {
boolean approve = CrmAuditStatusEnum.APPROVE.getStatus().equals(status);
// 1.1 鏍¢獙瀛樺湪
CrmReceivableDO receivable = validateReceivableExists(id);
- // 1.2 鏍¢獙鐘舵��
+ // 1.2 宸叉彁浜� BPM 鍗忓悓瀹℃壒鐨勫洖娆撅紝瀹℃壒缁撴灉鐢辨祦绋嬬洃鍚櫒椹卞姩锛岀姝㈡墜宸ュ鏍革紝閬垮厤閲戦鍙岄噸鍥炲啓
+ if (StrUtil.isNotBlank(receivable.getProcessInstanceId())) {
+ if (approve) {
+ throw exception(RECEIVABLE_MANUAL_AUDIT_FAIL_BPM_PROCESSING, receivable.getProcessInstanceId());
+ }
+ // 瀹℃壒涓笉鑳藉弽瀹℃牳锛屽惁鍒欎細瑙i櫎娴佺▼鍏宠仈锛屽鑷存祦绋嬪畬鎴愬悗鏃犳硶鍥炲啓锛涘鎵归�氳繃鍚庣殑鍙嶅鏍镐粛淇濈暀
+ if (ObjectUtil.equal(receivable.getAuditStatus(), CrmAuditStatusEnum.PROCESS.getStatus())) {
+ throw exception(RECEIVABLE_MANUAL_REVERSE_FAIL_BPM_PROCESSING, receivable.getProcessInstanceId());
+ }
+ }
+ // 1.3 鏍¢獙鐘舵��
if (receivable.getAuditStatus().equals(status)) {
throw exception(approve ? RECEIVABLE_APPROVE_FAIL : RECEIVABLE_PROCESS_FAIL);
}
- // 2. 鏇存柊鐘舵��
- int updateCount = receivableMapper.updateByIdAndStatus(id, receivable.getAuditStatus(),
- new CrmReceivableDO().setAuditStatus(status));
+ // 2. 鏇存柊鐘舵�侊紱鍙嶅鏍告椂瑙i櫎 BPM 鍏宠仈锛屽洖褰掓墜宸ュ鏍稿吋瀹规祦绋�
+ CrmReceivableDO updateObj = new CrmReceivableDO().setAuditStatus(status);
+ if (!approve) {
+ updateObj.setProcessInstanceId("");
+ }
+ int updateCount = receivableMapper.updateByIdAndStatus(id, receivable.getAuditStatus(), updateObj);
if (updateCount == 0) {
throw exception(approve ? RECEIVABLE_APPROVE_FAIL : RECEIVABLE_PROCESS_FAIL);
}
// 3. 鍥炴璁″垝鍥炲啓瀹為檯鍥炴閲戦涓庣姸鎬�
- if (receivable.getPlanId() != null) {
- if (approve) {
- receivablePlanService.updateReceivablePlanReceipted(receivable.getPlanId(),
- receivable.getPrice(), receivable.getReturnTime());
- } else {
- receivablePlanService.resetReceivablePlanReceipted(receivable.getPlanId());
- }
+ syncReceivablePlanReceipted(receivable, approve);
+ }
+
+ /**
+ * 鍚屾鍥炴璁″垝鐨勫凡鍥炴閲戦涓庣姸鎬�
+ *
+ * @param receivable 鍥炴鍗�
+ * @param approve 鏄惁瀹℃壒閫氳繃锛歵rue 鍥炲啓宸插洖娆撅紱false 閲嶇疆宸插洖娆�
+ */
+ private void syncReceivablePlanReceipted(CrmReceivableDO receivable, boolean approve) {
+ if (receivable.getPlanId() == null) {
+ return;
+ }
+ if (approve) {
+ receivablePlanService.updateReceivablePlanReceipted(receivable.getPlanId(),
+ receivable.getPrice(), receivable.getReturnTime());
+ } else {
+ receivablePlanService.resetReceivablePlanReceipted(receivable.getPlanId());
}
}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/listener/CrmReceivableStatusListener.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/listener/CrmReceivableStatusListener.java
new file mode 100644
index 0000000..a1361f7
--- /dev/null
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/listener/CrmReceivableStatusListener.java
@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.crm.service.receivable.listener;
+
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
+import cn.iocoder.yudao.module.crm.service.receivable.CrmReceivableService;
+import cn.iocoder.yudao.module.crm.service.receivable.CrmReceivableServiceImpl;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * 鍥炴瀹℃壒缁撴灉鐩戝惉鍣�
+ *
+ * 娴佺▼瀹℃壒閫氳繃锛氬洖娆剧姸鎬佹洿鏂颁负瀹℃牳閫氳繃锛屽苟鍥炲啓鍥炴璁″垝宸插洖娆鹃噾棰濓紱
+ * 娴佺▼椹冲洖/鍙栨秷锛氫粎鏇存柊鍥炴鐘舵�侊紝涓嶅洖鍐欓噾棰濄��
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Component
+@Slf4j
+public class CrmReceivableStatusListener extends BpmProcessInstanceStatusEventListener {
+
+ @Resource
+ private CrmReceivableService receivableService;
+
+ @Override
+ protected String getProcessDefinitionKey() {
+ return CrmReceivableServiceImpl.BPM_PROCESS_DEFINITION_KEY;
+ }
+
+ @Override
+ protected void onEvent(BpmProcessInstanceStatusEvent event) {
+ Long receivableId;
+ try {
+ receivableId = Long.parseLong(event.getBusinessKey());
+ } catch (NumberFormatException | NullPointerException ex) {
+ log.warn("[onEvent][鍥炴瀹℃壒浜嬩欢鐨� businessKey({}) 涓嶆槸鍥炴缂栧彿锛屽拷鐣", event.getBusinessKey());
+ return;
+ }
+ receivableService.updateReceivableAuditStatus(receivableId, event.getStatus());
+ }
+
+}
diff --git a/yudao-module-crm/src/main/resources/templates/quotation/sale-quotation.docx b/yudao-module-crm/src/main/resources/templates/quotation/sale-quotation.docx
new file mode 100644
index 0000000..57406a8
--- /dev/null
+++ b/yudao-module-crm/src/main/resources/templates/quotation/sale-quotation.docx
Binary files differ
diff --git a/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/dto/ErpPurchaseOrderCreateReqDTO.java b/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/dto/ErpPurchaseOrderCreateReqDTO.java
index 7f3460d..e37c8e6 100644
--- a/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/dto/ErpPurchaseOrderCreateReqDTO.java
+++ b/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/dto/ErpPurchaseOrderCreateReqDTO.java
@@ -20,6 +20,9 @@
@Schema(description = "涓嬪崟鏃堕棿")
private LocalDateTime orderTime;
+ @Schema(description = "浠樻鏃ユ湡")
+ private LocalDateTime paymentDate;
+
@Schema(description = "浼樻儬鐜囷紝鐧惧垎姣�", example = "10")
private BigDecimal discountPercent;
diff --git a/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/sale/dto/ErpSaleOrderRespDTO.java b/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/sale/dto/ErpSaleOrderRespDTO.java
index f5265fd..65092f6 100644
--- a/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/sale/dto/ErpSaleOrderRespDTO.java
+++ b/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/sale/dto/ErpSaleOrderRespDTO.java
@@ -28,6 +28,9 @@
@Schema(description = "璁㈠崟鐘舵��", example = "0")
private Integer status;
+ @Schema(description = "涓嬪崟鏃堕棿")
+ private java.time.LocalDateTime orderTime;
+
@Schema(description = "鍚堣閲戦锛屽崟浣嶏細鍏�", example = "1000")
private java.math.BigDecimal totalPrice;
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseOrderApiImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseOrderApiImpl.java
index 77e1ffd..c7a0d9d 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseOrderApiImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseOrderApiImpl.java
@@ -21,6 +21,8 @@
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.PURCHASE_ORDER_ITEM_RETURN_FAIL_IN_EXCEED;
/**
* ERP 閲囪喘璁㈠崟 API 瀹炵幇绫�
@@ -115,6 +117,11 @@
// 绱姞閫�璐ф暟閲�
BigDecimal oldReturnCount = item.getReturnCount() != null ? item.getReturnCount() : BigDecimal.ZERO;
BigDecimal newReturnCount = oldReturnCount.add(returnCount);
+ BigDecimal inCount = item.getInCount() != null ? item.getInCount() : BigDecimal.ZERO;
+ if (returnCount.compareTo(BigDecimal.ZERO) <= 0 || newReturnCount.compareTo(inCount) > 0) {
+ throw exception(PURCHASE_ORDER_ITEM_RETURN_FAIL_IN_EXCEED,
+ "浜у搧ID:" + item.getProductId(), inCount);
+ }
purchaseOrderItemMapper.updateById(new ErpPurchaseOrderItemDO()
.setId(orderItemId)
.setReturnCount(newReturnCount));
@@ -171,4 +178,4 @@
return success(BeanUtils.toBean(items, ErpPurchaseOrderItemRespDTO.class));
}
-}
\ No newline at end of file
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
index d42cea3..0d46bef 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.erp.controller.admin.sale;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -24,6 +25,7 @@
import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
import cn.iocoder.yudao.module.mes.api.mps.MesProMpsApi;
+import cn.iocoder.yudao.module.mes.api.mps.dto.MesProMpsRespDTO;
import cn.iocoder.yudao.module.mes.api.productsales.MesWmProductSalesLineApi;
import cn.iocoder.yudao.module.mes.api.salesnotice.MesWmSalesNoticeApi;
import cn.iocoder.yudao.module.mes.api.wms.MesWmStockApi;
@@ -169,6 +171,7 @@
convertSet(saleOrderItemList, ErpSaleOrderItemDO::getId));
Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureMap(
convertSet(saleOrderItemList, ErpSaleOrderItemDO::getProductUnitId));
+ Map<Long, MesProMpsRespDTO> mpsMap = getMpsMap(saleOrderItemList);
// 3. 杞崲璁㈠崟椤�
List<ErpSaleOrderRespVO.Item> itemVOList = BeanUtils.toBean(saleOrderItemList, ErpSaleOrderRespVO.Item.class, item -> {
fillItemPrice(item);
@@ -176,13 +179,22 @@
item.setBatchCode(batchCodeMap.get(item.getId()));
MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem ->
item.setProductName(mdmItem.getName()).setProductBarCode(mdmItem.getBarCode())
+ .setProductCode(mdmItem.getCode())
.setProductSpecification(mdmItem.getSpecification()));
MapUtils.findAndThen(unitMeasureMap, item.getProductUnitId(), unit ->
item.setProductUnitName(unit.getName()));
+ MesProMpsRespDTO mps = mpsMap.get(item.getId());
+ if (mps != null) {
+ item.setQuantityProduced(mps.getQuantityProduced());
+ }
});
// 4. 缁勮鍝嶅簲
ErpSaleOrderRespVO saleOrderVO = BeanUtils.toBean(saleOrder, ErpSaleOrderRespVO.class);
saleOrderVO.setItems(itemVOList);
+ saleOrderVO.setProductCodes(CollUtil.join(itemVOList, "锛�", ErpSaleOrderRespVO.Item::getProductCode));
+ saleOrderVO.setProducedCount(itemVOList.stream()
+ .map(item -> ObjectUtil.defaultIfNull(item.getQuantityProduced(), BigDecimal.ZERO))
+ .reduce(BigDecimal.ZERO, BigDecimal::add));
saleOrderVO.setNeedProduction(itemVOList.stream()
.anyMatch(item -> Integer.valueOf(1).equals(item.getNeedProduction())) ? 1 : 0);
if (saleOrder.getCustomerId() != null) {
@@ -266,6 +278,7 @@
// 1.7 璁¢噺鍗曚綅
Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureMap(
convertSet(saleOrderItemList, ErpSaleOrderItemDO::getProductUnitId));
+ Map<Long, MesProMpsRespDTO> mpsMap = getMpsMap(saleOrderItemList);
// 1.8 妫�鏌ユ槸鍚﹀彲浠ョ敓鎴愬彂璐ч�氱煡鍗曪紙闇�瑕佺敓浜х殑鏄庣粏瀵瑰簲鐨� MPS 鏄惁宸插畬鎴愶級
// 绛涢�夊嚭闇�瑕佺敓浜х殑鏄庣粏ID
List<Long> needProductionItemIds = saleOrderItemList.stream()
@@ -310,11 +323,20 @@
item.setBatchCode(batchCodeMap.get(item.getId()));
MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem ->
item.setProductName(mdmItem.getName()).setProductBarCode(mdmItem.getBarCode())
+ .setProductCode(mdmItem.getCode())
.setProductSpecification(mdmItem.getSpecification()));
MapUtils.findAndThen(unitMeasureMap, item.getProductUnitId(), unit ->
item.setProductUnitName(unit.getName()));
+ MesProMpsRespDTO mps = mpsMap.get(item.getId());
+ if (mps != null) {
+ item.setQuantityProduced(mps.getQuantityProduced());
+ }
}));
saleOrder.setProductNames(CollUtil.join(saleOrder.getItems(), "锛�", ErpSaleOrderRespVO.Item::getProductName));
+ saleOrder.setProductCodes(CollUtil.join(saleOrder.getItems(), "锛�", ErpSaleOrderRespVO.Item::getProductCode));
+ saleOrder.setProducedCount(saleOrder.getItems().stream()
+ .map(item -> ObjectUtil.defaultIfNull(item.getQuantityProduced(), BigDecimal.ZERO))
+ .reduce(BigDecimal.ZERO, BigDecimal::add));
MapUtils.findAndThen(customerMap, saleOrder.getCustomerId(), supplier -> saleOrder.setCustomerName(supplier.getName()));
MapUtils.findAndThen(userMap, Long.parseLong(saleOrder.getCreator()), user -> saleOrder.setCreatorName(user.getNickname()));
// 璁剧疆鏄惁宸茬敓鎴愬彂璐ч�氱煡鍗�
@@ -328,6 +350,20 @@
});
}
+ private Map<Long, MesProMpsRespDTO> getMpsMap(List<ErpSaleOrderItemDO> items) {
+ if (CollUtil.isEmpty(items)) {
+ return java.util.Collections.emptyMap();
+ }
+ List<MesProMpsRespDTO> mpsList = mpsApi.getMpsListBySaleOrderItemIds(
+ items.stream().map(ErpSaleOrderItemDO::getId).toList());
+ if (CollUtil.isEmpty(mpsList)) {
+ return java.util.Collections.emptyMap();
+ }
+ return mpsList.stream().filter(mps -> mps.getSaleOrderItemId() != null)
+ .collect(java.util.stream.Collectors.toMap(MesProMpsRespDTO::getSaleOrderItemId,
+ mps -> mps, (a, b) -> a));
+ }
+
/**
* 濉厖璁㈠崟椤圭殑閲戦瀛楁
*
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderPageReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderPageReqVO.java
index ddaefc8..c1df63f 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderPageReqVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderPageReqVO.java
@@ -23,6 +23,12 @@
@Schema(description = "瀹㈡埛缂栧彿", example = "1724")
private Long customerId;
+ @Schema(description = "鍚堝悓鍙�", example = "HT001")
+ private String contractNo;
+
+ @Schema(description = "閿�鍞被鍨嬶細1鍐呴攢 2澶栭攢 3鏍峰搧 4鍏朵粬", example = "1")
+ private Integer saleType;
+
@Schema(description = "涓嬪崟鏃堕棿")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] orderTime;
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java
index 6d761a9..ca6b241 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java
@@ -40,6 +40,11 @@
@ExcelProperty("鍚堝悓鍗曞彿")
private String contractNo;
+ @Schema(description = "閿�鍞被鍨嬶細1鍐呴攢 2澶栭攢 3鏍峰搧 4鍏朵粬", example = "1")
+ @ExcelProperty(value = "閿�鍞被鍨�", converter = cn.iocoder.yudao.framework.excel.core.convert.DictConvert.class)
+ @cn.iocoder.yudao.framework.excel.core.annotations.DictFormat(cn.iocoder.yudao.module.erp.enums.DictTypeConstants.SALES_TYPE)
+ private Integer saleType;
+
@Schema(description = "缁撶畻璐︽埛缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "311.89")
@ExcelProperty("缁撶畻璐︽埛缂栧彿")
private Long accountId;
@@ -102,6 +107,14 @@
@Schema(description = "浜у搧淇℃伅", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("浜у搧淇℃伅")
private String productNames;
+
+ @Schema(description = "浜у搧缂栧彿锛堣鍗曢」鐗╂枡缂栫爜锛屽琛屼互閫楀彿鍒嗛殧锛�", example = "ITEM001,ITEM002")
+ @ExcelProperty("浜у搧缂栧彿")
+ private String productCodes;
+
+ @Schema(description = "宸茬敓浜ф暟閲忥紙鎸夎鍗曢」鍏宠仈鐨� MPS 宸茬敓浜ф暟閲忓悎璁★級", example = "100.00")
+ @ExcelProperty("鐢熶骇鏁伴噺")
+ private BigDecimal producedCount;
// ========== 閿�鍞嚭搴� ==========
@@ -189,6 +202,10 @@
@Schema(description = "浜у搧鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "宸у厠鍔�")
private String productName;
+ @Schema(description = "浜у搧缂栧彿锛堢墿鏂欑紪鐮侊級", example = "ITEM001")
+ private String productCode;
+ @Schema(description = "宸茬敓浜ф暟閲�", example = "60.00")
+ private BigDecimal quantityProduced;
@Schema(description = "浜у搧鏉$爜", requiredMode = Schema.RequiredMode.REQUIRED, example = "A9985")
private String productBarCode;
@Schema(description = "浜у搧鍗曚綅鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "鐩�")
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderSaveReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderSaveReqVO.java
index 62f3769..e068f34 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderSaveReqVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderSaveReqVO.java
@@ -23,9 +23,13 @@
@Schema(description = "鍏宠仈鍚堝悓缂栧彿", example = "1")
private Long contractId;
- @Schema(description = "鍚堝悓鍗曞彿", example = "HT001")
+ @Schema(description = "鍚堝悓鍗曞彿锛堝彲鎵嬪伐濉啓锛屽叧鑱斿悎鍚屾椂鑷姩甯﹀嚭锛�", example = "HT001")
+ @Size(max = 64, message = "鍚堝悓鍙蜂笉鑳借秴杩�64涓瓧绗�")
private String contractNo;
+ @Schema(description = "閿�鍞被鍨嬶細1鍐呴攢 2澶栭攢 3鏍峰搧 4鍏朵粬", example = "1")
+ private Integer saleType;
+
@Schema(description = "涓嬪崟鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "涓嬪崟鏃堕棿涓嶈兘涓虹┖")
private LocalDateTime orderTime;
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java
index b5ba20e..49251bd 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java
@@ -54,6 +54,13 @@
* CRM 鍚堝悓鍗曞彿
*/
private String contractNo;
+
+ /**
+ * 閿�鍞被鍨�
+ *
+ * 鏋氫妇 {@link cn.iocoder.yudao.module.erp.enums.ErpSaleTypeEnum}
+ */
+ private Integer saleType;
/**
* 缁撶畻璐︽埛缂栧彿
*
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentMapper.java
index 84657d2..a8781d5 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentMapper.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentMapper.java
@@ -73,14 +73,20 @@
* @return key 涓烘潵绁ㄧ紪鍙凤紝value 涓哄凡浠樻閲戦
*/
default Map<Long, BigDecimal> selectPaymentPriceMapByInvoiceId(Collection<Long> invoiceIds) {
+ return selectPaymentPriceMapByInvoiceIdAndStatus(invoiceIds, List.of(
+ ErpAuditStatus.PROCESS.getStatus(), ErpAuditStatus.APPROVING.getStatus(),
+ ErpAuditStatus.APPROVE.getStatus()));
+ }
+
+ default Map<Long, BigDecimal> selectPaymentPriceMapByInvoiceIdAndStatus(
+ Collection<Long> invoiceIds, Collection<Integer> statuses) {
if (CollUtil.isEmpty(invoiceIds)) {
return Collections.emptyMap();
}
// SQL sum 鏌ヨ
List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpFinancePaymentDO>()
.select("invoice_id, SUM(payment_price) AS total_payment_price")
- .in("status", ErpAuditStatus.PROCESS.getStatus(), // 鏈鏍� + 瀹℃壒涓� + 宸插鏍�
- ErpAuditStatus.APPROVING.getStatus(), ErpAuditStatus.APPROVE.getStatus())
+ .in("status", statuses)
.groupBy("invoice_id")
.in("invoice_id", invoiceIds));
// 鑾峰緱閲戦
@@ -115,4 +121,4 @@
.inIfPresent(ErpFinancePaymentDO::getStatus, statuses));
}
-}
\ No newline at end of file
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java
index 899b7e6..b4ff85a 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java
@@ -25,6 +25,8 @@
MPJLambdaWrapperX<ErpSaleOrderDO> query = new MPJLambdaWrapperX<ErpSaleOrderDO>()
.likeIfPresent(ErpSaleOrderDO::getNo, reqVO.getNo())
.eqIfPresent(ErpSaleOrderDO::getCustomerId, reqVO.getCustomerId())
+ .likeIfPresent(ErpSaleOrderDO::getContractNo, reqVO.getContractNo())
+ .eqIfPresent(ErpSaleOrderDO::getSaleType, reqVO.getSaleType())
.betweenIfPresent(ErpSaleOrderDO::getOrderTime, reqVO.getOrderTime())
.betweenIfPresent(ErpSaleOrderDO::getReceiptDate, reqVO.getReceiptDate())
.eqIfPresent(ErpSaleOrderDO::getStatus, reqVO.getStatus())
@@ -49,6 +51,8 @@
MPJLambdaWrapperX<ErpSaleOrderDO> query = new MPJLambdaWrapperX<ErpSaleOrderDO>()
.likeIfPresent(ErpSaleOrderDO::getNo, reqVO.getNo())
.eqIfPresent(ErpSaleOrderDO::getCustomerId, reqVO.getCustomerId())
+ .likeIfPresent(ErpSaleOrderDO::getContractNo, reqVO.getContractNo())
+ .eqIfPresent(ErpSaleOrderDO::getSaleType, reqVO.getSaleType())
.betweenIfPresent(ErpSaleOrderDO::getOrderTime, reqVO.getOrderTime())
.betweenIfPresent(ErpSaleOrderDO::getReceiptDate, reqVO.getReceiptDate())
.eqIfPresent(ErpSaleOrderDO::getStatus, reqVO.getStatus())
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/DictTypeConstants.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/DictTypeConstants.java
index c55a735..0ab01fc 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/DictTypeConstants.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/DictTypeConstants.java
@@ -11,5 +11,6 @@
String STOCK_RECORD_BIZ_TYPE = "erp_stock_record_biz_type"; // 搴撳瓨鏄庣粏鐨勪笟鍔$被鍨�
String PURCHASE_TYPE = "erp_purchase_type"; // 閲囪喘鍙拌处鐨勯噰璐被鍨�
String PAYMENT_METHOD = "erp_payment_method"; // 閲囪喘鍙拌处鐨勪粯娆炬柟寮�
+ String SALES_TYPE = "erp_sale_type"; // 閿�鍞彴璐︾殑閿�鍞被鍨�
}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpSaleTypeEnum.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpSaleTypeEnum.java
new file mode 100644
index 0000000..5625607
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpSaleTypeEnum.java
@@ -0,0 +1,51 @@
+package cn.iocoder.yudao.module.erp.enums;
+
+import cn.iocoder.yudao.framework.common.core.ArrayValuable;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Arrays;
+import java.util.Objects;
+
+/**
+ * ERP 閿�鍞被鍨嬫灇涓撅紙閿�鍞彴璐︼級
+ *
+ * 瀛楀吀 {@link DictTypeConstants#SALES_TYPE}
+ */
+@RequiredArgsConstructor
+@Getter
+public enum ErpSaleTypeEnum implements ArrayValuable<Integer> {
+
+ DOMESTIC(1, "鍐呴攢"),
+ EXPORT(2, "澶栭攢"),
+ SAMPLE(3, "鏍峰搧"),
+ OTHER(4, "鍏朵粬");
+
+ public static final Integer[] ARRAYS = Arrays.stream(values())
+ .map(ErpSaleTypeEnum::getType).toArray(Integer[]::new);
+
+ /**
+ * 绫诲瀷鍊�
+ */
+ private final Integer type;
+ /**
+ * 绫诲瀷鍚�
+ */
+ private final String name;
+
+ @Override
+ public Integer[] array() {
+ return ARRAYS;
+ }
+
+ /**
+ * 鍒ゆ柇绫诲瀷鍊兼槸鍚﹀悎娉曪紙涓虹┖瑙嗕负鏈�夋嫨锛屽悎娉曪級
+ */
+ public static boolean isValid(Integer type) {
+ if (type == null) {
+ return true;
+ }
+ return Arrays.stream(values()).anyMatch(item -> Objects.equals(item.getType(), type));
+ }
+
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
index e44f218..047c2bd 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
@@ -110,6 +110,7 @@
ErrorCode SALE_ORDER_SUBMIT_FAIL_ITEM_EMPTY = new ErrorCode(1_020_201_018, "鎻愪氦瀹℃壒澶辫触锛岄攢鍞鍗�({})娌℃湁璁㈠崟鏄庣粏锛屾棤娉曟彁浜�");
ErrorCode SALE_ORDER_BPM_CATEGORY_NOT_EXISTS = new ErrorCode(1_020_201_019, "閿�鍞鍗曞鏍稿垎绫讳笉瀛樺湪锛岃鍏堝湪BPM妯″潡鍒涘缓閿�鍞鍗曞鏍告祦绋嬪垎绫�");
ErrorCode SALE_ORDER_BPM_PROCESS_DEFINITION_NOT_EXISTS = new ErrorCode(1_020_201_020, "閿�鍞鍗曞鏍稿垎绫讳笅娌℃湁鍙敤鐨勬祦绋嬫ā鍨嬶紝璇峰厛鍒涘缓骞跺彂甯冩祦绋�");
+ ErrorCode SALE_ORDER_SALE_TYPE_INVALID = new ErrorCode(1_020_201_021, "閿�鍞被鍨�({})涓嶅悎娉曪紝鍙兘閫夋嫨锛�1鍐呴攢銆�2澶栭攢銆�3鏍峰搧銆�4鍏朵粬");
// ========== ERP 閿�鍞嚭搴擄紙1-030-202-000锛� ==========
ErrorCode SALE_OUT_NOT_EXISTS = new ErrorCode(1_020_202_000, "閿�鍞嚭搴撳崟涓嶅瓨鍦�");
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceServiceImpl.java
index 8df0874..f8761cd 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceServiceImpl.java
@@ -121,7 +121,8 @@
*/
private void validateItemReceipt(ErpPurchaseInvoiceSaveReqVO reqVO, ErpPurchaseOrderDO purchaseOrder) {
if (reqVO.getItemReceiptId() == null) {
- return; // 瀛橀噺/鏈粦瀹氭椂鍏佽涓虹┖
+ throw new ServiceException(PURCHASE_INVOICE_CREATE_FAIL_RECEIPT_NOT_EXISTS.getCode(),
+ "閲囪喘鏉ョエ蹇呴』缁戝畾宸插畬鎴愮殑閲囪喘鍏ュ簱鍗曘�傝鍏堝湪 MES 瀹屾垚鍏ュ簱锛屽啀閫夋嫨瀵瑰簲鍏ュ簱鍗曘��");
}
MesWmItemReceiptRespDTO receipt = mesWmItemReceiptApi.getItemReceipt(reqVO.getItemReceiptId());
if (receipt == null) {
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
index e1f91d4..b14e32a 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
@@ -145,6 +145,9 @@
ErpPurchaseOrderDO purchaseOrder = BeanUtils.toBean(createReqVO, ErpPurchaseOrderDO.class, in -> in
.setNo(no).setStatus(submit ? ErpAuditStatus.PROCESS.getStatus() : ErpAuditStatus.DRAFT.getStatus())
.setInCount(BigDecimal.ZERO).setInStatus(ErpPurchaseOrderInStatusEnum.NOT_IN.getStatus()));
+ if (purchaseOrder.getDepositPrice() == null) {
+ purchaseOrder.setDepositPrice(BigDecimal.ZERO);
+ }
calculateTotalPrice(purchaseOrder, purchaseOrderItems);
purchaseOrderMapper.insert(purchaseOrder);
// 2.2 鎻掑叆璁㈠崟椤�
@@ -184,6 +187,9 @@
// 2.1 鏇存柊璁㈠崟
ErpPurchaseOrderDO updateObj = BeanUtils.toBean(updateReqVO, ErpPurchaseOrderDO.class);
+ if (updateObj.getDepositPrice() == null) {
+ updateObj.setDepositPrice(BigDecimal.ZERO);
+ }
calculateTotalPrice(updateObj, purchaseOrderItems);
purchaseOrderMapper.updateById(updateObj);
// 2.2 鏇存柊璁㈠崟椤�
@@ -893,4 +899,4 @@
return arrivalNoticeId;
}
-}
\ No newline at end of file
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierStatementServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierStatementServiceImpl.java
index aa7350a..5066177 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierStatementServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierStatementServiceImpl.java
@@ -62,8 +62,7 @@
reqVO.getSupplierId(), reqVO.getBeginTime(), reqVO.getEndTime(), orderStatuses);
List<ErpPurchaseInvoiceDO> invoices = purchaseInvoiceMapper.selectListBySupplierIdAndInvoiceTimeBetween(
reqVO.getSupplierId(), reqVO.getBeginTime(), reqVO.getEndTime());
- List<Integer> paymentStatuses = List.of(ErpAuditStatus.PROCESS.getStatus(),
- ErpAuditStatus.APPROVING.getStatus(), ErpAuditStatus.APPROVE.getStatus());
+ List<Integer> paymentStatuses = List.of(ErpAuditStatus.APPROVE.getStatus());
List<ErpFinancePaymentDO> payments = financePaymentMapper.selectListBySupplierIdAndPaymentTimeBetween(
reqVO.getSupplierId(), reqVO.getBeginTime(), reqVO.getEndTime(), paymentStatuses);
@@ -71,10 +70,10 @@
Map<Long, BigDecimal> invoicedMap = CollUtil.isEmpty(orders) ? Collections.emptyMap()
: purchaseInvoiceService.getPurchaseInvoicePriceSumMapByOrderIds(
orders.stream().map(ErpPurchaseOrderDO::getId).toList());
- // 4. 鏉ョエ宸蹭粯閲戦锛堟寜鎵�鏈夋湁鏁堜粯娆惧崟姹囨�伙級
+ // 4. 鏉ョエ宸蹭粯閲戦浠呮寜宸插鏍镐粯娆惧崟姹囨�伙紱瀹℃壒涓椤逛粛鍗犻搴︼紝浣嗗皻鏈疄闄呬粯娆俱��
Map<Long, BigDecimal> paidMap = CollUtil.isEmpty(invoices) ? Collections.emptyMap()
- : financePaymentMapper.selectPaymentPriceMapByInvoiceId(
- invoices.stream().map(ErpPurchaseInvoiceDO::getId).toList());
+ : financePaymentMapper.selectPaymentPriceMapByInvoiceIdAndStatus(
+ invoices.stream().map(ErpPurchaseInvoiceDO::getId).toList(), paymentStatuses);
// 5. 鏉ョエ鍏宠仈璁㈠崟鍙�
Set<Long> invoiceOrderIds = invoices.stream().map(ErpPurchaseInvoiceDO::getPurchaseOrderId)
.filter(Objects::nonNull).collect(Collectors.toSet());
@@ -161,7 +160,7 @@
@Override
public List<ErpSupplierStatementSummaryRespVO> getSupplierSummaryList(ErpSupplierStatementSummaryReqVO reqVO) {
- // 1. 鍙e緞涓庡崟涓緵搴斿晢璇︽儏淇濇寔涓�鑷达細璁㈠崟鎸夊鏍哥姸鎬佽繃婊ゃ�佹潵绁ㄤ笉杩囨护鐘舵�併�佷粯娆惧惈鏈鏍�/瀹℃壒涓�/宸插鏍�
+ // 1. 鍙e緞涓庡崟涓緵搴斿晢璇︽儏淇濇寔涓�鑷达細璁㈠崟鎸夊鏍哥姸鎬佽繃婊ゃ�佹潵绁ㄤ笉杩囨护鐘舵�併�佷粯娆惧彧璁″凡瀹℃牳銆�
List<Integer> orderStatuses = Boolean.TRUE.equals(reqVO.getIncludeUnapprovedOrder())
? List.of(ErpAuditStatus.PROCESS.getStatus(), ErpAuditStatus.APPROVING.getStatus(),
ErpAuditStatus.APPROVE.getStatus())
@@ -170,8 +169,7 @@
reqVO.getBeginTime(), reqVO.getEndTime(), orderStatuses);
List<ErpPurchaseInvoiceDO> invoices = purchaseInvoiceMapper.selectListByInvoiceTimeBetween(
reqVO.getBeginTime(), reqVO.getEndTime());
- List<Integer> paymentStatuses = List.of(ErpAuditStatus.PROCESS.getStatus(),
- ErpAuditStatus.APPROVING.getStatus(), ErpAuditStatus.APPROVE.getStatus());
+ List<Integer> paymentStatuses = List.of(ErpAuditStatus.APPROVE.getStatus());
List<ErpFinancePaymentDO> payments = financePaymentMapper.selectListByPaymentTimeBetween(
reqVO.getBeginTime(), reqVO.getEndTime(), paymentStatuses);
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
index 05ece24..327209c 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
@@ -28,6 +28,7 @@
import cn.iocoder.yudao.module.erp.dal.mysql.sale.ErpSaleOrderMapper;
import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
+import cn.iocoder.yudao.module.erp.enums.ErpSaleTypeEnum;
import cn.iocoder.yudao.module.erp.api.sale.enums.ErpSaleOrderOutStatusEnum;
import cn.iocoder.yudao.module.erp.service.finance.ErpAccountService;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
@@ -127,6 +128,8 @@
List<ErpSaleOrderItemDO> saleOrderItems = validateSaleOrderItems(createReqVO.getItems());
// 1.2 鏍¢獙瀹㈡埛锛堜娇鐢� CRM 瀹㈡埛 API锛�
customerApi.validateCustomer(createReqVO.getCustomerId());
+ // 1.2.1 鏍¢獙閿�鍞被鍨�
+ validateSaleType(createReqVO.getSaleType());
// 1.3 鏍¢獙缁撶畻璐︽埛
if (createReqVO.getAccountId() != null) {
accountService.validateAccount(createReqVO.getAccountId());
@@ -169,6 +172,8 @@
}
// 1.3 鏍¢獙瀹㈡埛锛堜娇鐢� CRM 瀹㈡埛 API锛�
customerApi.validateCustomer(updateReqVO.getCustomerId());
+ // 1.3.1 鏍¢獙閿�鍞被鍨�
+ validateSaleType(updateReqVO.getSaleType());
// 1.3 鏍¢獙缁撶畻璐︽埛
if (updateReqVO.getAccountId() != null) {
accountService.validateAccount(updateReqVO.getAccountId());
@@ -327,6 +332,12 @@
return saleOrder;
}
+ private void validateSaleType(Integer saleType) {
+ if (!ErpSaleTypeEnum.isValid(saleType)) {
+ throw exception(SALE_ORDER_SALE_TYPE_INVALID, saleType);
+ }
+ }
+
/**
* 瑙f瀽鈥滄槸鍚﹂渶瑕佺敓浜р�濓細鐣欑┖榛樿鈥滄槸(1)鈥濓紝濉�滃惁/0/涓嶉渶瑕佲�濆垯涓衡�滃惁(0)鈥�
*/
diff --git a/yudao-module-erp/src/test/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseOrderReturnCountTest.java b/yudao-module-erp/src/test/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseOrderReturnCountTest.java
new file mode 100644
index 0000000..b5e62d1
--- /dev/null
+++ b/yudao-module-erp/src/test/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseOrderReturnCountTest.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.erp.api.purchase;
+
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderItemDO;
+import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseOrderItemMapper;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.math.BigDecimal;
+
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.PURCHASE_ORDER_ITEM_RETURN_FAIL_IN_EXCEED;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class ErpPurchaseOrderReturnCountTest {
+
+ @Mock private ErpPurchaseOrderItemMapper itemMapper;
+
+ @Test
+ void cumulativeReturnCannotExceedReceived() {
+ ErpPurchaseOrderApiImpl api = new ErpPurchaseOrderApiImpl();
+ ReflectionTestUtils.setField(api, "purchaseOrderItemMapper", itemMapper);
+ when(itemMapper.selectById(1L)).thenReturn(new ErpPurchaseOrderItemDO()
+ .setId(1L).setProductId(1996L).setInCount(BigDecimal.valueOf(2))
+ .setReturnCount(BigDecimal.ONE));
+ assertServiceException(() -> api.updateOrderItemReturnCount(1L, BigDecimal.valueOf(2)),
+ PURCHASE_ORDER_ITEM_RETURN_FAIL_IN_EXCEED, "浜у搧ID:1996", BigDecimal.valueOf(2));
+ verify(itemMapper, never()).updateById(any(ErpPurchaseOrderItemDO.class));
+ }
+}
diff --git a/yudao-module-hrm/pom.xml b/yudao-module-hrm/pom.xml
index df07d9c..f6b6f44 100644
--- a/yudao-module-hrm/pom.xml
+++ b/yudao-module-hrm/pom.xml
@@ -24,6 +24,13 @@
<version>${revision}</version>
</dependency>
+ <!-- 钖叕鏍哥畻姹囨�� MES 鐢熶骇鎶ュ伐宸ヨ祫 -->
+ <dependency>
+ <groupId>cn.iocoder.boot</groupId>
+ <artifactId>yudao-module-mes-api</artifactId>
+ <version>${revision}</version>
+ </dependency>
+
<dependency>
<groupId>cn.iocoder.boot</groupId>
<artifactId>yudao-module-system</artifactId>
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmEmployeeSocialSecurityController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmEmployeeSocialSecurityController.java
index c969f84..adb9e0d 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmEmployeeSocialSecurityController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmEmployeeSocialSecurityController.java
@@ -7,10 +7,8 @@
import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.HrmEmployeeSocialSecurityPageReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.HrmEmployeeSocialSecurityRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.HrmEmployeeSocialSecuritySaveReqVO;
-import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.salary.HrmEmployeeSocialSecurityDO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.salary.HrmSocialSecuritySchemeDO;
-import cn.iocoder.yudao.module.hrm.service.employee.HrmEmployeeService;
import cn.iocoder.yudao.module.hrm.service.salary.HrmEmployeeSocialSecurityService;
import cn.iocoder.yudao.module.hrm.service.salary.HrmSocialSecuritySchemeService;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
@@ -29,7 +27,7 @@
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-@Tag(name = "绠$悊鍚庡彴 - HRM 鍛樺伐绀句繚鍏Н閲戞。妗�")
+@Tag(name = "绠$悊鍚庡彴 - HRM 閮ㄩ棬绀句繚鍏Н閲戞。妗�")
@RestController
@RequestMapping("/hrm/salary/employee-social-security")
@Validated
@@ -38,14 +36,12 @@
@Resource
private HrmEmployeeSocialSecurityService employeeSocialSecurityService;
@Resource
- private HrmEmployeeService employeeService;
- @Resource
private DeptApi deptApi;
@Resource
private HrmSocialSecuritySchemeService schemeService;
@PostMapping("/create")
- @Operation(summary = "鍒涘缓鍛樺伐绀句繚鍏Н閲戞。妗�")
+ @Operation(summary = "鍒涘缓閮ㄩ棬绀句繚鍏Н閲戞。妗�")
@PreAuthorize("@ss.hasPermission('hrm:employee-social-security:create')")
public CommonResult<Long> createEmployeeSocialSecurity(@Valid @RequestBody HrmEmployeeSocialSecuritySaveReqVO createReqVO) {
HrmEmployeeSocialSecurityDO socialSecurity = BeanUtils.toBean(createReqVO, HrmEmployeeSocialSecurityDO.class);
@@ -53,7 +49,7 @@
}
@PutMapping("/update")
- @Operation(summary = "鏇存柊鍛樺伐绀句繚鍏Н閲戞。妗�")
+ @Operation(summary = "鏇存柊閮ㄩ棬绀句繚鍏Н閲戞。妗�")
@PreAuthorize("@ss.hasPermission('hrm:employee-social-security:update')")
public CommonResult<Boolean> updateEmployeeSocialSecurity(@Valid @RequestBody HrmEmployeeSocialSecuritySaveReqVO updateReqVO) {
HrmEmployeeSocialSecurityDO socialSecurity = BeanUtils.toBean(updateReqVO, HrmEmployeeSocialSecurityDO.class);
@@ -62,7 +58,7 @@
}
@DeleteMapping("/delete")
- @Operation(summary = "鍒犻櫎鍛樺伐绀句繚鍏Н閲戞。妗�")
+ @Operation(summary = "鍒犻櫎閮ㄩ棬绀句繚鍏Н閲戞。妗�")
@Parameter(name = "id", description = "妗fID", required = true)
@PreAuthorize("@ss.hasPermission('hrm:employee-social-security:delete')")
public CommonResult<Boolean> deleteEmployeeSocialSecurity(@RequestParam("id") Long id) {
@@ -71,7 +67,7 @@
}
@GetMapping("/get")
- @Operation(summary = "鑾峰彇鍛樺伐绀句繚鍏Н閲戞。妗�")
+ @Operation(summary = "鑾峰彇閮ㄩ棬绀句繚鍏Н閲戞。妗�")
@Parameter(name = "id", description = "妗fID", required = true)
public CommonResult<HrmEmployeeSocialSecurityRespVO> getEmployeeSocialSecurity(@RequestParam("id") Long id) {
HrmEmployeeSocialSecurityDO socialSecurity = employeeSocialSecurityService.getEmployeeSocialSecurity(id);
@@ -79,14 +75,13 @@
return success(null);
}
HrmEmployeeSocialSecurityRespVO respVO = BeanUtils.toBean(socialSecurity, HrmEmployeeSocialSecurityRespVO.class);
- // 濉厖鍛樺伐鍜屾柟妗堜俊鎭�
- fillEmployeeInfo(respVO, socialSecurity.getUserId());
+ fillDeptInfo(respVO, socialSecurity.getDeptId());
fillSchemeInfo(respVO, socialSecurity.getSocialSecuritySchemeId());
return success(respVO);
}
@GetMapping("/page")
- @Operation(summary = "鑾峰彇鍛樺伐绀句繚鍏Н閲戞。妗堝垎椤�")
+ @Operation(summary = "鑾峰彇閮ㄩ棬绀句繚鍏Н閲戞。妗堝垎椤�")
public CommonResult<PageResult<HrmEmployeeSocialSecurityRespVO>> getEmployeeSocialSecurityPage(
@Valid HrmEmployeeSocialSecurityPageReqVO pageReqVO) {
PageResult<HrmEmployeeSocialSecurityDO> pageResult = employeeSocialSecurityService.getEmployeeSocialSecurityPage(pageReqVO);
@@ -94,23 +89,11 @@
if (CollUtil.isEmpty(recordList)) {
return success(new PageResult<>(Collections.emptyList(), pageResult.getTotal()));
}
- // userId 鏄憳宸D锛屾壒閲忚幏鍙栧憳宸ヤ俊鎭�
- Set<Long> employeeIds = recordList.stream()
- .map(HrmEmployeeSocialSecurityDO::getUserId)
+ // 鎵归噺鑾峰彇閮ㄩ棬淇℃伅
+ Set<Long> deptIds = recordList.stream()
+ .map(HrmEmployeeSocialSecurityDO::getDeptId)
.filter(Objects::nonNull)
.collect(Collectors.toSet());
- Map<Long, HrmEmployeeDO> employeeMap = new HashMap<>();
- Set<Long> deptIds = new HashSet<>();
- for (Long employeeId : employeeIds) {
- HrmEmployeeDO employee = employeeService.getEmployee(employeeId);
- if (employee != null) {
- employeeMap.put(employeeId, employee);
- if (employee.getDeptId() != null) {
- deptIds.add(employee.getDeptId());
- }
- }
- }
- // 鎵归噺鑾峰彇閮ㄩ棬淇℃伅
Map<Long, DeptRespDTO> deptMap = CollUtil.isEmpty(deptIds) ? Collections.emptyMap() : deptApi.getDeptMap(deptIds);
// 鎵归噺鑾峰彇鏂规淇℃伅
Set<Long> schemeIds = recordList.stream()
@@ -128,18 +111,12 @@
List<HrmEmployeeSocialSecurityRespVO> list = recordList.stream()
.map(socialSecurity -> {
HrmEmployeeSocialSecurityRespVO respVO = BeanUtils.toBean(socialSecurity, HrmEmployeeSocialSecurityRespVO.class);
- // 濉厖鍛樺伐濮撳悕鍜岄儴闂ㄥ悕绉帮紙userId 鏄憳宸D锛�
- HrmEmployeeDO employee = employeeMap.get(socialSecurity.getUserId());
- if (employee != null) {
- respVO.setUserName(employee.getName());
- if (employee.getDeptId() != null) {
- DeptRespDTO dept = deptMap.get(employee.getDeptId());
- if (dept != null) {
- respVO.setDeptName(dept.getName());
- }
+ if (socialSecurity.getDeptId() != null) {
+ DeptRespDTO dept = deptMap.get(socialSecurity.getDeptId());
+ if (dept != null) {
+ respVO.setDeptName(dept.getName());
}
}
- // 濉厖鏂规鍚嶇О
if (socialSecurity.getSocialSecuritySchemeId() != null) {
HrmSocialSecuritySchemeDO scheme = schemeMap.get(socialSecurity.getSocialSecuritySchemeId());
if (scheme != null) {
@@ -152,15 +129,16 @@
return success(new PageResult<>(list, pageResult.getTotal()));
}
- @GetMapping("/list-by-user")
- @Operation(summary = "鑾峰彇鍛樺伐绀句繚鍏Н閲戞。妗堝巻鍙插垪琛�")
- @Parameter(name = "userId", description = "绯荤粺鐢ㄦ埛ID", required = true)
+ @GetMapping("/list-by-dept")
+ @Operation(summary = "鑾峰彇閮ㄩ棬绀句繚鍏Н閲戞。妗堝巻鍙插垪琛�")
+ @Parameter(name = "deptId", description = "閮ㄩ棬ID", required = true)
public CommonResult<List<HrmEmployeeSocialSecurityRespVO>> getEmployeeSocialSecurityList(
- @RequestParam("userId") Long userId) {
- List<HrmEmployeeSocialSecurityDO> list = employeeSocialSecurityService.getEmployeeSocialSecurityList(userId);
+ @RequestParam("deptId") Long deptId) {
+ List<HrmEmployeeSocialSecurityDO> list = employeeSocialSecurityService.getEmployeeSocialSecurityList(deptId);
List<HrmEmployeeSocialSecurityRespVO> result = list.stream()
.map(socialSecurity -> {
HrmEmployeeSocialSecurityRespVO respVO = BeanUtils.toBean(socialSecurity, HrmEmployeeSocialSecurityRespVO.class);
+ fillDeptInfo(respVO, socialSecurity.getDeptId());
fillSchemeInfo(respVO, socialSecurity.getSocialSecuritySchemeId());
return respVO;
})
@@ -169,35 +147,30 @@
}
@GetMapping("/get-latest")
- @Operation(summary = "鑾峰彇鍛樺伐鏈�鏂扮敓鏁堢殑绀句繚鍏Н閲戞。妗�")
- @Parameter(name = "userId", description = "绯荤粺鐢ㄦ埛ID", required = true)
+ @Operation(summary = "鑾峰彇閮ㄩ棬鏈�鏂扮敓鏁堢殑绀句繚鍏Н閲戞。妗�")
+ @Parameter(name = "deptId", description = "閮ㄩ棬ID", required = true)
public CommonResult<HrmEmployeeSocialSecurityRespVO> getLatestEmployeeSocialSecurity(
- @RequestParam("userId") Long userId) {
- HrmEmployeeSocialSecurityDO socialSecurity = employeeSocialSecurityService.getLatestEmployeeSocialSecurity(userId);
+ @RequestParam("deptId") Long deptId) {
+ HrmEmployeeSocialSecurityDO socialSecurity = employeeSocialSecurityService.getLatestEmployeeSocialSecurity(deptId);
if (socialSecurity == null) {
return success(null);
}
HrmEmployeeSocialSecurityRespVO respVO = BeanUtils.toBean(socialSecurity, HrmEmployeeSocialSecurityRespVO.class);
- // 濉厖鍛樺伐鍜屾柟妗堜俊鎭�
- fillEmployeeInfo(respVO, socialSecurity.getUserId());
+ fillDeptInfo(respVO, socialSecurity.getDeptId());
fillSchemeInfo(respVO, socialSecurity.getSocialSecuritySchemeId());
return success(respVO);
}
/**
- * 濉厖鍛樺伐淇℃伅锛堥�氳繃鍛樺伐ID锛�
+ * 濉厖閮ㄩ棬淇℃伅
*/
- private void fillEmployeeInfo(HrmEmployeeSocialSecurityRespVO respVO, Long userId) {
- // userId 鏄憳宸D锛岄�氳繃鍛樺伐琛ㄨ幏鍙栧鍚嶅拰閮ㄩ棬
- HrmEmployeeDO employee = employeeService.getEmployee(userId);
- if (employee != null) {
- respVO.setUserName(employee.getName());
- if (employee.getDeptId() != null) {
- DeptRespDTO dept = deptApi.getDept(employee.getDeptId());
- if (dept != null) {
- respVO.setDeptName(dept.getName());
- }
- }
+ private void fillDeptInfo(HrmEmployeeSocialSecurityRespVO respVO, Long deptId) {
+ if (deptId == null) {
+ return;
+ }
+ DeptRespDTO dept = deptApi.getDept(deptId);
+ if (dept != null) {
+ respVO.setDeptName(dept.getName());
}
}
@@ -213,4 +186,4 @@
}
}
-}
\ No newline at end of file
+}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java
index 6df67e9..8b8beef 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java
@@ -14,6 +14,7 @@
import cn.iocoder.yudao.module.hrm.dal.dataobject.salary.HrmSalaryCalculationDO;
import cn.iocoder.yudao.module.hrm.service.employee.HrmEmployeeService;
import cn.iocoder.yudao.module.hrm.service.salary.HrmSalaryCalculationService;
+import cn.iocoder.yudao.module.mes.api.feedback.dto.MesProFeedbackWageDetailRespDTO;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
import io.swagger.v3.oas.annotations.Operation;
@@ -121,6 +122,17 @@
return success(respVO);
}
+ @GetMapping("/work-wage-detail")
+ @Operation(summary = "鑾峰緱鍛樺伐鏌愭牳绠楀懆鏈熺殑鎶ュ伐宸ヨ祫鏄庣粏",
+ description = "鎸夋姤宸ヤ汉姹囨�诲彛寰勮繑鍥炴瘡鏉℃姤宸ュ崟鐨勪富宸ヨ祫銆佽緟鍔╁伐璧勩�佽嚜瀹氫箟宸ヨ祫瀛楁銆佽川閲忚皟鏁翠笌鏈�缁堝伐璧�")
+ @Parameter(name = "period", description = "鏍哥畻鍛ㄦ湡锛屾牸寮� 2024-01", required = true, example = "2026-11")
+ @Parameter(name = "userId", description = "鍛樺伐缂栧彿锛堣柂閰牳绠楄褰曚腑鐨� userId锛�", required = true, example = "1024")
+ public CommonResult<List<MesProFeedbackWageDetailRespDTO>> getWorkWageDetail(
+ @RequestParam("period") String period,
+ @RequestParam("userId") Long userId) {
+ return success(salaryCalculationService.getWorkWageDetailList(period, userId));
+ }
+
@PostMapping("/calculate")
@Operation(summary = "鎵ц钖叕鏍哥畻")
@Parameter(name = "period", description = "鏍哥畻鍛ㄦ湡", required = true, example = "2024-01")
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmEmployeeSocialSecurityPageReqVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmEmployeeSocialSecurityPageReqVO.java
index e6dc647..8813e5b 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmEmployeeSocialSecurityPageReqVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmEmployeeSocialSecurityPageReqVO.java
@@ -7,16 +7,10 @@
import java.time.LocalDate;
-@Schema(description = "绠$悊鍚庡彴 - 鍛樺伐绀句繚鍏Н閲戞。妗堝垎椤� Request VO")
+@Schema(description = "绠$悊鍚庡彴 - 閮ㄩ棬绀句繚鍏Н閲戞。妗堝垎椤� Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
public class HrmEmployeeSocialSecurityPageReqVO extends PageParam {
-
- @Schema(description = "鍛樺伐ID", example = "100")
- private Long userId;
-
- @Schema(description = "鍛樺伐濮撳悕", example = "寮犱笁")
- private String userName;
@Schema(description = "閮ㄩ棬ID", example = "104")
private Long deptId;
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmEmployeeSocialSecurityRespVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmEmployeeSocialSecurityRespVO.java
index 69e7e6e..50c8e8e 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmEmployeeSocialSecurityRespVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmEmployeeSocialSecurityRespVO.java
@@ -7,18 +7,15 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
-@Schema(description = "绠$悊鍚庡彴 - 鍛樺伐绀句繚鍏Н閲戞。妗� Response VO")
+@Schema(description = "绠$悊鍚庡彴 - 閮ㄩ棬绀句繚鍏Н閲戞。妗� Response VO")
@Data
public class HrmEmployeeSocialSecurityRespVO {
@Schema(description = "妗fID", example = "1")
private Long id;
- @Schema(description = "绯荤粺鐢ㄦ埛ID锛堝叧鑱� system_users.id锛�", example = "100")
- private Long userId;
-
- @Schema(description = "鍛樺伐濮撳悕", example = "寮犱笁")
- private String userName;
+ @Schema(description = "閮ㄩ棬ID锛堝叧鑱� system_dept.id锛�", example = "119")
+ private Long deptId;
@Schema(description = "閮ㄩ棬鍚嶇О", example = "鐮斿彂閮�")
private String deptName;
@@ -29,7 +26,7 @@
@Schema(description = "绀句繚鍏Н閲戞柟妗堝悕绉�", example = "2024骞村崡閫氬競鏍囧噯")
private String schemeName;
- // ========== 缂寸撼鍩烘暟锛堝憳宸ヤ釜鎬у寲璁剧疆锛� ==========
+ // ========== 缂寸撼鍩烘暟锛堟寜閮ㄩ棬璁剧疆锛� ==========
@Schema(description = "绀句繚缂寸撼鍩烘暟", example = "10000")
private BigDecimal socialSecurityBase;
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmEmployeeSocialSecuritySaveReqVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmEmployeeSocialSecuritySaveReqVO.java
index 9cc8c47..b6716ca 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmEmployeeSocialSecuritySaveReqVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmEmployeeSocialSecuritySaveReqVO.java
@@ -7,22 +7,22 @@
import java.math.BigDecimal;
import java.time.LocalDate;
-@Schema(description = "绠$悊鍚庡彴 - 鍛樺伐绀句繚鍏Н閲戞。妗堟柊澧�/淇敼 Request VO")
+@Schema(description = "绠$悊鍚庡彴 - 閮ㄩ棬绀句繚鍏Н閲戞。妗堟柊澧�/淇敼 Request VO")
@Data
public class HrmEmployeeSocialSecuritySaveReqVO {
@Schema(description = "妗fID", example = "1")
private Long id;
- @Schema(description = "绯荤粺鐢ㄦ埛ID锛堝叧鑱� system_users.id锛�", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
- @NotNull(message = "绯荤粺鐢ㄦ埛ID涓嶈兘涓虹┖")
- private Long userId;
+ @Schema(description = "閮ㄩ棬ID锛堝叧鑱� system_dept.id锛�", requiredMode = Schema.RequiredMode.REQUIRED, example = "119")
+ @NotNull(message = "閮ㄩ棬涓嶈兘涓虹┖")
+ private Long deptId;
@Schema(description = "绀句繚鍏Н閲戞柟妗圛D", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "绀句繚鍏Н閲戞柟妗堜笉鑳戒负绌�")
private Long socialSecuritySchemeId;
- // ========== 缂寸撼鍩烘暟锛堝憳宸ヤ釜鎬у寲璁剧疆锛� ==========
+ // ========== 缂寸撼鍩烘暟锛堟寜閮ㄩ棬璁剧疆锛� ==========
@Schema(description = "绀句繚缂寸撼鍩烘暟", requiredMode = Schema.RequiredMode.REQUIRED, example = "10000")
@NotNull(message = "绀句繚缂寸撼鍩烘暟涓嶈兘涓虹┖")
private BigDecimal socialSecurityBase;
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java
index 16836b7..ac960ed 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java
@@ -65,6 +65,10 @@
@ExcelProperty("鍏朵粬琛ヨ创")
private BigDecimal otherAllowance;
+ @Schema(description = "鎶ュ伐宸ヨ祫")
+ @ExcelProperty("鎶ュ伐宸ヨ祫")
+ private BigDecimal workWage;
+
@Schema(description = "绀句繚鎵i櫎")
@ExcelProperty("绀句繚鎵i櫎")
private BigDecimal socialSecurityDeduction;
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationSaveReqVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationSaveReqVO.java
index 550c6c9..1bdf8f5 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationSaveReqVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationSaveReqVO.java
@@ -56,6 +56,9 @@
@Schema(description = "鍏朵粬琛ヨ创")
private BigDecimal otherAllowance;
+ @Schema(description = "鎶ュ伐宸ヨ祫锛堝彲浜哄伐璋冩暣锛岃皟鏁村悗鐢卞墠绔噸鏂拌绠楀疄鍙戝伐璧勶級")
+ private BigDecimal workWage;
+
@Schema(description = "绀句繚鎵i櫎")
private BigDecimal socialSecurityDeduction;
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmEmployeeSocialSecurityDO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmEmployeeSocialSecurityDO.java
index 9ef5cfb..6f702a7 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmEmployeeSocialSecurityDO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmEmployeeSocialSecurityDO.java
@@ -10,10 +10,10 @@
import java.time.LocalDate;
/**
- * 鍛樺伐绀句繚鍏Н閲戞。妗� DO
+ * 閮ㄩ棬绀句繚鍏Н閲戞。妗� DO
*
- * 鍛樺伐缁戝畾绀句繚鍏Н閲戞柟妗堬紝骞惰缃釜浜哄寲鐨勭即绾冲熀鏁�
- * 涓�涓ぞ淇濇柟妗堝彲浠ョ粦瀹氬涓憳宸ワ紝涓�涓憳宸ュ彲浠ユ湁澶氫釜绀句繚妗f锛堟寜鐢熸晥鏃ユ湡锛屽彇鏈�鏂扮敓鏁堢殑锛�
+ * 閮ㄩ棬缁戝畾绀句繚鍏Н閲戞柟妗堬紝骞惰缃閮ㄩ棬鐨勭即绾冲熀鏁帮紱閮ㄩ棬涓嬫墍鏈夊憳宸ユ寜妗f缂寸撼
+ * 涓�涓ぞ淇濇柟妗堝彲浠ョ粦瀹氬涓儴闂紝涓�涓儴闂ㄥ彲浠ユ湁澶氫釜绀句繚妗f锛堟寜鐢熸晥鏃ユ湡锛屽彇鏈�鏂扮敓鏁堢殑锛�
*
* @author 瓒呯骇绠$悊鍛�
*/
@@ -34,11 +34,11 @@
private Long id;
/**
- * 鍛樺伐ID
+ * 閮ㄩ棬ID
*
- * 鍏宠仈 HrmEmployeeDO#getId()
+ * 鍏宠仈 system_dept#getId()
*/
- private Long userId;
+ private Long deptId;
/**
* 绀句繚鍏Н閲戞柟妗圛D
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryCalculationDO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryCalculationDO.java
index 2f19cc4..2dff29f 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryCalculationDO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryCalculationDO.java
@@ -83,6 +83,13 @@
private BigDecimal otherAllowance;
/**
+ * 鎶ュ伐宸ヨ祫
+ *
+ * 姹囨�昏鍛樺伐鍦ㄦ牳绠楀懆鏈熷唴宸插鎵归�氳繃鐨勭敓浜ф姤宸ュ伐璧勶紝鏍哥畻鏃跺彲鎸変汉璋冩暣
+ */
+ private BigDecimal workWage;
+
+ /**
* 绀句繚鎵i櫎
*/
private BigDecimal socialSecurityDeduction;
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmResignationApplicationMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmResignationApplicationMapper.java
index 888c275..674d5d2 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmResignationApplicationMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmResignationApplicationMapper.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmResignationApplicationPageReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.approval.HrmResignationApplicationDO;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
import java.time.LocalDate;
@@ -18,6 +19,14 @@
@Mapper
public interface HrmResignationApplicationMapper extends BaseMapperX<HrmResignationApplicationDO> {
+ default void startApproval(Long id, String processInstanceId, Integer status) {
+ update(null, new LambdaUpdateWrapper<HrmResignationApplicationDO>()
+ .eq(HrmResignationApplicationDO::getId, id)
+ .set(HrmResignationApplicationDO::getProcessInstanceId, processInstanceId)
+ .set(HrmResignationApplicationDO::getStatus, status)
+ .set(HrmResignationApplicationDO::getApproveTime, null));
+ }
+
default PageResult<HrmResignationApplicationDO> selectPage(HrmResignationApplicationPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<HrmResignationApplicationDO>()
.likeIfPresent(HrmResignationApplicationDO::getNo, reqVO.getNo())
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/salary/HrmEmployeeSocialSecurityMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/salary/HrmEmployeeSocialSecurityMapper.java
index cd785f8..effb246 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/salary/HrmEmployeeSocialSecurityMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/salary/HrmEmployeeSocialSecurityMapper.java
@@ -7,34 +7,44 @@
import cn.iocoder.yudao.module.hrm.dal.dataobject.salary.HrmEmployeeSocialSecurityDO;
import org.apache.ibatis.annotations.Mapper;
-import java.time.LocalDate;
+import java.util.Collection;
import java.util.List;
/**
- * 鍛樺伐绀句繚鍏Н閲戞。妗� Mapper
+ * 閮ㄩ棬绀句繚鍏Н閲戞。妗� Mapper
*
* @author 瓒呯骇绠$悊鍛�
*/
@Mapper
public interface HrmEmployeeSocialSecurityMapper extends BaseMapperX<HrmEmployeeSocialSecurityDO> {
- default HrmEmployeeSocialSecurityDO selectLatestByUserId(Long userId) {
+ default HrmEmployeeSocialSecurityDO selectLatestByDeptId(Long deptId) {
return selectOne(new LambdaQueryWrapperX<HrmEmployeeSocialSecurityDO>()
- .eq(HrmEmployeeSocialSecurityDO::getUserId, userId)
+ .eq(HrmEmployeeSocialSecurityDO::getDeptId, deptId)
.eq(HrmEmployeeSocialSecurityDO::getStatus, 0)
.orderByDesc(HrmEmployeeSocialSecurityDO::getEffectiveDate)
.last("LIMIT 1"));
}
- default List<HrmEmployeeSocialSecurityDO> selectListByUserId(Long userId) {
+ /**
+ * 鎵归噺鏌ヨ澶氫釜閮ㄩ棬鍚勮嚜鏈�鏂扮敓鏁堢殑妗f锛岀敤浜庤柂閰牳绠楁椂閬垮厤閫愬憳宸ユ煡璇�
+ */
+ default List<HrmEmployeeSocialSecurityDO> selectListByDeptIds(Collection<Long> deptIds) {
return selectList(new LambdaQueryWrapperX<HrmEmployeeSocialSecurityDO>()
- .eq(HrmEmployeeSocialSecurityDO::getUserId, userId)
+ .inIfPresent(HrmEmployeeSocialSecurityDO::getDeptId, deptIds)
+ .eq(HrmEmployeeSocialSecurityDO::getStatus, 0)
+ .orderByDesc(HrmEmployeeSocialSecurityDO::getEffectiveDate));
+ }
+
+ default List<HrmEmployeeSocialSecurityDO> selectListByDeptId(Long deptId) {
+ return selectList(new LambdaQueryWrapperX<HrmEmployeeSocialSecurityDO>()
+ .eq(HrmEmployeeSocialSecurityDO::getDeptId, deptId)
.orderByDesc(HrmEmployeeSocialSecurityDO::getEffectiveDate));
}
default PageResult<HrmEmployeeSocialSecurityDO> selectPage(HrmEmployeeSocialSecurityPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<HrmEmployeeSocialSecurityDO>()
- .eqIfPresent(HrmEmployeeSocialSecurityDO::getUserId, reqVO.getUserId())
+ .eqIfPresent(HrmEmployeeSocialSecurityDO::getDeptId, reqVO.getDeptId())
.eqIfPresent(HrmEmployeeSocialSecurityDO::getStatus, reqVO.getStatus())
.eqIfPresent(HrmEmployeeSocialSecurityDO::getEffectiveDate, reqVO.getEffectiveDate())
.orderByDesc(HrmEmployeeSocialSecurityDO::getId));
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java
index 8b8fe32..7edc503 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java
@@ -150,7 +150,7 @@
@Override
public void updateResignationApplication(HrmResignationApplicationSaveReqVO updateReqVO) {
HrmResignationApplicationDO application = validateResignationApplicationExists(updateReqVO.getId());
- if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
+ if (!isEditableResignationStatus(application.getStatus())) {
throw exception(RESIGNATION_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
}
HrmResignationApplicationDO updateObj = BeanUtils.toBean(updateReqVO, HrmResignationApplicationDO.class);
@@ -190,6 +190,11 @@
throw exception(RESIGNATION_APPLICATION_NOT_EXISTS);
}
return application;
+ }
+
+ private boolean isEditableResignationStatus(Integer status) {
+ return Objects.equals(status, HrmAuditStatusEnum.DRAFT.getStatus())
+ || Objects.equals(status, HrmAuditStatusEnum.REJECT.getStatus());
}
@Override
@@ -323,16 +328,12 @@
@Transactional(rollbackFor = Exception.class)
public void submitResignationApplication(Long id, String processDefinitionKey, Long userId) {
HrmResignationApplicationDO application = validateResignationApplicationExists(id);
- if (ObjUtil.notEqual(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
+ if (!isEditableResignationStatus(application.getStatus())) {
throw exception(RESIGNATION_APPLICATION_SUBMIT_FAIL_NOT_DRAFT);
}
// 鍏ㄥ眬鍏嶅鎵癸細涓氬姟鏍¢獙閫氳繃鍚庣洿鎺ユ墽琛屽鎵归�氳繃閫昏緫锛屾棤闇�娴佺▼妯″瀷銆�
if (bpmProcessInstanceApi.isGlobalAutoApprove()) {
- resignationApplicationMapper.updateById(HrmResignationApplicationDO.builder()
- .id(id)
- .processInstanceId("")
- .status(HrmAuditStatusEnum.PROCESS.getStatus())
- .build());
+ resignationApplicationMapper.startApproval(id, "", HrmAuditStatusEnum.PROCESS.getStatus());
updateResignationApplicationAuditStatus(id, HrmAuditStatusEnum.APPROVE.getStatus());
return;
}
@@ -340,11 +341,7 @@
ProcessDefinition processDefinition = resolveActiveProcessDefinition(processDefinitionKey);
String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
.setProcessDefinitionKey(processDefinition.getKey()).setBusinessKey(String.valueOf(id)));
- resignationApplicationMapper.updateById(HrmResignationApplicationDO.builder()
- .id(id)
- .processInstanceId(processInstanceId)
- .status(HrmAuditStatusEnum.PROCESS.getStatus())
- .build());
+ resignationApplicationMapper.startApproval(id, processInstanceId, HrmAuditStatusEnum.PROCESS.getStatus());
}
private void validateApproveCategoryAndProcessDefinition() {
@@ -684,4 +681,4 @@
: String.format("ID=%s", employeeId);
}
-}
\ No newline at end of file
+}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmEmployeeSocialSecurityService.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmEmployeeSocialSecurityService.java
index 9690710..981a3c0 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmEmployeeSocialSecurityService.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmEmployeeSocialSecurityService.java
@@ -4,52 +4,58 @@
import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.HrmEmployeeSocialSecurityPageReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.salary.HrmEmployeeSocialSecurityDO;
+import java.util.Collection;
import java.util.List;
/**
- * 鍛樺伐绀句繚鍏Н閲戞。妗� Service 鎺ュ彛
+ * 閮ㄩ棬绀句繚鍏Н閲戞。妗� Service 鎺ュ彛
*
* @author 瓒呯骇绠$悊鍛�
*/
public interface HrmEmployeeSocialSecurityService {
/**
- * 鍒涘缓鍛樺伐绀句繚鍏Н閲戞。妗�
+ * 鍒涘缓閮ㄩ棬绀句繚鍏Н閲戞。妗�
*/
Long createEmployeeSocialSecurity(HrmEmployeeSocialSecurityDO socialSecurity);
/**
- * 鏇存柊鍛樺伐绀句繚鍏Н閲戞。妗�
+ * 鏇存柊閮ㄩ棬绀句繚鍏Н閲戞。妗�
*/
void updateEmployeeSocialSecurity(HrmEmployeeSocialSecurityDO socialSecurity);
/**
- * 鍒犻櫎鍛樺伐绀句繚鍏Н閲戞。妗�
+ * 鍒犻櫎閮ㄩ棬绀句繚鍏Н閲戞。妗�
*/
void deleteEmployeeSocialSecurity(Long id);
/**
- * 鑾峰彇鍛樺伐绀句繚鍏Н閲戞。妗�
+ * 鑾峰彇閮ㄩ棬绀句繚鍏Н閲戞。妗�
*/
HrmEmployeeSocialSecurityDO getEmployeeSocialSecurity(Long id);
/**
- * 鑾峰彇鍛樺伐绀句繚鍏Н閲戞。妗堝垎椤�
+ * 鑾峰彇閮ㄩ棬绀句繚鍏Н閲戞。妗堝垎椤�
*/
PageResult<HrmEmployeeSocialSecurityDO> getEmployeeSocialSecurityPage(HrmEmployeeSocialSecurityPageReqVO pageReqVO);
/**
- * 鑾峰彇鍛樺伐鏈�鏂扮敓鏁堢殑绀句繚鍏Н閲戞。妗�
+ * 鑾峰彇閮ㄩ棬鏈�鏂扮敓鏁堢殑绀句繚鍏Н閲戞。妗�
*/
- HrmEmployeeSocialSecurityDO getLatestEmployeeSocialSecurity(Long userId);
+ HrmEmployeeSocialSecurityDO getLatestEmployeeSocialSecurity(Long deptId);
/**
- * 鑾峰彇鍛樺伐绀句繚鍏Н閲戞。妗堝巻鍙插垪琛�
+ * 鑾峰彇閮ㄩ棬绀句繚鍏Н閲戞。妗堝巻鍙插垪琛�
*/
- List<HrmEmployeeSocialSecurityDO> getEmployeeSocialSecurityList(Long userId);
+ List<HrmEmployeeSocialSecurityDO> getEmployeeSocialSecurityList(Long deptId);
/**
- * 鎵归噺鍒涘缓鍛樺伐绀句繚鍏Н閲戞。妗堬紙鏍规嵁鍛樺伐鍒楄〃锛�
+ * 鎵归噺鑾峰彇澶氫釜閮ㄩ棬鏈�鏂扮敓鏁堢殑绀句繚鍏Н閲戞。妗�
+ */
+ List<HrmEmployeeSocialSecurityDO> getLatestEmployeeSocialSecurityList(Collection<Long> deptIds);
+
+ /**
+ * 鎵归噺鍒涘缓閮ㄩ棬绀句繚鍏Н閲戞。妗�
*/
void batchCreateEmployeeSocialSecurity(List<HrmEmployeeSocialSecurityDO> socialSecurityList);
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmEmployeeSocialSecurityServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmEmployeeSocialSecurityServiceImpl.java
index 65731d0..23c4a4e 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmEmployeeSocialSecurityServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmEmployeeSocialSecurityServiceImpl.java
@@ -9,13 +9,14 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
+import java.util.Collection;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.hrm.enums.ErrorCodeConstants.EMPLOYEE_SOCIAL_SECURITY_NOT_EXISTS;
/**
- * 鍛樺伐绀句繚鍏Н閲戞。妗� Service 瀹炵幇绫�
+ * 閮ㄩ棬绀句繚鍏Н閲戞。妗� Service 瀹炵幇绫�
*
* @author 瓒呯骇绠$悊鍛�
*/
@@ -63,13 +64,18 @@
}
@Override
- public HrmEmployeeSocialSecurityDO getLatestEmployeeSocialSecurity(Long userId) {
- return employeeSocialSecurityMapper.selectLatestByUserId(userId);
+ public HrmEmployeeSocialSecurityDO getLatestEmployeeSocialSecurity(Long deptId) {
+ return employeeSocialSecurityMapper.selectLatestByDeptId(deptId);
}
@Override
- public List<HrmEmployeeSocialSecurityDO> getEmployeeSocialSecurityList(Long userId) {
- return employeeSocialSecurityMapper.selectListByUserId(userId);
+ public List<HrmEmployeeSocialSecurityDO> getEmployeeSocialSecurityList(Long deptId) {
+ return employeeSocialSecurityMapper.selectListByDeptId(deptId);
+ }
+
+ @Override
+ public List<HrmEmployeeSocialSecurityDO> getLatestEmployeeSocialSecurityList(Collection<Long> deptIds) {
+ return employeeSocialSecurityMapper.selectListByDeptIds(deptIds);
}
private void validateEmployeeSocialSecurityExists(Long id) {
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationService.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationService.java
index cf9d519..e61911f 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationService.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationService.java
@@ -3,6 +3,7 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.HrmSalaryCalculationPageReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.salary.HrmSalaryCalculationDO;
+import cn.iocoder.yudao.module.mes.api.feedback.dto.MesProFeedbackWageDetailRespDTO;
import java.util.List;
@@ -81,4 +82,16 @@
*/
void saveSalaryCalculationList(List<HrmSalaryCalculationDO> calculationList);
+ /**
+ * 鑾峰緱鍛樺伐鏌愭牳绠楀懆鏈熺殑鎶ュ伐宸ヨ祫鏄庣粏
+ *
+ * <p>鎶ュ伐宸ヨ祫鎸夈�屾姤宸ヤ汉 = 鍛樺伐缁戝畾鐨勭郴缁熺敤鎴枫�嶆眹鎬伙紱鏄庣粏杩斿洖姣忔潯鎶ュ伐鍗曠殑涓诲伐璧勩��
+ * 杈呭姪宸ヨ祫銆佽嚜瀹氫箟宸ヨ祫瀛楁銆佽川閲忚皟鏁翠笌鏈�缁堝伐璧勶紝渚涜柂閰牳绠楁牳瀵广��
+ *
+ * @param period 鏍哥畻鍛ㄦ湡锛屾牸寮忓 2024-01
+ * @param employeeId 鍛樺伐缂栧彿锛堣柂閰牳绠楄褰曚腑鐨� userId锛�
+ * @return 鎶ュ伐宸ヨ祫鏄庣粏锛屾寜鎶ュ伐鏃堕棿鍊掑簭
+ */
+ List<MesProFeedbackWageDetailRespDTO> getWorkWageDetailList(String period, Long employeeId);
+
}
\ No newline at end of file
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationServiceImpl.java
index 6cf8b19..7fefce0 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationServiceImpl.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.hrm.service.salary;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.HrmSalaryCalculationPageReqVO;
@@ -31,6 +32,8 @@
import cn.iocoder.yudao.module.hrm.dal.mysql.salary.HrmSocialSecuritySchemeMapper;
import cn.iocoder.yudao.module.hrm.dal.mysql.salary.HrmSalaryStructureMapper;
import cn.iocoder.yudao.module.hrm.dal.redis.HrmNoRedisDAO;
+import cn.iocoder.yudao.module.mes.api.feedback.MesProFeedbackWageApi;
+import cn.iocoder.yudao.module.mes.api.feedback.dto.MesProFeedbackWageDetailRespDTO;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.hrm.enums.HrmOvertimeTypeEnum;
import jakarta.annotation.Resource;
@@ -44,6 +47,7 @@
import java.time.LocalDateTime;
import java.time.YearMonth;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -107,6 +111,8 @@
private HrmEmployeeScheduleMapper employeeScheduleMapper;
@Resource
private HrmShiftMapper shiftMapper;
+ @Resource
+ private MesProFeedbackWageApi feedbackWageApi;
@Override
public PageResult<HrmSalaryCalculationDO> getSalaryCalculationPage(HrmSalaryCalculationPageReqVO pageReqVO) {
@@ -139,6 +145,11 @@
.filter(e -> deptId == null || deptId.equals(e.getDeptId()))
.toList();
+ // 1.1 涓�娆℃眹鎬绘墍鏈夊憳宸ュ綋鏈堢殑鐢熶骇鎶ュ伐宸ヨ祫锛岄伩鍏嶉�愪汉鏌ヨ
+ Map<Long, BigDecimal> workWageMap = loadWorkWageMap(employees, period);
+ // 1.2 涓�娆″姞杞芥秹鍙婇儴闂ㄧ殑鏈�鏂扮ぞ淇濆叕绉噾妗f锛岄伩鍏嶉�愪汉鏌ヨ
+ Map<Long, HrmEmployeeSocialSecurityDO> deptSocialSecurityMap = loadDeptSocialSecurityMap(employees);
+
// 2. 閬嶅巻鍛樺伐杩涜钖叕鏍哥畻
for (HrmEmployeeDO employee : employees) {
// employeeId 鏄憳宸D锛岀敤浜庡叧鑱旇柂閰。妗堛�佺ぞ淇濇。妗堛�佹牳绠楄褰�
@@ -163,8 +174,9 @@
employeeSalary = buildDefaultEmployeeSalary(employeeId, employee);
}
- // 2.3 鑾峰彇鍛樺伐绀句繚鍏Н閲戞。妗堬紙鎸夊憳宸D鏌ヨ锛屽彇鏈�鏂扮敓鏁堢殑锛�
- HrmEmployeeSocialSecurityDO socialSecurity = employeeSocialSecurityMapper.selectLatestByUserId(employeeId);
+ // 2.3 鑾峰彇鍛樺伐鎵�鍦ㄩ儴闂ㄧ殑绀句繚鍏Н閲戞。妗堬紙鎸夐儴闂ㄥ彇鏈�鏂扮敓鏁堢殑锛�
+ HrmEmployeeSocialSecurityDO socialSecurity = employee.getDeptId() == null
+ ? null : deptSocialSecurityMap.get(employee.getDeptId());
// 2.4 濡傛灉鏈夌ぞ淇濇。妗堬紝鑾峰彇缁戝畾鐨勬柟妗�
HrmSocialSecuritySchemeDO scheme = null;
if (socialSecurity != null && socialSecurity.getSocialSecuritySchemeId() != null) {
@@ -172,7 +184,8 @@
}
// 2.5 鏋勫缓鏍哥畻璁板綍锛堝寘鍚墸闄よ绠楋紝閫氳繃鏂规鑾峰彇姣斾緥锛�
- HrmSalaryCalculationDO calculation = buildSalaryCalculation(period, employeeId, employee, employeeSalary, socialSecurity, scheme, effectiveDate);
+ HrmSalaryCalculationDO calculation = buildSalaryCalculation(period, employeeId, employee, employeeSalary,
+ socialSecurity, scheme, effectiveDate, workWageMap);
// 2.6 淇濆瓨锛氶娆$敓鎴愬崟鍙凤紱宸叉湁寰呯‘璁よ褰曞垯淇濈暀鍗曞彿骞惰鐩栭噸绠楃粨鏋�
if (CollUtil.isNotEmpty(existCalculations)) {
@@ -202,6 +215,46 @@
}
/**
+ * 姹囨�绘牳绠楀懆鏈熷唴鎵�鏈夊憳宸ョ殑鐢熶骇鎶ュ伐宸ヨ祫銆�
+ *
+ * <p>鎶ュ伐鍗曡褰曠殑鏄姤宸ヤ汉锛堢郴缁熺敤鎴稩D锛夛紝钖叕鏍哥畻璁板綍鐨勬槸鍛樺伐ID锛屼袱鑰呴渶閫氳繃
+ * {@link HrmEmployeeDO#getUserId()} 鏄犲皠锛涙病鏈夌粦瀹氱郴缁熻处鍙风殑鍛樺伐涓嶄骇鐢熸姤宸ュ伐璧勩��
+ */
+ private Map<Long, BigDecimal> loadWorkWageMap(List<HrmEmployeeDO> employees, String period) {
+ Set<Long> userIds = employees.stream()
+ .map(HrmEmployeeDO::getUserId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toSet());
+ if (CollUtil.isEmpty(userIds)) {
+ return Collections.emptyMap();
+ }
+ YearMonth month = YearMonth.parse(period);
+ return feedbackWageApi.getWageAmountMap(userIds, month.atDay(1).atStartOfDay(),
+ month.atEndOfMonth().atTime(23, 59, 59));
+ }
+
+ /**
+ * 鍔犺浇娑夊強閮ㄩ棬鍚勮嚜鏈�鏂扮敓鏁堢殑绀句繚鍏Н閲戞。妗堛��
+ *
+ * <p>妗f鎸夐儴闂ㄧ淮鎶わ紝閮ㄩ棬涓嬫墍鏈夊憳宸ュ叡鐢ㄥ悓涓�浠芥。妗堬紱鏌ヨ缁撴灉宸叉寜鐢熸晥鏃ユ湡鍊掑簭锛�
+ * 姣忎釜閮ㄩ棬鍙栫涓�鏉″嵆鍙��
+ */
+ private Map<Long, HrmEmployeeSocialSecurityDO> loadDeptSocialSecurityMap(List<HrmEmployeeDO> employees) {
+ Set<Long> deptIds = employees.stream()
+ .map(HrmEmployeeDO::getDeptId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toSet());
+ if (CollUtil.isEmpty(deptIds)) {
+ return Collections.emptyMap();
+ }
+ Map<Long, HrmEmployeeSocialSecurityDO> result = new HashMap<>();
+ for (HrmEmployeeSocialSecurityDO socialSecurity : employeeSocialSecurityMapper.selectListByDeptIds(deptIds)) {
+ result.putIfAbsent(socialSecurity.getDeptId(), socialSecurity);
+ }
+ return result;
+ }
+
+ /**
* 鏋勫缓榛樿鐨勫憳宸ヨ柂閰。妗堛�傚熀鏈伐璧勭粺涓�鍙栧憳宸ユ。妗堬紝缁╂晥宸ヨ祫榛樿涓嶈嚜鍔ㄧ敓鎴愩��
*/
private HrmEmployeeSalaryDO buildDefaultEmployeeSalary(Long employeeId, HrmEmployeeDO employee) {
@@ -226,7 +279,8 @@
HrmEmployeeSalaryDO employeeSalary,
HrmEmployeeSocialSecurityDO socialSecurity,
HrmSocialSecuritySchemeDO scheme,
- LocalDate effectiveDate) {
+ LocalDate effectiveDate,
+ Map<Long, BigDecimal> workWageMap) {
// 璁$畻搴斿彂钖祫
BigDecimal baseSalary = employeeSalary.getBaseSalary() != null ? employeeSalary.getBaseSalary() : BigDecimal.ZERO;
BigDecimal performanceSalary = employeeSalary.getPerformanceSalary() != null ? employeeSalary.getPerformanceSalary() : BigDecimal.ZERO;
@@ -236,14 +290,19 @@
OvertimeSalary overtimeSalary = calculateOvertimeSalary(employee, employeeSalary, period, baseSalary);
BigDecimal overtimePay = overtimeSalary.pay();
+ // 鎶ュ伐宸ヨ祫锛氭姤宸ヤ汉锛堢郴缁熺敤鎴稩D锛夊湪鏍哥畻鍛ㄦ湡鍐呭凡瀹℃壒閫氳繃鐨勬姤宸ュ伐璧勫悎璁�
+ BigDecimal workWage = employee.getUserId() != null
+ ? workWageMap.getOrDefault(employee.getUserId(), BigDecimal.ZERO)
+ : BigDecimal.ZERO;
+
// 鎸夋帓鐝疮璁″嚭鍕ゅぉ鏁颁笌鎺掔彮鎬诲伐鏃讹紙鏃犳帓鐝椂鍑哄嫟澶╂暟鍥為��榛樿 22锛�
ScheduleStat scheduleStat = calculateScheduleStat(employeeId, period);
Integer workDays = scheduleStat.scheduledDays() > 0 ? scheduleStat.scheduledDays() : 22;
BigDecimal totalWorkHours = scheduleStat.totalWorkHours();
- // 搴斿彂宸ヨ祫鎬婚
+ // 搴斿彂宸ヨ祫鎬婚锛堝惈鎶ュ伐宸ヨ祫锛�
BigDecimal totalIncome = baseSalary.add(performanceSalary).add(mealAllowance)
- .add(transportAllowance).add(otherAllowance).add(overtimePay);
+ .add(transportAllowance).add(otherAllowance).add(overtimePay).add(workWage);
// 鑾峰彇绀句繚鍩烘暟锛氬憳宸ョぞ淇濇。妗� > 鍛樺伐鍩烘湰宸ヨ祫
BigDecimal socialSecurityBase = (socialSecurity != null && socialSecurity.getSocialSecurityBase() != null)
@@ -305,6 +364,7 @@
.mealAllowance(mealAllowance)
.transportAllowance(transportAllowance)
.otherAllowance(otherAllowance)
+ .workWage(workWage)
.socialSecurityDeduction(socialSecurityDeduction)
.housingFundDeduction(housingFundDeduction)
.taxDeduction(taxDeduction)
@@ -529,7 +589,12 @@
.filter(e -> deptId == null || deptId.equals(e.getDeptId()))
.toList();
- // 2. 閬嶅巻鍛樺伐瀹炴椂璁$畻钖叕
+ // 2. 涓�娆℃眹鎬绘墍鏈夊憳宸ュ綋鏈堢殑鐢熶骇鎶ュ伐宸ヨ祫
+ Map<Long, BigDecimal> workWageMap = loadWorkWageMap(employees, period);
+ // 2.1 涓�娆″姞杞芥秹鍙婇儴闂ㄧ殑鏈�鏂扮ぞ淇濆叕绉噾妗f
+ Map<Long, HrmEmployeeSocialSecurityDO> deptSocialSecurityMap = loadDeptSocialSecurityMap(employees);
+
+ // 3. 閬嶅巻鍛樺伐瀹炴椂璁$畻钖叕
List<HrmSalaryCalculationDO> resultList = new java.util.ArrayList<>();
for (HrmEmployeeDO employee : employees) {
Long employeeId = employee.getId();
@@ -541,8 +606,9 @@
employeeSalary = buildDefaultEmployeeSalary(employeeId, employee);
}
- // 2.2 鑾峰彇鍛樺伐绀句繚鍏Н閲戞。妗堬紙鎸夊憳宸D鏌ヨ锛屽彇鏈�鏂扮敓鏁堢殑锛�
- HrmEmployeeSocialSecurityDO socialSecurity = employeeSocialSecurityMapper.selectLatestByUserId(employeeId);
+ // 2.2 鑾峰彇鍛樺伐鎵�鍦ㄩ儴闂ㄧ殑绀句繚鍏Н閲戞。妗堬紙鎸夐儴闂ㄥ彇鏈�鏂扮敓鏁堢殑锛�
+ HrmEmployeeSocialSecurityDO socialSecurity = employee.getDeptId() == null
+ ? null : deptSocialSecurityMap.get(employee.getDeptId());
// 2.3 濡傛灉鏈夌ぞ淇濇。妗堬紝鑾峰彇缁戝畾鐨勬柟妗�
HrmSocialSecuritySchemeDO scheme = null;
if (socialSecurity != null && socialSecurity.getSocialSecuritySchemeId() != null) {
@@ -550,7 +616,8 @@
}
// 2.4 鏋勫缓鏍哥畻璁板綍锛堝疄鏃惰绠楋紝涓嶅瓨鍌級
- HrmSalaryCalculationDO calculation = buildSalaryCalculation(period, employeeId, employee, employeeSalary, socialSecurity, scheme, effectiveDate);
+ HrmSalaryCalculationDO calculation = buildSalaryCalculation(period, employeeId, employee, employeeSalary,
+ socialSecurity, scheme, effectiveDate, workWageMap);
resultList.add(calculation);
}
return resultList;
@@ -576,6 +643,20 @@
}
}
+ @Override
+ public List<MesProFeedbackWageDetailRespDTO> getWorkWageDetailList(String period, Long employeeId) {
+ if (employeeId == null || StrUtil.isBlank(period)) {
+ return Collections.emptyList();
+ }
+ HrmEmployeeDO employee = employeeMapper.selectById(employeeId);
+ if (employee == null || employee.getUserId() == null) {
+ return Collections.emptyList();
+ }
+ YearMonth month = YearMonth.parse(period);
+ return feedbackWageApi.getWageDetailList(employee.getUserId(),
+ month.atDay(1).atStartOfDay(), month.atEndOfMonth().atTime(23, 59, 59));
+ }
+
/**
* 鍐呴儴鐢熸垚鍙戞斁鍙拌处鏂规硶锛堜緵鑷姩鐢熸垚璋冪敤锛�
*/
diff --git a/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/feedback/MesProFeedbackWageApi.java b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/feedback/MesProFeedbackWageApi.java
new file mode 100644
index 0000000..124eb0c
--- /dev/null
+++ b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/feedback/MesProFeedbackWageApi.java
@@ -0,0 +1,48 @@
+package cn.iocoder.yudao.module.mes.api.feedback;
+
+import cn.iocoder.yudao.module.mes.api.feedback.dto.MesProFeedbackWageDetailRespDTO;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * MES 鐢熶骇鎶ュ伐宸ヨ祫 API 鎺ュ彛
+ *
+ * 渚� HRM 钖叕鏍哥畻姹囨�汇�岃皝鎶ョ殑宸ュ氨绠楄皝鐨勫伐璧勩��
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface MesProFeedbackWageApi {
+
+ /**
+ * 姹囨�绘寚瀹氭姤宸ヤ汉鍦ㄦ煇鏃堕棿娈靛唴宸插鎵归�氳繃鎶ュ伐鐨勫伐璧�
+ *
+ * <p>缁熻鍙e緞锛氭姤宸ュ崟鐘舵�佷负寰呮楠�/宸插畬鎴愶紙鍗冲鎵瑰凡閫氳繃锛夛紝涓旀姤宸ユ椂闂磋惤鍦ㄦ椂闂存鍐咃紱
+ * 鑽夌銆佸鎵逛腑鐨勬姤宸ヤ笉璁¤柂銆�
+ *
+ * @param feedbackUserIds 鎶ュ伐浜猴紙绯荤粺鐢ㄦ埛锛夌紪鍙烽泦鍚�
+ * @param beginTime 寮�濮嬫椂闂达紙鍚級
+ * @param endTime 缁撴潫鏃堕棿锛堝惈锛�
+ * @return 鎶ュ伐浜虹紪鍙� 鈫� 鎶ュ伐宸ヨ祫鍚堣锛涙病鏈夋姤宸ョ殑浜轰笉浼氬嚭鐜板湪 Map 涓�
+ */
+ Map<Long, BigDecimal> getWageAmountMap(Collection<Long> feedbackUserIds,
+ LocalDateTime beginTime, LocalDateTime endTime);
+
+ /**
+ * 鏌ヨ鎸囧畾鎶ュ伐浜哄湪鏌愭椂闂存鍐呭凡瀹℃壒閫氳繃鎶ュ伐鐨勫伐璧勬槑缁�
+ *
+ * <p>缁熻鍙e緞涓� {@link #getWageAmountMap} 涓�鑷达紱杩斿洖鐨勬瘡鏉¤褰曞寘鍚姤宸ュ崟鍙枫�佸伐搴忋��
+ * 涓诲伐璧勩�佽緟鍔╁伐璧勩�佽嚜瀹氫箟宸ヨ祫瀛楁鏄庣粏銆佽川閲忚皟鏁翠笌鏈�缁堝伐璧勶紝渚涜柂閰牳绠楀睍绀恒��
+ *
+ * @param feedbackUserId 鎶ュ伐浜猴紙绯荤粺鐢ㄦ埛锛夌紪鍙�
+ * @param beginTime 寮�濮嬫椂闂达紙鍚級
+ * @param endTime 缁撴潫鏃堕棿锛堝惈锛�
+ * @return 鎶ュ伐宸ヨ祫鏄庣粏鍒楄〃锛屾寜鎶ュ伐鏃堕棿鍊掑簭
+ */
+ List<MesProFeedbackWageDetailRespDTO> getWageDetailList(Long feedbackUserId,
+ LocalDateTime beginTime, LocalDateTime endTime);
+
+}
diff --git a/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/feedback/dto/MesProFeedbackWageDetailRespDTO.java b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/feedback/dto/MesProFeedbackWageDetailRespDTO.java
new file mode 100644
index 0000000..f1481d5
--- /dev/null
+++ b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/feedback/dto/MesProFeedbackWageDetailRespDTO.java
@@ -0,0 +1,118 @@
+package cn.iocoder.yudao.module.mes.api.feedback.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * MES 鐢熶骇鎶ュ伐宸ヨ祫鏄庣粏 DTO
+ *
+ * <p>渚� HRM 钖叕鏍哥畻鏌ョ湅銆屾姤宸ュ伐璧勩�嶇敱鍝簺鎶ュ伐鍗曘�佸摢浜涜嚜瀹氫箟宸ヨ祫瀛楁鏋勬垚銆�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Data
+public class MesProFeedbackWageDetailRespDTO {
+
+ /**
+ * 鎶ュ伐缂栧彿
+ */
+ private Long feedbackId;
+ /**
+ * 鎶ュ伐鍗曞彿
+ */
+ private String feedbackNo;
+ /**
+ * 宸ュ簭缂栧彿
+ */
+ private Long processId;
+ /**
+ * 宸ュ簭鍚嶇О
+ */
+ private String processName;
+ /**
+ * 鎶ュ伐鏃堕棿
+ */
+ private LocalDateTime feedbackTime;
+ /**
+ * 鎶ュ伐鐘舵��
+ */
+ private Integer status;
+ /**
+ * 璁¤垂绫诲瀷锛�1-璁℃椂 2-璁′欢
+ */
+ private Integer billingType;
+ /**
+ * 鎶ュ伐宸ユ椂锛堝皬鏃讹級
+ */
+ private BigDecimal workHours;
+ /**
+ * 鎶ュ伐鏁伴噺
+ */
+ private BigDecimal feedbackQuantity;
+ /**
+ * 鍚堟牸鏁伴噺锛堣浠惰浠峰彛寰勶級
+ */
+ private BigDecimal qualifiedQuantity;
+ /**
+ * 涓诲伐璧�
+ */
+ private BigDecimal mainWage;
+ /**
+ * 杈呭姪宸ヨ祫
+ */
+ private BigDecimal auxWage;
+ /**
+ * 鑷畾涔夊伐璧勫瓧娈佃皟鏁村悎璁�
+ */
+ private BigDecimal fieldWage;
+ /**
+ * 璐ㄩ噺璋冩暣鍓嶅伐璧勶紙涓诲伐璧� + 杈呭姪宸ヨ祫 + 瀛楁璋冩暣锛�
+ */
+ private BigDecimal preQualityWage;
+ /**
+ * 璐ㄩ噺璋冩暣閲戦锛堟渶缁堝伐璧� 鈭� 璐ㄩ噺璋冩暣鍓嶅伐璧勶紝鎵f涓鸿礋锛�
+ */
+ private BigDecimal qualityAdjustment;
+ /**
+ * 鏈�缁堝伐璧勶紙鎶ュ伐宸ヨ祫锛�
+ */
+ private BigDecimal finalWage;
+ /**
+ * 鑷畾涔夊伐璧勫瓧娈垫槑缁�
+ */
+ private List<Field> fields;
+
+ @Data
+ public static class Field {
+
+ /**
+ * 瀛楁缂栫爜
+ */
+ private String code;
+ /**
+ * 瀛楁鍚嶇О
+ */
+ private String name;
+ /**
+ * 璁$畻瑙掕壊锛�1-绯绘暟 2-鍔犲噺閲戦 3-璁′环鏁伴噺 4-浠呰褰�
+ */
+ private Integer role;
+ /**
+ * 鍙栧�硷紙璐ㄦ濉啓鍊间紭鍏堜簬宸ュ簭鍥哄畾鍊硷級
+ */
+ private String value;
+ /**
+ * 璁′环鏁伴噺瑙掕壊鐨勫崟浠�
+ */
+ private BigDecimal unitPrice;
+ /**
+ * 鏈瓧娈佃鍏ュ伐璧勭殑閲戦
+ */
+ private BigDecimal amount;
+
+ }
+
+}
diff --git a/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/mps/MesProMpsApi.java b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/mps/MesProMpsApi.java
index e8c9201..758a31c 100644
--- a/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/mps/MesProMpsApi.java
+++ b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/mps/MesProMpsApi.java
@@ -69,13 +69,8 @@
*/
Boolean checkSaleOrderProductionFinished(Long saleOrderId);
- /**
- * 鏍规嵁宸ュ崟ID鑾峰彇 MPS
- *
- * @param workOrderId 宸ュ崟ID
- * @return MPS 淇℃伅
- */
- MesProMpsRespDTO getMpsByWorkOrderId(Long workOrderId);
+ /** 鑾峰彇宸ュ崟鍏宠仈鐨勫叏閮� MPS锛屽吋瀹瑰巻鍙插悎骞跺伐鍗曘�� */
+ List<MesProMpsRespDTO> getMpsListByWorkOrderId(Long workOrderId);
/**
* 鏇存柊 MPS 鐨勫凡鐢熶骇鏁伴噺锛堢疮鍔狅級
@@ -96,4 +91,4 @@
*/
Boolean checkAndFinishMps(Long mpsId);
-}
\ No newline at end of file
+}
diff --git a/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/productsales/MesWmProductSalesApi.java b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/productsales/MesWmProductSalesApi.java
index 79ca157..c2203cc 100644
--- a/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/productsales/MesWmProductSalesApi.java
+++ b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/productsales/MesWmProductSalesApi.java
@@ -2,6 +2,7 @@
import cn.iocoder.yudao.module.mes.api.productsales.dto.MesWmProductSalesRespDTO;
+import java.util.Collection;
import java.util.List;
/**
@@ -20,6 +21,14 @@
List<MesWmProductSalesRespDTO> getProductSalesListBySaleOrderId(Long saleOrderId);
/**
+ * 鏍规嵁閿�鍞鍗曠紪鍙烽泦鍚堟壒閲忔煡璇㈠嚭搴撳崟鍒楄〃
+ *
+ * @param saleOrderIds 閿�鍞鍗曠紪鍙烽泦鍚�
+ * @return 鍑哄簱鍗曞垪琛紙鍚槑缁嗭級
+ */
+ List<MesWmProductSalesRespDTO> getProductSalesListBySaleOrderIds(Collection<Long> saleOrderIds);
+
+ /**
* 鏍规嵁瀹㈡埛缂栧彿鏌ヨ鍑哄簱鍗曞垪琛�
*
* @param clientId 瀹㈡埛缂栧彿
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/feedback/MesProFeedbackWageApiImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/feedback/MesProFeedbackWageApiImpl.java
new file mode 100644
index 0000000..54f8d43
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/feedback/MesProFeedbackWageApiImpl.java
@@ -0,0 +1,138 @@
+package cn.iocoder.yudao.module.mes.api.feedback;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
+import cn.iocoder.yudao.module.mes.api.feedback.dto.MesProFeedbackWageDetailRespDTO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.feedback.MesProFeedbackMapper;
+import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
+import cn.iocoder.yudao.module.mes.service.pro.wage.MesProFeedbackWageBreakdown;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.*;
+
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+
+/**
+ * MES 鐢熶骇鎶ュ伐宸ヨ祫 API 瀹炵幇绫�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class MesProFeedbackWageApiImpl implements MesProFeedbackWageApi {
+
+ @Resource
+ private MesProFeedbackMapper feedbackMapper;
+ @Resource
+ private MesProProcessService processService;
+
+ @Override
+ public Map<Long, BigDecimal> getWageAmountMap(Collection<Long> feedbackUserIds,
+ LocalDateTime beginTime, LocalDateTime endTime) {
+ if (CollUtil.isEmpty(feedbackUserIds)) {
+ return Collections.emptyMap();
+ }
+ List<MesProFeedbackDO> list = feedbackMapper.selectWageListByUserIds(feedbackUserIds, beginTime, endTime);
+ Map<Long, BigDecimal> result = new LinkedHashMap<>();
+ for (MesProFeedbackDO feedback : list) {
+ if (feedback.getFeedbackUserId() == null) {
+ continue;
+ }
+ BigDecimal wage = feedback.getWageAmount() != null ? feedback.getWageAmount() : BigDecimal.ZERO;
+ result.merge(feedback.getFeedbackUserId(), wage, BigDecimal::add);
+ }
+ return result;
+ }
+
+ @Override
+ public List<MesProFeedbackWageDetailRespDTO> getWageDetailList(Long feedbackUserId,
+ LocalDateTime beginTime, LocalDateTime endTime) {
+ if (feedbackUserId == null) {
+ return Collections.emptyList();
+ }
+ List<MesProFeedbackDO> list = feedbackMapper.selectWageListByUserIds(
+ Collections.singleton(feedbackUserId), beginTime, endTime);
+ if (CollUtil.isEmpty(list)) {
+ return Collections.emptyList();
+ }
+ Map<Long, MesProProcessDO> processMap = processService.getProcessMap(
+ convertSet(list, MesProFeedbackDO::getProcessId));
+ List<MesProFeedbackWageDetailRespDTO> result = new ArrayList<>(list.size());
+ for (MesProFeedbackDO feedback : list) {
+ result.add(buildWageDetail(feedback, processMap.get(feedback.getProcessId())));
+ }
+ // 鎶ュ伐鏃堕棿鍊掑簭锛屾渶杩戠殑鎶ュ伐鎺掑湪鏈�鍓�
+ result.sort(Comparator.comparing(MesProFeedbackWageDetailRespDTO::getFeedbackTime,
+ Comparator.nullsLast(Comparator.reverseOrder())));
+ return result;
+ }
+
+ private MesProFeedbackWageDetailRespDTO buildWageDetail(MesProFeedbackDO feedback, MesProProcessDO process) {
+ MesProFeedbackWageDetailRespDTO detail = new MesProFeedbackWageDetailRespDTO();
+ detail.setFeedbackId(feedback.getId());
+ detail.setFeedbackNo(feedback.getCode());
+ detail.setProcessId(feedback.getProcessId());
+ detail.setProcessName(process != null ? process.getName() : null);
+ detail.setFeedbackTime(feedback.getFeedbackTime());
+ detail.setStatus(feedback.getStatus());
+ detail.setBillingType(feedback.getBillingType());
+ detail.setWorkHours(feedback.getWorkHours());
+ detail.setFeedbackQuantity(feedback.getFeedbackQuantity());
+ detail.setQualifiedQuantity(feedback.getQualifiedQuantity());
+
+ MesProFeedbackWageBreakdown breakdown = StrUtil.isNotBlank(feedback.getWageBreakdown())
+ ? JsonUtils.parseObject(feedback.getWageBreakdown(), MesProFeedbackWageBreakdown.class) : null;
+ BigDecimal mainWage;
+ BigDecimal auxWage;
+ if (breakdown != null) {
+ mainWage = breakdown.getMainWage() != null ? breakdown.getMainWage() : BigDecimal.ZERO;
+ auxWage = breakdown.getAuxWage() != null ? breakdown.getAuxWage()
+ : (feedback.getAuxWageAmount() != null ? feedback.getAuxWageAmount() : BigDecimal.ZERO);
+ } else {
+ // 鏀归�犲墠鐨勫巻鍙叉姤宸ユ病鏈夊伐璧勬媶鍒嗗揩鐓э細鎶婃姤宸ュ伐璧勬暣浣撹涓轰富宸ヨ祫锛�
+ // 淇濊瘉鏄庣粏涓�屼富宸ヨ祫 + 杈呭姪宸ヨ祫 + 瀛楁璋冩暣 + 璐ㄩ噺璋冩暣 = 鏈�缁堝伐璧勩�嶄粛鐒跺寰椾笂
+ auxWage = feedback.getAuxWageAmount() != null ? feedback.getAuxWageAmount() : BigDecimal.ZERO;
+ mainWage = feedback.getWageAmount() != null
+ ? feedback.getWageAmount().subtract(auxWage).max(BigDecimal.ZERO) : BigDecimal.ZERO;
+ }
+ detail.setMainWage(mainWage);
+ detail.setAuxWage(auxWage);
+
+ // 鑷畾涔夊伐璧勫瓧娈垫槑缁�
+ List<MesProFeedbackWageDetailRespDTO.Field> fields = new ArrayList<>();
+ BigDecimal fieldWage = BigDecimal.ZERO;
+ if (breakdown != null && CollUtil.isNotEmpty(breakdown.getFields())) {
+ for (MesProFeedbackWageBreakdown.FieldSnapshot snapshot : breakdown.getFields()) {
+ MesProFeedbackWageDetailRespDTO.Field field = new MesProFeedbackWageDetailRespDTO.Field();
+ field.setCode(snapshot.getCode());
+ field.setName(snapshot.getName());
+ field.setRole(snapshot.getRole());
+ field.setValue(snapshot.getValue());
+ field.setUnitPrice(snapshot.getUnitPrice());
+ field.setAmount(snapshot.getAmount() != null ? snapshot.getAmount() : BigDecimal.ZERO);
+ fields.add(field);
+ fieldWage = fieldWage.add(field.getAmount());
+ }
+ }
+ detail.setFields(fields);
+ detail.setFieldWage(fieldWage);
+
+ BigDecimal preQualityWage = breakdown != null && breakdown.getPreQualityWage() != null
+ ? breakdown.getPreQualityWage() : mainWage.add(auxWage).add(fieldWage);
+ BigDecimal finalWage = feedback.getWageAmount() != null
+ ? feedback.getWageAmount()
+ : (breakdown != null && breakdown.getFinalWage() != null ? breakdown.getFinalWage() : preQualityWage);
+ detail.setPreQualityWage(preQualityWage);
+ detail.setFinalWage(finalWage);
+ detail.setQualityAdjustment(finalWage.subtract(preQualityWage));
+ return detail;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/mps/MesProMpsApiImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/mps/MesProMpsApiImpl.java
index be25a16..2f0cfb8 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/mps/MesProMpsApiImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/mps/MesProMpsApiImpl.java
@@ -103,9 +103,8 @@
}
@Override
- public MesProMpsRespDTO getMpsByWorkOrderId(Long workOrderId) {
- MesProMpsDO mps = mpsService.getMpsByWorkOrderId(workOrderId);
- return BeanUtils.toBean(mps, MesProMpsRespDTO.class);
+ public List<MesProMpsRespDTO> getMpsListByWorkOrderId(Long workOrderId) {
+ return BeanUtils.toBean(mpsService.getMpsListByWorkOrderId(workOrderId), MesProMpsRespDTO.class);
}
@Override
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/productsales/MesWmProductSalesApiImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/productsales/MesWmProductSalesApiImpl.java
index 9830f0a..584c811 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/productsales/MesWmProductSalesApiImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/productsales/MesWmProductSalesApiImpl.java
@@ -12,6 +12,7 @@
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -37,6 +38,14 @@
}
@Override
+ public List<MesWmProductSalesRespDTO> getProductSalesListBySaleOrderIds(Collection<Long> saleOrderIds) {
+ if (CollUtil.isEmpty(saleOrderIds)) {
+ return List.of();
+ }
+ return convertList(productSalesMapper.selectListBySaleOrderIds(saleOrderIds));
+ }
+
+ @Override
public List<MesWmProductSalesRespDTO> getProductSalesListByClientId(Long clientId) {
if (clientId == null) {
return List.of();
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/calendar/MesCalCalendarController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/calendar/MesCalCalendarController.java
deleted file mode 100644
index c7b2b91..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/calendar/MesCalCalendarController.java
+++ /dev/null
@@ -1,211 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.calendar;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.LocalDateTimeUtil;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.calendar.vo.MesCalCalendarListReqVO;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.calendar.vo.MesCalCalendarRespVO;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.shift.MesCalTeamShiftListReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.holiday.MesCalHolidayDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanShiftDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.team.MesCalTeamDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.team.MesCalTeamMemberDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.team.MesCalTeamShiftDO;
-import cn.iocoder.yudao.module.mes.enums.cal.MesCalHolidayTypeEnum;
-import cn.iocoder.yudao.module.mes.service.cal.holiday.MesCalHolidayService;
-import cn.iocoder.yudao.module.mes.service.cal.plan.MesCalPlanService;
-import cn.iocoder.yudao.module.mes.service.cal.plan.MesCalPlanShiftService;
-import cn.iocoder.yudao.module.mes.service.cal.team.MesCalTeamMemberService;
-import cn.iocoder.yudao.module.mes.service.cal.team.MesCalTeamService;
-import cn.iocoder.yudao.module.mes.service.cal.team.MesCalTeamShiftService;
-import io.swagger.v3.oas.annotations.Operation;
-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.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.time.LocalDateTime;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
-
-@Tag(name = "绠$悊鍚庡彴 - MES 鎺掔彮鏃ュ巻")
-@RestController
-@RequestMapping("/mes/cal/calendar")
-@Validated
-public class MesCalCalendarController {
-
- @Resource
- private MesCalTeamShiftService teamShiftService;
- @Resource
- private MesCalTeamService teamService;
- @Resource
- private MesCalPlanShiftService planShiftService;
- @Resource
- private MesCalPlanService planService;
- @Resource
- private MesCalTeamMemberService teamMemberService;
- @Resource
- private MesCalHolidayService holidayService;
-
- @GetMapping("/list")
- @Operation(summary = "鏌ヨ鎺掔彮鏃ュ巻")
- public CommonResult<List<MesCalCalendarRespVO>> getCalendarList(@Valid MesCalCalendarListReqVO reqVO) {
- // 1.1 鏍规嵁鏌ヨ绫诲瀷鑾峰彇鐝粍鎺掔彮璁板綍
- List<MesCalTeamShiftDO> teamShifts = getTeamShifts(reqVO);
- if (CollUtil.isEmpty(teamShifts)) {
- return success(Collections.emptyList());
- }
- // 1.2 鎸夋棩鏈熻寖鍥存煡璇㈠亣鏈燂紝鏋勫缓鑺傚亣鏃ユ棩鏈熼泦鍚�
- Set<String> holidaySet = buildHolidaySet(reqVO.getStartDay(), reqVO.getEndDay());
- // 1.3 鎵归噺鏌ヨ鍏宠仈鏁版嵁锛氱彮缁勩�佺彮娆°�佹帓鐝鍒�
- Map<Long, MesCalTeamDO> teamMap = teamService.getTeamMap(
- convertSet(teamShifts, MesCalTeamShiftDO::getTeamId));
- Map<Long, MesCalPlanShiftDO> shiftMap = planShiftService.getPlanShiftMap(
- convertSet(teamShifts, MesCalTeamShiftDO::getShiftId));
- Map<Long, MesCalPlanDO> planMap = planService.getPlanMap(
- convertSet(teamShifts, MesCalTeamShiftDO::getPlanId));
-
- // 2. 鎸� day 鍒嗙粍鑱氬悎
- Map<String, List<MesCalTeamShiftDO>> dayGroupMap = convertMultiMap(teamShifts,
- teamShift -> LocalDateTimeUtil.format(teamShift.getDay(), DatePattern.NORM_DATE_PATTERN));
-
- // 3. 閬嶅巻鍒嗙粍锛岃繃婊ゅ亣鏈燂紝鏋勫缓鏃ュ巻鍝嶅簲
- List<MesCalCalendarRespVO> result = new ArrayList<>();
- for (Map.Entry<String, List<MesCalTeamShiftDO>> entry : dayGroupMap.entrySet()) {
- String dayStr = entry.getKey();
- // 3.1 杩囨护鑺傚亣鏃�
- if (holidaySet.contains(dayStr)) {
- continue;
- }
- List<MesCalTeamShiftDO> dayShifts = entry.getValue();
- dayShifts.sort(Comparator.comparing(ts -> ts.getSort() != null ? ts.getSort() : 0));
- // 3.2 鑾峰彇杞彮鏂瑰紡锛堝彇绗竴鏉¤褰曞叧鑱旂殑鎺掔彮璁″垝锛�
- Integer shiftType = null;
- MesCalTeamShiftDO first = dayShifts.get(0);
- if (first.getPlanId() != null) {
- MesCalPlanDO plan = planMap.get(first.getPlanId());
- if (plan != null) {
- shiftType = plan.getShiftType();
- }
- }
- // 3.3 鏋勫缓鐝粍鎺掔彮椤瑰垪琛�
- List<MesCalCalendarRespVO.TeamShiftItem> items = convertList(dayShifts,
- teamShift -> buildTeamShiftItem(teamShift, teamMap, shiftMap));
-
- // 3.4 鏋勫缓鏃ュ巻椤癸紝娣诲姞鍒扮粨鏋滃垪琛�
- MesCalCalendarRespVO calendarVO = MesCalCalendarRespVO.builder()
- .day(LocalDateTimeUtil.parseDate(dayStr, DatePattern.NORM_DATE_FORMATTER).atStartOfDay())
- .shiftType(shiftType)
- .teamShifts(items)
- .build();
- result.add(calendarVO);
- }
- return success(result);
- }
-
- /**
- * 鏍规嵁鏌ヨ绫诲瀷鑾峰彇鐝粍鎺掔彮璁板綍
- */
- @SuppressWarnings("EnhancedSwitchMigration")
- private List<MesCalTeamShiftDO> getTeamShifts(MesCalCalendarListReqVO reqVO) {
- LocalDateTime startDay = reqVO.getStartDay();
- LocalDateTime endDay = reqVO.getEndDay();
- switch (reqVO.getQueryType()) {
- case MesCalCalendarListReqVO.QUERY_TYPE_TYPE:
- return getTeamShiftsByCalendarType(reqVO.getCalendarType(), startDay, endDay);
- case MesCalCalendarListReqVO.QUERY_TYPE_TEAM:
- return getTeamShiftsByTeamId(reqVO.getTeamId(), startDay, endDay);
- case MesCalCalendarListReqVO.QUERY_TYPE_USER:
- return getTeamShiftsByUserId(reqVO.getUserId(), startDay, endDay);
- default:
- return Collections.emptyList();
- }
- }
-
- /**
- * 鏋勫缓鍗曟潯 TeamShiftItem
- */
- private MesCalCalendarRespVO.TeamShiftItem buildTeamShiftItem(MesCalTeamShiftDO ts,
- Map<Long, MesCalTeamDO> teamMap,
- Map<Long, MesCalPlanShiftDO> shiftMap) {
- MesCalTeamDO team = teamMap.get(ts.getTeamId());
- MesCalPlanShiftDO shift = shiftMap.get(ts.getShiftId());
- return MesCalCalendarRespVO.TeamShiftItem.builder()
- .teamId(ts.getTeamId()).teamName(team != null ? team.getName() : null)
- .shiftId(ts.getShiftId()).shiftName(shift != null ? shift.getName() : null)
- .sort(ts.getSort()).build();
- }
-
- /**
- * 鎸夌彮缁勭被鍨嬫煡璇㈡帓鐝褰�
- */
- private List<MesCalTeamShiftDO> getTeamShiftsByCalendarType(Integer calendarType,
- LocalDateTime startDay, LocalDateTime endDay) {
- if (calendarType == null) {
- return Collections.emptyList();
- }
- // 1. 鏌ヨ鎸囧畾绫诲瀷鐨勬墍鏈夌彮缁�
- List<MesCalTeamDO> teams = teamService.getTeamList().stream()
- .filter(t -> calendarType.equals(t.getCalendarType()))
- .collect(Collectors.toList());
- if (CollUtil.isEmpty(teams)) {
- return Collections.emptyList();
- }
- // 2. 涓�娆� IN 鏌ヨ杩欎簺鐝粍鍦ㄦ棩鏈熻寖鍥村唴鐨勬帓鐝褰�
- MesCalTeamShiftListReqVO reqVO = new MesCalTeamShiftListReqVO()
- .setTeamIds(convertSet(teams, MesCalTeamDO::getId))
- .setStartDay(startDay).setEndDay(endDay);
- return teamShiftService.getTeamShiftList(reqVO);
- }
-
- /**
- * 鎸夌彮缁勭紪鍙锋煡璇㈡帓鐝褰�
- */
- private List<MesCalTeamShiftDO> getTeamShiftsByTeamId(Long teamId, LocalDateTime startDay, LocalDateTime endDay) {
- if (teamId == null) {
- return Collections.emptyList();
- }
- MesCalTeamShiftListReqVO reqVO = new MesCalTeamShiftListReqVO()
- .setTeamId(teamId).setStartDay(startDay).setEndDay(endDay);
- return teamShiftService.getTeamShiftList(reqVO);
- }
-
- /**
- * 鎸夌敤鎴风紪鍙锋煡璇㈡帓鐝褰曪紙鍏堟煡鐢ㄦ埛鎵�灞炵彮缁勶紝鍐嶆煡鐝粍鎺掔彮锛�
- */
- private List<MesCalTeamShiftDO> getTeamShiftsByUserId(Long userId,
- LocalDateTime startDay, LocalDateTime endDay) {
- if (userId == null) {
- return Collections.emptyList();
- }
- // 1. 鏌ヨ鐢ㄦ埛鎵�灞炵殑鐝粍锛堜竴涓敤鎴峰彧灞炰簬涓�涓彮缁勶級
- MesCalTeamMemberDO member = teamMemberService.getTeamMemberByUserId(userId);
- if (member == null) {
- return Collections.emptyList();
- }
- // 2. 鏌ヨ璇ョ彮缁勫湪鏃ユ湡鑼冨洿鍐呯殑鎺掔彮璁板綍
- MesCalTeamShiftListReqVO reqVO = new MesCalTeamShiftListReqVO()
- .setTeamId(member.getTeamId()).setStartDay(startDay).setEndDay(endDay);
- return teamShiftService.getTeamShiftList(reqVO);
- }
-
- /**
- * 鎸夋棩鏈熻寖鍥存煡璇㈠亣鏈燂紝鏋勫缓鑺傚亣鏃ユ棩鏈熼泦鍚堬紙yyyy-MM-dd 鏍煎紡锛�
- */
- private Set<String> buildHolidaySet(LocalDateTime startDay, LocalDateTime endDay) {
- List<MesCalHolidayDO> holidays = holidayService.getHolidayList(startDay, endDay);
- return convertSet(holidays,
- holiday -> LocalDateTimeUtil.format(holiday.getDay(), DatePattern.NORM_DATE_PATTERN),
- holiday -> MesCalHolidayTypeEnum.HOLIDAY.getType().equals(holiday.getType()));
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/calendar/vo/MesCalCalendarListReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/calendar/vo/MesCalCalendarListReqVO.java
deleted file mode 100644
index ac4774d..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/calendar/vo/MesCalCalendarListReqVO.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.calendar.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@Schema(description = "绠$悊鍚庡彴 - MES 鎺掔彮鏃ュ巻鏌ヨ Request VO")
-@Data
-public class MesCalCalendarListReqVO {
-
- public static final String QUERY_TYPE_TYPE = "TYPE";
- public static final String QUERY_TYPE_TEAM = "TEAM";
- public static final String QUERY_TYPE_USER = "USER";
-
- @Schema(description = "寮�濮嬫棩鏈�", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "寮�濮嬫棩鏈熶笉鑳戒负绌�")
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- private LocalDateTime startDay;
-
- @Schema(description = "缁撴潫鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "缁撴潫鏃ユ湡涓嶈兘涓虹┖")
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- private LocalDateTime endDay;
-
- @Schema(description = "鏌ヨ绫诲瀷锛歍YPE-鎸夊垎绫伙紝TEAM-鎸夌彮缁勶紝USER-鎸変釜浜�", requiredMode = Schema.RequiredMode.REQUIRED, example = "TYPE")
- @NotEmpty(message = "鏌ヨ绫诲瀷涓嶈兘涓虹┖")
- private String queryType;
-
- @Schema(description = "鐝粍绫诲瀷锛坬ueryType=TYPE 鏃朵娇鐢級", example = "1")
- private Integer calendarType;
-
- @Schema(description = "鐝粍缂栧彿锛坬ueryType=TEAM 鏃朵娇鐢級", example = "201")
- private Long teamId;
-
- @Schema(description = "鐢ㄦ埛缂栧彿锛坬ueryType=USER 鏃朵娇鐢級", example = "1")
- private Long userId;
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/calendar/vo/MesCalCalendarRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/calendar/vo/MesCalCalendarRespVO.java
deleted file mode 100644
index 254857e..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/calendar/vo/MesCalCalendarRespVO.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.calendar.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Schema(description = "绠$悊鍚庡彴 - MES 鎺掔彮鏃ュ巻 Response VO")
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class MesCalCalendarRespVO {
-
- @Schema(description = "鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED, example = "2025-01-15 00:00:00")
- private LocalDateTime day;
-
- @Schema(description = "杞彮鏂瑰紡", example = "2")
- private Integer shiftType; // 瀵瑰簲 MesCalShiftTypeEnum 鏋氫妇鍊�
-
- @Schema(description = "鐝粍鎺掔彮鍒楄〃")
- private List<TeamShiftItem> teamShifts;
-
- @Schema(description = "鐝粍鎺掔彮椤�")
- @Data
- @Builder
- @NoArgsConstructor
- @AllArgsConstructor
- public static class TeamShiftItem {
-
- @Schema(description = "鐝粍缂栧彿", example = "201")
- private Long teamId;
-
- @Schema(description = "鐝粍鍚嶇О", example = "娉ㄥA缁�")
- private String teamName;
-
- @Schema(description = "鐝缂栧彿", example = "1")
- private Long shiftId;
-
- @Schema(description = "鐝鍚嶇О", example = "鐧界彮")
- private String shiftName;
-
- @Schema(description = "鎺掑簭", example = "1")
- private Integer sort;
-
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/MesCalHolidayController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/MesCalHolidayController.java
deleted file mode 100644
index 782bbaa..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/MesCalHolidayController.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.holiday;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.holiday.vo.MesCalHolidayRespVO;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.holiday.vo.MesCalHolidaySaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.holiday.MesCalHolidayDO;
-import cn.iocoder.yudao.module.mes.service.cal.holiday.MesCalHolidayService;
-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.format.annotation.DateTimeFormat;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "绠$悊鍚庡彴 - MES 鍋囨湡璁剧疆")
-@RestController
-@RequestMapping("/mes/cal/holiday")
-@Validated
-public class MesCalHolidayController {
-
- @Resource
- private MesCalHolidayService holidayService;
-
- @PostMapping("/save")
- @Operation(summary = "淇濆瓨鍋囨湡璁剧疆", description = "濡傛灉璇ユ棩鏈熷凡瀛樺湪璁板綍锛屽垯鏇存柊")
- @PreAuthorize("@ss.hasPermission('mes:cal-holiday:create')")
- public CommonResult<Long> saveHoliday(@Valid @RequestBody MesCalHolidaySaveReqVO saveReqVO) {
- return success(holidayService.saveHoliday(saveReqVO));
- }
-
- @GetMapping("/get-by-day")
- @Operation(summary = "鏍规嵁鏃ユ湡鑾峰緱鍋囨湡璁剧疆")
- @Parameter(name = "day", description = "鏃ユ湡", required = true)
- public CommonResult<MesCalHolidayRespVO> getHolidayByDay(
- @RequestParam("day") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) LocalDateTime day) {
- MesCalHolidayDO holiday = holidayService.getHolidayByDay(day);
- return success(BeanUtils.toBean(holiday, MesCalHolidayRespVO.class));
- }
-
- @GetMapping("/list")
- @Operation(summary = "鑾峰緱鍋囨湡璁剧疆鍒楄〃", description = "鏀寔鍙�夋棩鏈熻寖鍥磋繃婊わ紝涓嶄紶鍒欒繑鍥炲叏閲忔暟鎹�")
- public CommonResult<List<MesCalHolidayRespVO>> getHolidayList(
- @RequestParam(value = "startDay", required = false)
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) LocalDateTime startDay,
- @RequestParam(value = "endDay", required = false)
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) LocalDateTime endDay) {
- List<MesCalHolidayDO> list = holidayService.getHolidayList(startDay, endDay);
- return success(BeanUtils.toBean(list, MesCalHolidayRespVO.class));
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidayRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidayRespVO.java
deleted file mode 100644
index cfde7a0..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidayRespVO.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.holiday.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "绠$悊鍚庡彴 - MES 鍋囨湡璁剧疆 Response VO")
-@Data
-public class MesCalHolidayRespVO {
-
- @Schema(description = "缂栧彿", example = "1024")
- private Long id;
-
- @Schema(description = "鏃ユ湡")
- private LocalDateTime day;
-
- @Schema(description = "鏃ユ湡绫诲瀷")
- private Integer type;
-
- @Schema(description = "澶囨敞")
- private String remark;
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidaySaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidaySaveReqVO.java
deleted file mode 100644
index 0a85172..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidaySaveReqVO.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.holiday.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "绠$悊鍚庡彴 - MES 鍋囨湡璁剧疆鏂板/淇敼 Request VO")
-@Data
-public class MesCalHolidaySaveReqVO {
-
- @Schema(description = "缂栧彿", example = "1024")
- private Long id;
-
- @Schema(description = "鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "鏃ユ湡涓嶈兘涓虹┖")
- private LocalDateTime day;
-
- @Schema(description = "鏃ユ湡绫诲瀷", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
- @NotNull(message = "鏃ユ湡绫诲瀷涓嶈兘涓虹┖")
- private Integer type;
-
- @Schema(description = "澶囨敞")
- private String remark;
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/package-info.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/package-info.java
deleted file mode 100644
index 4b2f9f3..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * MES 鏃ュ巻鎺掔彮锛圕alendar / Shift Planning锛夛細鐝銆佺彮缁勩�佺彮缁勬垚鍛樸�佹帓鐝鍒掋�佸亣鏈熻缃瓑鐢熶骇浜哄憳杞彮涓庡伐浣滄棩鍘�
- */
-package cn.iocoder.yudao.module.mes.controller.admin.cal;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanController.java
deleted file mode 100644
index a1c4747..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanController.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.plan;
-
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.MesCalPlanPageReqVO;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.MesCalPlanRespVO;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.MesCalPlanSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanDO;
-import cn.iocoder.yudao.module.mes.service.cal.plan.MesCalPlanService;
-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.servlet.http.HttpServletResponse;
-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.io.IOException;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "绠$悊鍚庡彴 - MES 鎺掔彮璁″垝")
-@RestController
-@RequestMapping("/mes/cal/plan")
-@Validated
-public class MesCalPlanController {
-
- @Resource
- private MesCalPlanService planService;
-
- @PostMapping("/create")
- @Operation(summary = "鍒涘缓鎺掔彮璁″垝")
- @PreAuthorize("@ss.hasPermission('mes:cal-plan:create')")
- public CommonResult<Long> createPlan(@Valid @RequestBody MesCalPlanSaveReqVO createReqVO) {
- return success(planService.createPlan(createReqVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "鏇存柊鎺掔彮璁″垝")
- @PreAuthorize("@ss.hasPermission('mes:cal-plan:update')")
- public CommonResult<Boolean> updatePlan(@Valid @RequestBody MesCalPlanSaveReqVO updateReqVO) {
- planService.updatePlan(updateReqVO);
- return success(true);
- }
-
- @PutMapping("/confirm")
- @Operation(summary = "纭鎺掔彮璁″垝")
- @Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('mes:cal-plan:update')")
- public CommonResult<Boolean> confirmPlan(@RequestParam("id") Long id) {
- planService.confirmPlan(id);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "鍒犻櫎鎺掔彮璁″垝")
- @Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('mes:cal-plan:delete')")
- public CommonResult<Boolean> deletePlan(@RequestParam("id") Long id) {
- planService.deletePlan(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "鑾峰緱鎺掔彮璁″垝")
- @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- public CommonResult<MesCalPlanRespVO> getPlan(@RequestParam("id") Long id) {
- MesCalPlanDO plan = planService.getPlan(id);
- return success(BeanUtils.toBean(plan, MesCalPlanRespVO.class));
- }
-
- @GetMapping("/page")
- @Operation(summary = "鑾峰緱鎺掔彮璁″垝鍒嗛〉")
- public CommonResult<PageResult<MesCalPlanRespVO>> getPlanPage(@Valid MesCalPlanPageReqVO pageReqVO) {
- PageResult<MesCalPlanDO> pageResult = planService.getPlanPage(pageReqVO);
- return success(BeanUtils.toBean(pageResult, MesCalPlanRespVO.class));
- }
-
- @GetMapping("/export-excel")
- @Operation(summary = "瀵煎嚭鎺掔彮璁″垝 Excel")
- @PreAuthorize("@ss.hasPermission('mes:cal-plan:export')")
- @ApiAccessLog(operateType = EXPORT)
- public void exportPlanExcel(@Valid MesCalPlanPageReqVO pageReqVO,
- HttpServletResponse response) throws IOException {
- pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
- List<MesCalPlanDO> list = planService.getPlanPage(pageReqVO).getList();
- // 瀵煎嚭 Excel
- ExcelUtils.write(response, "鎺掔彮璁″垝.xls", "鏁版嵁", MesCalPlanRespVO.class,
- BeanUtils.toBean(list, MesCalPlanRespVO.class));
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanShiftController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanShiftController.java
deleted file mode 100644
index 19031da..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanShiftController.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.plan;
-
-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.cal.plan.vo.shift.MesCalPlanShiftPageReqVO;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.shift.MesCalPlanShiftRespVO;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.shift.MesCalPlanShiftSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanShiftDO;
-import cn.iocoder.yudao.module.mes.service.cal.plan.MesCalPlanShiftService;
-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.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "绠$悊鍚庡彴 - MES 璁″垝鐝")
-@RestController
-@RequestMapping("/mes/cal/plan-shift")
-@Validated
-public class MesCalPlanShiftController {
-
- @Resource
- private MesCalPlanShiftService planShiftService;
-
- @PostMapping("/create")
- @Operation(summary = "鍒涘缓璁″垝鐝")
- @PreAuthorize("@ss.hasPermission('mes:cal-plan:update')")
- public CommonResult<Long> createPlanShift(@Valid @RequestBody MesCalPlanShiftSaveReqVO createReqVO) {
- return success(planShiftService.createPlanShift(createReqVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "鏇存柊璁″垝鐝")
- @PreAuthorize("@ss.hasPermission('mes:cal-plan:update')")
- public CommonResult<Boolean> updatePlanShift(@Valid @RequestBody MesCalPlanShiftSaveReqVO updateReqVO) {
- planShiftService.updatePlanShift(updateReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "鍒犻櫎璁″垝鐝")
- @Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('mes:cal-plan:update')")
- public CommonResult<Boolean> deletePlanShift(@RequestParam("id") Long id) {
- planShiftService.deletePlanShift(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "鑾峰緱璁″垝鐝")
- @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- public CommonResult<MesCalPlanShiftRespVO> getPlanShift(@RequestParam("id") Long id) {
- MesCalPlanShiftDO planShift = planShiftService.getPlanShift(id);
- return success(BeanUtils.toBean(planShift, MesCalPlanShiftRespVO.class));
- }
-
- @GetMapping("/page")
- @Operation(summary = "鑾峰緱璁″垝鐝鍒嗛〉")
- public CommonResult<PageResult<MesCalPlanShiftRespVO>> getPlanShiftPage(@Valid MesCalPlanShiftPageReqVO pageReqVO) {
- PageResult<MesCalPlanShiftDO> pageResult = planShiftService.getPlanShiftPage(pageReqVO);
- return success(BeanUtils.toBean(pageResult, MesCalPlanShiftRespVO.class));
- }
-
- @GetMapping("/list-by-plan")
- @Operation(summary = "鑾峰緱鎸囧畾鎺掔彮璁″垝鐨勭彮娆″垪琛�")
- @Parameter(name = "planId", description = "鎺掔彮璁″垝缂栧彿", required = true)
- public CommonResult<List<MesCalPlanShiftRespVO>> getPlanShiftListByPlan(@RequestParam("planId") Long planId) {
- List<MesCalPlanShiftDO> list = planShiftService.getPlanShiftListByPlanId(planId);
- return success(BeanUtils.toBean(list, MesCalPlanShiftRespVO.class));
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanTeamController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanTeamController.java
deleted file mode 100644
index aa38b9a..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanTeamController.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.plan;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.team.MesCalPlanTeamRespVO;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.team.MesCalPlanTeamSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanTeamDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.team.MesCalTeamDO;
-import cn.iocoder.yudao.module.mes.service.cal.plan.MesCalPlanTeamService;
-import cn.iocoder.yudao.module.mes.service.cal.team.MesCalTeamService;
-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.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.convertList;
-
-@Tag(name = "绠$悊鍚庡彴 - MES 璁″垝鐝粍鍏宠仈")
-@RestController
-@RequestMapping("/mes/cal/plan-team")
-@Validated
-public class MesCalPlanTeamController {
-
- @Resource
- private MesCalPlanTeamService planTeamService;
- @Resource
- private MesCalTeamService teamService;
-
- @PostMapping("/create")
- @Operation(summary = "鍒涘缓璁″垝鐝粍鍏宠仈")
- @PreAuthorize("@ss.hasPermission('mes:cal-plan:update')")
- public CommonResult<Long> createPlanTeam(@Valid @RequestBody MesCalPlanTeamSaveReqVO createReqVO) {
- return success(planTeamService.createPlanTeam(createReqVO));
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "鍒犻櫎璁″垝鐝粍鍏宠仈")
- @Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('mes:cal-plan:update')")
- public CommonResult<Boolean> deletePlanTeam(@RequestParam("id") Long id) {
- planTeamService.deletePlanTeam(id);
- return success(true);
- }
-
- @GetMapping("/list-by-plan")
- @Operation(summary = "鑾峰緱鎸囧畾鎺掔彮璁″垝鐨勭彮缁勫垪琛�")
- @Parameter(name = "planId", description = "鎺掔彮璁″垝缂栧彿", required = true)
- public CommonResult<List<MesCalPlanTeamRespVO>> getPlanTeamListByPlan(@RequestParam("planId") Long planId) {
- List<MesCalPlanTeamDO> list = planTeamService.getPlanTeamListByPlanId(planId);
- List<MesCalPlanTeamRespVO> respList = BeanUtils.toBean(list, MesCalPlanTeamRespVO.class);
- // 鎷艰鐝粍缂栫爜/鍚嶇О
- // TODO @AI锛歩f return
- if (CollUtil.isNotEmpty(respList)) {
- Map<Long, MesCalTeamDO> teamMap = teamService.getTeamMap(
- convertList(respList, MesCalPlanTeamRespVO::getTeamId));
- respList.forEach(resp -> {
- // TODO @AI锛歠indand then
- MesCalTeamDO team = teamMap.get(resp.getTeamId());
- if (team != null) {
- resp.setTeamCode(team.getCode()).setTeamName(team.getName());
- }
- });
- }
- return success(respList);
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/MesCalPlanPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/MesCalPlanPageReqVO.java
deleted file mode 100644
index b88ef25..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/MesCalPlanPageReqVO.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@Schema(description = "绠$悊鍚庡彴 - MES 鎺掔彮璁″垝鍒嗛〉 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MesCalPlanPageReqVO extends PageParam {
-
- @Schema(description = "璁″垝缂栫爜", example = "PLAN001")
- private String code;
-
- @Schema(description = "璁″垝鍚嶇О", example = "2024骞存帓鐝�")
- private String name;
-
- @Schema(description = "杞彮鏂瑰紡", example = "1")
- private Integer shiftType;
-
- @Schema(description = "鐘舵��", example = "0")
- private Integer status;
-
- @Schema(description = "鐝粍绫诲瀷", example = "1")
- private Integer calendarType;
-
- @Schema(description = "寮�濮嬫棩鏈�")
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- private LocalDateTime[] startDate;
-
- @Schema(description = "缁撴潫鏃ユ湡")
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- private LocalDateTime[] endDate;
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/MesCalPlanRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/MesCalPlanRespVO.java
deleted file mode 100644
index 3d57e21..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/MesCalPlanRespVO.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo;
-
-import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
-import cn.idev.excel.annotation.ExcelProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "绠$悊鍚庡彴 - MES 鎺掔彮璁″垝 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class MesCalPlanRespVO {
-
- @Schema(description = "璁″垝缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- @ExcelProperty("璁″垝缂栧彿")
- private Long id;
-
- @Schema(description = "璁″垝缂栫爜", requiredMode = Schema.RequiredMode.REQUIRED, example = "PLAN001")
- @ExcelProperty("璁″垝缂栫爜")
- private String code;
-
- @Schema(description = "璁″垝鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "2024骞存帓鐝鍒�")
- @ExcelProperty("璁″垝鍚嶇О")
- private String name;
-
- @Schema(description = "鐝粍绫诲瀷", example = "1")
- @ExcelProperty("鐝粍绫诲瀷")
- private Integer calendarType;
-
- @Schema(description = "寮�濮嬫棩鏈�", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("寮�濮嬫棩鏈�")
- private LocalDateTime startDate;
-
- @Schema(description = "缁撴潫鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("缁撴潫鏃ユ湡")
- private LocalDateTime endDate;
-
- @Schema(description = "杞彮鏂瑰紡", example = "1")
- @ExcelProperty("杞彮鏂瑰紡")
- private Integer shiftType;
-
- @Schema(description = "鍊掔彮鏂瑰紡", example = "1")
- @ExcelProperty("鍊掔彮鏂瑰紡")
- private Integer shiftMethod;
-
- @Schema(description = "鍊掔彮澶╂暟", example = "7")
- @ExcelProperty("鍊掔彮澶╂暟")
- private Integer shiftCount;
-
- @Schema(description = "鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
- @ExcelProperty("鐘舵��")
- private Integer status;
-
- @Schema(description = "鏄惁鎺掗櫎鍛ㄦ湯", example = "true")
- @ExcelProperty("鏄惁鎺掗櫎鍛ㄦ湯")
- private Boolean excludeWeekend;
-
- @Schema(description = "澶囨敞")
- @ExcelProperty("澶囨敞")
- private String remark;
-
- @Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("鍒涘缓鏃堕棿")
- private LocalDateTime createTime;
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/MesCalPlanSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/MesCalPlanSaveReqVO.java
deleted file mode 100644
index a7d9af5..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/MesCalPlanSaveReqVO.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "绠$悊鍚庡彴 - MES 鎺掔彮璁″垝鏂板/淇敼 Request VO")
-@Data
-public class MesCalPlanSaveReqVO {
-
- @Schema(description = "璁″垝缂栧彿", example = "1024")
- private Long id;
-
- @Schema(description = "璁″垝缂栫爜", requiredMode = Schema.RequiredMode.REQUIRED, example = "PLAN001")
- @NotEmpty(message = "璁″垝缂栫爜涓嶈兘涓虹┖")
- private String code;
-
- @Schema(description = "璁″垝鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "2024骞存帓鐝鍒�")
- @NotEmpty(message = "璁″垝鍚嶇О涓嶈兘涓虹┖")
- private String name;
-
- @Schema(description = "鐝粍绫诲瀷", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "鐝粍绫诲瀷涓嶈兘涓虹┖")
- private Integer calendarType;
-
- @Schema(description = "寮�濮嬫棩鏈�", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "寮�濮嬫棩鏈熶笉鑳戒负绌�")
- private LocalDateTime startDate;
-
- @Schema(description = "缁撴潫鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "缁撴潫鏃ユ湡涓嶈兘涓虹┖")
- private LocalDateTime endDate;
-
- @Schema(description = "杞彮鏂瑰紡", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "杞彮鏂瑰紡涓嶈兘涓虹┖")
- private Integer shiftType;
-
- @Schema(description = "鍊掔彮鏂瑰紡", example = "1")
- private Integer shiftMethod;
-
- @Schema(description = "鍊掔彮澶╂暟", example = "7")
- private Integer shiftCount;
-
- @Schema(description = "鐘舵��", example = "0")
- private Integer status;
-
- @Schema(description = "鏄惁鎺掗櫎鍛ㄦ湯", example = "true")
- private Boolean excludeWeekend;
-
- @Schema(description = "澶囨敞")
- private String remark;
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/shift/MesCalPlanShiftPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/shift/MesCalPlanShiftPageReqVO.java
deleted file mode 100644
index 525e168..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/shift/MesCalPlanShiftPageReqVO.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.shift;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "绠$悊鍚庡彴 - MES 璁″垝鐝鍒嗛〉 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MesCalPlanShiftPageReqVO extends PageParam {
-
- @Schema(description = "鎺掔彮璁″垝缂栧彿", example = "1")
- private Long planId;
-
- @Schema(description = "鐝鍚嶇О", example = "鐧界彮")
- private String name;
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/shift/MesCalPlanShiftRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/shift/MesCalPlanShiftRespVO.java
deleted file mode 100644
index c0613a9..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/shift/MesCalPlanShiftRespVO.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.shift;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "绠$悊鍚庡彴 - MES 璁″垝鐝 Response VO")
-@Data
-public class MesCalPlanShiftRespVO {
-
- @Schema(description = "鐝缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private Long id;
-
- @Schema(description = "鎺掔彮璁″垝缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Long planId;
-
- @Schema(description = "鏄剧ず椤哄簭", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Integer sort;
-
- @Schema(description = "鐝鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "鐧界彮")
- private String name;
-
- @Schema(description = "寮�濮嬫椂闂�", requiredMode = Schema.RequiredMode.REQUIRED, example = "08:00")
- private String startTime;
-
- @Schema(description = "缁撴潫鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED, example = "17:00")
- private String endTime;
-
- @Schema(description = "澶囨敞")
- private String remark;
-
- @Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime createTime;
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/shift/MesCalPlanShiftSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/shift/MesCalPlanShiftSaveReqVO.java
deleted file mode 100644
index cf2cefb..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/shift/MesCalPlanShiftSaveReqVO.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.shift;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-@Schema(description = "绠$悊鍚庡彴 - MES 璁″垝鐝鏂板/淇敼 Request VO")
-@Data
-public class MesCalPlanShiftSaveReqVO {
-
- @Schema(description = "鐝缂栧彿", example = "1024")
- private Long id;
-
- @Schema(description = "鎺掔彮璁″垝缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "鎺掔彮璁″垝涓嶈兘涓虹┖")
- private Long planId;
-
- @Schema(description = "鏄剧ず椤哄簭", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- private Integer sort;
-
- @Schema(description = "鐝鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "鐧界彮")
- @NotEmpty(message = "鐝鍚嶇О涓嶈兘涓虹┖")
- private String name;
-
- @Schema(description = "寮�濮嬫椂闂�", requiredMode = Schema.RequiredMode.REQUIRED, example = "08:00")
- @NotEmpty(message = "寮�濮嬫椂闂翠笉鑳戒负绌�")
- private String startTime;
-
- @Schema(description = "缁撴潫鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED, example = "17:00")
- @NotEmpty(message = "缁撴潫鏃堕棿涓嶈兘涓虹┖")
- private String endTime;
-
- @Schema(description = "澶囨敞")
- private String remark;
-
- }
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/team/MesCalPlanTeamRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/team/MesCalPlanTeamRespVO.java
deleted file mode 100644
index d2a0a0d..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/team/MesCalPlanTeamRespVO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.team;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "绠$悊鍚庡彴 - MES 璁″垝鐝粍鍏宠仈 Response VO")
-@Data
-public class MesCalPlanTeamRespVO {
-
- @Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private Long id;
-
- @Schema(description = "鎺掔彮璁″垝缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Long planId;
-
- @Schema(description = "鐝粍缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Long teamId;
-
- @Schema(description = "鐝粍缂栫爜", example = "T001")
- private String teamCode;
-
- @Schema(description = "鐝粍鍚嶇О", example = "A缁�")
- private String teamName;
-
- @Schema(description = "澶囨敞")
- private String remark;
-
- @Schema(description = "鍒涘缓鏃堕棿")
- private LocalDateTime createTime;
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/team/MesCalPlanTeamSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/team/MesCalPlanTeamSaveReqVO.java
deleted file mode 100644
index 1ea1165..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/team/MesCalPlanTeamSaveReqVO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.team;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-@Schema(description = "绠$悊鍚庡彴 - MES 璁″垝鐝粍鍏宠仈鏂板 Request VO")
-@Data
-public class MesCalPlanTeamSaveReqVO {
-
- @Schema(description = "缂栧彿", example = "1024")
- private Long id;
-
- @Schema(description = "鎺掔彮璁″垝缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "鎺掔彮璁″垝涓嶈兘涓虹┖")
- private Long planId;
-
- @Schema(description = "鐝粍缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "鐝粍涓嶈兘涓虹┖")
- private Long teamId;
-
- @Schema(description = "澶囨敞")
- private String remark;
-
- }
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/MesCalTeamController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/MesCalTeamController.java
deleted file mode 100644
index 789ddbf..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/MesCalTeamController.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.team;
-
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.MesCalTeamPageReqVO;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.MesCalTeamRespVO;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.MesCalTeamSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.team.MesCalTeamDO;
-import cn.iocoder.yudao.module.mes.service.cal.team.MesCalTeamService;
-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.servlet.http.HttpServletResponse;
-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.io.IOException;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "绠$悊鍚庡彴 - MES 鐝粍")
-@RestController
-@RequestMapping("/mes/cal/team")
-@Validated
-public class MesCalTeamController {
-
- @Resource
- private MesCalTeamService teamService;
-
- @PostMapping("/create")
- @Operation(summary = "鍒涘缓鐝粍")
- @PreAuthorize("@ss.hasPermission('mes:cal-team:create')")
- public CommonResult<Long> createTeam(@Valid @RequestBody MesCalTeamSaveReqVO createReqVO) {
- return success(teamService.createTeam(createReqVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "鏇存柊鐝粍")
- @PreAuthorize("@ss.hasPermission('mes:cal-team:update')")
- public CommonResult<Boolean> updateTeam(@Valid @RequestBody MesCalTeamSaveReqVO updateReqVO) {
- teamService.updateTeam(updateReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "鍒犻櫎鐝粍")
- @Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('mes:cal-team:delete')")
- public CommonResult<Boolean> deleteTeam(@RequestParam("id") Long id) {
- teamService.deleteTeam(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "鑾峰緱鐝粍")
- @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- public CommonResult<MesCalTeamRespVO> getTeam(@RequestParam("id") Long id) {
- MesCalTeamDO team = teamService.getTeam(id);
- return success(BeanUtils.toBean(team, MesCalTeamRespVO.class));
- }
-
- @GetMapping("/page")
- @Operation(summary = "鑾峰緱鐝粍鍒嗛〉")
- public CommonResult<PageResult<MesCalTeamRespVO>> getTeamPage(@Valid MesCalTeamPageReqVO pageReqVO) {
- PageResult<MesCalTeamDO> pageResult = teamService.getTeamPage(pageReqVO);
- return success(BeanUtils.toBean(pageResult, MesCalTeamRespVO.class));
- }
-
- @GetMapping("/list")
- @Operation(summary = "鑾峰緱鐝粍鍒楄〃")
- public CommonResult<List<MesCalTeamRespVO>> getTeamList() {
- List<MesCalTeamDO> list = teamService.getTeamList();
- return success(BeanUtils.toBean(list, MesCalTeamRespVO.class));
- }
-
- @GetMapping("/export-excel")
- @Operation(summary = "瀵煎嚭鐝粍 Excel")
- @PreAuthorize("@ss.hasPermission('mes:cal-team:export')")
- @ApiAccessLog(operateType = EXPORT)
- public void exportTeamExcel(@Valid MesCalTeamPageReqVO pageReqVO,
- HttpServletResponse response) throws IOException {
- pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
- List<MesCalTeamDO> list = teamService.getTeamPage(pageReqVO).getList();
- // 瀵煎嚭 Excel
- ExcelUtils.write(response, "鐝粍.xls", "鏁版嵁", MesCalTeamRespVO.class,
- BeanUtils.toBean(list, MesCalTeamRespVO.class));
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/MesCalTeamMemberController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/MesCalTeamMemberController.java
deleted file mode 100644
index e812994..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/MesCalTeamMemberController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.team;
-
-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.cal.team.vo.member.MesCalTeamMemberPageReqVO;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.member.MesCalTeamMemberRespVO;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.member.MesCalTeamMemberSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.team.MesCalTeamMemberDO;
-import cn.iocoder.yudao.module.mes.service.cal.team.MesCalTeamMemberService;
-import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
-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.Collection;
-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/cal/team-member")
-@Validated
-public class MesCalTeamMemberController {
-
- @Resource
- private MesCalTeamMemberService teamMemberService;
-
- @Resource
- private AdminUserApi adminUserApi;
-
- @PostMapping("/create")
- @Operation(summary = "鍒涘缓鐝粍鎴愬憳")
- @PreAuthorize("@ss.hasPermission('mes:cal-team:create')")
- public CommonResult<Long> createTeamMember(@Valid @RequestBody MesCalTeamMemberSaveReqVO createReqVO) {
- return success(teamMemberService.createTeamMember(createReqVO));
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "鍒犻櫎鐝粍鎴愬憳")
- @Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('mes:cal-team:delete')")
- public CommonResult<Boolean> deleteTeamMember(@RequestParam("id") Long id) {
- teamMemberService.deleteTeamMember(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "鑾峰緱鐝粍鎴愬憳")
- @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- public CommonResult<MesCalTeamMemberRespVO> getTeamMember(@RequestParam("id") Long id) {
- MesCalTeamMemberDO member = teamMemberService.getTeamMember(id);
- return success(BeanUtils.toBean(member, MesCalTeamMemberRespVO.class));
- }
-
- @GetMapping("/page")
- @Operation(summary = "鑾峰緱鐝粍鎴愬憳鍒嗛〉")
- public CommonResult<PageResult<MesCalTeamMemberRespVO>> getTeamMemberPage(@Valid MesCalTeamMemberPageReqVO pageReqVO) {
- PageResult<MesCalTeamMemberDO> pageResult = teamMemberService.getTeamMemberPage(pageReqVO);
- return success(BeanUtils.toBean(pageResult, MesCalTeamMemberRespVO.class));
- }
-
- @GetMapping("/list-by-team")
- @Operation(summary = "鑾峰緱鐝粍鎴愬憳鍒楄〃", description = "鏀寔鍗曚釜 teamId 鎴栧涓� teamIds")
- public CommonResult<List<MesCalTeamMemberRespVO>> getTeamMemberListByTeam(
- @RequestParam(value = "teamId", required = false) Long teamId,
- @RequestParam(value = "teamIds", required = false) Collection<Long> teamIds) {
- List<MesCalTeamMemberDO> list;
- if (CollUtil.isNotEmpty(teamIds)) {
- list = teamMemberService.getTeamMemberListByTeamIds(teamIds);
- } else if (teamId != null) {
- list = teamMemberService.getTeamMemberListByTeamId(teamId);
- } else {
- list = Collections.emptyList();
- }
- return success(buildMemberRespVOList(list));
- }
-
- // ==================== 鎷兼帴 VO ====================
-
- private List<MesCalTeamMemberRespVO> buildMemberRespVOList(List<MesCalTeamMemberDO> list) {
- if (CollUtil.isEmpty(list)) {
- return Collections.emptyList();
- }
- Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
- convertSet(list, MesCalTeamMemberDO::getUserId));
- return BeanUtils.toBean(list, MesCalTeamMemberRespVO.class, vo ->
- MapUtils.findAndThen(userMap, vo.getUserId(), user -> {
- vo.setNickname(user.getNickname());
- vo.setTelephone(user.getMobile());
- }));
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/MesCalTeamShiftController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/MesCalTeamShiftController.java
deleted file mode 100644
index 99d78bd..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/MesCalTeamShiftController.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.team;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-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.cal.team.vo.shift.MesCalTeamShiftListReqVO;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.shift.MesCalTeamShiftRespVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanShiftDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.team.MesCalTeamDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.team.MesCalTeamShiftDO;
-import cn.iocoder.yudao.module.mes.service.cal.plan.MesCalPlanShiftService;
-import cn.iocoder.yudao.module.mes.service.cal.team.MesCalTeamService;
-import cn.iocoder.yudao.module.mes.service.cal.team.MesCalTeamShiftService;
-import io.swagger.v3.oas.annotations.Operation;
-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.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-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/cal/team-shift")
-@Validated
-public class MesCalTeamShiftController {
-
- @Resource
- private MesCalTeamShiftService teamShiftService;
- @Resource
- private MesCalTeamService teamService;
- @Resource
- private MesCalPlanShiftService planShiftService;
-
- @GetMapping("/list")
- @Operation(summary = "鑾峰緱鐝粍鎺掔彮鍒楄〃")
- public CommonResult<List<MesCalTeamShiftRespVO>> getTeamShiftList(@Valid MesCalTeamShiftListReqVO reqVO) {
- List<MesCalTeamShiftDO> list = teamShiftService.getTeamShiftList(reqVO);
- if (CollUtil.isEmpty(list)) {
- return success(Collections.emptyList());
- }
- // 鍏宠仈鏌ヨ鐝粍鍚嶇О鍜岀彮娆″悕绉�
- Map<Long, MesCalTeamDO> teamMap = teamService.getTeamMap(
- convertSet(list, MesCalTeamShiftDO::getTeamId));
- Map<Long, MesCalPlanShiftDO> shiftMap = planShiftService.getPlanShiftMap(
- convertSet(list, MesCalTeamShiftDO::getShiftId));
- return success(BeanUtils.toBean(list, MesCalTeamShiftRespVO.class, vo -> {
- MapUtils.findAndThen(teamMap, vo.getTeamId(), team -> vo.setTeamName(team.getName()));
- MapUtils.findAndThen(shiftMap, vo.getShiftId(), shift -> vo.setShiftName(shift.getName()));
- }));
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/vo/MesCalTeamPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/vo/MesCalTeamPageReqVO.java
deleted file mode 100644
index ddc3681..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/vo/MesCalTeamPageReqVO.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "绠$悊鍚庡彴 - MES 鐝粍鍒嗛〉 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MesCalTeamPageReqVO extends PageParam {
-
- @Schema(description = "鐝粍缂栫爜", example = "TEAM-A")
- private String code;
-
- @Schema(description = "鐝粍鍚嶇О", example = "娉ㄥ")
- private String name;
-
- @Schema(description = "鐝粍绫诲瀷", example = "1")
- private Integer calendarType;
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/vo/MesCalTeamRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/vo/MesCalTeamRespVO.java
deleted file mode 100644
index 27d4117..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/vo/MesCalTeamRespVO.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo;
-
-import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
-import cn.idev.excel.annotation.ExcelProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "绠$悊鍚庡彴 - MES 鐝粍 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class MesCalTeamRespVO {
-
- @Schema(description = "鐝粍缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- @ExcelProperty("鐝粍缂栧彿")
- private Long id;
-
- @Schema(description = "鐝粍缂栫爜", requiredMode = Schema.RequiredMode.REQUIRED, example = "TEAM-A")
- @ExcelProperty("鐝粍缂栫爜")
- private String code;
-
- @Schema(description = "鐝粍鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "娉ㄥA缁�")
- @ExcelProperty("鐝粍鍚嶇О")
- private String name;
-
- @Schema(description = "鐝粍绫诲瀷", example = "1")
- @ExcelProperty("鐝粍绫诲瀷")
- private Integer calendarType;
-
- @Schema(description = "澶囨敞")
- @ExcelProperty("澶囨敞")
- private String remark;
-
- @Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("鍒涘缓鏃堕棿")
- private LocalDateTime createTime;
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/vo/MesCalTeamSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/vo/MesCalTeamSaveReqVO.java
deleted file mode 100644
index e2f10f9..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/vo/MesCalTeamSaveReqVO.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-@Schema(description = "绠$悊鍚庡彴 - MES 鐝粍鏂板/淇敼 Request VO")
-@Data
-public class MesCalTeamSaveReqVO {
-
- @Schema(description = "鐝粍缂栧彿", example = "1024")
- private Long id;
-
- @Schema(description = "鐝粍缂栫爜", requiredMode = Schema.RequiredMode.REQUIRED, example = "TEAM-A")
- @NotEmpty(message = "鐝粍缂栫爜涓嶈兘涓虹┖")
- private String code;
-
- @Schema(description = "鐝粍鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "娉ㄥA缁�")
- @NotEmpty(message = "鐝粍鍚嶇О涓嶈兘涓虹┖")
- private String name;
-
- @Schema(description = "鐝粍绫诲瀷", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "鐝粍绫诲瀷涓嶈兘涓虹┖")
- private Integer calendarType;
-
- @Schema(description = "澶囨敞")
- private String remark;
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/vo/member/MesCalTeamMemberPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/vo/member/MesCalTeamMemberPageReqVO.java
deleted file mode 100644
index c225375..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/vo/member/MesCalTeamMemberPageReqVO.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.member;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "绠$悊鍚庡彴 - MES 鐝粍鎴愬憳鍒嗛〉 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MesCalTeamMemberPageReqVO extends PageParam {
-
- @Schema(description = "鐝粍缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "201")
- @NotNull(message = "鐝粍缂栧彿涓嶈兘涓虹┖")
- private Long teamId;
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/vo/member/MesCalTeamMemberRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/vo/member/MesCalTeamMemberRespVO.java
deleted file mode 100644
index 023538b..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/vo/member/MesCalTeamMemberRespVO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.member;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "绠$悊鍚庡彴 - MES 鐝粍鎴愬憳 Response VO")
-@Data
-public class MesCalTeamMemberRespVO {
-
- @Schema(description = "鐝粍鎴愬憳缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private Long id;
-
- @Schema(description = "鐝粍缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "201")
- private Long teamId;
-
- @Schema(description = "鐢ㄦ埛缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Long userId;
-
- @Schema(description = "鐢ㄦ埛鏄电О", example = "绠$悊鍛�")
- private String nickname;
-
- @Schema(description = "鐢佃瘽", example = "13800138000")
- private String telephone;
-
- @Schema(description = "澶囨敞")
- private String remark;
-
- @Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime createTime;
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/vo/member/MesCalTeamMemberSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/vo/member/MesCalTeamMemberSaveReqVO.java
deleted file mode 100644
index 71a2658..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/vo/member/MesCalTeamMemberSaveReqVO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.member;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-@Schema(description = "绠$悊鍚庡彴 - MES 鐝粍鎴愬憳鏂板 Request VO")
-@Data
-public class MesCalTeamMemberSaveReqVO {
-
- @Schema(description = "鐝粍鎴愬憳缂栧彿", example = "1024")
- private Long id;
-
- @Schema(description = "鐝粍缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "201")
- @NotNull(message = "鐝粍缂栧彿涓嶈兘涓虹┖")
- private Long teamId;
-
- @Schema(description = "鐢ㄦ埛缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "鐢ㄦ埛缂栧彿涓嶈兘涓虹┖")
- private Long userId;
-
- @Schema(description = "澶囨敞")
- private String remark;
-
- }
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/vo/shift/MesCalTeamShiftListReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/vo/shift/MesCalTeamShiftListReqVO.java
deleted file mode 100644
index 459be38..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/vo/shift/MesCalTeamShiftListReqVO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.shift;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@Schema(description = "绠$悊鍚庡彴 - MES 鐝粍鎺掔彮鍒楄〃 Request VO")
-@Data
-public class MesCalTeamShiftListReqVO {
-
- @Schema(description = "鐝粍缂栧彿", example = "201")
- private Long teamId;
-
- @Schema(description = "鐝粍缂栧彿闆嗗悎")
- private Collection<Long> teamIds;
-
- @Schema(description = "鎺掔彮璁″垝缂栧彿", example = "1")
- private Long planId;
-
- @Schema(description = "寮�濮嬫棩鏈�")
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- private LocalDateTime startDay;
-
- @Schema(description = "缁撴潫鏃ユ湡")
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- private LocalDateTime endDay;
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/vo/shift/MesCalTeamShiftRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/vo/shift/MesCalTeamShiftRespVO.java
deleted file mode 100644
index a1af1bb..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/vo/shift/MesCalTeamShiftRespVO.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.shift;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "绠$悊鍚庡彴 - MES 鐝粍鎺掔彮 Response VO")
-@Data
-public class MesCalTeamShiftRespVO {
-
- @Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private Long id;
-
- @Schema(description = "鎺掔彮璁″垝缂栧彿", example = "1")
- private Long planId;
-
- @Schema(description = "鐝粍缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "201")
- private Long teamId;
-
- @Schema(description = "鐝粍鍚嶇О", example = "娉ㄥA缁�")
- private String teamName;
-
- @Schema(description = "鐝缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Long shiftId;
-
- @Schema(description = "鐝鍚嶇О", example = "鐧界彮")
- private String shiftName;
-
- @Schema(description = "鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime day;
-
- @Schema(description = "鎺掑簭", example = "1")
- private Integer sort;
-
- @Schema(description = "澶囨敞")
- private String remark;
-
- @Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime createTime;
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryController.java
index a44e8ac..8c18b06 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryController.java
@@ -54,6 +54,8 @@
private MesMdWorkshopService workshopService;
@Resource
private cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService workstationService;
+ @Resource
+ private cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationMachineService workstationMachineService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓璁惧")
@@ -111,9 +113,17 @@
}
@GetMapping("/simple-list")
- @Operation(summary = "鑾峰緱璁惧绮剧畝鍒楄〃", description = "涓昏鐢ㄤ簬鍓嶇鐨勪笅鎷夐�夐」")
- public CommonResult<List<MesDvMachineryRespVO>> getMachinerySimpleList() {
+ @Operation(summary = "鑾峰緱璁惧绮剧畝鍒楄〃", description = "涓昏鐢ㄤ簬鍓嶇鐨勪笅鎷夐�夐」锛涗紶 workstationId 鏃跺彧杩斿洖璇ュ伐浣滅珯缁戝畾鐨勮澶�")
+ @Parameter(name = "workstationId", description = "宸ヤ綔绔欑紪鍙凤紝鍙�夛紱浼犲垯鍙繑鍥炶宸ヤ綔绔欑粦瀹氱殑璁惧")
+ public CommonResult<List<MesDvMachineryRespVO>> getMachinerySimpleList(
+ @RequestParam(value = "workstationId", required = false) Long workstationId) {
List<MesDvMachineryDO> list = machineryService.getMachineryList();
+ if (workstationId != null) {
+ var boundIds = cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet(
+ workstationMachineService.getWorkstationMachineListByWorkstationId(workstationId),
+ cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationMachineDO::getMachineryId);
+ list = list.stream().filter(machinery -> boundIds.contains(machinery.getId())).toList();
+ }
return success(BeanUtils.toBean(list, MesDvMachineryRespVO.class));
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java
index 6ea3048..046ab2a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java
@@ -12,6 +12,9 @@
import cn.iocoder.yudao.module.mes.controller.admin.pd.project.vo.MesPdProjectRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.project.vo.MesPdProjectSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pd.project.MesPdProjectDO;
+import cn.iocoder.yudao.module.mes.enums.pd.MesPdProjectStatusEnum;
+import cn.iocoder.yudao.module.mes.service.wm.document.MesWmDocumentRenderer;
+import cn.iocoder.yudao.module.system.service.companyconfig.SystemCompanyConfigService;
import cn.iocoder.yudao.module.mes.service.pd.project.MesPdProjectService;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
@@ -26,16 +29,22 @@
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.time.format.DateTimeFormatter;
import java.util.Collections;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Stream;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSetByFlatMap;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PD_PROJECT_NOT_EXISTS;
@Tag(name = "绠$悊鍚庡彴 - MES 璁捐椤圭洰")
@RestController
@@ -48,6 +57,8 @@
@Resource
private AdminUserApi adminUserApi;
+ @Resource
+ private SystemCompanyConfigService companyConfigService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓璁捐椤圭洰")
@@ -104,6 +115,61 @@
buildProjectRespVOList(list));
}
+ @GetMapping("/export-word")
+ @Operation(summary = "瀵煎嚭椤圭洰璺熻釜琛� Word锛堣〃澶磋嚜鍔ㄥ~鍏咃紝璺熻釜璁板綍鐣欑┖鍙墜濉級")
+ @Parameter(name = "id", description = "璁捐椤圭洰缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:pd-project:export')")
+ @ApiAccessLog(operateType = EXPORT)
+ public void exportProjectTrackingWord(@RequestParam("id") Long id,
+ HttpServletResponse response) throws IOException {
+ MesPdProjectDO project = projectService.getProject(id);
+ if (project == null) {
+ throw exception(PD_PROJECT_NOT_EXISTS);
+ }
+ Map<String, String> fields = new LinkedHashMap<>();
+ fields.put("taskCode", project.getTaskCode());
+ fields.put("taskName", project.getTaskName());
+ fields.put("productCode", project.getProductCode());
+ fields.put("productName", project.getProductName());
+ fields.put("version", project.getVersion());
+ fields.put("status", resolveStatusName(project.getStatus()));
+ fields.put("chiefDesigner", resolveUserName(project.getChiefDesigner()));
+ fields.put("reviewer", resolveUserName(project.getReviewer()));
+ fields.put("planFinishTime", project.getPlanFinishTime() == null ? null
+ : project.getPlanFinishTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")));
+ fields.put("printDate", java.time.LocalDate.now().toString());
+ fields.put("remark", project.getRemark());
+
+ var companyConfig = companyConfigService.getCompanyConfig();
+ byte[] content = MesWmDocumentRenderer.renderProjectTracking(fields,
+ companyConfig != null ? companyConfig.getCompanyName() : null);
+ String filename = "椤圭洰璺熻釜琛�-" + project.getTaskCode() + ".docx";
+ String encoded = URLEncoder.encode(filename, StandardCharsets.UTF_8).replace("+", "%20");
+ response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+ response.setHeader("Content-Disposition", "attachment;filename*=UTF-8''" + encoded);
+ response.getOutputStream().write(content);
+ }
+
+ private String resolveStatusName(Integer status) {
+ if (status == null) {
+ return null;
+ }
+ for (MesPdProjectStatusEnum item : MesPdProjectStatusEnum.values()) {
+ if (item.getStatus().equals(status)) {
+ return item.getName();
+ }
+ }
+ return "鏈煡鐘舵��(" + status + ")";
+ }
+
+ private String resolveUserName(Long userId) {
+ if (userId == null) {
+ return null;
+ }
+ AdminUserRespDTO user = adminUserApi.getUser(userId);
+ return user != null ? user.getNickname() : "ID=" + userId;
+ }
+
@PutMapping("/publish")
@Operation(summary = "鍙戝竷璁捐椤圭洰锛堝緟鍙戝竷鈫掑緟涓婁紶锛�")
@Parameter(name = "id", description = "缂栧彿", required = true)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java
index 865a653..4025062 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java
@@ -18,6 +18,10 @@
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackSaveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackSubmitReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackWagePreviewReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackWagePreviewRespVO;
+import cn.iocoder.yudao.module.mes.service.pro.wage.MesProFeedbackWageBreakdown;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dv.machinery.MesDvMachineryDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
@@ -27,6 +31,7 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
+import cn.iocoder.yudao.module.mes.service.dv.machinery.MesDvMachineryService;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
@@ -63,6 +68,11 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderParamRecordDetailDO;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderParamRecordMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderParamRecordDetailMapper;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackAuxDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.feedback.MesProFeedbackAuxMapper;
+import cn.iocoder.yudao.module.mes.service.pro.worktime.MesProWorktimeService;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import java.io.IOException;
@@ -118,6 +128,12 @@
private MesProWorkOrderParamRecordMapper paramRecordMapper;
@Resource
private MesProWorkOrderParamRecordDetailMapper paramRecordDetailMapper;
+ @Resource
+ private MesProFeedbackAuxMapper feedbackAuxMapper;
+ @Resource
+ private MesProWorktimeService worktimeService;
+ @Resource
+ private MesDvMachineryService machineryService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鐢熶骇鎶ュ伐")
@@ -221,6 +237,16 @@
return success(feedbackService.quickCreateFeedback(reqVO));
}
+ @PostMapping("/preview-wage")
+ @Operation(summary = "鎶ュ伐宸ヨ祫璇曠畻锛堜笉钀藉簱锛�")
+ @PreAuthorize("@ss.hasPermission('mes:pro-feedback:query')")
+ public CommonResult<MesProFeedbackWagePreviewRespVO> previewWage(
+ @Valid @RequestBody MesProFeedbackWagePreviewReqVO reqVO) {
+ MesProFeedbackWageBreakdown breakdown = feedbackService.previewWage(reqVO);
+ MesProFeedbackWagePreviewRespVO resp = BeanUtils.toBean(breakdown, MesProFeedbackWagePreviewRespVO.class);
+ return success(resp);
+ }
+
@PostMapping("/batch-create")
@Operation(summary = "鎵归噺鎶ュ伐")
@PreAuthorize("@ss.hasPermission('mes:pro-feedback:create')")
@@ -314,6 +340,13 @@
}
}));
Map<Long, MesMdUnitMeasureDO> paramUnitMeasureMap = unitMeasureService.getUnitMeasureMap(paramUnitIds);
+ // 1.11 涓昏浠疯澶�
+ Map<Long, MesDvMachineryDO> machineryMap = machineryService.getMachineryMap(
+ convertSet(list, MesProFeedbackDO::getMachineryId));
+ // 1.10 杈呭姪宸ユ椂鏄庣粏
+ Map<Long, List<MesProFeedbackAuxDO>> feedbackAuxMap = feedbackAuxMapper
+ .selectListByFeedbackIds(convertSet(list, MesProFeedbackDO::getId)).stream()
+ .collect(Collectors.groupingBy(MesProFeedbackAuxDO::getFeedbackId));
// 2. 鎷兼帴 VO
return BeanUtils.toBean(list, MesProFeedbackRespVO.class, vo -> {
@@ -326,6 +359,9 @@
// 宸ュ簭
findAndThen(processMap, vo.getProcessId(), process ->
vo.setProcessCode(process.getCode()).setProcessName(process.getName()));
+ // 涓昏浠疯澶�
+ findAndThen(machineryMap, vo.getMachineryId(), machinery ->
+ vo.setMachineryName(machinery.getName()));
// checkFlag
findAndThen(routeProcessCheckFlagMap, vo.getRouteId(), processCheckMap ->
findAndThen(processCheckMap, vo.getProcessId(), vo::setCheckFlag));
@@ -363,6 +399,24 @@
return pv;
}).toList());
}
+ // 杈呭姪宸ユ椂鏄庣粏 + 宸ユ椂宸紓锛堟爣鍑嗗伐鏃跺彧鐢ㄤ簬鑰冩牳瀵规瘮锛�
+ List<MesProFeedbackAuxDO> auxList = feedbackAuxMap.get(vo.getId());
+ if (CollUtil.isNotEmpty(auxList)) {
+ vo.setAuxList(BeanUtils.toBean(auxList, MesProFeedbackRespVO.AuxResp.class));
+ }
+ BigDecimal standardHours = vo.getStandardWorkHours();
+ BigDecimal actualHours = vo.getWorkHours() != null ? vo.getWorkHours() : BigDecimal.ZERO;
+ if (standardHours != null && standardHours.signum() > 0) {
+ BigDecimal diff = actualHours.subtract(standardHours).setScale(2, RoundingMode.HALF_UP);
+ vo.setWorkHoursDiff(diff);
+ vo.setWorkHoursDiffRate(diff.multiply(BigDecimal.valueOf(100))
+ .divide(standardHours, 2, RoundingMode.HALF_UP));
+ String warnMessage = worktimeService.buildWarnMessage(actualHours, standardHours);
+ vo.setStandardWarnFlag(warnMessage != null);
+ vo.setStandardWarnMessage(warnMessage);
+ } else {
+ vo.setStandardWarnFlag(false);
+ }
});
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackQuickCreateReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackQuickCreateReqVO.java
index 72eb0b2..3d854bd 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackQuickCreateReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackQuickCreateReqVO.java
@@ -20,6 +20,9 @@
@NotNull(message = "鎶ュ伐鏁伴噺涓嶈兘涓虹┖")
private BigDecimal feedbackQuantity;
+ @Schema(description = "鏈鎶ュ伐宸ユ椂锛堝皬鏃讹級锛岃鏃惰钖殑宸ュ簭蹇呭~", example = "8.00")
+ private BigDecimal workHours;
+
@Schema(description = "鎶ュ伐鏃堕棿锛屼笉濉椂浣跨敤褰撳墠鏃堕棿")
private LocalDateTime feedbackTime;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackRespVO.java
index 61c4c8e..76ef33a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackRespVO.java
@@ -150,6 +150,84 @@
@Schema(description = "鍏朵粬搴熷搧鏁伴噺", example = "0")
private BigDecimal otherScrapQuantity;
+ @Schema(description = "璁¤垂绫诲瀷锛�1-璁℃椂 2-璁′欢", example = "2")
+ @ExcelProperty("璁¤垂绫诲瀷")
+ private Integer billingType;
+
+ @Schema(description = "宸ヨ祫瀹氶锛氳鏃朵负鍏�/灏忔椂锛岃浠朵负鍏�/浠�", example = "12.50")
+ @ExcelProperty("宸ヨ祫瀹氶")
+ private BigDecimal wageRate;
+
+ @Schema(description = "涓昏浠疯澶囩紪鍙�", example = "8")
+ private Long machineryId;
+
+ @Schema(description = "涓昏浠疯澶囧悕绉�", example = "鎸ゅ鏈�-01")
+ private String machineryName;
+
+ @Schema(description = "鍛戒腑鐨勫伐搴忓伐璧勫崟浠疯鍒欑紪鍙�")
+ private Long wageRuleId;
+
+ @Schema(description = "鏈鎶ュ伐宸ユ椂锛堝皬鏃讹級", example = "8.00")
+ @ExcelProperty("鎶ュ伐宸ユ椂")
+ private BigDecimal workHours;
+
+ @Schema(description = "鏈鎶ュ伐宸ヨ祫锛堝惈杈呭姪宸ヨ祫涓庤川閲忚皟鏁达級", example = "100.00")
+ @ExcelProperty("鎶ュ伐宸ヨ祫")
+ private BigDecimal wageAmount;
+
+ @Schema(description = "杈呭姪璁¤柂宸ユ椂锛堝皬鏃讹級", example = "0.50")
+ private BigDecimal auxPaidHours;
+
+ @Schema(description = "鏈杈呭姪宸ヨ祫", example = "15.00")
+ @ExcelProperty("杈呭姪宸ヨ祫")
+ private BigDecimal auxWageAmount;
+
+ @Schema(description = "璐ㄩ噺鍚堟牸鐜囷紙%锛�", example = "97.50")
+ private BigDecimal qualityPassRate;
+
+ @Schema(description = "璐ㄩ噺绯绘暟", example = "0.9200")
+ private BigDecimal qualityCoefficient;
+
+ @Schema(description = "璐ㄩ噺鎵f", example = "0.00")
+ private BigDecimal qualityDeduction;
+
+ @Schema(description = "宸ヨ祫璁$畻鏄庣粏蹇収锛圝SON锛�")
+ private String wageBreakdown;
+
+ @Schema(description = "鏈鐢熶骇闀垮害锛堢背锛夛紝浠呯敤浜庤绠楁爣鍑嗗伐鏃�", example = "1000.00")
+ @ExcelProperty("鐢熶骇闀垮害(绫�)")
+ private BigDecimal productionLength;
+
+ @Schema(description = "鏍囧噯宸ユ椂锛堝皬鏃讹級锛屽彧鐢ㄤ簬鑰冩牳瀵规瘮", example = "1.25")
+ @ExcelProperty("鏍囧噯宸ユ椂")
+ private BigDecimal standardWorkHours;
+
+ @Schema(description = "鏍囧噯宸ユ椂-涓诲伐鏃讹紙灏忔椂锛�", example = "1.00")
+ private BigDecimal standardPrimaryHours;
+
+ @Schema(description = "鏍囧噯宸ユ椂-杈呭姪宸ユ椂锛堝皬鏃讹級", example = "0.25")
+ private BigDecimal standardAuxHours;
+
+ @Schema(description = "鏍囧噯宸ユ椂璁$畻渚濇嵁", example = "绾块�熷害 45.60 绫�/鍒嗭紱鐢熶骇闀垮害 1000.00 绫筹紝涓诲伐鏃� 0.37h锛涜緟鍔╁伐鏃� 0.25h")
+ private String stdCalcNote;
+
+ @Schema(description = "宸ユ椂宸紓锛堝皬鏃讹級= 瀹為檯宸ユ椂 - 鏍囧噯宸ユ椂", example = "0.35")
+ @ExcelProperty("宸ユ椂宸紓")
+ private BigDecimal workHoursDiff;
+
+ @Schema(description = "宸ユ椂宸紓鐜囷紙%锛�= (瀹為檯 - 鏍囧噯) 梅 鏍囧噯 脳 100", example = "28.00")
+ @ExcelProperty("宸ユ椂宸紓鐜�(%)")
+ private BigDecimal workHoursDiffRate;
+
+ @Schema(description = "鏄惁瓒呭嚭宸ユ椂鑰冩牳闃堝��", example = "true")
+ private Boolean standardWarnFlag;
+
+ @Schema(description = "宸ユ椂鑰冩牳鎻愮ず", example = "鏈鎶ュ伐宸ユ椂 1.60h 楂樹簬鏍囧噯宸ユ椂 1.25h 杈� 28.00%锛岃秴杩� 20% 闃堝�硷紝璇锋牳瀵瑰伐鏃舵垨杈呭姪椤规鏁�")
+ private String standardWarnMessage;
+
+ @Schema(description = "杈呭姪宸ユ椂褰曞叆鏄庣粏")
+ private List<AuxResp> auxList;
+
@Schema(description = "鎶ュ伐鐢ㄦ埛缂栧彿", example = "1")
private Long feedbackUserId;
@@ -189,6 +267,36 @@
private List<ParamValueResp> paramValues;
@Data
+ @Schema(description = "鎶ュ伐杈呭姪宸ユ椂鏄庣粏")
+ public static class AuxResp {
+
+ @Schema(description = "杈呭姪宸ユ椂椤圭洰缂栧彿", example = "1024")
+ private Long auxItemId;
+
+ @Schema(description = "杈呭姪椤圭洰鍚嶇О", example = "涓婁笅鏀剧嚎鐩�")
+ private String itemName;
+
+ @Schema(description = "璁¢噺鏂瑰紡锛�1-鎸夋 2-鎸変釜 3-鎸夌洏 4-鎸夌背鎶樼畻", example = "2")
+ private Integer measureType;
+
+ @Schema(description = "娆℃暟/涓暟/鐩樻暟/绫虫暟", example = "2.00")
+ private BigDecimal quantity;
+
+ @Schema(description = "鎹㈣壊璧峰鏉愭枡", example = "PVC")
+ private String materialFrom;
+
+ @Schema(description = "鎹㈣壊鐩爣鏉愭枡", example = "LSZH")
+ private String materialTo;
+
+ @Schema(description = "鎶樼畻鍒嗛挓鏁�", example = "10.00")
+ private BigDecimal minutes;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ }
+
+ @Data
@Schema(description = "鎶ュ伐鍙傛暟鍊�")
public static class ParamValueResp {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackSaveReqVO.java
index ce71bf4..390f2f0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackSaveReqVO.java
@@ -26,6 +26,9 @@
@Schema(description = "宸ヤ綔绔欑紪鍙�", example = "1")
private Long workstationId;
+ @Schema(description = "涓昏浠疯澶囩紪鍙凤紝鏈鎶ュ伐瀹為檯浣跨敤鐨勮澶囷紱宸ヨ祫鍗曚环鎸夊伐搴�+宸ヨ壓璺嚎+璁惧鍖归厤", example = "8")
+ private Long machineryId;
+
@Schema(description = "宸ヨ壓璺嚎缂栧彿", example = "1")
private Long routeId;
@@ -77,6 +80,24 @@
@NotNull(message = "鎶ュ伐浜轰笉鑳戒负绌�")
private Long feedbackUserId;
+ @Schema(description = "璁¤垂绫诲瀷锛�1-璁℃椂 2-璁′欢锛堢敱宸ュ簭鑷姩甯﹀嚭锛屽墠绔棤闇�鎻愪氦锛�", example = "2")
+ private Integer billingType;
+
+ @Schema(description = "宸ヨ祫瀹氶锛堢敱宸ュ簭鑷姩甯﹀嚭锛屽墠绔棤闇�鎻愪氦锛�", example = "12.50")
+ private BigDecimal wageRate;
+
+ @Schema(description = "鏈鎶ュ伐宸ユ椂锛堝皬鏃讹級锛岃鏃惰钖殑宸ュ簭蹇呭~", example = "8.00")
+ private BigDecimal workHours;
+
+ @Schema(description = "鏈鎶ュ伐宸ヨ祫锛堝悗绔寜宸ュ簭璁¤垂绫诲瀷鑷姩璁$畻锛屽墠绔棤闇�鎻愪氦锛�", example = "100.00")
+ private BigDecimal wageAmount;
+
+ @Schema(description = "鏈鐢熶骇闀垮害锛堢背锛夛紝浠呯敤浜庤绠楁爣鍑嗗伐鏃讹紱鎶ュ伐鍗曚綅涓虹背鏃堕粯璁ょ瓑浜庢姤宸ユ暟閲�", example = "1000.00")
+ private BigDecimal productionLength;
+
+ @Schema(description = "杈呭姪宸ユ椂褰曞叆椤�")
+ private List<AuxValue> auxList;
+
@Schema(description = "鎶ュ伐鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "鎶ュ伐鏃堕棿涓嶈兘涓虹┖")
private LocalDateTime feedbackTime;
@@ -89,6 +110,27 @@
private List<ParamValue> paramValues;
@Data
+ public static class AuxValue {
+
+ @Schema(description = "杈呭姪宸ユ椂椤圭洰缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ @NotNull(message = "杈呭姪宸ユ椂椤圭洰涓嶈兘涓虹┖")
+ private Long auxItemId;
+
+ @Schema(description = "娆℃暟/涓暟/鐩樻暟/绫虫暟", example = "2.00")
+ private BigDecimal quantity;
+
+ @Schema(description = "鎹㈣壊/鎹㈡枡璧峰鏉愭枡锛堟寜鏉愭枡瀵归厤缃椂濉啓锛�", example = "PVC")
+ private String materialFrom;
+
+ @Schema(description = "鎹㈣壊/鎹㈡枡鐩爣鏉愭枡锛堟寜鏉愭枡瀵归厤缃椂濉啓锛�", example = "LSZH")
+ private String materialTo;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ }
+
+ @Data
public static class ParamValue {
@Schema(description = "浠诲姟鍙傛暟璁板綍鏄庣粏缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "鍙傛暟鏄庣粏涓嶈兘涓虹┖")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackWagePreviewReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackWagePreviewReqVO.java
new file mode 100644
index 0000000..7035454
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackWagePreviewReqVO.java
@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 鎶ュ伐宸ヨ祫璇曠畻 Request VO")
+@Data
+public class MesProFeedbackWagePreviewReqVO {
+
+ @Schema(description = "鐢熶骇浠诲姟缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "101")
+ @NotNull(message = "鐢熶骇浠诲姟涓嶈兘涓虹┖")
+ private Long taskId;
+
+ @Schema(description = "涓昏浠疯澶囩紪鍙凤紝鏈鎶ュ伐瀹為檯浣跨敤鐨勮澶�", example = "8")
+ private Long machineryId;
+
+ @Schema(description = "鎶ュ伐宸ユ椂锛堝皬鏃讹級锛岃鏃惰钖殑宸ュ簭蹇呭~", example = "7.50")
+ private BigDecimal workHours;
+
+ @Schema(description = "鎶ュ伐鏁伴噺", example = "120")
+ private BigDecimal feedbackQuantity;
+
+ @Schema(description = "鍚堟牸鍝佹暟閲忥紝璁′欢璁¤柂鏃朵紭鍏堟寜鍚堟牸鏁伴噺璁′环", example = "118")
+ private BigDecimal qualifiedQuantity;
+
+ @Schema(description = "鏈鐢熶骇闀垮害锛堢背锛夛紝浠呯敤浜庤绠楁爣鍑嗗伐鏃朵笌鎸夌背鎶樼畻鐨勮緟鍔╅」", example = "1000.00")
+ private BigDecimal productionLength;
+
+ @Schema(description = "璁′环鏃ユ湡锛岀┖鍙栧綋澶�", example = "2026-11-06")
+ private LocalDate feedbackDate;
+
+ @Schema(description = "杈呭姪宸ユ椂褰曞叆椤�")
+ private List<MesProFeedbackSaveReqVO.AuxValue> auxList;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackWagePreviewRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackWagePreviewRespVO.java
new file mode 100644
index 0000000..757178d
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackWagePreviewRespVO.java
@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo;
+
+import cn.iocoder.yudao.module.mes.service.pro.wage.MesProFeedbackWageBreakdown;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 鎶ュ伐宸ヨ祫璇曠畻 Response VO")
+@Data
+public class MesProFeedbackWagePreviewRespVO {
+
+ @Schema(description = "璁¤垂绫诲瀷锛�1-璁℃椂 2-璁′欢")
+ private Integer billingType;
+
+ @Schema(description = "宸ヨ祫鍗曚环")
+ private BigDecimal wageRate;
+
+ @Schema(description = "鍛戒腑鐨勫崟浠疯鍒欑紪鍙凤紝绌�=宸ュ簭榛樿鍗曚环")
+ private Long wageRuleId;
+
+ @Schema(description = "鍗曚环瑙勫垯鍖归厤灞傜骇锛欵XACT / ROUTE / MACHINERY / DEFAULT")
+ private String matchLevel;
+
+ @Schema(description = "鎶ュ伐宸ユ椂锛堝皬鏃讹級")
+ private BigDecimal workHours;
+
+ @Schema(description = "璁′欢鏁伴噺")
+ private BigDecimal pieceQuantity;
+
+ @Schema(description = "涓诲伐璧�")
+ private BigDecimal mainWage;
+
+ @Schema(description = "杈呭姪璁¤柂宸ユ椂锛堝皬鏃讹級")
+ private BigDecimal auxPaidHours;
+
+ @Schema(description = "杈呭姪宸ヨ祫")
+ private BigDecimal auxWage;
+
+ @Schema(description = "宸ヨ祫瀛楁璋冩暣鏄庣粏")
+ private List<MesProFeedbackWageBreakdown.FieldSnapshot> fields;
+
+ @Schema(description = "璐ㄩ噺璋冩暣鍓嶅伐璧�")
+ private BigDecimal preQualityWage;
+
+ @Schema(description = "璐ㄩ噺璋冩暣锛涜瘯绠楁湭鎺ヨ川妫�缁撴灉鏃朵负绌�")
+ private MesProFeedbackWageBreakdown.Quality quality;
+
+ @Schema(description = "鏈�缁堝伐璧�")
+ private BigDecimal finalWage;
+
+ @Schema(description = "闈為樆鏂彁绀猴紝濡傝緟鍔╁崟浠风己澶便�佸崟浠蜂负 0")
+ private List<String> warnings;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java
index 03fe143..20f1267 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java
@@ -14,6 +14,9 @@
import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsSaveReqVO;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
+import cn.iocoder.yudao.module.system.api.permission.PermissionApi;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.mps.MesProMpsDO;
@@ -62,6 +65,10 @@
private MesMdUnitMeasureService unitMeasureService;
@Resource
private CrmCustomerApi customerApi;
+ @Resource
+ private ErpSaleOrderApi saleOrderApi;
+ @Resource
+ private PermissionApi permissionApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鐢熶骇涓昏鍒�")
@@ -183,7 +190,13 @@
convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
Map<Long, CrmCustomerRespDTO> clientMap = customerApi.getCustomerMap(
convertSet(list, MesProMpsDO::getClientId));
- // 2. 鎷兼帴 VO
+ // 2. 涓嬪彂鏉冮檺锛氫笌 MesProMpsServiceImpl#validateIssuePermission 淇濇寔涓�鑷�
+ Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+ boolean superAdmin = loginUserId != null && permissionApi.hasAnyRoles(loginUserId, "super_admin");
+ Map<Long, MesProMpsDO> mpsMap = list.stream()
+ .collect(java.util.stream.Collectors.toMap(MesProMpsDO::getId, mps -> mps));
+ Map<Long, String> saleOrderCreatorMap = new java.util.HashMap<>();
+ // 3. 鎷兼帴 VO
return BeanUtils.toBean(list, MesProMpsRespVO.class, vo -> {
MapUtils.findAndThen(itemMap, vo.getProductId(), item -> {
vo.setProductName(item.getName())
@@ -194,6 +207,18 @@
});
MapUtils.findAndThen(clientMap, vo.getClientId(),
client -> vo.setClientName(client.getName()));
+ MesProMpsDO mps = mpsMap.get(vo.getId());
+ if (mps != null) {
+ String creator = mps.getCreator();
+ if (mps.getSaleOrderId() != null) {
+ creator = saleOrderCreatorMap.computeIfAbsent(mps.getSaleOrderId(), orderId -> {
+ var order = saleOrderApi.getSaleOrder(orderId).getCheckedData();
+ return order != null ? order.getCreator() : null;
+ });
+ }
+ vo.setCreator(creator);
+ vo.setCanIssue(superAdmin || (loginUserId != null && String.valueOf(loginUserId).equals(creator)));
+ }
});
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/vo/MesProMpsRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/vo/MesProMpsRespVO.java
index aaf6a32..11068c7 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/vo/MesProMpsRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/vo/MesProMpsRespVO.java
@@ -118,6 +118,14 @@
@ExcelProperty("澶囨敞")
private String remark;
+ // ========== 涓嬪彂鏉冮檺 ==========
+
+ @Schema(description = "璁″垝鍒涘缓浜虹敤鎴风紪鍙凤紙閿�鍞鍗曡鍒掍互閿�鍞鍗曞垱寤轰汉涓哄噯锛�", example = "1")
+ private String creator;
+
+ @Schema(description = "褰撳墠鐧诲綍鐢ㄦ埛鏄惁鍙笅鍙戯紙浠呭垱寤轰汉鎴栬秴绾х鐞嗗憳鍙笅鍙戯級", example = "true")
+ private Boolean canIssue;
+
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessRespVO.java
index 5cdd462..3f99d4f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessRespVO.java
@@ -7,6 +7,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
@Schema(description = "绠$悊鍚庡彴 - MES 鐢熶骇宸ュ簭 Response VO")
@@ -29,6 +30,39 @@
@Schema(description = "宸ヨ壓瑕佹眰", example = "鎸夌収鍥剧焊灏哄杩涜鍒囧壊")
private String attention;
+ @ExcelProperty("璁¤垂绫诲瀷")
+ @Schema(description = "璁¤垂绫诲瀷锛�1-璁℃椂 2-璁′欢", example = "2")
+ private Integer billingType;
+
+ @ExcelProperty("宸ヨ祫瀹氶")
+ @Schema(description = "宸ヨ祫瀹氶锛氳鏃朵负鍏�/灏忔椂锛岃浠朵负鍏�/浠�", example = "12.50")
+ private BigDecimal wageRate;
+
+ @ExcelProperty("杈呭姪宸ユ椂灏忔椂宸ヨ祫")
+ @Schema(description = "杈呭姪宸ユ椂灏忔椂宸ヨ祫锛堝厓/灏忔椂锛�", example = "25.00")
+ private BigDecimal auxHourlyRate;
+
+ @Schema(description = "鏍囧噯宸ユ椂璁$畻鏂瑰紡锛�0-鏈惎鐢� 1-杞�熋楄妭璺� 2-绾块�熷害鐩村彇 3-婊¢�熺櫨鍒嗘瘮脳鑺傝窛", example = "1")
+ private Integer stdTimeMode;
+
+ @Schema(description = "鏍囧噯宸ユ椂鎶樼畻绯绘暟", example = "1.8")
+ private BigDecimal stdTimeFactor;
+
+ @Schema(description = "鏈哄彴婊¤浆閫燂紙r/min锛�", example = "1200")
+ private BigDecimal maxRpm;
+
+ @Schema(description = "杞�熷弬鏁扮紪鐮�", example = "RPM")
+ private String stdRpmParamCode;
+
+ @Schema(description = "鑺傝窛鍙傛暟缂栫爜", example = "PITCH")
+ private String stdPitchParamCode;
+
+ @Schema(description = "绾块�熷害锛堢背/鍒嗭級鍙傛暟缂栫爜", example = "SPEED")
+ private String stdSpeedParamCode;
+
+ @Schema(description = "杞�熺櫨鍒嗘瘮鍙傛暟缂栫爜", example = "RPM_PERCENT")
+ private String stdPercentParamCode;
+
@ExcelProperty(value = "鐘舵��", converter = DictConvert.class)
@DictFormat(DictTypeConstants.COMMON_STATUS)
@Schema(description = "鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessSaveReqVO.java
index 2abbd0c..4d25ff7 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessSaveReqVO.java
@@ -1,9 +1,12 @@
package cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo;
import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.DecimalMin;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
+
+import java.math.BigDecimal;
@Schema(description = "绠$悊鍚庡彴 - MES 鐢熶骇宸ュ簭鏂板/淇敼 Request VO")
@Data
@@ -23,6 +26,42 @@
@Schema(description = "宸ヨ壓瑕佹眰", example = "鎸夌収鍥剧焊灏哄杩涜鍒囧壊")
private String attention;
+ @Schema(description = "璁¤垂绫诲瀷锛�1-璁℃椂 2-璁′欢", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+ @NotNull(message = "璁¤垂绫诲瀷涓嶈兘涓虹┖锛岃閫夋嫨 1-璁℃椂 鎴� 2-璁′欢")
+ private Integer billingType;
+
+ @Schema(description = "宸ヨ祫瀹氶锛氳鏃朵负鍏�/灏忔椂锛岃浠朵负鍏�/浠�", requiredMode = Schema.RequiredMode.REQUIRED, example = "12.50")
+ @NotNull(message = "宸ヨ祫瀹氶涓嶈兘涓虹┖锛岃濉啓璁℃椂锛堝厓/灏忔椂锛夋垨璁′欢锛堝厓/浠讹級鐨勫伐璧勫畾棰�")
+ @DecimalMin(value = "0", message = "宸ヨ祫瀹氶涓嶈兘灏忎簬 0锛涜鏃舵寜鍏�/灏忔椂濉啓锛岃浠舵寜鍏�/浠跺~鍐�")
+ private BigDecimal wageRate;
+
+ @Schema(description = "杈呭姪宸ユ椂灏忔椂宸ヨ祫锛堝厓/灏忔椂锛夛紝璁′欢宸ュ簭蹇呭~鏂硅兘璁$畻杈呭姪宸ヨ祫", example = "25.00")
+ @DecimalMin(value = "0", message = "杈呭姪宸ユ椂灏忔椂宸ヨ祫涓嶈兘灏忎簬 0锛涜鎸夊厓/灏忔椂濉啓杈呭姪宸ユ椂鍗曚环")
+ private BigDecimal auxHourlyRate;
+
+ @Schema(description = "鏍囧噯宸ユ椂璁$畻鏂瑰紡锛�0-鏈惎鐢� 1-杞�熋楄妭璺� 2-绾块�熷害鐩村彇 3-婊¢�熺櫨鍒嗘瘮脳鑺傝窛", example = "1")
+ private Integer stdTimeMode;
+
+ @Schema(description = "鏍囧噯宸ユ椂鎶樼畻绯绘暟锛氭潫涓濆~ 1.8锛屽叾浣欏~ 1", example = "1.8")
+ @DecimalMin(value = "0", message = "鎶樼畻绯绘暟涓嶈兘灏忎簬 0锛涙潫涓濅竴鑸~ 1.8锛屽叾浣欏伐搴忓~ 1")
+ private BigDecimal stdTimeFactor;
+
+ @Schema(description = "鏈哄彴婊¤浆閫燂紙r/min锛夛紝璁$畻鏂瑰紡=3 鏃跺繀濉笖蹇呴』澶т簬 0", example = "1200")
+ @DecimalMin(value = "0", message = "鏈哄彴婊¤浆閫熶笉鑳藉皬浜� 0锛涜绠楁柟寮忎负鈥滄弧閫熺櫨鍒嗘瘮脳鑺傝窛鈥濇椂璇峰~鍐欏疄闄呮弧杞��")
+ private BigDecimal maxRpm;
+
+ @Schema(description = "杞�熷弬鏁扮紪鐮侊紝璁$畻鏂瑰紡=1/3 鏃跺繀濉�", example = "RPM")
+ private String stdRpmParamCode;
+
+ @Schema(description = "鑺傝窛鍙傛暟缂栫爜锛岃绠楁柟寮�=1/3 鏃跺繀濉�", example = "PITCH")
+ private String stdPitchParamCode;
+
+ @Schema(description = "绾块�熷害锛堢背/鍒嗭級鍙傛暟缂栫爜锛岃绠楁柟寮�=2 鏃跺繀濉�", example = "SPEED")
+ private String stdSpeedParamCode;
+
+ @Schema(description = "杞�熺櫨鍒嗘瘮鍙傛暟缂栫爜锛岃绠楁柟寮�=3 鏃跺繀濉�", example = "RPM_PERCENT")
+ private String stdPercentParamCode;
+
@Schema(description = "鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
@NotNull(message = "鐘舵�佷笉鑳戒负绌�")
private Integer status;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/MesProProcessWageFieldController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/MesProProcessWageFieldController.java
new file mode 100644
index 0000000..344d2c0
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/MesProProcessWageFieldController.java
@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.wage;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo.MesProProcessWageFieldRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo.MesProProcessWageFieldSaveListReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.wage.MesProProcessWageFieldDO;
+import cn.iocoder.yudao.module.mes.service.pro.wage.MesProProcessWageFieldService;
+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.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "绠$悊鍚庡彴 - MES 宸ュ簭宸ヨ祫瀛楁")
+@RestController
+@RequestMapping("/mes/pro/process-wage-field")
+@Validated
+public class MesProProcessWageFieldController {
+
+ @Resource
+ private MesProProcessWageFieldService processWageFieldService;
+
+ @GetMapping("/list")
+ @Operation(summary = "鑾峰緱宸ュ簭鐨勫伐璧勫瓧娈靛垪琛�")
+ @Parameter(name = "processId", description = "宸ュ簭缂栧彿", required = true, example = "1024")
+ public CommonResult<List<MesProProcessWageFieldRespVO>> getFieldList(@RequestParam("processId") Long processId) {
+ List<MesProProcessWageFieldDO> list = processWageFieldService.getFieldList(processId);
+ return success(BeanUtils.toBean(list, MesProProcessWageFieldRespVO.class));
+ }
+
+ @PostMapping("/save-list")
+ @Operation(summary = "鎵归噺淇濆瓨宸ュ簭宸ヨ祫瀛楁")
+ @PreAuthorize("@ss.hasPermission('mes:pro-process:update')")
+ public CommonResult<Boolean> saveFieldList(@Valid @RequestBody MesProProcessWageFieldSaveListReqVO reqVO) {
+ processWageFieldService.saveFieldList(reqVO);
+ return success(true);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/MesProProcessWageRuleController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/MesProProcessWageRuleController.java
new file mode 100644
index 0000000..b6b3c23
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/MesProProcessWageRuleController.java
@@ -0,0 +1,84 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.wage;
+
+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.pro.wage.vo.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.wage.MesProProcessWageRuleDO;
+import cn.iocoder.yudao.module.mes.service.pro.wage.MesProProcessWageRuleService;
+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.time.LocalDate;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "绠$悊鍚庡彴 - MES 宸ュ簭宸ヨ祫鍗曚环瑙勫垯")
+@RestController
+@RequestMapping("/mes/pro/process-wage-rule")
+@Validated
+public class MesProProcessWageRuleController {
+
+ @Resource
+ private MesProProcessWageRuleService processWageRuleService;
+
+ @PostMapping("/create")
+ @Operation(summary = "鍒涘缓宸ュ簭宸ヨ祫鍗曚环瑙勫垯")
+ @PreAuthorize("@ss.hasPermission('mes:pro-process:update')")
+ public CommonResult<Long> createRule(@Valid @RequestBody MesProProcessWageRuleSaveReqVO createReqVO) {
+ return success(processWageRuleService.createRule(createReqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "鏇存柊宸ュ簭宸ヨ祫鍗曚环瑙勫垯")
+ @PreAuthorize("@ss.hasPermission('mes:pro-process:update')")
+ public CommonResult<Boolean> updateRule(@Valid @RequestBody MesProProcessWageRuleSaveReqVO updateReqVO) {
+ processWageRuleService.updateRule(updateReqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎宸ュ簭宸ヨ祫鍗曚环瑙勫垯")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:pro-process:update')")
+ public CommonResult<Boolean> deleteRule(@RequestParam("id") Long id) {
+ processWageRuleService.deleteRule(id);
+ return success(true);
+ }
+
+ @GetMapping("/list")
+ @Operation(summary = "鑾峰緱宸ュ簭鐨勫伐璧勫崟浠疯鍒欏垪琛�")
+ @Parameter(name = "processId", description = "宸ュ簭缂栧彿", required = true)
+ public CommonResult<List<MesProProcessWageRuleRespVO>> getRuleList(@RequestParam("processId") Long processId) {
+ List<MesProProcessWageRuleDO> list = processWageRuleService.getRuleListByProcessId(processId);
+ return success(BeanUtils.toBean(list, MesProProcessWageRuleRespVO.class));
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱宸ュ簭宸ヨ祫鍗曚环瑙勫垯鍒嗛〉")
+ public CommonResult<PageResult<MesProProcessWageRuleRespVO>> getRulePage(
+ @Valid MesProProcessWageRulePageReqVO pageReqVO) {
+ PageResult<MesProProcessWageRuleDO> pageResult = processWageRuleService.getRulePage(pageReqVO);
+ return success(BeanUtils.toBean(pageResult, MesProProcessWageRuleRespVO.class));
+ }
+
+ @GetMapping("/resolve")
+ @Operation(summary = "瑙f瀽鍛戒腑鐨勫伐搴忓伐璧勫崟浠�")
+ public CommonResult<MesProProcessWageRuleResolveRespVO> resolve(
+ @RequestParam("processId") Long processId,
+ @RequestParam(value = "routeId", required = false) Long routeId,
+ @RequestParam(value = "machineryId", required = false) Long machineryId,
+ @RequestParam(value = "billingType", required = false) Integer billingType,
+ @RequestParam(value = "date", required = false) @org.springframework.format.annotation.DateTimeFormat(
+ iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE) LocalDate date) {
+ return success(processWageRuleService.resolve(processId, routeId, machineryId, billingType, date));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/MesProWageQualityRuleController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/MesProWageQualityRuleController.java
new file mode 100644
index 0000000..c59da1b
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/MesProWageQualityRuleController.java
@@ -0,0 +1,81 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.wage;
+
+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.pro.wage.vo.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.wage.MesProWageQualityRuleDO;
+import cn.iocoder.yudao.module.mes.service.pro.wage.MesProWageQualityRuleService;
+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.math.BigDecimal;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "绠$悊鍚庡彴 - MES 璐ㄩ噺宸ヨ祫瑙勫垯")
+@RestController
+@RequestMapping("/mes/pro/quality-wage-rule")
+@Validated
+public class MesProWageQualityRuleController {
+
+ @Resource
+ private MesProWageQualityRuleService qualityRuleService;
+
+ @PostMapping("/create")
+ @Operation(summary = "鍒涘缓璐ㄩ噺宸ヨ祫瑙勫垯")
+ @PreAuthorize("@ss.hasPermission('mes:pro-process:update')")
+ public CommonResult<Long> createRule(@Valid @RequestBody MesProWageQualityRuleSaveReqVO createReqVO) {
+ return success(qualityRuleService.createRule(createReqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "鏇存柊璐ㄩ噺宸ヨ祫瑙勫垯")
+ @PreAuthorize("@ss.hasPermission('mes:pro-process:update')")
+ public CommonResult<Boolean> updateRule(@Valid @RequestBody MesProWageQualityRuleSaveReqVO updateReqVO) {
+ qualityRuleService.updateRule(updateReqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎璐ㄩ噺宸ヨ祫瑙勫垯")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:pro-process:update')")
+ public CommonResult<Boolean> deleteRule(@RequestParam("id") Long id) {
+ qualityRuleService.deleteRule(id);
+ return success(true);
+ }
+
+ @GetMapping("/list")
+ @Operation(summary = "鑾峰緱宸ュ簭鐨勮川閲忓伐璧勮鍒欏垪琛�")
+ @Parameter(name = "processId", description = "宸ュ簭缂栧彿", required = true)
+ public CommonResult<List<MesProWageQualityRuleRespVO>> getRuleList(@RequestParam("processId") Long processId) {
+ List<MesProWageQualityRuleDO> list = qualityRuleService.getRuleListByProcessId(processId);
+ return success(BeanUtils.toBean(list, MesProWageQualityRuleRespVO.class));
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱璐ㄩ噺宸ヨ祫瑙勫垯鍒嗛〉")
+ public CommonResult<PageResult<MesProWageQualityRuleRespVO>> getRulePage(
+ @Valid MesProWageQualityRulePageReqVO pageReqVO) {
+ PageResult<MesProWageQualityRuleDO> pageResult = qualityRuleService.getRulePage(pageReqVO);
+ return success(BeanUtils.toBean(pageResult, MesProWageQualityRuleRespVO.class));
+ }
+
+ @GetMapping("/resolve")
+ @Operation(summary = "鎸夊悎鏍肩巼鍖归厤璐ㄩ噺宸ヨ祫瑙勫垯")
+ public CommonResult<MesProWageQualityRuleResolveRespVO> resolve(
+ @RequestParam("processId") Long processId,
+ @RequestParam(value = "routeId", required = false) Long routeId,
+ @RequestParam("passRate") BigDecimal passRate) {
+ return success(qualityRuleService.resolve(processId, routeId, passRate));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageFieldRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageFieldRespVO.java
new file mode 100644
index 0000000..96238de
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageFieldRespVO.java
@@ -0,0 +1,52 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 宸ュ簭宸ヨ祫瀛楁 Response VO")
+@Data
+public class MesProProcessWageFieldRespVO {
+
+ @Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ private Long id;
+
+ @Schema(description = "宸ュ簭缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ private Long processId;
+
+ @Schema(description = "瀛楁缂栫爜", requiredMode = Schema.RequiredMode.REQUIRED)
+ private String fieldCode;
+
+ @Schema(description = "瀛楁鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED)
+ private String fieldName;
+
+ @Schema(description = "瀛楁绫诲瀷锛�1-鏁板�� 2-鏂囨湰 3-涓嬫媺 4-甯冨皵")
+ private Integer fieldType;
+
+ @Schema(description = "鍗曚綅")
+ private String unit;
+
+ @Schema(description = "榛樿瀛楁鍊�")
+ private String fieldValue;
+
+ @Schema(description = "璁$畻瑙掕壊锛�1-绯绘暟 2-鍔犲噺閲戦 3-璁′环鏁伴噺 4-浠呰褰�")
+ private Integer calcRole;
+
+ @Schema(description = "鍗曚环锛堣浠锋暟閲忚鑹蹭娇鐢級")
+ private BigDecimal unitPrice;
+
+ @Schema(description = "鎺掑簭")
+ private Integer sort;
+
+ @Schema(description = "鐘舵�侊細0-鍚敤 1-绂佺敤")
+ private Integer status;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ @Schema(description = "鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageFieldSaveListReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageFieldSaveListReqVO.java
new file mode 100644
index 0000000..9fa1fff
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageFieldSaveListReqVO.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 宸ュ簭宸ヨ祫瀛楁鎵归噺淇濆瓨 Request VO")
+@Data
+public class MesProProcessWageFieldSaveListReqVO {
+
+ @Schema(description = "宸ュ簭缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "宸ュ簭涓嶈兘涓虹┖")
+ private Long processId;
+
+ @Schema(description = "瀛楁鍒楄〃锛屼笉瀛樺湪鐨勭紪鍙疯涓哄垹闄�")
+ @Valid
+ private List<MesProProcessWageFieldSaveReqVO> list;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageFieldSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageFieldSaveReqVO.java
new file mode 100644
index 0000000..11f2ccc
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageFieldSaveReqVO.java
@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 宸ュ簭宸ヨ祫瀛楁鏂板/淇敼 Request VO")
+@Data
+public class MesProProcessWageFieldSaveReqVO {
+
+ @Schema(description = "缂栧彿")
+ private Long id;
+
+ @Schema(description = "宸ュ簭缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "宸ュ簭涓嶈兘涓虹┖")
+ private Long processId;
+
+ @Schema(description = "瀛楁缂栫爜", requiredMode = Schema.RequiredMode.REQUIRED, example = "TEMP_COEF")
+ @NotBlank(message = "瀛楁缂栫爜涓嶈兘涓虹┖")
+ private String fieldCode;
+
+ @Schema(description = "瀛楁鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "楂樻俯绯绘暟")
+ @NotBlank(message = "瀛楁鍚嶇О涓嶈兘涓虹┖")
+ private String fieldName;
+
+ @Schema(description = "瀛楁绫诲瀷锛�1-鏁板�� 2-鏂囨湰 3-涓嬫媺 4-甯冨皵", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "瀛楁绫诲瀷涓嶈兘涓虹┖")
+ private Integer fieldType;
+
+ @Schema(description = "鍗曚綅", example = "绯绘暟")
+ private String unit;
+
+ @Schema(description = "宸ュ簭绾у浐瀹氬��", example = "1.10")
+ private String fieldValue;
+
+ @Schema(description = "璁$畻瑙掕壊锛�1-绯绘暟 2-鍔犲噺閲戦 3-璁′环鏁伴噺 4-浠呰褰�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璁$畻瑙掕壊涓嶈兘涓虹┖")
+ private Integer calcRole;
+
+ @Schema(description = "璁′环鏁伴噺鍗曚环", example = "2.00")
+ private BigDecimal unitPrice;
+
+ @Schema(description = "鎺掑簭")
+ private Integer sort;
+
+ @Schema(description = "鐘舵�侊細0-鍚敤 1-绂佺敤")
+ private Integer status;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageRulePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageRulePageReqVO.java
new file mode 100644
index 0000000..1a595e2
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageRulePageReqVO.java
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 宸ュ簭宸ヨ祫鍗曚环瑙勫垯鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MesProProcessWageRulePageReqVO extends PageParam {
+
+ @Schema(description = "宸ュ簭缂栧彿")
+ private Long processId;
+
+ @Schema(description = "宸ヨ壓璺嚎缂栧彿")
+ private Long routeId;
+
+ @Schema(description = "璁惧缂栧彿")
+ private Long machineryId;
+
+ @Schema(description = "璁¤垂绫诲瀷锛�1-璁℃椂 2-璁′欢")
+ private Integer billingType;
+
+ @Schema(description = "鐘舵�侊細0-鍚敤 1-绂佺敤")
+ private Integer status;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageRuleResolveRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageRuleResolveRespVO.java
new file mode 100644
index 0000000..bd54126
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageRuleResolveRespVO.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 宸ュ簭宸ヨ祫鍗曚环璇曠畻 Response VO")
+@Data
+public class MesProProcessWageRuleResolveRespVO {
+
+ @Schema(description = "鍛戒腑鐨勫伐璧勫崟浠�")
+ private BigDecimal wageRate;
+
+ @Schema(description = "鍛戒腑鐨勮鍒欑紪鍙凤紝绌�=浣跨敤宸ュ簭榛樿鍗曚环")
+ private Long ruleId;
+
+ @Schema(description = "鍖归厤绾у埆锛欵XACT-宸ュ簭+璺嚎+璁惧 ROUTE-宸ュ簭+璺嚎 MACHINERY-宸ュ簭+璁惧 DEFAULT-宸ュ簭榛樿")
+ private String matchLevel;
+
+ @Schema(description = "宸ュ簭缂栧彿")
+ private Long processId;
+
+ @Schema(description = "宸ヨ壓璺嚎缂栧彿")
+ private Long routeId;
+
+ @Schema(description = "璁惧缂栧彿")
+ private Long machineryId;
+
+ @Schema(description = "璁¤垂绫诲瀷锛�1-璁℃椂 2-璁′欢")
+ private Integer billingType;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageRuleRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageRuleRespVO.java
new file mode 100644
index 0000000..c04ed0d
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageRuleRespVO.java
@@ -0,0 +1,59 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 宸ュ簭宸ヨ祫鍗曚环瑙勫垯 Response VO")
+@Data
+public class MesProProcessWageRuleRespVO {
+
+ @Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ private Long id;
+
+ @Schema(description = "宸ュ簭缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ private Long processId;
+
+ @Schema(description = "宸ュ簭鍚嶇О")
+ private String processName;
+
+ @Schema(description = "宸ヨ壓璺嚎缂栧彿")
+ private Long routeId;
+
+ @Schema(description = "宸ヨ壓璺嚎鍚嶇О")
+ private String routeName;
+
+ @Schema(description = "璁惧缂栧彿")
+ private Long machineryId;
+
+ @Schema(description = "璁惧鍚嶇О")
+ private String machineryName;
+
+ @Schema(description = "璁¤垂绫诲瀷")
+ private Integer billingType;
+
+ @Schema(description = "宸ヨ祫鍗曚环")
+ private BigDecimal wageRate;
+
+ @Schema(description = "鐢熸晥寮�濮嬫棩鏈�")
+ private LocalDate effectiveFrom;
+
+ @Schema(description = "鐢熸晥缁撴潫鏃ユ湡")
+ private LocalDate effectiveTo;
+
+ @Schema(description = "浼樺厛绾�")
+ private Integer priority;
+
+ @Schema(description = "鐘舵�侊細0-鍚敤 1-绂佺敤")
+ private Integer status;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ @Schema(description = "鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageRuleSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageRuleSaveReqVO.java
new file mode 100644
index 0000000..9242761
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProProcessWageRuleSaveReqVO.java
@@ -0,0 +1,52 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 宸ュ簭宸ヨ祫鍗曚环瑙勫垯鏂板/淇敼 Request VO")
+@Data
+public class MesProProcessWageRuleSaveReqVO {
+
+ @Schema(description = "缂栧彿")
+ private Long id;
+
+ @Schema(description = "宸ュ簭缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "宸ュ簭涓嶈兘涓虹┖")
+ private Long processId;
+
+ @Schema(description = "宸ヨ壓璺嚎缂栧彿锛岀┖=涓嶉檺璺嚎")
+ private Long routeId;
+
+ @Schema(description = "璁惧缂栧彿锛岀┖=涓嶉檺璁惧")
+ private Long machineryId;
+
+ @Schema(description = "璁¤垂绫诲瀷锛�1-璁℃椂 2-璁′欢", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璁¤垂绫诲瀷涓嶈兘涓虹┖")
+ private Integer billingType;
+
+ @Schema(description = "宸ヨ祫鍗曚环锛氳鏃�=鍏�/灏忔椂锛岃浠�=鍏�/浠�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "宸ヨ祫鍗曚环涓嶈兘涓虹┖")
+ @DecimalMin(value = "0", message = "宸ヨ祫鍗曚环涓嶈兘灏忎簬 0")
+ private BigDecimal wageRate;
+
+ @Schema(description = "鐢熸晥寮�濮嬫棩鏈�")
+ private LocalDate effectiveFrom;
+
+ @Schema(description = "鐢熸晥缁撴潫鏃ユ湡")
+ private LocalDate effectiveTo;
+
+ @Schema(description = "浼樺厛绾э紝瓒婂ぇ瓒婁紭鍏�")
+ private Integer priority;
+
+ @Schema(description = "鐘舵�侊細0-鍚敤 1-绂佺敤")
+ private Integer status;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProWageQualityRulePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProWageQualityRulePageReqVO.java
new file mode 100644
index 0000000..15d2b76
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProWageQualityRulePageReqVO.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 璐ㄩ噺宸ヨ祫瑙勫垯鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MesProWageQualityRulePageReqVO extends PageParam {
+
+ @Schema(description = "宸ュ簭缂栧彿")
+ private Long processId;
+
+ @Schema(description = "宸ヨ壓璺嚎缂栧彿")
+ private Long routeId;
+
+ @Schema(description = "瑙勫垯绫诲瀷锛�1-鍚堟牸鐜囩郴鏁� 2-涓嶅悎鏍兼墸娆�")
+ private Integer ruleType;
+
+ @Schema(description = "鐘舵�侊細0-鍚敤 1-绂佺敤")
+ private Integer status;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProWageQualityRuleResolveRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProWageQualityRuleResolveRespVO.java
new file mode 100644
index 0000000..94288fe
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProWageQualityRuleResolveRespVO.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 璐ㄩ噺宸ヨ祫瑙勫垯鍛戒腑缁撴灉 Response VO")
+@Data
+public class MesProWageQualityRuleResolveRespVO {
+
+ @Schema(description = "宸ュ簭缂栧彿")
+ private Long processId;
+
+ @Schema(description = "宸ヨ壓璺嚎缂栧彿")
+ private Long routeId;
+
+ @Schema(description = "鍚堟牸鐜囷紙%锛�")
+ private BigDecimal passRate;
+
+ @Schema(description = "鍛戒腑鐨勮鍒欑紪鍙凤紝绌�=鏈懡涓�")
+ private Long ruleId;
+
+ @Schema(description = "瑙勫垯绫诲瀷锛�1-鍚堟牸鐜囩郴鏁� 2-涓嶅悎鏍兼墸娆�")
+ private Integer ruleType;
+
+ @Schema(description = "鍚堟牸鐜囩郴鏁�")
+ private BigDecimal coefficient;
+
+ @Schema(description = "姣忎欢鎵f")
+ private BigDecimal deductionPerUnit;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProWageQualityRuleRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProWageQualityRuleRespVO.java
new file mode 100644
index 0000000..06bed9c
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProWageQualityRuleRespVO.java
@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 璐ㄩ噺宸ヨ祫瑙勫垯 Response VO")
+@Data
+public class MesProWageQualityRuleRespVO {
+
+ @Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ private Long id;
+
+ @Schema(description = "宸ュ簭缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ private Long processId;
+
+ @Schema(description = "宸ュ簭鍚嶇О")
+ private String processName;
+
+ @Schema(description = "宸ヨ壓璺嚎缂栧彿")
+ private Long routeId;
+
+ @Schema(description = "宸ヨ壓璺嚎鍚嶇О")
+ private String routeName;
+
+ @Schema(description = "瑙勫垯绫诲瀷锛�1-鍚堟牸鐜囩郴鏁� 2-涓嶅悎鏍兼墸娆�")
+ private Integer ruleType;
+
+ @Schema(description = "鍚堟牸鐜囦笅闄愶紙鍚級锛岀櫨鍒嗘瘮")
+ private BigDecimal minRate;
+
+ @Schema(description = "鍚堟牸鐜囦笂闄愶紙涓嶅惈锛夛紝鐧惧垎姣�")
+ private BigDecimal maxRate;
+
+ @Schema(description = "绯绘暟")
+ private BigDecimal coefficient;
+
+ @Schema(description = "姣忎欢鎵f")
+ private BigDecimal deductionPerUnit;
+
+ @Schema(description = "浼樺厛绾�")
+ private Integer priority;
+
+ @Schema(description = "鐘舵�侊細0-鍚敤 1-绂佺敤")
+ private Integer status;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ @Schema(description = "鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProWageQualityRuleSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProWageQualityRuleSaveReqVO.java
new file mode 100644
index 0000000..48597e7
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/wage/vo/MesProWageQualityRuleSaveReqVO.java
@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 璐ㄩ噺宸ヨ祫瑙勫垯鏂板/淇敼 Request VO")
+@Data
+public class MesProWageQualityRuleSaveReqVO {
+
+ @Schema(description = "缂栧彿")
+ private Long id;
+
+ @Schema(description = "宸ュ簭缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "宸ュ簭涓嶈兘涓虹┖")
+ private Long processId;
+
+ @Schema(description = "宸ヨ壓璺嚎缂栧彿锛岀┖=涓嶉檺璺嚎")
+ private Long routeId;
+
+ @Schema(description = "瑙勫垯绫诲瀷锛�1-鍚堟牸鐜囩郴鏁� 2-涓嶅悎鏍兼墸娆�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "瑙勫垯绫诲瀷涓嶈兘涓虹┖")
+ private Integer ruleType;
+
+ @Schema(description = "鍚堟牸鐜囦笅闄愶紙鍚級锛岀櫨鍒嗘瘮", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "鍚堟牸鐜囦笅闄愪笉鑳戒负绌�")
+ @DecimalMin(value = "0", message = "鍚堟牸鐜囦笅闄愪笉鑳藉皬浜� 0")
+ @DecimalMax(value = "100", message = "鍚堟牸鐜囦笅闄愪笉鑳藉ぇ浜� 100")
+ private BigDecimal minRate;
+
+ @Schema(description = "鍚堟牸鐜囦笂闄愶紙涓嶅惈锛夛紝鐧惧垎姣旓紱100=鏃犱笂闄�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "鍚堟牸鐜囦笂闄愪笉鑳戒负绌�")
+ @DecimalMin(value = "0", message = "鍚堟牸鐜囦笂闄愪笉鑳藉皬浜� 0")
+ @DecimalMax(value = "100", message = "鍚堟牸鐜囦笂闄愪笉鑳藉ぇ浜� 100")
+ private BigDecimal maxRate;
+
+ @Schema(description = "绯绘暟锛堣鍒欑被鍨�=1 鏃跺繀濉級")
+ private BigDecimal coefficient;
+
+ @Schema(description = "姣忎欢鎵f锛堣鍒欑被鍨�=2 鏃跺繀濉級")
+ private BigDecimal deductionPerUnit;
+
+ @Schema(description = "浼樺厛绾э紝瓒婂ぇ瓒婁紭鍏�")
+ private Integer priority;
+
+ @Schema(description = "鐘舵�侊細0-鍚敤 1-绂佺敤")
+ private Integer status;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/MesProWorktimeAuxController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/MesProWorktimeAuxController.java
new file mode 100644
index 0000000..0ff86ce
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/MesProWorktimeAuxController.java
@@ -0,0 +1,119 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.worktime;
+
+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.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo.MesProWorktimeAuxPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo.MesProWorktimeAuxRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo.MesProWorktimeAuxSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.worktime.MesProWorktimeAuxDO;
+import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
+import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
+import cn.iocoder.yudao.module.mes.service.pro.worktime.MesProWorktimeAuxService;
+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 java.util.Set;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
+
+@Tag(name = "绠$悊鍚庡彴 - MES 杈呭姪宸ユ椂閰嶇疆")
+@RestController
+@RequestMapping("/mes/pro/worktime-aux")
+@Validated
+public class MesProWorktimeAuxController {
+
+ @Resource
+ private MesProWorktimeAuxService worktimeAuxService;
+ @Resource
+ private MesProProcessService processService;
+ @Resource
+ private MesMdWorkstationService workstationService;
+
+ @PostMapping("/create")
+ @Operation(summary = "鍒涘缓杈呭姪宸ユ椂椤圭洰")
+ @PreAuthorize("@ss.hasPermission('mes:pro-worktime-aux:create')")
+ public CommonResult<Long> createWorktimeAux(@Valid @RequestBody MesProWorktimeAuxSaveReqVO createReqVO) {
+ return success(worktimeAuxService.createWorktimeAux(createReqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "鏇存柊杈呭姪宸ユ椂椤圭洰")
+ @PreAuthorize("@ss.hasPermission('mes:pro-worktime-aux:update')")
+ public CommonResult<Boolean> updateWorktimeAux(@Valid @RequestBody MesProWorktimeAuxSaveReqVO updateReqVO) {
+ worktimeAuxService.updateWorktimeAux(updateReqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎杈呭姪宸ユ椂椤圭洰")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:pro-worktime-aux:delete')")
+ public CommonResult<Boolean> deleteWorktimeAux(@RequestParam("id") Long id) {
+ worktimeAuxService.deleteWorktimeAux(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱杈呭姪宸ユ椂椤圭洰")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:pro-worktime-aux:query')")
+ public CommonResult<MesProWorktimeAuxRespVO> getWorktimeAux(@RequestParam("id") Long id) {
+ MesProWorktimeAuxDO aux = worktimeAuxService.getWorktimeAux(id);
+ if (aux == null) {
+ return success(null);
+ }
+ return success(buildRespVOList(Collections.singletonList(aux)).get(0));
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱杈呭姪宸ユ椂椤圭洰鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('mes:pro-worktime-aux:query')")
+ public CommonResult<PageResult<MesProWorktimeAuxRespVO>> getWorktimeAuxPage(@Valid MesProWorktimeAuxPageReqVO pageReqVO) {
+ PageResult<MesProWorktimeAuxDO> pageResult = worktimeAuxService.getWorktimeAuxPage(pageReqVO);
+ return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal()));
+ }
+
+ @GetMapping("/list-applicable")
+ @Operation(summary = "鑾峰緱宸ュ簭+鏈哄彴鍙敤鐨勮緟鍔╁伐鏃堕」鐩紝鎶ュ伐琛ㄥ崟浣跨敤")
+ @Parameter(name = "processId", description = "宸ュ簭缂栧彿", required = true)
+ @Parameter(name = "workstationId", description = "宸ヤ綔绔欙紙鏈哄彴锛夌紪鍙�")
+ @PreAuthorize("@ss.hasPermission('mes:pro-feedback:create')")
+ public CommonResult<List<MesProWorktimeAuxRespVO>> getApplicableList(@RequestParam("processId") Long processId,
+ @RequestParam(value = "workstationId", required = false) Long workstationId) {
+ List<MesProWorktimeAuxDO> list = worktimeAuxService.getApplicableList(processId, workstationId);
+ return success(buildRespVOList(list));
+ }
+
+ private List<MesProWorktimeAuxRespVO> buildRespVOList(List<MesProWorktimeAuxDO> list) {
+ if (CollUtil.isEmpty(list)) {
+ return Collections.emptyList();
+ }
+ Set<Long> processIds = convertSet(list, MesProWorktimeAuxDO::getProcessId);
+ processIds.remove(null);
+ Map<Long, MesProProcessDO> processMap = processService.getProcessMap(processIds);
+ Set<Long> workstationIds = convertSet(list, MesProWorktimeAuxDO::getWorkstationId);
+ workstationIds.remove(null);
+ Map<Long, MesMdWorkstationDO> workstationMap = workstationService.getWorkstationMap(workstationIds);
+ return BeanUtils.toBean(list, MesProWorktimeAuxRespVO.class, vo -> {
+ findAndThen(processMap, vo.getProcessId(), process -> vo.setProcessName(process.getName()));
+ findAndThen(workstationMap, vo.getWorkstationId(),
+ workstation -> vo.setWorkstationName(workstation.getName()));
+ });
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/MesProWorktimeController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/MesProWorktimeController.java
new file mode 100644
index 0000000..bda6e8a
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/MesProWorktimeController.java
@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.worktime;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo.MesProWorktimeCalcReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo.MesProWorktimeCalcRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo.MesProWorktimeReportReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo.MesProWorktimeReportRespVO;
+import cn.iocoder.yudao.module.mes.service.pro.worktime.MesProWorktimeReportService;
+import cn.iocoder.yudao.module.mes.service.pro.worktime.MesProWorktimeService;
+import io.swagger.v3.oas.annotations.Operation;
+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.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;
+
+@Tag(name = "绠$悊鍚庡彴 - MES 宸ユ椂鑰冩牳")
+@RestController
+@RequestMapping("/mes/pro/worktime")
+@Validated
+public class MesProWorktimeController {
+
+ @Resource
+ private MesProWorktimeService worktimeService;
+ @Resource
+ private MesProWorktimeReportService worktimeReportService;
+
+ @PostMapping("/calculate")
+ @Operation(summary = "璇曠畻鏍囧噯宸ユ椂", description = "鎶ュ伐琛ㄥ崟褰曞叆鐢熶骇闀垮害涓庤緟鍔╅」娆℃暟鍚庡疄鏃惰瘯绠楋紝涓嶈惤搴�")
+ @PreAuthorize("@ss.hasPermission('mes:pro-feedback:create')")
+ public CommonResult<MesProWorktimeCalcRespVO> calculate(@Valid @RequestBody MesProWorktimeCalcReqVO reqVO) {
+ return success(worktimeService.calculate(reqVO));
+ }
+
+ @GetMapping("/report")
+ @Operation(summary = "鑾峰緱宸ユ椂鑰冩牳鎶ヨ〃", description = "鎸変汉/宸ュ簭/鏈哄彴/鏃ユ湡姹囨�诲疄闄呭伐鏃躲�佹爣鍑嗗伐鏃朵笌宸紓")
+ @PreAuthorize("@ss.hasPermission('mes:pro-worktime-report:query')")
+ public CommonResult<MesProWorktimeReportRespVO> getReport(@Valid MesProWorktimeReportReqVO reqVO) {
+ return success(worktimeReportService.getReport(reqVO));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeAuxPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeAuxPageReqVO.java
new file mode 100644
index 0000000..e0b173a
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeAuxPageReqVO.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 杈呭姪宸ユ椂閰嶇疆鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MesProWorktimeAuxPageReqVO extends PageParam {
+
+ @Schema(description = "宸ュ簭缂栧彿", example = "1024")
+ private Long processId;
+
+ @Schema(description = "宸ヤ綔绔欙紙鏈哄彴锛夌紪鍙�", example = "2048")
+ private Long workstationId;
+
+ @Schema(description = "杈呭姪椤圭洰鍚嶇О", example = "涓婁笅鏀剧嚎鐩�")
+ private String itemName;
+
+ @Schema(description = "鐘舵�侊細0-鍚敤 1-绂佺敤", example = "0")
+ private Integer status;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeAuxRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeAuxRespVO.java
new file mode 100644
index 0000000..742cbea
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeAuxRespVO.java
@@ -0,0 +1,67 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 杈呭姪宸ユ椂閰嶇疆 Response VO")
+@Data
+public class MesProWorktimeAuxRespVO {
+
+ @Schema(description = "缂栧彿", example = "1024")
+ private Long id;
+
+ @Schema(description = "宸ュ簭缂栧彿", example = "1024")
+ private Long processId;
+
+ @Schema(description = "宸ュ簭鍚嶇О", example = "缁濈紭50鏈�")
+ private String processName;
+
+ @Schema(description = "宸ヤ綔绔欙紙鏈哄彴锛夌紪鍙�", example = "2048")
+ private Long workstationId;
+
+ @Schema(description = "宸ヤ綔绔欙紙鏈哄彴锛夊悕绉�", example = "缁濈紭50鏈�")
+ private String workstationName;
+
+ @Schema(description = "杈呭姪椤圭洰缂栫爜", example = "AUX_REEL_CHANGE")
+ private String itemCode;
+
+ @Schema(description = "杈呭姪椤圭洰鍚嶇О", example = "涓婁笅鏀剧嚎鐩�")
+ private String itemName;
+
+ @Schema(description = "璁¢噺鏂瑰紡锛�1-鎸夋 2-鎸変釜 3-鎸夌洏 4-鎸夌背鎶樼畻", example = "2")
+ private Integer measureType;
+
+ @Schema(description = "杈呭姪璁¤柂鏂瑰紡锛�0-涓嶈钖� 1-鎸夊伐搴忚緟鍔╁皬鏃跺伐璧� 2-鎸夋湰椤瑰崟浠�", example = "1")
+ private Integer wageMode;
+
+ @Schema(description = "鏈」杈呭姪灏忔椂宸ヨ祫锛堝厓/灏忔椂锛�", example = "25.00")
+ private BigDecimal wageRate;
+
+ @Schema(description = "鍗曟/鍗曚釜/鍗曠洏鍒嗛挓鏁�", example = "5.00")
+ private BigDecimal durationMinutes;
+
+ @Schema(description = "鎶樼畻閫熷害锛堢背/鍒嗭級", example = "30.00")
+ private BigDecimal speedMPerMin;
+
+ @Schema(description = "鎹㈣壊璧峰鏉愭枡", example = "PVC")
+ private String materialFrom;
+
+ @Schema(description = "鎹㈣壊鐩爣鏉愭枡", example = "LSZH")
+ private String materialTo;
+
+ @Schema(description = "鐘舵�侊細0-鍚敤 1-绂佺敤", example = "0")
+ private Integer status;
+
+ @Schema(description = "鎺掑簭", example = "1")
+ private Integer sort;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ @Schema(description = "鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeAuxSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeAuxSaveReqVO.java
new file mode 100644
index 0000000..9a7196e
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeAuxSaveReqVO.java
@@ -0,0 +1,67 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 杈呭姪宸ユ椂閰嶇疆鏂板/淇敼 Request VO")
+@Data
+public class MesProWorktimeAuxSaveReqVO {
+
+ @Schema(description = "缂栧彿", example = "1024")
+ private Long id;
+
+ @Schema(description = "宸ュ簭缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ @NotNull(message = "宸ュ簭涓嶈兘涓虹┖锛岃閫夋嫨璇ヨ緟鍔╁伐鏃堕�傜敤鐨勫伐搴�")
+ private Long processId;
+
+ @Schema(description = "宸ヤ綔绔欙紙鏈哄彴锛夌紪鍙凤紝绌�=涓嶉檺鏈哄彴", example = "2048")
+ private Long workstationId;
+
+ @Schema(description = "杈呭姪椤圭洰缂栫爜", requiredMode = Schema.RequiredMode.REQUIRED, example = "AUX_REEL_CHANGE")
+ @NotBlank(message = "杈呭姪椤圭洰缂栫爜涓嶈兘涓虹┖")
+ private String itemCode;
+
+ @Schema(description = "杈呭姪椤圭洰鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "涓婁笅鏀剧嚎鐩�")
+ @NotBlank(message = "杈呭姪椤圭洰鍚嶇О涓嶈兘涓虹┖")
+ private String itemName;
+
+ @Schema(description = "璁¢噺鏂瑰紡锛�1-鎸夋 2-鎸変釜 3-鎸夌洏 4-鎸夌背鎶樼畻", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+ @NotNull(message = "璁¢噺鏂瑰紡涓嶈兘涓虹┖锛岃閫夋嫨 1-鎸夋 / 2-鎸変釜 / 3-鎸夌洏 / 4-鎸夌背鎶樼畻")
+ private Integer measureType;
+
+ @Schema(description = "杈呭姪璁¤柂鏂瑰紡锛�0-涓嶈钖� 1-鎸夊伐搴忚緟鍔╁皬鏃跺伐璧� 2-鎸夋湰椤瑰崟浠�", example = "1")
+ private Integer wageMode;
+
+ @Schema(description = "鏈」杈呭姪灏忔椂宸ヨ祫锛堝厓/灏忔椂锛夛紝璁¤柂鏂瑰紡=2 鏃跺繀濉�", example = "25.00")
+ @DecimalMin(value = "0", message = "杈呭姪灏忔椂宸ヨ祫涓嶈兘灏忎簬 0锛涜鎸夊厓/灏忔椂濉啓")
+ private BigDecimal wageRate;
+
+ @Schema(description = "鍗曟/鍗曚釜/鍗曠洏鍒嗛挓鏁�", example = "5.00")
+ @DecimalMin(value = "0", message = "鍗曢」鍒嗛挓鏁颁笉鑳藉皬浜� 0")
+ private BigDecimal durationMinutes;
+
+ @Schema(description = "鎶樼畻閫熷害锛堢背/鍒嗭級锛屾寜绫虫姌绠楁椂蹇呭~涓斿繀椤诲ぇ浜� 0", example = "30.00")
+ @DecimalMin(value = "0", message = "鎶樼畻閫熷害涓嶈兘灏忎簬 0")
+ private BigDecimal speedMPerMin;
+
+ @Schema(description = "鎹㈣壊/鎹㈡枡璧峰鏉愭枡", example = "PVC")
+ private String materialFrom;
+
+ @Schema(description = "鎹㈣壊/鎹㈡枡鐩爣鏉愭枡", example = "LSZH")
+ private String materialTo;
+
+ @Schema(description = "鐘舵�侊細0-鍚敤 1-绂佺敤", example = "0")
+ private Integer status;
+
+ @Schema(description = "鎺掑簭", example = "1")
+ private Integer sort;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeCalcReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeCalcReqVO.java
new file mode 100644
index 0000000..bcc1471
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeCalcReqVO.java
@@ -0,0 +1,51 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 鏍囧噯宸ユ椂璇曠畻 Request VO")
+@Data
+public class MesProWorktimeCalcReqVO {
+
+ @Schema(description = "鐢熶骇浠诲姟缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ @NotNull(message = "鐢熶骇浠诲姟涓嶈兘涓虹┖")
+ private Long taskId;
+
+ @Schema(description = "鏈鐢熶骇闀垮害锛堢背锛�", example = "1000.00")
+ private BigDecimal productionLength;
+
+ @Schema(description = "鏈鎶ュ伐鏁伴噺锛岀敤浜庣敓浜ч暱搴︿负绌烘椂鎸夆�滅背鈥濆崟浣嶈嚜鍔ㄥ甫鍏�", example = "1000.00")
+ private BigDecimal feedbackQuantity;
+
+ @Schema(description = "杈呭姪宸ユ椂褰曞叆椤�")
+ @Valid
+ private List<AuxInput> auxList;
+
+ @Schema(description = "杈呭姪宸ユ椂褰曞叆椤�")
+ @Data
+ public static class AuxInput {
+
+ @Schema(description = "杈呭姪宸ユ椂椤圭洰缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ @NotNull(message = "杈呭姪宸ユ椂椤圭洰涓嶈兘涓虹┖")
+ private Long auxItemId;
+
+ @Schema(description = "娆℃暟/涓暟/鐩樻暟/绫虫暟", example = "2.00")
+ private BigDecimal quantity;
+
+ @Schema(description = "鎹㈣壊/鎹㈡枡璧峰鏉愭枡", example = "PVC")
+ private String materialFrom;
+
+ @Schema(description = "鎹㈣壊/鎹㈡枡鐩爣鏉愭枡", example = "LSZH")
+ private String materialTo;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeCalcRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeCalcRespVO.java
new file mode 100644
index 0000000..8c8623f
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeCalcRespVO.java
@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 鏍囧噯宸ユ椂璇曠畻 Response VO")
+@Data
+public class MesProWorktimeCalcRespVO {
+
+ @Schema(description = "瀹為檯鍙備笌璁$畻鐨勭敓浜ч暱搴︼紙绫筹級锛屾湭濉笖鍗曚綅鏄背鏃朵細鎸夋姤宸ユ暟閲忓甫鍏�", example = "1000.00")
+ private BigDecimal productionLength;
+
+ @Schema(description = "鏍囧噯宸ユ椂锛堝皬鏃讹級", example = "1.25")
+ private BigDecimal standardWorkHours;
+
+ @Schema(description = "涓诲伐鏃讹紙灏忔椂锛�", example = "1.00")
+ private BigDecimal primaryHours;
+
+ @Schema(description = "杈呭姪宸ユ椂锛堝皬鏃讹級", example = "0.25")
+ private BigDecimal auxHours;
+
+ @Schema(description = "璁$畻渚濇嵁璇存槑", example = "绾块�熷害 45.60 绫�/鍒嗭紱鐢熶骇闀垮害 1000.00 绫筹紝涓诲伐鏃� 0.37h锛涜緟鍔╁伐鏃� 0.25h")
+ private String note;
+
+ @Schema(description = "鏈兘璁$畻鐨勫師鍥犲垪琛紱涓虹┖琛ㄧず璁$畻鎴愬姛")
+ private List<String> missingReasons;
+
+ @Schema(description = "杈呭姪宸ユ椂閫愰」璁$畻缁撴灉")
+ private List<AuxResult> auxList;
+
+ @Data
+ @Schema(description = "杈呭姪宸ユ椂閫愰」璁$畻缁撴灉")
+ public static class AuxResult {
+
+ @Schema(description = "杈呭姪宸ユ椂椤圭洰缂栧彿", example = "1024")
+ private Long auxItemId;
+
+ @Schema(description = "杈呭姪椤圭洰鍚嶇О", example = "涓婁笅鏀剧嚎鐩�")
+ private String itemName;
+
+ @Schema(description = "璁¢噺鏂瑰紡锛�1-鎸夋 2-鎸変釜 3-鎸夌洏 4-鎸夌背鎶樼畻", example = "2")
+ private Integer measureType;
+
+ @Schema(description = "娆℃暟/涓暟/鐩樻暟/绫虫暟", example = "2.00")
+ private BigDecimal quantity;
+
+ @Schema(description = "鎹㈣壊璧峰鏉愭枡", example = "PVC")
+ private String materialFrom;
+
+ @Schema(description = "鎹㈣壊鐩爣鏉愭枡", example = "LSZH")
+ private String materialTo;
+
+ @Schema(description = "鎶樼畻鍒嗛挓鏁�", example = "10.00")
+ private BigDecimal minutes;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeReportReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeReportReqVO.java
new file mode 100644
index 0000000..6c3f4f8
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeReportReqVO.java
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 宸ユ椂鑰冩牳鎶ヨ〃 Request VO")
+@Data
+public class MesProWorktimeReportReqVO {
+
+ @Schema(description = "鎶ュ伐鏃堕棿-寮�濮�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "寮�濮嬫椂闂翠笉鑳戒负绌猴紝璇烽�夋嫨缁熻鍛ㄦ湡")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime beginTime;
+
+ @Schema(description = "鎶ュ伐鏃堕棿-缁撴潫", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "缁撴潫鏃堕棿涓嶈兘涓虹┖锛岃閫夋嫨缁熻鍛ㄦ湡")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime endTime;
+
+ @Schema(description = "缁熻缁村害锛�1-鎸変汉 2-鎸夊伐搴� 3-鎸夋満鍙� 4-鎸夋棩鏈�", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "缁熻缁村害涓嶈兘涓虹┖锛岃閫夋嫨 1-鎸変汉 / 2-鎸夊伐搴� / 3-鎸夋満鍙� / 4-鎸夋棩鏈�")
+ private Integer dimType;
+
+ @Schema(description = "鎶ュ伐浜虹紪鍙凤紙鍙�夎繃婊わ級", example = "1024")
+ private Long feedbackUserId;
+
+ @Schema(description = "宸ュ簭缂栧彿锛堝彲閫夎繃婊わ級", example = "1024")
+ private Long processId;
+
+ @Schema(description = "宸ヤ綔绔欙紙鏈哄彴锛夌紪鍙凤紙鍙�夎繃婊わ級", example = "2048")
+ private Long workstationId;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeReportRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeReportRespVO.java
new file mode 100644
index 0000000..bac4a89
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/worktime/vo/MesProWorktimeReportRespVO.java
@@ -0,0 +1,52 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 宸ユ椂鑰冩牳鎶ヨ〃 Response VO")
+@Data
+public class MesProWorktimeReportRespVO {
+
+ @Schema(description = "鍚堣")
+ private Row summary;
+
+ @Schema(description = "鍒嗙粍鏄庣粏")
+ private List<Row> rows;
+
+ @Data
+ @Schema(description = "宸ユ椂鑰冩牳鎶ヨ〃琛�")
+ public static class Row {
+
+ @Schema(description = "鍒嗙粍閿細浜哄憳/宸ュ簭/鏈哄彴缂栧彿鎴栨棩鏈�", example = "2026-11-01")
+ private String dimKey;
+
+ @Schema(description = "鍒嗙粍鍚嶇О", example = "寮犱笁 / 缁濈紭50鏈� / 2026-11-01")
+ private String dimName;
+
+ @Schema(description = "鎶ュ伐鍗曟暟", example = "8")
+ private Long feedbackCount;
+
+ @Schema(description = "鐢熶骇闀垮害鍚堣锛堢背锛�", example = "8000.00")
+ private BigDecimal productionLength;
+
+ @Schema(description = "瀹為檯宸ユ椂鍚堣锛堝皬鏃讹級", example = "12.50")
+ private BigDecimal actualHours;
+
+ @Schema(description = "鏍囧噯宸ユ椂鍚堣锛堝皬鏃讹級", example = "10.00")
+ private BigDecimal standardHours;
+
+ @Schema(description = "宸ユ椂宸紓鍚堣锛堝皬鏃讹級= 瀹為檯 - 鏍囧噯", example = "2.50")
+ private BigDecimal workHoursDiff;
+
+ @Schema(description = "宸ユ椂宸紓鐜囷紙%锛�= (瀹為檯 - 鏍囧噯) 梅 鏍囧噯 脳 100", example = "25.00")
+ private BigDecimal workHoursDiffRate;
+
+ @Schema(description = "鎶ュ伐宸ヨ祫鍚堣锛堝厓锛�", example = "375.00")
+ private BigDecimal wageAmount;
+
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/attachment/MesQcAttachmentController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/attachment/MesQcAttachmentController.java
index b32f889..05ebd97 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/attachment/MesQcAttachmentController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/attachment/MesQcAttachmentController.java
@@ -83,6 +83,57 @@
return success(true);
}
+ // ==================== 杩囩▼妫�楠屻�屾楠岃銆嶉檮浠� ====================
+
+ /** 杩囩▼妫�楠岃闄勪欢锛歳ecordId 涓烘楠岀粨鏋滄槑缁� ID锛屾瘡琛岀嫭绔嬩笂浼� */
+ @GetMapping("/ipqc-detail/list")
+ @PreAuthorize("@ss.hasPermission('mes:qc-ipqc:query')")
+ public CommonResult<List<StorageBlobRespDTO>> listIpqcDetail(@RequestParam @NotNull Long detailId) {
+ validateIpqcDetail(detailId);
+ var files = storageApi.listAttachments(IPQC_DETAIL_RECORD_TYPE, detailId);
+ return success(files == null ? List.of() : files);
+ }
+
+ @PostMapping("/ipqc-detail/save")
+ @PreAuthorize("@ss.hasPermission('mes:qc-ipqc:update')")
+ @Transactional(rollbackFor = Exception.class)
+ public CommonResult<Boolean> saveIpqcDetail(@Valid @RequestBody IpqcDetailSaveReq req) {
+ validateIpqcDetail(req.getDetailId());
+ storageApi.bindAttachments("file", IPQC_DETAIL_RECORD_TYPE, req.getDetailId(),
+ req.getBlobIds().stream().distinct().toList());
+ return success(true);
+ }
+
+ @DeleteMapping("/ipqc-detail/remove")
+ @PreAuthorize("@ss.hasPermission('mes:qc-ipqc:update')")
+ @Transactional(rollbackFor = Exception.class)
+ public CommonResult<Boolean> removeIpqcDetail(@RequestParam @NotNull Long detailId,
+ @RequestParam @NotNull Long blobId) {
+ validateIpqcDetail(detailId);
+ storageApi.removeReference("file", IPQC_DETAIL_RECORD_TYPE, detailId, blobId);
+ return success(true);
+ }
+
+ private static final String IPQC_DETAIL_RECORD_TYPE = "mes_qc_ipqc_detail_attachment";
+
+ /** 鏍¢獙鏄庣粏瀛樺湪涓斿睘浜庤繃绋嬫楠岀粨鏋� */
+ private void validateIpqcDetail(Long detailId) {
+ var ids = jdbcTemplate.queryForList(
+ "SELECT d.id FROM mes_qc_indicator_result_detail d "
+ + "JOIN mes_qc_indicator_result r ON r.id = d.result_id "
+ + "WHERE d.id = ? AND r.qc_type = ? AND d.deleted = 0 AND r.deleted = 0",
+ Long.class, detailId, cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum.IPQC.getType());
+ if (ids.isEmpty()) {
+ throw new ServiceException(400, "杩囩▼妫�楠岃涓嶅瓨鍦ㄦ垨涓嶅睘浜庤繃绋嬫楠屽崟锛屾棤娉曚笂浼犻檮浠�");
+ }
+ }
+
+ @Data public static class IpqcDetailSaveReq {
+ @NotNull private Long detailId;
+ /** 鍏佽绌哄垪琛細琛ㄧず娓呯┖璇ヨ闄勪欢 */
+ @NotNull @Size(max = 50) private List<@NotNull Long> blobIds;
+ }
+
private String recordType(String type) {
return switch (type) {
case "iqc", "ipqc", "oqc", "rqc", "patrol" -> "mes_qc_" + type + "_attachment";
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicatorresult/MesQcIndicatorResultController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicatorresult/MesQcIndicatorResultController.java
index 1c186b8..ffe1b19 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicatorresult/MesQcIndicatorResultController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicatorresult/MesQcIndicatorResultController.java
@@ -57,14 +57,14 @@
@PostMapping("/create")
@Operation(summary = "鍒涘缓妫�楠岀粨鏋�")
- @PreAuthorize("@ss.hasPermission('mes:qc-iqc:create')")
+ @PreAuthorize("@ss.hasAnyPermissions('mes:qc-iqc:create', 'mes:qc-ipqc:create', 'mes:qc-oqc:create', 'mes:qc-rqc:create')")
public CommonResult<Long> createIndicatorResult(@Valid @RequestBody MesQcIndicatorResultSaveReqVO createReqVO) {
return success(resultService.createIndicatorResult(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "鏇存柊妫�楠岀粨鏋�")
- @PreAuthorize("@ss.hasPermission('mes:qc-iqc:update')")
+ @PreAuthorize("@ss.hasAnyPermissions('mes:qc-iqc:update', 'mes:qc-ipqc:update', 'mes:qc-oqc:update', 'mes:qc-rqc:update')")
public CommonResult<Boolean> updateIndicatorResult(@Valid @RequestBody MesQcIndicatorResultSaveReqVO updateReqVO) {
resultService.updateIndicatorResult(updateReqVO);
return success(true);
@@ -73,7 +73,7 @@
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎妫�楠岀粨鏋�")
@Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('mes:qc-iqc:delete')")
+ @PreAuthorize("@ss.hasAnyPermissions('mes:qc-iqc:delete', 'mes:qc-ipqc:delete', 'mes:qc-oqc:delete', 'mes:qc-rqc:delete')")
public CommonResult<Boolean> deleteIndicatorResult(@RequestParam("id") Long id) {
resultService.deleteIndicatorResult(id);
return success(true);
@@ -153,6 +153,12 @@
return Collections.emptyList();
}
+ // 杩囩▼妫�楠屾敮鎸佽川妫�鎵嬪伐澧炲垹妫�楠岃锛氬凡鏈夋槑缁嗘椂浠ユ槑缁嗗疄闄呮寚鏍囧強椤哄簭涓哄噯锛�
+ // 閬垮厤妯℃澘閲岀殑鎸囨爣鎶婂凡鍒犻櫎鐨勮閲嶆柊甯﹀嚭鏉ャ��
+ if (Objects.equals(qcType, MesQcTypeEnum.IPQC.getType()) && CollUtil.isNotEmpty(details)) {
+ indicatorIds = details.stream().map(MesQcIndicatorResultDetailDO::getIndicatorId)
+ .filter(Objects::nonNull).distinct().toList();
+ }
// 1.2 鎵归噺鏌ヨ妫�娴嬫寚鏍�
Map<Long, MesQcIndicatorDO> indicatorMap = indicatorService.getIndicatorMap(new HashSet<>(indicatorIds));
// 1.3 鏋勫缓宸叉湁鏄庣粏 Map锛堟寜 indicatorId 绱㈠紩锛�
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java
index aefce49..6c3c3ff 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java
@@ -13,6 +13,9 @@
import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcTemplateProcessRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcWageFieldRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcWageFieldSaveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcQualityExportVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
@@ -28,6 +31,7 @@
import cn.iocoder.yudao.module.mes.dal.mysql.qc.ipqc.MesQcIpqcLineMapper;
import cn.iocoder.yudao.module.mes.enums.DictTypeConstants;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
+import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
@@ -36,6 +40,8 @@
import cn.iocoder.yudao.module.mes.service.qc.indicator.MesQcIndicatorService;
import cn.iocoder.yudao.module.mes.service.qc.indicatorresult.MesQcIndicatorResultService;
import cn.iocoder.yudao.module.mes.service.qc.ipqc.MesQcIpqcService;
+import cn.iocoder.yudao.module.mes.service.qc.ipqc.MesQcIpqcWageFieldService;
+import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateProcessService;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import io.swagger.v3.oas.annotations.Operation;
@@ -89,6 +95,10 @@
private MesQcIndicatorService indicatorService;
@Resource
private MesQcIpqcLineMapper ipqcLineMapper;
+ @Resource
+ private MesQcTemplateProcessService templateProcessService;
+ @Resource
+ private MesQcIpqcWageFieldService ipqcWageFieldService;
@Resource
private AdminUserApi adminUserApi;
@@ -126,6 +136,35 @@
return success(true);
}
+ @GetMapping("/template-by-process")
+ @Operation(summary = "鎸夊伐搴忚幏鍙栭粯璁よ川妫�鏂规鍙婃娴嬫寚鏍囧瓧娈�")
+ @Parameter(name = "processId", description = "宸ュ簭缂栧彿", required = true)
+ @Parameter(name = "type", description = "璐ㄦ绉嶇被锛岄粯璁� 2-杩囩▼妫�楠�", example = "2")
+ public CommonResult<MesQcIpqcTemplateProcessRespVO> getTemplateByProcess(
+ @RequestParam("processId") Long processId,
+ @RequestParam(value = "type", required = false) Integer type) {
+ return success(templateProcessService.resolveTemplate(processId,
+ type != null ? type : MesQcTypeEnum.IPQC.getType()));
+ }
+
+ @GetMapping("/wage-field/list")
+ @Operation(summary = "鎸夊伐搴忚幏鍙栬繃绋嬫楠屽崟宸ヨ祫瀛楁锛堝伐搴忚嚜瀹氫箟瀛楁锛岃川妫�濉啓锛�")
+ @Parameter(name = "processId", description = "宸ュ簭缂栧彿锛涚┖鏃舵寜 ipqcId 瑙f瀽")
+ @Parameter(name = "ipqcId", description = "杩囩▼妫�楠屽崟缂栧彿锛涙柊寤烘椂涓嶄紶锛岀敤浜庡姞杞藉凡濉啓鐨勫��")
+ public CommonResult<List<MesQcIpqcWageFieldRespVO>> getWageFieldList(
+ @RequestParam(value = "processId", required = false) Long processId,
+ @RequestParam(value = "ipqcId", required = false) Long ipqcId) {
+ return success(ipqcWageFieldService.getFieldList(processId, ipqcId));
+ }
+
+ @PostMapping("/wage-field/save")
+ @Operation(summary = "淇濆瓨杩囩▼妫�楠屽崟宸ヨ祫瀛楁鍊�")
+ @PreAuthorize("@ss.hasAnyPermissions('mes:qc-ipqc:create', 'mes:qc-ipqc:update')")
+ public CommonResult<Boolean> saveWageFieldValues(@Valid @RequestBody MesQcIpqcWageFieldSaveReqVO reqVO) {
+ ipqcWageFieldService.saveValues(reqVO);
+ return success(true);
+ }
+
@GetMapping("/get")
@Operation(summary = "鑾峰緱杩囩▼妫�楠屽崟")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcSaveReqVO.java
index 8ada36b..8ffae50 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcSaveReqVO.java
@@ -51,11 +51,10 @@
@Schema(description = "鐢熶骇浠诲姟 ID", example = "20")
private Long taskId;
- @Schema(description = "宸ヤ綅 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30")
- @NotNull(message = "宸ヤ綅涓嶈兘涓虹┖")
+ @Schema(description = "宸ヤ綅 ID锛堝彲閫夛紝鎵嬪伐鎸囧畾宸ュ簭鏃跺彲涓嶅~锛�", example = "30")
private Long workstationId;
- @Schema(description = "宸ュ簭 ID", example = "40")
+ @Schema(description = "宸ュ簭 ID锛堝伐浣嶄负绌烘椂蹇呭~锛�", example = "40")
private Long processId;
// ========== 鐗╂枡 ==========
@@ -63,6 +62,9 @@
@Schema(description = "浜у搧鐗╂枡 ID", example = "50")
private Long itemId;
+ @Schema(description = "鐩樺彿锛堝崐鎴愬搧杩芥函鍙凤紝鎵嬪伐褰曞叆锛�", example = "P-20261106-001")
+ private String reelNo;
+
@Schema(description = "璐ㄦ鏂规 ID", example = "5")
private Long templateId;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcTemplateProcessRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcTemplateProcessRespVO.java
new file mode 100644
index 0000000..c086bb7
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcTemplateProcessRespVO.java
@@ -0,0 +1,78 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Schema(description = "绠$悊鍚庡彴 - 宸ュ簭榛樿璐ㄦ鏂规鍙婃娴嬫寚鏍� Response VO")
+@Data
+public class MesQcIpqcTemplateProcessRespVO {
+
+ @Schema(description = "宸ュ簭缂栧彿")
+ private Long processId;
+
+ @Schema(description = "璐ㄦ绉嶇被")
+ private Integer qcType;
+
+ @Schema(description = "璐ㄦ鏂规缂栧彿锛岀┖=璇ュ伐搴忔湭缁戝畾鏂规")
+ private Long templateId;
+
+ @Schema(description = "璐ㄦ鏂规缂栫爜")
+ private String templateCode;
+
+ @Schema(description = "璐ㄦ鏂规鍚嶇О")
+ private String templateName;
+
+ @Schema(description = "妫�娴嬫寚鏍囧瓧娈�")
+ private List<IndicatorItem> indicators;
+
+ @Data
+ public static class IndicatorItem {
+
+ @Schema(description = "鏂规鎸囨爣椤圭紪鍙�")
+ private Long templateIndicatorId;
+
+ @Schema(description = "妫�娴嬫寚鏍囩紪鍙�")
+ private Long indicatorId;
+
+ @Schema(description = "妫�娴嬫寚鏍囩紪鐮�")
+ private String indicatorCode;
+
+ @Schema(description = "妫�娴嬫寚鏍囧悕绉�")
+ private String indicatorName;
+
+ @Schema(description = "鎸囨爣椤圭洰绫诲瀷")
+ private Integer itemType;
+
+ @Schema(description = "缁撴灉鍊肩被鍨�")
+ private Integer resultType;
+
+ @Schema(description = "缁撴灉瑙勬牸锛堝瓧鍏�/鏂囦欢绛夐厤缃級")
+ private String resultSpecification;
+
+ @Schema(description = "鍗曚綅鏂囨湰")
+ private String unitText;
+
+ @Schema(description = "妫�娴嬪伐鍏�")
+ private String tool;
+
+ @Schema(description = "妫�娴嬫柟娉�")
+ private String checkMethod;
+
+ @Schema(description = "鏍囧噯鍊�")
+ private BigDecimal standardValue;
+
+ @Schema(description = "璁¢噺鍗曚綅缂栧彿")
+ private Long unitMeasureId;
+
+ @Schema(description = "涓婇檺")
+ private BigDecimal thresholdMax;
+
+ @Schema(description = "涓嬮檺")
+ private BigDecimal thresholdMin;
+
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcWageFieldRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcWageFieldRespVO.java
new file mode 100644
index 0000000..95348c8
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcWageFieldRespVO.java
@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Schema(description = "绠$悊鍚庡彴 - 杩囩▼妫�楠屽崟宸ヨ祫瀛楁 Response VO")
+@Data
+public class MesQcIpqcWageFieldRespVO {
+
+ @Schema(description = "宸ュ簭宸ヨ祫瀛楁缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ private Long fieldId;
+
+ @Schema(description = "瀛楁缂栫爜", example = "TEMP_COEF")
+ private String fieldCode;
+
+ @Schema(description = "瀛楁鍚嶇О", example = "楂樻俯绯绘暟")
+ private String fieldName;
+
+ @Schema(description = "瀛楁绫诲瀷锛�1-鏁板�� 2-鏂囨湰 3-涓嬫媺 4-甯冨皵", example = "1")
+ private Integer fieldType;
+
+ @Schema(description = "鍗曚綅", example = "绯绘暟")
+ private String unit;
+
+ @Schema(description = "璁$畻瑙掕壊锛�1-绯绘暟 2-鍔犲噺閲戦 3-璁′环鏁伴噺 4-浠呰褰�", example = "1")
+ private Integer calcRole;
+
+ @Schema(description = "璁′环鏁伴噺鍗曚环", example = "2.0000")
+ private BigDecimal unitPrice;
+
+ @Schema(description = "鎺掑簭", example = "1")
+ private Integer sort;
+
+ @Schema(description = "宸ュ簭涓婇厤缃殑鍥哄畾鍊硷紙鏈~鍐欐椂鐨勫厹搴曞�硷級", example = "1.10")
+ private String defaultValue;
+
+ @Schema(description = "璐ㄦ濉啓鐨勫瓧娈靛��", example = "1.20")
+ private String value;
+
+ @Schema(description = "澶囨敞", example = "鏈壒娆″疄娴�")
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcWageFieldSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcWageFieldSaveReqVO.java
new file mode 100644
index 0000000..1842c18
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcWageFieldSaveReqVO.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "绠$悊鍚庡彴 - 杩囩▼妫�楠屽崟宸ヨ祫瀛楁淇濆瓨 Request VO")
+@Data
+public class MesQcIpqcWageFieldSaveReqVO {
+
+ @Schema(description = "杩囩▼妫�楠屽崟缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ @NotNull(message = "杩囩▼妫�楠屽崟缂栧彿涓嶈兘涓虹┖")
+ private Long ipqcId;
+
+ @Schema(description = "宸ヨ祫瀛楁鍊煎垪琛紱鏈彁浜ょ殑瀛楁瑙嗕负鏈~鍐�")
+ @Valid
+ private List<Item> list;
+
+ @Schema(description = "宸ヨ祫瀛楁鍊�")
+ @Data
+ public static class Item {
+
+ @Schema(description = "宸ュ簭宸ヨ祫瀛楁缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "宸ュ簭宸ヨ祫瀛楁缂栧彿涓嶈兘涓虹┖")
+ private Long fieldId;
+
+ @Schema(description = "璐ㄦ濉啓鐨勫瓧娈靛��", example = "1.20")
+ private String value;
+
+ @Schema(description = "澶囨敞", example = "鏈壒娆″疄娴�")
+ private String remark;
+
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/MesQcNcrController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/MesQcNcrController.java
index b1e0b36..5de06b9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/MesQcNcrController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/MesQcNcrController.java
@@ -81,11 +81,20 @@
@Operation(summary = "鎵ц涓嶅悎鏍煎搧澶勭疆")
@PreAuthorize("@ss.hasPermission('mes:qc-ncr:dispose')")
public CommonResult<Boolean> disposeNcr(@Valid @RequestBody MesQcNcrDisposeReqVO disposeReqVO) {
- ncrService.disposeNcr(disposeReqVO.getId(),
+ ncrService.disposeNcr(disposeReqVO.getId(), disposeReqVO.getDisposition(),
disposeReqVO.getHandlerUserId(), disposeReqVO.getHandleResult());
return success(true);
}
+ @PutMapping("/submit-approval")
+ @Operation(summary = "鎻愪氦涓嶅悎鏍煎搧澶勭悊鍗曞鎵�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:qc-ncr:update')")
+ public CommonResult<Boolean> submitNcrApproval(@RequestParam("id") Long id) {
+ ncrService.submitNcrApproval(id);
+ return success(true);
+ }
+
@PutMapping("/close")
@Operation(summary = "鍏抽棴涓嶅悎鏍煎搧澶勭悊鍗�")
@PreAuthorize("@ss.hasPermission('mes:qc-ncr:close')")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/vo/MesQcNcrDisposeReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/vo/MesQcNcrDisposeReqVO.java
index b05e8cd..4482ee3 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/vo/MesQcNcrDisposeReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/vo/MesQcNcrDisposeReqVO.java
@@ -12,6 +12,10 @@
@NotNull(message = "NCR缂栧彿涓嶈兘涓虹┖")
private Long id;
+ @Schema(description = "澶勭疆鏂瑰紡锛�2-鎶ュ簾 3-杩斿伐 4-璁╂鏀捐 6-杩斾慨锛�", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+ @NotNull(message = "澶勭疆鏂瑰紡涓嶈兘涓虹┖锛岃浠嶽璁╂鏀捐銆佽繑淇�佽繑宸ャ�佹姤搴焆涓�夋嫨涓�椤�")
+ private Integer disposition;
+
@Schema(description = "澶勭悊浜篒D", example = "2")
private Long handlerUserId;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/vo/MesQcNcrRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/vo/MesQcNcrRespVO.java
index 977421b..5a6cc22 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/vo/MesQcNcrRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/vo/MesQcNcrRespVO.java
@@ -141,6 +141,9 @@
@ExcelProperty("鐘舵��")
private Integer status;
+ @Schema(description = "BPM 娴佺▼瀹炰緥ID", example = "1024")
+ private String processInstanceId;
+
@Schema(description = "澶囨敞", example = "澶囨敞")
@ExcelProperty("澶囨敞")
private String remark;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/vo/MesQcNcrReviewReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/vo/MesQcNcrReviewReqVO.java
index 1a396eb..b65f919 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/vo/MesQcNcrReviewReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/vo/MesQcNcrReviewReqVO.java
@@ -13,8 +13,8 @@
@NotNull(message = "NCR缂栧彿涓嶈兘涓虹┖")
private Long id;
- @Schema(description = "澶勭疆鏂瑰紡", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "澶勭疆鏂瑰紡涓嶈兘涓虹┖")
+ @Schema(description = "澶勭疆鏂瑰紡锛�1-閫�璐� 2-鎶ュ簾 3-杩斿伐 4-璁╂鏀捐 5-闄嶇骇浣跨敤 6-杩斾慨锛�", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+ @NotNull(message = "澶勭疆鏂瑰紡涓嶈兘涓虹┖锛岃浠嶽璁╂鏀捐銆佽繑淇�佽繑宸ャ�佹姤搴焆涓�夋嫨涓�椤�")
private Integer disposition;
@Schema(description = "璐d换閮ㄩ棬ID", example = "10")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/patrol/MesQcPatrolController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/patrol/MesQcPatrolController.java
new file mode 100644
index 0000000..7d88caf
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/patrol/MesQcPatrolController.java
@@ -0,0 +1,121 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.patrol;
+
+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.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.patrol.vo.MesQcPatrolPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.patrol.vo.MesQcPatrolRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.patrol.vo.MesQcPatrolSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.patrol.MesQcPatrolDO;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
+import cn.iocoder.yudao.module.mes.service.qc.patrol.MesQcPatrolService;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+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;
+import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
+
+@Tag(name = "绠$悊鍚庡彴 - MES 璐ㄩ噺宸℃")
+@RestController
+@RequestMapping("/mes/qc/patrol")
+@Validated
+public class MesQcPatrolController {
+
+ @Resource
+ private MesQcPatrolService patrolService;
+ @Resource
+ private MesMdItemService itemService;
+ @Resource
+ private MesMdUnitMeasureService unitMeasureService;
+ @Resource
+ private AdminUserApi adminUserApi;
+
+ @PostMapping("/create")
+ @Operation(summary = "鍒涘缓璐ㄩ噺宸℃璁板綍")
+ @PreAuthorize("@ss.hasPermission('mes:qc-patrol:create')")
+ public CommonResult<Long> createPatrol(@Valid @RequestBody MesQcPatrolSaveReqVO createReqVO) {
+ return success(patrolService.createPatrol(createReqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "鏇存柊璐ㄩ噺宸℃璁板綍")
+ @PreAuthorize("@ss.hasPermission('mes:qc-patrol:update')")
+ public CommonResult<Boolean> updatePatrol(@Valid @RequestBody MesQcPatrolSaveReqVO updateReqVO) {
+ patrolService.updatePatrol(updateReqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎璐ㄩ噺宸℃璁板綍")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:qc-patrol:delete')")
+ public CommonResult<Boolean> deletePatrol(@RequestParam("id") Long id) {
+ patrolService.deletePatrol(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱璐ㄩ噺宸℃璁板綍")
+ @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
+ @PreAuthorize("@ss.hasPermission('mes:qc-patrol:query')")
+ public CommonResult<MesQcPatrolRespVO> getPatrol(@RequestParam("id") Long id) {
+ MesQcPatrolDO patrol = patrolService.getPatrol(id);
+ if (patrol == null) {
+ return success(null);
+ }
+ return success(buildPatrolRespVOList(Collections.singletonList(patrol)).get(0));
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱璐ㄩ噺宸℃璁板綍鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('mes:qc-patrol:query')")
+ public CommonResult<PageResult<MesQcPatrolRespVO>> getPatrolPage(@Valid MesQcPatrolPageReqVO pageReqVO) {
+ PageResult<MesQcPatrolDO> pageResult = patrolService.getPatrolPage(pageReqVO);
+ if (CollUtil.isEmpty(pageResult.getList())) {
+ return success(PageResult.empty());
+ }
+ return success(new PageResult<>(buildPatrolRespVOList(pageResult.getList()),
+ pageResult.getTotal()));
+ }
+
+ private List<MesQcPatrolRespVO> buildPatrolRespVOList(List<MesQcPatrolDO> list) {
+ // 鎵归噺鏌ヨ鐗╂枡
+ Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
+ convertSet(list, MesQcPatrolDO::getItemId));
+ // 鎵归噺鏌ヨ璁¢噺鍗曚綅
+ Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
+ convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+ // 鎵归噺鏌ヨ宸℃浜哄憳
+ Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
+ convertSet(list, MesQcPatrolDO::getInspectorUserId));
+ // 鎷艰 VO
+ return BeanUtils.toBean(list, MesQcPatrolRespVO.class, vo -> {
+ findAndThen(itemMap, vo.getItemId(), item -> {
+ vo.setItemCode(item.getCode()).setItemName(item.getName())
+ .setItemSpecification(item.getSpecification());
+ findAndThen(unitMeasureMap, item.getUnitMeasureId(),
+ unit -> vo.setUnitName(unit.getName()));
+ });
+ findAndThen(userMap, vo.getInspectorUserId(),
+ user -> vo.setInspectorNickname(user.getNickname()));
+ });
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/patrol/vo/MesQcPatrolPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/patrol/vo/MesQcPatrolPageReqVO.java
new file mode 100644
index 0000000..3df3e05
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/patrol/vo/MesQcPatrolPageReqVO.java
@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.patrol.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 璐ㄩ噺宸℃璁板綍鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MesQcPatrolPageReqVO extends PageParam {
+
+ @Schema(description = "宸℃鍗曠紪鍙�", example = "XJ20251106001")
+ private String code;
+
+ @Schema(description = "宸℃鍗曞悕绉�", example = "涓�鍙风嚎棣栦欢宸℃")
+ private String name;
+
+ @Schema(description = "浜у搧鐗╂枡缂栧彿", example = "100100001")
+ private Long itemId;
+
+ @Schema(description = "鐩樺彿", example = "P20251106001")
+ private String reelNo;
+
+ @Schema(description = "鎵规鍙�", example = "PC20251106")
+ private String batchCode;
+
+ @Schema(description = "宸℃浜哄憳缂栧彿", example = "1")
+ private Long inspectorUserId;
+
+ @Schema(description = "宸℃鏃ユ湡")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime[] inspectDate;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/patrol/vo/MesQcPatrolRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/patrol/vo/MesQcPatrolRespVO.java
new file mode 100644
index 0000000..14b2298
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/patrol/vo/MesQcPatrolRespVO.java
@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.patrol.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 璐ㄩ噺宸℃璁板綍 Response VO")
+@Data
+public class MesQcPatrolRespVO {
+
+ @Schema(description = "缂栧彿", example = "1")
+ private Long id;
+
+ @Schema(description = "宸℃鍗曠紪鍙�", example = "XJ20251106001")
+ private String code;
+
+ @Schema(description = "宸℃鍗曞悕绉�", example = "涓�鍙风嚎棣栦欢宸℃")
+ private String name;
+
+ @Schema(description = "浜у搧鐗╂枡缂栧彿", example = "1001")
+ private Long itemId;
+
+ @Schema(description = "浜у搧鐗╂枡缂栫爜", example = "100100001")
+ private String itemCode;
+
+ @Schema(description = "浜у搧鐗╂枡鍚嶇О", example = "閾滆姱鐢电紗")
+ private String itemName;
+
+ @Schema(description = "瑙勬牸鍨嬪彿", example = "YJV-4*25")
+ private String itemSpecification;
+
+ @Schema(description = "鍗曚綅", example = "绫�")
+ private String unitName;
+
+ @Schema(description = "鐩樺彿", example = "P20251106001")
+ private String reelNo;
+
+ @Schema(description = "鎵规鍙�", example = "PC20251106")
+ private String batchCode;
+
+ @Schema(description = "鍚堟牸鏁伴噺", example = "10")
+ private BigDecimal qualifiedQuantity;
+
+ @Schema(description = "涓嶅悎鏍兼暟閲�", example = "0")
+ private BigDecimal unqualifiedQuantity;
+
+ @Schema(description = "宸℃鏃ユ湡")
+ private LocalDateTime inspectDate;
+
+ @Schema(description = "宸℃浜哄憳缂栧彿", example = "1")
+ private Long inspectorUserId;
+
+ @Schema(description = "宸℃浜哄憳鏄电О", example = "寮犳晱")
+ private String inspectorNickname;
+
+ @Schema(description = "澶囨敞", example = "澶栬銆佸昂瀵稿潎绗﹀悎瑕佹眰")
+ private String remark;
+
+ @Schema(description = "鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/patrol/vo/MesQcPatrolSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/patrol/vo/MesQcPatrolSaveReqVO.java
new file mode 100644
index 0000000..7d0be89
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/patrol/vo/MesQcPatrolSaveReqVO.java
@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.patrol.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 璐ㄩ噺宸℃璁板綍淇濆瓨 Request VO")
+@Data
+public class MesQcPatrolSaveReqVO {
+
+ @Schema(description = "缂栧彿", example = "1")
+ private Long id;
+
+ @Schema(description = "宸℃鍗曠紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "XJ20251106001")
+ @NotBlank(message = "宸℃鍗曠紪鍙蜂笉鑳戒负绌�")
+ @Size(max = 100, message = "宸℃鍗曠紪鍙烽暱搴︿笉鑳借秴杩� 100 涓瓧绗�")
+ private String code;
+
+ @Schema(description = "宸℃鍗曞悕绉�", requiredMode = Schema.RequiredMode.REQUIRED, example = "涓�鍙风嚎棣栦欢宸℃")
+ @NotBlank(message = "宸℃鍗曞悕绉颁笉鑳戒负绌�")
+ @Size(max = 255, message = "宸℃鍗曞悕绉伴暱搴︿笉鑳借秴杩� 255 涓瓧绗�")
+ private String name;
+
+ @Schema(description = "浜у搧鐗╂枡缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1001")
+ @NotNull(message = "浜у搧鐗╂枡涓嶈兘涓虹┖")
+ private Long itemId;
+
+ @Schema(description = "鐩樺彿", example = "P20251106001")
+ @Size(max = 128, message = "鐩樺彿闀垮害涓嶈兘瓒呰繃 128 涓瓧绗�")
+ private String reelNo;
+
+ @Schema(description = "鎵规鍙�", example = "PC20251106")
+ @Size(max = 128, message = "鎵规鍙烽暱搴︿笉鑳借秴杩� 128 涓瓧绗�")
+ private String batchCode;
+
+ @Schema(description = "鍚堟牸鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+ @NotNull(message = "鍚堟牸鏁伴噺涓嶈兘涓虹┖")
+ @DecimalMin(value = "0", message = "鍚堟牸鏁伴噺涓嶈兘灏忎簬 0")
+ private BigDecimal qualifiedQuantity;
+
+ @Schema(description = "涓嶅悎鏍兼暟閲�", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
+ @NotNull(message = "涓嶅悎鏍兼暟閲忎笉鑳戒负绌�")
+ @DecimalMin(value = "0", message = "涓嶅悎鏍兼暟閲忎笉鑳藉皬浜� 0")
+ private BigDecimal unqualifiedQuantity;
+
+ @Schema(description = "宸℃鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "宸℃鏃ユ湡涓嶈兘涓虹┖")
+ private LocalDateTime inspectDate;
+
+ @Schema(description = "宸℃浜哄憳缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "宸℃浜哄憳涓嶈兘涓虹┖")
+ private Long inspectorUserId;
+
+ @Schema(description = "澶囨敞", example = "澶栬銆佸昂瀵稿潎绗﹀悎瑕佹眰")
+ @Size(max = 1000, message = "澶囨敞闀垮害涓嶈兘瓒呰繃 1000 涓瓧绗�")
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/statistics/MesQcStatisticsController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/statistics/MesQcStatisticsController.java
new file mode 100644
index 0000000..54612a6
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/statistics/MesQcStatisticsController.java
@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.statistics;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.statistics.vo.MesQcStatisticsRespVO;
+import cn.iocoder.yudao.module.mes.service.qc.statistics.MesQcStatisticsService;
+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 org.springframework.format.annotation.DateTimeFormat;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 绠$悊鍚庡彴 - MES 璐ㄩ噺缁熻
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Tag(name = "绠$悊鍚庡彴 - MES 璐ㄩ噺缁熻")
+@RestController
+@RequestMapping("/mes/qc/statistics")
+@Validated
+public class MesQcStatisticsController {
+
+ @Resource
+ private MesQcStatisticsService statisticsService;
+
+ @GetMapping("/summary")
+ @Operation(summary = "鑾峰緱璐ㄩ噺缁熻姹囨��")
+ @Parameter(name = "beginTime", description = "妫�娴嬫棩鏈熷紑濮嬫椂闂达紝鏍煎紡 yyyy-MM-dd HH:mm:ss", example = "2026-10-01 00:00:00")
+ @Parameter(name = "endTime", description = "妫�娴嬫棩鏈熺粨鏉熸椂闂达紝鏍煎紡 yyyy-MM-dd HH:mm:ss", example = "2026-11-06 23:59:59")
+ @PreAuthorize("@ss.hasPermission('mes:qc-statistics:query')")
+ public CommonResult<MesQcStatisticsRespVO> getStatisticsSummary(
+ @RequestParam(value = "beginTime", required = false)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime beginTime,
+ @RequestParam(value = "endTime", required = false)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime) {
+ return success(statisticsService.getStatisticsSummary(beginTime, endTime));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/statistics/vo/MesQcStatisticsByProcessVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/statistics/vo/MesQcStatisticsByProcessVO.java
new file mode 100644
index 0000000..00c68cc
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/statistics/vo/MesQcStatisticsByProcessVO.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.statistics.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+/**
+ * 绠$悊鍚庡彴 - MES 璐ㄩ噺缁熻鎸夊伐搴� VO锛堜粎 IPQC锛�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - MES 璐ㄩ噺缁熻鎸夊伐搴� VO")
+@Data
+@Accessors(chain = true)
+public class MesQcStatisticsByProcessVO {
+
+ @Schema(description = "宸ュ簭缂栧彿", example = "100")
+ private Long processId;
+
+ @Schema(description = "宸ュ簭鍚嶇О", example = "缁炵嚎")
+ private String processName;
+
+ @Schema(description = "妫�娴嬫�绘暟", example = "2000")
+ private BigDecimal checkQuantity;
+
+ @Schema(description = "鍚堟牸鏁�", example = "1990")
+ private BigDecimal qualifiedQuantity;
+
+ @Schema(description = "涓嶅悎鏍兼暟", example = "10")
+ private BigDecimal unqualifiedQuantity;
+
+ @Schema(description = "鍚堟牸鐜囷紙鐧惧垎姣旓紝淇濈暀涓や綅灏忔暟锛�", example = "99.50")
+ private BigDecimal qualifiedRate;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/statistics/vo/MesQcStatisticsByWorkOrderVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/statistics/vo/MesQcStatisticsByWorkOrderVO.java
new file mode 100644
index 0000000..c549f15
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/statistics/vo/MesQcStatisticsByWorkOrderVO.java
@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.statistics.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+/**
+ * 绠$悊鍚庡彴 - MES 璐ㄩ噺缁熻鎸夌敓浜у伐鍗� VO锛堜粎 IPQC锛�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - MES 璐ㄩ噺缁熻鎸夌敓浜у伐鍗� VO")
+@Data
+@Accessors(chain = true)
+public class MesQcStatisticsByWorkOrderVO {
+
+ @Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1001")
+ private Long workOrderId;
+
+ @Schema(description = "宸ュ崟鍙�", example = "MO20261106000001")
+ private String workOrderCode;
+
+ @Schema(description = "浜у搧鍚嶇О", example = "閾滆姱鐢电紗")
+ private String productName;
+
+ @Schema(description = "妫�娴嬫�绘暟", example = "1000")
+ private BigDecimal checkQuantity;
+
+ @Schema(description = "鍚堟牸鏁�", example = "995")
+ private BigDecimal qualifiedQuantity;
+
+ @Schema(description = "涓嶅悎鏍兼暟", example = "5")
+ private BigDecimal unqualifiedQuantity;
+
+ @Schema(description = "鍚堟牸鐜囷紙鐧惧垎姣旓紝淇濈暀涓や綅灏忔暟锛�", example = "99.50")
+ private BigDecimal qualifiedRate;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/statistics/vo/MesQcStatisticsOverallVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/statistics/vo/MesQcStatisticsOverallVO.java
new file mode 100644
index 0000000..5a37cdd
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/statistics/vo/MesQcStatisticsOverallVO.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.statistics.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 绠$悊鍚庡彴 - MES 璐ㄩ噺缁熻鏁翠綋姹囨�� VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - MES 璐ㄩ噺缁熻鏁翠綋姹囨�� VO")
+@Data
+@Accessors(chain = true)
+public class MesQcStatisticsOverallVO {
+
+ @Schema(description = "璐ㄦ鍗曟�绘暟锛圛QC + IPQC + OQC + RQC锛�", example = "120")
+ private Long totalQcCount;
+
+ @Schema(description = "妫�娴嬫�绘暟", example = "16782")
+ private BigDecimal checkQuantity;
+
+ @Schema(description = "鍚堟牸鏁�", example = "16770")
+ private BigDecimal qualifiedQuantity;
+
+ @Schema(description = "涓嶅悎鏍兼暟", example = "12")
+ private BigDecimal unqualifiedQuantity;
+
+ @Schema(description = "鍚堟牸鐜囷紙鐧惧垎姣旓紝淇濈暀涓や綅灏忔暟锛�", example = "99.93")
+ private BigDecimal qualifiedRate;
+
+ @Schema(description = "涓嶅悎鏍肩巼锛堢櫨鍒嗘瘮锛屼繚鐣欎袱浣嶅皬鏁帮級", example = "0.07")
+ private BigDecimal unqualifiedRate;
+
+ @Schema(description = "鍚勬楠岀被鍨嬬粺璁★紙IQC / IPQC / OQC / RQC锛屾棤鏁版嵁鐨勭被鍨嬭繑鍥� 0锛�")
+ private List<MesQcStatisticsTypeVO> types;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/statistics/vo/MesQcStatisticsRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/statistics/vo/MesQcStatisticsRespVO.java
new file mode 100644
index 0000000..5806a9f
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/statistics/vo/MesQcStatisticsRespVO.java
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.statistics.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * 绠$悊鍚庡彴 - MES 璐ㄩ噺缁熻姹囨�� Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - MES 璐ㄩ噺缁熻姹囨�� Response VO")
+@Data
+@Accessors(chain = true)
+public class MesQcStatisticsRespVO {
+
+ @Schema(description = "鏁翠綋缁熻")
+ private MesQcStatisticsOverallVO overall;
+
+ @Schema(description = "鎸夊伐搴忕粺璁★紙浠� IPQC锛�")
+ private List<MesQcStatisticsByProcessVO> byProcess;
+
+ @Schema(description = "鎸夌敓浜у伐鍗曠粺璁★紙浠� IPQC锛�")
+ private List<MesQcStatisticsByWorkOrderVO> byWorkOrder;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/statistics/vo/MesQcStatisticsTypeVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/statistics/vo/MesQcStatisticsTypeVO.java
new file mode 100644
index 0000000..ce728b1
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/statistics/vo/MesQcStatisticsTypeVO.java
@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.statistics.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+/**
+ * 绠$悊鍚庡彴 - MES 璐ㄩ噺缁熻鎸夋楠岀被鍨� VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - MES 璐ㄩ噺缁熻鎸夋楠岀被鍨� VO")
+@Data
+@Accessors(chain = true)
+public class MesQcStatisticsTypeVO {
+
+ @Schema(description = "妫�楠岀被鍨嬬紪鐮�", example = "IPQC")
+ private String qcType;
+
+ @Schema(description = "妫�楠岀被鍨嬪悕绉�", example = "杩囩▼妫�楠�")
+ private String qcTypeName;
+
+ @Schema(description = "璐ㄦ鍗曟暟閲�", example = "30")
+ private Long qcCount;
+
+ @Schema(description = "妫�娴嬫�绘暟", example = "5000")
+ private BigDecimal checkQuantity;
+
+ @Schema(description = "鍚堟牸鏁�", example = "4980")
+ private BigDecimal qualifiedQuantity;
+
+ @Schema(description = "涓嶅悎鏍兼暟", example = "20")
+ private BigDecimal unqualifiedQuantity;
+
+ @Schema(description = "鍚堟牸鐜囷紙鐧惧垎姣旓紝淇濈暀涓や綅灏忔暟锛�", example = "99.60")
+ private BigDecimal qualifiedRate;
+
+ @Schema(description = "涓嶅悎鏍肩巼锛堢櫨鍒嗘瘮锛屼繚鐣欎袱浣嶅皬鏁帮級", example = "0.40")
+ private BigDecimal unqualifiedRate;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/MesQcTemplateProcessController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/MesQcTemplateProcessController.java
new file mode 100644
index 0000000..cf2915c
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/MesQcTemplateProcessController.java
@@ -0,0 +1,100 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.template;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.MesQcTemplateProcessRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.MesQcTemplateProcessSaveByTemplateReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.MesQcTemplateProcessSaveListReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateProcessDO;
+import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
+import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateProcessService;
+import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateService;
+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.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.convertList;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+
+@Tag(name = "绠$悊鍚庡彴 - MES 璐ㄦ鏂规-宸ュ簭缁戝畾")
+@RestController
+@RequestMapping("/mes/qc/template-process")
+@Validated
+public class MesQcTemplateProcessController {
+
+ @Resource
+ private MesQcTemplateProcessService templateProcessService;
+ @Resource
+ private MesQcTemplateService templateService;
+ @Resource
+ private MesProProcessService processService;
+
+ @GetMapping("/list")
+ @Operation(summary = "鑾峰緱宸ュ簭缁戝畾鐨勮川妫�鏂规鍒楄〃")
+ @Parameter(name = "processId", description = "宸ュ簭缂栧彿", required = true, example = "1024")
+ public CommonResult<List<MesQcTemplateProcessRespVO>> getList(@RequestParam("processId") Long processId) {
+ List<MesQcTemplateProcessDO> list = templateProcessService.getListByProcessId(processId);
+ Map<Long, MesQcTemplateDO> templateMap = templateService.getTemplateMap(
+ convertSet(list, MesQcTemplateProcessDO::getTemplateId));
+ MesProProcessDO process = processService.getProcess(processId);
+ return success(convertList(list, binding -> {
+ MesQcTemplateProcessRespVO vo = BeanUtils.toBean(binding, MesQcTemplateProcessRespVO.class);
+ MesQcTemplateDO template = templateMap.get(binding.getTemplateId());
+ if (template != null) {
+ vo.setTemplateCode(template.getCode()).setTemplateName(template.getName());
+ }
+ if (process != null) {
+ vo.setProcessName(process.getName());
+ }
+ return vo;
+ }));
+ }
+
+ @PostMapping("/save-list")
+ @Operation(summary = "鎵归噺淇濆瓨宸ュ簭缁戝畾鐨勮川妫�鏂规")
+ @PreAuthorize("@ss.hasPermission('mes:qc-template:update')")
+ public CommonResult<Boolean> saveList(@Valid @RequestBody MesQcTemplateProcessSaveListReqVO reqVO) {
+ templateProcessService.saveList(reqVO);
+ return success(true);
+ }
+
+ @GetMapping("/list-by-template")
+ @Operation(summary = "鑾峰緱璐ㄦ鏂规閫傜敤鐨勫伐搴忓垪琛�")
+ @Parameter(name = "templateId", description = "璐ㄦ鏂规缂栧彿", required = true, example = "1024")
+ public CommonResult<List<MesQcTemplateProcessRespVO>> getListByTemplate(
+ @RequestParam("templateId") Long templateId) {
+ List<MesQcTemplateProcessDO> list = templateProcessService.getListByTemplateId(templateId);
+ Map<Long, MesProProcessDO> processMap = processService.getProcessMap(
+ convertSet(list, MesQcTemplateProcessDO::getProcessId));
+ return success(convertList(list, binding -> {
+ MesQcTemplateProcessRespVO vo = BeanUtils.toBean(binding, MesQcTemplateProcessRespVO.class);
+ MesProProcessDO process = processMap.get(binding.getProcessId());
+ if (process != null) {
+ vo.setProcessName(process.getName());
+ }
+ return vo;
+ }));
+ }
+
+ @PostMapping("/save-by-template")
+ @Operation(summary = "鎵归噺淇濆瓨璐ㄦ鏂规閫傜敤鐨勫伐搴�")
+ @PreAuthorize("@ss.hasPermission('mes:qc-template:update')")
+ public CommonResult<Boolean> saveByTemplate(
+ @Valid @RequestBody MesQcTemplateProcessSaveByTemplateReqVO reqVO) {
+ templateProcessService.saveByTemplate(reqVO);
+ return success(true);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplateProcessRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplateProcessRespVO.java
new file mode 100644
index 0000000..0bb7f0f
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplateProcessRespVO.java
@@ -0,0 +1,48 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 璐ㄦ鏂规-宸ュ簭缁戝畾 Response VO")
+@Data
+public class MesQcTemplateProcessRespVO {
+
+ @Schema(description = "缂栧彿")
+ private Long id;
+
+ @Schema(description = "宸ュ簭缂栧彿")
+ private Long processId;
+
+ @Schema(description = "宸ュ簭鍚嶇О")
+ private String processName;
+
+ @Schema(description = "璐ㄦ鏂规缂栧彿")
+ private Long templateId;
+
+ @Schema(description = "璐ㄦ鏂规缂栫爜")
+ private String templateCode;
+
+ @Schema(description = "璐ㄦ鏂规鍚嶇О")
+ private String templateName;
+
+ @Schema(description = "璐ㄦ绉嶇被")
+ private Integer qcType;
+
+ @Schema(description = "鏄惁榛樿鏂规")
+ private Boolean defaultFlag;
+
+ @Schema(description = "鎺掑簭")
+ private Integer sort;
+
+ @Schema(description = "鐘舵�侊細0-鍚敤 1-绂佺敤")
+ private Integer status;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ @Schema(description = "鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplateProcessSaveByTemplateReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplateProcessSaveByTemplateReqVO.java
new file mode 100644
index 0000000..56fe94a
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplateProcessSaveByTemplateReqVO.java
@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 璐ㄦ鏂规閫傜敤鐨勫伐搴忔壒閲忎繚瀛� Request VO")
+@Data
+public class MesQcTemplateProcessSaveByTemplateReqVO {
+
+ @Schema(description = "璐ㄦ鏂规缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ @NotNull(message = "璐ㄦ鏂规涓嶈兘涓虹┖")
+ private Long templateId;
+
+ @Schema(description = "璐ㄦ绉嶇被锛�1-鏉ユ枡妫�楠� 2-杩囩▼妫�楠� 3-鍑鸿揣妫�楠� 4-閫�璐ф楠�",
+ requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+ @NotNull(message = "璐ㄦ绉嶇被涓嶈兘涓虹┖")
+ private Integer qcType;
+
+ @Schema(description = "閫傜敤宸ュ簭鍒楄〃锛涙湭鎼哄甫鐨勫凡鏈夌粦瀹氬皢琚垹闄�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @Valid
+ private List<ProcessItem> list;
+
+ @Schema(description = "閫傜敤宸ュ簭")
+ @Data
+ public static class ProcessItem {
+
+ @Schema(description = "宸ュ簭缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ @NotNull(message = "宸ュ簭涓嶈兘涓虹┖")
+ private Long processId;
+
+ @Schema(description = "鏄惁榛樿鏂规", example = "true")
+ private Boolean defaultFlag;
+
+ @Schema(description = "鎺掑簭", example = "0")
+ private Integer sort;
+
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplateProcessSaveListReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplateProcessSaveListReqVO.java
new file mode 100644
index 0000000..562f56c
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplateProcessSaveListReqVO.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 璐ㄦ鏂规-宸ュ簭缁戝畾鎵归噺淇濆瓨 Request VO")
+@Data
+public class MesQcTemplateProcessSaveListReqVO {
+
+ @Schema(description = "宸ュ簭缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ @NotNull(message = "宸ュ簭涓嶈兘涓虹┖")
+ private Long processId;
+
+ @Schema(description = "缁戝畾鐨勮川妫�鏂规鍒楄〃锛涙湭鎼哄甫鐨勫凡鏈夌粦瀹氱殑灏嗚鍒犻櫎", requiredMode = Schema.RequiredMode.REQUIRED)
+ @Valid
+ private List<MesQcTemplateProcessSaveReqVO> list;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplateProcessSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplateProcessSaveReqVO.java
new file mode 100644
index 0000000..edc860e
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplateProcessSaveReqVO.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 璐ㄦ鏂规-宸ュ簭缁戝畾鏂板/淇敼 Request VO")
+@Data
+public class MesQcTemplateProcessSaveReqVO {
+
+ @Schema(description = "缂栧彿")
+ private Long id;
+
+ @Schema(description = "宸ュ簭缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ @NotNull(message = "宸ュ簭涓嶈兘涓虹┖")
+ private Long processId;
+
+ @Schema(description = "璐ㄦ鏂规缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "5")
+ @NotNull(message = "璐ㄦ鏂规涓嶈兘涓虹┖")
+ private Long templateId;
+
+ @Schema(description = "璐ㄦ绉嶇被", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+ @NotNull(message = "璐ㄦ绉嶇被涓嶈兘涓虹┖")
+ private Integer qcType;
+
+ @Schema(description = "鏄惁榛樿鏂规", example = "true")
+ private Boolean defaultFlag;
+
+ @Schema(description = "鎺掑簭", example = "1")
+ private Integer sort;
+
+ @Schema(description = "鐘舵�侊細0-鍚敤 1-绂佺敤", example = "0")
+ private Integer status;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+}
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 0853b68..f4efd0f 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
@@ -15,9 +15,17 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesSaveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesShippingReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesLineDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.salesnotice.MesWmSalesNoticeDO;
+import cn.iocoder.yudao.module.mes.service.wm.document.MesWmDocumentRenderer;
+import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesLineService;
import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesService;
import cn.iocoder.yudao.module.mes.service.wm.salesnotice.MesWmSalesNoticeService;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
+import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
+import cn.iocoder.yudao.module.system.service.companyconfig.SystemCompanyConfigService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -29,11 +37,16 @@
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_PRODUCT_SALES_NOT_EXISTS;
@Tag(name = "绠$悊鍚庡彴 - MES 閿�鍞嚭搴撳崟")
@RestController
@@ -44,9 +57,17 @@
@Resource
private MesWmProductSalesService productSalesService;
@Resource
+ private MesWmProductSalesLineService productSalesLineService;
+ @Resource
private CrmCustomerApi crmCustomerApi;
@Resource
private MesWmSalesNoticeService salesNoticeService;
+ @Resource
+ private MdmItemApi mdmItemApi;
+ @Resource
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
+ @Resource
+ private SystemCompanyConfigService companyConfigService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓閿�鍞嚭搴撳崟")
@@ -103,6 +124,83 @@
buildRespVOList(pageResult.getList()));
}
+ @GetMapping("/export-word")
+ @Operation(summary = "瀵煎嚭鎴愬搧鍑哄簱鍗� Word锛堝甫鐢靛瓙绔狅紝鍙墜濉瀛楀悗褰掓。锛�")
+ @Parameter(name = "id", description = "閿�鍞嚭搴撳崟缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:wm-product-sales:export')")
+ @ApiAccessLog(operateType = EXPORT)
+ public void exportProductSalesWord(@RequestParam("id") Long id,
+ HttpServletResponse response) throws IOException {
+ MesWmProductSalesDO sales = productSalesService.getProductSales(id);
+ if (sales == null) {
+ throw exception(WM_PRODUCT_SALES_NOT_EXISTS);
+ }
+ List<MesWmProductSalesLineDO> lines = productSalesLineService.getProductSalesLineListBySalesId(id);
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
+ convertSet(lines, MesWmProductSalesLineDO::getItemId));
+ Map<Long, MdmUnitMeasureRespDTO> unitMap = mdmUnitMeasureApi
+ .getUnitMeasureList(convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId))
+ .getCheckedData().stream()
+ .collect(java.util.stream.Collectors.toMap(MdmUnitMeasureRespDTO::getId, e -> e));
+
+ Map<String, String> fields = new LinkedHashMap<>();
+ fields.put("clientName", resolveClientName(sales.getClientId()));
+ fields.put("code", sales.getCode());
+ fields.put("salesDate", sales.getSalesDate() == null ? null
+ : sales.getSalesDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ fields.put("saleOrderCode", sales.getSalesOrderCode());
+ fields.put("noticeCode", resolveNoticeCode(sales.getNoticeId()));
+ fields.put("contactName", sales.getContactName());
+ fields.put("contactTelephone", sales.getContactTelephone());
+ fields.put("contactAddress", sales.getContactAddress());
+ fields.put("carrier", sales.getCarrier());
+ fields.put("shippingNumber", sales.getShippingNumber());
+ fields.put("remark", sales.getRemark());
+
+ List<Map<String, String>> items = new ArrayList<>();
+ for (MesWmProductSalesLineDO line : lines) {
+ MdmItemRespDTO item = itemMap.get(line.getItemId());
+ Map<String, String> row = new LinkedHashMap<>();
+ row.put("itemName", item != null ? item.getName() : null);
+ row.put("itemSpecification", item != null ? item.getSpecification() : null);
+ MdmUnitMeasureRespDTO unit = item != null ? unitMap.get(item.getUnitMeasureId()) : null;
+ row.put("unitName", unit != null ? unit.getName() : null);
+ row.put("quantity", line.getQuantity() == null ? null : line.getQuantity().toPlainString());
+ row.put("price", line.getPrice() == null ? null : line.getPrice().toPlainString());
+ row.put("amount", line.getTotalPrice() == null ? null : line.getTotalPrice().toPlainString());
+ row.put("batchCode", line.getBatchCode());
+ items.add(row);
+ }
+
+ var companyConfig = companyConfigService.getCompanyConfig();
+ byte[] content = MesWmDocumentRenderer.renderProductOutbound(fields, items,
+ companyConfig != null ? companyConfig.getCompanyName() : null);
+ writeWord(response, "鎴愬搧鍑哄簱鍗�-" + sales.getCode() + ".docx", content);
+ }
+
+ private String resolveClientName(Long clientId) {
+ if (clientId == null) {
+ return null;
+ }
+ CrmCustomerRespDTO customer = crmCustomerApi.getCustomer(clientId);
+ return customer != null ? customer.getName() : null;
+ }
+
+ private String resolveNoticeCode(Long noticeId) {
+ if (noticeId == null) {
+ return null;
+ }
+ MesWmSalesNoticeDO notice = salesNoticeService.getSalesNotice(noticeId);
+ return notice != null ? notice.getCode() : null;
+ }
+
+ private static void writeWord(HttpServletResponse response, String filename, byte[] content) throws IOException {
+ String encoded = URLEncoder.encode(filename, StandardCharsets.UTF_8).replace("+", "%20");
+ response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+ response.setHeader("Content-Disposition", "attachment;filename*=UTF-8''" + encoded);
+ response.getOutputStream().write(content);
+ }
+
@PutMapping("/submit")
@Operation(summary = "鎻愪氦閿�鍞嚭搴撳崟")
@Parameter(name = "id", description = "缂栧彿", required = true)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeController.java
index 9ff4bc9..f9b315a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeController.java
@@ -10,11 +10,20 @@
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo.MesWmSalesNoticeLedgerRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo.MesWmSalesNoticePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo.MesWmSalesNoticeRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo.MesWmSalesNoticeSaveReqVO;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
+import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.salesnotice.MesWmSalesNoticeDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.salesnotice.MesWmSalesNoticeLineDO;
+import cn.iocoder.yudao.module.mes.service.wm.document.MesWmDocumentRenderer;
+import cn.iocoder.yudao.module.mes.service.wm.salesnotice.MesWmSalesNoticeLineService;
import cn.iocoder.yudao.module.mes.service.wm.salesnotice.MesWmSalesNoticeService;
+import cn.iocoder.yudao.module.system.service.companyconfig.SystemCompanyConfigService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -26,13 +35,21 @@
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
import java.util.Collections;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_SALES_NOTICE_NOT_EXISTS;
@Tag(name = "绠$悊鍚庡彴 - MES 鍙戣揣閫氱煡鍗�")
@RestController
@@ -44,6 +61,16 @@
private MesWmSalesNoticeService salesNoticeService;
@Resource
private CrmCustomerApi crmCustomerApi;
+ @Resource
+ private MesWmSalesNoticeLineService salesNoticeLineService;
+ @Resource
+ private MdmItemApi mdmItemApi;
+ @Resource
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
+ @Resource
+ private SystemCompanyConfigService companyConfigService;
+ @Resource
+ private cn.iocoder.yudao.module.system.api.user.AdminUserApi adminUserApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鍙戣揣閫氱煡鍗�")
@@ -88,6 +115,83 @@
return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal()));
}
+ @GetMapping("/ledger-page")
+ @Operation(summary = "鑾峰緱鍙戣揣鍙拌处鍒嗛〉锛堟寜浜у搧骞抽摵锛�")
+ public CommonResult<PageResult<MesWmSalesNoticeLedgerRespVO>> getSalesNoticeLedgerPage(
+ @Valid MesWmSalesNoticePageReqVO pageReqVO) {
+ int pageNo = pageReqVO.getPageNo();
+ int pageSize = pageReqVO.getPageSize();
+ // 1. 鍏堟煡鍑虹鍚堟潯浠剁殑鍏ㄩ儴鍙戣揣鍗曪紝鍐嶅钩閾烘槑缁嗗悗鎵嬪姩鍒嗛〉锛堟槑缁嗚鏁版棤娉曞湪 SQL 灞傜洿鎺ュ垎椤碉級
+ List<MesWmSalesNoticeDO> notices;
+ try {
+ pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+ notices = salesNoticeService.getSalesNoticePage(pageReqVO).getList();
+ } finally {
+ pageReqVO.setPageSize(pageSize);
+ }
+ if (CollUtil.isEmpty(notices)) {
+ return success(new PageResult<>(Collections.emptyList(), 0L));
+ }
+ List<MesWmSalesNoticeLineDO> lines = salesNoticeLineService.getSalesNoticeLineListByNoticeIds(
+ convertSet(notices, MesWmSalesNoticeDO::getId));
+ Map<Long, List<MesWmSalesNoticeLineDO>> lineMap = lines.stream()
+ .collect(java.util.stream.Collectors.groupingBy(MesWmSalesNoticeLineDO::getNoticeId));
+ Map<Long, CrmCustomerRespDTO> customerMap = crmCustomerApi.getCustomerMap(
+ convertSet(notices, MesWmSalesNoticeDO::getClientId));
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
+ convertSet(lines, MesWmSalesNoticeLineDO::getItemId));
+ Map<Long, MdmUnitMeasureRespDTO> unitMap = CollUtil.isEmpty(itemMap) ? Collections.emptyMap()
+ : mdmUnitMeasureApi.getUnitMeasureList(
+ convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId))
+ .getCheckedData().stream()
+ .collect(java.util.stream.Collectors.toMap(MdmUnitMeasureRespDTO::getId, e -> e));
+
+ // 2. 鎸夊崟鎹『搴忓钩閾烘垚銆屼竴琛屼竴涓骇鍝併��
+ List<MesWmSalesNoticeLedgerRespVO> rows = new ArrayList<>();
+ for (MesWmSalesNoticeDO notice : notices) {
+ List<MesWmSalesNoticeLineDO> noticeLines = lineMap.getOrDefault(notice.getId(), Collections.emptyList());
+ CrmCustomerRespDTO customer = customerMap.get(notice.getClientId());
+ for (MesWmSalesNoticeLineDO line : noticeLines) {
+ MesWmSalesNoticeLedgerRespVO row = new MesWmSalesNoticeLedgerRespVO();
+ row.setNoticeId(notice.getId());
+ row.setNoticeCode(notice.getCode());
+ row.setSaleOrderCode(notice.getSaleOrderCode());
+ row.setClientId(notice.getClientId());
+ row.setClientName(customer != null ? customer.getName() : null);
+ row.setSalesDate(notice.getSalesDate());
+ row.setRecipientName(notice.getRecipientName());
+ row.setRecipientAddress(notice.getRecipientAddress());
+ row.setLogisticsCompany(notice.getLogisticsCompany());
+ row.setExpressFee(notice.getExpressFee());
+ row.setInvoiceStatus(notice.getInvoiceStatus());
+ row.setStatus(notice.getStatus());
+ row.setOutStatus(notice.getOutStatus());
+ row.setLineId(line.getId());
+ row.setItemId(line.getItemId());
+ MdmItemRespDTO item = itemMap.get(line.getItemId());
+ row.setItemCode(item != null ? item.getCode() : null);
+ row.setItemName(item != null ? item.getName() : null);
+ row.setItemSpecification(item != null ? item.getSpecification() : null);
+ MdmUnitMeasureRespDTO unit = item != null ? unitMap.get(item.getUnitMeasureId()) : null;
+ row.setUnitName(unit != null ? unit.getName() : null);
+ row.setQuantity(line.getQuantity());
+ row.setOutCount(line.getOutCount());
+ row.setBatchCode(line.getBatchCode());
+ row.setLineRemark(line.getRemark());
+ rows.add(row);
+ }
+ }
+
+ // 3. 鎵嬪姩鍒嗛〉
+ long total = rows.size();
+ if (pageSize == PageParam.PAGE_SIZE_NONE) {
+ return success(new PageResult<>(rows, total));
+ }
+ int from = Math.min(Math.max(pageNo - 1, 0) * pageSize, rows.size());
+ int to = Math.min(from + pageSize, rows.size());
+ return success(new PageResult<>(rows.subList(from, to), total));
+ }
+
@GetMapping("/export-excel")
@Operation(summary = "瀵煎嚭鍙戣揣閫氱煡鍗� Excel")
@PreAuthorize("@ss.hasPermission('mes:wm-sales-notice:export')")
@@ -100,15 +204,102 @@
buildRespVOList(pageResult.getList()));
}
+ @GetMapping("/export-word")
+ @Operation(summary = "瀵煎嚭鍙戣揣鍗� Word锛堝甫鐢靛瓙绔狅紝鍙墜濉瀛楀悗褰掓。锛�")
+ @Parameter(name = "id", description = "鍙戣揣閫氱煡鍗曠紪鍙�", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:wm-sales-notice:export')")
+ @ApiAccessLog(operateType = EXPORT)
+ public void exportSalesNoticeWord(@RequestParam("id") Long id,
+ HttpServletResponse response) throws IOException {
+ MesWmSalesNoticeDO notice = salesNoticeService.getSalesNotice(id);
+ if (notice == null) {
+ throw exception(WM_SALES_NOTICE_NOT_EXISTS);
+ }
+ List<MesWmSalesNoticeLineDO> lines = salesNoticeLineService.getSalesNoticeLineListByNoticeId(id);
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
+ convertSet(lines, MesWmSalesNoticeLineDO::getItemId));
+ Map<Long, MdmUnitMeasureRespDTO> unitMap = mdmUnitMeasureApi
+ .getUnitMeasureList(convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId))
+ .getCheckedData().stream()
+ .collect(java.util.stream.Collectors.toMap(MdmUnitMeasureRespDTO::getId, e -> e));
+
+ Map<String, String> fields = new LinkedHashMap<>();
+ fields.put("clientName", resolveClientName(notice.getClientId()));
+ fields.put("code", notice.getCode());
+ fields.put("salesDate", notice.getSalesDate() == null ? null
+ : notice.getSalesDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ fields.put("saleOrderCode", notice.getSaleOrderCode());
+ fields.put("recipientName", notice.getRecipientName());
+ fields.put("recipientTelephone", notice.getRecipientTelephone());
+ fields.put("recipientAddress", notice.getRecipientAddress());
+ fields.put("logisticsCompany", notice.getLogisticsCompany());
+ fields.put("expressFee", notice.getExpressFee() == null ? "0.00" : notice.getExpressFee().toPlainString());
+ fields.put("creator", resolveCreatorName(notice.getCreator()));
+ fields.put("remark", notice.getRemark());
+
+ List<Map<String, String>> items = new ArrayList<>();
+ for (MesWmSalesNoticeLineDO line : lines) {
+ MdmItemRespDTO item = itemMap.get(line.getItemId());
+ Map<String, String> row = new LinkedHashMap<>();
+ row.put("itemName", item != null ? item.getName() : null);
+ row.put("itemSpecification", item != null ? item.getSpecification() : null);
+ MdmUnitMeasureRespDTO unit = item != null ? unitMap.get(item.getUnitMeasureId()) : null;
+ row.put("unitName", unit != null ? unit.getName() : null);
+ row.put("quantity", line.getQuantity() == null ? null : line.getQuantity().toPlainString());
+ row.put("batchCode", line.getBatchCode());
+ row.put("itemRemark", line.getRemark());
+ items.add(row);
+ }
+
+ var companyConfig = companyConfigService.getCompanyConfig();
+ byte[] content = MesWmDocumentRenderer.renderSalesDelivery(fields, items,
+ companyConfig != null ? companyConfig.getCompanyName() : null);
+ writeWord(response, "鍙戣揣鍗�-" + notice.getCode() + ".docx", content);
+ }
+
+ private String resolveClientName(Long clientId) {
+ if (clientId == null) {
+ return null;
+ }
+ CrmCustomerRespDTO customer = crmCustomerApi.getCustomer(clientId);
+ return customer != null ? customer.getName() : null;
+ }
+
+ private String resolveCreatorName(String creator) {
+ if (creator == null) {
+ return null;
+ }
+ try {
+ var user = adminUserApi.getUser(Long.valueOf(creator));
+ return user != null ? user.getNickname() : null;
+ } catch (NumberFormatException ignored) {
+ return creator;
+ }
+ }
+
+ private static void writeWord(HttpServletResponse response, String filename, byte[] content) throws IOException {
+ String encoded = URLEncoder.encode(filename, StandardCharsets.UTF_8).replace("+", "%20");
+ response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+ response.setHeader("Content-Disposition", "attachment;filename*=UTF-8''" + encoded);
+ response.getOutputStream().write(content);
+ }
+
@PutMapping("/submit")
- @Operation(summary = "鎻愪氦鍙戣揣閫氱煡鍗�")
+ @Operation(summary = "鎻愪氦鍙戣揣閫氱煡鍗曞鎵�")
@Parameter(name = "id", description = "缂栧彿", required = true)
@PreAuthorize("@ss.hasPermission('mes:wm-sales-notice:update')")
- public CommonResult<Boolean> submitSalesNotice(@RequestParam("id") Long id) {
- salesNoticeService.submitSalesNotice(id);
+ public CommonResult<Boolean> submitSalesNotice(@RequestParam("id") Long id,
+ @RequestParam(value = "processDefinitionKey", required = false) String processDefinitionKey) {
+ salesNoticeService.submitSalesNotice(id, processDefinitionKey, getLoginUserId());
return success(true);
}
+ @GetMapping("/approve-process-list")
+ @Operation(summary = "鑾峰彇鍙戣揣瀹℃壒娴佺▼鍒楄〃")
+ public CommonResult<List<Map<String, Object>>> getSalesNoticeApproveProcessList() {
+ return success(salesNoticeService.getSalesNoticeApproveProcessDefinitionList());
+ }
+
@PostMapping("/generate-from-sale-order")
@Operation(summary = "浠庨攢鍞鍗曠敓鎴愬彂璐ч�氱煡鍗�")
@PreAuthorize("@ss.hasPermission('mes:wm-sales-notice:create')")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeLedgerRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeLedgerRespVO.java
new file mode 100644
index 0000000..d5a0b5c
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeLedgerRespVO.java
@@ -0,0 +1,66 @@
+package cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 鍙戣揣鍙拌处锛堟寜浜у搧骞抽摵锛塕esponse VO
+ *
+ * 涓�琛� = 涓�寮犲彂璐у崟鐨勪竴涓骇鍝佹槑缁嗭紝琛ㄥご淇℃伅闅忚灞曠ず锛屼究浜庢寜浜у搧缁村害绛涢�夊拰鏍稿銆�
+ */
+@Schema(description = "绠$悊鍚庡彴 - MES 鍙戣揣鍙拌处锛堟寜浜у搧骞抽摵锛� Response VO")
+@Data
+public class MesWmSalesNoticeLedgerRespVO {
+
+ @Schema(description = "鍙戣揣閫氱煡鍗曠紪鍙�")
+ private Long noticeId;
+ @Schema(description = "鍙戣揣鍗曞彿")
+ private String noticeCode;
+ @Schema(description = "閿�鍞鍗曞彿")
+ private String saleOrderCode;
+ @Schema(description = "瀹㈡埛缂栧彿")
+ private Long clientId;
+ @Schema(description = "瀹㈡埛鍚嶇О")
+ private String clientName;
+ @Schema(description = "鍙戣揣鏃ユ湡")
+ private LocalDateTime salesDate;
+ @Schema(description = "鏀惰揣浜�")
+ private String recipientName;
+ @Schema(description = "鏀惰揣鍦板潃")
+ private String recipientAddress;
+ @Schema(description = "鐗╂祦鍏徃")
+ private String logisticsCompany;
+ @Schema(description = "蹇�掕垂")
+ private BigDecimal expressFee;
+ @Schema(description = "寮�绁ㄧ姸鎬侊細0鏈紑绁� 1閮ㄥ垎寮�绁� 2宸插紑绁�")
+ private Integer invoiceStatus;
+ @Schema(description = "鍗曟嵁鐘舵��")
+ private Integer status;
+ @Schema(description = "鍑哄簱鐘舵��")
+ private Integer outStatus;
+
+ @Schema(description = "鏄庣粏琛岀紪鍙�")
+ private Long lineId;
+ @Schema(description = "浜у搧缂栧彿")
+ private Long itemId;
+ @Schema(description = "浜у搧缂栫爜")
+ private String itemCode;
+ @Schema(description = "浜у搧鍚嶇О")
+ private String itemName;
+ @Schema(description = "瑙勬牸鍨嬪彿")
+ private String itemSpecification;
+ @Schema(description = "鍗曚綅")
+ private String unitName;
+ @Schema(description = "鍙戣揣鏁伴噺")
+ private BigDecimal quantity;
+ @Schema(description = "宸插嚭搴撴暟閲�")
+ private BigDecimal outCount;
+ @Schema(description = "鎵规鍙�")
+ private String batchCode;
+ @Schema(description = "鏄庣粏澶囨敞")
+ private String lineRemark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeRespVO.java
index ad39bbd..96529bb 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeRespVO.java
@@ -5,6 +5,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
@Schema(description = "绠$悊鍚庡彴 - MES 鍙戣揣閫氱煡鍗� Response VO")
@@ -54,6 +55,18 @@
@ExcelProperty("鏀惰揣鍦板潃")
private String recipientAddress;
+ @Schema(description = "鐗╂祦鍏徃", example = "椤轰赴閫熻繍")
+ @ExcelProperty("鐗╂祦鍏徃")
+ private String logisticsCompany;
+
+ @Schema(description = "蹇�掕垂", example = "25.00")
+ @ExcelProperty("蹇�掕垂")
+ private BigDecimal expressFee;
+
+ @Schema(description = "寮�绁ㄧ姸鎬侊細0 鏈紑绁� 1 閮ㄥ垎寮�绁� 2 宸插紑绁�", example = "0")
+ @ExcelProperty("寮�绁ㄧ姸鎬�")
+ private Integer invoiceStatus;
+
@Schema(description = "鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
@ExcelProperty("鐘舵��")
private Integer status;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeSaveReqVO.java
index 4ffa6e2..d839f34 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeSaveReqVO.java
@@ -1,10 +1,13 @@
package cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo;
import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.DecimalMin;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
import lombok.Data;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
@Schema(description = "绠$悊鍚庡彴 - MES 鍙戣揣閫氱煡鍗曟柊澧�/淇敼 Request VO")
@@ -45,6 +48,17 @@
@Schema(description = "鏀惰揣鍦板潃", example = "鍖椾含甯傛湞闃冲尯xxx")
private String recipientAddress;
+ @Schema(description = "鐗╂祦鍏徃", example = "椤轰赴閫熻繍")
+ @Size(max = 128, message = "鐗╂祦鍏徃鍚嶇О涓嶈兘瓒呰繃 128 涓瓧绗�")
+ private String logisticsCompany;
+
+ @Schema(description = "蹇�掕垂", example = "25.00")
+ @DecimalMin(value = "0", message = "蹇�掕垂涓嶈兘灏忎簬 0")
+ private BigDecimal expressFee;
+
+ @Schema(description = "寮�绁ㄧ姸鎬侊細0 鏈紑绁� 1 閮ㄥ垎寮�绁� 2 宸插紑绁�", example = "0")
+ private Integer invoiceStatus;
+
@Schema(description = "澶囨敞", example = "澶囨敞")
private String remark;
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 891ec33..2645240 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
@@ -6,6 +6,7 @@
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.mdm.MesMdmItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.transaction.MesWmTransactionDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
@@ -13,6 +14,7 @@
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
+import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
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;
@@ -52,6 +54,8 @@
private MesWmWarehouseLocationService locationService;
@Resource
private MesWmWarehouseAreaService areaService;
+ @Resource
+ private MesProWorkOrderService workOrderService;
@GetMapping("/page")
@Operation(summary = "鑾峰彇搴撳瓨浜嬪姟娴佹按鍒嗛〉")
@@ -74,6 +78,9 @@
// 鍏宠仈鏌ヨ搴撲綅淇℃伅
Map<Long, MesWmWarehouseAreaDO> areaMap = areaService.getWarehouseAreaMap(
convertSet(pageResult.getList(), MesWmTransactionDO::getAreaId));
+ // 鍏宠仈鏌ヨ鐢熶骇璁㈠崟锛堝伐鍗曪級淇℃伅锛岀敤浜庡嚭搴撳彴璐﹀睍绀虹敓浜ц鍗曞彿
+ Map<Long, MesProWorkOrderDO> workOrderMap = workOrderService.getWorkOrderMap(
+ convertSet(pageResult.getList(), MesWmTransactionDO::getWorkOrderId));
// 杞崲涓� VO
List<MesWmTransactionRespVO> voList = pageResult.getList().stream().map(transaction -> {
@@ -104,6 +111,11 @@
if (area != null) {
vo.setAreaName(area.getName());
}
+ // 鐢熶骇璁㈠崟鍙�
+ MesProWorkOrderDO workOrder = workOrderMap.get(transaction.getWorkOrderId());
+ if (workOrder != null) {
+ vo.setWorkOrderCode(workOrder.getCode());
+ }
return vo;
}).collect(Collectors.toList());
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 e40218c..f7c5bf3 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
@@ -31,6 +31,12 @@
@Schema(description = "涓氬姟鍗曞彿", example = "STOCK_ADJUST_1")
private String bizCode;
+ @Schema(description = "鐢熶骇璁㈠崟锛堝伐鍗曪級ID", example = "1024")
+ private Long workOrderId;
+
+ @Schema(description = "鐢熶骇璁㈠崟鍙�", example = "WO20261106001")
+ private String workOrderCode;
+
// ========== 鐗╂枡缁村害 ==========
@Schema(description = "鐗╂枡ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/holiday/MesCalHolidayDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/holiday/MesCalHolidayDO.java
deleted file mode 100644
index fd78b42..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/holiday/MesCalHolidayDO.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package cn.iocoder.yudao.module.mes.dal.dataobject.cal.holiday;
-
-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.*;
-
-import java.time.LocalDateTime;
-
-/**
- * MES 鍋囨湡璁剧疆 DO
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@TableName("mes_cal_holiday")
-@KeySequence("mes_cal_holiday_seq") // 鐢ㄤ簬 Oracle銆丳ostgreSQL銆並ingbase銆丏B2銆丠2 鏁版嵁搴撶殑涓婚敭鑷銆傚鏋滄槸 MySQL 绛夋暟鎹簱锛屽彲涓嶅啓銆�
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class MesCalHolidayDO extends BaseDO {
-
- /**
- * 缂栧彿
- */
- @TableId
- private Long id;
- /**
- * 鏃ユ湡
- */
- private LocalDateTime day;
- /**
- * 鏃ユ湡绫诲瀷
- *
- * 瀛楀吀 {@link cn.iocoder.yudao.module.mes.enums.DictTypeConstants#MES_CAL_HOLIDAY_TYPE}
- */
- private Integer type;
- /**
- * 澶囨敞
- */
- private String remark;
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/plan/MesCalPlanDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/plan/MesCalPlanDO.java
deleted file mode 100644
index 9b5a69e..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/plan/MesCalPlanDO.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan;
-
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.module.mes.enums.cal.MesCalPlanStatusEnum;
-import cn.iocoder.yudao.module.mes.enums.cal.MesCalShiftMethodEnum;
-import cn.iocoder.yudao.module.mes.enums.cal.MesCalShiftTypeEnum;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-import java.time.LocalDateTime;
-import cn.iocoder.yudao.module.mes.enums.DictTypeConstants;
-
-/**
- * MES 鎺掔彮璁″垝 DO
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@TableName("mes_cal_plan")
-@KeySequence("mes_cal_plan_seq")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class MesCalPlanDO extends BaseDO {
-
- /**
- * 璁″垝缂栧彿
- */
- @TableId
- private Long id;
- /**
- * 璁″垝缂栫爜
- */
- private String code;
- /**
- * 璁″垝鍚嶇О
- */
- private String name;
- /**
- * 鐝粍绫诲瀷
- */
- private Integer calendarType;
- /**
- * 寮�濮嬫棩鏈�
- */
- private LocalDateTime startDate;
- /**
- * 缁撴潫鏃ユ湡
- */
- private LocalDateTime endDate;
- /**
- * 杞彮鏂瑰紡
- *
- * 瀛楀吀 {@link DictTypeConstants#MES_CAL_SHIFT_TYPE}
- * 鏋氫妇 {@link MesCalShiftTypeEnum}
- */
- private Integer shiftType;
- /**
- * 鍊掔彮鏂瑰紡
- *
- * 瀛楀吀 {@link DictTypeConstants#MES_CAL_SHIFT_METHOD}
- * 鏋氫妇 {@link MesCalShiftMethodEnum}
- */
- private Integer shiftMethod;
- /**
- * 鍊掔彮澶╂暟
- */
- private Integer shiftCount;
- /**
- * 鐘舵��
- *
- * 瀛楀吀 {@link DictTypeConstants#MES_CAL_PLAN_STATUS}
- * 鏋氫妇 {@link MesCalPlanStatusEnum}
- */
- private Integer status;
- /**
- * 鏄惁鎺掗櫎鍛ㄦ湯
- *
- * true锛氬懆鍏棩涓嶇敓鎴愭帓鐝褰曪紙榛樿锛�
- * false锛氬懆鍏棩姝e父鎺掔彮锛堝娉ㄥ杞﹂棿闇�瑕佽繛缁敓浜э級
- */
- private Boolean excludeWeekend;
-
- /**
- * 澶囨敞
- */
- private String remark;
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/plan/MesCalPlanShiftDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/plan/MesCalPlanShiftDO.java
deleted file mode 100644
index 0b30259..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/plan/MesCalPlanShiftDO.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan;
-
-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.*;
-
-/**
- * MES 璁″垝鐝 DO
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@TableName("mes_cal_plan_shift")
-@KeySequence("mes_cal_plan_shift_seq")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class MesCalPlanShiftDO extends BaseDO {
-
- /**
- * 鐝缂栧彿
- */
- @TableId
- private Long id;
- /**
- * 鎺掔彮璁″垝缂栧彿
- *
- * 鍏宠仈 {@link MesCalPlanDO#getId()}
- */
- private Long planId;
- /**
- * 鏄剧ず椤哄簭
- */
- private Integer sort;
- /**
- * 鐝鍚嶇О
- */
- private String name;
- /**
- * 寮�濮嬫椂闂达紙HH:mm 鏍煎紡锛�
- */
- private String startTime;
- /**
- * 缁撴潫鏃堕棿锛圚H:mm 鏍煎紡锛�
- */
- private String endTime;
- /**
- * 澶囨敞
- */
- private String remark;
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/plan/MesCalPlanTeamDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/plan/MesCalPlanTeamDO.java
deleted file mode 100644
index e381cca..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/plan/MesCalPlanTeamDO.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan;
-
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.team.MesCalTeamDO;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-/**
- * MES 璁″垝鐝粍鍏宠仈 DO
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@TableName("mes_cal_plan_team")
-@KeySequence("mes_cal_plan_team_seq")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class MesCalPlanTeamDO extends BaseDO {
-
- /**
- * 缂栧彿
- */
- @TableId
- private Long id;
- /**
- * 鎺掔彮璁″垝缂栧彿
- *
- * 鍏宠仈 {@link MesCalPlanDO#getId()}
- */
- private Long planId;
- /**
- * 鐝粍缂栧彿
- *
- * 鍏宠仈 {@link MesCalTeamDO#getId()}
- */
- private Long teamId;
- /**
- * 澶囨敞
- */
- private String remark;
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/team/MesCalTeamDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/team/MesCalTeamDO.java
deleted file mode 100644
index f107283..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/team/MesCalTeamDO.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package cn.iocoder.yudao.module.mes.dal.dataobject.cal.team;
-
-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.*;
-
-/**
- * MES 鐝粍 DO
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@TableName("mes_cal_team")
-@KeySequence("mes_cal_team_seq")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class MesCalTeamDO extends BaseDO {
-
- /**
- * 鐝粍缂栧彿
- */
- @TableId
- private Long id;
- /**
- * 鐝粍缂栫爜
- */
- private String code;
- /**
- * 鐝粍鍚嶇О
- */
- private String name;
- /**
- * 鐝粍绫诲瀷
- */
- private Integer calendarType;
- /**
- * 澶囨敞
- */
- private String remark;
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/team/MesCalTeamMemberDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/team/MesCalTeamMemberDO.java
deleted file mode 100644
index 22708c0..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/team/MesCalTeamMemberDO.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package cn.iocoder.yudao.module.mes.dal.dataobject.cal.team;
-
-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.*;
-
-/**
- * MES 鐝粍鎴愬憳 DO
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@TableName("mes_cal_team_member")
-@KeySequence("mes_cal_team_member_seq")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class MesCalTeamMemberDO extends BaseDO {
-
- /**
- * 鐝粍鎴愬憳缂栧彿
- */
- @TableId
- private Long id;
- /**
- * 鐝粍缂栧彿
- *
- * 鍏宠仈 {@link MesCalTeamDO#getId()}
- */
- private Long teamId;
- /**
- * 鐢ㄦ埛缂栧彿
- *
- * 鍏宠仈 system_users 琛�
- */
- private Long userId;
- /**
- * 澶囨敞
- */
- private String remark;
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/team/MesCalTeamShiftDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/team/MesCalTeamShiftDO.java
deleted file mode 100644
index 611d219..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/team/MesCalTeamShiftDO.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package cn.iocoder.yudao.module.mes.dal.dataobject.cal.team;
-
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanShiftDO;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-import java.time.LocalDateTime;
-
-/**
- * MES 鐝粍鎺掔彮 DO
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@TableName("mes_cal_team_shift")
-@KeySequence("mes_cal_team_shift_seq")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class MesCalTeamShiftDO extends BaseDO {
-
- /**
- * 缂栧彿
- */
- @TableId
- private Long id;
- /**
- * 鎺掔彮璁″垝缂栧彿
- *
- * 鍏宠仈 {@link MesCalPlanDO#getId()}
- */
- private Long planId;
- /**
- * 鐝粍缂栧彿
- *
- * 鍏宠仈 {@link MesCalTeamDO#getId()}
- */
- private Long teamId;
- /**
- * 鐝缂栧彿
- *
- * 鍏宠仈 {@link MesCalPlanShiftDO#getId()}
- */
- private Long shiftId;
- /**
- * 鏃ユ湡
- */
- private LocalDateTime day;
- /**
- * 鎺掑簭
- */
- private Integer sort;
- /**
- * 澶囨敞
- */
- private String remark;
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/feedback/MesProFeedbackAuxDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/feedback/MesProFeedbackAuxDO.java
new file mode 100644
index 0000000..ca6865f
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/feedback/MesProFeedbackAuxDO.java
@@ -0,0 +1,67 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback;
+
+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.*;
+
+import java.math.BigDecimal;
+
+/**
+ * MES 鎶ュ伐杈呭姪宸ユ椂鏄庣粏 DO
+ *
+ * <p>鎶ュ伐鏃舵墜宸ュ綍鍏ョ殑杈呭姪椤圭洰娆℃暟蹇収锛岀敤浜庢爣鍑嗗伐鏃惰�冩牳瀵规瘮銆�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_pro_feedback_aux")
+@KeySequence("mes_pro_feedback_aux_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesProFeedbackAuxDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /**
+ * 鎶ュ伐缂栧彿
+ */
+ private Long feedbackId;
+ /**
+ * 杈呭姪宸ユ椂椤圭洰缂栧彿
+ */
+ private Long auxItemId;
+ /**
+ * 杈呭姪椤圭洰鍚嶇О蹇収
+ */
+ private String itemName;
+ /**
+ * 璁¢噺鏂瑰紡锛�1-鎸夋 2-鎸変釜 3-鎸夌洏 4-鎸夌背鎶樼畻
+ */
+ private Integer measureType;
+ /**
+ * 娆℃暟/涓暟/鐩樻暟/绫虫暟
+ */
+ private BigDecimal quantity;
+ /**
+ * 鎹㈣壊璧峰鏉愭枡
+ */
+ private String materialFrom;
+ /**
+ * 鎹㈣壊鐩爣鏉愭枡
+ */
+ private String materialTo;
+ /**
+ * 鎶樼畻鍒嗛挓鏁�
+ */
+ private BigDecimal minutes;
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/feedback/MesProFeedbackDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/feedback/MesProFeedbackDO.java
index 82d1914..31e2aac 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/feedback/MesProFeedbackDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/feedback/MesProFeedbackDO.java
@@ -34,6 +34,12 @@
/** 棣栨鎻愪氦鏃剁殑鍏宠仈璁惧缂栧彿蹇収锛岄�楀彿鍒嗛殧锛涙棫鍘嗗彶璁板綍涓嶅弽鎺ㄣ�� */
private String machineryIds;
+ /**
+ * 涓昏浠疯澶囩紪鍙凤紙姣忔鎶ュ伐浣跨敤鐨勮澶囷紝宸ヨ祫鍗曚环鎸夋璁惧鍖归厤瑙勫垯锛�
+ *
+ * 鍏宠仈 {@link cn.iocoder.yudao.module.mes.dal.dataobject.dv.machinery.MesDvMachineryDO#getId()}
+ */
+ private Long machineryId;
/**
* 缂栧彿
@@ -146,6 +152,80 @@
*/
private Long feedbackUserId;
/**
+ * 璁¤垂绫诲瀷蹇収
+ *
+ * 鏋氫妇 {@link cn.iocoder.yudao.module.mes.enums.pro.MesProProcessBillingTypeEnum}
+ */
+ private Integer billingType;
+ /**
+ * 宸ヨ祫瀹氶蹇収
+ *
+ * 璁℃椂锛氬厓/灏忔椂锛涜浠讹細鍏�/浠�
+ */
+ private BigDecimal wageRate;
+ /**
+ * 鍛戒腑鐨勫伐搴忓伐璧勫崟浠疯鍒欑紪鍙凤紝绌�=浣跨敤宸ュ簭榛樿宸ヨ祫瀹氶
+ *
+ * 鍏宠仈 {@link cn.iocoder.yudao.module.mes.dal.dataobject.pro.wage.MesProProcessWageRuleDO#getId()}
+ */
+ private Long wageRuleId;
+ /**
+ * 璐ㄩ噺鍚堟牸鐜囷紙%锛夛紝浠呰川妫�宸ュ簭
+ */
+ private BigDecimal qualityPassRate;
+ /**
+ * 璐ㄩ噺绯绘暟锛屼粎璐ㄦ宸ュ簭涓斿懡涓�滃悎鏍肩巼绯绘暟鈥濊鍒�
+ */
+ private BigDecimal qualityCoefficient;
+ /**
+ * 璐ㄩ噺鎵f锛屼粎璐ㄦ宸ュ簭涓斿懡涓�滀笉鍚堟牸鎵f鈥濊鍒�
+ */
+ private BigDecimal qualityDeduction;
+ /**
+ * 鏈鎶ュ伐宸ユ椂锛堝皬鏃讹級
+ *
+ * 璁℃椂璁¤柂鐨勫伐搴忓繀濉�
+ */
+ private BigDecimal workHours;
+ /**
+ * 鏈鎶ュ伐宸ヨ祫
+ *
+ * 璁℃椂 = 宸ユ椂 脳 宸ヨ祫瀹氶锛涜浠� = 鎶ュ伐鏁伴噺 脳 宸ヨ祫瀹氶
+ */
+ private BigDecimal wageAmount;
+ /**
+ * 杈呭姪璁¤柂宸ユ椂锛堝皬鏃讹級
+ */
+ private BigDecimal auxPaidHours;
+ /**
+ * 鏈杈呭姪宸ヨ祫
+ */
+ private BigDecimal auxWageAmount;
+ /**
+ * 宸ヨ祫璁$畻鏄庣粏蹇収锛圝SON锛�
+ */
+ private String wageBreakdown;
+ /**
+ * 鏈鐢熶骇闀垮害锛堢背锛夛紝浠呯敤浜庤绠楁爣鍑嗗伐鏃�
+ */
+ private BigDecimal productionLength;
+ /**
+ * 鏍囧噯宸ユ椂锛堝皬鏃讹級锛屽彧鐢ㄤ簬鑰冩牳瀵规瘮锛屼笉鍙備笌宸ヨ祫璁$畻
+ */
+ private BigDecimal standardWorkHours;
+ /**
+ * 鏍囧噯宸ユ椂-涓诲伐鏃讹紙灏忔椂锛�
+ */
+ private BigDecimal standardPrimaryHours;
+ /**
+ * 鏍囧噯宸ユ椂-杈呭姪宸ユ椂锛堝皬鏃讹級
+ */
+ private BigDecimal standardAuxHours;
+ /**
+ * 鏍囧噯宸ユ椂璁$畻渚濇嵁蹇収
+ */
+ private String stdCalcNote;
+ /**
* 瀹℃牳鐢ㄦ埛缂栧彿
*
* 鍏宠仈 AdminUserDO#getId()
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/process/MesProProcessDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/process/MesProProcessDO.java
index 4c8a24a..8c7e783 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/process/MesProProcessDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/process/MesProProcessDO.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
+import java.math.BigDecimal;
+
/**
* MES 鐢熶骇宸ュ簭 DO
*
@@ -39,6 +41,56 @@
*/
private String attention;
/**
+ * 璁¤垂绫诲瀷
+ *
+ * 鏋氫妇 {@link cn.iocoder.yudao.module.mes.enums.pro.MesProProcessBillingTypeEnum}
+ */
+ private Integer billingType;
+ /**
+ * 宸ヨ祫瀹氶
+ *
+ * 璁℃椂锛氬厓/灏忔椂锛涜浠讹細鍏�/浠�
+ */
+ private BigDecimal wageRate;
+ /**
+ * 杈呭姪宸ユ椂灏忔椂宸ヨ祫锛堝厓/灏忔椂锛�
+ *
+ * 杈呭姪鏄庣粏鏈崟鐙厤缃崟浠锋椂锛屾寜姝ゅ崟浠疯钖紱璁′欢宸ュ簭蹇呴』閰嶇疆鎵嶈兘璁$畻杈呭姪宸ヨ祫
+ */
+ private BigDecimal auxHourlyRate;
+ /**
+ * 鏍囧噯宸ユ椂璁$畻鏂瑰紡
+ *
+ * 0-鏈惎鐢� 1-杞�熋楄妭璺� 2-绾块�熷害鐩村彇 3-婊¢�熺櫨鍒嗘瘮脳鑺傝窛
+ */
+ private Integer stdTimeMode;
+ /**
+ * 鏍囧噯宸ユ椂鎶樼畻绯绘暟
+ *
+ * 鏉熶笣鎸� 1.8锛屽叾浣欏伐搴忔寜 1
+ */
+ private BigDecimal stdTimeFactor;
+ /**
+ * 鏈哄彴婊¤浆閫燂紙r/min锛夛紝鏂瑰紡 3 浣跨敤
+ */
+ private BigDecimal maxRpm;
+ /**
+ * 杞�熷弬鏁扮紪鐮�
+ */
+ private String stdRpmParamCode;
+ /**
+ * 鑺傝窛鍙傛暟缂栫爜
+ */
+ private String stdPitchParamCode;
+ /**
+ * 绾块�熷害锛堢背/鍒嗭級鍙傛暟缂栫爜锛屾柟寮� 2 浣跨敤
+ */
+ private String stdSpeedParamCode;
+ /**
+ * 杞�熺櫨鍒嗘瘮鍙傛暟缂栫爜锛屾柟寮� 3 浣跨敤
+ */
+ private String stdPercentParamCode;
+ /**
* 鐘舵��
*
* 鏋氫妇 {@link cn.iocoder.yudao.framework.common.enums.CommonStatusEnum}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/wage/MesProProcessWageFieldDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/wage/MesProProcessWageFieldDO.java
new file mode 100644
index 0000000..ef1a96b
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/wage/MesProProcessWageFieldDO.java
@@ -0,0 +1,96 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.pro.wage;
+
+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.*;
+
+import java.math.BigDecimal;
+
+/**
+ * MES 宸ュ簭宸ヨ祫瀛楁 DO
+ *
+ * <p>姣忎釜宸ュ簭鍙淮鎶よ嫢骞蹭笌宸ヨ祫鐩稿叧鐨勮嚜瀹氫箟瀛楁锛屽瓧娈靛�间负宸ュ簭绾у浐瀹氬�笺��
+ * 鎶ュ伐鏃舵寜 {@link #calcRole} 鍙備笌宸ヨ祫璁$畻锛屽苟鏁翠綋蹇収鍒版姤宸ュ崟銆�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_pro_process_wage_field")
+@KeySequence("mes_pro_process_wage_field_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesProProcessWageFieldDO extends BaseDO {
+
+ /** 瀛楁绫诲瀷锛氭暟鍊� */
+ public static final int FIELD_TYPE_NUMBER = 1;
+ /** 瀛楁绫诲瀷锛氭枃鏈� */
+ public static final int FIELD_TYPE_TEXT = 2;
+ /** 瀛楁绫诲瀷锛氫笅鎷� */
+ public static final int FIELD_TYPE_SELECT = 3;
+ /** 瀛楁绫诲瀷锛氬竷灏� */
+ public static final int FIELD_TYPE_BOOLEAN = 4;
+
+ /** 璁$畻瑙掕壊锛氱郴鏁帮紙杩炰箻锛� */
+ public static final int CALC_ROLE_COEFFICIENT = 1;
+ /** 璁$畻瑙掕壊锛氬姞鍑忛噾棰� */
+ public static final int CALC_ROLE_AMOUNT = 2;
+ /** 璁$畻瑙掕壊锛氳浠锋暟閲忥紙鏁伴噺 脳 鍗曚环锛� */
+ public static final int CALC_ROLE_QUANTITY_PRICE = 3;
+ /** 璁$畻瑙掕壊锛氫粎璁板綍锛屼笉鍙備笌璁$畻 */
+ public static final int CALC_ROLE_RECORD_ONLY = 4;
+
+ @TableId
+ private Long id;
+ /**
+ * 宸ュ簭缂栧彿
+ *
+ * 鍏宠仈 {@link cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO#getId()}
+ */
+ private Long processId;
+ /**
+ * 瀛楁缂栫爜锛屽伐搴忓唴鍞竴
+ */
+ private String fieldCode;
+ /**
+ * 瀛楁鍚嶇О
+ */
+ private String fieldName;
+ /**
+ * 瀛楁绫诲瀷锛�1-鏁板�� 2-鏂囨湰 3-涓嬫媺 4-甯冨皵
+ */
+ private Integer fieldType;
+ /**
+ * 鍗曚綅
+ */
+ private String unit;
+ /**
+ * 宸ュ簭绾у浐瀹氬��
+ */
+ private String fieldValue;
+ /**
+ * 璁$畻瑙掕壊锛�1-绯绘暟 2-鍔犲噺閲戦 3-璁′环鏁伴噺 4-浠呰褰�
+ */
+ private Integer calcRole;
+ /**
+ * 璁′环鏁伴噺鏃剁殑鍗曚环
+ */
+ private BigDecimal unitPrice;
+ /**
+ * 鎺掑簭
+ */
+ private Integer sort;
+ /**
+ * 鐘舵��
+ */
+ private Integer status;
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/wage/MesProProcessWageRuleDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/wage/MesProProcessWageRuleDO.java
new file mode 100644
index 0000000..a7b1556
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/wage/MesProProcessWageRuleDO.java
@@ -0,0 +1,73 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.pro.wage;
+
+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.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * MES 宸ュ簭宸ヨ祫鍗曚环瑙勫垯 DO
+ *
+ * <p>鎸夈�屽伐搴� + 宸ヨ壓璺嚎 + 璁惧銆嶇淮搴﹁鐩栧伐搴忛粯璁ゅ伐璧勫畾棰濄��
+ * 鍖归厤浼樺厛绾э細宸ュ簭+璺嚎+璁惧 > 宸ュ簭+璺嚎 > 宸ュ簭+璁惧 > 宸ュ簭榛樿銆�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_pro_process_wage_rule")
+@KeySequence("mes_pro_process_wage_rule_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesProProcessWageRuleDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /**
+ * 宸ュ簭缂栧彿
+ */
+ private Long processId;
+ /**
+ * 宸ヨ壓璺嚎缂栧彿锛岀┖=涓嶉檺璺嚎
+ */
+ private Long routeId;
+ /**
+ * 璁惧缂栧彿锛岀┖=涓嶉檺璁惧
+ */
+ private Long machineryId;
+ /**
+ * 璁¤垂绫诲瀷锛�1-璁℃椂 2-璁′欢
+ */
+ private Integer billingType;
+ /**
+ * 宸ヨ祫鍗曚环锛氳鏃�=鍏�/灏忔椂锛岃浠�=鍏�/浠�
+ */
+ private BigDecimal wageRate;
+ /**
+ * 鐢熸晥寮�濮嬫棩鏈燂紝绌�=涓嶉檺
+ */
+ private LocalDate effectiveFrom;
+ /**
+ * 鐢熸晥缁撴潫鏃ユ湡锛岀┖=涓嶉檺
+ */
+ private LocalDate effectiveTo;
+ /**
+ * 浼樺厛绾э紝瓒婂ぇ瓒婁紭鍏�
+ */
+ private Integer priority;
+ /**
+ * 鐘舵��
+ */
+ private Integer status;
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/wage/MesProWageQualityRuleDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/wage/MesProWageQualityRuleDO.java
new file mode 100644
index 0000000..7245376
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/wage/MesProWageQualityRuleDO.java
@@ -0,0 +1,76 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.pro.wage;
+
+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.*;
+
+import java.math.BigDecimal;
+
+/**
+ * MES 璐ㄩ噺宸ヨ祫瑙勫垯 DO
+ *
+ * <p>鎸夎繃绋嬫楠屽悎鏍肩巼鍖洪棿璋冩暣鎶ュ伐宸ヨ祫锛氱郴鏁拌繛涔樻垨鎸変笉鍚堟牸鏁伴噺鎵f銆�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_pro_wage_quality_rule")
+@KeySequence("mes_pro_wage_quality_rule_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesProWageQualityRuleDO extends BaseDO {
+
+ /** 瑙勫垯绫诲瀷锛氬悎鏍肩巼绯绘暟 */
+ public static final int RULE_TYPE_COEFFICIENT = 1;
+ /** 瑙勫垯绫诲瀷锛氫笉鍚堟牸鎵f */
+ public static final int RULE_TYPE_DEDUCTION = 2;
+
+ @TableId
+ private Long id;
+ /**
+ * 宸ュ簭缂栧彿
+ */
+ private Long processId;
+ /**
+ * 宸ヨ壓璺嚎缂栧彿锛岀┖=涓嶉檺璺嚎
+ */
+ private Long routeId;
+ /**
+ * 瑙勫垯绫诲瀷锛�1-鍚堟牸鐜囩郴鏁� 2-涓嶅悎鏍兼墸娆�
+ */
+ private Integer ruleType;
+ /**
+ * 鍚堟牸鐜囦笅闄愶紙鍚級锛岀櫨鍒嗘瘮
+ */
+ private BigDecimal minRate;
+ /**
+ * 鍚堟牸鐜囦笂闄愶紙涓嶅惈锛夛紝鐧惧垎姣旓紱100 琛ㄧず鏃犱笂闄�
+ */
+ private BigDecimal maxRate;
+ /**
+ * 绯绘暟
+ */
+ private BigDecimal coefficient;
+ /**
+ * 姣忎欢鎵f
+ */
+ private BigDecimal deductionPerUnit;
+ /**
+ * 浼樺厛绾э紝瓒婂ぇ瓒婁紭鍏�
+ */
+ private Integer priority;
+ /**
+ * 鐘舵��
+ */
+ private Integer status;
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/worktime/MesProWorktimeAuxDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/worktime/MesProWorktimeAuxDO.java
new file mode 100644
index 0000000..8ed14a3
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/worktime/MesProWorktimeAuxDO.java
@@ -0,0 +1,119 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.pro.worktime;
+
+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.*;
+
+import java.math.BigDecimal;
+
+/**
+ * MES 杈呭姪宸ユ椂閰嶇疆 DO
+ *
+ * <p>鎶ュ伐鏃舵寜鈥滆緟鍔╅」鐩� + 娆℃暟鈥濇姌绠楁垚杈呭姪宸ユ椂锛屼粎鐢ㄤ簬璁$畻鏍囧噯宸ユ椂锛堣�冩牳瀵规瘮锛夛紝涓嶅弬涓庡伐璧勩��
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_pro_worktime_aux")
+@KeySequence("mes_pro_worktime_aux_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesProWorktimeAuxDO extends BaseDO {
+
+ /**
+ * 璁¢噺鏂瑰紡锛氭寜娆�
+ */
+ public static final int MEASURE_TIMES = 1;
+ /**
+ * 璁¢噺鏂瑰紡锛氭寜涓�
+ */
+ public static final int MEASURE_PIECES = 2;
+ /**
+ * 璁¢噺鏂瑰紡锛氭寜鐩�
+ */
+ public static final int MEASURE_REELS = 3;
+ /**
+ * 璁¢噺鏂瑰紡锛氭寜绫虫姌绠楋紙鏃堕棿 = 绫虫暟 梅 閫熷害锛�
+ */
+ public static final int MEASURE_METERS = 4;
+
+ /**
+ * 杈呭姪璁¤柂鏂瑰紡锛氫笉璁¤柂
+ */
+ public static final int WAGE_MODE_NONE = 0;
+ /**
+ * 杈呭姪璁¤柂鏂瑰紡锛氭寜宸ュ簭杈呭姪灏忔椂宸ヨ祫
+ */
+ public static final int WAGE_MODE_PROCESS = 1;
+ /**
+ * 杈呭姪璁¤柂鏂瑰紡锛氭寜鏈」鍗曚环
+ */
+ public static final int WAGE_MODE_ITEM = 2;
+
+ @TableId
+ private Long id;
+ /**
+ * 宸ュ簭缂栧彿
+ */
+ private Long processId;
+ /**
+ * 宸ヤ綔绔欙紙鏈哄彴锛夌紪鍙凤紝绌�=涓嶉檺鏈哄彴
+ */
+ private Long workstationId;
+ /**
+ * 杈呭姪椤圭洰缂栫爜
+ */
+ private String itemCode;
+ /**
+ * 杈呭姪椤圭洰鍚嶇О
+ */
+ private String itemName;
+ /**
+ * 璁¢噺鏂瑰紡锛�1-鎸夋 2-鎸変釜 3-鎸夌洏 4-鎸夌背鎶樼畻
+ */
+ private Integer measureType;
+ /**
+ * 杈呭姪璁¤柂鏂瑰紡
+ *
+ * 0-涓嶈钖� 1-鎸夊伐搴忚緟鍔╁皬鏃跺伐璧� 2-鎸夋湰椤瑰崟浠�
+ */
+ private Integer wageMode;
+ /**
+ * 鏈」杈呭姪灏忔椂宸ヨ祫锛堝厓/灏忔椂锛夛紝wageMode=2 鏃朵娇鐢�
+ */
+ private BigDecimal wageRate;
+ /**
+ * 鍗曟/鍗曚釜/鍗曠洏鍒嗛挓鏁帮紙鏂瑰紡 1-3 浣跨敤锛�
+ */
+ private BigDecimal durationMinutes;
+ /**
+ * 鎶樼畻閫熷害锛堢背/鍒嗭級锛屾柟寮� 4 浣跨敤锛氭椂闂� = 绫虫暟 梅 閫熷害
+ */
+ private BigDecimal speedMPerMin;
+ /**
+ * 鎹㈣壊/鎹㈡枡璧峰鏉愭枡
+ */
+ private String materialFrom;
+ /**
+ * 鎹㈣壊/鎹㈡枡鐩爣鏉愭枡
+ */
+ private String materialTo;
+ /**
+ * 鐘舵��
+ */
+ private Integer status;
+ /**
+ * 鎺掑簭
+ */
+ private Integer sort;
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ipqc/MesQcIpqcWageFieldDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ipqc/MesQcIpqcWageFieldDO.java
new file mode 100644
index 0000000..08f1098
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ipqc/MesQcIpqcWageFieldDO.java
@@ -0,0 +1,98 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.wage.MesProProcessWageFieldDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.math.BigDecimal;
+
+/**
+ * MES 杩囩▼妫�楠屽崟-宸ヨ祫瀛楁鍊� DO
+ *
+ * <p>杩囩▼妫�楠屽崟鎸夊伐搴忓甫鍑鸿宸ュ簭缁存姢鐨勮嚜瀹氫箟宸ヨ祫瀛楁锛岀敱璐ㄦ閮ㄩ棬鍦ㄦ楠屾椂濉啓銆�
+ * 鎶ュ伐瀹℃壒閲嶇畻宸ヨ祫鏃朵紭鍏堝彇杩欓噷鐨勫�硷紝鏈~鍐欐墠鍥為��宸ュ簭涓婄殑鍥哄畾鍊笺��
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_qc_ipqc_wage_field")
+@KeySequence("mes_qc_ipqc_wage_field_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesQcIpqcWageFieldDO extends BaseDO {
+
+ /**
+ * 缂栧彿
+ */
+ @TableId
+ private Long id;
+ /**
+ * 杩囩▼妫�楠屽崟 ID
+ *
+ * 鍏宠仈 {@link MesQcIpqcDO#getId()}
+ */
+ private Long ipqcId;
+ /**
+ * 宸ュ簭宸ヨ祫瀛楁 ID
+ *
+ * 鍏宠仈 {@link MesProProcessWageFieldDO#getId()}
+ */
+ private Long fieldId;
+ /**
+ * 瀛楁缂栫爜锛屽啑浣�
+ *
+ * 鍐椾綑 {@link MesProProcessWageFieldDO#getFieldCode()}
+ */
+ private String fieldCode;
+ /**
+ * 瀛楁鍚嶇О锛屽啑浣�
+ *
+ * 鍐椾綑 {@link MesProProcessWageFieldDO#getFieldName()}
+ */
+ private String fieldName;
+ /**
+ * 瀛楁绫诲瀷锛屽啑浣�
+ *
+ * 鍐椾綑 {@link MesProProcessWageFieldDO#getFieldType()}
+ */
+ private Integer fieldType;
+ /**
+ * 鍗曚綅锛屽啑浣�
+ *
+ * 鍐椾綑 {@link MesProProcessWageFieldDO#getUnit()}
+ */
+ private String unit;
+ /**
+ * 璁$畻瑙掕壊锛屽啑浣�
+ *
+ * 鍐椾綑 {@link MesProProcessWageFieldDO#getCalcRole()}
+ */
+ private Integer calcRole;
+ /**
+ * 璁′环鏁伴噺鍗曚环锛屽啑浣�
+ *
+ * 鍐椾綑 {@link MesProProcessWageFieldDO#getUnitPrice()}
+ */
+ private BigDecimal unitPrice;
+ /**
+ * 璐ㄦ濉啓鐨勫瓧娈靛��
+ */
+ private String value;
+ /**
+ * 鎺掑簭锛屽啑浣�
+ *
+ * 鍐椾綑 {@link MesProProcessWageFieldDO#getSort()}
+ */
+ private Integer sort;
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ncr/MesQcNcrDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ncr/MesQcNcrDO.java
index 181788c..7dc778a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ncr/MesQcNcrDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ncr/MesQcNcrDO.java
@@ -87,7 +87,7 @@
// ========== 璇勫淇℃伅 ==========
/**
- * 澶勭疆鏂瑰紡锛堥��璐�/鎶ュ簾/杩斿伐/璁╂鎺ユ敹/闄嶇骇浣跨敤锛�
+ * 澶勭疆鏂瑰紡锛堥��璐�/鎶ュ簾/杩斿伐/璁╂鏀捐/闄嶇骇浣跨敤/杩斾慨锛�
*
* 瀛楀吀 {@link DictTypeConstants#MES_NCR_DISPOSITION}
* 鏋氫妇 {@link MesNcrDispositionEnum}
@@ -158,14 +158,14 @@
// ========== 鐘舵�佷笌娴佺▼ ==========
/**
- * 鐘舵�侊紙寰呰瘎瀹�/宸茶瘎瀹�/宸插缃�/宸插叧闂級
+ * 鐘舵�侊紙寰呰瘎瀹�/瀹℃壒涓�/宸茶瘎瀹�/宸插缃�/宸插叧闂級
*
* 瀛楀吀 {@link DictTypeConstants#MES_NCR_STATUS}
* 鏋氫妇 {@link MesNcrStatusEnum}
*/
private Integer status;
/**
- * BPM 娴佺▼瀹炰緥 ID锛堥鐣欙級
+ * BPM 娴佺▼瀹炰緥 ID
*/
private String processInstanceId;
/**
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/patrol/MesQcPatrolDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/patrol/MesQcPatrolDO.java
new file mode 100644
index 0000000..0716b4d
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/patrol/MesQcPatrolDO.java
@@ -0,0 +1,77 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.qc.patrol;
+
+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.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * MES 璐ㄩ噺宸℃璁板綍 DO
+ *
+ * 宸℃鏄嫭绔嬭褰曪紝涓嶇敓鎴愬簱瀛樹笟鍔″崟鎹紝涔熶笉褰卞搷鍏ュ簱銆�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_qc_patrol")
+@KeySequence("mes_qc_patrol_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesQcPatrolDO extends BaseDO {
+
+ /**
+ * 缂栧彿
+ */
+ @TableId
+ private Long id;
+ /**
+ * 宸℃鍗曠紪鍙�
+ */
+ private String code;
+ /**
+ * 宸℃鍗曞悕绉�
+ */
+ private String name;
+ /**
+ * 浜у搧鐗╂枡缂栧彿
+ */
+ private Long itemId;
+ /**
+ * 鐩樺彿
+ */
+ private String reelNo;
+ /**
+ * 鎵规鍙�
+ */
+ private String batchCode;
+ /**
+ * 鍚堟牸鏁伴噺
+ */
+ private BigDecimal qualifiedQuantity;
+ /**
+ * 涓嶅悎鏍兼暟閲�
+ */
+ private BigDecimal unqualifiedQuantity;
+ /**
+ * 宸℃鏃ユ湡
+ */
+ private LocalDateTime inspectDate;
+ /**
+ * 宸℃浜哄憳缂栧彿
+ *
+ * 鍏宠仈 system_users 鐨勭紪鍙�
+ */
+ private Long inspectorUserId;
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/template/MesQcTemplateProcessDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/template/MesQcTemplateProcessDO.java
new file mode 100644
index 0000000..e06e409
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/template/MesQcTemplateProcessDO.java
@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.qc.template;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+/**
+ * MES 璐ㄦ鏂规-宸ュ簭缁戝畾 DO
+ *
+ * <p>缁存姢宸ュ簭榛樿浣跨敤鐨勮川妫�鏂规锛屾柊寤鸿繃绋嬫楠岄�夋嫨宸ュ簭鏃舵寜姝ゅ甫鍑烘娴嬫寚鏍囧瓧娈点��
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_qc_template_process")
+@KeySequence("mes_qc_template_process_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesQcTemplateProcessDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /**
+ * 宸ュ簭缂栧彿
+ *
+ * 鍏宠仈 {@link MesProProcessDO#getId()}
+ */
+ private Long processId;
+ /**
+ * 璐ㄦ鏂规缂栧彿
+ *
+ * 鍏宠仈 {@link MesQcTemplateDO#getId()}
+ */
+ private Long templateId;
+ /**
+ * 璐ㄦ绉嶇被
+ *
+ * 鏋氫妇 {@link cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum}
+ */
+ private Integer qcType;
+ /**
+ * 鏄惁榛樿鏂规
+ */
+ private Boolean defaultFlag;
+ /**
+ * 鎺掑簭
+ */
+ private Integer sort;
+ /**
+ * 鐘舵�侊細0-鍚敤 1-绂佺敤
+ */
+ private Integer status;
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/salesnotice/MesWmSalesNoticeDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/salesnotice/MesWmSalesNoticeDO.java
index 4c69b80..6181009 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/salesnotice/MesWmSalesNoticeDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/salesnotice/MesWmSalesNoticeDO.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import cn.iocoder.yudao.module.mes.enums.DictTypeConstants;
@@ -66,6 +67,24 @@
*/
private String recipientAddress;
/**
+ * 鐗╂祦鍏徃
+ */
+ private String logisticsCompany;
+ /**
+ * 蹇�掕垂
+ */
+ private BigDecimal expressFee;
+ /**
+ * 寮�绁ㄧ姸鎬�
+ *
+ * 0 鏈紑绁� 1 閮ㄥ垎寮�绁� 2 宸插紑绁�
+ */
+ private Integer invoiceStatus;
+ /**
+ * BPM 娴佺▼瀹炰緥缂栧彿
+ */
+ private String processInstanceId;
+ /**
* 鐘舵��
*
* 瀛楀吀 {@link DictTypeConstants#MES_WM_SALES_NOTICE_STATUS}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/stocktaking/task/MesWmStockTakingTaskDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/stocktaking/task/MesWmStockTakingTaskDO.java
index 7681c84..b16c049 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/stocktaking/task/MesWmStockTakingTaskDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/stocktaking/task/MesWmStockTakingTaskDO.java
@@ -85,6 +85,11 @@
private LocalDateTime endTime;
/**
+ * 鐩樼偣宸紓鏄惁宸茬粡鍐欏叆搴撳瓨浜嬪姟銆�
+ */
+ private Boolean differenceProcessed;
+
+ /**
* 浠诲姟鐘舵��
*
* 瀛楀吀 {@link DictTypeConstants#MES_WM_STOCK_TAKING_TASK_STATUS}
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 f574a36..0a88af9 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
@@ -67,6 +67,13 @@
* 鏉ユ簮涓氬姟琛� ID
*/
private Long bizLineId;
+ /**
+ * 鐢熶骇璁㈠崟锛堝伐鍗曪級ID
+ *
+ * 鍏宠仈 {@link cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO#getId()}
+ * 鐢熶骇棰嗘枡銆佺敓浜ч��鏂欍�佺敓浜у叆搴撱�佺敓浜ф秷鑰椼�佷骇鍝佷骇鍑虹瓑鐢熶骇鐩稿叧娴佹按鍐椾綑璁板綍锛屼究浜庡嚭搴撳彴璐︽寜鐢熶骇璁㈠崟杩芥函銆�
+ */
+ private Long workOrderId;
/**
* 搴撳瓨璁板綍 ID
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/holiday/MesCalHolidayMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/holiday/MesCalHolidayMapper.java
deleted file mode 100644
index ec9f229..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/holiday/MesCalHolidayMapper.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package cn.iocoder.yudao.module.mes.dal.mysql.cal.holiday;
-
-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.cal.holiday.MesCalHolidayDO;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * MES 鍋囨湡璁剧疆 Mapper
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@Mapper
-public interface MesCalHolidayMapper extends BaseMapperX<MesCalHolidayDO> {
-
- default MesCalHolidayDO selectByDay(LocalDateTime day) {
- return selectOne(MesCalHolidayDO::getDay, day);
- }
-
- default List<MesCalHolidayDO> selectList(LocalDateTime startDay, LocalDateTime endDay) {
- return selectList(new LambdaQueryWrapperX<MesCalHolidayDO>()
- .betweenIfPresent(MesCalHolidayDO::getDay, startDay, endDay)
- .orderByAsc(MesCalHolidayDO::getDay));
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanMapper.java
deleted file mode 100644
index a029663..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanMapper.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package cn.iocoder.yudao.module.mes.dal.mysql.cal.plan;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.MesCalPlanPageReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanDO;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * MES 鎺掔彮璁″垝 Mapper
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@Mapper
-public interface MesCalPlanMapper extends BaseMapperX<MesCalPlanDO> {
-
- default PageResult<MesCalPlanDO> selectPage(MesCalPlanPageReqVO reqVO) {
- return selectPage(reqVO, new LambdaQueryWrapperX<MesCalPlanDO>()
- .likeIfPresent(MesCalPlanDO::getCode, reqVO.getCode())
- .likeIfPresent(MesCalPlanDO::getName, reqVO.getName())
- .eqIfPresent(MesCalPlanDO::getShiftType, reqVO.getShiftType())
- .eqIfPresent(MesCalPlanDO::getStatus, reqVO.getStatus())
- .eqIfPresent(MesCalPlanDO::getCalendarType, reqVO.getCalendarType())
- .betweenIfPresent(MesCalPlanDO::getStartDate, reqVO.getStartDate())
- .betweenIfPresent(MesCalPlanDO::getEndDate, reqVO.getEndDate())
- .orderByDesc(MesCalPlanDO::getId));
- }
-
- default MesCalPlanDO selectByCode(String code) {
- return selectOne(MesCalPlanDO::getCode, code);
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanShiftMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanShiftMapper.java
deleted file mode 100644
index a8668a4..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanShiftMapper.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package cn.iocoder.yudao.module.mes.dal.mysql.cal.plan;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.shift.MesCalPlanShiftPageReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanShiftDO;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * MES 璁″垝鐝 Mapper
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@Mapper
-public interface MesCalPlanShiftMapper extends BaseMapperX<MesCalPlanShiftDO> {
-
- default PageResult<MesCalPlanShiftDO> selectPage(MesCalPlanShiftPageReqVO reqVO) {
- return selectPage(reqVO, new LambdaQueryWrapperX<MesCalPlanShiftDO>()
- .eqIfPresent(MesCalPlanShiftDO::getPlanId, reqVO.getPlanId())
- .likeIfPresent(MesCalPlanShiftDO::getName, reqVO.getName())
- .orderByAsc(MesCalPlanShiftDO::getSort));
- }
-
- default List<MesCalPlanShiftDO> selectListByPlanId(Long planId) {
- return selectList(new LambdaQueryWrapperX<MesCalPlanShiftDO>()
- .eq(MesCalPlanShiftDO::getPlanId, planId)
- .orderByAsc(MesCalPlanShiftDO::getSort));
- }
-
- default Long selectCountByPlanId(Long planId) {
- return selectCount(MesCalPlanShiftDO::getPlanId, planId);
- }
-
- default void deleteByPlanId(Long planId) {
- delete(new LambdaQueryWrapperX<MesCalPlanShiftDO>()
- .eq(MesCalPlanShiftDO::getPlanId, planId));
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanTeamMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanTeamMapper.java
deleted file mode 100644
index 7ebbc6a..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanTeamMapper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package cn.iocoder.yudao.module.mes.dal.mysql.cal.plan;
-
-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.cal.plan.MesCalPlanTeamDO;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * MES 璁″垝鐝粍鍏宠仈 Mapper
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@Mapper
-public interface MesCalPlanTeamMapper extends BaseMapperX<MesCalPlanTeamDO> {
-
- default List<MesCalPlanTeamDO> selectListByPlanId(Long planId) {
- return selectList(new LambdaQueryWrapperX<MesCalPlanTeamDO>()
- .eq(MesCalPlanTeamDO::getPlanId, planId)
- .orderByDesc(MesCalPlanTeamDO::getId));
- }
-
- default Long selectCountByPlanId(Long planId) {
- return selectCount(MesCalPlanTeamDO::getPlanId, planId);
- }
-
- default MesCalPlanTeamDO selectByPlanIdAndTeamId(Long planId, Long teamId) {
- return selectOne(new LambdaQueryWrapperX<MesCalPlanTeamDO>()
- .eq(MesCalPlanTeamDO::getPlanId, planId)
- .eq(MesCalPlanTeamDO::getTeamId, teamId));
- }
-
- default void deleteByPlanId(Long planId) {
- delete(new LambdaQueryWrapperX<MesCalPlanTeamDO>()
- .eq(MesCalPlanTeamDO::getPlanId, planId));
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/team/MesCalTeamMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/team/MesCalTeamMapper.java
deleted file mode 100644
index c855aae..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/team/MesCalTeamMapper.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package cn.iocoder.yudao.module.mes.dal.mysql.cal.team;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.MesCalTeamPageReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.team.MesCalTeamDO;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * MES 鐝粍 Mapper
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@Mapper
-public interface MesCalTeamMapper extends BaseMapperX<MesCalTeamDO> {
-
- default PageResult<MesCalTeamDO> selectPage(MesCalTeamPageReqVO reqVO) {
- return selectPage(reqVO, new LambdaQueryWrapperX<MesCalTeamDO>()
- .likeIfPresent(MesCalTeamDO::getCode, reqVO.getCode())
- .likeIfPresent(MesCalTeamDO::getName, reqVO.getName())
- .eqIfPresent(MesCalTeamDO::getCalendarType, reqVO.getCalendarType())
- .orderByDesc(MesCalTeamDO::getId));
- }
-
- default MesCalTeamDO selectByCode(String code) {
- return selectOne(MesCalTeamDO::getCode, code);
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/team/MesCalTeamMemberMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/team/MesCalTeamMemberMapper.java
deleted file mode 100644
index 22dcefe..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/team/MesCalTeamMemberMapper.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package cn.iocoder.yudao.module.mes.dal.mysql.cal.team;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.member.MesCalTeamMemberPageReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.team.MesCalTeamMemberDO;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * MES 鐝粍鎴愬憳 Mapper
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@Mapper
-public interface MesCalTeamMemberMapper extends BaseMapperX<MesCalTeamMemberDO> {
-
- default PageResult<MesCalTeamMemberDO> selectPage(MesCalTeamMemberPageReqVO reqVO) {
- return selectPage(reqVO, new LambdaQueryWrapperX<MesCalTeamMemberDO>()
- .eqIfPresent(MesCalTeamMemberDO::getTeamId, reqVO.getTeamId())
- .orderByDesc(MesCalTeamMemberDO::getId));
- }
-
- default List<MesCalTeamMemberDO> selectListByTeamId(Long teamId) {
- return selectList(MesCalTeamMemberDO::getTeamId, teamId);
- }
-
- default List<MesCalTeamMemberDO> selectListByTeamIds(Collection<Long> teamIds) {
- return selectList(MesCalTeamMemberDO::getTeamId, teamIds);
- }
-
- default MesCalTeamMemberDO selectByUserId(Long userId) {
- return selectOne(MesCalTeamMemberDO::getUserId, userId);
- }
-
- default void deleteByTeamId(Long teamId) {
- delete(MesCalTeamMemberDO::getTeamId, teamId);
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/team/MesCalTeamShiftMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/team/MesCalTeamShiftMapper.java
deleted file mode 100644
index 891f045..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/team/MesCalTeamShiftMapper.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package cn.iocoder.yudao.module.mes.dal.mysql.cal.team;
-
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.shift.MesCalTeamShiftListReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.team.MesCalTeamShiftDO;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * MES 鐝粍鎺掔彮 Mapper
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@Mapper
-public interface MesCalTeamShiftMapper extends BaseMapperX<MesCalTeamShiftDO> {
-
- default List<MesCalTeamShiftDO> selectList(MesCalTeamShiftListReqVO reqVO) {
- return selectList(new LambdaQueryWrapperX<MesCalTeamShiftDO>()
- .eqIfPresent(MesCalTeamShiftDO::getTeamId, reqVO.getTeamId())
- .inIfPresent(MesCalTeamShiftDO::getTeamId, reqVO.getTeamIds())
- .eqIfPresent(MesCalTeamShiftDO::getPlanId, reqVO.getPlanId())
- .geIfPresent(MesCalTeamShiftDO::getDay, reqVO.getStartDay())
- .leIfPresent(MesCalTeamShiftDO::getDay, reqVO.getEndDay())
- .orderByAsc(MesCalTeamShiftDO::getDay)
- .orderByAsc(MesCalTeamShiftDO::getSort));
- }
-
- default List<MesCalTeamShiftDO> selectListByPlanId(Long planId) {
- return selectList(MesCalTeamShiftDO::getPlanId, planId);
- }
-
- default void deleteByPlanId(Long planId) {
- delete(MesCalTeamShiftDO::getPlanId, planId);
- }
-
- default void deleteByTeamId(Long teamId) {
- delete(MesCalTeamShiftDO::getTeamId, teamId);
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/feedback/MesProFeedbackAuxMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/feedback/MesProFeedbackAuxMapper.java
new file mode 100644
index 0000000..c4de2aa
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/feedback/MesProFeedbackAuxMapper.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.pro.feedback;
+
+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.pro.feedback.MesProFeedbackAuxDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * MES 鎶ュ伐杈呭姪宸ユ椂鏄庣粏 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesProFeedbackAuxMapper extends BaseMapperX<MesProFeedbackAuxDO> {
+
+ default List<MesProFeedbackAuxDO> selectListByFeedbackId(Long feedbackId) {
+ return selectList(new LambdaQueryWrapperX<MesProFeedbackAuxDO>()
+ .eq(MesProFeedbackAuxDO::getFeedbackId, feedbackId)
+ .orderByAsc(MesProFeedbackAuxDO::getId));
+ }
+
+ default List<MesProFeedbackAuxDO> selectListByFeedbackIds(Collection<Long> feedbackIds) {
+ return selectList(new LambdaQueryWrapperX<MesProFeedbackAuxDO>()
+ .in(MesProFeedbackAuxDO::getFeedbackId, feedbackIds)
+ .orderByAsc(MesProFeedbackAuxDO::getId));
+ }
+
+ default Long selectCountByAuxItemId(Long auxItemId) {
+ return selectCount(new LambdaQueryWrapperX<MesProFeedbackAuxDO>()
+ .eq(MesProFeedbackAuxDO::getAuxItemId, auxItemId));
+ }
+
+ default void deleteByFeedbackId(Long feedbackId) {
+ delete(new LambdaQueryWrapperX<MesProFeedbackAuxDO>()
+ .eq(MesProFeedbackAuxDO::getFeedbackId, feedbackId));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/feedback/MesProFeedbackMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/feedback/MesProFeedbackMapper.java
index 0116b9b..90d7bb4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/feedback/MesProFeedbackMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/feedback/MesProFeedbackMapper.java
@@ -8,8 +8,10 @@
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackPageReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
+import cn.iocoder.yudao.module.mes.enums.pro.MesProFeedbackStatusEnum;
import org.apache.ibatis.annotations.Mapper;
+import java.time.LocalDateTime;
import java.util.Collection;
import java.util.List;
@@ -75,4 +77,35 @@
.in(MesProFeedbackDO::getTaskId, taskIds));
}
+ /**
+ * 宸ユ椂鑰冩牳鎶ヨ〃鍙栨暟锛氭椂闂存鍐呭凡瀹℃壒閫氳繃锛堝緟妫�楠�/宸插畬鎴愶級鐨勬姤宸ュ崟
+ */
+ default List<MesProFeedbackDO> selectWorktimeReportList(LocalDateTime beginTime, LocalDateTime endTime,
+ Long feedbackUserId, Long processId, Long workstationId) {
+ return selectList(new LambdaQueryWrapperX<MesProFeedbackDO>()
+ .eqIfPresent(MesProFeedbackDO::getFeedbackUserId, feedbackUserId)
+ .eqIfPresent(MesProFeedbackDO::getProcessId, processId)
+ .eqIfPresent(MesProFeedbackDO::getWorkstationId, workstationId)
+ .inIfPresent(MesProFeedbackDO::getStatus,
+ MesProFeedbackStatusEnum.UNCHECK.getStatus(),
+ MesProFeedbackStatusEnum.FINISHED.getStatus())
+ .ge(MesProFeedbackDO::getFeedbackTime, beginTime)
+ .le(MesProFeedbackDO::getFeedbackTime, endTime));
+ }
+
+ /**
+ * 鏌ヨ鎸囧畾鎶ュ伐浜哄湪鏌愭椂闂存鍐呭凡瀹℃壒閫氳繃锛堝緟妫�楠�/宸插畬鎴愶級鐨勬姤宸ュ崟锛岀敤浜庢眹鎬绘湀搴︽姤宸ュ伐璧勩��
+ * 鑽夌銆佸鎵逛腑鐨勬姤宸ヤ笉璁¤柂銆�
+ */
+ default List<MesProFeedbackDO> selectWageListByUserIds(Collection<Long> feedbackUserIds,
+ LocalDateTime beginTime, LocalDateTime endTime) {
+ return selectList(new LambdaQueryWrapperX<MesProFeedbackDO>()
+ .in(MesProFeedbackDO::getFeedbackUserId, feedbackUserIds)
+ .in(MesProFeedbackDO::getStatus,
+ MesProFeedbackStatusEnum.UNCHECK.getStatus(),
+ MesProFeedbackStatusEnum.FINISHED.getStatus())
+ .ge(MesProFeedbackDO::getFeedbackTime, beginTime)
+ .le(MesProFeedbackDO::getFeedbackTime, endTime));
+ }
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/wage/MesProProcessWageFieldMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/wage/MesProProcessWageFieldMapper.java
new file mode 100644
index 0000000..2f7ebf9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/wage/MesProProcessWageFieldMapper.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.pro.wage;
+
+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.pro.wage.MesProProcessWageFieldDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * MES 宸ュ簭宸ヨ祫瀛楁 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesProProcessWageFieldMapper extends BaseMapperX<MesProProcessWageFieldDO> {
+
+ default List<MesProProcessWageFieldDO> selectListByProcessId(Long processId) {
+ return selectList(new LambdaQueryWrapperX<MesProProcessWageFieldDO>()
+ .eq(MesProProcessWageFieldDO::getProcessId, processId)
+ .orderByAsc(MesProProcessWageFieldDO::getSort)
+ .orderByAsc(MesProProcessWageFieldDO::getId));
+ }
+
+ default MesProProcessWageFieldDO selectOneByProcessIdAndCode(Long processId, String fieldCode) {
+ return selectOne(new LambdaQueryWrapperX<MesProProcessWageFieldDO>()
+ .eq(MesProProcessWageFieldDO::getProcessId, processId)
+ .eq(MesProProcessWageFieldDO::getFieldCode, fieldCode)
+ .last("LIMIT 1"));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/wage/MesProProcessWageRuleMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/wage/MesProProcessWageRuleMapper.java
new file mode 100644
index 0000000..c20c63d
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/wage/MesProProcessWageRuleMapper.java
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.pro.wage;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo.MesProProcessWageRulePageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.wage.MesProProcessWageRuleDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * MES 宸ュ簭宸ヨ祫鍗曚环瑙勫垯 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesProProcessWageRuleMapper extends BaseMapperX<MesProProcessWageRuleDO> {
+
+ default PageResult<MesProProcessWageRuleDO> selectPage(MesProProcessWageRulePageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<MesProProcessWageRuleDO>()
+ .eqIfPresent(MesProProcessWageRuleDO::getProcessId, reqVO.getProcessId())
+ .eqIfPresent(MesProProcessWageRuleDO::getRouteId, reqVO.getRouteId())
+ .eqIfPresent(MesProProcessWageRuleDO::getMachineryId, reqVO.getMachineryId())
+ .eqIfPresent(MesProProcessWageRuleDO::getBillingType, reqVO.getBillingType())
+ .eqIfPresent(MesProProcessWageRuleDO::getStatus, reqVO.getStatus())
+ .orderByAsc(MesProProcessWageRuleDO::getProcessId)
+ .orderByDesc(MesProProcessWageRuleDO::getPriority)
+ .orderByDesc(MesProProcessWageRuleDO::getId));
+ }
+
+ default List<MesProProcessWageRuleDO> selectListByProcessId(Long processId) {
+ return selectList(new LambdaQueryWrapperX<MesProProcessWageRuleDO>()
+ .eq(MesProProcessWageRuleDO::getProcessId, processId)
+ .orderByDesc(MesProProcessWageRuleDO::getPriority)
+ .orderByDesc(MesProProcessWageRuleDO::getId));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/wage/MesProWageQualityRuleMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/wage/MesProWageQualityRuleMapper.java
new file mode 100644
index 0000000..a734920
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/wage/MesProWageQualityRuleMapper.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.pro.wage;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo.MesProWageQualityRulePageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.wage.MesProWageQualityRuleDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * MES 璐ㄩ噺宸ヨ祫瑙勫垯 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesProWageQualityRuleMapper extends BaseMapperX<MesProWageQualityRuleDO> {
+
+ default PageResult<MesProWageQualityRuleDO> selectPage(MesProWageQualityRulePageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<MesProWageQualityRuleDO>()
+ .eqIfPresent(MesProWageQualityRuleDO::getProcessId, reqVO.getProcessId())
+ .eqIfPresent(MesProWageQualityRuleDO::getRouteId, reqVO.getRouteId())
+ .eqIfPresent(MesProWageQualityRuleDO::getRuleType, reqVO.getRuleType())
+ .eqIfPresent(MesProWageQualityRuleDO::getStatus, reqVO.getStatus())
+ .orderByAsc(MesProWageQualityRuleDO::getProcessId)
+ .orderByDesc(MesProWageQualityRuleDO::getPriority)
+ .orderByAsc(MesProWageQualityRuleDO::getMinRate));
+ }
+
+ default List<MesProWageQualityRuleDO> selectListByProcessId(Long processId) {
+ return selectList(new LambdaQueryWrapperX<MesProWageQualityRuleDO>()
+ .eq(MesProWageQualityRuleDO::getProcessId, processId)
+ .orderByDesc(MesProWageQualityRuleDO::getPriority)
+ .orderByAsc(MesProWageQualityRuleDO::getMinRate));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkOrderMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkOrderMapper.java
index 5c94ad9..4849b37 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkOrderMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkOrderMapper.java
@@ -20,6 +20,11 @@
@Mapper
public interface MesProWorkOrderMapper extends BaseMapperX<MesProWorkOrderDO> {
+ default MesProWorkOrderDO selectByIdForUpdate(Long id) {
+ return selectOne(new LambdaQueryWrapperX<MesProWorkOrderDO>()
+ .eq(MesProWorkOrderDO::getId, id).last("FOR UPDATE"));
+ }
+
default List<MesProWorkOrderDO> lockScheduleOrders(List<Long> ids) {
return selectList(new LambdaQueryWrapperX<MesProWorkOrderDO>()
.in(MesProWorkOrderDO::getId, ids).orderByAsc(MesProWorkOrderDO::getId).last("FOR UPDATE"));
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/worktime/MesProWorktimeAuxMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/worktime/MesProWorktimeAuxMapper.java
new file mode 100644
index 0000000..47e7966
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/worktime/MesProWorktimeAuxMapper.java
@@ -0,0 +1,66 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.pro.worktime;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo.MesProWorktimeAuxPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.worktime.MesProWorktimeAuxDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * MES 杈呭姪宸ユ椂閰嶇疆 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesProWorktimeAuxMapper extends BaseMapperX<MesProWorktimeAuxDO> {
+
+ default PageResult<MesProWorktimeAuxDO> selectPage(MesProWorktimeAuxPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<MesProWorktimeAuxDO>()
+ .eqIfPresent(MesProWorktimeAuxDO::getProcessId, reqVO.getProcessId())
+ .eqIfPresent(MesProWorktimeAuxDO::getWorkstationId, reqVO.getWorkstationId())
+ .likeIfPresent(MesProWorktimeAuxDO::getItemName, reqVO.getItemName())
+ .eqIfPresent(MesProWorktimeAuxDO::getStatus, reqVO.getStatus())
+ .orderByAsc(MesProWorktimeAuxDO::getSort)
+ .orderByAsc(MesProWorktimeAuxDO::getId));
+ }
+
+ default List<MesProWorktimeAuxDO> selectListByProcessId(Long processId) {
+ return selectList(new LambdaQueryWrapperX<MesProWorktimeAuxDO>()
+ .eq(MesProWorktimeAuxDO::getProcessId, processId)
+ .orderByAsc(MesProWorktimeAuxDO::getSort)
+ .orderByAsc(MesProWorktimeAuxDO::getId));
+ }
+
+ default MesProWorktimeAuxDO selectOneByProcessIdAndWorkstationIdAndCode(Long processId, Long workstationId, String itemCode) {
+ return selectOne(new LambdaQueryWrapperX<MesProWorktimeAuxDO>()
+ .eq(MesProWorktimeAuxDO::getProcessId, processId)
+ .eq(MesProWorktimeAuxDO::getItemCode, itemCode)
+ .and(w -> {
+ if (workstationId == null) {
+ w.isNull(MesProWorktimeAuxDO::getWorkstationId);
+ } else {
+ w.eq(MesProWorktimeAuxDO::getWorkstationId, workstationId);
+ }
+ })
+ .last("LIMIT 1"));
+ }
+
+ default List<MesProWorktimeAuxDO> selectListByProcessIdAndWorkstationId(Long processId, Long workstationId) {
+ return selectList(new LambdaQueryWrapperX<MesProWorktimeAuxDO>()
+ .eq(MesProWorktimeAuxDO::getProcessId, processId)
+ .and(w -> {
+ if (workstationId != null) {
+ w.isNull(MesProWorktimeAuxDO::getWorkstationId)
+ .or(x -> x.eq(MesProWorktimeAuxDO::getWorkstationId, workstationId));
+ } else {
+ w.isNull(MesProWorktimeAuxDO::getWorkstationId);
+ }
+ })
+ .orderByAsc(MesProWorktimeAuxDO::getSort)
+ .orderByAsc(MesProWorktimeAuxDO::getId));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ipqc/MesQcIpqcWageFieldMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ipqc/MesQcIpqcWageFieldMapper.java
new file mode 100644
index 0000000..8bbed32
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ipqc/MesQcIpqcWageFieldMapper.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.qc.ipqc;
+
+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.ipqc.MesQcIpqcWageFieldDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * MES 杩囩▼妫�楠屽崟-宸ヨ祫瀛楁鍊� Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesQcIpqcWageFieldMapper extends BaseMapperX<MesQcIpqcWageFieldDO> {
+
+ default List<MesQcIpqcWageFieldDO> selectListByIpqcId(Long ipqcId) {
+ return selectList(new LambdaQueryWrapperX<MesQcIpqcWageFieldDO>()
+ .eq(MesQcIpqcWageFieldDO::getIpqcId, ipqcId)
+ .orderByAsc(MesQcIpqcWageFieldDO::getSort)
+ .orderByAsc(MesQcIpqcWageFieldDO::getId));
+ }
+
+ default List<MesQcIpqcWageFieldDO> selectListByIpqcIds(Collection<Long> ipqcIds) {
+ return selectList(new LambdaQueryWrapperX<MesQcIpqcWageFieldDO>()
+ .in(MesQcIpqcWageFieldDO::getIpqcId, ipqcIds)
+ .orderByAsc(MesQcIpqcWageFieldDO::getId));
+ }
+
+ default void deleteByIpqcId(Long ipqcId) {
+ delete(new LambdaQueryWrapperX<MesQcIpqcWageFieldDO>()
+ .eq(MesQcIpqcWageFieldDO::getIpqcId, ipqcId));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/patrol/MesQcPatrolMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/patrol/MesQcPatrolMapper.java
new file mode 100644
index 0000000..dc05da2
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/patrol/MesQcPatrolMapper.java
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.qc.patrol;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.patrol.vo.MesQcPatrolPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.patrol.MesQcPatrolDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * MES 璐ㄩ噺宸℃璁板綍 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesQcPatrolMapper extends BaseMapperX<MesQcPatrolDO> {
+
+ default PageResult<MesQcPatrolDO> selectPage(MesQcPatrolPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<MesQcPatrolDO>()
+ .likeIfPresent(MesQcPatrolDO::getCode, reqVO.getCode())
+ .likeIfPresent(MesQcPatrolDO::getName, reqVO.getName())
+ .eqIfPresent(MesQcPatrolDO::getItemId, reqVO.getItemId())
+ .likeIfPresent(MesQcPatrolDO::getReelNo, reqVO.getReelNo())
+ .likeIfPresent(MesQcPatrolDO::getBatchCode, reqVO.getBatchCode())
+ .eqIfPresent(MesQcPatrolDO::getInspectorUserId, reqVO.getInspectorUserId())
+ .betweenIfPresent(MesQcPatrolDO::getInspectDate, reqVO.getInspectDate())
+ .orderByDesc(MesQcPatrolDO::getId));
+ }
+
+ default MesQcPatrolDO selectByCode(String code) {
+ return selectOne(MesQcPatrolDO::getCode, code);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/statistics/MesQcStatisticsMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/statistics/MesQcStatisticsMapper.java
new file mode 100644
index 0000000..10c1a28
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/statistics/MesQcStatisticsMapper.java
@@ -0,0 +1,50 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.qc.statistics;
+
+import cn.iocoder.yudao.module.mes.controller.admin.qc.statistics.vo.MesQcStatisticsByProcessVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.statistics.vo.MesQcStatisticsByWorkOrderVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.statistics.vo.MesQcStatisticsTypeVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * MES 璐ㄩ噺缁熻 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesQcStatisticsMapper {
+
+ /**
+ * 鎸夋楠岀被鍨嬬粺璁″凡瀹屾垚鐨勮川妫�鍗曟暟閲忎笌妫�娴�/鍚堟牸/涓嶅悎鏍兼暟閲�
+ *
+ * @param beginTime 妫�娴嬫棩鏈� >= 寮�濮嬫椂闂达紝鍙负绌�
+ * @param endTime 妫�娴嬫棩鏈� <= 缁撴潫鏃堕棿锛屽彲涓虹┖
+ * @return 鎸� IQC / IPQC / OQC / RQC 鍚勪竴琛岋紙鏃犳暟鎹椂鏁伴噺涓� 0锛�
+ */
+ List<MesQcStatisticsTypeVO> selectTypeStatistics(@Param("beginTime") LocalDateTime beginTime,
+ @Param("endTime") LocalDateTime endTime);
+
+ /**
+ * 鎸夊伐搴忕粺璁� IPQC 宸插畬鎴愭楠屽崟鐨勬娴嬫暟閲�
+ *
+ * @param beginTime 妫�娴嬫棩鏈� >= 寮�濮嬫椂闂达紝鍙负绌�
+ * @param endTime 妫�娴嬫棩鏈� <= 缁撴潫鏃堕棿锛屽彲涓虹┖
+ * @return 鎸� process_id 鍒嗙粍
+ */
+ List<MesQcStatisticsByProcessVO> selectStatisticsByProcess(@Param("beginTime") LocalDateTime beginTime,
+ @Param("endTime") LocalDateTime endTime);
+
+ /**
+ * 鎸夌敓浜у伐鍗曠粺璁� IPQC 宸插畬鎴愭楠屽崟鐨勬娴嬫暟閲�
+ *
+ * @param beginTime 妫�娴嬫棩鏈� >= 寮�濮嬫椂闂达紝鍙负绌�
+ * @param endTime 妫�娴嬫棩鏈� <= 缁撴潫鏃堕棿锛屽彲涓虹┖
+ * @return 鎸� work_order_id 鍒嗙粍
+ */
+ List<MesQcStatisticsByWorkOrderVO> selectStatisticsByWorkOrder(@Param("beginTime") LocalDateTime beginTime,
+ @Param("endTime") LocalDateTime endTime);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/template/MesQcTemplateProcessMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/template/MesQcTemplateProcessMapper.java
new file mode 100644
index 0000000..8264a26
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/template/MesQcTemplateProcessMapper.java
@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.qc.template;
+
+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.template.MesQcTemplateProcessDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * MES 璐ㄦ鏂规-宸ュ簭缁戝畾 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesQcTemplateProcessMapper extends BaseMapperX<MesQcTemplateProcessDO> {
+
+ default List<MesQcTemplateProcessDO> selectListByProcessId(Long processId) {
+ return selectList(new LambdaQueryWrapperX<MesQcTemplateProcessDO>()
+ .eq(MesQcTemplateProcessDO::getProcessId, processId)
+ .orderByDesc(MesQcTemplateProcessDO::getDefaultFlag)
+ .orderByAsc(MesQcTemplateProcessDO::getSort)
+ .orderByAsc(MesQcTemplateProcessDO::getId));
+ }
+
+ default List<MesQcTemplateProcessDO> selectListByTemplateId(Long templateId) {
+ return selectList(new LambdaQueryWrapperX<MesQcTemplateProcessDO>()
+ .eq(MesQcTemplateProcessDO::getTemplateId, templateId));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockFreezeClaimMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockFreezeClaimMapper.java
new file mode 100644
index 0000000..8456aa7
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockFreezeClaimMapper.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.wm.materialstock;
+
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface MesWmMaterialStockFreezeClaimMapper {
+
+ @Insert("INSERT IGNORE INTO mes_wm_material_stock_freeze_claim(stock_id, source_type, source_id) " +
+ "VALUES(#{stockId}, #{sourceType}, #{sourceId})")
+ int acquire(@Param("stockId") Long stockId, @Param("sourceType") String sourceType,
+ @Param("sourceId") Long sourceId);
+
+ @Delete("DELETE FROM mes_wm_material_stock_freeze_claim " +
+ "WHERE stock_id = #{stockId} AND source_type = #{sourceType} AND source_id = #{sourceId}")
+ int release(@Param("stockId") Long stockId, @Param("sourceType") String sourceType,
+ @Param("sourceId") Long sourceId);
+
+ @Select("SELECT COUNT(*) FROM mes_wm_material_stock_freeze_claim WHERE stock_id = #{stockId}")
+ long countByStockId(@Param("stockId") Long stockId);
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesMapper.java
index f6fc538..931c29b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesMapper.java
@@ -8,6 +8,8 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO;
import org.apache.ibatis.annotations.Mapper;
+import java.util.Collection;
+import java.util.Collections;
import java.util.List;
/**
@@ -68,4 +70,13 @@
.orderByDesc(MesWmProductSalesDO::getId));
}
+ default List<MesWmProductSalesDO> selectListBySaleOrderIds(Collection<Long> saleOrderIds) {
+ if (CollUtil.isEmpty(saleOrderIds)) {
+ return Collections.emptyList();
+ }
+ return selectList(new LambdaQueryWrapperX<MesWmProductSalesDO>()
+ .in(MesWmProductSalesDO::getSaleOrderId, saleOrderIds)
+ .orderByDesc(MesWmProductSalesDO::getId));
+ }
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/salesnotice/MesWmSalesNoticeLineMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/salesnotice/MesWmSalesNoticeLineMapper.java
index b2eebe6..591eac6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/salesnotice/MesWmSalesNoticeLineMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/salesnotice/MesWmSalesNoticeLineMapper.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.mes.dal.mysql.wm.salesnotice;
+import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -7,6 +8,8 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.salesnotice.MesWmSalesNoticeLineDO;
import org.apache.ibatis.annotations.Mapper;
+import java.util.Collection;
+import java.util.Collections;
import java.util.List;
/**
@@ -25,6 +28,16 @@
return selectList(MesWmSalesNoticeLineDO::getNoticeId, noticeId);
}
+ default List<MesWmSalesNoticeLineDO> selectListByNoticeIds(Collection<Long> noticeIds) {
+ if (CollUtil.isEmpty(noticeIds)) {
+ return Collections.emptyList();
+ }
+ return selectList(new LambdaQueryWrapperX<MesWmSalesNoticeLineDO>()
+ .in(MesWmSalesNoticeLineDO::getNoticeId, noticeIds)
+ .orderByAsc(MesWmSalesNoticeLineDO::getNoticeId)
+ .orderByAsc(MesWmSalesNoticeLineDO::getId));
+ }
+
default void deleteByNoticeId(Long noticeId) {
delete(MesWmSalesNoticeLineDO::getNoticeId, noticeId);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskLineMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskLineMapper.java
index f3c863f..ddfd19a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskLineMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskLineMapper.java
@@ -33,11 +33,18 @@
.orderByAsc(MesWmStockTakingTaskLineDO::getId));
}
- default MesWmStockTakingTaskLineDO selectByTaskIdAndItemIdAndAreaId(Long taskId, Long itemId, Long areaId) {
+ default MesWmStockTakingTaskLineDO selectByStockDimensions(Long taskId, Long itemId, Long warehouseId,
+ Long locationId, Long areaId, Long batchId) {
return selectOne(new LambdaQueryWrapperX<MesWmStockTakingTaskLineDO>()
.eq(MesWmStockTakingTaskLineDO::getTaskId, taskId)
.eq(MesWmStockTakingTaskLineDO::getItemId, itemId)
- .eqIfPresent(MesWmStockTakingTaskLineDO::getAreaId, areaId));
+ .eq(MesWmStockTakingTaskLineDO::getWarehouseId, warehouseId)
+ .eq(locationId != null, MesWmStockTakingTaskLineDO::getLocationId, locationId)
+ .isNull(locationId == null, MesWmStockTakingTaskLineDO::getLocationId)
+ .eq(areaId != null, MesWmStockTakingTaskLineDO::getAreaId, areaId)
+ .isNull(areaId == null, MesWmStockTakingTaskLineDO::getAreaId)
+ .eq(batchId != null, MesWmStockTakingTaskLineDO::getBatchId, batchId)
+ .isNull(batchId == null, MesWmStockTakingTaskLineDO::getBatchId));
}
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskMapper.java
index 67c0918..8746225 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskMapper.java
@@ -6,6 +6,8 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.MesWmStockTakingTaskPageReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task.MesWmStockTakingTaskDO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
/**
* MES 鐩樼偣浠诲姟 Mapper
@@ -15,6 +17,10 @@
@Mapper
public interface MesWmStockTakingTaskMapper extends BaseMapperX<MesWmStockTakingTaskDO> {
+ @Update("UPDATE mes_wm_stock_taking_task SET difference_processed = b'1' " +
+ "WHERE id = #{id} AND deleted = b'0' AND status = 4 AND difference_processed = b'0'")
+ int claimDifferenceProcessing(@Param("id") Long id);
+
default MesWmStockTakingTaskDO selectByCode(String code) {
return selectOne(MesWmStockTakingTaskDO::getCode, code);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java
index e08f07d..397a5c1 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java
@@ -99,13 +99,6 @@
String MES_DV_METERING_STATUS = "mes_dv_metering_status"; // MES 璁¢噺鍣ㄥ叿鐘舵��
String MES_DV_METERING_CHECK_RESULT = "mes_dv_metering_check_result"; // MES 璁¢噺妫�娴嬬粨璁�
- // ========== 鎺掔彮鏃ュ巻 (CAL) ==========
- String MES_CAL_HOLIDAY_TYPE = "mes_cal_holiday_type"; // MES 鍋囨湡绫诲瀷
- String MES_CAL_SHIFT_TYPE = "mes_cal_shift_type"; // MES 杞彮鏂瑰紡
- String MES_CAL_SHIFT_METHOD = "mes_cal_shift_method"; // MES 鍊掔彮鏂瑰紡
- String MES_CAL_CALENDAR_TYPE = "mes_cal_calendar_type"; // MES 鐝粍绫诲瀷
- String MES_CAL_PLAN_STATUS = "mes_cal_plan_status"; // MES 鎺掔彮璁″垝鐘舵��
-
// ========== 宸ュ叿绠$悊 (TM) ==========
String MES_TM_TOOL_STATUS = "mes_tm_tool_status"; // MES 宸ュ叿鐘舵��
String MES_TM_MAINTEN_TYPE = "mes_tm_mainten_type"; // MES 淇濆吇缁存姢绫诲瀷
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 8d24f01..509733b 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
@@ -245,6 +245,10 @@
ErrorCode PRO_PROCESS_NAME_EXISTS = new ErrorCode(1_040_500_002, "宸ュ簭鍚嶇О宸插瓨鍦�");
ErrorCode PRO_PROCESS_USED_BY_ROUTE = new ErrorCode(1_040_500_003, "宸ュ簭宸茶宸ヨ壓璺嚎寮曠敤锛屾棤娉曞垹闄�");
ErrorCode PRO_PROCESS_IS_DISABLE = new ErrorCode(1_040_500_004, "宸ュ簭宸茬鐢�");
+ ErrorCode PRO_PROCESS_BILLING_TYPE_INVALID = new ErrorCode(1_040_500_005,
+ "宸ュ簭銆寋}銆嶇殑璁¤垂绫诲瀷[{}]鏃犳晥锛屽彧鑳芥槸 1-璁℃椂 鎴� 2-璁′欢锛岃閲嶆柊閫夋嫨璁¤垂绫诲瀷");
+ ErrorCode PRO_PROCESS_WAGE_RATE_INVALID = new ErrorCode(1_040_500_006,
+ "宸ュ簭銆寋}銆嶇殑宸ヨ祫瀹氶[{}]鏃犳晥锛屽繀椤诲ぇ浜庣瓑浜� 0锛堣鏃朵负鍏�/灏忔椂锛岃浠朵负鍏�/浠讹級锛岃閲嶆柊濉啓");
// ========== MES 鐢熶骇绠$悊-宸ュ簭鍐呭锛�1-040-500-100锛� ==========
ErrorCode PRO_PROCESS_CONTENT_NOT_EXISTS = new ErrorCode(1_040_500_100, "宸ュ簭鍐呭涓嶅瓨鍦�");
@@ -344,7 +348,31 @@
ErrorCode PRO_FEEDBACK_PREV_PROCESS_NOT_FINISHED = new ErrorCode(1_040_506_016,
"涓婁竴閬撳伐搴忋�寋}銆嶅皻鏈姤宸ュ畬鎴愶紙鍓╀綑 {}锛夛紝璇峰厛瀹屾垚涓婁竴閬撳伐搴忕殑鎶ュ伐");
ErrorCode PRO_FEEDBACK_EQUIPMENT_INVALID = new ErrorCode(1_040_506_017, "鎶ュ伐璁惧鏍¢獙澶辫触锛歿}");
+ ErrorCode PRO_FEEDBACK_PROCESS_NOT_EXISTS = new ErrorCode(1_040_506_018,
+ "褰撳墠鐢熶骇浠诲姟鍏宠仈鐨勫伐搴� ID={} 涓嶅瓨鍦紝鏃犳硶璁$畻鎶ュ伐宸ヨ祫锛岃鑱旂郴宸ヨ壓鍛樻鏌ヤ换鍔$殑宸ュ簭閰嶇疆");
+ ErrorCode PRO_FEEDBACK_WORK_HOURS_REQUIRED = new ErrorCode(1_040_506_019,
+ "宸ュ簭銆寋}銆嶆寜璁℃椂璁¤柂锛岃濉啓鏈鎶ュ伐宸ユ椂锛堝皬鏃讹級锛屽伐鏃跺繀椤诲ぇ浜� 0锛涜嫢瀹為檯鎸夋暟閲忚钖紝璇峰厛鎶婅宸ュ簭鐨勮璐圭被鍨嬫敼涓鸿浠�");
+ ErrorCode PRO_FEEDBACK_TIME_BILLING_QUICK_UNSUPPORTED = new ErrorCode(1_040_506_020,
+ "宸ュ簭銆寋}銆嶆寜璁℃椂璁¤柂锛屽揩鎹锋姤宸ユ棤娉曞綍鍏ュ伐鏃讹紙灏忔椂锛夛紱璇峰埌銆岀敓浜ф姤宸ャ�嶉〉闈㈡柊澧炴姤宸ュ苟濉啓宸ユ椂");
+ // ========== MES 鐢熶骇绠$悊-杈呭姪宸ユ椂閰嶇疆锛�1-040-510-000锛� ==========
+ ErrorCode PRO_WORKTIME_AUX_NOT_EXISTS = new ErrorCode(1_040_510_000, "杈呭姪宸ユ椂椤圭洰涓嶅瓨鍦�");
+ ErrorCode PRO_WORKTIME_AUX_PROCESS_NOT_EXISTS = new ErrorCode(1_040_510_001,
+ "鎵�閫夊伐搴� ID={} 涓嶅瓨鍦紝鏃犳硶淇濆瓨杈呭姪宸ユ椂椤圭洰锛岃閲嶆柊閫夋嫨宸ュ簭");
+ ErrorCode PRO_WORKTIME_AUX_MEASURE_TYPE_INVALID = new ErrorCode(1_040_510_002,
+ "杈呭姪宸ユ椂椤圭洰銆寋}銆嶇殑璁¢噺鏂瑰紡[{}]鏃犳晥锛屽彧鑳芥槸 1-鎸夋 / 2-鎸変釜 / 3-鎸夌洏 / 4-鎸夌背鎶樼畻锛岃閲嶆柊閫夋嫨");
+ ErrorCode PRO_WORKTIME_AUX_DURATION_REQUIRED = new ErrorCode(1_040_510_003,
+ "杈呭姪宸ユ椂椤圭洰銆寋}銆嶆寜[{}]璁¢噺锛岃濉啓鍗曢」鍒嗛挓鏁颁笖蹇呴』澶т簬 0");
+ ErrorCode PRO_WORKTIME_AUX_SPEED_REQUIRED = new ErrorCode(1_040_510_004,
+ "杈呭姪宸ユ椂椤圭洰銆寋}銆嶆寜绫虫姌绠楋紝璇峰~鍐欐姌绠楅�熷害锛堢背/鍒嗭級涓斿繀椤诲ぇ浜� 0");
+ ErrorCode PRO_WORKTIME_AUX_CODE_DUPLICATE = new ErrorCode(1_040_510_005,
+ "宸ュ簭銆寋}銆嶄笅宸插瓨鍦ㄨ緟鍔╅」鐩紪鐮併�寋}銆嶏紙鏈哄彴鑼冨洿锛歿}锛夛紝璇蜂慨鏀归」鐩紪鐮佹垨鍏堝垹闄ゅ師椤圭洰");
+ ErrorCode PRO_WORKTIME_AUX_IN_USE = new ErrorCode(1_040_510_006,
+ "杈呭姪宸ユ椂椤圭洰銆寋}銆嶅凡琚姤宸ヨ褰曞紩鐢紝鏃犳硶鍒犻櫎锛涘闇�鍋滄浣跨敤锛岃鎶婄姸鎬佹敼涓虹鐢�");
+ ErrorCode PRO_WORKTIME_ITEM_NOT_APPLICABLE = new ErrorCode(1_040_510_007,
+ "杈呭姪宸ユ椂椤圭洰銆寋}銆嶄笉閫傜敤浜庡綋鍓嶅伐搴忋�寋}銆嶆垨鏈哄彴銆寋}銆嶏紝璇峰埛鏂伴〉闈㈠悗閲嶆柊閫夋嫨");
+ ErrorCode PRO_WORKTIME_REPORT_DIM_INVALID = new ErrorCode(1_040_510_008,
+ "宸ユ椂鑰冩牳缁熻缁村害[{}]鏃犳晥锛屽彧鑳芥槸 1-鎸変汉 / 2-鎸夊伐搴� / 3-鎸夋満鍙� / 4-鎸夋棩鏈燂紝璇烽噸鏂伴�夋嫨");
// ========== MES 鐢熶骇绠$悊-鐢熶骇娴佽浆鍗★紙1-040-507-000锛� ==========
ErrorCode PRO_CARD_NOT_EXISTS = new ErrorCode(1_040_507_000, "鐢熶骇娴佽浆鍗′笉瀛樺湪");
ErrorCode PRO_CARD_CODE_DUPLICATE = new ErrorCode(1_040_507_001, "娴佽浆鍗$紪鐮佸凡瀛樺湪");
@@ -421,8 +449,11 @@
ErrorCode QC_IPQC_SOURCE_DOC_NO_PENDING_LINE = new ErrorCode(1_040_604_008, "鏉ユ簮鎶ュ伐鍗曚笉瀛樺湪寰呮浜у嚭琛岋紝鏃犳硶鍒涘缓 IPQC");
ErrorCode QC_IPQC_SOURCE_LINE_NOT_BELONG = new ErrorCode(1_040_604_009, "鏉ユ簮鍗曟嵁琛屼笉灞炰簬璇ユ姤宸ュ崟");
ErrorCode QC_IPQC_SOURCE_LINE_REQUIRED = new ErrorCode(1_040_604_010, "鏉ユ簮鍗曟嵁绫诲瀷涓烘姤宸ユ椂锛屾潵婧愪骇鍑鸿 ID 涓嶈兘涓虹┖");
+ ErrorCode QC_IPQC_PROCESS_REQUIRED = new ErrorCode(1_040_604_011, "杩囩▼妫�楠屽崟缂哄皯妫�楠屽伐搴忥細宸ヤ綅鍜屾楠屽伐搴忓潎鏈�夋嫨銆傝閫夋嫨宸ヤ綅锛堣嚜鍔ㄥ甫鍑烘墍灞炲伐搴忥級锛屾垨鐩存帴閫夋嫨妫�楠屽伐搴忓悗鍐嶄繚瀛�");
ErrorCode QC_IPQC_SOURCE_LINE_NOT_PENDING = new ErrorCode(1_040_604_011, "鏉ユ簮浜у嚭琛屼笉鏄緟妫�楠岀姸鎬�");
ErrorCode QC_IPQC_WORK_ORDER_STATUS_INVALID = new ErrorCode(1_040_604_012, "浠呭凡纭鎴栧凡瀹屾垚鐨勭敓浜у伐鍗曞彲鍒涘缓杩囩▼妫�楠�");
+ ErrorCode QC_IPQC_WAGE_FIELD_NOT_BELONG = new ErrorCode(1_040_604_013, "宸ヨ祫瀛楁[{}]涓嶅睘浜庤繃绋嬫楠屽崟[{}]鎵�鍦ㄥ伐搴忥紝璇烽噸鏂版墦寮�妫�楠屽崟鍚庡~鍐�");
+ ErrorCode QC_IPQC_WAGE_FIELD_VALUE_INVALID = new ErrorCode(1_040_604_014, "宸ヨ祫瀛楁[{}]鍙備笌宸ヨ祫璁$畻锛屽彧鑳藉~鍐欐暟瀛楋紝褰撳墠濉啓涓篬{}]");
// ========== MES 璐ㄩ噺绠$悊-杩囩▼妫�楠岃锛�1-040-604-100锛� ==========
ErrorCode QC_IPQC_LINE_NOT_EXISTS = new ErrorCode(1_040_604_100, "杩囩▼妫�楠岃涓嶅瓨鍦�");
@@ -459,11 +490,21 @@
ErrorCode QC_RQC_LINE_NOT_EXISTS = new ErrorCode(1_040_608_100, "閫�璐ф楠岃涓嶅瓨鍦�");
// ========== MES 璐ㄩ噺绠$悊-涓嶅悎鏍煎搧澶勭悊 NCR锛�1-040-609-000锛� ==========
- ErrorCode QC_NCR_NOT_EXISTS = new ErrorCode(1_040_609_000, "涓嶅悎鏍煎搧澶勭悊鍗曚笉瀛樺湪");
- ErrorCode QC_NCR_CODE_DUPLICATE = new ErrorCode(1_040_609_001, "涓嶅悎鏍煎搧澶勭悊鍗曠紪鍙峰凡瀛樺湪");
+ // ========== 璐ㄩ噺宸℃ 1-040-610-000 ==========
+ ErrorCode QC_PATROL_NOT_EXISTS = new ErrorCode(1_040_610_000, "璐ㄩ噺宸℃璁板綍涓嶅瓨鍦�");
+ ErrorCode QC_PATROL_CODE_DUPLICATE = new ErrorCode(1_040_610_001, "璐ㄩ噺宸℃鍗曠紪鍙峰凡瀛樺湪");
+
+ ErrorCode QC_NCR_NOT_EXISTS = new ErrorCode(1_040_609_000, "涓嶅悎鏍煎搧澶勭悊鍗昜{}]涓嶅瓨鍦紝璇峰埛鏂板垪琛ㄥ悗閲嶈瘯");
+ ErrorCode QC_NCR_CODE_DUPLICATE = new ErrorCode(1_040_609_001, "NCR鍗曞彿[{}]宸插瓨鍦紝璇蜂慨鏀筃CR鍗曞彿鍚庨噸鏂颁繚瀛�");
+ ErrorCode QC_NCR_CLOSE_STATUS_INVALID = new ErrorCode(1_040_609_010, "涓嶅悎鏍煎搧澶勭悊鍗昜{}]褰撳墠鐘舵�佷负[{}]锛屽彧鏈塠宸插缃甝鐘舵�佹墠鍙叧闂紱璇峰厛瀹屾垚澶勭疆");
ErrorCode QC_NCR_NOT_PENDING_REVIEW = new ErrorCode(1_040_609_002, "鍙湁寰呰瘎瀹$姸鎬佺殑涓嶅悎鏍煎搧澶勭悊鍗曟墠鍙搷浣�");
ErrorCode QC_NCR_NOT_REVIEWED = new ErrorCode(1_040_609_003, "鍙湁宸茶瘎瀹$姸鎬佺殑涓嶅悎鏍煎搧澶勭悊鍗曟墠鍙墽琛屽缃�");
ErrorCode QC_NCR_NOT_DISPOSED = new ErrorCode(1_040_609_004, "鍙湁宸插缃姸鎬佺殑涓嶅悎鏍煎搧澶勭悊鍗曟墠鍙叧闂�");
+ ErrorCode QC_NCR_STATUS_NOT_PENDING = new ErrorCode(1_040_609_005, "涓嶅悎鏍煎搧澶勭悊鍗昜{}]褰撳墠鐘舵�佷负[{}]锛屽彧鏈塠寰呰瘎瀹鐘舵�佹墠鍙慨鏀广�佸垹闄ゆ垨璇勫锛涘鎵逛腑璇风瓑寰呯粨鏋滐紝宸茶瘎瀹¤鐩存帴澶勭疆");
+ ErrorCode QC_NCR_SUBMIT_STATUS_INVALID = new ErrorCode(1_040_609_006, "涓嶅悎鏍煎搧澶勭悊鍗昜{}]褰撳墠鐘舵�佷负[{}]锛屽彧鏈塠寰呰瘎瀹鐘舵�佹墠鍙彁浜ゅ鎵癸紱瀹℃壒涓绛夊緟缁撴灉锛屽凡璇勫/宸插缃�/宸插叧闂棤闇�閲嶅鎻愪氦");
+ ErrorCode QC_NCR_DISPOSE_STATUS_INVALID = new ErrorCode(1_040_609_007, "涓嶅悎鏍煎搧澶勭悊鍗昜{}]褰撳墠鐘舵�佷负[{}]锛屽彧鏈夊鎵归�氳繃鍚庣殑[宸茶瘎瀹鐘舵�佹墠鍙墽琛屽缃紱璇峰厛鎻愪氦瀹℃壒骞剁瓑寰呭鎵归�氳繃");
+ ErrorCode QC_NCR_DISPOSITION_REQUIRED = new ErrorCode(1_040_609_008, "澶勭疆鏂瑰紡涓嶈兘涓虹┖锛岃浠嶽璁╂鏀捐銆佽繑淇�佽繑宸ャ�佹姤搴焆涓�夋嫨涓�椤�");
+ ErrorCode QC_NCR_DISPOSITION_INVALID = new ErrorCode(1_040_609_009, "澶勭疆鏂瑰紡[{}]涓嶅湪鍏佽鑼冨洿鍐咃紝璇蜂粠[璁╂鏀捐銆佽繑淇�佽繑宸ャ�佹姤搴焆涓�夋嫨涓�椤�");
// ========== MES 浠撳簱绠$悊-浠撳簱锛�1-040-700-000锛� ==========
ErrorCode WM_WAREHOUSE_NOT_EXISTS = new ErrorCode(1_040_700_000, "浠撳簱涓嶅瓨鍦�");
@@ -657,6 +698,8 @@
ErrorCode WM_RETURN_VENDOR_DETAIL_NOT_EXISTS = new ErrorCode(1_040_711_200, "渚涘簲鍟嗛��璐у崟鏄庣粏涓嶅瓨鍦�");
ErrorCode WM_RETURN_VENDOR_DETAIL_QUANTITY_INVALID = new ErrorCode(1_040_711_201, "閫�璐ф槑缁嗘暟閲忓繀椤诲ぇ浜� 0");
ErrorCode WM_RETURN_VENDOR_DETAIL_LINE_NOT_MATCH = new ErrorCode(1_040_711_202, "鎷h揣鏄庣粏涓嶅睘浜庢寚瀹氱殑渚涘簲鍟嗛��璐у崟");
+ ErrorCode WM_RETURN_VENDOR_DETAIL_STATUS_INVALID = new ErrorCode(1_040_711_203, "渚涘簲鍟嗛��璐у崟[{}]褰撳墠鐘舵�佷笉鍏佽淇敼鎷h揣鏄庣粏锛屼粎鑽夌鎴栧緟鎷h揣鐘舵�佸彲鎿嶄綔");
+ ErrorCode WM_RETURN_VENDOR_DETAIL_PARENT_IMMUTABLE = new ErrorCode(1_040_711_204, "鎷h揣鏄庣粏涓嶈兘鍙樻洿鎵�灞為��璐у崟鎴栭��璐ц");
ErrorCode WM_RETURN_VENDOR_PURCHASE_ORDER_REQUIRED = new ErrorCode(1_040_711_008, "璇峰厛閫夋嫨閲囪喘璁㈠崟");
ErrorCode WM_RETURN_VENDOR_PURCHASE_ORDER_NO_ITEM = new ErrorCode(1_040_711_009, "閲囪喘璁㈠崟鏃犳槑缁嗘暟鎹紝鏃犳硶甯﹀叆鐗╂枡");
ErrorCode WM_RETURN_VENDOR_ITEM_NOT_IN_PURCHASE_ORDER = new ErrorCode(1_040_711_010, "閫�璐х墿鏂欎笉鍦ㄦ墍鍏宠仈閲囪喘璁㈠崟鍐咃紝鏃犳硶娣诲姞");
@@ -665,6 +708,10 @@
ErrorCode WM_RETURN_VENDOR_REFUND_AMOUNT_REQUIRED = new ErrorCode(1_040_711_013, "鏃犳硶鑷姩璁$畻閫�娆鹃噾棰濓細閫�璐у崟[{}]鏈叧鑱旈噰璐鍗曪紝鎴栭��璐х墿鏂橻{}]鏈尮閰嶅埌閲囪喘璁㈠崟鏄庣粏銆傝鍦ㄩ��璐у崟濉啓閫�娆鹃噾棰濆悗鍐嶅畬鎴愰��璐�");
ErrorCode WM_RETURN_VENDOR_FINISHED_REQUIRED = new ErrorCode(1_040_711_014, "渚涘簲鍟嗛��璐у崟[{}]褰撳墠鐘舵�佷负[{}]锛屽彧鏈夊凡瀹屾垚鐨勯��璐у崟鎵嶈兘鎵ц璇ユ搷浣�");
ErrorCode WM_RETURN_VENDOR_ATTACHMENT_REQUIRED = new ErrorCode(1_040_711_015, "渚涘簲鍟嗛��璐у崟[{}]鏈笂浼犻��璐ч檮浠讹紝璐ㄩ噺閮ㄥ彂璧烽��璐у繀椤讳笂浼犺川妫�鎶ュ憡銆佷笉鍚堟牸鐓х墖绛夐檮浠跺悗鎵嶈兘鎻愪氦瀹℃壒锛岃鍏堢紪杈戝崟鎹笂浼犻檮浠�");
+ ErrorCode WM_RETURN_VENDOR_APPROVAL_REQUIRED = new ErrorCode(1_040_711_016, "渚涘簲鍟嗛��璐у崟[{}]娌℃湁鏈夋晥瀹℃壒璁板綍锛屼笉鑳芥嫞璐ф垨瀹屾垚閫�璐э紝璇峰厛鎻愪氦瀹℃壒");
+ ErrorCode WM_RETURN_VENDOR_APPROVAL_PROCESS_INVALID = new ErrorCode(1_040_711_017, "渚涘簲鍟嗛��璐у繀椤讳娇鐢ㄥ鎵规祦绋媅{}]");
+ ErrorCode WM_RETURN_VENDOR_QUANTITY_EXCEED = new ErrorCode(1_040_711_018, "閫�璐х墿鏂橻{}]鏁伴噺[{}]瓒呰繃閲囪喘璁㈠崟鍓╀綑鍙��鏁伴噺[{}]");
+ ErrorCode WM_RETURN_VENDOR_PURCHASE_ITEM_AMBIGUOUS = new ErrorCode(1_040_711_019, "閲囪喘璁㈠崟涓墿鏂橻{}]瀛樺湪澶氭潯鏄庣粏锛屾棤娉曠‘瀹氶��璐у綊灞烇紝璇峰厛鎷嗗垎鎴栬皟鏁撮噰璐鍗曟槑缁�");
// ========== MES 浠撳簱绠$悊-浜у搧鏀惰揣鍗曪紙1-040-712-000锛� ==========
ErrorCode WM_PRODUCT_RECPT_NOT_EXISTS = new ErrorCode(1_040_712_000, "浜у搧鏀惰揣鍗曚笉瀛樺湪");
@@ -727,6 +774,10 @@
ErrorCode WM_STOCK_TAKING_TASK_RESULT_NOT_EXISTS = new ErrorCode(1_040_714_119, "鐩樼偣缁撴灉涓嶅瓨鍦�");
ErrorCode WM_STOCK_TAKING_TASK_LINE_ALREADY_TAKEN = new ErrorCode(1_040_714_120, "璇ョ洏鐐规竻鍗曡宸叉湁鐩樼偣璁板綍锛屼笉鑳介噸澶嶇洏鐐�");
ErrorCode WM_STOCK_TAKING_TASK_NOT_FINISHED = new ErrorCode(1_040_714_121, "鍙湁宸插畬鎴愮姸鎬佺殑鐩樼偣浠诲姟鎵嶈兘澶勭悊宸紓");
+ ErrorCode WM_STOCK_TAKING_TASK_INCOMPLETE = new ErrorCode(1_040_714_122, "鐩樼偣浠诲姟灏氭湁鏈綍鍏ョ粨鏋滅殑浠诲姟琛岋細{}");
+ ErrorCode WM_STOCK_TAKING_TASK_RESULT_LINE_INVALID = new ErrorCode(1_040_714_123, "鐩樼偣缁撴灉涓庡綋鍓嶄换鍔¤涓嶅尮閰�");
+ ErrorCode WM_STOCK_TAKING_TASK_RESULT_DUPLICATE = new ErrorCode(1_040_714_124, "璇ョ洏鐐逛换鍔¤宸叉湁缁撴灉锛屼笉鑳介噸澶嶅綍鍏�");
+ ErrorCode WM_STOCK_TAKING_TASK_LINE_TASK_MISMATCH = new ErrorCode(1_040_714_125, "鐩樼偣娓呭崟琛屼笉灞炰簬鎸囧畾浠诲姟");
// ========== MES 浠撳簱绠$悊-閿�鍞嚭搴撳崟锛�1-040-714-000锛� ==========
ErrorCode WM_PRODUCT_SALES_NOT_EXISTS = new ErrorCode(1_040_714_000, "閿�鍞嚭搴撳崟涓嶅瓨鍦�");
@@ -800,6 +851,9 @@
ErrorCode WM_SALES_NOTICE_SALE_ORDER_NOT_EXISTS = new ErrorCode(1_040_720_013, "閿�鍞鍗曚笉瀛樺湪");
ErrorCode WM_SALES_NOTICE_SALE_ORDER_ITEM_EMPTY = new ErrorCode(1_040_720_014, "閿�鍞鍗曟槑缁嗕负绌�");
ErrorCode WM_SALES_NOTICE_ALREADY_EXISTS = new ErrorCode(1_040_720_015, "璇ラ攢鍞鍗曞凡鐢熸垚鍙戣揣閫氱煡鍗曪紝涓嶈兘閲嶅鐢熸垚");
+ ErrorCode WM_SALES_NOTICE_SUBMIT_PROCESS_KEY_REQUIRED = new ErrorCode(1_040_720_020, "鎻愪氦鍙戣揣瀹℃壒鍓嶅繀椤婚�夋嫨瀹℃壒娴佺▼锛氭湭浼犳祦绋嬪畾涔� Key");
+ ErrorCode WM_SALES_NOTICE_BPM_PROCESS_DEFINITION_NOT_EXISTS = new ErrorCode(1_040_720_021, "鍙戣揣瀹℃壒娴佺▼鏈厤缃細璇峰厛鍦ㄣ�屾祦绋嬬鐞嗐�嶄腑璁捐骞跺惎鐢ㄣ�屽彂璐у鎵广�嶆祦绋嬶紝鍐嶆彁浜ゅ彂璐у崟");
+ ErrorCode WM_SALES_NOTICE_UPDATE_AUDIT_STATUS_FAIL_NOT_APPROVING = new ErrorCode(1_040_720_022, "鍙戣揣鍗�({})褰撳墠鐘舵�佷负[{}]锛屼笉澶勪簬瀹℃壒涓紝鏃犳硶鏇存柊瀹℃壒缁撴灉");
// ========== MES 浠撳簱绠$悊-鏉$爜閰嶇疆锛�1-040-730-000锛� ==========
ErrorCode WM_BARCODE_CONFIG_NOT_EXISTS = new ErrorCode(1_040_730_000, "鏉$爜閰嶇疆涓嶅瓨鍦�");
@@ -859,6 +913,23 @@
ErrorCode PD_PROCESS_PARAM_TEMPLATE_NOT_EXISTS = new ErrorCode(1_040_805_000, "宸ヨ壓鍙傛暟妯℃澘涓嶅瓨鍦�");
ErrorCode PD_PROCESS_PARAM_TEMPLATE_CODE_DUPLICATE = new ErrorCode(1_040_805_001, "宸ヨ壓鍙傛暟妯℃澘缂栫爜宸插瓨鍦�");
+ // ========== MES 宸ュ簭宸ヨ祫锛�1-040-806-000锛� ==========
+ ErrorCode PRO_PROCESS_WAGE_FIELD_NOT_EXISTS = new ErrorCode(1_040_806_000, "宸ュ簭宸ヨ祫瀛楁涓嶅瓨鍦�");
+ ErrorCode PRO_PROCESS_WAGE_FIELD_CODE_DUPLICATE = new ErrorCode(1_040_806_001, "宸ュ簭宸ヨ祫瀛楁缂栫爜閲嶅");
+ ErrorCode PRO_PROCESS_WAGE_FIELD_TYPE_INVALID = new ErrorCode(1_040_806_002, "宸ュ簭宸ヨ祫瀛楁绫诲瀷涓嶅悎娉�");
+ ErrorCode PRO_PROCESS_WAGE_FIELD_VALUE_INVALID = new ErrorCode(1_040_806_003, "宸ュ簭宸ヨ祫瀛楁鍊间笉鍚堟硶");
+ ErrorCode PRO_PROCESS_WAGE_FIELD_ROLE_INVALID = new ErrorCode(1_040_806_004, "宸ュ簭宸ヨ祫瀛楁璁$畻瑙掕壊涓嶅悎娉�");
+ ErrorCode PRO_PROCESS_WAGE_RULE_NOT_EXISTS = new ErrorCode(1_040_806_005, "宸ュ簭宸ヨ祫鍗曚环瑙勫垯涓嶅瓨鍦�");
+ ErrorCode PRO_PROCESS_WAGE_RULE_DUPLICATE = new ErrorCode(1_040_806_006, "宸ュ簭宸ヨ祫鍗曚环瑙勫垯閲嶅");
+ ErrorCode PRO_WAGE_QUALITY_RULE_NOT_EXISTS = new ErrorCode(1_040_806_007, "璐ㄩ噺宸ヨ祫瑙勫垯涓嶅瓨鍦�");
+ ErrorCode PRO_WAGE_QUALITY_RULE_RANGE_INVALID = new ErrorCode(1_040_806_008, "璐ㄩ噺宸ヨ祫瑙勫垯鍚堟牸鐜囧尯闂翠笉鍚堟硶");
+ ErrorCode PRO_WAGE_QUALITY_RULE_VALUE_INVALID = new ErrorCode(1_040_806_009, "璐ㄩ噺宸ヨ祫瑙勫垯绯绘暟鎴栨墸娆鹃噾棰濅笉鍚堟硶");
+ ErrorCode QC_TEMPLATE_PROCESS_NOT_EXISTS = new ErrorCode(1_040_806_010, "璐ㄦ鏂规-宸ュ簭缁戝畾涓嶅瓨鍦�");
+ ErrorCode QC_TEMPLATE_PROCESS_DUPLICATE = new ErrorCode(1_040_806_011, "璇ュ伐搴忓凡缁戝畾鐩稿悓鐨勮川妫�鏂规");
+ ErrorCode PRO_FEEDBACK_QUALITY_INSPECTION_NOT_FINISHED = new ErrorCode(1_040_806_012, "璐ㄦ宸ュ簭鐨勮繃绋嬫楠屽皻鏈畬鎴�");
+ ErrorCode PRO_FEEDBACK_WAGE_RATE_NOT_CONFIGURED = new ErrorCode(1_040_806_013, "宸ュ簭宸ヨ祫鍗曚环鏈厤缃�");
+ ErrorCode PRO_FEEDBACK_AUX_WAGE_RATE_MISSING = new ErrorCode(1_040_806_014, "杈呭姪宸ユ椂璁¤柂鍗曚环鏈厤缃�");
+
// ========== MES 浠撳偍鐗╂祦-瀹℃壒閰嶇疆锛�1-040-900-000锛� ==========
ErrorCode WMS_APPROVAL_CONFIG_NOT_EXISTS = new ErrorCode(1_040_900_000, "浠撳簱瀹℃壒閰嶇疆涓嶅瓨鍦�");
ErrorCode WMS_APPROVAL_ORDER_NOT_EXISTS = new ErrorCode(1_040_900_001, "瀹℃壒鍗曟嵁涓嶅瓨鍦�");
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalHolidayTypeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalHolidayTypeEnum.java
deleted file mode 100644
index 4fc6312..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalHolidayTypeEnum.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package cn.iocoder.yudao.module.mes.enums.cal;
-
-import cn.iocoder.yudao.framework.common.core.ArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * MES 鍋囨湡绫诲瀷鏋氫妇
- *
- * 瀵瑰簲瀛楀吀 mes_cal_holiday_type
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@Getter
-@AllArgsConstructor
-public enum MesCalHolidayTypeEnum implements ArrayValuable<Integer> {
-
- WORKDAY(1, "宸ヤ綔鏃�"),
- HOLIDAY(2, "鑺傚亣鏃�");
-
- public static final Integer[] ARRAYS = Arrays.stream(values())
- .map(MesCalHolidayTypeEnum::getType).toArray(Integer[]::new);
-
- private final Integer type;
- private final String name;
-
- @Override
- public Integer[] array() {
- return ARRAYS;
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalPlanStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalPlanStatusEnum.java
deleted file mode 100644
index 49fef8c..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalPlanStatusEnum.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package cn.iocoder.yudao.module.mes.enums.cal;
-
-import cn.iocoder.yudao.framework.common.core.ArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * MES 鎺掔彮璁″垝鐘舵�佹灇涓�
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@Getter
-@AllArgsConstructor
-public enum MesCalPlanStatusEnum implements ArrayValuable<Integer> {
-
- /**
- * 鑽夌
- *
- * 瀵瑰簲 MesCalPlanService#createPlan 鏂规硶
- */
- PREPARE(0, "鑽夌"),
- /**
- * 宸茬‘璁�
- *
- * 瀵瑰簲 MesCalPlanService#confirmPlan 鏂规硶
- */
- CONFIRMED(1, "宸茬‘璁�");
-
- public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesCalPlanStatusEnum::getStatus).toArray(Integer[]::new);
-
- /**
- * 鐘舵�佸��
- */
- private final Integer status;
- /**
- * 鐘舵�佸悕
- */
- private final String name;
-
- @Override
- public Integer[] array() {
- return ARRAYS;
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalShiftMethodEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalShiftMethodEnum.java
deleted file mode 100644
index 80e6a83..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalShiftMethodEnum.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package cn.iocoder.yudao.module.mes.enums.cal;
-
-import cn.iocoder.yudao.framework.common.core.ArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * MES 鍊掔彮鏂瑰紡鏋氫妇
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@Getter
-@AllArgsConstructor
-public enum MesCalShiftMethodEnum implements ArrayValuable<Integer> {
-
- QUARTER(1, "鎸夊搴�"),
- MONTH(2, "鎸夋湀"),
- WEEK(3, "鎸夊懆"),
- DAY(4, "鎸夊ぉ");
-
- public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesCalShiftMethodEnum::getMethod).toArray(Integer[]::new);
-
- /**
- * 鏂瑰紡鍊�
- */
- private final Integer method;
- /**
- * 鏂瑰紡鍚�
- */
- private final String name;
-
- @Override
- public Integer[] array() {
- return ARRAYS;
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalShiftTypeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalShiftTypeEnum.java
deleted file mode 100644
index 1bb2e68..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalShiftTypeEnum.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package cn.iocoder.yudao.module.mes.enums.cal;
-
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.lang.Pair;
-import cn.iocoder.yudao.framework.common.core.ArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * MES 杞彮鏂瑰紡鏋氫妇
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@Getter
-@AllArgsConstructor
-public enum MesCalShiftTypeEnum implements ArrayValuable<Integer> {
-
- SINGLE(1, "鍗曠櫧鐝�", ListUtil.of(
- Pair.of("鐧界彮", new String[]{"08:00", "18:00"})
- )),
- TWO(2, "涓ょ彮鍊�", ListUtil.of(
- Pair.of("鐧界彮", new String[]{"08:00", "20:00"}),
- Pair.of("澶滅彮", new String[]{"20:00", "08:00"})
- )),
- THREE(3, "涓夌彮鍊�", ListUtil.of(
- Pair.of("鐧界彮", new String[]{"08:00", "16:00"}),
- Pair.of("涓彮", new String[]{"16:00", "00:00"}),
- Pair.of("澶滅彮", new String[]{"00:00", "08:00"})
- ));
-
- public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesCalShiftTypeEnum::getType).toArray(Integer[]::new);
-
- /**
- * 绫诲瀷鍊�
- */
- private final Integer type;
- /**
- * 绫诲瀷鍚�
- */
- private final String name;
- /**
- * 鐝閰嶇疆鍒楄〃
- *
- * key: 鐝鍚嶇О锛堝 "鐧界彮", "澶滅彮", "涓彮"锛�
- * value: [startTime, endTime]锛堝 ["08:00", "18:00"]锛�
- */
- private final List<Pair<String, String[]>> shifts;
-
- /**
- * 鑾峰彇鐝鏁伴噺涓婇檺
- */
- public int getShiftCount() {
- return shifts.size();
- }
-
- /**
- * 鑾峰彇鎵�闇�鐨勬渶灏戠彮缁勬暟閲�
- */
- public int getRequiredTeamCount() {
- return shifts.size();
- }
-
- /**
- * 鏍规嵁绫诲瀷鍊艰幏鍙栨灇涓�
- */
- public static MesCalShiftTypeEnum valueOf(Integer type) {
- for (MesCalShiftTypeEnum value : values()) {
- if (value.getType().equals(type)) {
- return value;
- }
- }
- throw new IllegalArgumentException("涓嶆敮鎸佺殑杞彮鏂瑰紡: " + type);
- }
-
- @Override
- public Integer[] array() {
- return ARRAYS;
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/md/autocode/MesMdAutoCodeRuleCodeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/md/autocode/MesMdAutoCodeRuleCodeEnum.java
index 1cad00b..4d8f8e7 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/md/autocode/MesMdAutoCodeRuleCodeEnum.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/md/autocode/MesMdAutoCodeRuleCodeEnum.java
@@ -31,6 +31,7 @@
QC_IPQC_CODE("QC_IPQC_CODE", "杩囩▼妫�楠屽崟缂栫爜"),
QC_OQC_CODE("QC_OQC_CODE", "鍑鸿揣妫�楠屽崟缂栫爜"),
QC_RQC_CODE("QC_RQC_CODE", "閫�璐ф楠屽崟缂栫爜"),
+ QC_PATROL_CODE("QC_PATROL_CODE", "璐ㄩ噺宸℃鍗曠紪鐮�"),
WM_WAREHOUSE_CODE("WM_WAREHOUSE_CODE", "浠撳簱缂栫爜"),
WM_LOCATION_CODE("WM_LOCATION_CODE", "搴撳尯缂栫爜"),
WM_AREA_CODE("WM_AREA_CODE", "搴撲綅缂栫爜"),
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProProcessBillingTypeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProProcessBillingTypeEnum.java
new file mode 100644
index 0000000..4416dd9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProProcessBillingTypeEnum.java
@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.mes.enums.pro;
+
+import cn.iocoder.yudao.framework.common.core.ArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * MES 宸ュ簭璁¤垂绫诲瀷鏋氫妇
+ *
+ * <p>鍐冲畾鎶ュ伐宸ヨ祫鐨勮绠楀彛寰勶細
+ * <ul>
+ * <li>璁℃椂锛氭姤宸ュ伐璧� = 鏈鎶ュ伐宸ユ椂 脳 宸ヨ祫瀹氶锛堝厓/灏忔椂锛�</li>
+ * <li>璁′欢锛氭姤宸ュ伐璧� = 鏈鎶ュ伐鏁伴噺 脳 宸ヨ祫瀹氶锛堝厓/浠讹級</li>
+ * </ul>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum MesProProcessBillingTypeEnum implements ArrayValuable<Integer> {
+
+ TIME(1, "璁℃椂"),
+ PIECE(2, "璁′欢");
+
+ public static final Integer[] ARRAYS = Arrays.stream(values())
+ .map(MesProProcessBillingTypeEnum::getType).toArray(Integer[]::new);
+
+ /**
+ * 绫诲瀷鍊�
+ */
+ private final Integer type;
+ /**
+ * 绫诲瀷鍚�
+ */
+ private final String name;
+
+ @Override
+ public Integer[] array() {
+ return ARRAYS;
+ }
+
+ public static MesProProcessBillingTypeEnum valueOfType(Integer type) {
+ if (type == null) {
+ return null;
+ }
+ return Arrays.stream(values()).filter(e -> e.getType().equals(type)).findFirst().orElse(null);
+ }
+
+ public static String getNameByType(Integer type) {
+ MesProProcessBillingTypeEnum billingType = valueOfType(type);
+ return billingType != null ? billingType.getName() : String.valueOf(type);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesNcrDispositionEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesNcrDispositionEnum.java
index c91052a..35ef079 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesNcrDispositionEnum.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesNcrDispositionEnum.java
@@ -18,8 +18,9 @@
RETURN(1, "閫�璐�"),
SCRAP(2, "鎶ュ簾"),
REWORK(3, "杩斿伐"),
- CONCESSION(4, "璁╂鎺ユ敹"),
- DOWNGRADE(5, "闄嶇骇浣跨敤");
+ CONCESSION(4, "璁╂鏀捐"),
+ DOWNGRADE(5, "闄嶇骇浣跨敤"),
+ REPAIR(6, "杩斾慨");
public static final Integer[] ARRAYS = Arrays.stream(values())
.map(MesNcrDispositionEnum::getType).toArray(Integer[]::new);
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesNcrStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesNcrStatusEnum.java
index ff0f325..3727ce9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesNcrStatusEnum.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesNcrStatusEnum.java
@@ -17,6 +17,7 @@
public enum MesNcrStatusEnum implements ArrayValuable<Integer> {
PENDING_REVIEW(MesOrderStatusConstants.PREPARE, "寰呰瘎瀹�"),
+ APPROVING(MesOrderStatusConstants.APPROVING, "瀹℃壒涓�"),
REVIEWED(MesOrderStatusConstants.REVIEWED, "宸茶瘎瀹�"),
DISPOSED(MesOrderStatusConstants.DISPOSED, "宸插缃�"),
CLOSED(MesOrderStatusConstants.CLOSED, "宸插叧闂�");
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmSalesNoticeStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmSalesNoticeStatusEnum.java
index 1cf75da..f2223e5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmSalesNoticeStatusEnum.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmSalesNoticeStatusEnum.java
@@ -23,6 +23,10 @@
*/
PREPARE(MesOrderStatusConstants.PREPARE, "鑽夌"),
/**
+ * 瀹℃壒涓�
+ */
+ APPROVING(MesOrderStatusConstants.APPROVING, "瀹℃壒涓�"),
+ /**
* 寰呭嚭搴擄紝瀵规帴 wm 妯″潡鐨� MesWmProductSalesDO 鍚庣画娴佺▼
*
* 瀵瑰簲 MesWmSalesNoticeService#submitSalesNotice 鏂规硶
@@ -51,4 +55,8 @@
return ARRAYS;
}
+ public static MesWmSalesNoticeStatusEnum getByStatus(Integer status) {
+ return Arrays.stream(values()).filter(e -> e.getStatus().equals(status)).findFirst().orElse(null);
+ }
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/holiday/MesCalHolidayService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/holiday/MesCalHolidayService.java
deleted file mode 100644
index 7efc71e..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/holiday/MesCalHolidayService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package cn.iocoder.yudao.module.mes.service.cal.holiday;
-
-import cn.iocoder.yudao.module.mes.controller.admin.cal.holiday.vo.MesCalHolidaySaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.holiday.MesCalHolidayDO;
-import jakarta.validation.Valid;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * MES 鍋囨湡璁剧疆 Service 鎺ュ彛
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-public interface MesCalHolidayService {
-
- /**
- * 淇濆瓨鍋囨湡璁剧疆锛堝惈 upsert 閫昏緫锛氬鏋滆鏃ユ湡宸插瓨鍦ㄨ褰曪紝鍒欐洿鏂帮級
- *
- * @param saveReqVO 淇濆瓨淇℃伅
- * @return 缂栧彿
- */
- Long saveHoliday(@Valid MesCalHolidaySaveReqVO saveReqVO);
-
- /**
- * 鑾峰緱鍋囨湡璁剧疆鍒楄〃
- *
- * @param startDay 寮�濮嬫棩鏈燂紙鍙�夛級
- * @param endDay 缁撴潫鏃ユ湡锛堝彲閫夛級
- * @return 鍋囨湡璁剧疆鍒楄〃
- */
- List<MesCalHolidayDO> getHolidayList(LocalDateTime startDay, LocalDateTime endDay);
-
- /**
- * 鏍规嵁鏃ユ湡鑾峰緱鍋囨湡璁剧疆
- *
- * @param day 鏃ユ湡
- * @return 鍋囨湡璁剧疆锛屼笉瀛樺湪鍒欒繑鍥� null
- */
- MesCalHolidayDO getHolidayByDay(LocalDateTime day);
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/holiday/MesCalHolidayServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/holiday/MesCalHolidayServiceImpl.java
deleted file mode 100644
index 4d603e2..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/holiday/MesCalHolidayServiceImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package cn.iocoder.yudao.module.mes.service.cal.holiday;
-
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.holiday.vo.MesCalHolidaySaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.holiday.MesCalHolidayDO;
-import cn.iocoder.yudao.module.mes.dal.mysql.cal.holiday.MesCalHolidayMapper;
-import jakarta.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * MES 鍋囨湡璁剧疆 Service 瀹炵幇绫�
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@Service
-@Validated
-public class MesCalHolidayServiceImpl implements MesCalHolidayService {
-
- @Resource
- private MesCalHolidayMapper holidayMapper;
-
- @Override
- public Long saveHoliday(MesCalHolidaySaveReqVO saveReqVO) {
- // Upsert 閫昏緫锛氬鏋滆鏃ユ湡宸叉湁璁板綍锛屽垯鏇存柊
- MesCalHolidayDO existing = holidayMapper.selectByDay(saveReqVO.getDay());
- if (existing != null) {
- MesCalHolidayDO updateObj = BeanUtils.toBean(saveReqVO, MesCalHolidayDO.class);
- updateObj.setId(existing.getId());
- holidayMapper.updateById(updateObj);
- return existing.getId();
- }
-
- // 鎻掑叆鏂拌褰�
- MesCalHolidayDO holiday = BeanUtils.toBean(saveReqVO, MesCalHolidayDO.class);
- holidayMapper.insert(holiday);
- return holiday.getId();
- }
-
- @Override
- public List<MesCalHolidayDO> getHolidayList(LocalDateTime startDay, LocalDateTime endDay) {
- return holidayMapper.selectList(startDay, endDay);
- }
-
- @Override
- public MesCalHolidayDO getHolidayByDay(LocalDateTime day) {
- return holidayMapper.selectByDay(day);
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanService.java
deleted file mode 100644
index f2ded5e..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanService.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package cn.iocoder.yudao.module.mes.service.cal.plan;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.MesCalPlanPageReqVO;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.MesCalPlanSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanDO;
-import jakarta.validation.Valid;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
-
-/**
- * MES 鎺掔彮璁″垝 Service 鎺ュ彛
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-public interface MesCalPlanService {
-
- /**
- * 鍒涘缓鎺掔彮璁″垝
- *
- * @param createReqVO 鍒涘缓淇℃伅
- * @return 缂栧彿
- */
- Long createPlan(@Valid MesCalPlanSaveReqVO createReqVO);
-
- /**
- * 鏇存柊鎺掔彮璁″垝
- *
- * @param updateReqVO 鏇存柊淇℃伅
- */
- void updatePlan(@Valid MesCalPlanSaveReqVO updateReqVO);
-
- /**
- * 纭鎺掔彮璁″垝
- *
- * @param id 缂栧彿
- */
- void confirmPlan(Long id);
-
- /**
- * 鍒犻櫎鎺掔彮璁″垝
- *
- * @param id 缂栧彿
- */
- void deletePlan(Long id);
-
- /**
- * 鏍¢獙鎺掔彮璁″垝涓鸿崏绋跨姸鎬侊紙纭鍚庝笉鍏佽缂栬緫锛�
- *
- * @param planId 璁″垝缂栧彿
- * @return 鎺掔彮璁″垝
- */
- MesCalPlanDO validatePlanPrepare(Long planId);
-
- /**
- * 鑾峰緱鎺掔彮璁″垝
- *
- * @param id 缂栧彿
- * @return 鎺掔彮璁″垝
- */
- MesCalPlanDO getPlan(Long id);
-
- /**
- * 鑾峰緱鎺掔彮璁″垝鍒楄〃
- *
- * @param ids 鎺掔彮璁″垝缂栧彿闆嗗悎
- * @return 鎺掔彮璁″垝鍒楄〃
- */
- List<MesCalPlanDO> getPlanList(Collection<Long> ids);
-
- /**
- * 鑾峰緱鎺掔彮璁″垝 Map
- *
- * @param ids 鎺掔彮璁″垝缂栧彿闆嗗悎
- * @return 鎺掔彮璁″垝 Map锛宬ey 涓虹紪鍙�
- */
- default Map<Long, MesCalPlanDO> getPlanMap(Collection<Long> ids) {
- return convertMap(getPlanList(ids), MesCalPlanDO::getId);
- }
-
- /**
- * 鑾峰緱鎺掔彮璁″垝鍒嗛〉
- *
- * @param pageReqVO 鍒嗛〉鏌ヨ
- * @return 鎺掔彮璁″垝鍒嗛〉
- */
- PageResult<MesCalPlanDO> getPlanPage(MesCalPlanPageReqVO pageReqVO);
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanServiceImpl.java
deleted file mode 100644
index 1b0451e..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanServiceImpl.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package cn.iocoder.yudao.module.mes.service.cal.plan;
-
-import cn.hutool.core.collection.CollUtil;
-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.cal.plan.vo.MesCalPlanPageReqVO;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.MesCalPlanSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanDO;
-import cn.iocoder.yudao.module.mes.dal.mysql.cal.plan.MesCalPlanMapper;
-import cn.iocoder.yudao.module.mes.enums.cal.MesCalPlanStatusEnum;
-import cn.iocoder.yudao.module.mes.enums.cal.MesCalShiftTypeEnum;
-import cn.iocoder.yudao.module.mes.service.cal.team.MesCalTeamShiftService;
-import cn.hutool.core.util.ObjUtil;
-import jakarta.annotation.Resource;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
-
-/**
- * MES 鎺掔彮璁″垝 Service 瀹炵幇绫�
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@Service
-@Validated
-public class MesCalPlanServiceImpl implements MesCalPlanService {
-
- @Resource
- private MesCalPlanMapper planMapper;
-
- @Resource
- @Lazy
- private MesCalPlanShiftService planShiftService;
- @Resource
- @Lazy
- private MesCalPlanTeamService planTeamService;
- @Resource
- @Lazy
- private MesCalTeamShiftService teamShiftService;
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public Long createPlan(MesCalPlanSaveReqVO createReqVO) {
- // 1. 鏍¢獙缂栫爜鍞竴
- validatePlanCodeUnique(null, createReqVO.getCode());
-
- // 2. 鎻掑叆璁″垝
- MesCalPlanDO plan = BeanUtils.toBean(createReqVO, MesCalPlanDO.class);
- plan.setStatus(MesCalPlanStatusEnum.PREPARE.getStatus()); // 榛樿鑽夌
- planMapper.insert(plan);
-
- // 3. 鑷姩鐢熸垚榛樿鐝
- if (plan.getShiftType() != null) {
- planShiftService.addDefaultPlanShift(plan.getId(), plan.getShiftType());
- }
- return plan.getId();
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void updatePlan(MesCalPlanSaveReqVO updateReqVO) {
- // 1.1 鏍¢獙瀛樺湪
- MesCalPlanDO existPlan = validatePlanExists(updateReqVO.getId());
- // 1.2 鏍¢獙璁″垝鏈‘璁わ紙宸茬‘璁や笉鍏佽缂栬緫锛�
- if (MesCalPlanStatusEnum.CONFIRMED.getStatus().equals(existPlan.getStatus())) {
- throw exception(CAL_PLAN_NOT_PREPARE);
- }
- // 1.3 鏍¢獙缂栫爜鍞竴
- validatePlanCodeUnique(updateReqVO.getId(), updateReqVO.getCode());
-
- // 2. 鏇存柊
- updateReqVO.setStatus(null); // 涓嶅厑璁搁�氳繃 update 淇敼鐘舵�侊紝鐘舵�佸彉鏇磋蛋涓撶敤鎺ュ彛
- MesCalPlanDO updateObj = BeanUtils.toBean(updateReqVO, MesCalPlanDO.class);
- planMapper.updateById(updateObj);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void confirmPlan(Long id) {
- // 1.1 鏍¢獙瀛樺湪 + 鏍¢獙鐘舵�佷负鑽夌
- MesCalPlanDO plan = validatePlanPrepare(id);
- // 1.2 鏍¢獙鐝粍鏁伴噺涓庤疆鐝柟寮忓尮閰�
- validateTeamCountForConfirm(id, plan.getShiftType());
-
- // 2. 鏇存柊鐘舵�佷负宸茬‘璁�
- MesCalPlanDO updateObj = new MesCalPlanDO();
- updateObj.setId(id);
- updateObj.setStatus(MesCalPlanStatusEnum.CONFIRMED.getStatus());
- planMapper.updateById(updateObj);
-
- // 3. 鐢熸垚鐝粍鎺掔彮璁板綍
- teamShiftService.generateTeamShiftRecords(id);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void deletePlan(Long id) {
- // 1.1 鏍¢獙瀛樺湪 + 鏍¢獙鐘舵�佷负鑽夌
- validatePlanPrepare(id);
-
- // 2.1 绾ц仈鍒犻櫎鐝 + 鐝粍鍏宠仈
- planShiftService.deletePlanShiftByPlanId(id);
- planTeamService.deleteByPlanId(id);
- // 2.2 鍒犻櫎璁″垝
- planMapper.deleteById(id);
- }
-
- @Override
- public MesCalPlanDO getPlan(Long id) {
- return planMapper.selectById(id);
- }
-
- @Override
- public List<MesCalPlanDO> getPlanList(Collection<Long> ids) {
- if (CollUtil.isEmpty(ids)) {
- return Collections.emptyList();
- }
- return planMapper.selectByIds(ids);
- }
-
- @Override
- public PageResult<MesCalPlanDO> getPlanPage(MesCalPlanPageReqVO pageReqVO) {
- return planMapper.selectPage(pageReqVO);
- }
-
- @Override
- public MesCalPlanDO validatePlanPrepare(Long planId) {
- MesCalPlanDO plan = validatePlanExists(planId);
- if (ObjUtil.notEqual(MesCalPlanStatusEnum.PREPARE.getStatus(), plan.getStatus())) {
- throw exception(CAL_PLAN_NOT_PREPARE);
- }
- return plan;
- }
-
- private MesCalPlanDO validatePlanExists(Long id) {
- MesCalPlanDO plan = planMapper.selectById(id);
- if (plan == null) {
- throw exception(CAL_PLAN_NOT_EXISTS);
- }
- return plan;
- }
-
- private void validatePlanCodeUnique(Long id, String code) {
- MesCalPlanDO plan = planMapper.selectByCode(code);
- if (plan == null) {
- return;
- }
- if (id == null || !id.equals(plan.getId())) {
- throw exception(CAL_PLAN_CODE_DUPLICATE);
- }
- }
-
- /**
- * 纭鎺掔彮璁″垝鏃讹紝鏍¢獙鐝粍鏁伴噺鏄惁涓庤疆鐝柟寮忓尮閰�
- */
- private void validateTeamCountForConfirm(Long planId, Integer shiftType) {
- Long teamCount = planTeamService.getPlanTeamCountByPlanId(planId);
- MesCalShiftTypeEnum shiftTypeEnum = MesCalShiftTypeEnum.valueOf(shiftType);
- if (teamCount < shiftTypeEnum.getRequiredTeamCount()) {
- throw exception(CAL_PLAN_TEAM_COUNT_NOT_MATCH);
- }
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanShiftService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanShiftService.java
deleted file mode 100644
index 466c0e0..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanShiftService.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package cn.iocoder.yudao.module.mes.service.cal.plan;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.shift.MesCalPlanShiftPageReqVO;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.shift.MesCalPlanShiftSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanShiftDO;
-import jakarta.validation.Valid;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
-
-/**
- * MES 璁″垝鐝 Service 鎺ュ彛
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-public interface MesCalPlanShiftService {
-
- /**
- * 鍒涘缓璁″垝鐝
- *
- * @param createReqVO 鍒涘缓淇℃伅
- * @return 缂栧彿
- */
- Long createPlanShift(@Valid MesCalPlanShiftSaveReqVO createReqVO);
-
- /**
- * 鏇存柊璁″垝鐝
- *
- * @param updateReqVO 鏇存柊淇℃伅
- */
- void updatePlanShift(@Valid MesCalPlanShiftSaveReqVO updateReqVO);
-
- /**
- * 鍒犻櫎璁″垝鐝
- *
- * @param id 缂栧彿
- */
- void deletePlanShift(Long id);
-
- /**
- * 鑾峰緱璁″垝鐝
- *
- * @param id 缂栧彿
- * @return 璁″垝鐝
- */
- MesCalPlanShiftDO getPlanShift(Long id);
-
- /**
- * 鑾峰緱璁″垝鐝鍒嗛〉
- *
- * @param pageReqVO 鍒嗛〉鏌ヨ
- * @return 璁″垝鐝鍒嗛〉
- */
- PageResult<MesCalPlanShiftDO> getPlanShiftPage(MesCalPlanShiftPageReqVO pageReqVO);
-
- /**
- * 鑾峰緱鎸囧畾鎺掔彮璁″垝鐨勭彮娆″垪琛�
- *
- * @param planId 鎺掔彮璁″垝缂栧彿
- * @return 鐝鍒楄〃
- */
- List<MesCalPlanShiftDO> getPlanShiftListByPlanId(Long planId);
-
- /**
- * 鑾峰緱鎸囧畾鎺掔彮璁″垝鐨勭彮娆℃暟閲�
- *
- * @param planId 鎺掔彮璁″垝缂栧彿
- * @return 鐝鏁伴噺
- */
- Long getPlanShiftCountByPlanId(Long planId);
-
- /**
- * 鏍规嵁杞彮鏂瑰紡娣诲姞榛樿鐝
- *
- * @param planId 鎺掔彮璁″垝缂栧彿
- * @param shiftType 杞彮鏂瑰紡
- */
- void addDefaultPlanShift(Long planId, Integer shiftType);
-
- /**
- * 鑾峰緱璁″垝鐝鍒楄〃
- *
- * @param ids 鐝缂栧彿闆嗗悎
- * @return 鐝鍒楄〃
- */
- List<MesCalPlanShiftDO> getPlanShiftList(Collection<Long> ids);
-
- /**
- * 鑾峰緱璁″垝鐝 Map
- *
- * @param ids 鐝缂栧彿闆嗗悎
- * @return 鐝 Map锛宬ey 涓虹紪鍙�
- */
- default Map<Long, MesCalPlanShiftDO> getPlanShiftMap(Collection<Long> ids) {
- return convertMap(getPlanShiftList(ids), MesCalPlanShiftDO::getId);
- }
-
- /**
- * 鏍规嵁鎺掔彮璁″垝缂栧彿鍒犻櫎鎵�鏈夌彮娆�
- *
- * @param planId 鎺掔彮璁″垝缂栧彿
- */
- void deletePlanShiftByPlanId(Long planId);
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanShiftServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanShiftServiceImpl.java
deleted file mode 100644
index 4f08a5a..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanShiftServiceImpl.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package cn.iocoder.yudao.module.mes.service.cal.plan;
-
-import cn.hutool.core.lang.Pair;
-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.cal.plan.vo.shift.MesCalPlanShiftPageReqVO;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.shift.MesCalPlanShiftSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanShiftDO;
-import cn.iocoder.yudao.module.mes.dal.mysql.cal.plan.MesCalPlanShiftMapper;
-import cn.iocoder.yudao.module.mes.enums.cal.MesCalShiftTypeEnum;
-import jakarta.annotation.Resource;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
-import cn.hutool.core.collection.CollUtil;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
-
-/**
- * MES 璁″垝鐝 Service 瀹炵幇绫�
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@Service
-@Validated
-public class MesCalPlanShiftServiceImpl implements MesCalPlanShiftService {
-
- @Resource
- private MesCalPlanShiftMapper planShiftMapper;
-
- @Resource
- @Lazy
- private MesCalPlanService planService;
-
- @Override
- public Long createPlanShift(MesCalPlanShiftSaveReqVO createReqVO) {
- // 鏍¢獙璁″垝鏈‘璁�
- planService.validatePlanPrepare(createReqVO.getPlanId());
- // 鏍¢獙鐝鏁伴噺闄愬埗
- validatePlanShiftCount(createReqVO.getPlanId());
-
- // 鎻掑叆
- MesCalPlanShiftDO planShift = BeanUtils.toBean(createReqVO, MesCalPlanShiftDO.class);
- planShiftMapper.insert(planShift);
- return planShift.getId();
- }
-
- @Override
- public void updatePlanShift(MesCalPlanShiftSaveReqVO updateReqVO) {
- // 鏍¢獙瀛樺湪
- MesCalPlanShiftDO existShift = validatePlanShiftExists(updateReqVO.getId());
- // 鏍¢獙璁″垝鏈‘璁�
- planService.validatePlanPrepare(existShift.getPlanId());
- // 鏇存柊
- MesCalPlanShiftDO updateObj = BeanUtils.toBean(updateReqVO, MesCalPlanShiftDO.class);
- planShiftMapper.updateById(updateObj);
- }
-
- @Override
- public void deletePlanShift(Long id) {
- // 鏍¢獙瀛樺湪
- MesCalPlanShiftDO existShift = validatePlanShiftExists(id);
- // 鏍¢獙璁″垝鏈‘璁�
- planService.validatePlanPrepare(existShift.getPlanId());
- // 鍒犻櫎
- planShiftMapper.deleteById(id);
- }
-
- private MesCalPlanShiftDO validatePlanShiftExists(Long id) {
- MesCalPlanShiftDO shift = planShiftMapper.selectById(id);
- if (shift == null) {
- throw exception(CAL_PLAN_SHIFT_NOT_EXISTS);
- }
- return shift;
- }
-
- /**
- * 鏍¢獙鐝鏁伴噺鏄惁瓒呴檺
- * <p>
- * 閫氳繃 planId 鏌ヨ宸叉湁鐝鏁伴噺锛屾牴鎹帓鐝鍒掔殑杞彮鏂瑰紡鏍¢獙
- */
- private void validatePlanShiftCount(Long planId) {
- MesCalPlanDO plan = planService.getPlan(planId);
- if (plan == null) {
- return;
- }
- Long count = planShiftMapper.selectCountByPlanId(planId);
- MesCalShiftTypeEnum shiftTypeEnum = MesCalShiftTypeEnum.valueOf(plan.getShiftType());
- if (count >= shiftTypeEnum.getShiftCount()) {
- throw exception(CAL_PLAN_SHIFT_COUNT_EXCEED);
- }
- }
-
- @Override
- public MesCalPlanShiftDO getPlanShift(Long id) {
- return planShiftMapper.selectById(id);
- }
-
- @Override
- public PageResult<MesCalPlanShiftDO> getPlanShiftPage(MesCalPlanShiftPageReqVO pageReqVO) {
- return planShiftMapper.selectPage(pageReqVO);
- }
-
- @Override
- public List<MesCalPlanShiftDO> getPlanShiftListByPlanId(Long planId) {
- return planShiftMapper.selectListByPlanId(planId);
- }
-
- @Override
- public Long getPlanShiftCountByPlanId(Long planId) {
- return planShiftMapper.selectCountByPlanId(planId);
- }
-
- @Override
- public void addDefaultPlanShift(Long planId, Integer shiftType) {
- // 鏍规嵁杞彮鏂瑰紡锛岄�氳繃鏋氫妇閰嶇疆鐢熸垚榛樿鐝
- MesCalShiftTypeEnum shiftTypeEnum = MesCalShiftTypeEnum.valueOf(shiftType);
- List<Pair<String, String[]>> shifts = shiftTypeEnum.getShifts();
- for (int i = 0; i < shifts.size(); i++) {
- Pair<String, String[]> shift = shifts.get(i);
- MesCalPlanShiftDO planShiftDO = MesCalPlanShiftDO.builder()
- .planId(planId).sort(i + 1).name(shift.getKey())
- .startTime(shift.getValue()[0]).endTime(shift.getValue()[1])
- .build();
- planShiftMapper.insert(planShiftDO);
- }
- }
-
- @Override
- public List<MesCalPlanShiftDO> getPlanShiftList(Collection<Long> ids) {
- if (CollUtil.isEmpty(ids)) {
- return Collections.emptyList();
- }
- return planShiftMapper.selectByIds(ids);
- }
-
- @Override
- public void deletePlanShiftByPlanId(Long planId) {
- planShiftMapper.deleteByPlanId(planId);
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanTeamService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanTeamService.java
deleted file mode 100644
index 91d7481..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanTeamService.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package cn.iocoder.yudao.module.mes.service.cal.plan;
-
-import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.team.MesCalPlanTeamSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanTeamDO;
-import jakarta.validation.Valid;
-
-import java.util.List;
-
-/**
- * MES 璁″垝鐝粍鍏宠仈 Service 鎺ュ彛
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-public interface MesCalPlanTeamService {
-
- /**
- * 鍒涘缓璁″垝鐝粍鍏宠仈
- *
- * @param createReqVO 鍒涘缓淇℃伅
- * @return 缂栧彿
- */
- Long createPlanTeam(@Valid MesCalPlanTeamSaveReqVO createReqVO);
-
- /**
- * 鍒犻櫎璁″垝鐝粍鍏宠仈
- *
- * @param id 缂栧彿
- */
- void deletePlanTeam(Long id);
-
- /**
- * 鑾峰緱鎸囧畾鎺掔彮璁″垝鐨勭彮缁勫垪琛�
- *
- * @param planId 鎺掔彮璁″垝缂栧彿
- * @return 鐝粍鍏宠仈鍒楄〃
- */
- List<MesCalPlanTeamDO> getPlanTeamListByPlanId(Long planId);
-
- /**
- * 鑾峰緱鎸囧畾鎺掔彮璁″垝鐨勭彮缁勬暟閲�
- *
- * @param planId 鎺掔彮璁″垝缂栧彿
- * @return 鐝粍鏁伴噺
- */
- Long getPlanTeamCountByPlanId(Long planId);
-
- /**
- * 鏍规嵁鎺掔彮璁″垝缂栧彿鍒犻櫎鎵�鏈夌彮缁勫叧鑱�
- *
- * @param planId 鎺掔彮璁″垝缂栧彿
- */
- void deleteByPlanId(Long planId);
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanTeamServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanTeamServiceImpl.java
deleted file mode 100644
index d943274..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanTeamServiceImpl.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package cn.iocoder.yudao.module.mes.service.cal.plan;
-
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.team.MesCalPlanTeamSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanTeamDO;
-import cn.iocoder.yudao.module.mes.dal.mysql.cal.plan.MesCalPlanTeamMapper;
-import cn.iocoder.yudao.module.mes.service.cal.team.MesCalTeamService;
-import jakarta.annotation.Resource;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
-
-/**
- * MES 璁″垝鐝粍鍏宠仈 Service 瀹炵幇绫�
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@Service
-@Validated
-public class MesCalPlanTeamServiceImpl implements MesCalPlanTeamService {
-
- @Resource
- private MesCalPlanTeamMapper planTeamMapper;
-
- @Resource
- @Lazy
- private MesCalPlanService planService;
- @Resource
- @Lazy
- private MesCalTeamService teamService;
-
- @Override
- public Long createPlanTeam(MesCalPlanTeamSaveReqVO createReqVO) {
- // 鏍¢獙璁″垝鏈‘璁�
- planService.validatePlanPrepare(createReqVO.getPlanId());
- // 鏍¢獙鐝粍瀛樺湪
- teamService.validateTeamExists(createReqVO.getTeamId());
- // 鏍¢獙鐝粍涓嶉噸澶�
- validatePlanTeamDuplicate(createReqVO.getPlanId(), createReqVO.getTeamId());
-
- // 鎻掑叆
- MesCalPlanTeamDO planTeam = BeanUtils.toBean(createReqVO, MesCalPlanTeamDO.class);
- planTeamMapper.insert(planTeam);
- return planTeam.getId();
- }
-
- @Override
- public void deletePlanTeam(Long id) {
- // 鏍¢獙瀛樺湪
- MesCalPlanTeamDO existPlanTeam = validatePlanTeamExists(id);
- // 鏍¢獙璁″垝鏈‘璁�
- planService.validatePlanPrepare(existPlanTeam.getPlanId());
- // 鍒犻櫎
- planTeamMapper.deleteById(id);
- }
-
- private MesCalPlanTeamDO validatePlanTeamExists(Long id) {
- MesCalPlanTeamDO planTeam = planTeamMapper.selectById(id);
- if (planTeam == null) {
- throw exception(CAL_PLAN_TEAM_NOT_EXISTS);
- }
- return planTeam;
- }
-
- private void validatePlanTeamDuplicate(Long planId, Long teamId) {
- MesCalPlanTeamDO planTeam = planTeamMapper.selectByPlanIdAndTeamId(planId, teamId);
- if (planTeam != null) {
- throw exception(CAL_PLAN_TEAM_DUPLICATE);
- }
- }
-
- @Override
- public List<MesCalPlanTeamDO> getPlanTeamListByPlanId(Long planId) {
- return planTeamMapper.selectListByPlanId(planId);
- }
-
- @Override
- public Long getPlanTeamCountByPlanId(Long planId) {
- return planTeamMapper.selectCountByPlanId(planId);
- }
-
- @Override
- public void deleteByPlanId(Long planId) {
- planTeamMapper.deleteByPlanId(planId);
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamMemberService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamMemberService.java
deleted file mode 100644
index ee9b60f..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamMemberService.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package cn.iocoder.yudao.module.mes.service.cal.team;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.member.MesCalTeamMemberPageReqVO;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.member.MesCalTeamMemberSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.team.MesCalTeamMemberDO;
-import jakarta.validation.Valid;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * MES 鐝粍鎴愬憳 Service 鎺ュ彛
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-public interface MesCalTeamMemberService {
-
- /**
- * 鍒涘缓鐝粍鎴愬憳
- *
- * @param createReqVO 鍒涘缓淇℃伅
- * @return 缂栧彿
- */
- Long createTeamMember(@Valid MesCalTeamMemberSaveReqVO createReqVO);
-
- /**
- * 鍒犻櫎鐝粍鎴愬憳
- *
- * @param id 缂栧彿
- */
- void deleteTeamMember(Long id);
-
- /**
- * 鑾峰緱鐝粍鎴愬憳
- *
- * @param id 缂栧彿
- * @return 鐝粍鎴愬憳
- */
- MesCalTeamMemberDO getTeamMember(Long id);
-
- /**
- * 鑾峰緱鐝粍鎴愬憳鍒嗛〉
- *
- * @param pageReqVO 鍒嗛〉鏌ヨ
- * @return 鐝粍鎴愬憳鍒嗛〉
- */
- PageResult<MesCalTeamMemberDO> getTeamMemberPage(MesCalTeamMemberPageReqVO pageReqVO);
-
- /**
- * 鑾峰緱鎸囧畾鐝粍鐨勬垚鍛樺垪琛�
- *
- * @param teamId 鐝粍缂栧彿
- * @return 鐝粍鎴愬憳鍒楄〃
- */
- List<MesCalTeamMemberDO> getTeamMemberListByTeamId(Long teamId);
-
- /**
- * 鑾峰緱鎸囧畾澶氫釜鐝粍鐨勬垚鍛樺垪琛�
- *
- * @param teamIds 鐝粍缂栧彿鍒楄〃
- * @return 鐝粍鎴愬憳鍒楄〃
- */
- List<MesCalTeamMemberDO> getTeamMemberListByTeamIds(Collection<Long> teamIds);
-
- /**
- * 鏍规嵁鐢ㄦ埛缂栧彿鑾峰緱鐝粍鎴愬憳
- *
- * @param userId 鐢ㄦ埛缂栧彿
- * @return 鐝粍鎴愬憳锛屼笉瀛樺湪鍒欒繑鍥� null
- */
- MesCalTeamMemberDO getTeamMemberByUserId(Long userId);
-
- /**
- * 鏍规嵁鐝粍缂栧彿鍒犻櫎鎵�鏈夋垚鍛�
- *
- * @param teamId 鐝粍缂栧彿
- */
- void deleteByTeamId(Long teamId);
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamMemberServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamMemberServiceImpl.java
deleted file mode 100644
index 7560e9a..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamMemberServiceImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package cn.iocoder.yudao.module.mes.service.cal.team;
-
-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.cal.team.vo.member.MesCalTeamMemberPageReqVO;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.member.MesCalTeamMemberSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.team.MesCalTeamMemberDO;
-import cn.iocoder.yudao.module.mes.dal.mysql.cal.team.MesCalTeamMemberMapper;
-import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import jakarta.annotation.Resource;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
-import java.util.Collection;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
-
-/**
- * MES 鐝粍鎴愬憳 Service 瀹炵幇绫�
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@Service
-@Validated
-public class MesCalTeamMemberServiceImpl implements MesCalTeamMemberService {
-
- @Resource
- private MesCalTeamMemberMapper teamMemberMapper;
-
- @Resource
- @Lazy
- private MesCalTeamService teamService;
-
- @Resource
- private AdminUserApi adminUserApi;
-
- @Override
- public Long createTeamMember(MesCalTeamMemberSaveReqVO createReqVO) {
- // 1.1 鏍¢獙鐝粍瀛樺湪
- teamService.validateTeamExists(createReqVO.getTeamId());
- // 1.2 鏍¢獙鐢ㄦ埛瀛樺湪
- validateUserExists(createReqVO.getUserId());
- // 1.3 鏍¢獙鐢ㄦ埛鏈垎閰嶅埌鍏朵粬鐝粍
- validateUserUnique(createReqVO.getUserId());
-
- // 2. 鎻掑叆
- MesCalTeamMemberDO member = BeanUtils.toBean(createReqVO, MesCalTeamMemberDO.class);
- teamMemberMapper.insert(member);
- return member.getId();
- }
-
- @Override
- public void deleteTeamMember(Long id) {
- // 鏍¢獙瀛樺湪
- validateTeamMemberExists(id);
- // 鍒犻櫎
- teamMemberMapper.deleteById(id);
- }
-
- @Override
- public MesCalTeamMemberDO getTeamMember(Long id) {
- return teamMemberMapper.selectById(id);
- }
-
- @Override
- public PageResult<MesCalTeamMemberDO> getTeamMemberPage(MesCalTeamMemberPageReqVO pageReqVO) {
- return teamMemberMapper.selectPage(pageReqVO);
- }
-
- @Override
- public List<MesCalTeamMemberDO> getTeamMemberListByTeamId(Long teamId) {
- return teamMemberMapper.selectListByTeamId(teamId);
- }
-
- @Override
- public List<MesCalTeamMemberDO> getTeamMemberListByTeamIds(Collection<Long> teamIds) {
- return teamMemberMapper.selectListByTeamIds(teamIds);
- }
-
- @Override
- public MesCalTeamMemberDO getTeamMemberByUserId(Long userId) {
- return teamMemberMapper.selectByUserId(userId);
- }
-
- @Override
- public void deleteByTeamId(Long teamId) {
- teamMemberMapper.deleteByTeamId(teamId);
- }
-
- private void validateTeamMemberExists(Long id) {
- if (teamMemberMapper.selectById(id) == null) {
- throw exception(CAL_TEAM_MEMBER_NOT_EXISTS);
- }
- }
-
- private void validateUserExists(Long userId) {
- if (adminUserApi.getUser(userId) == null) {
- throw exception(CAL_TEAM_MEMBER_USER_NOT_EXISTS);
- }
- }
-
- private void validateUserUnique(Long userId) {
- if (teamMemberMapper.selectByUserId(userId) != null) {
- throw exception(CAL_TEAM_MEMBER_USER_DUPLICATE);
- }
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamService.java
deleted file mode 100644
index bbdf589..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamService.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package cn.iocoder.yudao.module.mes.service.cal.team;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.MesCalTeamPageReqVO;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.MesCalTeamSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.team.MesCalTeamDO;
-import jakarta.validation.Valid;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
-
-/**
- * MES 鐝粍 Service 鎺ュ彛
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-public interface MesCalTeamService {
-
- /**
- * 鍒涘缓鐝粍
- *
- * @param createReqVO 鍒涘缓淇℃伅
- * @return 缂栧彿
- */
- Long createTeam(@Valid MesCalTeamSaveReqVO createReqVO);
-
- /**
- * 鏇存柊鐝粍
- *
- * @param updateReqVO 鏇存柊淇℃伅
- */
- void updateTeam(@Valid MesCalTeamSaveReqVO updateReqVO);
-
- /**
- * 鍒犻櫎鐝粍
- *
- * @param id 缂栧彿
- */
- void deleteTeam(Long id);
-
- /**
- * 鑾峰緱鐝粍
- *
- * @param id 缂栧彿
- * @return 鐝粍
- */
- MesCalTeamDO getTeam(Long id);
-
- /**
- * 鑾峰緱鐝粍鍒嗛〉
- *
- * @param pageReqVO 鍒嗛〉鏌ヨ
- * @return 鐝粍鍒嗛〉
- */
- PageResult<MesCalTeamDO> getTeamPage(MesCalTeamPageReqVO pageReqVO);
-
- /**
- * 鑾峰緱鐝粍鍒楄〃锛堝叏閲忥紝鐢ㄤ簬涓嬫媺閫夋嫨锛�
- *
- * @return 鐝粍鍒楄〃
- */
- List<MesCalTeamDO> getTeamList();
-
- /**
- * 鑾峰緱鐝粍鍒楄〃
- *
- * @param ids 鐝粍缂栧彿闆嗗悎
- * @return 鐝粍鍒楄〃
- */
- List<MesCalTeamDO> getTeamList(Collection<Long> ids);
-
- /**
- * 鑾峰緱鐝粍 Map
- *
- * @param ids 鐝粍缂栧彿闆嗗悎
- * @return 鐝粍 Map锛宬ey 涓虹紪鍙�
- */
- default Map<Long, MesCalTeamDO> getTeamMap(Collection<Long> ids) {
- return convertMap(getTeamList(ids), MesCalTeamDO::getId);
- }
-
- /**
- * 鏍¢獙鐝粍瀛樺湪
- *
- * @param id 缂栧彿
- * @return 鐝粍
- */
- MesCalTeamDO validateTeamExists(Long id);
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamServiceImpl.java
deleted file mode 100644
index 6d0dada..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamServiceImpl.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package cn.iocoder.yudao.module.mes.service.cal.team;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ObjUtil;
-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.cal.team.vo.MesCalTeamPageReqVO;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.MesCalTeamSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.team.MesCalTeamDO;
-import cn.iocoder.yudao.module.mes.dal.mysql.cal.team.MesCalTeamMapper;
-import jakarta.annotation.Resource;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
-
-/**
- * MES 鐝粍 Service 瀹炵幇绫�
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@Service
-@Validated
-public class MesCalTeamServiceImpl implements MesCalTeamService {
-
- @Resource
- private MesCalTeamMapper teamMapper;
-
- @Resource
- @Lazy
- private MesCalTeamMemberService teamMemberService;
- @Resource
- @Lazy
- private MesCalTeamShiftService teamShiftService;
-
- @Override
- public Long createTeam(MesCalTeamSaveReqVO createReqVO) {
- // 1. 鏍¢獙缂栫爜鍞竴
- validateTeamCodeUnique(null, createReqVO.getCode());
-
- // 2. 鎻掑叆
- MesCalTeamDO team = BeanUtils.toBean(createReqVO, MesCalTeamDO.class);
- teamMapper.insert(team);
- return team.getId();
- }
-
- @Override
- public void updateTeam(MesCalTeamSaveReqVO updateReqVO) {
- // 1.1 鏍¢獙瀛樺湪
- validateTeamExists(updateReqVO.getId());
- // 1.2 鏍¢獙缂栫爜鍞竴
- validateTeamCodeUnique(updateReqVO.getId(), updateReqVO.getCode());
-
- // 2. 鏇存柊
- MesCalTeamDO updateObj = BeanUtils.toBean(updateReqVO, MesCalTeamDO.class);
- teamMapper.updateById(updateObj);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void deleteTeam(Long id) {
- // 1. 鏍¢獙瀛樺湪
- validateTeamExists(id);
-
- // 2.1 绾ц仈鍒犻櫎鎴愬憳
- teamMemberService.deleteByTeamId(id);
- // 2.2 绾ц仈鍒犻櫎鎺掔彮璁板綍
- teamShiftService.deleteByTeamId(id);
- // 2.3 鍒犻櫎鐝粍
- teamMapper.deleteById(id);
- }
-
- @Override
- public MesCalTeamDO getTeam(Long id) {
- return teamMapper.selectById(id);
- }
-
- @Override
- public PageResult<MesCalTeamDO> getTeamPage(MesCalTeamPageReqVO pageReqVO) {
- return teamMapper.selectPage(pageReqVO);
- }
-
- @Override
- public List<MesCalTeamDO> getTeamList() {
- return teamMapper.selectList();
- }
-
- @Override
- public List<MesCalTeamDO> getTeamList(Collection<Long> ids) {
- if (CollUtil.isEmpty(ids)) {
- return Collections.emptyList();
- }
- return teamMapper.selectByIds(ids);
- }
-
- @Override
- public MesCalTeamDO validateTeamExists(Long id) {
- MesCalTeamDO team = teamMapper.selectById(id);
- if (team == null) {
- throw exception(CAL_TEAM_NOT_EXISTS);
- }
- return team;
- }
-
- private void validateTeamCodeUnique(Long id, String code) {
- MesCalTeamDO team = teamMapper.selectByCode(code);
- if (team == null) {
- return;
- }
- if (ObjUtil.notEqual(id, team.getId())) {
- throw exception(CAL_TEAM_CODE_DUPLICATE);
- }
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamShiftService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamShiftService.java
deleted file mode 100644
index c817d49..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamShiftService.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package cn.iocoder.yudao.module.mes.service.cal.team;
-
-import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.shift.MesCalTeamShiftListReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.team.MesCalTeamShiftDO;
-
-import java.util.List;
-
-/**
- * MES 鐝粍鎺掔彮 Service 鎺ュ彛
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-public interface MesCalTeamShiftService {
-
- /**
- * 鏍规嵁鎺掔彮璁″垝鐢熸垚鐝粍鎺掔彮璁板綍
- *
- * @param planId 鎺掔彮璁″垝缂栧彿
- */
- void generateTeamShiftRecords(Long planId);
-
- /**
- * 鑾峰緱鐝粍鎺掔彮鍒楄〃
- *
- * @param reqVO 鏌ヨ鏉′欢
- * @return 鐝粍鎺掔彮鍒楄〃
- */
- List<MesCalTeamShiftDO> getTeamShiftList(MesCalTeamShiftListReqVO reqVO);
-
- /**
- * 鏍规嵁鎺掔彮璁″垝缂栧彿鍒犻櫎鎵�鏈夋帓鐝褰�
- *
- * @param planId 鎺掔彮璁″垝缂栧彿
- */
- void deleteByPlanId(Long planId);
-
- /**
- * 鏍规嵁鐝粍缂栧彿鍒犻櫎鎵�鏈夋帓鐝褰�
- *
- * @param teamId 鐝粍缂栧彿
- */
- void deleteByTeamId(Long teamId);
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamShiftServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamShiftServiceImpl.java
deleted file mode 100644
index a856863..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamShiftServiceImpl.java
+++ /dev/null
@@ -1,292 +0,0 @@
-package cn.iocoder.yudao.module.mes.service.cal.team;
-
-import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.shift.MesCalTeamShiftListReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.holiday.MesCalHolidayDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanShiftDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanTeamDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.team.MesCalTeamShiftDO;
-import cn.iocoder.yudao.module.mes.dal.mysql.cal.team.MesCalTeamShiftMapper;
-import cn.iocoder.yudao.module.mes.enums.cal.MesCalHolidayTypeEnum;
-import cn.iocoder.yudao.module.mes.enums.cal.MesCalShiftMethodEnum;
-import cn.iocoder.yudao.module.mes.enums.cal.MesCalShiftTypeEnum;
-import cn.iocoder.yudao.module.mes.service.cal.holiday.MesCalHolidayService;
-import cn.iocoder.yudao.module.mes.service.cal.plan.MesCalPlanService;
-import cn.iocoder.yudao.module.mes.service.cal.plan.MesCalPlanShiftService;
-import cn.iocoder.yudao.module.mes.service.cal.plan.MesCalPlanTeamService;
-import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
-import jakarta.annotation.Resource;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
-
-import java.time.DayOfWeek;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.CAL_TEAM_SHIFT_GENERATE_SHIFT_NOT_ENOUGH;
-import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.CAL_TEAM_SHIFT_GENERATE_TEAM_NOT_ENOUGH;
-
-/**
- * MES 鐝粍鎺掔彮 Service 瀹炵幇绫�
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@Service
-@Validated
-public class MesCalTeamShiftServiceImpl implements MesCalTeamShiftService {
-
- @Resource
- private MesCalTeamShiftMapper teamShiftMapper;
-
- @Resource
- @Lazy
- private MesCalPlanService planService;
- @Resource
- @Lazy
- private MesCalPlanShiftService planShiftService;
- @Resource
- @Lazy
- private MesCalPlanTeamService planTeamService;
- @Resource
- @Lazy
- private MesCalHolidayService holidayService;
-
- @Transactional(rollbackFor = Exception.class)
- @Override
- public void generateTeamShiftRecords(Long planId) {
- // 1.1 鏌ヨ鎺掔彮璁″垝
- MesCalPlanDO plan = planService.getPlan(planId);
- // 1.2 鏌ヨ璁″垝涓殑鐝鍒楄〃
- List<MesCalPlanShiftDO> shifts = planShiftService.getPlanShiftListByPlanId(planId);
- // 1.3 鏌ヨ璁″垝涓殑鐝粍鍒楄〃
- List<MesCalPlanTeamDO> teams = planTeamService.getPlanTeamListByPlanId(planId);
- // 1.4 鏍¢獙鐝粍鍜岀彮娆℃暟閲忔槸鍚︽弧瓒崇彮鍨嬭姹�
- MesCalShiftTypeEnum shiftTypeEnum = MesCalShiftTypeEnum.valueOf(plan.getShiftType());
- int requiredCount = shiftTypeEnum.getRequiredTeamCount();
- if (teams.size() < requiredCount) {
- throw exception(CAL_TEAM_SHIFT_GENERATE_TEAM_NOT_ENOUGH);
- }
- if (shifts.size() < requiredCount) {
- throw exception(CAL_TEAM_SHIFT_GENERATE_SHIFT_NOT_ENOUGH);
- }
-
- // 1.5 鍔犺浇鏃ユ湡鍖洪棿鍐呯殑鍋囨棩鏁版嵁锛屾瀯寤� Map<鏃ユ湡, 绫诲瀷>
- Map<LocalDate, Integer> holidayMap = holidayService.getHolidayList(plan.getStartDate(), plan.getEndDate())
- .stream().collect(Collectors.toMap(h -> h.getDay().toLocalDate(), MesCalHolidayDO::getType));
-
- // 2. 璁$畻鏃ユ湡璺ㄥ害锛岄�愬ぉ鍒ゆ柇宸ヤ綔鏃ワ紝鐢熸垚鎺掔彮璁板綍
- LocalDate startDate = plan.getStartDate().toLocalDate();
- LocalDate endDate = plan.getEndDate().toLocalDate();
- long days = ChronoUnit.DAYS.between(startDate, endDate) + 1;
- boolean excludeWeekend = plan.getExcludeWeekend() != null && plan.getExcludeWeekend();
- List<MesCalTeamShiftDO> allRecords = new ArrayList<>();
- int shiftIndex = 0;
- int workdayOffset = 0; // 浠呭伐浣滄棩閫掑锛岀敤浜庡�掔彮杞崲璁℃暟
- for (int i = 0; i < days; i++) {
- LocalDate currentDate = startDate.plusDays(i);
- // 2.1 璺宠繃闈炲伐浣滄棩
- if (!isWorkday(currentDate, holidayMap, excludeWeekend)) {
- continue;
- }
- LocalDateTime currentDay = currentDate.atStartOfDay();
- // 2.2.1 鏍规嵁鍊掔彮鏂瑰紡璁$畻 shiftIndex锛堜互宸ヤ綔鏃ュ亸绉讳负鍑嗭級
- shiftIndex = calculateShiftIndex(shiftIndex, workdayOffset, currentDate, startDate, plan);
- // 2.2.2 鏍规嵁杞彮鏂瑰紡鐢熸垚鎺掔彮璁板綍锛屾敹闆嗗埌鍒楄〃
- buildRecordsForDay(allRecords, planId, currentDay, shiftIndex, plan.getShiftType(), teams, shifts);
- workdayOffset++;
- }
-
- // 3. 鎵归噺鎻掑叆鎺掔彮璁板綍
- teamShiftMapper.insertBatch(allRecords);
- }
-
- /**
- * 鍒ゆ柇鎸囧畾鏃ユ湡鏄惁涓哄伐浣滄棩
- *
- * 浼樺厛绾э細holiday 琛� > 鍛ㄦ湯鎺掗櫎寮�鍏� > 榛樿宸ヤ綔鏃�
- */
- private boolean isWorkday(LocalDate date, Map<LocalDate, Integer> holidayMap, boolean excludeWeekend) {
- // 1. holiday 琛ㄤ紭鍏堬細鏄惧紡鏍囪鐨勬棩鏈熶互鏍囪涓哄噯
- Integer holidayType = holidayMap.get(date);
- if (holidayType != null) {
- return MesCalHolidayTypeEnum.WORKDAY.getType().equals(holidayType);
- }
- // 2. 鑻ュ紑鍚簡鎺掗櫎鍛ㄦ湯锛屽懆鍏棩榛樿涓轰紤鎭棩
- if (excludeWeekend) {
- DayOfWeek dow = date.getDayOfWeek();
- if (dow == DayOfWeek.SATURDAY || dow == DayOfWeek.SUNDAY) {
- return false;
- }
- }
- // 3. 榛樿宸ヤ綔鏃�
- return true;
- }
-
- /**
- * 璁$畻褰撳ぉ鐨� shiftIndex锛堟牴鎹�掔彮鏂瑰紡鍒ゆ柇鏄惁闇�瑕侀�掑锛�
- */
- private int calculateShiftIndex(int shiftIndex, int dayOffset, LocalDate currentDate,
- LocalDate startDate, MesCalPlanDO plan) {
- if (dayOffset == 0) {
- return shiftIndex; // 绗竴澶╀笉閫掑
- }
- // 鍗曠櫧鐝笉闇�瑕佸�掔彮锛宻hiftMethod 涓� null锛岀洿鎺ヨ繑鍥�
- if (plan.getShiftMethod() == null) {
- return shiftIndex;
- }
- if (MesCalShiftMethodEnum.QUARTER.getMethod().equals(plan.getShiftMethod())) {
- // 鎸夊搴﹁疆鐝細鍒颁簡鏂板搴︾殑绗竴澶�
- LocalDate quarterStart = LocalDateTimeUtils.getQuarterStart(currentDate);
- LocalDate planQuarterStart = LocalDateTimeUtils.getQuarterStart(startDate);
- if (currentDate.equals(quarterStart) && !quarterStart.equals(planQuarterStart)) {
- return shiftIndex + 1;
- }
- } else if (MesCalShiftMethodEnum.MONTH.getMethod().equals(plan.getShiftMethod())) {
- // 鎸夋湀杞彮锛氬埌浜嗘湀鍒�
- LocalDate monthStart = currentDate.withDayOfMonth(1);
- LocalDate planMonthStart = startDate.withDayOfMonth(1);
- if (currentDate.equals(monthStart) && !monthStart.equals(planMonthStart)) {
- return shiftIndex + 1;
- }
- } else if (MesCalShiftMethodEnum.WEEK.getMethod().equals(plan.getShiftMethod())) {
- // 鎸夊懆杞彮锛氬埌浜嗗懆涓�
- LocalDate weekStart = LocalDateTimeUtils.getWeekStart(currentDate);
- LocalDate planWeekStart = LocalDateTimeUtils.getWeekStart(startDate);
- if (currentDate.equals(weekStart) && !weekStart.equals(planWeekStart)) {
- return shiftIndex + 1;
- }
- } else if (MesCalShiftMethodEnum.DAY.getMethod().equals(plan.getShiftMethod())) {
- // 鎸夊ぉ杞彮锛氬埌浜嗘寚瀹氳疆鐝ぉ鏁扮殑鍊嶆暟
- if (dayOffset % plan.getShiftCount() == 0) {
- return shiftIndex + 1;
- }
- } else {
- throw new IllegalArgumentException("涓嶆敮鎸佺殑鍊掔彮鏂瑰紡: " + plan.getShiftMethod());
- }
- return shiftIndex;
- }
-
- /**
- * 鏍规嵁鐝瀷鐢熸垚褰撳ぉ鐨勬帓鐝褰曪紝娣诲姞鍒� allRecords 鍒楄〃
- */
- private void buildRecordsForDay(List<MesCalTeamShiftDO> allRecords, Long planId,
- LocalDateTime currentDay, int shiftIndex, Integer shiftType,
- List<MesCalPlanTeamDO> teams, List<MesCalPlanShiftDO> shifts) {
- if (MesCalShiftTypeEnum.SINGLE.getType().equals(shiftType)) {
- // 鍗曠櫧鐝細涓嶉渶瑕佸�掔彮
- allRecords.add(MesCalTeamShiftDO.builder()
- .planId(planId)
- .day(currentDay)
- .teamId(teams.get(0).getTeamId())
- .shiftId(shifts.get(0).getId())
- .sort(1).build());
- } else if (MesCalShiftTypeEnum.TWO.getType().equals(shiftType)) {
- // 涓ょ彮鍊�
- if (shiftIndex % 2 == 0) {
- // A 缁勪笂鐧界彮
- allRecords.add(MesCalTeamShiftDO.builder()
- .planId(planId).day(currentDay)
- .teamId(teams.get(0).getTeamId())
- .shiftId(shifts.get(0).getId())
- .sort(1).build());
- // B 缁勪笂澶滅彮
- allRecords.add(MesCalTeamShiftDO.builder()
- .planId(planId).day(currentDay)
- .teamId(teams.get(1).getTeamId())
- .shiftId(shifts.get(1).getId())
- .sort(2).build());
- } else {
- // A 缁勪笂澶滅彮
- allRecords.add(MesCalTeamShiftDO.builder()
- .planId(planId).day(currentDay)
- .teamId(teams.get(0).getTeamId())
- .shiftId(shifts.get(1).getId())
- .sort(2).build());
- // B 缁勪笂鐧界彮
- allRecords.add(MesCalTeamShiftDO.builder()
- .planId(planId).day(currentDay)
- .teamId(teams.get(1).getTeamId())
- .shiftId(shifts.get(0).getId())
- .sort(1).build());
- }
- } else if (MesCalShiftTypeEnum.THREE.getType().equals(shiftType)) {
- // 涓夌彮鍊�
- if (shiftIndex % 3 == 0) {
- // A 缁勪笂鐧界彮銆丅 缁勪笂涓彮銆丆 缁勪笂澶滅彮
- allRecords.add(MesCalTeamShiftDO.builder()
- .planId(planId).day(currentDay)
- .teamId(teams.get(0).getTeamId())
- .shiftId(shifts.get(0).getId())
- .sort(1).build());
- allRecords.add(MesCalTeamShiftDO.builder()
- .planId(planId).day(currentDay)
- .teamId(teams.get(1).getTeamId())
- .shiftId(shifts.get(1).getId())
- .sort(2).build());
- allRecords.add(MesCalTeamShiftDO.builder()
- .planId(planId).day(currentDay)
- .teamId(teams.get(2).getTeamId())
- .shiftId(shifts.get(2).getId())
- .sort(3).build());
- } else if (shiftIndex % 3 == 1) {
- // A 缁勪笂涓彮銆丅 缁勪笂澶滅彮銆丆 缁勪笂鐧界彮
- allRecords.add(MesCalTeamShiftDO.builder()
- .planId(planId).day(currentDay)
- .teamId(teams.get(0).getTeamId())
- .shiftId(shifts.get(1).getId())
- .sort(2).build());
- allRecords.add(MesCalTeamShiftDO.builder()
- .planId(planId).day(currentDay)
- .teamId(teams.get(1).getTeamId())
- .shiftId(shifts.get(2).getId())
- .sort(3).build());
- allRecords.add(MesCalTeamShiftDO.builder()
- .planId(planId).day(currentDay)
- .teamId(teams.get(2).getTeamId())
- .shiftId(shifts.get(0).getId())
- .sort(1).build());
- } else {
- // A 缁勪笂澶滅彮銆丅 缁勪笂鐧界彮銆丆 缁勪笂涓彮
- allRecords.add(MesCalTeamShiftDO.builder()
- .planId(planId).day(currentDay)
- .teamId(teams.get(0).getTeamId())
- .shiftId(shifts.get(2).getId())
- .sort(3).build());
- allRecords.add(MesCalTeamShiftDO.builder()
- .planId(planId).day(currentDay)
- .teamId(teams.get(1).getTeamId())
- .shiftId(shifts.get(0).getId())
- .sort(1).build());
- allRecords.add(MesCalTeamShiftDO.builder()
- .planId(planId).day(currentDay)
- .teamId(teams.get(2).getTeamId())
- .shiftId(shifts.get(1).getId())
- .sort(2).build());
- }
- }
- }
-
- @Override
- public List<MesCalTeamShiftDO> getTeamShiftList(MesCalTeamShiftListReqVO reqVO) {
- return teamShiftMapper.selectList(reqVO);
- }
-
- @Override
- public void deleteByPlanId(Long planId) {
- teamShiftMapper.deleteByPlanId(planId);
- }
-
- @Override
- public void deleteByTeamId(Long teamId) {
- teamShiftMapper.deleteByTeamId(teamId);
- }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackService.java
index e0745e6..00bd0c4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackService.java
@@ -157,5 +157,14 @@
*/
MesProFeedbackBatchCreateRespVO batchCreateFeedback(@Valid MesProFeedbackBatchCreateReqVO reqVO);
+ /**
+ * 鎶ュ伐宸ヨ祫璇曠畻锛堜笉钀藉簱锛�
+ *
+ * @param reqVO 璇曠畻璇锋眰
+ * @return 宸ヨ祫鎷嗗垎
+ */
+ cn.iocoder.yudao.module.mes.service.pro.wage.MesProFeedbackWageBreakdown previewWage(
+ @Valid MesProFeedbackWagePreviewReqVO reqVO);
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
index 371a979..ded280e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
@@ -1,16 +1,20 @@
package cn.iocoder.yudao.module.mes.service.pro.feedback;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.*;
+import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.md.autocode.MesMdAutoCodeRuleCodeEnum;
import cn.iocoder.yudao.module.mes.enums.pro.MesProFeedbackTypeEnum;
import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackAuxDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessDO;
@@ -21,10 +25,17 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceLineDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc.MesQcIpqcDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.feedback.MesProFeedbackAuxMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.feedback.MesProFeedbackMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.qc.ipqc.MesQcIpqcMapper;
import cn.iocoder.yudao.module.mes.enums.pro.MesProFeedbackStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.pro.MesProProcessBillingTypeEnum;
import cn.iocoder.yudao.module.mes.enums.pro.MesProTaskStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.qc.MesQcStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
+import cn.iocoder.yudao.module.mes.service.qc.ipqc.MesQcIpqcService;
+import cn.iocoder.yudao.module.mes.service.qc.ipqc.MesQcIpqcWageFieldService;
import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProcessService;
import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
@@ -32,6 +43,11 @@
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderProcessService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderParamRecordService;
+import cn.iocoder.yudao.module.mes.service.pro.wage.MesProFeedbackQualityResult;
+import cn.iocoder.yudao.module.mes.service.pro.wage.MesProFeedbackWageBreakdown;
+import cn.iocoder.yudao.module.mes.service.pro.wage.MesProFeedbackWageCalculator;
+import cn.iocoder.yudao.module.mes.service.pro.wage.MesProProcessWageRuleService;
+import cn.iocoder.yudao.module.mes.service.pro.worktime.MesProWorktimeService;
import cn.iocoder.yudao.module.mes.service.wm.itemconsume.MesWmItemConsumeService;
import cn.iocoder.yudao.module.mes.service.wm.productproduce.MesWmProductProduceLineService;
import cn.iocoder.yudao.module.mes.service.wm.productproduce.MesWmProductProduceService;
@@ -50,12 +66,17 @@
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
@@ -75,6 +96,22 @@
@Resource
private MesProFeedbackMapper feedbackMapper;
+ @Resource
+ private MesProFeedbackAuxMapper feedbackAuxMapper;
+ @Resource
+ private MesProWorktimeService worktimeService;
+ @Resource
+ private MesProFeedbackWageCalculator wageCalculator;
+ @Resource
+ private MesProProcessWageRuleService wageRuleService;
+ @Resource
+ private MesQcIpqcMapper ipqcMapper;
+ @Resource
+ @Lazy // IPQC 瀹屾垚鍥炲啓鎶ュ伐锛岄伩鍏嶅惊鐜緷璧�
+ private MesQcIpqcService ipqcService;
+ @Resource
+ @Lazy // 杩囩▼妫�楠屽崟宸ヨ祫瀛楁鍊硷紙璐ㄦ濉啓锛夛紝閬垮厤涓� IPQC 涓绘湇鍔″惊鐜緷璧�
+ private MesQcIpqcWageFieldService ipqcWageFieldService;
@Resource
private MesProWorkOrderService workOrderService;
@@ -122,7 +159,12 @@
.setId(null)
.setStatus(MesProFeedbackStatusEnum.PREPARE.getStatus())
.setItemId(task.getItemId());
+ // 2.1 璁$畻鏍囧噯宸ユ椂蹇収涓庤緟鍔╁伐鏃舵槑缁嗭紙鍙敤浜庤�冩牳瀵规瘮锛屽弬鏁扮己澶变笉闃绘柇鎶ュ伐锛�
+ List<MesProFeedbackAuxDO> auxList = worktimeService.calculateForFeedback(feedback, createReqVO.getAuxList());
+ // 2.2 鎸夊伐搴忚璐圭被鍨嬨�佸崟浠疯鍒欍�佽緟鍔╄钖笌宸ヨ祫瀛楁蹇収宸ヨ祫锛岃皝鎶ョ殑宸ュ氨璁板湪璋佸悕涓�
+ applyProcessBilling(feedback, processService.getProcess(task.getProcessId()), auxList);
feedbackMapper.insert(feedback);
+ saveFeedbackAux(feedback.getId(), auxList);
// 3. 淇濆瓨鍙傛暟鍊硷紱蹇呭~鍙傛暟鏍¢獙澶辫触鏃舵暣浣撳洖婊氾紝閬垮厤娈嬬暀鑽夌
saveParamValues(task.getId(), createReqVO.getParamValues());
return feedback.getId();
@@ -140,10 +182,26 @@
// 2. 鏇存柊锛堣嚜鍔ㄥ~鍏� itemId锛�
MesProFeedbackDO updateObj = BeanUtils.toBean(updateReqVO, MesProFeedbackDO.class)
.setItemId(task.getItemId());
+ // 2.1 閲嶆柊璁$畻鏍囧噯宸ユ椂蹇収涓庤緟鍔╁伐鏃舵槑缁�
+ List<MesProFeedbackAuxDO> auxList = worktimeService.calculateForFeedback(updateObj, updateReqVO.getAuxList());
+ // 2.2 鎸夊伐搴忓綋鍓嶇殑璁¤垂绫诲瀷/鍗曚环瑙勫垯/杈呭姪璁¤柂/宸ヨ祫瀛楁閲嶇畻宸ヨ祫锛堣崏绋块樁娈靛厑璁告敼宸ユ椂/鏁伴噺锛�
+ applyProcessBilling(updateObj, processService.getProcess(task.getProcessId()), auxList);
feedbackMapper.updateById(updateObj);
+ feedbackAuxMapper.deleteByFeedbackId(updateReqVO.getId());
+ saveFeedbackAux(updateReqVO.getId(), auxList);
equipmentService.resetSnapshot(updateReqVO.getId());
// 3. 淇濆瓨鍙傛暟鍊硷紱蹇呭~鍙傛暟鏍¢獙澶辫触鏃舵暣浣撳洖婊�
saveParamValues(task.getId(), updateReqVO.getParamValues());
+ }
+
+ private void saveFeedbackAux(Long feedbackId, List<MesProFeedbackAuxDO> auxList) {
+ if (CollUtil.isEmpty(auxList)) {
+ return;
+ }
+ auxList.forEach(aux -> {
+ aux.setId(null).setFeedbackId(feedbackId);
+ feedbackAuxMapper.insert(aux);
+ });
}
private void saveParamValues(Long taskId, List<MesProFeedbackSaveReqVO.ParamValue> paramValues) {
@@ -164,8 +222,9 @@
// 1. 鏍¢獙瀛樺湪 + 鑽夌鐘舵��
validateFeedbackStatusPrepare(id);
- // 2. 鍒犻櫎
+ // 2. 鍒犻櫎锛堣緟鍔╁伐鏃舵槑缁嗕竴骞跺垹闄わ級
feedbackMapper.deleteById(id);
+ feedbackAuxMapper.deleteByFeedbackId(id);
}
@Override
@@ -209,6 +268,7 @@
MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(feedback.getWorkOrderId());
+ // 1.2 鎶ュ伐涓庤川妫�鍒嗙锛氭彁浜ゆ姤宸ヤ笉鍐嶈嚜鍔ㄧ敓鎴愯繃绋嬫楠屽崟锛岃川妫�鐢辫川妫�閮ㄩ棬鎵嬪伐寤哄崟
if (!processInstanceApi.isGlobalAutoApprove() && workOrder != null
&& Boolean.TRUE.equals(workOrder.getFeedbackApprove())
&& cn.hutool.core.util.StrUtil.isNotBlank(workOrder.getProcessDefinitionKey())) {
@@ -235,7 +295,8 @@
feedbackMapper.updateById(new MesProFeedbackDO().setId(id)
.setStatus(MesProFeedbackStatusEnum.APPROVING.getStatus()));
MesProFeedbackApproveReqVO approveReqVO = cn.iocoder.yudao.framework.common.util.object.BeanUtils.toBean(reqVO, MesProFeedbackApproveReqVO.class);
- approveFeedback(approveReqVO);
+ // 鑷姩瀹℃壒锛氳繃绋嬫楠屽崟鍒氱敓鎴愬皻鏈~鍐欙紝涓嶅仛璐ㄦ宸ヨ祫鍓嶇疆鏍¢獙锛堣川閲忚皟鏁寸暀绌猴級
+ approveFeedback(approveReqVO, false);
}
}
@@ -290,16 +351,21 @@
@Override
@Transactional(rollbackFor = Exception.class)
public boolean approveFeedback(MesProFeedbackApproveReqVO reqVO) {
+ return approveFeedback(reqVO, true);
+ }
+
+ private boolean approveFeedback(MesProFeedbackApproveReqVO reqVO, boolean enforceQualityGate) {
equipmentService.lock();
// 1.1 鏍¢獙瀛樺湪 + 瀹℃壒涓姸鎬�
MesProFeedbackDO feedback = validateFeedbackStatusApproving(reqVO.getId());
equipmentService.validateApproval(feedback);
try (var equipmentScope = equipmentService.beginApproval(feedback)) {
- return approveValidatedFeedback(reqVO, feedback);
+ return approveValidatedFeedback(reqVO, feedback, enforceQualityGate);
}
}
- private boolean approveValidatedFeedback(MesProFeedbackApproveReqVO reqVO, MesProFeedbackDO feedback) {
+ private boolean approveValidatedFeedback(MesProFeedbackApproveReqVO reqVO, MesProFeedbackDO feedback,
+ boolean enforceQualityGate) {
// 1.2 鏍¢獙鎶ュ伐鏁伴噺 > 0
if (feedback.getFeedbackQuantity() == null
|| feedback.getFeedbackQuantity().compareTo(BigDecimal.ZERO) <= 0) {
@@ -308,22 +374,16 @@
// 1.3 鏍¢獙浠诲姟鏈畬鎴�
taskService.validateTaskNotFinished(feedback.getTaskId());
- // 宸ュ簭妫�楠屾爣璇嗕笉鍐嶆帶鍒朵骇鍑哄叆搴擄細鎵�鏈夋柊鎶ュ伐浜у嚭鍧囬渶浜哄伐璐ㄦ銆�
- MesProRouteProcessDO routeProcess = routeProcessService.getRouteProcessByRouteIdAndProcessId(
- feedback.getRouteId(), feedback.getProcessId());
- boolean keyFlag = routeProcess != null && Boolean.TRUE.equals(routeProcess.getKeyFlag());
+ // 鎶ュ伐涓庤川妫�鍒嗙锛氭姤宸ュ鎵逛笉鍐嶄緷璧栥�屾槸鍚﹁川妫�銆嶅紑鍏筹紝璐ㄩ噺鏁版嵁鐢辫川妫�鍗曞洖濉��
+ // 1.4 宸ヨ祫鎸夋姤宸ユ椂鐐圭殑蹇収閲嶇畻锛岄伩鍏嶅伐搴忓畾棰濅簨鍚庤皟鏁村奖鍝嶅凡鎻愪氦鐨勬姤宸�
+ recalculateWageFromSnapshot(feedback, null);
- // 3. 鐗╂枡娑堣�楋細鍊掑啿宸ュ簭鎸夋湰宸ュ簭鎶曟枡 BOM 鑷姩鎵f枡锛涢潪鍊掑啿宸ュ簭璺宠繃锛堢墿鏂欒蛋鎵嬪伐棰嗘枡/鎶曟枡锛�
- boolean backflushFlag = routeProcess != null && Boolean.TRUE.equals(routeProcess.getBackflushFlag());
- if (backflushFlag) {
- // 3.1 鏍¢獙鍊掑啿宸ュ簭蹇呴』閰嶇疆鏈伐搴忕殑鎶曟枡 BOM锛岄伩鍏嶉潤榛樹笉鎵f枡
- // 锛堝彧鏍¢獙褰撳墠鎶ュ伐宸ュ簭鐨勬姇鏂欙紝鍏朵粬宸ュ簭鎶曟枡鐢卞悇鑷伐搴忔姤宸ユ椂鎵i櫎锛�
- List<MesProWorkOrderBomDO> boms = workOrderBomService.getWorkOrderBomListByWorkOrderIdAndProcessId(
- feedback.getWorkOrderId(), feedback.getProcessId());
- if (CollUtil.isEmpty(boms)) {
- throw exception(PRO_FEEDBACK_BACKFLUSH_BOM_REQUIRED);
- }
- // 3.2 鐢熸垚娑堣�楄褰曞苟鎵ц鎵e噺锛堟湰宸ュ簭鎶曟枡鐢ㄩ噺姣斾緥 脳 鎶ュ伐鏁伴噺锛孎IFO 鎵g嚎杈瑰簱锛�
+ // 3. 鐗╂枡娑堣�楋細鍙鏈伐搴忛厤缃簡鐢熶骇 BOM 灏辫嚜鍔ㄦ墸鏂欙紝涓嶅啀渚濊禆鍊掑啿寮�鍏筹紱
+ // 鏈厤缃� BOM 鐨勫伐搴忚烦杩囷紙鐗╂枡璧版墜宸ラ鏂�/鎶曟枡锛夛紝涓嶉樆鏂姤宸ュ鎵�
+ List<MesProWorkOrderBomDO> boms = workOrderBomService.getWorkOrderBomListByWorkOrderIdAndProcessId(
+ feedback.getWorkOrderId(), feedback.getProcessId());
+ if (CollUtil.isNotEmpty(boms)) {
+ // 3.1 鐢熸垚娑堣�楄褰曞苟鎵ц鎵e噺锛堟湰宸ュ簭鎶曟枡鐢ㄩ噺姣斾緥 脳 鎶ュ伐鏁伴噺锛孎IFO 鎵g嚎杈瑰簱锛�
MesWmItemConsumeDO itemConsume = itemConsumeService.generateItemConsume(feedback);
if (itemConsume != null) {
itemConsumeService.finishItemConsume(itemConsume.getId());
@@ -335,23 +395,23 @@
.setStatus(MesProFeedbackStatusEnum.UNCHECK.getStatus())
.setQualifiedQuantity(BigDecimal.ZERO)
.setUnqualifiedQuantity(BigDecimal.ZERO)
- .setUncheckQuantity(feedback.getFeedbackQuantity()));
+ .setUncheckQuantity(feedback.getFeedbackQuantity())
+ .setBillingType(feedback.getBillingType())
+ .setWageRate(feedback.getWageRate())
+ .setWageRuleId(feedback.getWageRuleId())
+ .setWorkHours(feedback.getWorkHours())
+ .setWageAmount(feedback.getWageAmount())
+ .setAuxPaidHours(feedback.getAuxPaidHours())
+ .setAuxWageAmount(feedback.getAuxWageAmount())
+ .setQualityPassRate(feedback.getQualityPassRate())
+ .setQualityCoefficient(feedback.getQualityCoefficient())
+ .setQualityDeduction(feedback.getQualityDeduction())
+ .setWageBreakdown(feedback.getWageBreakdown()));
feedback.setQualifiedQuantity(BigDecimal.ZERO).setUnqualifiedQuantity(BigDecimal.ZERO);
productProduceService.generateProductProduce(feedback, true, reqVO);
- // 6. 鏍规嵁鏄惁闇�瑕佹楠岋紝鍐冲畾浜у嚭鍜屽叆搴撴柟寮�
- // 6.2 璋冩暣 鍙瀹℃壒鎴愬姛鐩存帴鏇存柊
- // 鍏抽敭宸ュ簭锛氭洿鏂颁换鍔� + 宸ュ崟鐨勫凡鐢熶骇鏁伴噺锛涢潪鍏抽敭宸ュ簭锛氬彧鏇存柊浠诲姟鐨勫凡鐢熶骇鏁伴噺锛堝伐鍗曞彧鐪嬪叧閿伐搴忎骇鍑猴級
- if (keyFlag) {
- updateTaskAndWorkOrderByFeedback(feedback);
- } else {
- taskService.updateProducedQuantity(feedback.getTaskId(),
- feedback.getFeedbackQuantity(),
- ObjectUtil.defaultIfNull(feedback.getQualifiedQuantity(), BigDecimal.ZERO),
- ObjectUtil.defaultIfNull(feedback.getUnqualifiedQuantity(), BigDecimal.ZERO));
- checkAndPublishProductionFinished(feedback.getWorkOrderId());
-
- }
+ // 姣忛亾宸ュ簭鍙疮璁℃湰浠诲姟锛涘伐鍗曚笌 MPS 鐢辨渶鍚庝竴閬撳伐搴忓洖鍐欙紝涓庡叧閿伐搴忔爣璁版棤鍏炽��
+ updateTaskAndWorkOrderByFeedback(feedback);
equipmentService.afterApproved(feedback);
return false; // 浜у嚭绛夊緟璐ㄦ锛屾姤宸ヤ骇閲忓凡绱
}
@@ -368,21 +428,17 @@
*
* @param feedback 鎶ュ伐鍗�
*/
- private void updateTaskAndWorkOrderByFeedback(MesProFeedbackDO feedback) {
+ void updateTaskAndWorkOrderByFeedback(MesProFeedbackDO feedback) {
// 鎶ュ伐瀹℃壒鍙疮璁′骇閲忥紱鍚堟牸涓庝笉鍚堟牸鏁伴噺鍦ㄨ川妫�瀹屾垚鏃剁疮璁°��
taskService.updateProducedQuantity(feedback.getTaskId(),
feedback.getFeedbackQuantity(), BigDecimal.ZERO, BigDecimal.ZERO);
- // 3. 鏇存柊璁㈠崟鐨勫凡鐢熶骇鏁伴噺
- // 鏂板閫昏緫锛氬彧鏈夊湪璇ョ瑪璁㈠崟鏈�鍚庝竴涓伐搴忔墠鏇存柊鐢熶骇璁㈠崟鐨勫凡鐢熶骇鏁伴噺
+ // 鍙湁鏈�鍚庝竴閬撳伐搴忕殑鎶ュ伐璁″叆宸ュ崟涓� MPS锛岄伩鍏嶄腑闂村伐搴忛噸澶嶇疮璁°��
MesProWorkOrderProcessDO lastProcess = workOrderProcessService.getLastWorkOrderProcessByWorkOrderId(feedback.getWorkOrderId());
if (lastProcess != null && ObjUtil.equal(lastProcess.getProcessId(), feedback.getProcessId())) {
workOrderService.updateProducedQuantity(feedback.getWorkOrderId(),
feedback.getFeedbackQuantity());
- // 4. 鏇存柊 MPS 鐨勫凡鐢熶骇鏁伴噺锛堝鏋滄槸閿�鍞鍗曟潵婧愶級
- MesProMpsRespDTO mps = mpsApi.getMpsByWorkOrderId(feedback.getWorkOrderId());
- if (mps != null) {
- mpsApi.updateMpsProducedQuantity(mps.getId(), feedback.getFeedbackQuantity());
- }
+ // MPS 鍙褰曢攢鍞鍗曢渶姹傞噺锛涘疄闄呰秴浜т粛鐢卞伐鍗曞拰浜у嚭鍏ュ簱璁板綍瀹屾暣淇濈暀銆�
+ allocateMpsProducedQuantity(feedback.getWorkOrderId(), feedback.getFeedbackQuantity());
}
@@ -393,23 +449,45 @@
/**
* 妫�鏌ュ苟鍙戝竷鐢熶骇瀹屾垚浜嬩欢
*/
- private void checkAndPublishProductionFinished(Long workOrderId) {
- // 1. 鑾峰彇宸ュ崟鍏宠仈鐨� MPS
- MesProMpsRespDTO mps = mpsApi.getMpsByWorkOrderId(workOrderId);
- if (mps == null || mps.getSaleOrderId() == null
- || ObjUtil.equal(mps.getStatus(), cn.iocoder.yudao.module.mes.enums.pro.MesProMpsStatusEnum.FINISHED.getStatus())
- || ObjUtil.equal(mps.getStatus(), cn.iocoder.yudao.module.mes.enums.pro.MesProMpsStatusEnum.CANCELED.getStatus())) {
- return; // 闈為攢鍞鍗曟潵婧愮殑宸ュ崟锛岃烦杩�
+ void checkAndPublishProductionFinished(Long workOrderId) {
+ Set<Long> newlyCompletedSaleOrderIds = new LinkedHashSet<>();
+ for (MesProMpsRespDTO mps : mpsApi.getMpsListByWorkOrderId(workOrderId)) {
+ if (mps.getSaleOrderId() == null
+ || ObjUtil.equal(mps.getStatus(), cn.iocoder.yudao.module.mes.enums.pro.MesProMpsStatusEnum.FINISHED.getStatus())
+ || ObjUtil.equal(mps.getStatus(), cn.iocoder.yudao.module.mes.enums.pro.MesProMpsStatusEnum.CANCELED.getStatus())) {
+ continue;
+ }
+ if (Boolean.TRUE.equals(mpsApi.checkAndFinishMps(mps.getId()))) {
+ newlyCompletedSaleOrderIds.add(mps.getSaleOrderId());
+ }
}
-
- // 2. 妫�鏌ュ苟鑷姩瀹屾垚 MPS锛堝鏋滄弧瓒虫潯浠讹級
- if (!Boolean.TRUE.equals(mpsApi.checkAndFinishMps(mps.getId()))) {
- return;
+ for (Long saleOrderId : newlyCompletedSaleOrderIds) {
+ if (mpsApi.checkSaleOrderProductionFinished(saleOrderId)) {
+ eventPublisher.publishEvent(new ProductionFinishedEvent(saleOrderId, java.time.LocalDateTime.now()));
+ }
}
+ }
- // 3. 妫�鏌ラ攢鍞鍗曟墍鏈夌敓浜ф槸鍚﹀畬鎴�
- if (mpsApi.checkSaleOrderProductionFinished(mps.getSaleOrderId())) {
- eventPublisher.publishEvent(new ProductionFinishedEvent(mps.getSaleOrderId(), java.time.LocalDateTime.now()));
+ void allocateMpsProducedQuantity(Long workOrderId, BigDecimal actualQuantity) {
+ BigDecimal remaining = actualQuantity;
+ for (MesProMpsRespDTO mps : mpsApi.getMpsListByWorkOrderId(workOrderId)) {
+ if (remaining.signum() <= 0) {
+ break;
+ }
+ if (ObjUtil.equal(mps.getStatus(), cn.iocoder.yudao.module.mes.enums.pro.MesProMpsStatusEnum.CANCELED.getStatus())) {
+ continue;
+ }
+ BigDecimal planned = mps.getQuantity() == null ? BigDecimal.ZERO : mps.getQuantity();
+ BigDecimal produced = mps.getQuantityProduced() == null ? BigDecimal.ZERO : mps.getQuantityProduced();
+ BigDecimal need = planned.subtract(produced).max(BigDecimal.ZERO);
+ BigDecimal assigned = remaining.min(need);
+ if (assigned.signum() > 0) {
+ mpsApi.updateMpsProducedQuantity(mps.getId(), assigned);
+ remaining = remaining.subtract(assigned);
+ }
+ }
+ if (remaining.signum() > 0) {
+ log.info("[allocateMpsProducedQuantity] 宸ュ崟({}) 瓒呬骇鏁伴噺({})淇濈暀鍦ㄤ骇鍑哄簱瀛橈紝涓嶅垎閰嶅埌閿�鍞鍗�", workOrderId, remaining);
}
}
@@ -479,6 +557,164 @@
}
return task;
+ }
+
+ /**
+ * 鎸夊伐搴忛厤缃妸璁¤垂绫诲瀷銆佸崟浠疯鍒欍�佽緟鍔╄钖笌宸ヨ祫瀛楁蹇収鍒版姤宸ュ崟锛屽苟璁$畻鏈鎶ュ伐宸ヨ祫銆�
+ *
+ * <p>鍙e緞锛�
+ * <ul>
+ * <li>璁℃椂锛氫富宸ヨ祫 = 鏈鎶ュ伐宸ユ椂锛堝皬鏃讹級脳 鍗曚环锛堝厓/灏忔椂锛夛紱鍗曚环澶т簬 0 鏃跺繀椤诲~鍐欏伐鏃�</li>
+ * <li>璁′欢锛氫富宸ヨ祫 = 鍚堟牸鏁伴噺锛堟湭濉椂鍙栨姤宸ユ暟閲忥級脳 鍗曚环锛堝厓/浠讹級</li>
+ * <li>杈呭姪锛氳緟鍔╂槑缁嗗垎閽熸暟 梅 60 脳 杈呭姪灏忔椂鍗曚环锛涘伐搴忚緟鍔╁皬鏃跺伐璧勫厹搴�</li>
+ * <li>瀛楁锛氱郴鏁拌繛涔樹綔鐢ㄤ簬锛堜富宸ヨ祫 + 杈呭姪宸ヨ祫锛夛紝鍐嶅彔鍔犲姞鍑忛噾棰濅笌璁′环鏁伴噺</li>
+ * </ul>
+ * 鍓嶇浼犲叆鐨� billingType/wageRate/wageAmount 涓�寰嬩互鍚庣璁$畻瑕嗙洊锛岄槻姝㈣绡℃敼銆�
+ * 鍗曚环涓� 0 琛ㄧず璇ュ伐搴忓皻鏈畾浠凤紝鎸� 0 鍏冭钖紝涓嶉樆鏂姤宸ワ紙鏍哥畻鏃跺彲鎸変汉璋冩暣锛夈��
+ */
+ private void applyProcessBilling(MesProFeedbackDO feedback, MesProProcessDO process,
+ List<MesProFeedbackAuxDO> auxList) {
+ if (process == null) {
+ throw exception(PRO_FEEDBACK_PROCESS_NOT_EXISTS, feedback.getProcessId());
+ }
+ MesProFeedbackWageBreakdown breakdown = wageCalculator.calculate(process,
+ feedback.getRouteId(), feedback.getMachineryId(), feedback.getWorkHours(),
+ feedback.getFeedbackQuantity(), feedback.getQualifiedQuantity(), auxList,
+ feedback.getFeedbackTime() != null ? feedback.getFeedbackTime().toLocalDate() : null,
+ getWageFieldValues(feedback.getId()));
+ applyWageBreakdown(feedback, breakdown);
+ }
+
+ /**
+ * 鎶婂伐璧勮绠楃粨鏋滃啓鍥炴姤宸ュ崟
+ */
+ private void applyWageBreakdown(MesProFeedbackDO feedback, MesProFeedbackWageBreakdown breakdown) {
+ if (CollUtil.isNotEmpty(breakdown.getWarnings())) {
+ log.warn("鎶ュ伐宸ヨ祫璁$畻鎻愮ず锛氭姤宸ュ崟[{}] {}", feedback.getCode(), String.join("锛�", breakdown.getWarnings()));
+ }
+ feedback.setBillingType(breakdown.getBillingType())
+ .setWageRate(breakdown.getWageRate())
+ .setWageRuleId(breakdown.getWageRuleId())
+ .setWorkHours(breakdown.getWorkHours())
+ .setAuxPaidHours(breakdown.getAuxPaidHours())
+ .setAuxWageAmount(breakdown.getAuxWage())
+ .setWageAmount(breakdown.getFinalWage())
+ .setQualityPassRate(breakdown.getQuality() != null ? breakdown.getQuality().getPassRate() : null)
+ .setQualityCoefficient(breakdown.getQuality() != null ? breakdown.getQuality().getCoefficient() : null)
+ .setQualityDeduction(breakdown.getQuality() != null && breakdown.getQuality().getDeduction() != null
+ ? breakdown.getQuality().getDeduction() : BigDecimal.ZERO)
+ .setWageBreakdown(JsonUtils.toJsonString(breakdown));
+ }
+
+ /**
+ * 鍙栫涓�涓澶囩紪鍙蜂綔涓轰富璁′环璁惧锛堝揩鎹锋姤宸ョ殑 machineryIds 涓洪�楀彿鍒嗛殧锛�
+ */
+ private static Long firstMachineryId(String machineryIds) {
+ if (StrUtil.isBlank(machineryIds)) {
+ return null;
+ }
+ for (String part : machineryIds.split(",")) {
+ String trimmed = part.trim();
+ if (StrUtil.isBlank(trimmed)) {
+ continue;
+ }
+ try {
+ return Long.parseLong(trimmed);
+ } catch (NumberFormatException ex) {
+ return null;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 瀹℃壒鏃舵寜鎶ュ伐鏃剁偣鐨勫揩鐓ч噸绠楀伐璧勶紝閬垮厤宸ュ簭閰嶇疆浜嬪悗璋冩暣褰卞搷宸叉彁浜ょ殑鎶ュ伐銆�
+ * 鍘嗗彶鏁版嵁锛堟棤宸ヨ祫鎷嗗垎蹇収锛夊垯鎸夊綋鍓嶅伐搴忛厤缃ˉ榻愩��
+ *
+ * @param qualityResult 杩囩▼妫�楠屾眹鎬伙紱绌�=闈炶川妫�宸ュ簭鎴栬嚜鍔ㄥ鎵癸紝涓嶅仛璐ㄩ噺璋冩暣
+ */
+ private void recalculateWageFromSnapshot(MesProFeedbackDO feedback, MesProFeedbackQualityResult qualityResult) {
+ BigDecimal qualifiedQuantity = qualityResult != null
+ ? qualityResult.qualifiedQuantity() : feedback.getQualifiedQuantity();
+ // 璐ㄦ閮ㄩ棬鍦ㄨ繃绋嬫楠屽崟涓婂~鍐欑殑宸ヨ祫瀛楁鍊硷紝浼樺厛浜庡伐搴忓浐瀹氬��
+ Map<String, String> wageFieldValues = getWageFieldValues(feedback.getId());
+ MesProFeedbackWageBreakdown breakdown;
+ if (StrUtil.isBlank(feedback.getWageBreakdown())) {
+ breakdown = wageCalculator.calculate(processService.getProcess(feedback.getProcessId()),
+ feedback.getRouteId(), feedback.getMachineryId(), feedback.getWorkHours(),
+ feedback.getFeedbackQuantity(), qualifiedQuantity,
+ feedback.getId() != null ? feedbackAuxMapper.selectListByFeedbackId(feedback.getId())
+ : Collections.emptyList(),
+ feedback.getFeedbackTime() != null ? feedback.getFeedbackTime().toLocalDate() : null,
+ wageFieldValues);
+ } else {
+ breakdown = wageCalculator.fromSnapshot(feedback, qualifiedQuantity, wageFieldValues);
+ }
+ if (qualityResult != null) {
+ wageCalculator.applyQuality(breakdown, feedback.getProcessId(), feedback.getRouteId(),
+ qualityResult.passRate(), qualityResult.unqualifiedQuantity());
+ }
+ applyWageBreakdown(feedback, breakdown);
+ }
+
+ /**
+ * 鍙栨姤宸ュ崟鍏宠仈鐨勮繃绋嬫楠屽崟涓婅川妫�濉啓鐨勫伐璧勫瓧娈靛��
+ *
+ * <p>鍚屼竴鎶ュ伐鍗曞瓨鍦ㄥ寮犳楠屽崟鏃讹紝宸插畬鎴愮殑浼樺厛锛涘瓧娈垫湭濉啓鏃朵笉鏀惧叆 Map锛岃绠楁椂鍥為��宸ュ簭鍥哄畾鍊笺��
+ */
+ private Map<String, String> getWageFieldValues(Long feedbackId) {
+ if (feedbackId == null) {
+ return Collections.emptyMap();
+ }
+ List<MesQcIpqcDO> ipqcList = ipqcMapper.selectListBySourceDoc(
+ MesBizTypeConstants.PRO_FEEDBACK, feedbackId);
+ if (CollUtil.isEmpty(ipqcList)) {
+ return Collections.emptyMap();
+ }
+ List<Long> ipqcIds = new ArrayList<>(ipqcList.size());
+ ipqcList.stream()
+ .filter(ipqc -> ObjUtil.equal(ipqc.getStatus(), MesQcStatusEnum.FINISHED.getStatus()))
+ .map(MesQcIpqcDO::getId).forEach(ipqcIds::add);
+ ipqcList.stream()
+ .filter(ipqc -> !ObjUtil.equal(ipqc.getStatus(), MesQcStatusEnum.FINISHED.getStatus()))
+ .map(MesQcIpqcDO::getId).forEach(ipqcIds::add);
+ return ipqcWageFieldService.getValueMapByIpqcIds(ipqcIds);
+ }
+
+ /**
+ * 鏍¢獙璐ㄦ宸ュ簭鐨勮繃绋嬫楠屽凡瀹屾垚锛屽苟姹囨�诲悎鏍肩巼涓庝笉鍚堟牸鏁伴噺
+ */
+ private MesProFeedbackQualityResult validateAndGetQualityResult(MesProFeedbackDO feedback) {
+ MesProProcessDO process = processService.getProcess(feedback.getProcessId());
+ String processName = process != null ? process.getName() : "ID=" + feedback.getProcessId();
+ List<MesQcIpqcDO> finishedList = ipqcMapper.selectListBySourceDoc(
+ MesBizTypeConstants.PRO_FEEDBACK, feedback.getId()).stream()
+ .filter(ipqc -> ObjUtil.equal(ipqc.getStatus(), MesQcStatusEnum.FINISHED.getStatus()))
+ .toList();
+ if (CollUtil.isEmpty(finishedList)) {
+ throw new ServiceException(PRO_FEEDBACK_QUALITY_INSPECTION_NOT_FINISHED.getCode(),
+ StrUtil.format("宸ュ簭[{}]涓鸿川妫�宸ュ簭锛屾姤宸ュ崟[{}]灏氭湭瀹屾垚杩囩▼妫�楠岋紱"
+ + "璇峰埌銆岃川閲忕鐞�-杩囩▼妫�楠屻�嶅畬鎴愭楠屽悗鍐嶅鎵�",
+ processName, feedback.getCode()));
+ }
+ BigDecimal checkQuantity = BigDecimal.ZERO;
+ BigDecimal qualifiedQuantity = BigDecimal.ZERO;
+ BigDecimal unqualifiedQuantity = BigDecimal.ZERO;
+ for (MesQcIpqcDO ipqc : finishedList) {
+ checkQuantity = checkQuantity.add(ObjectUtil.defaultIfNull(ipqc.getCheckQuantity(), BigDecimal.ZERO));
+ qualifiedQuantity = qualifiedQuantity.add(ObjectUtil.defaultIfNull(ipqc.getQualifiedQuantity(), BigDecimal.ZERO));
+ unqualifiedQuantity = unqualifiedQuantity.add(
+ ObjectUtil.defaultIfNull(ipqc.getUnqualifiedQuantity(), BigDecimal.ZERO));
+ }
+ if (checkQuantity.signum() <= 0) {
+ throw new ServiceException(PRO_FEEDBACK_QUALITY_INSPECTION_NOT_FINISHED.getCode(),
+ StrUtil.format("宸ュ簭[{}]鐨勮繃绋嬫楠屽崟[{}]妫�娴嬫暟閲忎负 0锛屾棤娉曡绠楀悎鏍肩巼锛�"
+ + "璇峰湪銆岃川閲忕鐞�-杩囩▼妫�楠屻�嶈ˉ褰曟娴嬫暟閲忓悗鍐嶅鎵�",
+ processName, finishedList.get(0).getCode()));
+ }
+ BigDecimal passRate = qualifiedQuantity.multiply(BigDecimal.valueOf(100))
+ .divide(checkQuantity, 2, RoundingMode.HALF_UP);
+ return new MesProFeedbackQualityResult(passRate, checkQuantity, qualifiedQuantity, unqualifiedQuantity);
}
/**
@@ -582,13 +818,32 @@
.setTaskId(reqVO.getTaskId())
.setItemId(task.getItemId())
.setFeedbackQuantity(reqVO.getFeedbackQuantity())
+ .setWorkHours(reqVO.getWorkHours())
.setScheduledQuantity(task.getQuantity())
.setFeedbackTime(reqVO.getFeedbackTime() != null ? reqVO.getFeedbackTime() : LocalDateTime.now())
.setMachineryIds(reqVO.getMachineryIds())
+ .setMachineryId(firstMachineryId(reqVO.getMachineryIds()))
.setStatus(MesProFeedbackStatusEnum.APPROVING.getStatus())
.setRemark(reqVO.getRemark());
+ // 4.1 蹇嵎鎶ュ伐榛樿娌℃湁宸ユ椂褰曞叆鍏ュ彛锛氳鏃惰钖笖宸插畾浠风殑宸ュ簭锛屽繀椤绘樉寮忎紶宸ユ椂锛�
+ // 鎵归噺鎶ュ伐绛変笉浼犲伐鏃剁殑鍏ュ彛浼氬緱鍒板彲鎵ц鐨勬彁绀猴紝寮曞鍒版姤宸ラ〉闈㈠~鍐�
+ MesProProcessDO process = processService.getProcess(task.getProcessId());
+ if (process == null) {
+ throw exception(PRO_FEEDBACK_PROCESS_NOT_EXISTS, task.getProcessId());
+ }
+ BigDecimal wageRate = ObjectUtil.defaultIfNull(wageRuleService.resolve(task.getProcessId(), task.getRouteId(),
+ feedback.getMachineryId(), process.getBillingType(), LocalDate.now()).getWageRate(), BigDecimal.ZERO);
+ if (MesProProcessBillingTypeEnum.TIME == MesProProcessBillingTypeEnum.valueOfType(process.getBillingType())
+ && wageRate.signum() > 0 && reqVO.getWorkHours() == null) {
+ throw exception(PRO_FEEDBACK_TIME_BILLING_QUICK_UNSUPPORTED, process.getName());
+ }
+ // 4.2 蹇嵎鎶ュ伐娌℃湁杈呭姪椤瑰叆鍙o紝浠呮寜鐢熶骇闀垮害锛堟姤宸ュ崟浣嶄负绫虫椂锛夎绠楁爣鍑嗗伐鏃跺揩鐓�
+ List<MesProFeedbackAuxDO> auxList = worktimeService.calculateForFeedback(feedback, null);
+ // 4.3 鎸夊伐搴忚璐圭被鍨嬨�佸崟浠疯鍒欎笌宸ヨ祫瀛楁蹇収骞惰绠楁湰娆℃姤宸ュ伐璧�
+ applyProcessBilling(feedback, process, auxList);
equipmentService.validateSubmission(feedback);
feedbackMapper.insert(feedback);
+ saveFeedbackAux(feedback.getId(), auxList);
saveParamValues(task.getId(), reqVO.getParamValues());
// 5. 杩斿洖缁撴灉
MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(task.getWorkOrderId());
@@ -608,6 +863,33 @@
.setTaskStatus(task.getStatus())
.setWorkOrderStatus(workOrder != null ? workOrder.getStatus() : null)
.setReportableQuantity(reportableQuantity);
+ }
+
+ @Override
+ public MesProFeedbackWageBreakdown previewWage(MesProFeedbackWagePreviewReqVO reqVO) {
+ MesProTaskDO task = taskService.getTask(reqVO.getTaskId());
+ if (task == null) {
+ throw exception(PRO_TASK_NOT_EXISTS);
+ }
+ MesProProcessDO process = processService.getProcess(task.getProcessId());
+ if (process == null) {
+ throw exception(PRO_FEEDBACK_PROCESS_NOT_EXISTS, task.getProcessId());
+ }
+ // 鍊熺敤涓�涓复鏃舵姤宸ュ崟瀵硅薄澶嶇敤鏍囧噯宸ユ椂/杈呭姪宸ユ椂璁$畻
+ MesProFeedbackDO temp = new MesProFeedbackDO()
+ .setTaskId(task.getId())
+ .setRouteId(task.getRouteId())
+ .setProcessId(task.getProcessId())
+ .setWorkstationId(task.getWorkstationId())
+ .setMachineryId(reqVO.getMachineryId())
+ .setWorkHours(reqVO.getWorkHours())
+ .setFeedbackQuantity(reqVO.getFeedbackQuantity())
+ .setQualifiedQuantity(reqVO.getQualifiedQuantity())
+ .setProductionLength(reqVO.getProductionLength());
+ List<MesProFeedbackAuxDO> auxList = worktimeService.calculateForFeedback(temp, reqVO.getAuxList());
+ return wageCalculator.calculate(process, task.getRouteId(), reqVO.getMachineryId(),
+ reqVO.getWorkHours(), reqVO.getFeedbackQuantity(), reqVO.getQualifiedQuantity(), auxList,
+ reqVO.getFeedbackDate());
}
@Override
@@ -677,6 +959,23 @@
ObjectUtil.defaultIfNull(unqualifiedQty, BigDecimal.ZERO));
//5.妫�鏌ュ苟鍙戝竷鐢熶骇瀹屾垚浜嬩欢
checkAndPublishProductionFinished(feedback.getWorkOrderId());
+ checkAndAutoFinishAfterLastQc(feedback);
+ }
+
+ void checkAndAutoFinishAfterLastQc(MesProFeedbackDO feedback) {
+ MesProWorkOrderProcessDO lastProcess = workOrderProcessService
+ .getLastWorkOrderProcessByWorkOrderId(feedback.getWorkOrderId());
+ if (lastProcess == null || !ObjUtil.equal(lastProcess.getProcessId(), feedback.getProcessId())) {
+ return;
+ }
+ // 鍚屼竴宸ュ崟鐨勬湯閬撴姤宸ュ叏閮ㄥ畬鎴愯川妫�鍚庯紝鎵嶅厑璁哥骇鑱斿畬鎴愬伐鍗曚换鍔°��
+ Long pendingCount = feedbackMapper.selectCount(new LambdaQueryWrapperX<MesProFeedbackDO>()
+ .eq(MesProFeedbackDO::getWorkOrderId, feedback.getWorkOrderId())
+ .eq(MesProFeedbackDO::getProcessId, feedback.getProcessId())
+ .ne(MesProFeedbackDO::getStatus, MesProFeedbackStatusEnum.FINISHED.getStatus()));
+ if (pendingCount == 0) {
+ workOrderService.checkAndAutoFinishWorkOrder(feedback.getWorkOrderId());
+ }
}
@Override
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsService.java
index a3f3c77..89f971c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsService.java
@@ -158,13 +158,8 @@
*/
Boolean checkSaleOrderProductionFinished(Long saleOrderId);
- /**
- * 鏍规嵁宸ュ崟ID鑾峰彇 MPS
- *
- * @param workOrderId 宸ュ崟ID
- * @return MPS
- */
- MesProMpsDO getMpsByWorkOrderId(Long workOrderId);
+ /** 鑾峰彇宸ュ崟鍏宠仈鐨勫叏閮� MPS锛屽吋瀹瑰巻鍙插悎骞跺伐鍗曘�� */
+ List<MesProMpsDO> getMpsListByWorkOrderId(Long workOrderId);
/**
* 妫�鏌ュ苟鑷姩瀹屾垚 MPS
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
index 61fc8ed..d932d68 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.mes.service.pro.mps;
import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -375,11 +376,13 @@
}
@Override
- public MesProMpsDO getMpsByWorkOrderId(Long workOrderId) {
+ public List<MesProMpsDO> getMpsListByWorkOrderId(Long workOrderId) {
if (workOrderId == null) {
- return null;
+ return Collections.emptyList();
}
- return mpsMapper.selectOne(MesProMpsDO::getWorkOrderId, workOrderId);
+ return mpsMapper.selectList(new LambdaQueryWrapperX<MesProMpsDO>()
+ .eq(MesProMpsDO::getWorkOrderId, workOrderId)
+ .orderByAsc(MesProMpsDO::getId));
}
@Override
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessServiceImpl.java
index dd5050c..3dd668a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessServiceImpl.java
@@ -9,6 +9,7 @@
import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.MesProProcessSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.process.MesProProcessMapper;
+import cn.iocoder.yudao.module.mes.enums.pro.MesProProcessBillingTypeEnum;
import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProcessService;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
@@ -129,6 +130,14 @@
validateProcessCodeUnique(saveReqVO.getId(), saveReqVO.getCode());
// 2. 鏍¢獙鍚嶇О鍞竴
validateProcessNameUnique(saveReqVO.getId(), saveReqVO.getName());
+ // 3. 鏍¢獙璁¤垂绫诲瀷鍚堟硶锛�1-璁℃椂 2-璁′欢锛夛紝鍚﹀垯鎶ュ伐鏃犳硶纭畾宸ヨ祫绠楁硶
+ if (MesProProcessBillingTypeEnum.valueOfType(saveReqVO.getBillingType()) == null) {
+ throw exception(PRO_PROCESS_BILLING_TYPE_INVALID, saveReqVO.getName(), saveReqVO.getBillingType());
+ }
+ // 4. 鏍¢獙宸ヨ祫瀹氶闈炶礋锛堝厑璁� 0锛岃〃绀烘殏鏈畾浠凤紝姝ゆ椂鎶ュ伐宸ヨ祫涓� 0锛屾牳绠楁椂鍙寜浜鸿皟鏁达級
+ if (saveReqVO.getWageRate() != null && saveReqVO.getWageRate().signum() < 0) {
+ throw exception(PRO_PROCESS_WAGE_RATE_INVALID, saveReqVO.getName(), saveReqVO.getWageRate());
+ }
}
@Override
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleService.java
index 936c385..6849be0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleService.java
@@ -21,7 +21,6 @@
import cn.iocoder.yudao.module.mes.service.pro.route.*;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderProcessService;
import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
-import cn.iocoder.yudao.module.mes.service.cal.holiday.MesCalHolidayService;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -49,7 +48,6 @@
@Resource private MesProRouteProductService routeProductService;
@Resource private MesProProcessService processService;
@Resource private MesMdItemService itemService;
- @Resource private MesCalHolidayService holidayService;
@Resource @Lazy private cn.iocoder.yudao.module.mes.service.pd.processparamtemplate.MesPdProcessParamTemplateService paramTemplateService;
@Resource private MesProScheduleGuardService guard;
@Resource private CrmCustomerApi customerApi;
@@ -137,9 +135,8 @@
.filter(task -> !Objects.equals(task.getStatus(), MesProTaskStatusEnum.CANCELED.getStatus()))
.forEach(task -> allRelevantTasks.put(task.getId(), task));
var existingTasks = new ArrayList<>(allRelevantTasks.values());
- var holidays = holidayService.getHolidayList(request.getStartTime().toLocalDate().atStartOfDay(), request.getStartTime().plusYears(1));
- Set<LocalDate> holidayDates = holidays.stream().filter(day -> Objects.equals(day.getType(), 2))
- .map(day -> day.getDay().toLocalDate()).collect(Collectors.toSet());
+ // 鎺掔彮绠$悊锛堝惈鑺傚亣鏃ヨ缃級宸蹭笅绾匡紝鎺掍骇涓嶅啀鎸夎妭鍋囨棩璺宠繃
+ Set<LocalDate> holidayDates = Set.of();
var calendar = new MesProScheduleEngine.Calendar(holidayDates, request.getStartTime().toLocalDate().plusYears(1));
List<MesProScheduleEngine.Busy> busy = new ArrayList<>();
Set<Long> unknownStations = new HashSet<>();
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProFeedbackQualityResult.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProFeedbackQualityResult.java
new file mode 100644
index 0000000..3407313
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProFeedbackQualityResult.java
@@ -0,0 +1,16 @@
+package cn.iocoder.yudao.module.mes.service.pro.wage;
+
+import java.math.BigDecimal;
+
+/**
+ * MES 鎶ュ伐鍏宠仈杩囩▼妫�楠屾眹鎬荤粨鏋�
+ *
+ * @param passRate 鍚堟牸鐜囷紙%锛�
+ * @param checkQuantity 妫�娴嬫暟閲忓悎璁�
+ * @param qualifiedQuantity 鍚堟牸鏁伴噺鍚堣
+ * @param unqualifiedQuantity 涓嶅悎鏍兼暟閲忓悎璁�
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public record MesProFeedbackQualityResult(BigDecimal passRate, BigDecimal checkQuantity,
+ BigDecimal qualifiedQuantity, BigDecimal unqualifiedQuantity) {
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProFeedbackWageBreakdown.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProFeedbackWageBreakdown.java
new file mode 100644
index 0000000..54337ff
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProFeedbackWageBreakdown.java
@@ -0,0 +1,132 @@
+package cn.iocoder.yudao.module.mes.service.pro.wage;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * MES 鎶ュ伐宸ヨ祫璁$畻鏄庣粏锛堣惤搴撳埌 mes_pro_feedback.wage_breakdown锛�
+ *
+ * <p>鎶ュ伐鎻愪氦鏃跺揩鐓у崟浠枫�佽緟鍔╄钖笌瀛楁鍙栧�硷紱瀹℃壒閲嶇畻鍙鏈揩鐓э紝涓嶅啀璇诲伐搴忓綋鍓嶉厤缃��
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Data
+public class MesProFeedbackWageBreakdown {
+
+ /**
+ * 璁¤垂绫诲瀷锛�1-璁℃椂 2-璁′欢
+ */
+ private Integer billingType;
+ /**
+ * 鎶ュ伐宸ユ椂锛堝皬鏃讹級锛岃浠跺浐瀹氫负 0
+ */
+ private BigDecimal workHours;
+ /**
+ * 璁′欢鏁伴噺锛堟寜鍚堟牸鏁伴噺浼樺厛锛�
+ */
+ private BigDecimal pieceQuantity;
+ /**
+ * 宸ヨ祫鍗曚环
+ */
+ private BigDecimal wageRate;
+ /**
+ * 鍛戒腑鐨勫崟浠疯鍒欑紪鍙凤紝绌�=宸ュ簭榛樿鍗曚环
+ */
+ private Long wageRuleId;
+ /**
+ * 鍗曚环瑙勫垯鍖归厤灞傜骇锛欵XACT / ROUTE / MACHINERY / DEFAULT
+ */
+ private String matchLevel;
+ /**
+ * 宸ヨ壓璺嚎缂栧彿
+ */
+ private Long routeId;
+ /**
+ * 涓昏浠疯澶囩紪鍙�
+ */
+ private Long machineryId;
+ /**
+ * 杈呭姪璁¤柂宸ユ椂锛堝皬鏃讹級
+ */
+ private BigDecimal auxPaidHours;
+ /**
+ * 涓诲伐璧�
+ */
+ private BigDecimal mainWage;
+ /**
+ * 杈呭姪宸ヨ祫
+ */
+ private BigDecimal auxWage;
+ /**
+ * 宸ヨ祫瀛楁蹇収
+ */
+ private List<FieldSnapshot> fields = new ArrayList<>();
+ /**
+ * 璐ㄩ噺璋冩暣鍓嶅伐璧勶紙涓诲伐璧� + 杈呭姪宸ヨ祫 + 瀛楁璋冩暣锛�
+ */
+ private BigDecimal preQualityWage;
+ /**
+ * 璐ㄩ噺璋冩暣
+ */
+ private Quality quality;
+ /**
+ * 鏈�缁堝伐璧�
+ */
+ private BigDecimal finalWage;
+ /**
+ * 闈為樆鏂彁绀�
+ */
+ private List<String> warnings = new ArrayList<>();
+
+ @Data
+ public static class FieldSnapshot {
+
+ /**
+ * 瀛楁缂栫爜
+ */
+ private String code;
+ /**
+ * 瀛楁鍚嶇О
+ */
+ private String name;
+ /**
+ * 璁$畻瑙掕壊锛�1-绯绘暟 2-鍔犲噺閲戦 3-璁′环鏁伴噺 4-浠呰褰�
+ */
+ private Integer role;
+ /**
+ * 鍙栧��
+ */
+ private String value;
+ /**
+ * 璁′环鏁伴噺瑙掕壊鐨勫崟浠�
+ */
+ private BigDecimal unitPrice;
+ /**
+ * 鏈瓧娈佃鍏ュ伐璧勭殑閲戦
+ */
+ private BigDecimal amount;
+
+ }
+
+ @Data
+ public static class Quality {
+
+ /**
+ * 鍚堟牸鐜囷紙%锛�
+ */
+ private BigDecimal passRate;
+ /**
+ * 璐ㄩ噺绯绘暟
+ */
+ private BigDecimal coefficient;
+ /**
+ * 璐ㄩ噺鎵f
+ */
+ private BigDecimal deduction;
+
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProFeedbackWageCalculator.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProFeedbackWageCalculator.java
new file mode 100644
index 0000000..eac415b
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProFeedbackWageCalculator.java
@@ -0,0 +1,409 @@
+package cn.iocoder.yudao.module.mes.service.pro.wage;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo.MesProProcessWageRuleResolveRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo.MesProWageQualityRuleResolveRespVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackAuxDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.wage.MesProProcessWageFieldDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.wage.MesProWageQualityRuleDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.worktime.MesProWorktimeAuxDO;
+import cn.iocoder.yudao.module.mes.enums.pro.MesProProcessBillingTypeEnum;
+import cn.iocoder.yudao.module.mes.service.pro.worktime.MesProWorktimeAuxService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
+
+/**
+ * MES 鎶ュ伐宸ヨ祫璁$畻鍣�
+ *
+ * <p>鍙e緞锛�
+ * <ul>
+ * <li>涓诲伐璧勶細璁℃椂 = 宸ユ椂 脳 鍗曚环锛涜浠� = 鍚堟牸鏁伴噺锛堟棤鍚堟牸鏁伴噺鏃跺彇鎶ュ伐鏁伴噺锛壝� 鍗曚环</li>
+ * <li>杈呭姪宸ヨ祫锛氳緟鍔╂槑缁嗗垎閽熸暟 梅 60 脳 杈呭姪灏忔椂鍗曚环</li>
+ * <li>瀛楁璋冩暣锛氱郴鏁板瓧娈佃繛涔樺悗浣滅敤浜庯紙涓诲伐璧� + 杈呭姪宸ヨ祫锛夛紝鍐嶅彔鍔犲姞鍑忛噾棰濅笌璁′环鏁伴噺</li>
+ * <li>璐ㄩ噺璋冩暣锛氭寜杩囩▼妫�楠屽悎鏍肩巼鍛戒腑璐ㄩ噺瑙勫垯锛岀郴鏁拌繛涔樻垨鎸変笉鍚堟牸鏁伴噺鎵f</li>
+ * </ul>
+ * 鏈被鍙仛璁$畻锛屼笉鍐欏簱锛涙姤宸ュ崟钀藉簱鐢� Service 璐熻矗銆�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Component
+public class MesProFeedbackWageCalculator {
+
+ private static final BigDecimal SIXTY = BigDecimal.valueOf(60);
+ private static final BigDecimal HUNDRED = BigDecimal.valueOf(100);
+
+ @Resource
+ private MesProProcessWageRuleService wageRuleService;
+ @Resource
+ private MesProProcessWageFieldService wageFieldService;
+ @Resource
+ private MesProWageQualityRuleService qualityRuleService;
+ @Resource
+ private MesProWorktimeAuxService worktimeAuxService;
+
+ /**
+ * 鎸夊伐搴忓綋鍓嶉厤缃绠楀伐璧�
+ *
+ * @param process 宸ュ簭
+ * @param routeId 宸ヨ壓璺嚎锛堢敓浜т换鍔$粦瀹氾級
+ * @param machineryId 鏈鎶ュ伐涓昏浠疯澶�
+ * @param workHours 鎶ュ伐宸ユ椂
+ * @param feedbackQuantity 鎶ュ伐鏁伴噺
+ * @param qualifiedQuantity 鍚堟牸鏁伴噺锛岀┖鎴� 0 鏃惰浠舵寜鎶ュ伐鏁伴噺
+ * @param auxList 杈呭姪宸ユ椂鏄庣粏锛堢敱鏍囧噯宸ユ椂鏈嶅姟璁$畻锛�
+ * @param date 璁′环鏃ユ湡锛岀┖鍙栧綋澶�
+ * @return 宸ヨ祫鎷嗗垎
+ */
+ public MesProFeedbackWageBreakdown calculate(MesProProcessDO process, Long routeId, Long machineryId,
+ BigDecimal workHours, BigDecimal feedbackQuantity,
+ BigDecimal qualifiedQuantity,
+ List<MesProFeedbackAuxDO> auxList, LocalDate date) {
+ return calculate(process, routeId, machineryId, workHours, feedbackQuantity, qualifiedQuantity,
+ auxList, date, Collections.emptyMap());
+ }
+
+ /**
+ * 鎸夊伐搴忓綋鍓嶉厤缃绠楀伐璧勶紝骞剁敤杩囩▼妫�楠屽崟涓婅川妫�濉啓鐨勫�艰鐩栧伐璧勫瓧娈�
+ *
+ * @param fieldValues 宸ヨ祫瀛楁缂栫爜 鈫� 璐ㄦ濉啓鐨勫�硷紱绌哄�煎洖閫�宸ュ簭涓婄殑鍥哄畾鍊�
+ */
+ public MesProFeedbackWageBreakdown calculate(MesProProcessDO process, Long routeId, Long machineryId,
+ BigDecimal workHours, BigDecimal feedbackQuantity,
+ BigDecimal qualifiedQuantity,
+ List<MesProFeedbackAuxDO> auxList, LocalDate date,
+ Map<String, String> fieldValues) {
+ MesProProcessBillingTypeEnum billingType = MesProProcessBillingTypeEnum.valueOfType(process.getBillingType());
+ if (billingType == null) {
+ throw exception(PRO_PROCESS_BILLING_TYPE_INVALID, process.getName(), process.getBillingType());
+ }
+ MesProProcessWageRuleResolveRespVO resolved = wageRuleService.resolve(
+ process.getId(), routeId, machineryId, process.getBillingType(), date);
+ BigDecimal wageRate = ObjectUtil.defaultIfNull(resolved.getWageRate(), BigDecimal.ZERO);
+
+ MesProFeedbackWageBreakdown breakdown = new MesProFeedbackWageBreakdown()
+ .setBillingType(billingType.getType())
+ .setRouteId(routeId)
+ .setMachineryId(machineryId)
+ .setWageRate(wageRate)
+ .setWageRuleId(resolved.getRuleId())
+ .setMatchLevel(resolved.getMatchLevel());
+ if (wageRate.signum() <= 0) {
+ breakdown.getWarnings().add(StrUtil.format(
+ "宸ュ簭[{}]鏈厤缃伐璧勫崟浠凤紝鏈鎶ュ伐宸ヨ祫鎸� 0 鍏冭绠楋紱璇峰埌銆屽伐搴忕鐞�-鍗曚环瑙勫垯銆嶇淮鎶ゅ悗閲嶈瘯",
+ process.getName()));
+ }
+
+ // 1. 涓诲伐璧�
+ applyMainWage(breakdown, process, billingType, workHours, feedbackQuantity, qualifiedQuantity);
+ // 2. 杈呭姪宸ヨ祫
+ applyAuxWage(breakdown, process, auxList);
+ // 3. 宸ヨ祫瀛楁璋冩暣锛堣川妫�濉啓鐨勫�间紭鍏堬級
+ applyWageFields(breakdown, process, fieldValues);
+ // 4. 璐ㄩ噺璋冩暣鍓嶅伐璧�
+ breakdown.setPreQualityWage(computePreQualityWage(breakdown));
+ breakdown.setFinalWage(breakdown.getPreQualityWage());
+ return breakdown;
+ }
+
+ /**
+ * 鎸夋姤宸ュ崟蹇収閲嶅缓璁$畻鏄庣粏锛堝鎵归噸绠楃敤锛�
+ *
+ * @param feedback 鎶ュ伐鍗�
+ * @param qualifiedQuantity 璐ㄦ鍚堟牸鏁伴噺锛岀┖鎴� 0 鏃惰浠舵寜鎶ュ伐鏁伴噺
+ * @return 宸ヨ祫鎷嗗垎
+ */
+ public MesProFeedbackWageBreakdown fromSnapshot(MesProFeedbackDO feedback, BigDecimal qualifiedQuantity) {
+ return fromSnapshot(feedback, qualifiedQuantity, Collections.emptyMap());
+ }
+
+ /**
+ * 鎸夋姤宸ュ崟蹇収閲嶅缓璁$畻鏄庣粏锛屽苟鐢ㄨ繃绋嬫楠屽崟涓婅川妫�濉啓鐨勫�艰鐩栧伐璧勫瓧娈�
+ *
+ * @param fieldValues 宸ヨ祫瀛楁缂栫爜 鈫� 璐ㄦ濉啓鐨勫�硷紱绌哄�兼部鐢ㄥ揩鐓у��
+ */
+ public MesProFeedbackWageBreakdown fromSnapshot(MesProFeedbackDO feedback, BigDecimal qualifiedQuantity,
+ Map<String, String> fieldValues) {
+ MesProFeedbackWageBreakdown breakdown = StrUtil.isNotBlank(feedback.getWageBreakdown())
+ ? JsonUtils.parseObject(feedback.getWageBreakdown(), MesProFeedbackWageBreakdown.class) : null;
+ if (breakdown == null) {
+ breakdown = new MesProFeedbackWageBreakdown();
+ }
+ if (breakdown.getWarnings() == null) {
+ breakdown.setWarnings(new ArrayList<>());
+ }
+ if (breakdown.getFields() == null) {
+ breakdown.setFields(new ArrayList<>());
+ }
+ // 浠ユ姤宸ュ崟钀藉簱鍊间负鍑嗭紝閬垮厤蹇収瀛楁缂哄け
+ breakdown.setBillingType(feedback.getBillingType())
+ .setWageRate(ObjectUtil.defaultIfNull(feedback.getWageRate(), BigDecimal.ZERO))
+ .setWageRuleId(feedback.getWageRuleId())
+ .setRouteId(feedback.getRouteId())
+ .setMachineryId(feedback.getMachineryId());
+
+ MesProProcessBillingTypeEnum billingType = MesProProcessBillingTypeEnum.valueOfType(breakdown.getBillingType());
+ String processName = "ID=" + feedback.getProcessId();
+ applyMainWage(breakdown, processName, billingType, feedback.getWorkHours(),
+ feedback.getFeedbackQuantity(), qualifiedQuantity);
+ // 杈呭姪宸ヨ祫娌跨敤鎻愪氦鏃跺揩鐓�
+ breakdown.setAuxPaidHours(ObjectUtil.defaultIfNull(feedback.getAuxPaidHours(), BigDecimal.ZERO));
+ breakdown.setAuxWage(ObjectUtil.defaultIfNull(feedback.getAuxWageAmount(), BigDecimal.ZERO));
+ applyWageFields(breakdown, null, fieldValues);
+ breakdown.setPreQualityWage(computePreQualityWage(breakdown));
+ breakdown.setQuality(null);
+ breakdown.setFinalWage(breakdown.getPreQualityWage());
+ return breakdown;
+ }
+
+ /**
+ * 搴旂敤璐ㄩ噺璋冩暣
+ *
+ * @param breakdown 宸ヨ祫鎷嗗垎
+ * @param processId 宸ュ簭缂栧彿
+ * @param routeId 宸ヨ壓璺嚎缂栧彿
+ * @param passRate 鍚堟牸鐜囷紙%锛�
+ * @param unqualifiedQuantity 涓嶅悎鏍兼暟閲�
+ */
+ public void applyQuality(MesProFeedbackWageBreakdown breakdown, Long processId, Long routeId,
+ BigDecimal passRate, BigDecimal unqualifiedQuantity) {
+ BigDecimal preQuality = computePreQualityWage(breakdown);
+ breakdown.setPreQualityWage(preQuality);
+ MesProFeedbackWageBreakdown.Quality quality = null;
+ BigDecimal finalWage = preQuality;
+ if (passRate != null) {
+ MesProWageQualityRuleResolveRespVO rule = qualityRuleService.resolve(processId, routeId, passRate);
+ if (rule.getRuleId() != null) {
+ quality = new MesProFeedbackWageBreakdown.Quality().setPassRate(passRate);
+ if (Objects.equals(rule.getRuleType(), MesProWageQualityRuleDO.RULE_TYPE_COEFFICIENT)
+ && rule.getCoefficient() != null) {
+ quality.setCoefficient(rule.getCoefficient());
+ finalWage = preQuality.multiply(rule.getCoefficient());
+ } else if (Objects.equals(rule.getRuleType(), MesProWageQualityRuleDO.RULE_TYPE_DEDUCTION)
+ && rule.getDeductionPerUnit() != null) {
+ BigDecimal unqualified = ObjectUtil.defaultIfNull(unqualifiedQuantity, BigDecimal.ZERO);
+ BigDecimal deduction = unqualified.multiply(rule.getDeductionPerUnit())
+ .setScale(2, RoundingMode.HALF_UP);
+ quality.setDeduction(deduction);
+ finalWage = preQuality.subtract(deduction);
+ }
+ quality.setPassRate(passRate);
+ } else {
+ breakdown.getWarnings().add(StrUtil.format(
+ "宸ュ簭鍚堟牸鐜嘯{}%]鏈懡涓川閲忓伐璧勮鍒欙紝鏈涓嶅仛璐ㄩ噺璋冩暣锛涘闇�璋冩暣璇峰湪銆屽伐搴忕鐞�-璐ㄩ噺瑙勫垯銆嶉厤缃尯闂�",
+ passRate.setScale(2, RoundingMode.HALF_UP)));
+ }
+ }
+ if (finalWage.signum() < 0) {
+ breakdown.getWarnings().add("璐ㄩ噺璋冩暣鍚庡伐璧勫皬浜� 0锛屽凡鎸� 0 鍏冭绠楋紱璇锋牳瀵硅川閲忚鍒欐垨涓嶅悎鏍兼暟閲�");
+ finalWage = BigDecimal.ZERO;
+ }
+ breakdown.setQuality(quality);
+ breakdown.setFinalWage(finalWage.setScale(2, RoundingMode.HALF_UP));
+ }
+
+ /**
+ * 璁$畻涓诲伐璧�
+ */
+ private void applyMainWage(MesProFeedbackWageBreakdown breakdown, MesProProcessDO process,
+ MesProProcessBillingTypeEnum billingType, BigDecimal workHours,
+ BigDecimal feedbackQuantity, BigDecimal qualifiedQuantity) {
+ applyMainWage(breakdown, process.getName(), billingType, workHours, feedbackQuantity, qualifiedQuantity);
+ }
+
+ private void applyMainWage(MesProFeedbackWageBreakdown breakdown, String processName,
+ MesProProcessBillingTypeEnum billingType, BigDecimal workHours,
+ BigDecimal feedbackQuantity, BigDecimal qualifiedQuantity) {
+ if (billingType == null) {
+ throw exception(PRO_PROCESS_BILLING_TYPE_INVALID, processName, breakdown.getBillingType());
+ }
+ BigDecimal wageRate = ObjectUtil.defaultIfNull(breakdown.getWageRate(), BigDecimal.ZERO);
+ if (MesProProcessBillingTypeEnum.TIME == billingType) {
+ BigDecimal hours = ObjectUtil.defaultIfNull(workHours, BigDecimal.ZERO);
+ if (wageRate.signum() > 0 && hours.signum() <= 0) {
+ throw exception(PRO_FEEDBACK_WORK_HOURS_REQUIRED, processName);
+ }
+ hours = hours.setScale(2, RoundingMode.HALF_UP);
+ breakdown.setWorkHours(hours).setPieceQuantity(null)
+ .setMainWage(hours.multiply(wageRate).setScale(2, RoundingMode.HALF_UP));
+ return;
+ }
+ // 璁′欢锛氬伐鏃跺瓧娈典笉鍙備笌璁¤柂锛岀粺涓�娓� 0锛涜浠锋暟閲忔寜鍚堟牸鏁伴噺浼樺厛
+ BigDecimal pieceQuantity = ObjectUtil.defaultIfNull(qualifiedQuantity, BigDecimal.ZERO).signum() > 0
+ ? qualifiedQuantity : ObjectUtil.defaultIfNull(feedbackQuantity, BigDecimal.ZERO);
+ breakdown.setWorkHours(BigDecimal.ZERO).setPieceQuantity(pieceQuantity)
+ .setMainWage(pieceQuantity.multiply(wageRate).setScale(2, RoundingMode.HALF_UP));
+ }
+
+ /**
+ * 杈呭姪宸ヨ祫锛氭寜杈呭姪椤硅钖柟寮忓彇鍗曚环锛屽伐搴忚緟鍔╁皬鏃跺伐璧勫厹搴�
+ */
+ private void applyAuxWage(MesProFeedbackWageBreakdown breakdown, MesProProcessDO process,
+ List<MesProFeedbackAuxDO> auxList) {
+ breakdown.setAuxPaidHours(BigDecimal.ZERO).setAuxWage(BigDecimal.ZERO);
+ if (CollUtil.isEmpty(auxList)) {
+ return;
+ }
+ BigDecimal paidMinutes = BigDecimal.ZERO;
+ BigDecimal auxWage = BigDecimal.ZERO;
+ for (MesProFeedbackAuxDO aux : auxList) {
+ BigDecimal minutes = ObjectUtil.defaultIfNull(aux.getMinutes(), BigDecimal.ZERO);
+ if (minutes.signum() <= 0) {
+ continue;
+ }
+ MesProWorktimeAuxDO auxItem = aux.getAuxItemId() != null
+ ? worktimeAuxService.getWorktimeAux(aux.getAuxItemId()) : null;
+ Integer wageMode = auxItem != null ? auxItem.getWageMode() : null;
+ if (wageMode == null) {
+ // 鍘嗗彶杈呭姪椤规湭閰嶇疆璁¤柂鏂瑰紡锛氫笉鍙備笌宸ヨ祫锛屼繚鎸佸師琛屼负
+ continue;
+ }
+ if (Objects.equals(wageMode, MesProWorktimeAuxDO.WAGE_MODE_NONE)) {
+ continue;
+ }
+ BigDecimal hourlyRate = null;
+ if (Objects.equals(wageMode, MesProWorktimeAuxDO.WAGE_MODE_ITEM)) {
+ hourlyRate = auxItem.getWageRate();
+ } else if (Objects.equals(wageMode, MesProWorktimeAuxDO.WAGE_MODE_PROCESS)) {
+ hourlyRate = process.getAuxHourlyRate();
+ if ((hourlyRate == null || hourlyRate.signum() <= 0)
+ && Objects.equals(process.getBillingType(), MesProProcessBillingTypeEnum.TIME.getType())) {
+ // 璁℃椂宸ュ簭鍙洖閫�鍒板伐搴忓伐璧勫崟浠凤紙鍚屼负鍏�/灏忔椂锛�
+ hourlyRate = process.getWageRate();
+ }
+ }
+ if (hourlyRate == null || hourlyRate.signum() <= 0) {
+ breakdown.getWarnings().add(StrUtil.format(
+ "杈呭姪椤筟{}]鏈厤缃钖崟浠凤紝宸ュ簭[{}]涔熸湭閰嶇疆杈呭姪灏忔椂宸ヨ祫锛屾湰娆′笉璁¤緟鍔╁伐璧勶紱"
+ + "璇峰埌銆岃緟鍔╁伐鏃堕厤缃�嶆垨銆屽伐搴忕鐞嗐�嶈ˉ鍏呭崟浠�",
+ aux.getItemName() != null ? aux.getItemName() : "ID=" + aux.getAuxItemId(),
+ process.getName()));
+ continue;
+ }
+ paidMinutes = paidMinutes.add(minutes);
+ auxWage = auxWage.add(minutes.multiply(hourlyRate).divide(SIXTY, 4, RoundingMode.HALF_UP));
+ }
+ breakdown.setAuxPaidHours(paidMinutes.divide(SIXTY, 2, RoundingMode.HALF_UP))
+ .setAuxWage(auxWage.setScale(2, RoundingMode.HALF_UP));
+ }
+
+ /**
+ * 宸ヨ祫瀛楁璋冩暣
+ *
+ * @param process 宸ュ簭锛涗负绌烘椂浣跨敤蹇収涓殑瀛楁锛堝鎵归噸绠楋級
+ */
+ private void applyWageFields(MesProFeedbackWageBreakdown breakdown, MesProProcessDO process,
+ Map<String, String> fieldValues) {
+ List<MesProFeedbackWageBreakdown.FieldSnapshot> snapshots;
+ if (process != null) {
+ snapshots = new ArrayList<>();
+ for (MesProProcessWageFieldDO field : wageFieldService.getFieldList(process.getId())) {
+ if (!Objects.equals(field.getStatus(), CommonStatusEnum.ENABLE.getStatus())) {
+ continue;
+ }
+ snapshots.add(new MesProFeedbackWageBreakdown.FieldSnapshot()
+ .setCode(field.getFieldCode())
+ .setName(field.getFieldName())
+ .setRole(field.getCalcRole())
+ .setValue(field.getFieldValue())
+ .setUnitPrice(field.getUnitPrice()));
+ }
+ breakdown.setFields(snapshots);
+ } else {
+ snapshots = breakdown.getFields() != null ? breakdown.getFields() : new ArrayList<>();
+ }
+ // 璐ㄦ鍦ㄨ繃绋嬫楠屽崟涓婂~鍐欑殑鍊间紭鍏堜簬宸ュ簭鍥哄畾鍊�
+ if (CollUtil.isNotEmpty(fieldValues)) {
+ for (MesProFeedbackWageBreakdown.FieldSnapshot snapshot : snapshots) {
+ String value = fieldValues.get(snapshot.getCode());
+ if (StrUtil.isNotBlank(value)) {
+ snapshot.setValue(value);
+ }
+ }
+ }
+ BigDecimal base = ObjectUtil.defaultIfNull(breakdown.getMainWage(), BigDecimal.ZERO)
+ .add(ObjectUtil.defaultIfNull(breakdown.getAuxWage(), BigDecimal.ZERO));
+ BigDecimal coefficientProduct = BigDecimal.ONE;
+ BigDecimal amountSum = BigDecimal.ZERO;
+ for (MesProFeedbackWageBreakdown.FieldSnapshot snapshot : snapshots) {
+ Integer role = snapshot.getRole();
+ String value = snapshot.getValue();
+ if (Objects.equals(role, MesProProcessWageFieldDO.CALC_ROLE_COEFFICIENT)) {
+ BigDecimal coefficient = parseDecimal(value);
+ if (coefficient == null || coefficient.signum() <= 0) {
+ coefficient = BigDecimal.ONE;
+ }
+ coefficientProduct = coefficientProduct.multiply(coefficient);
+ snapshot.setAmount(base.multiply(coefficient.subtract(BigDecimal.ONE))
+ .setScale(2, RoundingMode.HALF_UP));
+ } else if (Objects.equals(role, MesProProcessWageFieldDO.CALC_ROLE_AMOUNT)) {
+ BigDecimal amount = ObjectUtil.defaultIfNull(parseDecimal(value), BigDecimal.ZERO);
+ amountSum = amountSum.add(amount);
+ snapshot.setAmount(amount.setScale(2, RoundingMode.HALF_UP));
+ } else if (Objects.equals(role, MesProProcessWageFieldDO.CALC_ROLE_QUANTITY_PRICE)) {
+ BigDecimal quantity = ObjectUtil.defaultIfNull(parseDecimal(value), BigDecimal.ZERO);
+ BigDecimal unitPrice = ObjectUtil.defaultIfNull(snapshot.getUnitPrice(), BigDecimal.ZERO);
+ BigDecimal amount = quantity.multiply(unitPrice);
+ amountSum = amountSum.add(amount);
+ snapshot.setAmount(amount.setScale(2, RoundingMode.HALF_UP));
+ } else {
+ snapshot.setAmount(BigDecimal.ZERO);
+ }
+ }
+ breakdown.setFields(snapshots);
+ breakdown.setPreQualityWage(base.multiply(coefficientProduct).add(amountSum)
+ .setScale(2, RoundingMode.HALF_UP));
+ }
+
+ private BigDecimal computePreQualityWage(MesProFeedbackWageBreakdown breakdown) {
+ BigDecimal base = ObjectUtil.defaultIfNull(breakdown.getMainWage(), BigDecimal.ZERO)
+ .add(ObjectUtil.defaultIfNull(breakdown.getAuxWage(), BigDecimal.ZERO));
+ BigDecimal coefficientProduct = BigDecimal.ONE;
+ BigDecimal extra = BigDecimal.ZERO;
+ if (breakdown.getFields() != null) {
+ for (MesProFeedbackWageBreakdown.FieldSnapshot snapshot : breakdown.getFields()) {
+ if (Objects.equals(snapshot.getRole(), MesProProcessWageFieldDO.CALC_ROLE_COEFFICIENT)) {
+ BigDecimal coefficient = parseDecimal(snapshot.getValue());
+ if (coefficient != null && coefficient.signum() > 0) {
+ coefficientProduct = coefficientProduct.multiply(coefficient);
+ }
+ } else if (Objects.equals(snapshot.getRole(), MesProProcessWageFieldDO.CALC_ROLE_AMOUNT)) {
+ extra = extra.add(ObjectUtil.defaultIfNull(parseDecimal(snapshot.getValue()), BigDecimal.ZERO));
+ } else if (Objects.equals(snapshot.getRole(), MesProProcessWageFieldDO.CALC_ROLE_QUANTITY_PRICE)) {
+ extra = extra.add(ObjectUtil.defaultIfNull(parseDecimal(snapshot.getValue()), BigDecimal.ZERO)
+ .multiply(ObjectUtil.defaultIfNull(snapshot.getUnitPrice(), BigDecimal.ZERO)));
+ }
+ }
+ }
+ return base.multiply(coefficientProduct).add(extra).setScale(2, RoundingMode.HALF_UP);
+ }
+
+ private static BigDecimal parseDecimal(String value) {
+ if (StrUtil.isBlank(value)) {
+ return null;
+ }
+ try {
+ return new BigDecimal(value.trim());
+ } catch (NumberFormatException ex) {
+ return null;
+ }
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProProcessWageFieldService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProProcessWageFieldService.java
new file mode 100644
index 0000000..f7f447d
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProProcessWageFieldService.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.mes.service.pro.wage;
+
+import cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo.MesProProcessWageFieldSaveListReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.wage.MesProProcessWageFieldDO;
+
+import java.util.List;
+
+/**
+ * MES 宸ュ簭宸ヨ祫瀛楁 Service 鎺ュ彛
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface MesProProcessWageFieldService {
+
+ /**
+ * 鑾峰彇宸ュ簭鐨勫伐璧勫瓧娈靛垪琛�
+ *
+ * @param processId 宸ュ簭缂栧彿
+ * @return 瀛楁鍒楄〃
+ */
+ List<MesProProcessWageFieldDO> getFieldList(Long processId);
+
+ /**
+ * 鎵归噺淇濆瓨宸ュ簭宸ヨ祫瀛楁锛堟柊澧炪�佷慨鏀广�佸垹闄ゅ樊寮傦級
+ *
+ * @param reqVO 淇濆瓨璇锋眰
+ */
+ void saveFieldList(MesProProcessWageFieldSaveListReqVO reqVO);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProProcessWageFieldServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProProcessWageFieldServiceImpl.java
new file mode 100644
index 0000000..2c0e4bf
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProProcessWageFieldServiceImpl.java
@@ -0,0 +1,172 @@
+package cn.iocoder.yudao.module.mes.service.pro.wage;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo.MesProProcessWageFieldSaveListReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo.MesProProcessWageFieldSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.wage.MesProProcessWageFieldDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.wage.MesProProcessWageFieldMapper;
+import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
+
+/**
+ * MES 宸ュ簭宸ヨ祫瀛楁 Service 瀹炵幇绫�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class MesProProcessWageFieldServiceImpl implements MesProProcessWageFieldService {
+
+ @Resource
+ private MesProProcessWageFieldMapper fieldMapper;
+ @Resource
+ private MesProProcessService processService;
+
+ @Override
+ public List<MesProProcessWageFieldDO> getFieldList(Long processId) {
+ if (processId == null) {
+ return Collections.emptyList();
+ }
+ return fieldMapper.selectListByProcessId(processId);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void saveFieldList(MesProProcessWageFieldSaveListReqVO reqVO) {
+ MesProProcessDO process = processService.getProcess(reqVO.getProcessId());
+ if (process == null) {
+ throw exception(PRO_FEEDBACK_PROCESS_NOT_EXISTS, reqVO.getProcessId());
+ }
+ List<MesProProcessWageFieldSaveReqVO> list = reqVO.getList() == null
+ ? Collections.emptyList() : reqVO.getList();
+ validateFieldList(process, list);
+
+ // 1. 宸插瓨鍦ㄧ殑瀛楁缂栧彿
+ List<MesProProcessWageFieldDO> existingList = fieldMapper.selectListByProcessId(process.getId());
+ Set<Long> existingIds = new HashSet<>();
+ existingList.forEach(field -> existingIds.add(field.getId()));
+ Set<Long> retainedIds = new HashSet<>();
+
+ // 2. 鏂板 / 淇敼
+ for (MesProProcessWageFieldSaveReqVO item : list) {
+ MesProProcessWageFieldDO field = BeanUtils.toBean(item, MesProProcessWageFieldDO.class);
+ field.setProcessId(process.getId());
+ field.setFieldCode(StrUtil.trim(field.getFieldCode()));
+ field.setFieldName(StrUtil.trim(field.getFieldName()));
+ field.setStatus(item.getStatus() != null ? item.getStatus() : CommonStatusEnum.ENABLE.getStatus());
+ field.setSort(item.getSort() != null ? item.getSort() : 0);
+ if (field.getId() == null) {
+ fieldMapper.insert(field);
+ retainedIds.add(field.getId());
+ } else {
+ if (!existingIds.contains(field.getId())) {
+ throw exception(PRO_PROCESS_WAGE_FIELD_NOT_EXISTS);
+ }
+ fieldMapper.updateById(field);
+ retainedIds.add(field.getId());
+ }
+ }
+
+ // 3. 鍒犻櫎鏈鏈繚鐣欑殑瀛楁
+ for (Long existingId : existingIds) {
+ if (!retainedIds.contains(existingId)) {
+ fieldMapper.deleteById(existingId);
+ }
+ }
+ }
+
+ private void validateFieldList(MesProProcessDO process, List<MesProProcessWageFieldSaveReqVO> list) {
+ if (CollUtil.isEmpty(list)) {
+ return;
+ }
+ Set<String> codes = new HashSet<>();
+ for (MesProProcessWageFieldSaveReqVO item : list) {
+ String code = StrUtil.trim(item.getFieldCode());
+ String name = StrUtil.trim(item.getFieldName());
+ if (!codes.add(code)) {
+ throw new ServiceException(PRO_PROCESS_WAGE_FIELD_CODE_DUPLICATE.getCode(),
+ StrUtil.format("宸ュ簭[{}]涓嬪瓧娈电紪鐮乕{}]閲嶅锛岃淇敼瀛楁缂栫爜鍚庨噸璇�", process.getName(), code));
+ }
+ Integer fieldType = item.getFieldType();
+ if (fieldType == null || fieldType < MesProProcessWageFieldDO.FIELD_TYPE_NUMBER
+ || fieldType > MesProProcessWageFieldDO.FIELD_TYPE_BOOLEAN) {
+ throw new ServiceException(PRO_PROCESS_WAGE_FIELD_TYPE_INVALID.getCode(),
+ StrUtil.format("宸ュ簭[{}]瀛楁[{}]鐨勫瓧娈电被鍨媅{}]涓嶅悎娉曪紱鏈熸湜 1-鏁板�� / 2-鏂囨湰 / 3-涓嬫媺 / 4-甯冨皵锛岃閲嶆柊閫夋嫨",
+ process.getName(), name, fieldType));
+ }
+ Integer calcRole = item.getCalcRole();
+ if (calcRole == null || calcRole < MesProProcessWageFieldDO.CALC_ROLE_COEFFICIENT
+ || calcRole > MesProProcessWageFieldDO.CALC_ROLE_RECORD_ONLY) {
+ throw new ServiceException(PRO_PROCESS_WAGE_FIELD_ROLE_INVALID.getCode(),
+ StrUtil.format("宸ュ簭[{}]瀛楁[{}]鐨勮绠楄鑹瞇{}]涓嶅悎娉曪紱鏈熸湜 1-绯绘暟 / 2-鍔犲噺閲戦 / 3-璁′环鏁伴噺 / 4-浠呰褰曪紝璇烽噸鏂伴�夋嫨",
+ process.getName(), name, calcRole));
+ }
+ boolean numericRole = calcRole == MesProProcessWageFieldDO.CALC_ROLE_COEFFICIENT
+ || calcRole == MesProProcessWageFieldDO.CALC_ROLE_AMOUNT
+ || calcRole == MesProProcessWageFieldDO.CALC_ROLE_QUANTITY_PRICE;
+ if (numericRole && !Objects.equals(fieldType, MesProProcessWageFieldDO.FIELD_TYPE_NUMBER)) {
+ throw new ServiceException(PRO_PROCESS_WAGE_FIELD_TYPE_INVALID.getCode(),
+ StrUtil.format("宸ュ簭[{}]瀛楁[{}]鍙備笌宸ヨ祫璁$畻锛屽瓧娈电被鍨嬪繀椤讳负銆屾暟鍊笺�嶏紝瀹為檯涓篬{}]锛涜鏀逛负鏁板�肩被鍨嬪悗閲嶈瘯",
+ process.getName(), name, fieldTypeName(fieldType)));
+ }
+ if (numericRole) {
+ // 鍥哄畾鍊煎厑璁哥暀绌猴細鐢辫川妫�鍦ㄨ繃绋嬫楠屽崟涓婂~鍐欙紝璁$畻鏃剁郴鏁版寜 1銆侀噾棰�/鏁伴噺鎸� 0 澶勭悊
+ BigDecimal value = parseValue(process.getName(), name, item.getFieldValue());
+ if (calcRole == MesProProcessWageFieldDO.CALC_ROLE_COEFFICIENT
+ && value != null && value.signum() <= 0) {
+ throw new ServiceException(PRO_PROCESS_WAGE_FIELD_VALUE_INVALID.getCode(),
+ StrUtil.format("宸ュ簭[{}]瀛楁[{}]涓哄伐璧勭郴鏁帮紝鏈熸湜澶т簬 0 鐨勬暟鍊硷紝瀹為檯涓篬{}]锛涜濉啓澶т簬 0 鐨勭郴鏁帮紝鎴栫暀绌虹敱璐ㄦ濉啓",
+ process.getName(), name, item.getFieldValue()));
+ }
+ if (calcRole == MesProProcessWageFieldDO.CALC_ROLE_QUANTITY_PRICE
+ && (item.getUnitPrice() == null || item.getUnitPrice().signum() < 0)) {
+ throw new ServiceException(PRO_PROCESS_WAGE_FIELD_VALUE_INVALID.getCode(),
+ StrUtil.format("宸ュ簭[{}]瀛楁[{}]涓鸿浠锋暟閲忥紝鏈熸湜閰嶇疆鍗曚环涓斾笉灏忎簬 0锛屽疄闄呬负[{}]锛涜琛ュ厖鍗曚环鍚庨噸璇�",
+ process.getName(), name, item.getUnitPrice()));
+ }
+ }
+ }
+ }
+
+ private BigDecimal parseValue(String processName, String fieldName, String fieldValue) {
+ // 鐣欑┖杩斿洖 null锛岀敱璐ㄦ鍦ㄨ繃绋嬫楠屽崟濉啓锛涢潪绌哄垯蹇呴』鏄暟鍊�
+ if (StrUtil.isBlank(fieldValue)) {
+ return null;
+ }
+ try {
+ return new BigDecimal(fieldValue.trim());
+ } catch (NumberFormatException ex) {
+ throw new ServiceException(PRO_PROCESS_WAGE_FIELD_VALUE_INVALID.getCode(),
+ StrUtil.format("宸ュ簭[{}]瀛楁[{}]鍙備笌宸ヨ祫璁$畻锛屾湡鏈涙暟鍊硷紝瀹為檯涓篬{}]锛涜鏀逛负鏁板�煎悗閲嶈瘯",
+ processName, fieldName, fieldValue));
+ }
+ }
+
+ private static String fieldTypeName(Integer fieldType) {
+ if (fieldType == null) {
+ return "鏈煡";
+ }
+ return switch (fieldType) {
+ case MesProProcessWageFieldDO.FIELD_TYPE_NUMBER -> "鏁板��";
+ case MesProProcessWageFieldDO.FIELD_TYPE_TEXT -> "鏂囨湰";
+ case MesProProcessWageFieldDO.FIELD_TYPE_SELECT -> "涓嬫媺";
+ case MesProProcessWageFieldDO.FIELD_TYPE_BOOLEAN -> "甯冨皵";
+ default -> "鏈煡";
+ };
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProProcessWageRuleService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProProcessWageRuleService.java
new file mode 100644
index 0000000..86ba1e0
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProProcessWageRuleService.java
@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.mes.service.pro.wage;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo.MesProProcessWageRulePageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo.MesProProcessWageRuleResolveRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo.MesProProcessWageRuleSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.wage.MesProProcessWageRuleDO;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * MES 宸ュ簭宸ヨ祫鍗曚环瑙勫垯 Service 鎺ュ彛
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface MesProProcessWageRuleService {
+
+ /**
+ * 鑾峰彇瑙勫垯鍒嗛〉
+ */
+ PageResult<MesProProcessWageRuleDO> getRulePage(MesProProcessWageRulePageReqVO pageReqVO);
+
+ /**
+ * 鑾峰彇宸ュ簭鐨勫叏閮ㄨ鍒�
+ */
+ List<MesProProcessWageRuleDO> getRuleListByProcessId(Long processId);
+
+ /**
+ * 鍒涘缓瑙勫垯
+ */
+ Long createRule(MesProProcessWageRuleSaveReqVO createReqVO);
+
+ /**
+ * 鏇存柊瑙勫垯
+ */
+ void updateRule(MesProProcessWageRuleSaveReqVO updateReqVO);
+
+ /**
+ * 鍒犻櫎瑙勫垯
+ */
+ void deleteRule(Long id);
+
+ /**
+ * 瑙f瀽鍛戒腑鐨勫伐璧勫崟浠�
+ *
+ * @param processId 宸ュ簭缂栧彿
+ * @param routeId 宸ヨ壓璺嚎缂栧彿
+ * @param machineryId 璁惧缂栧彿
+ * @param billingType 璁¤垂绫诲瀷
+ * @param date 璁′环鏃ユ湡锛岀┖鏃跺彇褰撳ぉ
+ * @return 鍛戒腑鐨勮鍒欐垨宸ュ簭榛樿鍗曚环
+ */
+ MesProProcessWageRuleResolveRespVO resolve(Long processId, Long routeId, Long machineryId,
+ Integer billingType, LocalDate date);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProProcessWageRuleServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProProcessWageRuleServiceImpl.java
new file mode 100644
index 0000000..6eea074
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProProcessWageRuleServiceImpl.java
@@ -0,0 +1,193 @@
+package cn.iocoder.yudao.module.mes.service.pro.wage;
+
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+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.pro.wage.vo.MesProProcessWageRulePageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo.MesProProcessWageRuleResolveRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo.MesProProcessWageRuleSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dv.machinery.MesDvMachineryDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.wage.MesProProcessWageRuleDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.wage.MesProProcessWageRuleMapper;
+import cn.iocoder.yudao.module.mes.service.dv.machinery.MesDvMachineryService;
+import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
+import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
+
+/**
+ * MES 宸ュ簭宸ヨ祫鍗曚环瑙勫垯 Service 瀹炵幇绫�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class MesProProcessWageRuleServiceImpl implements MesProProcessWageRuleService {
+
+ @Resource
+ private MesProProcessWageRuleMapper ruleMapper;
+ @Resource
+ private MesProProcessService processService;
+ @Resource
+ private MesProRouteService routeService;
+ @Resource
+ private MesDvMachineryService machineryService;
+
+ @Override
+ public PageResult<MesProProcessWageRuleDO> getRulePage(MesProProcessWageRulePageReqVO pageReqVO) {
+ return ruleMapper.selectPage(pageReqVO);
+ }
+
+ @Override
+ public List<MesProProcessWageRuleDO> getRuleListByProcessId(Long processId) {
+ return ruleMapper.selectListByProcessId(processId);
+ }
+
+ @Override
+ public Long createRule(MesProProcessWageRuleSaveReqVO createReqVO) {
+ validateRule(createReqVO);
+ MesProProcessWageRuleDO rule = BeanUtils.toBean(createReqVO, MesProProcessWageRuleDO.class)
+ .setId(null)
+ .setStatus(ObjUtil.defaultIfNull(createReqVO.getStatus(), CommonStatusEnum.ENABLE.getStatus()))
+ .setPriority(ObjUtil.defaultIfNull(createReqVO.getPriority(), 0));
+ ruleMapper.insert(rule);
+ return rule.getId();
+ }
+
+ @Override
+ public void updateRule(MesProProcessWageRuleSaveReqVO updateReqVO) {
+ validateRuleExists(updateReqVO.getId());
+ validateRule(updateReqVO);
+ ruleMapper.updateById(BeanUtils.toBean(updateReqVO, MesProProcessWageRuleDO.class));
+ }
+
+ @Override
+ public void deleteRule(Long id) {
+ validateRuleExists(id);
+ ruleMapper.deleteById(id);
+ }
+
+ @Override
+ public MesProProcessWageRuleResolveRespVO resolve(Long processId, Long routeId, Long machineryId,
+ Integer billingType, LocalDate date) {
+ MesProProcessDO process = processService.getProcess(processId);
+ if (process == null) {
+ throw exception(PRO_FEEDBACK_PROCESS_NOT_EXISTS, processId);
+ }
+ LocalDate matchDate = date != null ? date : LocalDate.now();
+ List<MesProProcessWageRuleDO> candidates = ruleMapper.selectListByProcessId(processId).stream()
+ .filter(rule -> Objects.equals(rule.getStatus(), CommonStatusEnum.ENABLE.getStatus()))
+ .filter(rule -> billingType == null || Objects.equals(rule.getBillingType(), billingType))
+ .filter(rule -> matchEffective(rule, matchDate))
+ .filter(rule -> rule.getRouteId() == null || Objects.equals(rule.getRouteId(), routeId))
+ .filter(rule -> rule.getMachineryId() == null || Objects.equals(rule.getMachineryId(), machineryId))
+ .sorted(Comparator
+ .comparingInt((MesProProcessWageRuleDO rule) -> matchScore(rule, routeId, machineryId)).reversed()
+ .thenComparing(Comparator.comparingInt(
+ (MesProProcessWageRuleDO rule) -> ObjUtil.defaultIfNull(rule.getPriority(), 0)).reversed())
+ .thenComparing(Comparator.comparing(
+ MesProProcessWageRuleDO::getEffectiveFrom,
+ Comparator.nullsLast(Comparator.reverseOrder())))
+ .thenComparing(Comparator.comparing(MesProProcessWageRuleDO::getId).reversed()))
+ .toList();
+
+ MesProProcessWageRuleResolveRespVO resp = new MesProProcessWageRuleResolveRespVO()
+ .setProcessId(processId).setRouteId(routeId).setMachineryId(machineryId)
+ .setBillingType(billingType != null ? billingType : process.getBillingType());
+ if (candidates.isEmpty()) {
+ resp.setWageRate(process.getWageRate() != null ? process.getWageRate() : BigDecimal.ZERO)
+ .setMatchLevel("DEFAULT");
+ return resp;
+ }
+ MesProProcessWageRuleDO rule = candidates.get(0);
+ resp.setWageRate(rule.getWageRate()).setRuleId(rule.getId())
+ .setMatchLevel(matchLevel(rule, routeId, machineryId));
+ return resp;
+ }
+
+ private static boolean matchEffective(MesProProcessWageRuleDO rule, LocalDate date) {
+ if (rule.getEffectiveFrom() != null && date.isBefore(rule.getEffectiveFrom())) {
+ return false;
+ }
+ return rule.getEffectiveTo() == null || !date.isAfter(rule.getEffectiveTo());
+ }
+
+ private static int matchScore(MesProProcessWageRuleDO rule, Long routeId, Long machineryId) {
+ int score = 0;
+ if (rule.getRouteId() != null && Objects.equals(rule.getRouteId(), routeId)) {
+ score += 2;
+ }
+ if (rule.getMachineryId() != null && Objects.equals(rule.getMachineryId(), machineryId)) {
+ score += 1;
+ }
+ return score;
+ }
+
+ private static String matchLevel(MesProProcessWageRuleDO rule, Long routeId, Long machineryId) {
+ boolean routeMatched = rule.getRouteId() != null && Objects.equals(rule.getRouteId(), routeId);
+ boolean machineryMatched = rule.getMachineryId() != null && Objects.equals(rule.getMachineryId(), machineryId);
+ if (routeMatched && machineryMatched) {
+ return "EXACT";
+ }
+ if (routeMatched) {
+ return "ROUTE";
+ }
+ if (machineryMatched) {
+ return "MACHINERY";
+ }
+ return "DEFAULT";
+ }
+
+ private MesProProcessWageRuleDO validateRuleExists(Long id) {
+ MesProProcessWageRuleDO rule = ruleMapper.selectById(id);
+ if (rule == null) {
+ throw exception(PRO_PROCESS_WAGE_RULE_NOT_EXISTS);
+ }
+ return rule;
+ }
+
+ private void validateRule(MesProProcessWageRuleSaveReqVO reqVO) {
+ MesProProcessDO process = processService.getProcess(reqVO.getProcessId());
+ if (process == null) {
+ throw exception(PRO_FEEDBACK_PROCESS_NOT_EXISTS, reqVO.getProcessId());
+ }
+ if (reqVO.getRouteId() != null) {
+ MesProRouteDO route = routeService.getRoute(reqVO.getRouteId());
+ if (route == null) {
+ throw new ServiceException(PRO_ROUTE_NOT_EXISTS.getCode(),
+ StrUtil.format("宸ュ簭[{}]鐨勫伐璧勮鍒欏紩鐢ㄧ殑宸ヨ壓璺嚎 ID={} 涓嶅瓨鍦紱璇烽噸鏂伴�夋嫨宸ヨ壓璺嚎",
+ process.getName(), reqVO.getRouteId()));
+ }
+ }
+ if (reqVO.getMachineryId() != null) {
+ MesDvMachineryDO machinery = machineryService.getMachinery(reqVO.getMachineryId());
+ if (machinery == null) {
+ throw new ServiceException(DV_MACHINERY_NOT_EXISTS.getCode(),
+ StrUtil.format("宸ュ簭[{}]鐨勫伐璧勮鍒欏紩鐢ㄧ殑璁惧 ID={} 涓嶅瓨鍦紱璇烽噸鏂伴�夋嫨璁惧",
+ process.getName(), reqVO.getMachineryId()));
+ }
+ }
+ if (reqVO.getEffectiveFrom() != null && reqVO.getEffectiveTo() != null
+ && reqVO.getEffectiveFrom().isAfter(reqVO.getEffectiveTo())) {
+ throw new ServiceException(PRO_PROCESS_WAGE_RULE_DUPLICATE.getCode(),
+ StrUtil.format("宸ュ簭[{}]鐨勫伐璧勮鍒欑敓鏁堝紑濮嬫棩鏈焄{}]鏅氫簬缁撴潫鏃ユ湡[{}]锛涜璋冩暣鐢熸晥鍖洪棿鍚庨噸璇�",
+ process.getName(), reqVO.getEffectiveFrom(), reqVO.getEffectiveTo()));
+ }
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProWageQualityRuleService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProWageQualityRuleService.java
new file mode 100644
index 0000000..b2d7a78
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProWageQualityRuleService.java
@@ -0,0 +1,54 @@
+package cn.iocoder.yudao.module.mes.service.pro.wage;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo.MesProWageQualityRulePageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo.MesProWageQualityRuleResolveRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo.MesProWageQualityRuleSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.wage.MesProWageQualityRuleDO;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * MES 璐ㄩ噺宸ヨ祫瑙勫垯 Service 鎺ュ彛
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface MesProWageQualityRuleService {
+
+ /**
+ * 鑾峰彇瑙勫垯鍒嗛〉
+ */
+ PageResult<MesProWageQualityRuleDO> getRulePage(MesProWageQualityRulePageReqVO pageReqVO);
+
+ /**
+ * 鑾峰彇宸ュ簭鐨勫叏閮ㄨ川閲忚鍒�
+ */
+ List<MesProWageQualityRuleDO> getRuleListByProcessId(Long processId);
+
+ /**
+ * 鍒涘缓瑙勫垯
+ */
+ Long createRule(MesProWageQualityRuleSaveReqVO createReqVO);
+
+ /**
+ * 鏇存柊瑙勫垯
+ */
+ void updateRule(MesProWageQualityRuleSaveReqVO updateReqVO);
+
+ /**
+ * 鍒犻櫎瑙勫垯
+ */
+ void deleteRule(Long id);
+
+ /**
+ * 鎸夊伐搴� + 璺嚎 + 鍚堟牸鐜囧尮閰嶈川閲忚鍒�
+ *
+ * @param processId 宸ュ簭缂栧彿
+ * @param routeId 宸ヨ壓璺嚎缂栧彿
+ * @param passRate 鍚堟牸鐜囷紙%锛�
+ * @return 鍛戒腑鐨勮鍒欙紱鏈懡涓椂鍙 passRate锛宺uleId 涓虹┖
+ */
+ MesProWageQualityRuleResolveRespVO resolve(Long processId, Long routeId, BigDecimal passRate);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProWageQualityRuleServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProWageQualityRuleServiceImpl.java
new file mode 100644
index 0000000..f0d76c4
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/wage/MesProWageQualityRuleServiceImpl.java
@@ -0,0 +1,156 @@
+package cn.iocoder.yudao.module.mes.service.pro.wage;
+
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+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.pro.wage.vo.MesProWageQualityRulePageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo.MesProWageQualityRuleResolveRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.wage.vo.MesProWageQualityRuleSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.wage.MesProWageQualityRuleDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.wage.MesProWageQualityRuleMapper;
+import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.math.BigDecimal;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
+
+/**
+ * MES 璐ㄩ噺宸ヨ祫瑙勫垯 Service 瀹炵幇绫�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class MesProWageQualityRuleServiceImpl implements MesProWageQualityRuleService {
+
+ @Resource
+ private MesProWageQualityRuleMapper ruleMapper;
+ @Resource
+ private MesProProcessService processService;
+
+ @Override
+ public PageResult<MesProWageQualityRuleDO> getRulePage(MesProWageQualityRulePageReqVO pageReqVO) {
+ return ruleMapper.selectPage(pageReqVO);
+ }
+
+ @Override
+ public List<MesProWageQualityRuleDO> getRuleListByProcessId(Long processId) {
+ return ruleMapper.selectListByProcessId(processId);
+ }
+
+ @Override
+ public Long createRule(MesProWageQualityRuleSaveReqVO createReqVO) {
+ validateRule(createReqVO);
+ MesProWageQualityRuleDO rule = BeanUtils.toBean(createReqVO, MesProWageQualityRuleDO.class)
+ .setId(null)
+ .setStatus(ObjUtil.defaultIfNull(createReqVO.getStatus(), CommonStatusEnum.ENABLE.getStatus()))
+ .setPriority(ObjUtil.defaultIfNull(createReqVO.getPriority(), 0));
+ ruleMapper.insert(rule);
+ return rule.getId();
+ }
+
+ @Override
+ public void updateRule(MesProWageQualityRuleSaveReqVO updateReqVO) {
+ validateRuleExists(updateReqVO.getId());
+ validateRule(updateReqVO);
+ ruleMapper.updateById(BeanUtils.toBean(updateReqVO, MesProWageQualityRuleDO.class));
+ }
+
+ @Override
+ public void deleteRule(Long id) {
+ validateRuleExists(id);
+ ruleMapper.deleteById(id);
+ }
+
+ @Override
+ public MesProWageQualityRuleResolveRespVO resolve(Long processId, Long routeId, BigDecimal passRate) {
+ MesProWageQualityRuleResolveRespVO resp = new MesProWageQualityRuleResolveRespVO()
+ .setProcessId(processId).setRouteId(routeId).setPassRate(passRate);
+ if (processId == null || passRate == null) {
+ return resp;
+ }
+ MesProWageQualityRuleDO rule = ruleMapper.selectListByProcessId(processId).stream()
+ .filter(item -> Objects.equals(item.getStatus(), CommonStatusEnum.ENABLE.getStatus()))
+ .filter(item -> item.getRouteId() == null || Objects.equals(item.getRouteId(), routeId))
+ .filter(item -> matchRate(item, passRate))
+ .sorted(Comparator
+ // 璺嚎鏇村叿浣撶殑浼樺厛
+ .comparingInt((MesProWageQualityRuleDO item) -> item.getRouteId() != null ? 1 : 0).reversed()
+ .thenComparing(Comparator.comparingInt(
+ (MesProWageQualityRuleDO item) -> ObjUtil.defaultIfNull(item.getPriority(), 0)).reversed())
+ .thenComparing(Comparator.comparing(MesProWageQualityRuleDO::getId).reversed()))
+ .findFirst().orElse(null);
+ if (rule == null) {
+ return resp;
+ }
+ resp.setRuleId(rule.getId()).setRuleType(rule.getRuleType())
+ .setCoefficient(rule.getCoefficient()).setDeductionPerUnit(rule.getDeductionPerUnit());
+ return resp;
+ }
+
+ private static boolean matchRate(MesProWageQualityRuleDO rule, BigDecimal passRate) {
+ if (rule.getMinRate() != null && passRate.compareTo(rule.getMinRate()) < 0) {
+ return false;
+ }
+ return rule.getMaxRate() == null || passRate.compareTo(rule.getMaxRate()) < 0;
+ }
+
+ private MesProWageQualityRuleDO validateRuleExists(Long id) {
+ MesProWageQualityRuleDO rule = ruleMapper.selectById(id);
+ if (rule == null) {
+ throw exception(PRO_WAGE_QUALITY_RULE_NOT_EXISTS);
+ }
+ return rule;
+ }
+
+ private void validateRule(MesProWageQualityRuleSaveReqVO reqVO) {
+ MesProProcessDO process = processService.getProcess(reqVO.getProcessId());
+ if (process == null) {
+ throw exception(PRO_FEEDBACK_PROCESS_NOT_EXISTS, reqVO.getProcessId());
+ }
+ Integer ruleType = reqVO.getRuleType();
+ if (!Objects.equals(ruleType, MesProWageQualityRuleDO.RULE_TYPE_COEFFICIENT)
+ && !Objects.equals(ruleType, MesProWageQualityRuleDO.RULE_TYPE_DEDUCTION)) {
+ throw new ServiceException(PRO_WAGE_QUALITY_RULE_VALUE_INVALID.getCode(),
+ StrUtil.format("宸ュ簭[{}]鐨勮川閲忚鍒欑被鍨媅{}]涓嶅悎娉曪紱鏈熸湜 1-鍚堟牸鐜囩郴鏁� / 2-涓嶅悎鏍兼墸娆撅紝璇烽噸鏂伴�夋嫨",
+ process.getName(), ruleType));
+ }
+ BigDecimal minRate = reqVO.getMinRate();
+ BigDecimal maxRate = reqVO.getMaxRate();
+ if (minRate == null || maxRate == null) {
+ throw new ServiceException(PRO_WAGE_QUALITY_RULE_RANGE_INVALID.getCode(),
+ StrUtil.format("宸ュ簭[{}]鐨勮川閲忚鍒欏悎鏍肩巼鍖洪棿涓嶅畬鏁达細涓嬮檺[{}]锛屼笂闄怺{}]锛涜鍚屾椂濉啓涓嬮檺涓庝笂闄愬悗閲嶈瘯",
+ process.getName(), minRate, maxRate));
+ }
+ if (minRate.compareTo(maxRate) >= 0) {
+ throw new ServiceException(PRO_WAGE_QUALITY_RULE_RANGE_INVALID.getCode(),
+ StrUtil.format("宸ュ簭[{}]鐨勮川閲忚鍒欏悎鏍肩巼鍖洪棿涓嶅悎娉曪細涓嬮檺[{}%]蹇呴』灏忎簬涓婇檺[{}%]锛涜璋冩暣鍖洪棿鍚庨噸璇�",
+ process.getName(), minRate, maxRate));
+ }
+ if (Objects.equals(ruleType, MesProWageQualityRuleDO.RULE_TYPE_COEFFICIENT)) {
+ if (reqVO.getCoefficient() == null || reqVO.getCoefficient().signum() <= 0) {
+ throw new ServiceException(PRO_WAGE_QUALITY_RULE_VALUE_INVALID.getCode(),
+ StrUtil.format("宸ュ簭[{}]鐨勮川閲忚鍒欎负銆屽悎鏍肩巼绯绘暟銆嶏紝鏈熸湜绯绘暟澶т簬 0锛屽疄闄呬负[{}]锛涜濉啓绯绘暟鍚庨噸璇�",
+ process.getName(), reqVO.getCoefficient()));
+ }
+ } else {
+ if (reqVO.getDeductionPerUnit() == null || reqVO.getDeductionPerUnit().signum() < 0) {
+ throw new ServiceException(PRO_WAGE_QUALITY_RULE_VALUE_INVALID.getCode(),
+ StrUtil.format("宸ュ簭[{}]鐨勮川閲忚鍒欎负銆屼笉鍚堟牸鎵f銆嶏紝鏈熸湜姣忎欢鎵f涓嶅皬浜� 0锛屽疄闄呬负[{}]锛涜濉啓鎵f閲戦鍚庨噸璇�",
+ process.getName(), reqVO.getDeductionPerUnit()));
+ }
+ }
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java
index 5e01383..44f9538 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java
@@ -315,7 +315,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public boolean checkAndAutoFinishWorkOrder(Long id) {
- MesProWorkOrderDO workOrder = getWorkOrder(id);
+ MesProWorkOrderDO workOrder = workOrderMapper.selectByIdForUpdate(id);
if (workOrder == null) {
return false;
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/worktime/MesProWorktimeAuxService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/worktime/MesProWorktimeAuxService.java
new file mode 100644
index 0000000..1374000
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/worktime/MesProWorktimeAuxService.java
@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.mes.service.pro.worktime;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo.MesProWorktimeAuxPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo.MesProWorktimeAuxSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.worktime.MesProWorktimeAuxDO;
+import jakarta.validation.Valid;
+
+import java.util.List;
+
+/**
+ * MES 杈呭姪宸ユ椂閰嶇疆 Service 鎺ュ彛
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface MesProWorktimeAuxService {
+
+ Long createWorktimeAux(@Valid MesProWorktimeAuxSaveReqVO createReqVO);
+
+ void updateWorktimeAux(@Valid MesProWorktimeAuxSaveReqVO updateReqVO);
+
+ void deleteWorktimeAux(Long id);
+
+ MesProWorktimeAuxDO getWorktimeAux(Long id);
+
+ PageResult<MesProWorktimeAuxDO> getWorktimeAuxPage(MesProWorktimeAuxPageReqVO pageReqVO);
+
+ /**
+ * 鑾峰緱鎸囧畾宸ュ簭 + 鏈哄彴鍙敤鐨勮緟鍔╁伐鏃堕」鐩紙鏈哄彴涓虹┖鏃跺彧杩斿洖涓嶉檺鏈哄彴鐨勯」鐩級
+ */
+ List<MesProWorktimeAuxDO> getApplicableList(Long processId, Long workstationId);
+
+ List<MesProWorktimeAuxDO> getWorktimeAuxListByProcessId(Long processId);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/worktime/MesProWorktimeAuxServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/worktime/MesProWorktimeAuxServiceImpl.java
new file mode 100644
index 0000000..54eb07a
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/worktime/MesProWorktimeAuxServiceImpl.java
@@ -0,0 +1,149 @@
+package cn.iocoder.yudao.module.mes.service.pro.worktime;
+
+import cn.hutool.core.util.ObjUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo.MesProWorktimeAuxPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo.MesProWorktimeAuxSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.worktime.MesProWorktimeAuxDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.feedback.MesProFeedbackAuxMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.worktime.MesProWorktimeAuxMapper;
+import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
+
+/**
+ * MES 杈呭姪宸ユ椂閰嶇疆 Service 瀹炵幇绫�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class MesProWorktimeAuxServiceImpl implements MesProWorktimeAuxService {
+
+ @Resource
+ private MesProWorktimeAuxMapper worktimeAuxMapper;
+ @Resource
+ private MesProFeedbackAuxMapper feedbackAuxMapper;
+ @Resource
+ private MesProProcessService processService;
+
+ @Override
+ public Long createWorktimeAux(MesProWorktimeAuxSaveReqVO createReqVO) {
+ validateWorktimeAux(createReqVO, null);
+ MesProWorktimeAuxDO aux = BeanUtils.toBean(createReqVO, MesProWorktimeAuxDO.class)
+ .setId(null)
+ .setStatus(ObjUtil.defaultIfNull(createReqVO.getStatus(), CommonStatusEnum.ENABLE.getStatus()))
+ .setSort(ObjUtil.defaultIfNull(createReqVO.getSort(), 0));
+ worktimeAuxMapper.insert(aux);
+ return aux.getId();
+ }
+
+ @Override
+ public void updateWorktimeAux(MesProWorktimeAuxSaveReqVO updateReqVO) {
+ validateWorktimeAux(updateReqVO, updateReqVO.getId());
+ MesProWorktimeAuxDO updateObj = BeanUtils.toBean(updateReqVO, MesProWorktimeAuxDO.class);
+ worktimeAuxMapper.updateById(updateObj);
+ }
+
+ @Override
+ public void deleteWorktimeAux(Long id) {
+ MesProWorktimeAuxDO aux = validateWorktimeAuxExists(id);
+ Long usedCount = feedbackAuxMapper.selectCountByAuxItemId(id);
+ if (usedCount != null && usedCount > 0) {
+ throw exception(PRO_WORKTIME_AUX_IN_USE, aux.getItemName());
+ }
+ worktimeAuxMapper.deleteById(id);
+ }
+
+ @Override
+ public MesProWorktimeAuxDO getWorktimeAux(Long id) {
+ return worktimeAuxMapper.selectById(id);
+ }
+
+ @Override
+ public PageResult<MesProWorktimeAuxDO> getWorktimeAuxPage(MesProWorktimeAuxPageReqVO pageReqVO) {
+ return worktimeAuxMapper.selectPage(pageReqVO);
+ }
+
+ @Override
+ public List<MesProWorktimeAuxDO> getApplicableList(Long processId, Long workstationId) {
+ if (processId == null) {
+ return List.of();
+ }
+ return worktimeAuxMapper.selectListByProcessIdAndWorkstationId(processId, workstationId).stream()
+ .filter(aux -> CommonStatusEnum.ENABLE.getStatus().equals(aux.getStatus()))
+ .toList();
+ }
+
+ @Override
+ public List<MesProWorktimeAuxDO> getWorktimeAuxListByProcessId(Long processId) {
+ return worktimeAuxMapper.selectListByProcessId(processId);
+ }
+
+ private MesProWorktimeAuxDO validateWorktimeAuxExists(Long id) {
+ MesProWorktimeAuxDO aux = worktimeAuxMapper.selectById(id);
+ if (aux == null) {
+ throw exception(PRO_WORKTIME_AUX_NOT_EXISTS);
+ }
+ return aux;
+ }
+
+ private void validateWorktimeAux(MesProWorktimeAuxSaveReqVO reqVO, Long id) {
+ // 1. 宸ュ簭蹇呴』瀛樺湪
+ MesProProcessDO process = processService.getProcess(reqVO.getProcessId());
+ if (process == null) {
+ throw exception(PRO_WORKTIME_AUX_PROCESS_NOT_EXISTS, reqVO.getProcessId());
+ }
+ // 2. 璁¢噺鏂瑰紡 + 瀵瑰簲鐨勬椂闂村弬鏁�
+ Integer measureType = reqVO.getMeasureType();
+ boolean measureValid = MesProWorktimeAuxDO.MEASURE_TIMES == measureType
+ || MesProWorktimeAuxDO.MEASURE_PIECES == measureType
+ || MesProWorktimeAuxDO.MEASURE_REELS == measureType
+ || MesProWorktimeAuxDO.MEASURE_METERS == measureType;
+ if (!measureValid) {
+ throw exception(PRO_WORKTIME_AUX_MEASURE_TYPE_INVALID, reqVO.getItemName(), measureType);
+ }
+ if (MesProWorktimeAuxDO.MEASURE_METERS == measureType) {
+ BigDecimal speed = reqVO.getSpeedMPerMin();
+ if (speed == null || speed.signum() <= 0) {
+ throw exception(PRO_WORKTIME_AUX_SPEED_REQUIRED, reqVO.getItemName());
+ }
+ } else {
+ BigDecimal duration = reqVO.getDurationMinutes();
+ if (duration == null || duration.signum() <= 0) {
+ throw exception(PRO_WORKTIME_AUX_DURATION_REQUIRED, reqVO.getItemName(), measureTypeName(measureType));
+ }
+ }
+ // 3. 鍚屼竴宸ュ簭 + 鍚屼竴鏈哄彴鑼冨洿涓嬮」鐩紪鐮佷笉鑳介噸澶�
+ MesProWorktimeAuxDO exists = worktimeAuxMapper.selectOneByProcessIdAndWorkstationIdAndCode(
+ reqVO.getProcessId(), reqVO.getWorkstationId(), reqVO.getItemCode());
+ if (exists != null && !exists.getId().equals(id)) {
+ String workstationScope = reqVO.getWorkstationId() == null ? "涓嶉檺鏈哄彴" : "鏈哄彴 ID=" + reqVO.getWorkstationId();
+ throw exception(PRO_WORKTIME_AUX_CODE_DUPLICATE, process.getName(), reqVO.getItemCode(), workstationScope);
+ }
+ }
+
+ private static String measureTypeName(Integer measureType) {
+ if (measureType == null) {
+ return "鏈煡";
+ }
+ return switch (measureType) {
+ case MesProWorktimeAuxDO.MEASURE_TIMES -> "鎸夋";
+ case MesProWorktimeAuxDO.MEASURE_PIECES -> "鎸変釜";
+ case MesProWorktimeAuxDO.MEASURE_REELS -> "鎸夌洏";
+ case MesProWorktimeAuxDO.MEASURE_METERS -> "鎸夌背鎶樼畻";
+ default -> "鏈煡";
+ };
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/worktime/MesProWorktimeReportService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/worktime/MesProWorktimeReportService.java
new file mode 100644
index 0000000..abee1f5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/worktime/MesProWorktimeReportService.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.module.mes.service.pro.worktime;
+
+import cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo.MesProWorktimeReportReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo.MesProWorktimeReportRespVO;
+import jakarta.validation.Valid;
+
+/**
+ * MES 宸ユ椂鑰冩牳鎶ヨ〃 Service 鎺ュ彛
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface MesProWorktimeReportService {
+
+ /**
+ * 鎸変汉/宸ュ簭/鏈哄彴/鏃ユ湡姹囨�诲伐鏃惰�冩牳鏁版嵁
+ *
+ * <p>缁熻鑼冨洿锛氭姤宸ユ椂闂村湪鍛ㄦ湡鍐呫�佺姸鎬佷负寰呮楠�(3)鎴栧凡瀹屾垚(4)鐨勬姤宸ュ崟锛涜崏绋夸笌瀹℃壒涓笉璁″叆銆�
+ */
+ MesProWorktimeReportRespVO getReport(@Valid MesProWorktimeReportReqVO reqVO);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/worktime/MesProWorktimeReportServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/worktime/MesProWorktimeReportServiceImpl.java
new file mode 100644
index 0000000..75834f4
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/worktime/MesProWorktimeReportServiceImpl.java
@@ -0,0 +1,179 @@
+package cn.iocoder.yudao.module.mes.service.pro.worktime;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo.MesProWorktimeReportReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo.MesProWorktimeReportRespVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.feedback.MesProFeedbackMapper;
+import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
+import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PRO_WORKTIME_REPORT_DIM_INVALID;
+
+/**
+ * MES 宸ユ椂鑰冩牳鎶ヨ〃 Service 瀹炵幇绫�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class MesProWorktimeReportServiceImpl implements MesProWorktimeReportService {
+
+ private static final BigDecimal HUNDRED = BigDecimal.valueOf(100);
+
+ @Resource
+ private MesProFeedbackMapper feedbackMapper;
+ @Resource
+ private MesProProcessService processService;
+ @Resource
+ private MesMdWorkstationService workstationService;
+ @Resource
+ private AdminUserApi adminUserApi;
+
+ @Override
+ public MesProWorktimeReportRespVO getReport(MesProWorktimeReportReqVO reqVO) {
+ Integer dimType = reqVO.getDimType();
+ if (dimType == null || dimType < 1 || dimType > 4) {
+ throw exception(PRO_WORKTIME_REPORT_DIM_INVALID, dimType);
+ }
+ List<MesProFeedbackDO> list = feedbackMapper.selectWorktimeReportList(reqVO.getBeginTime(), reqVO.getEndTime(),
+ reqVO.getFeedbackUserId(), reqVO.getProcessId(), reqVO.getWorkstationId());
+
+ // 1. 鎸夌淮搴﹀垎缁勭疮鍔�
+ Map<String, Accumulator> accumulatorMap = new LinkedHashMap<>();
+ for (MesProFeedbackDO feedback : list) {
+ String key = buildDimKey(feedback, dimType);
+ accumulatorMap.computeIfAbsent(key, k -> new Accumulator()).add(feedback);
+ }
+
+ // 2. 瑙f瀽缁村害鍚嶇О
+ Map<String, String> nameMap = buildDimNameMap(accumulatorMap.keySet(), dimType);
+
+ // 3. 杈撳嚭琛� + 鍚堣
+ MesProWorktimeReportRespVO resp = new MesProWorktimeReportRespVO();
+ Accumulator total = new Accumulator();
+ list.forEach(total::add);
+ List<MesProWorktimeReportRespVO.Row> rows = new ArrayList<>();
+ accumulatorMap.forEach((key, accumulator) -> {
+ MesProWorktimeReportRespVO.Row row = accumulator.toRow(key);
+ row.setDimName(nameMap.getOrDefault(key, key));
+ rows.add(row);
+ });
+ rows.sort(buildComparator(dimType));
+ resp.setRows(rows);
+ resp.setSummary(total.toRow("ALL"));
+ resp.getSummary().setDimName("鍚堣");
+ return resp;
+ }
+
+ private static String buildDimKey(MesProFeedbackDO feedback, int dimType) {
+ return switch (dimType) {
+ case 1 -> String.valueOf(feedback.getFeedbackUserId());
+ case 2 -> String.valueOf(feedback.getProcessId());
+ case 3 -> feedback.getWorkstationId() == null ? "0" : String.valueOf(feedback.getWorkstationId());
+ default -> feedback.getFeedbackTime() == null ? "" : feedback.getFeedbackTime().toLocalDate().toString();
+ };
+ }
+
+ private Map<String, String> buildDimNameMap(java.util.Set<String> keys, int dimType) {
+ Map<String, String> nameMap = new LinkedHashMap<>();
+ if (CollUtil.isEmpty(keys)) {
+ return nameMap;
+ }
+ switch (dimType) {
+ case 1 -> {
+ Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
+ keys.stream().map(Long::valueOf).toList());
+ keys.forEach(key -> nameMap.put(key,
+ userMap.containsKey(Long.valueOf(key)) ? userMap.get(Long.valueOf(key)).getNickname() : "ID=" + key));
+ }
+ case 2 -> {
+ Map<Long, MesProProcessDO> processMap = processService.getProcessMap(
+ keys.stream().map(Long::valueOf).toList());
+ keys.forEach(key -> nameMap.put(key,
+ processMap.containsKey(Long.valueOf(key)) ? processMap.get(Long.valueOf(key)).getName() : "ID=" + key));
+ }
+ case 3 -> {
+ List<Long> workstationIds = keys.stream().filter(key -> !"0".equals(key)).map(Long::valueOf).toList();
+ Map<Long, MesMdWorkstationDO> workstationMap = workstationService.getWorkstationMap(workstationIds);
+ keys.forEach(key -> {
+ if ("0".equals(key)) {
+ nameMap.put(key, "鏈寚瀹氭満鍙�");
+ } else {
+ nameMap.put(key, workstationMap.containsKey(Long.valueOf(key))
+ ? workstationMap.get(Long.valueOf(key)).getName() : "ID=" + key);
+ }
+ });
+ }
+ default -> keys.forEach(key -> nameMap.put(key, key));
+ }
+ return nameMap;
+ }
+
+ private static Comparator<MesProWorktimeReportRespVO.Row> buildComparator(int dimType) {
+ if (dimType == 4) {
+ return Comparator.comparing(MesProWorktimeReportRespVO.Row::getDimKey);
+ }
+ return Comparator.comparing(row -> {
+ try {
+ return Long.parseLong(row.getDimKey());
+ } catch (NumberFormatException ignored) {
+ return Long.MAX_VALUE;
+ }
+ });
+ }
+
+ private static class Accumulator {
+
+ private long count;
+ private BigDecimal productionLength = BigDecimal.ZERO;
+ private BigDecimal actualHours = BigDecimal.ZERO;
+ private BigDecimal standardHours = BigDecimal.ZERO;
+ private BigDecimal wageAmount = BigDecimal.ZERO;
+
+ void add(MesProFeedbackDO feedback) {
+ count++;
+ productionLength = productionLength.add(nvl(feedback.getProductionLength()));
+ actualHours = actualHours.add(nvl(feedback.getWorkHours()));
+ standardHours = standardHours.add(nvl(feedback.getStandardWorkHours()));
+ wageAmount = wageAmount.add(nvl(feedback.getWageAmount()));
+ }
+
+ MesProWorktimeReportRespVO.Row toRow(String key) {
+ MesProWorktimeReportRespVO.Row row = new MesProWorktimeReportRespVO.Row();
+ row.setDimKey(key);
+ row.setFeedbackCount(count);
+ row.setProductionLength(productionLength.setScale(2, RoundingMode.HALF_UP));
+ row.setActualHours(actualHours.setScale(2, RoundingMode.HALF_UP));
+ row.setStandardHours(standardHours.setScale(2, RoundingMode.HALF_UP));
+ BigDecimal diff = actualHours.subtract(standardHours).setScale(2, RoundingMode.HALF_UP);
+ row.setWorkHoursDiff(diff);
+ row.setWorkHoursDiffRate(standardHours.signum() > 0
+ ? diff.multiply(HUNDRED).divide(standardHours, 2, RoundingMode.HALF_UP) : null);
+ row.setWageAmount(wageAmount.setScale(2, RoundingMode.HALF_UP));
+ return row;
+ }
+
+ private static BigDecimal nvl(BigDecimal value) {
+ return value != null ? value : BigDecimal.ZERO;
+ }
+
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/worktime/MesProWorktimeService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/worktime/MesProWorktimeService.java
new file mode 100644
index 0000000..4baac70
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/worktime/MesProWorktimeService.java
@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.mes.service.pro.worktime;
+
+import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo.MesProWorktimeCalcReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo.MesProWorktimeCalcRespVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackAuxDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
+import jakarta.validation.Valid;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * MES 鏍囧噯宸ユ椂璁$畻 Service 鎺ュ彛
+ *
+ * <p>鏍囧噯宸ユ椂鍙敤浜庡伐鏃惰�冩牳瀵规瘮锛屼笉鍙備笌宸ヨ祫璁$畻锛涘伐璧勫缁堟寜瀹為檯鎶ュ伐宸ユ椂/鏁伴噺璁$畻銆�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface MesProWorktimeService {
+
+ /**
+ * 鎸夌敓浜т换鍔� + 鐢熶骇闀垮害 + 杈呭姪椤规鏁拌瘯绠楁爣鍑嗗伐鏃�
+ */
+ MesProWorktimeCalcRespVO calculate(@Valid MesProWorktimeCalcReqVO reqVO);
+
+ /**
+ * 璁$畻鎶ュ伐鍗曠殑鏍囧噯宸ユ椂蹇収锛屽苟鐢熸垚杈呭姪宸ユ椂鏄庣粏锛堟湭鍏ュ簱锛�
+ *
+ * <p>璁$畻鏉′欢缂哄け鏃朵笉闃绘柇鎶ュ伐锛屾爣鍑嗗伐鏃惰 0 骞跺湪 stdCalcNote 鍐欐槑鍘熷洜銆�
+ *
+ * @return 寰呴殢鎶ュ伐涓�璧蜂繚瀛樼殑杈呭姪宸ユ椂鏄庣粏锛堝凡濉ソ minutes锛�
+ */
+ List<MesProFeedbackAuxDO> calculateForFeedback(MesProFeedbackDO feedback,
+ List<MesProFeedbackSaveReqVO.AuxValue> auxValues);
+
+ /**
+ * 鐢熸垚宸ユ椂瓒呭嚭闃堝�肩殑鎻愮ず鏂囨
+ *
+ * @return 鏈秴闃堝�兼垨鏃犳硶姣旇緝鏃惰繑鍥� null
+ */
+ String buildWarnMessage(BigDecimal actualHours, BigDecimal standardHours);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/worktime/MesProWorktimeServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/worktime/MesProWorktimeServiceImpl.java
new file mode 100644
index 0000000..bd7a2ff
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/worktime/MesProWorktimeServiceImpl.java
@@ -0,0 +1,444 @@
+package cn.iocoder.yudao.module.mes.service.pro.worktime;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo.MesProWorktimeCalcReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.worktime.vo.MesProWorktimeCalcRespVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackAuxDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.worktime.MesProWorktimeAuxDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderParamRecordDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderParamRecordDetailDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderParamRecordDetailMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderParamRecordMapper;
+import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
+import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
+import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
+import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
+import jakarta.annotation.Resource;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PRO_TASK_NOT_EXISTS;
+
+/**
+ * MES 鏍囧噯宸ユ椂璁$畻 Service 瀹炵幇绫�
+ *
+ * <p>璁$畻鍙e緞锛堜笌銆婂伐鏃惰�冩牳锛堟暟鏀规ā鐗堬級銆嬩竴鑷达級锛�
+ * <ul>
+ * <li>鏂瑰紡 1-杞�熋楄妭璺濓細绾块�熷害 = 杞�� 脳 鑺傝窛 梅 1000 脳 鎶樼畻绯绘暟</li>
+ * <li>鏂瑰紡 2-绾块�熷害鐩村彇锛氱嚎閫熷害 = 鍙傛暟鍊�</li>
+ * <li>鏂瑰紡 3-婊¢�熺櫨鍒嗘瘮脳鑺傝窛锛氳浆閫� = 婊¤浆閫� 脳 鐧惧垎姣� 梅 100锛屽啀鎸夋柟寮� 1 鎶樼畻绾块�熷害</li>
+ * <li>涓诲伐鏃讹紙灏忔椂锛�= 鐢熶骇闀垮害锛堢背锛壝� 绾块�熷害锛堢背/鍒嗭級梅 60</li>
+ * <li>杈呭姪宸ユ椂锛堝皬鏃讹級= 危(娆℃暟 脳 鍗曢」鍒嗛挓鏁�) 梅 60锛涙寜绫虫姌绠楁椂 = 绫虫暟 梅 鎶樼畻閫熷害</li>
+ * <li>鏍囧噯宸ユ椂 = 涓诲伐鏃� + 杈呭姪宸ユ椂</li>
+ * </ul>
+ * 浠讳綍鍙傛暟缂哄け閮藉彧璁颁负鈥滄湭璁$畻鍘熷洜鈥濓紝涓嶉樆鏂姤宸ャ��
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+public class MesProWorktimeServiceImpl implements MesProWorktimeService {
+
+ private static final BigDecimal SIXTY = BigDecimal.valueOf(60);
+ private static final BigDecimal THOUSAND = BigDecimal.valueOf(1000);
+ private static final BigDecimal HUNDRED = BigDecimal.valueOf(100);
+
+ @Resource
+ private MesProTaskService taskService;
+ @Resource
+ private MesProProcessService processService;
+ @Resource
+ private MesProWorktimeAuxService worktimeAuxService;
+ @Resource
+ private MesMdmItemService mdmItemService;
+ @Resource
+ private MesMdUnitMeasureService unitMeasureService;
+ @Resource
+ private MesProWorkOrderParamRecordMapper paramRecordMapper;
+ @Resource
+ private MesProWorkOrderParamRecordDetailMapper paramRecordDetailMapper;
+
+ /**
+ * 宸ユ椂瓒呭嚭鏍囧噯宸ユ椂鐨勫憡璀﹂槇鍊硷紙鐧惧垎姣旓級锛岄粯璁� 20%
+ */
+ @Value("${yudao.mes.worktime.warn-threshold:20}")
+ private BigDecimal warnThreshold;
+
+ @Override
+ public MesProWorktimeCalcRespVO calculate(MesProWorktimeCalcReqVO reqVO) {
+ MesProTaskDO task = taskService.getTask(reqVO.getTaskId());
+ if (task == null) {
+ throw exception(PRO_TASK_NOT_EXISTS);
+ }
+ return doCalculate(task, reqVO.getProductionLength(), reqVO.getFeedbackQuantity(), reqVO.getAuxList());
+ }
+
+ @Override
+ public List<MesProFeedbackAuxDO> calculateForFeedback(MesProFeedbackDO feedback,
+ List<MesProFeedbackSaveReqVO.AuxValue> auxValues) {
+ MesProTaskDO task = feedback.getTaskId() != null ? taskService.getTask(feedback.getTaskId()) : null;
+ List<MesProWorktimeCalcReqVO.AuxInput> auxInputs = toAuxInputs(auxValues);
+ MesProWorktimeCalcRespVO result = doCalculate(task, feedback.getProductionLength(),
+ feedback.getFeedbackQuantity(), auxInputs);
+
+ feedback.setProductionLength(result.getProductionLength() != null
+ ? result.getProductionLength() : BigDecimal.ZERO);
+ feedback.setStandardWorkHours(result.getStandardWorkHours());
+ feedback.setStandardPrimaryHours(result.getPrimaryHours());
+ feedback.setStandardAuxHours(result.getAuxHours());
+ String note = result.getNote();
+ if (CollUtil.isNotEmpty(result.getMissingReasons())) {
+ note = StrUtil.format("{}锛涙湭璁$畻鍘熷洜锛歿}", note, String.join("锛�", result.getMissingReasons()));
+ }
+ feedback.setStdCalcNote(StrUtil.maxLength(note, 500));
+
+ // 杈呭姪宸ユ椂鏄庣粏锛氫互璁$畻缁撴灉涓哄噯锛屼繚鐣欏綍鍏ョ殑娆℃暟/鏉愭枡瀵癸紝渚夸簬瀹℃牳杩芥煡
+ List<MesProFeedbackAuxDO> auxList = new ArrayList<>();
+ if (CollUtil.isNotEmpty(result.getAuxList())) {
+ for (MesProWorktimeCalcRespVO.AuxResult auxResult : result.getAuxList()) {
+ auxList.add(MesProFeedbackAuxDO.builder()
+ .auxItemId(auxResult.getAuxItemId())
+ .itemName(auxResult.getItemName())
+ .measureType(auxResult.getMeasureType())
+ .quantity(auxResult.getQuantity())
+ .materialFrom(auxResult.getMaterialFrom())
+ .materialTo(auxResult.getMaterialTo())
+ .minutes(auxResult.getMinutes())
+ .remark(auxResult.getRemark())
+ .build());
+ }
+ }
+ return auxList;
+ }
+
+ @Override
+ public String buildWarnMessage(BigDecimal actualHours, BigDecimal standardHours) {
+ if (actualHours == null || standardHours == null || standardHours.signum() <= 0) {
+ return null;
+ }
+ BigDecimal threshold = warnThreshold != null ? warnThreshold : BigDecimal.valueOf(20);
+ BigDecimal diffRate = actualHours.subtract(standardHours)
+ .multiply(HUNDRED)
+ .divide(standardHours, 2, RoundingMode.HALF_UP);
+ if (diffRate.compareTo(threshold) <= 0) {
+ return null;
+ }
+ return StrUtil.format("鏈鎶ュ伐宸ユ椂 {} 灏忔椂锛岄珮浜庢爣鍑嗗伐鏃� {} 灏忔椂杈� {}%锛岃秴杩� {}% 闃堝�硷紱"
+ + "璇锋牳瀵规姤宸ュ伐鏃舵槸鍚﹀綍閿欙紝浠ュ強杈呭姪椤规鏁版槸鍚︽寜瀹為檯濉啓",
+ actualHours.setScale(2, RoundingMode.HALF_UP),
+ standardHours.setScale(2, RoundingMode.HALF_UP),
+ diffRate, threshold.setScale(2, RoundingMode.HALF_UP).stripTrailingZeros());
+ }
+
+ private MesProWorktimeCalcRespVO doCalculate(MesProTaskDO task, BigDecimal productionLength,
+ BigDecimal feedbackQuantity,
+ List<MesProWorktimeCalcReqVO.AuxInput> auxInputs) {
+ MesProWorktimeCalcRespVO resp = new MesProWorktimeCalcRespVO();
+ resp.setProductionLength(productionLength);
+ resp.setStandardWorkHours(BigDecimal.ZERO);
+ resp.setPrimaryHours(BigDecimal.ZERO);
+ resp.setAuxHours(BigDecimal.ZERO);
+ resp.setAuxList(List.of());
+ List<String> missingReasons = new ArrayList<>();
+ resp.setMissingReasons(missingReasons);
+ if (task == null) {
+ missingReasons.add("鐢熶骇浠诲姟涓嶅瓨鍦紝鏃犳硶璁$畻鏍囧噯宸ユ椂");
+ resp.setNote(String.join("锛�", missingReasons));
+ return resp;
+ }
+ Long processId = task.getProcessId();
+ MesProProcessDO process = processId != null ? processService.getProcess(processId) : null;
+ if (process == null) {
+ missingReasons.add(StrUtil.format("鐢熶骇浠诲姟鐨勫伐搴� ID={} 涓嶅瓨鍦紝鏃犳硶璁$畻鏍囧噯宸ユ椂", processId));
+ resp.setNote(String.join("锛�", missingReasons));
+ return resp;
+ }
+
+ // 1. 鐢熶骇闀垮害锛氭湭濉笖鎶ュ伐鍗曚綅涓衡�滅背鈥濇椂鎸夋姤宸ユ暟閲忓甫鍏�
+ BigDecimal length = productionLength;
+ if (length == null || length.signum() <= 0) {
+ length = defaultProductionLength(task, feedbackQuantity);
+ }
+ if (length == null || length.signum() <= 0) {
+ missingReasons.add("鏈~鍐欑敓浜ч暱搴︼紙绫筹級锛屾棤娉曡绠椾富宸ユ椂锛涜鍦ㄦ姤宸ュ崟濉啓鏈鐢熶骇闀垮害");
+ }
+ resp.setProductionLength(length);
+
+ // 2. 绾块�熷害
+ SpeedResult speedResult = calculateSpeed(task, process, missingReasons);
+
+ // 3. 涓诲伐鏃�
+ BigDecimal primaryHours = BigDecimal.ZERO;
+ if (length != null && length.signum() > 0 && speedResult.speed != null && speedResult.speed.signum() > 0) {
+ primaryHours = length.divide(speedResult.speed, 6, RoundingMode.HALF_UP)
+ .divide(SIXTY, 2, RoundingMode.HALF_UP);
+ }
+
+ // 4. 杈呭姪宸ユ椂
+ AuxCalcResult auxResult = calculateAux(task, process, auxInputs, missingReasons);
+
+ // 5. 姹囨��
+ BigDecimal standardHours = primaryHours.add(auxResult.auxHours).setScale(2, RoundingMode.HALF_UP);
+ resp.setPrimaryHours(primaryHours);
+ resp.setAuxHours(auxResult.auxHours);
+ resp.setStandardWorkHours(standardHours);
+ resp.setAuxList(auxResult.items);
+ resp.setNote(buildNote(length, speedResult, primaryHours, auxResult));
+ return resp;
+ }
+
+ /**
+ * 璁$畻绾块�熷害锛堢背/鍒嗭級
+ */
+ private SpeedResult calculateSpeed(MesProTaskDO task, MesProProcessDO process, List<String> missingReasons) {
+ Integer mode = process.getStdTimeMode();
+ if (mode == null || mode == 0) {
+ missingReasons.add(StrUtil.format("宸ュ簭銆寋}銆嶆湭鍚敤鏍囧噯宸ユ椂璁$畻鏂瑰紡锛屼富宸ユ椂鎸� 0 澶勭悊锛�"
+ + "璇峰湪宸ュ簭璁剧疆涓�夋嫨璁$畻鏂瑰紡骞剁粦瀹氬弬鏁�", process.getName()));
+ return new SpeedResult(null, null);
+ }
+ Map<String, String> paramValues = loadTaskParamValues(task.getId());
+ BigDecimal factor = process.getStdTimeFactor() != null ? process.getStdTimeFactor() : BigDecimal.ONE;
+
+ if (mode == 2) {
+ BigDecimal speed = parseParam(process.getStdSpeedParamCode(), "绾块�熷害", paramValues, missingReasons);
+ return new SpeedResult(speed, StrUtil.format("绾块�熷害 {} 绫�/鍒嗭紙鍙傛暟鐩村彇锛�", speed));
+ }
+
+ BigDecimal pitch = parseParam(process.getStdPitchParamCode(), "鑺傝窛", paramValues, missingReasons);
+ BigDecimal rpm;
+ String rpmNote;
+ if (mode == 1) {
+ rpm = parseParam(process.getStdRpmParamCode(), "杞��", paramValues, missingReasons);
+ rpmNote = "杞�� " + plain(rpm) + " r/min";
+ } else if (mode == 3) {
+ BigDecimal percent = parseParam(process.getStdPercentParamCode(), "杞�熺櫨鍒嗘瘮", paramValues, missingReasons);
+ BigDecimal maxRpm = process.getMaxRpm();
+ if (maxRpm == null || maxRpm.signum() <= 0) {
+ missingReasons.add(StrUtil.format("宸ュ簭銆寋}銆嶆湭閰嶇疆鏈哄彴婊¤浆閫燂紙r/min锛夛紝鏃犳硶鎸夆�滄弧閫熺櫨鍒嗘瘮脳鑺傝窛鈥濊绠�",
+ process.getName()));
+ rpm = null;
+ } else if (percent == null) {
+ rpm = null;
+ } else {
+ rpm = maxRpm.multiply(percent).divide(HUNDRED, 4, RoundingMode.HALF_UP);
+ }
+ rpmNote = StrUtil.format("杞�� {} r/min锛堟弧杞�� {} 脳 {}%锛�", plain(rpm), plain(maxRpm), plain(percent));
+ } else {
+ missingReasons.add(StrUtil.format("宸ュ簭銆寋}銆嶇殑鏍囧噯宸ユ椂璁$畻鏂瑰紡[{}]鏃犳晥锛屽彧鑳芥槸 0/1/2/3",
+ process.getName(), mode));
+ return new SpeedResult(null, null);
+ }
+ if (rpm == null || pitch == null) {
+ return new SpeedResult(null, null);
+ }
+ BigDecimal speed = rpm.multiply(pitch).divide(THOUSAND, 4, RoundingMode.HALF_UP).multiply(factor)
+ .setScale(4, RoundingMode.HALF_UP);
+ if (speed.signum() <= 0) {
+ missingReasons.add(StrUtil.format("鎸夎浆閫� {} 脳 鑺傝窛 {} 梅 1000 脳 绯绘暟 {} 绠楀嚭鐨勭嚎閫熷害涓嶅ぇ浜� 0锛岃妫�鏌ュ伐鑹哄弬鏁�",
+ plain(rpm), plain(pitch), plain(factor)));
+ return new SpeedResult(null, null);
+ }
+ String note = StrUtil.format("绾块�熷害 {} 绫�/鍒嗭紙{} 脳 鑺傝窛 {} 梅 1000 脳 绯绘暟 {}锛�",
+ plain(speed), rpmNote, plain(pitch), plain(factor));
+ return new SpeedResult(speed, note);
+ }
+
+ private AuxCalcResult calculateAux(MesProTaskDO task, MesProProcessDO process,
+ List<MesProWorktimeCalcReqVO.AuxInput> auxInputs,
+ List<String> missingReasons) {
+ if (CollUtil.isEmpty(auxInputs)) {
+ return new AuxCalcResult(BigDecimal.ZERO, List.of());
+ }
+ Long workstationId = task.getWorkstationId();
+ Map<Long, MesProWorktimeAuxDO> applicableMap = new HashMap<>();
+ worktimeAuxService.getApplicableList(process.getId(), workstationId)
+ .forEach(aux -> applicableMap.put(aux.getId(), aux));
+
+ List<MesProWorktimeCalcRespVO.AuxResult> items = new ArrayList<>();
+ BigDecimal totalMinutes = BigDecimal.ZERO;
+ for (MesProWorktimeCalcReqVO.AuxInput input : auxInputs) {
+ if (input == null || input.getAuxItemId() == null) {
+ continue;
+ }
+ MesProWorktimeAuxDO aux = applicableMap.get(input.getAuxItemId());
+ if (aux == null) {
+ missingReasons.add(StrUtil.format("杈呭姪宸ユ椂椤圭洰 ID={} 鏈厤缃湪褰撳墠宸ュ簭銆寋}銆嶆垨鏈哄彴銆寋}銆嶄笅锛�"
+ + "宸插拷鐣ヨ椤癸紱璇峰埛鏂伴〉闈㈤噸鏂伴�夋嫨杈呭姪椤圭洰",
+ input.getAuxItemId(), process.getName(),
+ workstationId == null ? "涓嶉檺鏈哄彴" : "ID=" + workstationId));
+ continue;
+ }
+ BigDecimal quantity = input.getQuantity() != null ? input.getQuantity() : BigDecimal.ZERO;
+ BigDecimal minutes;
+ if (MesProWorktimeAuxDO.MEASURE_METERS == aux.getMeasureType()) {
+ BigDecimal speed = aux.getSpeedMPerMin();
+ if (speed == null || speed.signum() <= 0) {
+ missingReasons.add(StrUtil.format("杈呭姪椤圭洰銆寋}銆嶆寜绫虫姌绠楋紝浣嗘湭閰嶇疆鎶樼畻閫熷害锛堢背/鍒嗭級锛屽凡蹇界暐璇ラ」",
+ aux.getItemName()));
+ continue;
+ }
+ minutes = quantity.divide(speed, 2, RoundingMode.HALF_UP);
+ } else {
+ BigDecimal duration = aux.getDurationMinutes() != null ? aux.getDurationMinutes() : BigDecimal.ZERO;
+ minutes = quantity.multiply(duration).setScale(2, RoundingMode.HALF_UP);
+ }
+ totalMinutes = totalMinutes.add(minutes);
+ MesProWorktimeCalcRespVO.AuxResult item = new MesProWorktimeCalcRespVO.AuxResult();
+ item.setAuxItemId(aux.getId());
+ item.setItemName(aux.getItemName());
+ item.setMeasureType(aux.getMeasureType());
+ item.setQuantity(quantity);
+ item.setMaterialFrom(input.getMaterialFrom());
+ item.setMaterialTo(input.getMaterialTo());
+ item.setMinutes(minutes);
+ item.setRemark(input.getRemark());
+ items.add(item);
+ }
+ BigDecimal auxHours = totalMinutes.divide(SIXTY, 2, RoundingMode.HALF_UP);
+ return new AuxCalcResult(auxHours, items);
+ }
+
+ /**
+ * 鐢熶骇闀垮害鏈~鏃讹細鎶ュ伐鍗曚綅鏄�滅背鈥濆垯鐩存帴鎸夋姤宸ユ暟閲忓甫鍏ワ紝鍚﹀垯杩斿洖 null 鐢变汉宸ュ~鍐�
+ */
+ private BigDecimal defaultProductionLength(MesProTaskDO task, BigDecimal feedbackQuantity) {
+ if (feedbackQuantity == null || feedbackQuantity.signum() <= 0 || task.getItemId() == null) {
+ return null;
+ }
+ MesMdmItemDO item = mdmItemService.getItem(task.getItemId());
+ if (item == null || item.getUnitMeasureId() == null) {
+ return null;
+ }
+ MesMdUnitMeasureDO unit = unitMeasureService.getUnitMeasure(item.getUnitMeasureId());
+ if (unit == null || unit.getName() == null) {
+ return null;
+ }
+ String unitName = unit.getName().trim();
+ if (Objects.equals(unitName, "绫�") || Objects.equals(unitName, "m") || Objects.equals(unitName, "M")) {
+ return feedbackQuantity;
+ }
+ return null;
+ }
+
+ /**
+ * 璇诲彇浠诲姟宸ヨ壓鍙傛暟璁板綍涓殑鍙傛暟鍊硷紙缂栫爜 鈫� 鍊硷級锛屽彇绗竴鏉¤褰�
+ */
+ private Map<String, String> loadTaskParamValues(Long taskId) {
+ Map<String, String> values = new HashMap<>();
+ MesProWorkOrderParamRecordDO record = paramRecordMapper.selectFirstByTaskId(taskId);
+ if (record == null) {
+ return values;
+ }
+ List<MesProWorkOrderParamRecordDetailDO> details = paramRecordDetailMapper.selectListByRecordId(record.getId());
+ for (MesProWorkOrderParamRecordDetailDO detail : details) {
+ if (StrUtil.isNotBlank(detail.getParamCode()) && StrUtil.isNotBlank(detail.getParamValue())) {
+ values.putIfAbsent(detail.getParamCode(), detail.getParamValue());
+ }
+ }
+ return values;
+ }
+
+ private BigDecimal parseParam(String paramCode, String paramLabel, Map<String, String> values,
+ List<String> missingReasons) {
+ if (StrUtil.isBlank(paramCode)) {
+ missingReasons.add(StrUtil.format("宸ュ簭鏈粦瀹氥�寋}銆嶅弬鏁扮紪鐮侊紝璇峰湪宸ュ簭璁剧疆涓�夋嫨{}鍙傛暟", paramLabel, paramLabel));
+ return null;
+ }
+ String raw = values.get(paramCode);
+ if (StrUtil.isBlank(raw)) {
+ missingReasons.add(StrUtil.format("宸ヨ壓璺嚎鍙傛暟銆寋}銆嶆湭濉啓锛屾棤娉曡绠楁爣鍑嗗伐鏃讹紱璇峰厛鍦ㄤ笅杈剧殑宸ヨ壓鍙傛暟涓~鍐檣}",
+ paramCode, paramLabel));
+ return null;
+ }
+ BigDecimal value = parseNumber(raw);
+ if (value == null) {
+ missingReasons.add(StrUtil.format("鍙傛暟銆寋}銆嶇殑鍊糩{}]涓嶆槸鏈夋晥鏁板瓧锛屾棤娉曡绠楁爣鍑嗗伐鏃讹紱璇锋寜鏁板�煎~鍐�",
+ paramCode, raw));
+ }
+ return value;
+ }
+
+ private static BigDecimal parseNumber(String raw) {
+ if (StrUtil.isBlank(raw)) {
+ return null;
+ }
+ String normalized = StrUtil.trim(raw).replace(",", "").replace("锛�", "");
+ try {
+ return new BigDecimal(normalized);
+ } catch (NumberFormatException ignored) {
+ // 鍙傛暟鍊煎彲鑳藉甫鍗曚綅锛屼緥濡� "1200 r/min"锛屽彇鍏朵腑鏈�鍓嶉潰鐨勬暟鍊�
+ java.util.regex.Matcher matcher = java.util.regex.Pattern
+ .compile("-?\\d+(?:\\.\\d+)?").matcher(normalized);
+ if (matcher.find()) {
+ try {
+ return new BigDecimal(matcher.group());
+ } catch (NumberFormatException ignoredAgain) {
+ return null;
+ }
+ }
+ return null;
+ }
+ }
+
+ private String buildNote(BigDecimal length, SpeedResult speedResult,
+ BigDecimal primaryHours, AuxCalcResult auxResult) {
+ List<String> parts = new ArrayList<>();
+ if (length != null && length.signum() > 0) {
+ parts.add(StrUtil.format("鐢熶骇闀垮害 {} 绫�", plain(length)));
+ }
+ parts.add(speedResult.note != null ? speedResult.note : "绾块�熷害鏈绠�");
+ parts.add(StrUtil.format("涓诲伐鏃� {} 灏忔椂", plain(primaryHours)));
+ parts.add(StrUtil.format("杈呭姪宸ユ椂 {} 灏忔椂", plain(auxResult.auxHours)));
+ return String.join("锛�", parts);
+ }
+
+ private List<MesProWorktimeCalcReqVO.AuxInput> toAuxInputs(List<MesProFeedbackSaveReqVO.AuxValue> auxValues) {
+ if (CollUtil.isEmpty(auxValues)) {
+ return List.of();
+ }
+ List<MesProWorktimeCalcReqVO.AuxInput> inputs = new ArrayList<>();
+ for (MesProFeedbackSaveReqVO.AuxValue auxValue : auxValues) {
+ if (auxValue == null || auxValue.getAuxItemId() == null) {
+ continue;
+ }
+ MesProWorktimeCalcReqVO.AuxInput input = new MesProWorktimeCalcReqVO.AuxInput();
+ input.setAuxItemId(auxValue.getAuxItemId());
+ input.setQuantity(auxValue.getQuantity());
+ input.setMaterialFrom(auxValue.getMaterialFrom());
+ input.setMaterialTo(auxValue.getMaterialTo());
+ input.setRemark(auxValue.getRemark());
+ inputs.add(input);
+ }
+ return inputs;
+ }
+
+ private static String plain(BigDecimal value) {
+ if (value == null) {
+ return "-";
+ }
+ return value.stripTrailingZeros().toPlainString();
+ }
+
+ private record SpeedResult(BigDecimal speed, String note) {
+ }
+
+ private record AuxCalcResult(BigDecimal auxHours, List<MesProWorktimeCalcRespVO.AuxResult> items) {
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcIndicatorResultDetailService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcIndicatorResultDetailService.java
index 5db7f7b..9f241a7 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcIndicatorResultDetailService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcIndicatorResultDetailService.java
@@ -48,4 +48,11 @@
*/
void deleteDetailByResultId(Long resultId);
+ /**
+ * 鏍规嵁鏄庣粏 ID 鍒楄〃鎵归噺鍒犻櫎锛堣繃绋嬫楠屾墜宸ュ垹闄ゆ楠岃鏃朵娇鐢級
+ *
+ * @param ids 鏄庣粏 ID 鍒楄〃
+ */
+ void deleteDetailList(List<Long> ids);
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcIndicatorResultDetailServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcIndicatorResultDetailServiceImpl.java
index 533e057..01ca6b9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcIndicatorResultDetailServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcIndicatorResultDetailServiceImpl.java
@@ -47,4 +47,9 @@
.eq(MesQcIndicatorResultDetailDO::getResultId, resultId));
}
+ @Override
+ public void deleteDetailList(List<Long> ids) {
+ detailMapper.deleteByIds(ids);
+ }
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcIndicatorResultServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcIndicatorResultServiceImpl.java
index 1163b31..8cceafd 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcIndicatorResultServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcIndicatorResultServiceImpl.java
@@ -22,6 +22,7 @@
import cn.iocoder.yudao.module.mes.service.qc.oqc.MesQcOqcService;
import cn.iocoder.yudao.module.mes.service.qc.rqc.MesQcRqcService;
import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -67,6 +68,12 @@
@Resource
private DictDataApi dictDataApi;
+ @Resource
+ private StorageAttachmentApi storageAttachmentApi;
+
+ /** 杩囩▼妫�楠岃闄勪欢鐨勫瓨鍌ㄥ叧鑱旂被鍨嬶紙涓� MesQcAttachmentController 淇濇寔涓�鑷达級 */
+ private static final String IPQC_DETAIL_RECORD_TYPE = "mes_qc_ipqc_detail_attachment";
+
@Override
@Transactional(rollbackFor = Exception.class)
public Long createIndicatorResult(MesQcIndicatorResultSaveReqVO createReqVO) {
@@ -103,6 +110,27 @@
List<MesQcIndicatorResultDetailDO> details = BeanUtils.toBean(updateReqVO.getItems(),
MesQcIndicatorResultDetailDO.class);
resultDetailService.createOrUpdateDetailList(details);
+ // 2.3 杩囩▼妫�楠屾敮鎸佹墜宸ュ鍒犳楠岃锛氬垹闄ゆ湰娆℃湭鎻愪氦鐨勬槑缁嗭紝骞舵竻鐞嗗叾琛岄檮浠跺叧鑱�
+ if (MesQcTypeEnum.IPQC.getType().equals(updateReqVO.getQcType())) {
+ deleteIndicatorDetailsRemoved(updateReqVO.getId(), updateReqVO.getItems());
+ }
+ }
+
+ /**
+ * 鍒犻櫎鏈淇濆瓨涓凡琚Щ闄ょ殑杩囩▼妫�楠岃锛堣闄勪欢涓�骞惰В缁戯級
+ */
+ private void deleteIndicatorDetailsRemoved(Long resultId, List<MesQcIndicatorResultSaveReqVO.Item> items) {
+ Set<Long> keepIds = convertSet(items, MesQcIndicatorResultSaveReqVO.Item::getId);
+ List<Long> removedIds = resultDetailService.getDetailListByResultId(resultId).stream()
+ .map(MesQcIndicatorResultDetailDO::getId)
+ .filter(id -> id != null && !keepIds.contains(id))
+ .toList();
+ if (CollUtil.isEmpty(removedIds)) {
+ return;
+ }
+ removedIds.forEach(detailId ->
+ storageAttachmentApi.bindAttachments("file", IPQC_DETAIL_RECORD_TYPE, detailId, Collections.emptyList()));
+ resultDetailService.deleteDetailList(removedIds);
}
@Override
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcService.java
index 3236bbe..4408ca5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcService.java
@@ -27,6 +27,14 @@
Long createIpqc(@Valid MesQcIpqcSaveReqVO createReqVO);
/**
+ * 鎸夋姤宸ュ崟鑷姩鍒涘缓杩囩▼妫�楠屽崟锛堣川妫�宸ュ簭鎶ュ伐鎻愪氦鏃惰皟鐢級
+ *
+ * @param feedback 鎶ュ伐鍗�
+ * @return 杩囩▼妫�楠屽崟缂栧彿
+ */
+ Long createInspectionForFeedback(cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO feedback);
+
+ /**
* 鏇存柊杩囩▼妫�楠屽崟
*
* @param updateReqVO 鏇存柊淇℃伅
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java
index 35454eb..592dcd0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java
@@ -134,6 +134,10 @@
@Resource
private MesQcImportHelper qcImportHelper;
+ @Resource
+ private cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateProcessService templateProcessService;
+ @Resource
+ private cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService autoCodeRecordService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -142,23 +146,75 @@
SaveDataContext ctx = validateIpqcSaveData(createReqVO);
// 1.2 鏍¢獙宸ュ崟瀛樺湪
MesProWorkOrderDO workOrder = workOrderService.validateWorkOrderExists(createReqVO.getWorkOrderId());
- // 1.3 纭畾妫�楠岀墿鏂欙細鏈変换鍔℃椂鍙栦换鍔$殑鐗╂枡锛屾棤浠诲姟鏃跺彇宸ュ崟鐨勪骇鍝�
- Long itemId = (ctx.task() != null) ? ctx.task().getItemId() : workOrder.getProductId();
+ // 1.3 纭畾妫�楠岀墿鏂欙細鎵嬪伐閫夋嫨浼樺厛锛涘惁鍒欐湁浠诲姟鏃跺彇浠诲姟鐗╂枡锛屾棤浠诲姟鏃跺彇宸ュ崟浜у搧
+ Long itemId = createReqVO.getItemId() != null ? createReqVO.getItemId()
+ : (ctx.task() != null) ? ctx.task().getItemId() : workOrder.getProductId();
// 鏂板缓璐ㄦ鍗曚笉渚濊禆璐ㄦ鏂规銆�
// 1.5 鑾峰彇鏉ユ簮鍗曟嵁缂栧彿
String sourceDocCode = validateAndGetSourceDocCode(
createReqVO.getSourceDocType(), createReqVO.getSourceDocId(), createReqVO.getSourceLineId());
- // 2. 鎻掑叆涓昏〃
+ // 2. 鎻掑叆涓昏〃锛堟湭鎸囧畾璐ㄦ鏂规鏃讹紝鎸夊伐搴忛粯璁ょ粦瀹氳В鏋愶級
+ Long processId = createReqVO.getProcessId() != null ? createReqVO.getProcessId()
+ : getProcessId(itemId, ctx.workstation() != null ? ctx.workstation().getProcessId() : null);
+ Long templateId = createReqVO.getTemplateId() != null ? createReqVO.getTemplateId()
+ : templateProcessService.resolveTemplateId(processId, MesQcTypeEnum.IPQC.getType());
+ String reelNo = StrUtil.isNotBlank(createReqVO.getReelNo()) ? createReqVO.getReelNo()
+ : workOrder.getReelNo();
MesQcIpqcDO ipqc = BeanUtils.toBean(createReqVO, MesQcIpqcDO.class)
.setItemId(itemId)
- .setReelNo(workOrder.getReelNo())
- .setProcessId(getProcessId(itemId, ctx.workstation().getProcessId()))
- .setTemplateId(null)
+ .setReelNo(reelNo)
+ .setProcessId(processId)
+ .setTemplateId(templateId)
.setSourceDocCode(sourceDocCode)
.setStatus(MesQcStatusEnum.DRAFT.getStatus());
ipqcMapper.insert(ipqc);
+ // 3. 鎸夎川妫�鏂规鐢熸垚妫�娴嬫寚鏍囪锛屽墠绔洿鎺ュ甫鍑洪渶瑕佸~鍐欑殑瀛楁
+ if (templateId != null) {
+ ipqcLineService.createLinesFromTemplate(ipqc.getId(), templateId);
+ }
return ipqc.getId();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long createInspectionForFeedback(MesProFeedbackDO feedback) {
+ // 宸插瓨鍦ㄥ叧鑱旀楠屽崟鏃剁洿鎺ュ鐢紝閬垮厤閲嶅鐢熸垚
+ List<MesQcIpqcDO> existingList = ipqcMapper.selectListBySourceDoc(
+ MesBizTypeConstants.PRO_FEEDBACK, feedback.getId());
+ if (CollUtil.isNotEmpty(existingList)) {
+ return existingList.get(0).getId();
+ }
+ MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(feedback.getWorkOrderId());
+ if (workOrder == null) {
+ throw exception(PRO_WORK_ORDER_NOT_EXISTS);
+ }
+ BigDecimal quantity = ObjectUtil.defaultIfNull(feedback.getFeedbackQuantity(), BigDecimal.ZERO);
+ MesQcIpqcSaveReqVO reqVO = new MesQcIpqcSaveReqVO();
+ reqVO.setCode(autoCodeRecordService.generateAutoCode(MesMdAutoCodeRuleCodeEnum.QC_IPQC_CODE.getCode()));
+ reqVO.setName(StrUtil.format("鎶ュ伐鍗昜{}]杩囩▼妫�楠�", feedback.getCode()));
+ reqVO.setType(MesQcTypeEnum.IPQC.getType());
+ reqVO.setSourceDocType(MesBizTypeConstants.PRO_FEEDBACK);
+ reqVO.setSourceDocId(feedback.getId());
+ reqVO.setWorkOrderId(feedback.getWorkOrderId());
+ reqVO.setTaskId(feedback.getTaskId());
+ reqVO.setWorkstationId(feedback.getWorkstationId());
+ reqVO.setProcessId(feedback.getProcessId());
+ // 鎶ュ伐鍗曞凡鏄庣‘宸ュ簭锛岀洿鎺ユ寜銆屽伐搴� + 杩囩▼妫�楠屻�嶈В鏋愰粯璁よ川妫�鏂规锛岄伩鍏嶅伐浣嶇己澶辨椂鐢熸垚绌烘楠屽崟
+ reqVO.setTemplateId(templateProcessService.resolveTemplateId(
+ feedback.getProcessId(), MesQcTypeEnum.IPQC.getType()));
+ reqVO.setItemId(feedback.getItemId());
+ // 榛樿妫�娴嬫暟閲忓彇鎶ュ伐鏁伴噺锛岄粯璁や负鍏ㄩ儴鍚堟牸锛岃川妫�濉啓鏃跺啀璋冩暣涓嶅悎鏍兼暟閲�
+ reqVO.setCheckQuantity(quantity);
+ reqVO.setQualifiedQuantity(quantity);
+ reqVO.setUnqualifiedQuantity(BigDecimal.ZERO);
+ reqVO.setLaborScrapQuantity(BigDecimal.ZERO);
+ reqVO.setMaterialScrapQuantity(BigDecimal.ZERO);
+ reqVO.setOtherScrapQuantity(BigDecimal.ZERO);
+ reqVO.setInspectDate(java.time.LocalDateTime.now());
+ reqVO.setInspectorUserId(cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId());
+ reqVO.setRemark(StrUtil.format("鎶ュ伐鎻愪氦鑷姩鐢熸垚锛屽伐搴� ID={}", feedback.getProcessId()));
+ return createIpqc(reqVO);
}
@Override
@@ -175,15 +231,23 @@
updateObj.setTemplateId(null); // 涓嶅厑璁镐慨鏀规ā鏉�
updateObj.setItemId(null); // 涓嶅厑璁镐慨鏀圭墿鏂�
updateObj.setWorkOrderId(null); // 涓嶅厑璁镐慨鏀瑰伐鍗�
- updateObj.setProcessId(getProcessId(existIpqc.getItemId(), ctx.workstation().getProcessId()));
+ updateObj.setProcessId(updateReqVO.getProcessId() != null ? updateReqVO.getProcessId()
+ : getProcessId(existIpqc.getItemId(), ctx.workstation() != null ? ctx.workstation().getProcessId() : null));
+ if (StrUtil.isBlank(updateReqVO.getReelNo())) {
+ updateObj.setReelNo(null); // 鏈~鍐欑洏鍙锋椂淇濈暀鍘熷��
+ }
ipqcMapper.updateById(updateObj);
}
private SaveDataContext validateIpqcSaveData(MesQcIpqcSaveReqVO reqVO) {
// 鏍¢獙缂栧彿鍞竴
validateIpqcCodeUnique(reqVO.getId(), reqVO.getCode());
- // 鏍¢獙宸ヤ綅銆佹娴嬩汉鍛樺瓨鍦�
- MesMdWorkstationDO workstation = workstationService.validateWorkstationExists(reqVO.getWorkstationId());
+ // 鏍¢獙宸ヤ綅銆佹娴嬩汉鍛樺瓨鍦紙鎵嬪伐鎸囧畾宸ュ簭鏃跺伐浣嶅彲涓嶅~锛�
+ MesMdWorkstationDO workstation = reqVO.getWorkstationId() != null
+ ? workstationService.validateWorkstationExists(reqVO.getWorkstationId()) : null;
+ if (workstation == null && reqVO.getProcessId() == null) {
+ throw exception(QC_IPQC_PROCESS_REQUIRED);
+ }
adminUserApi.validateUser(reqVO.getInspectorUserId());
// 鏍¢獙宸ュ崟瀛樺湪
MesProWorkOrderDO workOrder = workOrderService.validateWorkOrderExists(reqVO.getWorkOrderId());
@@ -191,7 +255,8 @@
&& !Objects.equals(workOrder.getStatus(), cn.iocoder.yudao.module.mes.enums.pro.MesProWorkOrderStatusEnum.FINISHED.getStatus())) {
throw exception(QC_IPQC_WORK_ORDER_STATUS_INVALID);
}
- if (reqVO.getProcessId() != null && ObjUtil.notEqual(workstation.getProcessId(), reqVO.getProcessId())) {
+ if (workstation != null && reqVO.getProcessId() != null
+ && ObjUtil.notEqual(workstation.getProcessId(), reqVO.getProcessId())) {
throw exception(PRO_WORKSTATION_PROCESS_MISMATCH);
}
// 鏍¢獙浠诲姟鍏崇郴锛堝鏋滄寚瀹氫簡浠诲姟锛�
@@ -202,11 +267,6 @@
throw exception(PRO_TASK_ALREADY_FINISHED);
}
validateTaskRelation(task, workstation, workOrder, reqVO);
- } else {
- // 鏃犱换鍔℃椂锛宨temId 浠嶉渶涓庡伐鍗曚骇鍝佷竴鑷�
- if (reqVO.getItemId() != null && ObjUtil.notEqual(reqVO.getItemId(), workOrder.getProductId())) {
- throw exception(PRO_WORK_ORDER_PRODUCT_MISMATCH);
- }
}
return new SaveDataContext(workstation, task);
}
@@ -216,10 +276,11 @@
if (ObjUtil.notEqual(task.getWorkOrderId(), workOrder.getId())) {
throw exception(PRO_TASK_WORK_ORDER_MISMATCH);
}
- if (ObjUtil.notEqual(task.getWorkstationId(), workstation.getId())) {
+ if (workstation != null && ObjUtil.notEqual(task.getWorkstationId(), workstation.getId())) {
throw exception(PRO_TASK_WORKSTATION_MISMATCH);
}
- Long expectedProcessId = reqVO.getProcessId() != null ? reqVO.getProcessId() : workstation.getProcessId();
+ Long expectedProcessId = reqVO.getProcessId() != null ? reqVO.getProcessId()
+ : workstation != null ? workstation.getProcessId() : null;
if (expectedProcessId != null && ObjUtil.notEqual(task.getProcessId(), expectedProcessId)) {
throw exception(PRO_TASK_ROUTE_PROCESS_MISMATCH);
}
@@ -292,8 +353,14 @@
return;
}
if (!Objects.equals(ipqc.getSourceDocType(), MesBizTypeConstants.PRO_FEEDBACK)
- || sourceDocId == null || sourceLineId == null) {
- throw new IllegalArgumentException("杩囩▼妫�楠岀殑鎶ュ伐鏉ユ簮鎴栦骇鍑鸿涓嶅畬鏁�");
+ || sourceDocId == null) {
+ throw new IllegalArgumentException("杩囩▼妫�楠岀殑鎶ュ伐鏉ユ簮涓嶅畬鏁�");
+ }
+ // 鎶ュ伐瀹℃壒鍓嶇殑杩囩▼妫�楠岋紙鐢辨姤宸ユ彁浜よ嚜鍔ㄧ敓鎴愶級锛氬彧璁板綍妫�楠岀粨鏋滀緵瀹℃壒鍋氳川閲忓伐璧勮皟鏁达紝
+ // 姝ゆ椂灏氭湭鐢熸垚浜у嚭琛岋紝涓嶅仛浜у嚭琛屾媶鍒嗕笌鎶ュ伐鐘舵�佸洖鍐�
+ if (sourceLineId == null) {
+ log.info("[writeBackSourceDoc] IPQC({}) 鏃犱骇鍑鸿锛堟姤宸ュ鎵瑰墠妫�楠岋級锛岃烦杩囧洖鍐�", ipqc.getId());
+ return;
}
// 2. 鍥炲啓鎶ュ伐
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcWageFieldService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcWageFieldService.java
new file mode 100644
index 0000000..979f9fa
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcWageFieldService.java
@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.mes.service.qc.ipqc;
+
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcWageFieldRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcWageFieldSaveReqVO;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * MES 杩囩▼妫�楠屽崟-宸ヨ祫瀛楁 Service 鎺ュ彛
+ *
+ * <p>宸ュ簭涓婄淮鎶ょ殑鑷畾涔夊伐璧勫瓧娈碉紝鍦ㄨ繃绋嬫楠屾椂甯﹀嚭缁欒川妫�閮ㄩ棬濉啓銆�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface MesQcIpqcWageFieldService {
+
+ /**
+ * 鎸夊伐搴忓甫鍑哄伐璧勫瓧娈碉紙鍚妫�楠屽崟宸插~鍐欑殑鍊硷級
+ *
+ * @param processId 宸ュ簭缂栧彿锛岀┖鏃舵寜 ipqcId 瑙f瀽
+ * @param ipqcId 杩囩▼妫�楠屽崟缂栧彿锛屾柊寤哄満鏅紶绌�
+ * @return 宸ヨ祫瀛楁鍒楄〃
+ */
+ List<MesQcIpqcWageFieldRespVO> getFieldList(Long processId, Long ipqcId);
+
+ /**
+ * 淇濆瓨璐ㄦ濉啓鐨勫伐璧勫瓧娈靛�硷紱鏈彁浜ょ殑瀛楁瑙嗕负鏈~鍐�
+ *
+ * @param reqVO 淇濆瓨璇锋眰
+ */
+ void saveValues(MesQcIpqcWageFieldSaveReqVO reqVO);
+
+ /**
+ * 鎵归噺鑾峰彇杩囩▼妫�楠屽崟濉啓杩囩殑宸ヨ祫瀛楁鍊�
+ *
+ * @param ipqcIds 杩囩▼妫�楠屽崟缂栧彿闆嗗悎
+ * @return 瀛楁缂栫爜 鈫� 瀛楁鍊硷紙鍚岀紪鐮佷互鍏堝嚭鐜扮殑涓哄噯锛�
+ */
+ Map<String, String> getValueMapByIpqcIds(Collection<Long> ipqcIds);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcWageFieldServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcWageFieldServiceImpl.java
new file mode 100644
index 0000000..f324fba
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcWageFieldServiceImpl.java
@@ -0,0 +1,158 @@
+package cn.iocoder.yudao.module.mes.service.qc.ipqc;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcWageFieldRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcWageFieldSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.wage.MesProProcessWageFieldDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc.MesQcIpqcDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc.MesQcIpqcWageFieldDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.qc.ipqc.MesQcIpqcWageFieldMapper;
+import cn.iocoder.yudao.module.mes.service.pro.wage.MesProProcessWageFieldService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.QC_IPQC_NOT_EXISTS;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.QC_IPQC_WAGE_FIELD_NOT_BELONG;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.QC_IPQC_WAGE_FIELD_VALUE_INVALID;
+
+/**
+ * MES 杩囩▼妫�楠屽崟-宸ヨ祫瀛楁 Service 瀹炵幇绫�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class MesQcIpqcWageFieldServiceImpl implements MesQcIpqcWageFieldService {
+
+ @Resource
+ private MesQcIpqcWageFieldMapper wageFieldMapper;
+ @Resource
+ private MesProProcessWageFieldService processWageFieldService;
+ @Resource
+ private MesQcIpqcService ipqcService;
+
+ @Override
+ public List<MesQcIpqcWageFieldRespVO> getFieldList(Long processId, Long ipqcId) {
+ Long finalProcessId = processId;
+ if (finalProcessId == null && ipqcId != null) {
+ MesQcIpqcDO ipqc = ipqcService.getIpqc(ipqcId);
+ finalProcessId = ipqc != null ? ipqc.getProcessId() : null;
+ }
+ if (finalProcessId == null) {
+ return Collections.emptyList();
+ }
+ // 1. 浠ュ伐搴忓綋鍓嶅惎鐢ㄧ殑宸ヨ祫瀛楁涓哄噯
+ List<MesProProcessWageFieldDO> fieldList = processWageFieldService.getFieldList(finalProcessId).stream()
+ .filter(field -> Objects.equals(field.getStatus(), CommonStatusEnum.ENABLE.getStatus()))
+ .sorted(Comparator.comparing(MesProProcessWageFieldDO::getSort,
+ Comparator.nullsLast(Comparator.naturalOrder())))
+ .toList();
+ if (CollUtil.isEmpty(fieldList)) {
+ return Collections.emptyList();
+ }
+ // 2. 鍚堝苟璇ユ楠屽崟宸插~鍐欑殑鍊�
+ Map<Long, MesQcIpqcWageFieldDO> valueMap = new HashMap<>();
+ if (ipqcId != null) {
+ for (MesQcIpqcWageFieldDO saved : wageFieldMapper.selectListByIpqcId(ipqcId)) {
+ valueMap.put(saved.getFieldId(), saved);
+ }
+ }
+ List<MesQcIpqcWageFieldRespVO> result = new ArrayList<>(fieldList.size());
+ for (MesProProcessWageFieldDO field : fieldList) {
+ MesQcIpqcWageFieldDO saved = valueMap.get(field.getId());
+ result.add(new MesQcIpqcWageFieldRespVO()
+ .setFieldId(field.getId())
+ .setFieldCode(field.getFieldCode())
+ .setFieldName(field.getFieldName())
+ .setFieldType(field.getFieldType())
+ .setUnit(field.getUnit())
+ .setCalcRole(field.getCalcRole())
+ .setUnitPrice(field.getUnitPrice())
+ .setSort(field.getSort())
+ .setDefaultValue(field.getFieldValue())
+ .setValue(saved != null ? saved.getValue() : null)
+ .setRemark(saved != null ? saved.getRemark() : null));
+ }
+ return result;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void saveValues(MesQcIpqcWageFieldSaveReqVO reqVO) {
+ MesQcIpqcDO ipqc = ipqcService.getIpqc(reqVO.getIpqcId());
+ if (ipqc == null) {
+ throw exception(QC_IPQC_NOT_EXISTS, reqVO.getIpqcId());
+ }
+ Map<Long, MesProProcessWageFieldDO> fieldMap = new HashMap<>();
+ for (MesProProcessWageFieldDO field : processWageFieldService.getFieldList(ipqc.getProcessId())) {
+ fieldMap.put(field.getId(), field);
+ }
+ // 1. 鏍¢獙骞剁粍瑁呮槑缁嗭紙蹇収瀛楁瀹氫箟锛屽巻鍙叉楠屽崟涓嶅彈瀛楁鏀瑰悕褰卞搷锛�
+ List<MesQcIpqcWageFieldDO> details = new ArrayList<>();
+ if (reqVO.getList() != null) {
+ for (MesQcIpqcWageFieldSaveReqVO.Item item : reqVO.getList()) {
+ MesProProcessWageFieldDO field = fieldMap.get(item.getFieldId());
+ if (field == null) {
+ throw exception(QC_IPQC_WAGE_FIELD_NOT_BELONG, item.getFieldId(),
+ ipqc != null ? ipqc.getCode() : reqVO.getIpqcId());
+ }
+ String value = StrUtil.trim(item.getValue());
+ if (StrUtil.isNotBlank(value) && needsNumber(field.getCalcRole())) {
+ try {
+ new BigDecimal(value);
+ } catch (NumberFormatException ex) {
+ throw exception(QC_IPQC_WAGE_FIELD_VALUE_INVALID, field.getFieldName(), value);
+ }
+ }
+ details.add(new MesQcIpqcWageFieldDO()
+ .setIpqcId(ipqc.getId())
+ .setFieldId(field.getId())
+ .setFieldCode(field.getFieldCode())
+ .setFieldName(field.getFieldName())
+ .setFieldType(field.getFieldType())
+ .setUnit(field.getUnit())
+ .setCalcRole(field.getCalcRole())
+ .setUnitPrice(field.getUnitPrice())
+ .setSort(field.getSort())
+ .setValue(value)
+ .setRemark(StrUtil.trim(item.getRemark())));
+ }
+ }
+ // 2. 鍏ㄩ噺瑕嗙洊璇ユ楠屽崟鐨勫伐璧勫瓧娈靛�硷紙鏈彁浜�=鏈~鍐欙級
+ wageFieldMapper.deleteByIpqcId(ipqc.getId());
+ details.forEach(wageFieldMapper::insert);
+ }
+
+ @Override
+ public Map<String, String> getValueMapByIpqcIds(Collection<Long> ipqcIds) {
+ if (CollUtil.isEmpty(ipqcIds)) {
+ return Collections.emptyMap();
+ }
+ Map<String, String> result = new HashMap<>();
+ for (MesQcIpqcWageFieldDO item : wageFieldMapper.selectListByIpqcIds(ipqcIds)) {
+ if (StrUtil.isBlank(item.getFieldCode()) || StrUtil.isBlank(item.getValue())) {
+ continue;
+ }
+ result.putIfAbsent(item.getFieldCode(), item.getValue());
+ }
+ return result;
+ }
+
+ /**
+ * 绯绘暟/鍔犲噺閲戦/璁′环鏁伴噺涓夌璁$畻瑙掕壊蹇呴』鏄暟瀛�
+ */
+ private static boolean needsNumber(Integer calcRole) {
+ return Objects.equals(calcRole, MesProProcessWageFieldDO.CALC_ROLE_COEFFICIENT)
+ || Objects.equals(calcRole, MesProProcessWageFieldDO.CALC_ROLE_AMOUNT)
+ || Objects.equals(calcRole, MesProProcessWageFieldDO.CALC_ROLE_QUANTITY_PRICE);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrService.java
index 6285880..ddc8572 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrService.java
@@ -53,10 +53,26 @@
* 鎵ц涓嶅悎鏍煎搧澶勭疆
*
* @param id 缂栧彿
+ * @param disposition 澶勭疆鏂瑰紡锛堝繀濉級
* @param handlerUserId 澶勭悊浜篒D
* @param handleResult 澶勭悊缁撴灉璇存槑
*/
- void disposeNcr(Long id, Long handlerUserId, String handleResult);
+ void disposeNcr(Long id, Integer disposition, Long handlerUserId, String handleResult);
+
+ /**
+ * 鎻愪氦涓嶅悎鏍煎搧澶勭悊鍗曞鎵�
+ *
+ * @param id 缂栧彿
+ */
+ void submitNcrApproval(Long id);
+
+ /**
+ * 鏇存柊涓嶅悎鏍煎搧澶勭悊鍗曞鎵圭姸鎬侊紙BPM 娴佺▼鍥炶皟锛�
+ *
+ * @param id 缂栧彿
+ * @param bpmResult BPM 瀹℃壒缁撴灉
+ */
+ void updateNcrAuditStatus(Long id, Integer bpmResult);
/**
* 鍏抽棴涓嶅悎鏍煎搧澶勭悊鍗�
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java
index 56ed686..1b9f291 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java
@@ -1,11 +1,16 @@
package cn.iocoder.yudao.module.mes.service.qc.ncr;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
import cn.iocoder.yudao.module.mes.controller.admin.qc.ncr.vo.MesQcNcrPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.ncr.vo.MesQcNcrSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ncr.MesQcNcrDO;
import cn.iocoder.yudao.module.mes.dal.mysql.qc.ncr.MesQcNcrMapper;
+import cn.iocoder.yudao.module.mes.enums.qc.MesNcrDispositionEnum;
import cn.iocoder.yudao.module.mes.enums.qc.MesNcrStatusEnum;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum;
import cn.iocoder.yudao.module.mes.service.qc.iqc.MesQcIqcService;
@@ -23,6 +28,7 @@
import java.util.Collection;
import java.util.Map;
import java.util.Objects;
+import java.util.Set;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
@@ -38,11 +44,31 @@
@Validated
public class MesQcNcrServiceImpl implements MesQcNcrService {
+ /**
+ * NCR 鍗忓悓瀹℃壒娴佺▼鍒嗙被/娴佺▼瀹氫箟 key
+ */
+ private static final String NCR_APPROVAL_PROCESS_KEY = "mes_ncr_approve";
+
+ /**
+ * 鏈�缁堝缃厑璁稿�硷細璁╂鏀捐銆佽繑淇�佽繑宸ャ�佹姤搴�
+ * <p>
+ * 閫�璐�(1)銆侀檷绾т娇鐢�(5) 浠嶄繚鐣欏湪 {@link MesNcrDispositionEnum} 涓庡瓧鍏镐腑锛岀敤浜庡巻鍙叉暟鎹樉绀猴紝
+ * 浣嗕笉鍐嶄綔涓鸿川閲忛儴鏈�缁堝缃殑鍙�夐」銆�
+ */
+ private static final Set<Integer> DISPOSITION_ALLOWED_TYPES = Set.of(
+ MesNcrDispositionEnum.SCRAP.getType(),
+ MesNcrDispositionEnum.REWORK.getType(),
+ MesNcrDispositionEnum.CONCESSION.getType(),
+ MesNcrDispositionEnum.REPAIR.getType());
+
@Resource
private MesQcNcrMapper ncrMapper;
@Resource
private MdmItemApi mdmItemApi;
+
+ @Resource
+ private BpmProcessInstanceApi processInstanceApi;
@Resource
@Lazy
@@ -105,6 +131,7 @@
Integer defectLevel, String reviewOpinion) {
// 1. 鏍¢獙瀛樺湪 + 寰呰瘎瀹$姸鎬�
validateNcrStatusPendingReview(id);
+ validateDisposition(disposition);
// 2. 鏇存柊璇勫淇℃伅
MesQcNcrDO updateObj = new MesQcNcrDO()
@@ -123,17 +150,20 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void disposeNcr(Long id, Long handlerUserId, String handleResult) {
- // 1. 鏍¢獙瀛樺湪 + 宸茶瘎瀹$姸鎬�
+ public void disposeNcr(Long id, Integer disposition, Long handlerUserId, String handleResult) {
+ // 1. 鏍¢獙瀛樺湪 + 宸茶瘎瀹★紙瀹℃壒閫氳繃锛夌姸鎬�
MesQcNcrDO ncr = validateNcrExists(id);
if (!MesNcrStatusEnum.REVIEWED.getStatus().equals(ncr.getStatus())) {
- throw exception(QC_NCR_NOT_REVIEWED);
+ throw exception(QC_NCR_DISPOSE_STATUS_INVALID, ncr.getCode(), resolveStatusName(ncr.getStatus()));
}
+ // 2. 澶勭疆鏂瑰紡蹇呭~锛屼笖蹇呴』鏄悎娉曟灇涓惧��
+ validateDisposition(disposition);
- // 2. 鏇存柊澶勭疆淇℃伅
+ // 3. 鏇存柊澶勭疆淇℃伅锛堝缃柟寮忎互鏈澶勭疆閫夋嫨涓哄噯骞惰惤搴擄級
// TODO: WM 妯″潡闆嗘垚 鈥� 澶勭疆涓洪��璐ф椂瑙﹀彂渚涘簲鍟嗛��璐э紝澶勭疆涓烘姤搴熸椂瑙﹀彂鏉傞」鍑哄簱
ncrMapper.updateById(new MesQcNcrDO()
.setId(id)
+ .setDisposition(disposition)
.setHandlerUserId(handlerUserId)
.setHandleDate(LocalDateTime.now())
.setHandleResult(handleResult)
@@ -142,11 +172,99 @@
@Override
@Transactional(rollbackFor = Exception.class)
+ public void submitNcrApproval(Long id) {
+ // 璇存槑锛欱PM 鐨� createProcessInstance 鍐呴儴閫氳繃 FlowableUtils.executeAuthenticatedUserId 鎵ц锛�
+ // 璇ユ柟娉曚細鎶婃墍鏈夊紓甯哥粺涓�鍖呮垚 RuntimeException锛屽洜姝よ繖閲屼笉鑳界洿鎺� catch ServiceException锛�
+ // 蹇呴』娌� cause 閾惧垽鏂槸鍚︿负銆屾祦绋嬪畾涔変笉瀛樺湪銆嶃��
+ // 1. 鏍¢獙瀛樺湪 + 寰呰瘎瀹★紙鑽夌/瀹℃壒椹冲洖鍚庯級鐘舵��
+ MesQcNcrDO ncr = validateNcrExists(id);
+ if (!MesNcrStatusEnum.PENDING_REVIEW.getStatus().equals(ncr.getStatus())) {
+ throw exception(QC_NCR_SUBMIT_STATUS_INVALID, ncr.getCode(), resolveStatusName(ncr.getStatus()));
+ }
+
+ // 2. 鍏ㄥ眬鍏嶅鎵癸細涓氬姟鏍¢獙閫氳繃鍚庣洿鎺ヨ涓哄鎵归�氳繃锛堝凡璇勫/寰呭缃級锛屾棤闇�娴佺▼妯″瀷
+ if (processInstanceApi.isGlobalAutoApprove()) {
+ ncrMapper.updateById(new MesQcNcrDO()
+ .setId(id)
+ .setStatus(MesNcrStatusEnum.REVIEWED.getStatus())
+ .setProcessInstanceId(""));
+ return;
+ }
+
+ // 3. 鍒涘缓 BPM 娴佺▼瀹炰緥锛涘彇涓嶅埌娴佺▼瀹氫箟鏃舵寜绾﹀畾璧拌嚜鍔ㄩ�氳繃鍏滃簳
+ String processInstanceId;
+ try {
+ processInstanceId = processInstanceApi.createProcessInstance(getLoginUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(NCR_APPROVAL_PROCESS_KEY)
+ .setBusinessKey(String.valueOf(id)));
+ } catch (RuntimeException ex) {
+ if (isProcessDefinitionNotExists(ex)) {
+ ncrMapper.updateById(new MesQcNcrDO()
+ .setId(id)
+ .setStatus(MesNcrStatusEnum.REVIEWED.getStatus())
+ .setProcessInstanceId(""));
+ return;
+ }
+ throw ex;
+ }
+
+ // 4. 鏇存柊 NCR 鐘舵�佷负瀹℃壒涓紝骞跺洖鍐欐祦绋嬪疄渚嬬紪鍙�
+ ncrMapper.updateById(new MesQcNcrDO()
+ .setId(id)
+ .setStatus(MesNcrStatusEnum.APPROVING.getStatus())
+ .setProcessInstanceId(processInstanceId));
+ }
+
+ /**
+ * 鍒ゆ柇寮傚父閾句腑鏄惁鍖呭惈銆屾祦绋嬪畾涔変笉瀛樺湪銆嶏紙BPM 瀵瑰浼氬寘涓�灞� RuntimeException锛�
+ */
+ private static boolean isProcessDefinitionNotExists(Throwable ex) {
+ Throwable current = ex;
+ while (current != null) {
+ if (current instanceof ServiceException serviceException
+ && cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.PROCESS_DEFINITION_NOT_EXISTS
+ .getCode().equals(serviceException.getCode())) {
+ return true;
+ }
+ current = current.getCause();
+ }
+ return false;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateNcrAuditStatus(Long id, Integer bpmResult) {
+ // 1. 鏍¢獙瀛樺湪 + 瀹℃壒涓紙閬垮厤骞跺彂鎴栭噸澶嶅洖璋冭鐩栧凡澶勭疆/宸插叧闂姸鎬侊級
+ MesQcNcrDO ncr = validateNcrExists(id);
+ if (!MesNcrStatusEnum.APPROVING.getStatus().equals(ncr.getStatus())) {
+ return;
+ }
+
+ // 2. 瀹℃壒閫氳繃 -> 宸茶瘎瀹★紙寰呭缃級锛涢┏鍥�/鍙栨秷 -> 寰呰瘎瀹★紙鍙噸鏂颁慨鏀瑰苟鎻愪氦锛�
+ if (BpmProcessInstanceStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
+ ncrMapper.updateById(new MesQcNcrDO()
+ .setId(id)
+ .setStatus(MesNcrStatusEnum.REVIEWED.getStatus()));
+ return;
+ }
+ if (BpmProcessInstanceStatusEnum.REJECT.getStatus().equals(bpmResult)
+ || BpmProcessInstanceStatusEnum.CANCEL.getStatus().equals(bpmResult)) {
+ // 淇濈暀 processInstanceId锛氶┏鍥�/鍙栨秷鍚庝粛鍙湪銆屾煡鐪嬪鎵广�嶄腑鏌ョ湅瀹℃壒鎰忚锛�
+ // 閲嶆柊鎻愪氦鏃朵細鐢ㄦ柊娴佺▼瀹炰緥缂栧彿瑕嗙洊銆�
+ ncrMapper.updateById(new MesQcNcrDO()
+ .setId(id)
+ .setStatus(MesNcrStatusEnum.PENDING_REVIEW.getStatus()));
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
public void closeNcr(Long id, String closeOpinion) {
// 1. 鏍¢獙瀛樺湪 + 宸插缃姸鎬�
MesQcNcrDO ncr = validateNcrExists(id);
if (!MesNcrStatusEnum.DISPOSED.getStatus().equals(ncr.getStatus())) {
- throw exception(QC_NCR_NOT_DISPOSED);
+ throw exception(QC_NCR_CLOSE_STATUS_INVALID, ncr.getCode(), resolveStatusName(ncr.getStatus()));
}
// 2. 鏇存柊鍏抽棴淇℃伅
@@ -164,7 +282,7 @@
public MesQcNcrDO validateNcrExists(Long id) {
MesQcNcrDO ncr = ncrMapper.selectById(id);
if (ncr == null) {
- throw exception(QC_NCR_NOT_EXISTS);
+ throw exception(QC_NCR_NOT_EXISTS, id);
}
return ncr;
}
@@ -175,9 +293,33 @@
private MesQcNcrDO validateNcrStatusPendingReview(Long id) {
MesQcNcrDO ncr = validateNcrExists(id);
if (!MesNcrStatusEnum.PENDING_REVIEW.getStatus().equals(ncr.getStatus())) {
- throw exception(QC_NCR_NOT_PENDING_REVIEW);
+ throw exception(QC_NCR_STATUS_NOT_PENDING, ncr.getCode(), resolveStatusName(ncr.getStatus()));
}
return ncr;
+ }
+
+ /**
+ * 鏍¢獙澶勭疆鏂瑰紡锛氬繀濉� + 蹇呴』鏄悎娉曟灇涓惧��
+ */
+ private void validateDisposition(Integer disposition) {
+ if (disposition == null) {
+ throw exception(QC_NCR_DISPOSITION_REQUIRED);
+ }
+ if (!DISPOSITION_ALLOWED_TYPES.contains(disposition)) {
+ throw exception(QC_NCR_DISPOSITION_INVALID, disposition);
+ }
+ }
+
+ /**
+ * 鐘舵�佸�艰浆鍚嶇О锛岃В鏋愬け璐ュ洖閫�涓� ID 瀛楃涓�
+ */
+ private String resolveStatusName(Integer status) {
+ for (MesNcrStatusEnum value : MesNcrStatusEnum.values()) {
+ if (value.getStatus().equals(status)) {
+ return value.getName();
+ }
+ }
+ return "ID=" + status;
}
/**
@@ -186,7 +328,7 @@
private void validateNcrCodeUnique(Long id, String code) {
MesQcNcrDO existing = ncrMapper.selectByCode(code);
if (existing != null && !existing.getId().equals(id)) {
- throw exception(QC_NCR_CODE_DUPLICATE);
+ throw exception(QC_NCR_CODE_DUPLICATE, code);
}
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/listener/MesQcNcrStatusListener.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/listener/MesQcNcrStatusListener.java
new file mode 100644
index 0000000..4c0a651
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/listener/MesQcNcrStatusListener.java
@@ -0,0 +1,73 @@
+package cn.iocoder.yudao.module.mes.service.qc.ncr.listener;
+
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ncr.MesQcNcrDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.qc.ncr.MesQcNcrMapper;
+import cn.iocoder.yudao.module.mes.service.qc.ncr.MesQcNcrService;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * 涓嶅悎鏍煎搧澶勭悊鍗曪紙NCR锛塀PM 瀹℃壒鐘舵�佺洃鍚櫒
+ *
+ * 鐩戝惉 BPM 娴佺▼瀹炰緥鐘舵�佸彉鏇翠簨浠讹紝鏇存柊 NCR 鐨勫鎵圭姸鎬侊細
+ * 瀹℃壒閫氳繃 -> 宸茶瘎瀹★紙寰呭缃級锛涘鎵归┏鍥�/鍙栨秷 -> 寰呰瘎瀹★紙鍙噸鏂颁慨鏀瑰苟鎻愪氦锛夈��
+ *
+ * 娴佺▼ key / 鍒嗙被缂栫爜锛歿@code mes_ncr_approve}
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Component
+@Slf4j
+public class MesQcNcrStatusListener extends BpmProcessInstanceStatusEventListener {
+
+ /**
+ * BPM NCR 瀹℃壒娴佺▼瀹氫箟 key锛堝悓鏃跺吋瀹规寜娴佺▼鍒嗙被缂栫爜鍖归厤锛�
+ */
+ private static final String BPM_PROCESS_DEFINITION_KEY = "mes_ncr_approve";
+
+ @Resource
+ private MesQcNcrService ncrService;
+
+ @Resource
+ private MesQcNcrMapper ncrMapper;
+
+ @Override
+ protected String getProcessDefinitionKey() {
+ return BPM_PROCESS_DEFINITION_KEY;
+ }
+
+ @Override
+ protected void onEvent(BpmProcessInstanceStatusEvent event) {
+ // 1. 瑙f瀽涓氬姟涓婚敭
+ Long ncrId;
+ try {
+ ncrId = Long.parseLong(event.getBusinessKey());
+ } catch (NumberFormatException e) {
+ log.warn("[onEvent] businessKey({}) 涓嶆槸鏈夋晥鐨� NCR 缂栧彿", event.getBusinessKey());
+ return;
+ }
+
+ // 2. 鏍¢獙 NCR 瀛樺湪
+ MesQcNcrDO ncr = ncrMapper.selectById(ncrId);
+ if (ncr == null) {
+ return;
+ }
+
+ // 3. 鏍¢獙娴佺▼瀹炰緥鍖归厤锛岄伩鍏嶅叾瀹冧笟鍔″洖璋冭鏇存柊
+ if (StrUtil.isNotBlank(ncr.getProcessInstanceId())
+ && !ncr.getProcessInstanceId().equals(event.getId())) {
+ log.warn("[onEvent] NCR({}) 鐨勬祦绋嬪疄渚�({}) 涓庝簨浠�({}) 涓嶅尮閰嶏紝蹇界暐",
+ ncrId, ncr.getProcessInstanceId(), event.getId());
+ return;
+ }
+
+ // 4. 鏇存柊瀹℃壒鐘舵�侊紙Service 鍐呴儴浼氬啀娆℃牎楠屼粎瀹℃壒涓姸鎬佸彲鏇存柊锛�
+ ncrService.updateNcrAuditStatus(ncrId, event.getStatus());
+ log.info("[onEvent] NCR({}) 瀹℃壒鐘舵�佹洿鏂板畬鎴愶紝BPM 鐘舵�侊細{}", ncrId, event.getStatus());
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/patrol/MesQcPatrolService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/patrol/MesQcPatrolService.java
new file mode 100644
index 0000000..1157abb
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/patrol/MesQcPatrolService.java
@@ -0,0 +1,53 @@
+package cn.iocoder.yudao.module.mes.service.qc.patrol;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.patrol.vo.MesQcPatrolPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.patrol.vo.MesQcPatrolSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.patrol.MesQcPatrolDO;
+
+/**
+ * MES 璐ㄩ噺宸℃璁板綍 Service 鎺ュ彛
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface MesQcPatrolService {
+
+ /**
+ * 鍒涘缓璐ㄩ噺宸℃璁板綍
+ *
+ * @param createReqVO 鍒涘缓淇℃伅
+ * @return 缂栧彿
+ */
+ Long createPatrol(MesQcPatrolSaveReqVO createReqVO);
+
+ /**
+ * 鏇存柊璐ㄩ噺宸℃璁板綍
+ *
+ * @param updateReqVO 鏇存柊淇℃伅
+ */
+ void updatePatrol(MesQcPatrolSaveReqVO updateReqVO);
+
+ /**
+ * 鍒犻櫎璐ㄩ噺宸℃璁板綍
+ *
+ * @param id 缂栧彿
+ */
+ void deletePatrol(Long id);
+
+ /**
+ * 鑾峰緱璐ㄩ噺宸℃璁板綍
+ *
+ * @param id 缂栧彿
+ * @return 璐ㄩ噺宸℃璁板綍
+ */
+ MesQcPatrolDO getPatrol(Long id);
+
+ /**
+ * 鑾峰緱璐ㄩ噺宸℃璁板綍鍒嗛〉
+ *
+ * @param pageReqVO 鍒嗛〉鏌ヨ
+ * @return 璐ㄩ噺宸℃璁板綍鍒嗛〉
+ */
+ PageResult<MesQcPatrolDO> getPatrolPage(MesQcPatrolPageReqVO pageReqVO);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/patrol/MesQcPatrolServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/patrol/MesQcPatrolServiceImpl.java
new file mode 100644
index 0000000..eef26f9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/patrol/MesQcPatrolServiceImpl.java
@@ -0,0 +1,81 @@
+package cn.iocoder.yudao.module.mes.service.qc.patrol;
+
+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.patrol.vo.MesQcPatrolPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.patrol.vo.MesQcPatrolSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.patrol.MesQcPatrolDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.qc.patrol.MesQcPatrolMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.Objects;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.QC_PATROL_CODE_DUPLICATE;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.QC_PATROL_NOT_EXISTS;
+
+/**
+ * MES 璐ㄩ噺宸℃璁板綍 Service 瀹炵幇绫�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class MesQcPatrolServiceImpl implements MesQcPatrolService {
+
+ @Resource
+ private MesQcPatrolMapper patrolMapper;
+
+ @Override
+ public Long createPatrol(MesQcPatrolSaveReqVO createReqVO) {
+ // 鏍¢獙缂栧彿鍞竴
+ validatePatrolCodeUnique(null, createReqVO.getCode());
+ // 鎻掑叆
+ MesQcPatrolDO patrol = BeanUtils.toBean(createReqVO, MesQcPatrolDO.class);
+ patrolMapper.insert(patrol);
+ return patrol.getId();
+ }
+
+ @Override
+ public void updatePatrol(MesQcPatrolSaveReqVO updateReqVO) {
+ // 鏍¢獙瀛樺湪
+ validatePatrolExists(updateReqVO.getId());
+ // 鏍¢獙缂栧彿鍞竴
+ validatePatrolCodeUnique(updateReqVO.getId(), updateReqVO.getCode());
+ // 鏇存柊
+ MesQcPatrolDO updateObj = BeanUtils.toBean(updateReqVO, MesQcPatrolDO.class);
+ patrolMapper.updateById(updateObj);
+ }
+
+ @Override
+ public void deletePatrol(Long id) {
+ validatePatrolExists(id);
+ patrolMapper.deleteById(id);
+ }
+
+ @Override
+ public MesQcPatrolDO getPatrol(Long id) {
+ return patrolMapper.selectById(id);
+ }
+
+ @Override
+ public PageResult<MesQcPatrolDO> getPatrolPage(MesQcPatrolPageReqVO pageReqVO) {
+ return patrolMapper.selectPage(pageReqVO);
+ }
+
+ private void validatePatrolExists(Long id) {
+ if (id == null || patrolMapper.selectById(id) == null) {
+ throw exception(QC_PATROL_NOT_EXISTS);
+ }
+ }
+
+ private void validatePatrolCodeUnique(Long id, String code) {
+ MesQcPatrolDO patrol = patrolMapper.selectByCode(code);
+ if (patrol != null && !Objects.equals(patrol.getId(), id)) {
+ throw exception(QC_PATROL_CODE_DUPLICATE);
+ }
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/statistics/MesQcStatisticsService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/statistics/MesQcStatisticsService.java
new file mode 100644
index 0000000..81ae9d2
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/statistics/MesQcStatisticsService.java
@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.module.mes.service.qc.statistics;
+
+import cn.iocoder.yudao.module.mes.controller.admin.qc.statistics.vo.MesQcStatisticsRespVO;
+
+import java.time.LocalDateTime;
+
+/**
+ * MES 璐ㄩ噺缁熻 Service 鎺ュ彛
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface MesQcStatisticsService {
+
+ /**
+ * 鑾峰緱璐ㄩ噺缁熻姹囨��
+ *
+ * @param beginTime 妫�娴嬫棩鏈� >= 寮�濮嬫椂闂达紝鍙负绌�
+ * @param endTime 妫�娴嬫棩鏈� <= 缁撴潫鏃堕棿锛屽彲涓虹┖
+ * @return 鏁翠綋缁熻銆佹寜宸ュ簭缁熻銆佹寜鐢熶骇宸ュ崟缁熻
+ */
+ MesQcStatisticsRespVO getStatisticsSummary(LocalDateTime beginTime, LocalDateTime endTime);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/statistics/MesQcStatisticsServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/statistics/MesQcStatisticsServiceImpl.java
new file mode 100644
index 0000000..c8d18d8
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/statistics/MesQcStatisticsServiceImpl.java
@@ -0,0 +1,134 @@
+package cn.iocoder.yudao.module.mes.service.qc.statistics;
+
+import cn.iocoder.yudao.module.mes.controller.admin.qc.statistics.vo.MesQcStatisticsByProcessVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.statistics.vo.MesQcStatisticsByWorkOrderVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.statistics.vo.MesQcStatisticsOverallVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.statistics.vo.MesQcStatisticsRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.statistics.vo.MesQcStatisticsTypeVO;
+import cn.iocoder.yudao.module.mes.dal.mysql.qc.statistics.MesQcStatisticsMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * MES 璐ㄩ噺缁熻 Service 瀹炵幇绫�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class MesQcStatisticsServiceImpl implements MesQcStatisticsService {
+
+ /**
+ * 鍥哄畾杈撳嚭椤哄簭涓庡悕绉帮細IQC / IPQC / OQC / RQC锛屾棤鏁版嵁鐨勭被鍨嬩篃瑕佽繑鍥� 0
+ */
+ private static final Map<String, String> QC_TYPE_NAMES = Map.of(
+ "IQC", "鏉ユ枡妫�楠�",
+ "IPQC", "杩囩▼妫�楠�",
+ "OQC", "鍑鸿揣妫�楠�",
+ "RQC", "閫�璐ф楠�");
+
+ private static final List<String> QC_TYPE_ORDER = List.of("IQC", "IPQC", "OQC", "RQC");
+
+ @Resource
+ private MesQcStatisticsMapper statisticsMapper;
+
+ @Override
+ public MesQcStatisticsRespVO getStatisticsSummary(LocalDateTime beginTime, LocalDateTime endTime) {
+ return new MesQcStatisticsRespVO()
+ .setOverall(buildOverall(beginTime, endTime))
+ .setByProcess(buildByProcess(beginTime, endTime))
+ .setByWorkOrder(buildByWorkOrder(beginTime, endTime));
+ }
+
+ private MesQcStatisticsOverallVO buildOverall(LocalDateTime beginTime, LocalDateTime endTime) {
+ Map<String, MesQcStatisticsTypeVO> typeMap = new HashMap<>();
+ for (MesQcStatisticsTypeVO row : statisticsMapper.selectTypeStatistics(beginTime, endTime)) {
+ typeMap.put(row.getQcType(), row);
+ }
+
+ long totalQcCount = 0L;
+ BigDecimal totalCheckQuantity = BigDecimal.ZERO;
+ BigDecimal totalQualifiedQuantity = BigDecimal.ZERO;
+ BigDecimal totalUnqualifiedQuantity = BigDecimal.ZERO;
+ List<MesQcStatisticsTypeVO> types = new ArrayList<>(QC_TYPE_ORDER.size());
+ for (String qcType : QC_TYPE_ORDER) {
+ MesQcStatisticsTypeVO type = typeMap.get(qcType);
+ if (type == null) {
+ type = new MesQcStatisticsTypeVO().setQcType(qcType);
+ }
+ type.setQcTypeName(QC_TYPE_NAMES.get(qcType));
+ type.setQcCount(defaultZero(type.getQcCount()));
+ type.setCheckQuantity(defaultZero(type.getCheckQuantity()));
+ type.setQualifiedQuantity(defaultZero(type.getQualifiedQuantity()));
+ type.setUnqualifiedQuantity(defaultZero(type.getUnqualifiedQuantity()));
+ type.setQualifiedRate(calculateRate(type.getQualifiedQuantity(), type.getCheckQuantity()));
+ type.setUnqualifiedRate(calculateRate(type.getUnqualifiedQuantity(), type.getCheckQuantity()));
+ types.add(type);
+
+ totalQcCount += type.getQcCount();
+ totalCheckQuantity = totalCheckQuantity.add(type.getCheckQuantity());
+ totalQualifiedQuantity = totalQualifiedQuantity.add(type.getQualifiedQuantity());
+ totalUnqualifiedQuantity = totalUnqualifiedQuantity.add(type.getUnqualifiedQuantity());
+ }
+
+ return new MesQcStatisticsOverallVO()
+ .setTotalQcCount(totalQcCount)
+ .setCheckQuantity(totalCheckQuantity)
+ .setQualifiedQuantity(totalQualifiedQuantity)
+ .setUnqualifiedQuantity(totalUnqualifiedQuantity)
+ .setQualifiedRate(calculateRate(totalQualifiedQuantity, totalCheckQuantity))
+ .setUnqualifiedRate(calculateRate(totalUnqualifiedQuantity, totalCheckQuantity))
+ .setTypes(types);
+ }
+
+ private List<MesQcStatisticsByProcessVO> buildByProcess(LocalDateTime beginTime, LocalDateTime endTime) {
+ List<MesQcStatisticsByProcessVO> list = statisticsMapper.selectStatisticsByProcess(beginTime, endTime);
+ for (MesQcStatisticsByProcessVO row : list) {
+ row.setCheckQuantity(defaultZero(row.getCheckQuantity()));
+ row.setQualifiedQuantity(defaultZero(row.getQualifiedQuantity()));
+ row.setUnqualifiedQuantity(defaultZero(row.getUnqualifiedQuantity()));
+ row.setQualifiedRate(calculateRate(row.getQualifiedQuantity(), row.getCheckQuantity()));
+ }
+ return list;
+ }
+
+ private List<MesQcStatisticsByWorkOrderVO> buildByWorkOrder(LocalDateTime beginTime, LocalDateTime endTime) {
+ List<MesQcStatisticsByWorkOrderVO> list = statisticsMapper.selectStatisticsByWorkOrder(beginTime, endTime);
+ for (MesQcStatisticsByWorkOrderVO row : list) {
+ row.setCheckQuantity(defaultZero(row.getCheckQuantity()));
+ row.setQualifiedQuantity(defaultZero(row.getQualifiedQuantity()));
+ row.setUnqualifiedQuantity(defaultZero(row.getUnqualifiedQuantity()));
+ row.setQualifiedRate(calculateRate(row.getQualifiedQuantity(), row.getCheckQuantity()));
+ }
+ return list;
+ }
+
+ private static Long defaultZero(Long value) {
+ return value == null ? 0L : value;
+ }
+
+ private static BigDecimal defaultZero(BigDecimal value) {
+ return value == null ? BigDecimal.ZERO : value;
+ }
+
+ /**
+ * 璁$畻鐧惧垎姣旓紝淇濈暀涓や綅灏忔暟锛涘垎姣嶄负绌烘垨 0 鏃惰繑鍥� 0.00锛岄伩鍏嶉櫎闆�
+ */
+ private static BigDecimal calculateRate(BigDecimal part, BigDecimal total) {
+ if (part == null || total == null || total.compareTo(BigDecimal.ZERO) == 0) {
+ return BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
+ }
+ return part.multiply(BigDecimal.valueOf(100))
+ .divide(total, 2, RoundingMode.HALF_UP);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateProcessService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateProcessService.java
new file mode 100644
index 0000000..f05c47f
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateProcessService.java
@@ -0,0 +1,72 @@
+package cn.iocoder.yudao.module.mes.service.qc.template;
+
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcTemplateProcessRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.MesQcTemplateProcessSaveByTemplateReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.MesQcTemplateProcessSaveListReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateProcessDO;
+
+import java.util.List;
+
+/**
+ * MES 璐ㄦ鏂规-宸ュ簭缁戝畾 Service 鎺ュ彛
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface MesQcTemplateProcessService {
+
+ /**
+ * 鑾峰彇宸ュ簭缁戝畾鐨勮川妫�鏂规鍒楄〃
+ *
+ * @param processId 宸ュ簭缂栧彿
+ * @return 缁戝畾鍒楄〃
+ */
+ List<MesQcTemplateProcessDO> getListByProcessId(Long processId);
+
+ /**
+ * 鑾峰彇璐ㄦ鏂规閫傜敤鐨勫伐搴忓垪琛�
+ *
+ * @param templateId 璐ㄦ鏂规缂栧彿
+ * @return 缁戝畾鍒楄〃
+ */
+ List<MesQcTemplateProcessDO> getListByTemplateId(Long templateId);
+
+ /**
+ * 鎵归噺淇濆瓨宸ュ簭缁戝畾鐨勮川妫�鏂规锛堟柊澧炪�佷慨鏀广�佸垹闄ゅ樊寮傦級
+ *
+ * @param reqVO 淇濆瓨璇锋眰
+ */
+ void saveList(MesQcTemplateProcessSaveListReqVO reqVO);
+
+ /**
+ * 鎵归噺淇濆瓨璐ㄦ鏂规閫傜敤鐨勫伐搴忥紙浠ユ柟妗堜负涓讳綋锛屽樊寮傚鍒狅級
+ *
+ * @param reqVO 淇濆瓨璇锋眰
+ */
+ void saveByTemplate(MesQcTemplateProcessSaveByTemplateReqVO reqVO);
+
+ /**
+ * 瑙f瀽宸ュ簭鐨勯粯璁よ川妫�鏂规缂栧彿
+ *
+ * @param processId 宸ュ簭缂栧彿
+ * @param qcType 璐ㄦ绉嶇被
+ * @return 鏂规缂栧彿锛岀┖=鏈粦瀹�
+ */
+ Long resolveTemplateId(Long processId, Integer qcType);
+
+ /**
+ * 瑙f瀽宸ュ簭鐨勯粯璁よ川妫�鏂规鍙婃娴嬫寚鏍囧瓧娈�
+ *
+ * @param processId 宸ュ簭缂栧彿
+ * @param qcType 璐ㄦ绉嶇被
+ * @return 榛樿鏂规涓庢寚鏍�
+ */
+ MesQcIpqcTemplateProcessRespVO resolveTemplate(Long processId, Integer qcType);
+
+ /**
+ * 鍒犻櫎璐ㄦ鏂规鏃剁骇鑱斿垹闄ゅ伐搴忕粦瀹�
+ *
+ * @param templateId 璐ㄦ鏂规缂栧彿
+ */
+ void deleteListByTemplateId(Long templateId);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateProcessServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateProcessServiceImpl.java
new file mode 100644
index 0000000..40d2379
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateProcessServiceImpl.java
@@ -0,0 +1,286 @@
+package cn.iocoder.yudao.module.mes.service.qc.template;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcTemplateProcessRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.MesQcTemplateProcessSaveByTemplateReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.MesQcTemplateProcessSaveListReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.MesQcTemplateProcessSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.indicator.MesQcIndicatorDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateIndicatorDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateProcessDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.qc.template.MesQcTemplateProcessMapper;
+import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum;
+import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
+import cn.iocoder.yudao.module.mes.service.qc.indicator.MesQcIndicatorService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.*;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
+
+/**
+ * MES 璐ㄦ鏂规-宸ュ簭缁戝畾 Service 瀹炵幇绫�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class MesQcTemplateProcessServiceImpl implements MesQcTemplateProcessService {
+
+ @Resource
+ private MesQcTemplateProcessMapper templateProcessMapper;
+ @Resource
+ private MesProProcessService processService;
+ @Resource
+ private MesQcTemplateService templateService;
+ @Resource
+ private MesQcTemplateIndicatorService templateIndicatorService;
+ @Resource
+ private MesQcIndicatorService indicatorService;
+
+ @Override
+ public List<MesQcTemplateProcessDO> getListByProcessId(Long processId) {
+ if (processId == null) {
+ return Collections.emptyList();
+ }
+ return templateProcessMapper.selectListByProcessId(processId);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void saveList(MesQcTemplateProcessSaveListReqVO reqVO) {
+ processService.validateProcessExists(reqVO.getProcessId());
+ List<MesQcTemplateProcessSaveReqVO> list = reqVO.getList() == null
+ ? Collections.emptyList() : reqVO.getList();
+ validateList(reqVO.getProcessId(), list);
+
+ List<MesQcTemplateProcessDO> existingList = templateProcessMapper.selectListByProcessId(reqVO.getProcessId());
+ Set<Long> existingIds = convertSet(existingList, MesQcTemplateProcessDO::getId);
+ Set<Long> retainedIds = new HashSet<>();
+ for (MesQcTemplateProcessSaveReqVO item : list) {
+ MesQcTemplateProcessDO binding = BeanUtils.toBean(item, MesQcTemplateProcessDO.class)
+ .setProcessId(reqVO.getProcessId())
+ .setDefaultFlag(Boolean.TRUE.equals(item.getDefaultFlag()))
+ .setStatus(item.getStatus() != null ? item.getStatus() : CommonStatusEnum.ENABLE.getStatus())
+ .setSort(item.getSort() != null ? item.getSort() : 0);
+ if (binding.getId() == null) {
+ templateProcessMapper.insert(binding);
+ } else {
+ if (!existingIds.contains(binding.getId())) {
+ throw exception(QC_TEMPLATE_PROCESS_NOT_EXISTS);
+ }
+ templateProcessMapper.updateById(binding);
+ }
+ retainedIds.add(binding.getId());
+ // 鍚屼竴宸ュ簭銆佸悓涓�璐ㄦ绉嶇被鍙厑璁镐竴涓粯璁ゆ柟妗�
+ if (Boolean.TRUE.equals(binding.getDefaultFlag())) {
+ clearOtherDefaults(reqVO.getProcessId(), binding.getQcType(), binding.getId());
+ }
+ }
+ for (Long existingId : existingIds) {
+ if (!retainedIds.contains(existingId)) {
+ templateProcessMapper.deleteById(existingId);
+ }
+ }
+ }
+
+ @Override
+ public List<MesQcTemplateProcessDO> getListByTemplateId(Long templateId) {
+ if (templateId == null) {
+ return Collections.emptyList();
+ }
+ return templateProcessMapper.selectListByTemplateId(templateId);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void saveByTemplate(MesQcTemplateProcessSaveByTemplateReqVO reqVO) {
+ // 1. 鏍¢獙鏂规涓庤川妫�绉嶇被
+ MesQcTemplateDO template = templateService.getTemplate(reqVO.getTemplateId());
+ if (template == null) {
+ throw new ServiceException(QC_TEMPLATE_PROCESS_NOT_EXISTS.getCode(),
+ StrUtil.format("璐ㄦ鏂规 ID={} 涓嶅瓨鍦紱璇峰埛鏂拌川妫�鏂规鍒楄〃鍚庨噸鏂伴�夋嫨", reqVO.getTemplateId()));
+ }
+ if (CollUtil.isNotEmpty(template.getTypes())
+ && !template.getTypes().contains(reqVO.getQcType())) {
+ throw new ServiceException(QC_TEMPLATE_PROCESS_NOT_EXISTS.getCode(),
+ StrUtil.format("璐ㄦ鏂规[{}]鐨勬娴嬬绫讳负{}锛屼笉鍖呭惈[{}]锛涜鍏堝湪璐ㄦ鏂规涓淮鎶よ妫�娴嬬绫�",
+ template.getName(), template.getTypes(), qcTypeName(reqVO.getQcType())));
+ }
+ List<MesQcTemplateProcessSaveByTemplateReqVO.ProcessItem> list = reqVO.getList() == null
+ ? Collections.emptyList() : reqVO.getList();
+ Map<Long, MesQcTemplateProcessSaveByTemplateReqVO.ProcessItem> requestedMap = new LinkedHashMap<>();
+ for (MesQcTemplateProcessSaveByTemplateReqVO.ProcessItem item : list) {
+ if (requestedMap.putIfAbsent(item.getProcessId(), item) != null) {
+ throw new ServiceException(QC_TEMPLATE_PROCESS_DUPLICATE.getCode(),
+ StrUtil.format("璐ㄦ鏂规[{}]閲嶅閫夋嫨浜嗗伐搴� ID={}锛涜鍒犻櫎閲嶅鐨勫伐搴忓悗閲嶈瘯",
+ template.getName(), item.getProcessId()));
+ }
+ }
+
+ // 2. 浠ャ�屽凡鏈夌粦瀹氬伐搴� 鈭� 鏈閫夋嫨宸ュ簭銆嶄负鑼冨洿锛岄�愬伐搴忛噸绠楃粦瀹氬垪琛�
+ List<MesQcTemplateProcessDO> existingList = templateProcessMapper.selectListByTemplateId(reqVO.getTemplateId());
+ Set<Long> processIds = new LinkedHashSet<>(convertSet(existingList, MesQcTemplateProcessDO::getProcessId));
+ processIds.addAll(requestedMap.keySet());
+ for (Long processId : processIds) {
+ List<MesQcTemplateProcessDO> processBindings = templateProcessMapper.selectListByProcessId(processId);
+ List<MesQcTemplateProcessSaveReqVO> targetList = new ArrayList<>();
+ for (MesQcTemplateProcessDO binding : processBindings) {
+ // 鏈柟妗� + 鏈川妫�绉嶇被鐨勬棫缁戝畾鐢辨湰娆¤姹傛暣浣撴浛鎹�
+ if (ObjUtil.equal(binding.getTemplateId(), reqVO.getTemplateId())
+ && ObjUtil.equal(binding.getQcType(), reqVO.getQcType())) {
+ continue;
+ }
+ targetList.add(BeanUtils.toBean(binding, MesQcTemplateProcessSaveReqVO.class));
+ }
+ MesQcTemplateProcessSaveByTemplateReqVO.ProcessItem requested = requestedMap.get(processId);
+ if (requested == null && targetList.isEmpty()) {
+ continue;
+ }
+ if (requested != null) {
+ targetList.add(new MesQcTemplateProcessSaveReqVO()
+ .setProcessId(processId)
+ .setTemplateId(reqVO.getTemplateId())
+ .setQcType(reqVO.getQcType())
+ .setDefaultFlag(Boolean.TRUE.equals(requested.getDefaultFlag()))
+ .setSort(requested.getSort() != null ? requested.getSort() : 0));
+ }
+ MesQcTemplateProcessSaveListReqVO saveReqVO = new MesQcTemplateProcessSaveListReqVO();
+ saveReqVO.setProcessId(processId);
+ saveReqVO.setList(targetList);
+ saveList(saveReqVO);
+ }
+ }
+
+ @Override
+ public Long resolveTemplateId(Long processId, Integer qcType) {
+ if (processId == null || qcType == null) {
+ return null;
+ }
+ return templateProcessMapper.selectListByProcessId(processId).stream()
+ .filter(binding -> ObjUtil.equal(binding.getQcType(), qcType))
+ .filter(binding -> ObjUtil.equal(binding.getStatus(), CommonStatusEnum.ENABLE.getStatus()))
+ .sorted(Comparator
+ .comparing((MesQcTemplateProcessDO binding) -> Boolean.TRUE.equals(binding.getDefaultFlag()))
+ .reversed()
+ .thenComparing(binding -> binding.getSort() != null ? binding.getSort() : 0)
+ .thenComparing(MesQcTemplateProcessDO::getId))
+ .map(MesQcTemplateProcessDO::getTemplateId)
+ .findFirst().orElse(null);
+ }
+
+ @Override
+ public MesQcIpqcTemplateProcessRespVO resolveTemplate(Long processId, Integer qcType) {
+ MesQcIpqcTemplateProcessRespVO resp = new MesQcIpqcTemplateProcessRespVO()
+ .setProcessId(processId).setQcType(qcType);
+ Long templateId = resolveTemplateId(processId, qcType);
+ if (templateId == null) {
+ return resp;
+ }
+ MesQcTemplateDO template = templateService.getTemplate(templateId);
+ if (template == null) {
+ return resp;
+ }
+ resp.setTemplateId(template.getId()).setTemplateCode(template.getCode()).setTemplateName(template.getName());
+ List<MesQcTemplateIndicatorDO> templateIndicators =
+ templateIndicatorService.getTemplateIndicatorListByTemplateId(templateId);
+ if (CollUtil.isEmpty(templateIndicators)) {
+ resp.setIndicators(Collections.emptyList());
+ return resp;
+ }
+ Map<Long, MesQcIndicatorDO> indicatorMap = indicatorService.getIndicatorMap(
+ convertSet(templateIndicators, MesQcTemplateIndicatorDO::getIndicatorId));
+ List<MesQcIpqcTemplateProcessRespVO.IndicatorItem> items = new ArrayList<>(templateIndicators.size());
+ for (MesQcTemplateIndicatorDO templateIndicator : templateIndicators) {
+ MesQcIndicatorDO indicator = indicatorMap.get(templateIndicator.getIndicatorId());
+ items.add(new MesQcIpqcTemplateProcessRespVO.IndicatorItem()
+ .setTemplateIndicatorId(templateIndicator.getId())
+ .setIndicatorId(templateIndicator.getIndicatorId())
+ .setIndicatorCode(indicator != null ? indicator.getCode() : null)
+ .setIndicatorName(indicator != null ? indicator.getName() : null)
+ .setItemType(indicator != null ? indicator.getItemType() : null)
+ .setResultType(indicator != null ? indicator.getResultType() : null)
+ .setResultSpecification(indicator != null ? indicator.getResultSpecification() : null)
+ .setUnitText(indicator != null ? indicator.getUnitText() : null)
+ .setTool(indicator != null ? indicator.getTool() : null)
+ .setCheckMethod(templateIndicator.getCheckMethod())
+ .setStandardValue(templateIndicator.getStandardValue())
+ .setUnitMeasureId(templateIndicator.getUnitMeasureId())
+ .setThresholdMax(templateIndicator.getThresholdMax())
+ .setThresholdMin(templateIndicator.getThresholdMin()));
+ }
+ resp.setIndicators(items);
+ return resp;
+ }
+
+ @Override
+ public void deleteListByTemplateId(Long templateId) {
+ List<MesQcTemplateProcessDO> list = templateProcessMapper.selectListByTemplateId(templateId);
+ if (CollUtil.isEmpty(list)) {
+ return;
+ }
+ templateProcessMapper.deleteBatch(MesQcTemplateProcessDO::getId,
+ convertSet(list, MesQcTemplateProcessDO::getId));
+ }
+
+ private void clearOtherDefaults(Long processId, Integer qcType, Long keepId) {
+ templateProcessMapper.selectListByProcessId(processId).stream()
+ .filter(binding -> ObjUtil.equal(binding.getQcType(), qcType))
+ .filter(binding -> Boolean.TRUE.equals(binding.getDefaultFlag()))
+ .filter(binding -> !ObjUtil.equal(binding.getId(), keepId))
+ .forEach(binding -> templateProcessMapper.updateById(
+ new MesQcTemplateProcessDO().setId(binding.getId()).setDefaultFlag(false)));
+ }
+
+ private static String qcTypeName(Integer qcType) {
+ return Arrays.stream(MesQcTypeEnum.values())
+ .filter(item -> ObjUtil.equal(item.getType(), qcType))
+ .map(MesQcTypeEnum::getName).findFirst().orElse("鏈煡(" + qcType + ")");
+ }
+
+ private void validateList(Long processId, List<MesQcTemplateProcessSaveReqVO> list) {
+ if (CollUtil.isEmpty(list)) {
+ return;
+ }
+ Set<String> keys = new HashSet<>();
+ Set<String> defaultKeys = new HashSet<>();
+ for (MesQcTemplateProcessSaveReqVO item : list) {
+ if (!Arrays.asList(MesQcTypeEnum.ARRAYS).contains(item.getQcType())) {
+ throw new ServiceException(QC_TEMPLATE_PROCESS_NOT_EXISTS.getCode(),
+ StrUtil.format("宸ュ簭缁戝畾鐨勮川妫�绉嶇被[{}]涓嶅悎娉曪紱鏈熸湜 1-鏉ユ枡妫�楠� / 2-杩囩▼妫�楠� / 3-鍑鸿揣妫�楠� / 4-閫�璐ф楠岋紝璇烽噸鏂伴�夋嫨",
+ item.getQcType()));
+ }
+ if (templateService.getTemplate(item.getTemplateId()) == null) {
+ throw new ServiceException(QC_TEMPLATE_PROCESS_NOT_EXISTS.getCode(),
+ StrUtil.format("宸ュ簭 ID={} 缁戝畾鐨勮川妫�鏂规 ID={} 涓嶅瓨鍦紱璇峰埛鏂拌川妫�鏂规鍚庨噸鏂伴�夋嫨",
+ processId, item.getTemplateId()));
+ }
+ String key = item.getQcType() + ":" + item.getTemplateId();
+ if (!keys.add(key)) {
+ throw new ServiceException(QC_TEMPLATE_PROCESS_DUPLICATE.getCode(),
+ StrUtil.format("宸ュ簭 ID={} 鍦ㄨ川妫�绉嶇被[{}]涓嬮噸澶嶇粦瀹氫簡璐ㄦ鏂规 ID={}锛涜鍒犻櫎閲嶅琛屽悗閲嶈瘯",
+ processId, qcTypeName(item.getQcType()), item.getTemplateId()));
+ }
+ if (Boolean.TRUE.equals(item.getDefaultFlag())) {
+ String defaultKey = String.valueOf(item.getQcType());
+ if (!defaultKeys.add(defaultKey)) {
+ throw new ServiceException(QC_TEMPLATE_PROCESS_DUPLICATE.getCode(),
+ StrUtil.format("宸ュ簭 ID={} 鍦ㄨ川妫�绉嶇被[{}]涓嬪彧鑳借缃竴涓粯璁ゆ柟妗堬紱璇峰彇娑堝浣欑殑榛樿鏍囪鍚庨噸璇�",
+ processId, qcTypeName(item.getQcType())));
+ }
+ }
+ }
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/document/MesWmDocumentRenderer.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/document/MesWmDocumentRenderer.java
new file mode 100644
index 0000000..11c01d7
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/document/MesWmDocumentRenderer.java
@@ -0,0 +1,290 @@
+package cn.iocoder.yudao.module.mes.service.wm.document;
+
+import org.springframework.core.io.ClassPathResource;
+import org.w3c.dom.Node;
+
+import javax.imageio.ImageIO;
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.awt.*;
+import java.awt.geom.Path2D;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * MES 浠撳偍鍗曟嵁 Word 瀵煎嚭锛氬熀浜� templates/wm/*.docx 妯℃澘濉啓妲戒綅锛�
+ * 骞舵寜鍏徃鍚嶇О瀹炴椂缁樺埗绾㈣壊鐢靛瓙绔狅紙涓嶄緷璧栭潤鎬佺珷鍥剧墖锛夈��
+ */
+public final class MesWmDocumentRenderer {
+
+ private static final String W = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
+ private static final String SALES_DELIVERY_TEMPLATE = "templates/wm/sales-delivery.docx";
+ private static final String PRODUCT_OUTBOUND_TEMPLATE = "templates/wm/product-outbound.docx";
+ private static final String PROJECT_TRACKING_TEMPLATE = "templates/pd/project-tracking.docx";
+ private static final String SEAL_ENTRY = "word/media/seal.png";
+
+ private MesWmDocumentRenderer() {
+ }
+
+ public static byte[] renderSalesDelivery(Map<String, String> fields,
+ List<Map<String, String>> items,
+ String companyName) throws IOException {
+ return render(SALES_DELIVERY_TEMPLATE, fields, items, companyName);
+ }
+
+ public static byte[] renderProductOutbound(Map<String, String> fields,
+ List<Map<String, String>> items,
+ String companyName) throws IOException {
+ return render(PRODUCT_OUTBOUND_TEMPLATE, fields, items, companyName);
+ }
+
+ /**
+ * 椤圭洰璺熻釜琛細琛ㄥご瀛楁鑷姩濉厖锛岃窡韪褰曚负绌虹櫧琛岋紝渚涙墦鍗板悗鎵嬪啓鎴栦笅杞藉悗琛ュ~銆�
+ */
+ public static byte[] renderProjectTracking(Map<String, String> fields,
+ String companyName) throws IOException {
+ byte[] seal = renderSeal(companyName, "椤圭洰涓撶敤绔�");
+ try (var input = new ClassPathResource(PROJECT_TRACKING_TEMPLATE).getInputStream();
+ var zip = new ZipInputStream(input);
+ var output = new ByteArrayOutputStream();
+ var result = new ZipOutputStream(output)) {
+ ZipEntry entry;
+ while ((entry = zip.getNextEntry()) != null) {
+ byte[] content = zip.readAllBytes();
+ if ("word/document.xml".equals(entry.getName())) {
+ content = fillDocumentFieldsOnly(content, fields, companyName);
+ } else if (SEAL_ENTRY.equals(entry.getName())) {
+ content = seal;
+ }
+ result.putNextEntry(new ZipEntry(entry.getName()));
+ result.write(content);
+ result.closeEntry();
+ }
+ result.finish();
+ return output.toByteArray();
+ }
+ }
+
+ private static byte[] render(String template, Map<String, String> fields,
+ List<Map<String, String>> items, String companyName) throws IOException {
+ if (items == null || items.isEmpty()) {
+ throw new IllegalArgumentException("鍗曟嵁娌℃湁璐х墿鏄庣粏锛屾棤娉曠敓鎴� Word 鏂囦欢");
+ }
+ byte[] seal = renderSeal(companyName, "鍙戣揣涓撶敤绔�");
+ try (var input = new ClassPathResource(template).getInputStream();
+ var zip = new ZipInputStream(input);
+ var output = new ByteArrayOutputStream();
+ var result = new ZipOutputStream(output)) {
+ ZipEntry entry;
+ while ((entry = zip.getNextEntry()) != null) {
+ byte[] content = zip.readAllBytes();
+ if ("word/document.xml".equals(entry.getName())) {
+ content = fillDocument(content, fields, items, companyName);
+ } else if (SEAL_ENTRY.equals(entry.getName())) {
+ content = seal;
+ }
+ result.putNextEntry(new ZipEntry(entry.getName()));
+ result.write(content);
+ result.closeEntry();
+ }
+ result.finish();
+ return output.toByteArray();
+ }
+ }
+
+ private static byte[] fillDocument(byte[] xml, Map<String, String> fields,
+ List<Map<String, String>> items, String companyName) throws IOException {
+ try {
+ var factory = DocumentBuilderFactory.newInstance();
+ factory.setNamespaceAware(true);
+ factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+ factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
+ factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
+ var document = factory.newDocumentBuilder().parse(new ByteArrayInputStream(xml));
+
+ // 1. 鏄庣粏琛�
+ Node rowTemplate = null;
+ var rows = document.getElementsByTagNameNS(W, "tr");
+ for (int i = 0; i < rows.getLength(); i++) {
+ if (rows.item(i).getTextContent().contains("${itemName}")) {
+ rowTemplate = rows.item(i);
+ break;
+ }
+ }
+ if (rowTemplate == null) {
+ throw new IOException("鍗曟嵁妯℃澘缂哄皯璐х墿鏄庣粏妲戒綅");
+ }
+ int index = 0;
+ for (Map<String, String> item : items) {
+ Node row = rowTemplate.cloneNode(true);
+ var values = new java.util.HashMap<String, String>();
+ item.forEach((key, value) -> values.put(key, text(value)));
+ values.put("index", String.valueOf(++index));
+ replace(row, values);
+ rowTemplate.getParentNode().insertBefore(row, rowTemplate);
+ }
+ rowTemplate.getParentNode().removeChild(rowTemplate);
+
+ // 2. 琛ㄥご瀛楁
+ var values = new java.util.HashMap<String, String>();
+ fields.forEach((key, value) -> values.put(key, text(value)));
+ values.put("companyName", text(companyName));
+ replace(document, values);
+ if (document.getDocumentElement().getTextContent().contains("${")) {
+ throw new IOException("鍗曟嵁妯℃澘瀛樺湪鏈~鍐欐Ы浣�");
+ }
+
+ var transformerFactory = TransformerFactory.newInstance();
+ transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
+ transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, "");
+ var output = new ByteArrayOutputStream();
+ transformerFactory.newTransformer().transform(new DOMSource(document), new StreamResult(output));
+ return output.toByteArray();
+ } catch (IOException exception) {
+ throw exception;
+ } catch (Exception exception) {
+ throw new IOException("鐢熸垚鍗曟嵁 Word 鏂囦欢澶辫触", exception);
+ }
+ }
+
+ private static byte[] fillDocumentFieldsOnly(byte[] xml, Map<String, String> fields,
+ String companyName) throws IOException {
+ try {
+ var factory = DocumentBuilderFactory.newInstance();
+ factory.setNamespaceAware(true);
+ factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+ factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
+ factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
+ var document = factory.newDocumentBuilder().parse(new ByteArrayInputStream(xml));
+
+ var values = new java.util.HashMap<String, String>();
+ fields.forEach((key, value) -> values.put(key, text(value)));
+ values.put("companyName", text(companyName));
+ replace(document, values);
+ if (document.getDocumentElement().getTextContent().contains("${")) {
+ throw new IOException("鍗曟嵁妯℃澘瀛樺湪鏈~鍐欐Ы浣�");
+ }
+
+ var transformerFactory = TransformerFactory.newInstance();
+ transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
+ transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, "");
+ var output = new ByteArrayOutputStream();
+ transformerFactory.newTransformer().transform(new DOMSource(document), new StreamResult(output));
+ return output.toByteArray();
+ } catch (IOException exception) {
+ throw exception;
+ } catch (Exception exception) {
+ throw new IOException("鐢熸垚鍗曟嵁 Word 鏂囦欢澶辫触", exception);
+ }
+ }
+
+ // ==================== 鐢靛瓙绔犵粯鍒� ====================
+
+ private static byte[] renderSeal(String companyName, String sealText) throws IOException {
+ int size = 400;
+ var image = new BufferedImage(size, size, BufferedImage.TYPE_INT_ARGB);
+ Graphics2D g = image.createGraphics();
+ try {
+ g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+ g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
+ var red = new Color(200, 16, 46);
+ g.setColor(red);
+ g.setStroke(new BasicStroke(9f));
+ g.drawOval(12, 12, size - 24, size - 24);
+ g.setStroke(new BasicStroke(3f));
+ g.drawOval(38, 38, size - 76, size - 76);
+
+ String name = text(companyName).isBlank() ? "鍏徃" : companyName.trim();
+ int fontSize = Math.max(16, Math.min(30, 560 / Math.max(1, name.length())));
+ g.setFont(new Font("SimSun", Font.BOLD, fontSize));
+ drawArcText(g, name, size / 2, size / 2, size / 2 - 62, 195, 150);
+
+ drawStar(g, size / 2, size / 2 - 8, 34, 14);
+ g.setFont(new Font("SimSun", Font.BOLD, 27));
+ drawCentered(g, sealText, size / 2, (int) (size * 0.68));
+ } finally {
+ g.dispose();
+ }
+ var output = new ByteArrayOutputStream();
+ ImageIO.write(image, "png", output);
+ return output.toByteArray();
+ }
+
+ private static void drawArcText(Graphics2D g, String text, int cx, int cy, int radius,
+ double startDeg, double sweepDeg) {
+ FontMetrics fm = g.getFontMetrics();
+ int[] widths = new int[text.length()];
+ double totalWidth = 0;
+ for (int i = 0; i < text.length(); i++) {
+ widths[i] = Math.max(1, fm.charWidth(text.charAt(i)));
+ totalWidth += widths[i];
+ }
+ double angle = startDeg;
+ for (int i = 0; i < text.length(); i++) {
+ double span = widths[i] / totalWidth * sweepDeg;
+ double center = angle + span / 2;
+ double rad = Math.toRadians(center);
+ int x = (int) (cx + radius * Math.cos(rad));
+ int y = (int) (cy + radius * Math.sin(rad));
+ var transform = g.getTransform();
+ g.rotate(Math.toRadians(center + 90), x, y);
+ g.drawString(String.valueOf(text.charAt(i)), x - widths[i] / 2, y + fm.getAscent() / 2 - 3);
+ g.setTransform(transform);
+ angle += span;
+ }
+ }
+
+ private static void drawStar(Graphics2D g, int cx, int cy, int outer, int inner) {
+ var path = new Path2D.Double();
+ for (int i = 0; i < 10; i++) {
+ double r = i % 2 == 0 ? outer : inner;
+ double angle = Math.toRadians(-90 + i * 36);
+ double x = cx + r * Math.cos(angle);
+ double y = cy + r * Math.sin(angle);
+ if (i == 0) {
+ path.moveTo(x, y);
+ } else {
+ path.lineTo(x, y);
+ }
+ }
+ path.closePath();
+ g.fill(path);
+ }
+
+ private static void drawCentered(Graphics2D g, String text, int cx, int baseline) {
+ FontMetrics fm = g.getFontMetrics();
+ g.drawString(text, cx - fm.stringWidth(text) / 2, baseline);
+ }
+
+ private static void replace(Node node, Map<String, String> values) {
+ if (node.getNodeType() == Node.ELEMENT_NODE && "t".equals(node.getLocalName())
+ && W.equals(node.getNamespaceURI())) {
+ String value = node.getTextContent();
+ for (var entry : values.entrySet()) {
+ // 鏄庣粏瀛楁鍙兘涓� null锛堝鏈~鎵规鍙凤級锛宺eplace 涓嶆帴鍙� null锛岀粺涓�鍥為��涓哄崰浣嶇
+ String replacement = entry.getValue() == null ? "-" : entry.getValue();
+ value = value.replace("${" + entry.getKey() + "}", replacement);
+ }
+ node.setTextContent(value);
+ return;
+ }
+ for (Node child = node.getFirstChild(); child != null; child = child.getNextSibling()) {
+ replace(child, values);
+ }
+ }
+
+ private static String text(String value) {
+ return Objects.requireNonNullElse(value, "-").isBlank() ? "-" : value;
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImpl.java
index 949b1f6..9d43702 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImpl.java
@@ -178,6 +178,9 @@
// 1. 鏌ヨ娑堣�楁槑缁嗭紙detail 绾у埆锛屽寘鍚簿纭殑鎵规/浠撳簱淇℃伅锛�
List<MesWmItemConsumeDetailDO> details = itemConsumeDetailService
.getItemConsumeDetailListByConsumeId(consumeId);
+ // 鐢熶骇璁㈠崟 ID 鍐椾綑鍒版祦姘达紝渚夸簬鍑哄簱鍙拌处鎸夌敓浜ц鍗曡拷婧�
+ MesWmItemConsumeDO consume = itemConsumeMapper.selectById(consumeId);
+ Long workOrderId = consume != null ? consume.getWorkOrderId() : null;
// 2. 閬嶅巻鏄庣粏锛屽垱寤哄簱瀛樹簨鍔★紙鎸夋壒娆$簿纭墸鍑忕嚎杈瑰簱锛�
for (MesWmItemConsumeDetailDO detail : details) {
@@ -192,7 +195,7 @@
.setAreaId(detail.getAreaId())
.setCheckFlag(false) // 绾胯竟搴撳厑璁歌礋搴撳瓨
.setBizType(MesBizTypeConstants.WM_ITEM_CONSUME)
- .setBizId(consumeId)
+ .setBizId(consumeId).setWorkOrderId(workOrderId)
.setBizCode("")
.setBizLineId(detail.getLineId()));
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockService.java
index f58e2a5..01b9ac8 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockService.java
@@ -53,12 +53,14 @@
void updateMaterialStockFrozen(@Valid MesWmMaterialStockFreezeReqVO updateReqVO);
/**
- * 鎵归噺鏇存柊搴撳瓨鍐荤粨鐘舵��
+ * 鎸夋潵婧愭寔鏈夋垨閲婃斁搴撳瓨鍐荤粨锛涗笉浼氭竻闄ゅ叾浠栨潵婧愮殑鍐荤粨銆�
*
* @param ids 搴撳瓨璁板綍缂栧彿鍒楄〃
+ * @param sourceType 鍐荤粨鏉ユ簮绫诲瀷
+ * @param sourceId 鍐荤粨鏉ユ簮鍗曟嵁缂栧彿
* @param frozen 鏄惁鍐荤粨
*/
- void updateMaterialStockFrozen(Collection<Long> ids, boolean frozen);
+ void setMaterialStockFreeze(Collection<Long> ids, String sourceType, Long sourceId, boolean frozen);
/**
* 鑾峰緱浠撳簱涓嬪簱瀛樿褰曟暟閲�
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 f083ece..3987dda 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
@@ -20,6 +20,7 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemTypeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstock.MesWmMaterialStockDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.materialstock.MesWmMaterialStockFreezeClaimMapper;
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;
@@ -70,6 +71,8 @@
@Resource
private MesWmMaterialStockMapper materialStockMapper;
+ @Resource
+ private MesWmMaterialStockFreezeClaimMapper freezeClaimMapper;
@Resource
private MesMdmItemService mdmItemService;
@@ -152,21 +155,34 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void updateMaterialStockFrozen(MesWmMaterialStockFreezeReqVO updateReqVO) {
- // 鏍¢獙瀛樺湪
- validateMaterialStockExists(updateReqVO.getId());
-
- // 鏇存柊鍐荤粨鐘舵��
- materialStockMapper.updateById(new MesWmMaterialStockDO()
- .setId(updateReqVO.getId()).setFrozen(updateReqVO.getFrozen()));
+ setMaterialStockFreeze(List.of(updateReqVO.getId()), "MANUAL", 0L, updateReqVO.getFrozen());
}
@Override
- public void updateMaterialStockFrozen(Collection<Long> ids, boolean frozen) {
+ @Transactional(rollbackFor = Exception.class)
+ public void setMaterialStockFreeze(Collection<Long> ids, String sourceType, Long sourceId, boolean frozen) {
if (CollUtil.isEmpty(ids)) {
return;
}
- materialStockMapper.updateByIds(ids, new MesWmMaterialStockDO().setFrozen(frozen));
+ // 鎸� ID 鍥哄畾椤哄簭鍔犻攣锛岄伩鍏嶄袱涓换鍔″悓鏃跺喕缁撶浉鍚屽簱瀛樻椂浜х敓閿侀『搴忓弽杞��
+ for (Long stockId : ids.stream().filter(Objects::nonNull).distinct().sorted().toList()) {
+ MesWmMaterialStockDO stock = materialStockMapper.lockById(stockId);
+ if (stock == null) {
+ throw exception(WM_MATERIAL_STOCK_NOT_EXISTS);
+ }
+ if (frozen) {
+ freezeClaimMapper.acquire(stockId, sourceType, sourceId);
+ } else {
+ freezeClaimMapper.release(stockId, sourceType, sourceId);
+ }
+ boolean effectiveFrozen = freezeClaimMapper.countByStockId(stockId) > 0;
+ if (!Objects.equals(stock.getFrozen(), effectiveFrozen)) {
+ materialStockMapper.updateById(new MesWmMaterialStockDO()
+ .setId(stockId).setFrozen(effectiveFrozen));
+ }
+ }
}
@Override
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java
index 3164436..8c91804 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java
@@ -250,7 +250,7 @@
.setQuantity(detail.getQuantity().negate()) // 搴撳瓨鍑忓皯
.setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode()).setMaterialStockId(detail.getMaterialStockId())
.setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId())
- .setBizType(MesBizTypeConstants.WM_ISSUE).setBizId(issue.getId())
+ .setBizType(MesBizTypeConstants.WM_ISSUE).setBizId(issue.getId()).setWorkOrderId(issue.getWorkOrderId())
.setBizCode(issue.getCode()).setBizLineId(detail.getLineId()));
// 2.2 鍐嶅叆铏氭嫙绾胯竟搴擄紙搴撳瓨澧炲姞锛�
wmTransactionService.createTransaction(new MesWmTransactionSaveReqDTO()
@@ -258,7 +258,7 @@
.setQuantity(detail.getQuantity()) // 搴撳瓨澧炲姞
.setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode())
.setWarehouseId(virtualWarehouse.getId()).setLocationId(virtualLocation.getId()).setAreaId(virtualArea.getId())
- .setBizType(MesBizTypeConstants.WM_ISSUE).setBizId(issue.getId())
+ .setBizType(MesBizTypeConstants.WM_ISSUE).setBizId(issue.getId()).setWorkOrderId(issue.getWorkOrderId())
.setBizCode(issue.getCode()).setBizLineId(detail.getLineId())
.setRelatedTransactionId(outTransactionId)); // 鍏宠仈鍑哄簱浜嬪姟
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java
index c50473e..6186aa8 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java
@@ -95,6 +95,9 @@
}
private void createTransactionList(Long produceId, List<MesWmProductProduceLineDO> lines) {
+ // 鐢熶骇璁㈠崟 ID 鍐椾綑鍒版祦姘达紝渚夸簬鍑哄簱鍙拌处鎸夌敓浜ц鍗曡拷婧�
+ MesWmProductProduceDO produce = productProduceMapper.selectById(produceId);
+ Long workOrderId = produce != null ? produce.getWorkOrderId() : null;
for (MesWmProductProduceLineDO line : lines) {
if (MesWmQualityStatusEnum.FAIL.getStatus().equals(line.getQualityStatus())) {
// 涓嶅悎鏍间骇鍑轰繚鐣欒褰曪紝浜ょ敱涓嶅悎鏍煎搧澶勭悊锛屼笉鐢熸垚鍚堟牸搴撳瓨娴佹按銆�
@@ -118,7 +121,7 @@
.setQuantity(detail.getQuantity())
.setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode())
.setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId())
- .setBizType(MesBizTypeConstants.WM_PRODUCT_PRODUCE).setBizId(produceId)
+ .setBizType(MesBizTypeConstants.WM_PRODUCT_PRODUCE).setBizId(produceId).setWorkOrderId(workOrderId)
.setBizCode("").setBizLineId(line.getId()));
}
}
@@ -128,8 +131,7 @@
@Transactional(rollbackFor = Exception.class)
public MesWmProductProduceDO generateProductProduce(MesProFeedbackDO feedback, boolean checkFlag,
MesProFeedbackApproveReqVO approveReqVO) {
- if (!checkFlag) throw exception(WM_PRODUCT_PRODUCE_QUALITY_PENDING);
- // 0. 鏌ヨ鍏宠仈鐨勫伐鍗曪紙鐢ㄤ簬鑾峰彇 clientId 绛変俊鎭級
+ // 0. 鏌ヨ鍏宠仈鐨勫伐鍗曪紙鐢ㄤ簬鑾峰彇 clientId銆佷骇鍝佺瓑淇℃伅锛�
MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(feedback.getWorkOrderId());
// 1. 鍒涘缓浜у嚭鍗曞ご
@@ -169,11 +171,26 @@
Long batchId = batch != null ? batch.getId() : null;
String batchCode = batch != null ? batch.getCode() : null;
- // 鏂版姤宸ヤ骇鍑虹粺涓�寰呮锛屽巻鍙蹭笉妫�楠屽嵆鍏ュ簱鍒嗘敮宸茬Щ闄ゃ��
+ // 鍗婃垚鍝侊紙鎶ュ伐鐗╂枡 != 宸ュ崟鎴愬搧锛夋寜鐢熶骇 BOM 鐩存帴鑷姩鍏ュ簱锛屼笉绛夎川妫�銆佷笉璧板鎵癸紱
+ // 鎴愬搧浠嶇粺涓�寰呮锛岃川妫�鍚堟牸鍚庢墠鐢熸垚鍏ュ簱娴佹按銆�
+ boolean semiFinished = workOrder != null && feedback.getItemId() != null
+ && ObjUtil.notEqual(feedback.getItemId(), workOrder.getProductId());
MesWmProductProduceLineDO line = buildProduceLine(produce, feedback, batchId, batchCode,
- feedback.getFeedbackQuantity(), MesWmQualityStatusEnum.PENDING.getStatus(),
+ feedback.getFeedbackQuantity(),
+ semiFinished ? MesWmQualityStatusEnum.PASS.getStatus() : MesWmQualityStatusEnum.PENDING.getStatus(),
workOrder != null ? workOrder.getReelNo() : null);
productProduceLineService.createProductProduceLine(line);
+ if (semiFinished) {
+ WarehouseTarget target = resolveOutputTarget(feedback.getWorkOrderId(), feedback.getProcessId(),
+ feedback.getItemId());
+ productProduceDetailService.createProductProduceDetail(MesWmProductProduceDetailDO.builder()
+ .produceId(produce.getId()).lineId(line.getId())
+ .itemId(feedback.getItemId()).quantity(feedback.getFeedbackQuantity())
+ .batchId(batchId).batchCode(batchCode).reelNo(line.getReelNo())
+ .warehouseId(target.warehouseId()).locationId(target.locationId()).areaId(target.areaId())
+ .build());
+ finishProductProduce(produce.getId());
+ }
return produce;
}
@@ -218,6 +235,10 @@
if (produce == null) {
throw exception(WM_PRODUCT_PRODUCE_NOT_EXISTS);
}
+ // 鍗婃垚鍝佸湪鎶ュ伐瀹℃壒鏃跺凡鑷姩鍏ュ簱锛堜骇鍑哄崟宸插畬鎴愶級锛岃川妫�瀹屾垚鏃朵笉鍐嶉噸澶嶆媶鍒嗗叆搴�
+ if (ObjUtil.equal(produce.getStatus(), MesWmProductProduceStatusEnum.FINISHED.getStatus())) {
+ return;
+ }
// 2. 閫氳繃 sourceLineId 鐩存帴瀹氫綅寰呮楠岃
MesWmProductProduceLineDO pendingLine = productProduceLineService.validateProductProduceLineExists(sourceLineId);
if (!ObjUtil.equal(pendingLine.getProduceId(), produce.getId())
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java
index 7b0bf81..1b5ab45 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java
@@ -202,7 +202,7 @@
.setBatchId(batchId).setBatchCode(batchCode)
.setWarehouseId(virtualWarehouse.getId()).setLocationId(virtualLocation.getId()).setAreaId(virtualArea.getId())
.setCheckFlag(false) // 绾胯竟搴撳厑璁歌礋搴撳瓨
- .setBizType(MesBizTypeConstants.WM_PRODUCT_RECPT).setBizId(receipt.getId())
+ .setBizType(MesBizTypeConstants.WM_PRODUCT_RECPT).setBizId(receipt.getId()).setWorkOrderId(receipt.getWorkOrderId())
.setBizCode(receipt.getCode()).setBizLineId(detail.getLineId()));
// 2.2 鍐嶅叆瀹為檯浠撳簱锛堝簱瀛樺鍔狅級
wmTransactionService.createTransaction(new MesWmTransactionSaveReqDTO()
@@ -210,7 +210,7 @@
.setQuantity(detail.getQuantity()) // 搴撳瓨澧炲姞
.setBatchId(batchId).setBatchCode(batchCode)
.setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId())
- .setBizType(MesBizTypeConstants.WM_PRODUCT_RECPT).setBizId(receipt.getId())
+ .setBizType(MesBizTypeConstants.WM_PRODUCT_RECPT).setBizId(receipt.getId()).setWorkOrderId(receipt.getWorkOrderId())
.setBizCode(receipt.getCode()).setBizLineId(detail.getLineId())
.setRelatedTransactionId(outTransactionId)); // 鍏宠仈鍑哄簱浜嬪姟
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java
index a00a8fd..efd17b7 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java
@@ -251,7 +251,7 @@
.setWarehouseId(virtualWarehouse.getId()).setLocationId(virtualLocation.getId()).setAreaId(virtualArea.getId())
.setMaterialStockId(detail.getMaterialStockId()) // 鎸囧畾铏氭嫙绾胯竟搴撳簱瀛樿褰�
.setCheckFlag(false) // 绾胯竟搴撳厑璁歌礋搴撳瓨
- .setBizType(MesBizTypeConstants.WM_RETURN_ISSUE).setBizId(issue.getId())
+ .setBizType(MesBizTypeConstants.WM_RETURN_ISSUE).setBizId(issue.getId()).setWorkOrderId(issue.getWorkOrderId())
.setBizCode(issue.getCode()).setBizLineId(detail.getLineId()));
// 2.2 纭畾涓婃灦鐩爣浠撳簱锛歞etail 鐨� warehouseId/locationId/areaId 鏄笂鏋剁洰鏍囷紙瀹為檯浠撳簱锛�
@@ -275,7 +275,7 @@
.setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode())
.setWarehouseId(targetWarehouseId).setLocationId(targetLocationId).setAreaId(targetAreaId)
.setForceCreateNewStock(true) // 寮哄埗鍒涘缓鏂板簱瀛樿褰�
- .setBizType(MesBizTypeConstants.WM_RETURN_ISSUE).setBizId(issue.getId())
+ .setBizType(MesBizTypeConstants.WM_RETURN_ISSUE).setBizId(issue.getId()).setWorkOrderId(issue.getWorkOrderId())
.setBizCode(issue.getCode()).setBizLineId(detail.getLineId())
.setRelatedTransactionId(outTransactionId)); // 鍏宠仈鍑哄簱浜嬪姟
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java
index 35288c5..3841671 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java
@@ -4,6 +4,8 @@
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
+import cn.iocoder.yudao.module.aftersales.api.AfterSaleTicketApi;
+import cn.iocoder.yudao.module.aftersales.api.dto.AfterSaleWarehouseReturnStageReqDTO;
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.returnsales.vo.line.MesWmReturnSalesLinePageReqVO;
@@ -42,6 +44,9 @@
@Service
@Validated
public class MesWmReturnSalesLineServiceImpl implements MesWmReturnSalesLineService {
+
+ @Resource
+ private AfterSaleTicketApi afterSaleTicketApi;
@Resource
private MesWmReturnSalesLineMapper returnSalesLineMapper;
@@ -246,6 +251,14 @@
line -> Objects.equals(line.getQualityStatus(), MesWmQualityStatusEnum.PENDING.getStatus()));
if (allInspected) {
returnSalesService.updateReturnSalesStatus(sourceDocId, MesWmReturnSalesStatusEnum.APPROVING.getStatus());
+ MesWmReturnSalesDO returnSales = returnSalesService.getReturnSales(sourceDocId);
+ if (returnSales != null && returnSales.getSaleOrderId() != null) {
+ afterSaleTicketApi.onWarehouseReturnQualityFinished(new AfterSaleWarehouseReturnStageReqDTO()
+ .setSaleOrderId(returnSales.getSaleOrderId())
+ .setReturnSalesId(returnSales.getId())
+ .setReturnSalesCode(returnSales.getCode())
+ .setQualityResult("鍏ㄩ儴寰呮琛屽凡瀹屾垚妫�楠�"));
+ }
}
}
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java
index 25418e3..41bd4b3 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java
@@ -5,6 +5,7 @@
import cn.hutool.core.util.ObjUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.aftersales.api.AfterSaleTicketApi;
+import cn.iocoder.yudao.module.aftersales.api.dto.AfterSaleWarehouseReturnStageReqDTO;
import cn.iocoder.yudao.module.aftersales.api.dto.AfterSaleWarehouseReturnCreateReqDTO;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -202,6 +203,12 @@
// 3. 鏇存柊閫�璐у崟鐘舵��
returnSalesMapper.updateById(new MesWmReturnSalesDO()
.setId(id).setStatus(MesWmReturnSalesStatusEnum.FINISHED.getStatus()));
+ if (returnSales.getSaleOrderId() != null) {
+ afterSaleTicketApi.onWarehouseReturnInboundFinished(new AfterSaleWarehouseReturnStageReqDTO()
+ .setSaleOrderId(returnSales.getSaleOrderId())
+ .setReturnSalesId(returnSales.getId())
+ .setReturnSalesCode(returnSales.getCode()));
+ }
}
private void createTransactionList(MesWmReturnSalesDO returnSales) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailServiceImpl.java
index efc903c..14d4622 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailServiceImpl.java
@@ -5,7 +5,9 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.detail.MesWmReturnVendorDetailSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor.MesWmReturnVendorDetailDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor.MesWmReturnVendorLineDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor.MesWmReturnVendorDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnvendor.MesWmReturnVendorDetailMapper;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnVendorStatusEnum;
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;
@@ -33,6 +35,9 @@
@Lazy
private MesWmReturnVendorLineService returnVendorLineService;
@Resource
+ @Lazy
+ private MesWmReturnVendorService returnVendorService;
+ @Resource
private MesMdmItemService mdmItemService;
@Resource
private MesWmMaterialStockService materialStockService;
@@ -52,8 +57,11 @@
@Override
public void updateReturnVendorDetail(MesWmReturnVendorDetailSaveReqVO updateReqVO) {
- // 鏍¢獙瀛樺湪
- validateReturnVendorDetailExists(updateReqVO.getId());
+ MesWmReturnVendorDetailDO oldDetail = validateReturnVendorDetailExists(updateReqVO.getId());
+ if (ObjUtil.notEqual(oldDetail.getReturnId(), updateReqVO.getReturnId())
+ || ObjUtil.notEqual(oldDetail.getLineId(), updateReqVO.getLineId())) {
+ throw exception(WM_RETURN_VENDOR_DETAIL_PARENT_IMMUTABLE);
+ }
// 鏍¢獙鏁版嵁
validateDetailSaveData(updateReqVO);
@@ -71,6 +79,7 @@
if (ObjUtil.notEqual(line.getReturnId(), reqVO.getReturnId())) {
throw exception(WM_RETURN_VENDOR_DETAIL_LINE_NOT_MATCH);
}
+ validateDetailEditable(reqVO.getReturnId());
// 鏍¢獙鐗╂枡瀛樺湪
mdmItemService.validateItemExistsAndEnable(reqVO.getItemId());
// 鏍¢獙鐗╂枡涓庤鐗╂枡涓�鑷�
@@ -84,8 +93,8 @@
@Override
public void deleteReturnVendorDetail(Long id) {
- // 鏍¢獙瀛樺湪
- validateReturnVendorDetailExists(id);
+ MesWmReturnVendorDetailDO detail = validateReturnVendorDetailExists(id);
+ validateDetailEditable(detail.getReturnId());
// 鍒犻櫎
returnVendorDetailMapper.deleteById(id);
}
@@ -115,10 +124,20 @@
returnVendorDetailMapper.deleteByLineId(lineId);
}
- private void validateReturnVendorDetailExists(Long id) {
- if (returnVendorDetailMapper.selectById(id) == null) {
+ private MesWmReturnVendorDetailDO validateReturnVendorDetailExists(Long id) {
+ MesWmReturnVendorDetailDO detail = returnVendorDetailMapper.selectById(id);
+ if (detail == null) {
throw exception(WM_RETURN_VENDOR_DETAIL_NOT_EXISTS);
}
+ return detail;
+ }
+
+ private void validateDetailEditable(Long returnId) {
+ MesWmReturnVendorDO returnVendor = returnVendorService.validateReturnVendorExists(returnId);
+ if (!ObjUtil.equal(returnVendor.getStatus(), MesWmReturnVendorStatusEnum.PREPARE.getStatus())
+ && !ObjUtil.equal(returnVendor.getStatus(), MesWmReturnVendorStatusEnum.APPROVING.getStatus())) {
+ throw exception(WM_RETURN_VENDOR_DETAIL_STATUS_INVALID, returnVendor.getCode());
+ }
}
/**
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorLineServiceImpl.java
index 39a10d4..0f16cb2 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorLineServiceImpl.java
@@ -26,10 +26,13 @@
import java.util.List;
import java.util.Set;
+import java.math.BigDecimal;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_RETURN_VENDOR_ITEM_NOT_IN_PURCHASE_ORDER;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_RETURN_VENDOR_LINE_NOT_EXISTS;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_RETURN_VENDOR_QUANTITY_EXCEED;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_RETURN_VENDOR_PURCHASE_ITEM_AMBIGUOUS;
/**
* MES 渚涘簲鍟嗛��璐у崟琛� Service 瀹炵幇绫�
@@ -60,6 +63,7 @@
MesWmReturnVendorDO returnVendor = validateReturnVendorLineSaveData(createReqVO);
// 閫�璐у崟鑻ュ凡鍏宠仈閲囪喘璁㈠崟锛岀墿鏂欏繀椤诲睘浜庤閲囪喘璁㈠崟锛岀姝㈣法璁㈠崟闅忔剰閫夋枡
validateReturnVendorItemInPurchaseOrder(returnVendor, createReqVO.getItemId(), null);
+ validateReturnQuantity(returnVendor, null, createReqVO.getItemId(), createReqVO.getQuantity());
// 鎻掑叆
MesWmReturnVendorLineDO line = BeanUtils.toBean(createReqVO, MesWmReturnVendorLineDO.class);
@@ -77,6 +81,7 @@
MesWmReturnVendorDO returnVendor = validateReturnVendorLineSaveData(updateReqVO);
// 鍏宠仈閲囪喘璁㈠崟鏃讹紝涓嶅厑璁告妸琛岀墿鏂欐敼鎴愯鍗曞鐨勭墿鏂欙紱浠呮敼鏁伴噺绛夋搷浣滀笉鍙楀奖鍝�
validateReturnVendorItemInPurchaseOrder(returnVendor, updateReqVO.getItemId(), oldLine.getItemId());
+ validateReturnQuantity(returnVendor, oldLine.getId(), updateReqVO.getItemId(), updateReqVO.getQuantity());
// 鏇存柊
MesWmReturnVendorLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnVendorLineDO.class);
@@ -172,6 +177,39 @@
returnVendor.getCode(), resolvePurchaseOrderNo(purchaseOrderId), resolveItemDesc(itemId)));
}
+ private void validateReturnQuantity(MesWmReturnVendorDO returnVendor, Long lineId, Long itemId, BigDecimal quantity) {
+ if (returnVendor.getPurchaseOrderId() == null) {
+ return;
+ }
+ List<ErpPurchaseOrderItemRespDTO> orderItems = purchaseOrderApi
+ .getPurchaseOrderItemList(returnVendor.getPurchaseOrderId()).getCheckedData();
+ List<ErpPurchaseOrderItemRespDTO> matching = (CollUtil.isEmpty(orderItems) ? List.<ErpPurchaseOrderItemRespDTO>of() : orderItems).stream()
+ .filter(item -> ObjUtil.equal(item.getProductId(), itemId)).toList();
+ if (matching.size() > 1) {
+ throw exception(WM_RETURN_VENDOR_PURCHASE_ITEM_AMBIGUOUS, itemId);
+ }
+ if (matching.isEmpty()) {
+ throw exception(WM_RETURN_VENDOR_ITEM_NOT_IN_PURCHASE_ORDER);
+ }
+ ErpPurchaseOrderItemRespDTO item = matching.get(0);
+ BigDecimal available = (item.getInCount() == null ? BigDecimal.ZERO : item.getInCount())
+ .subtract(item.getReturnCount() == null ? BigDecimal.ZERO : item.getReturnCount());
+ BigDecimal totalQuantity = quantity;
+ for (MesWmReturnVendorLineDO existing : returnVendorLineServiceList(returnVendor.getId())) {
+ if (!ObjUtil.equal(existing.getId(), lineId) && ObjUtil.equal(existing.getItemId(), itemId)
+ && existing.getQuantity() != null) {
+ totalQuantity = totalQuantity.add(existing.getQuantity());
+ }
+ }
+ if (totalQuantity.compareTo(available) > 0) {
+ throw exception(WM_RETURN_VENDOR_QUANTITY_EXCEED, itemId, totalQuantity, available);
+ }
+ }
+
+ private List<MesWmReturnVendorLineDO> returnVendorLineServiceList(Long returnId) {
+ return returnVendorLineMapper.selectListByReturnId(returnId);
+ }
+
/**
* 瑙f瀽閲囪喘璁㈠崟鍙凤紝瑙f瀽澶辫触鏃跺洖閫�涓哄彲璇� ID
*/
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java
index f08d468..387146e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java
@@ -62,6 +62,7 @@
* 闄勪欢涓氬姟绫诲瀷锛歁ES 渚涘簲鍟嗛��璐у崟
*/
public static final String RETURN_VENDOR_RECORD_TYPE = "mes_wm_return_vendor";
+ private static final String RETURN_VENDOR_APPROVAL_KEY = "purchase_return_vendor_approve";
@Resource
private MesWmReturnVendorMapper returnVendorMapper;
@@ -185,26 +186,25 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void submitReturnVendor(Long id) {
- // 鏍¢獙瀛樺湪 + 鑽夌鐘舵��
- validateReturnVendorExistsAndPrepare(id);
- // 鏍¢獙鑷冲皯鏈変竴鏉¤
- List<MesWmReturnVendorLineDO> lines = returnVendorLineService.getReturnVendorLineListByReturnId(id);
- if (CollUtil.isEmpty(lines)) {
- throw exception(WM_RETURN_VENDOR_NO_LINE);
- }
-
- // 鎻愪氦锛堣崏绋� -> 寰呮嫞璐э級
- returnVendorMapper.updateById(new MesWmReturnVendorDO()
- .setId(id).setStatus(MesWmReturnVendorStatusEnum.APPROVING.getStatus()));
+ submitReturnVendorApproval(id, RETURN_VENDOR_APPROVAL_KEY);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void submitReturnVendorApproval(Long id, String processDefinitionKey) {
+ if (!RETURN_VENDOR_APPROVAL_KEY.equals(processDefinitionKey)) {
+ throw exception(WM_RETURN_VENDOR_APPROVAL_PROCESS_INVALID, RETURN_VENDOR_APPROVAL_KEY);
+ }
// 1. 鏍¢獙瀛樺湪 + 鑽夌鐘舵�� + 鑷冲皯涓�鏉¤
MesWmReturnVendorDO returnVendor = validateReturnVendorExistsAndPrepare(id);
if (CollUtil.isEmpty(returnVendorLineService.getReturnVendorLineListByReturnId(id))) {
throw exception(WM_RETURN_VENDOR_NO_LINE);
+ }
+ validateReturnVendorOrderQuantity(returnVendor);
+ // 鎷h揣鍙湪瀹℃壒閫氳繃鍚庤繘琛岋紱濡傚凡鎻愬墠褰曞叆鏄庣粏锛屽垯鎻愪氦鍓嶅繀椤绘暟閲忓畧鎭掋��
+ if (CollUtil.isNotEmpty(returnVendorDetailService.getReturnVendorDetailListByReturnId(id))
+ && !checkReturnVendorQuantity(id)) {
+ throw exception(WM_RETURN_VENDOR_DETAIL_QUANTITY_MISMATCH);
}
// 1.1. 璐ㄩ噺閮ㄥ彂璧烽��璐у繀椤讳笂浼犻檮浠讹紙璐ㄦ鎶ュ憡銆佷笉鍚堟牸鐓х墖绛夛級锛屽惁鍒欏鎵逛汉鏃犳硶鍒ゆ柇閫�璐т緷鎹�
if (CollUtil.isEmpty(storageAttachmentApi.listAttachments(RETURN_VENDOR_RECORD_TYPE, id))) {
@@ -284,6 +284,11 @@
if (ObjUtil.notEqual(MesWmReturnVendorStatusEnum.APPROVING.getStatus(), returnVendor.getStatus())) {
throw exception(WM_RETURN_VENDOR_STATUS_INVALID);
}
+ validateReturnVendorApproval(returnVendor);
+ if (!checkReturnVendorQuantity(id)) {
+ throw exception(WM_RETURN_VENDOR_DETAIL_QUANTITY_MISMATCH);
+ }
+ validateReturnVendorOrderQuantity(returnVendor);
// 鎵ц鎷h揣锛堝緟鎷h揣 -> 寰呮墽琛岄��璐э級
returnVendorMapper.updateById(new MesWmReturnVendorDO()
.setId(id).setStatus(MesWmReturnVendorStatusEnum.APPROVED.getStatus()));
@@ -297,11 +302,16 @@
if (ObjUtil.notEqual(MesWmReturnVendorStatusEnum.APPROVED.getStatus(), returnVendor.getStatus())) {
throw exception(WM_RETURN_VENDOR_STATUS_INVALID);
}
+ validateReturnVendorApproval(returnVendor);
// 1.2 鏍¢獙鏄庣粏涓嶄负绌�
List<MesWmReturnVendorDetailDO> details = returnVendorDetailService.getReturnVendorDetailListByReturnId(id);
if (CollUtil.isEmpty(details)) {
throw exception(WM_RETURN_VENDOR_NO_DETAIL);
}
+ if (!checkReturnVendorQuantity(id)) {
+ throw exception(WM_RETURN_VENDOR_DETAIL_QUANTITY_MISMATCH);
+ }
+ validateReturnVendorOrderQuantity(returnVendor);
// 1.3 鏍¢獙澶勭悊鏂瑰紡锛堥��娆� / 鎹㈣揣锛�
if (!MesWmReturnVendorHandleTypeEnum.isValid(returnVendor.getHandleType())) {
@@ -326,6 +336,13 @@
}
}
+ private void validateReturnVendorApproval(MesWmReturnVendorDO returnVendor) {
+ if (!RETURN_VENDOR_APPROVAL_KEY.equals(returnVendor.getProcessDefinitionKey())
+ || returnVendor.getProcessInstanceId() == null) {
+ throw exception(WM_RETURN_VENDOR_APPROVAL_REQUIRED, returnVendor.getCode());
+ }
+ }
+
/**
* 鎶婇��璐ф暟閲忓閲忓洖鍐欏埌鍏宠仈閲囪喘璁㈠崟鐨勬槑缁嗚锛屽苟鍚屾璁㈠崟绾ч��璐ф暟閲�
*/
@@ -343,15 +360,58 @@
return;
}
Map<Long, Long> purchaseOrderItemIdMap = new HashMap<>();
+ Set<Long> ambiguousProductIds = new HashSet<>();
orderItems.stream()
.filter(item -> item.getProductId() != null)
- .forEach(item -> purchaseOrderItemIdMap.putIfAbsent(item.getProductId(), item.getId()));
+ .forEach(item -> {
+ if (purchaseOrderItemIdMap.putIfAbsent(item.getProductId(), item.getId()) != null) {
+ ambiguousProductIds.add(item.getProductId());
+ }
+ });
for (MesWmReturnVendorLineDO line : lines) {
+ if (ambiguousProductIds.contains(line.getItemId())) {
+ throw exception(WM_RETURN_VENDOR_PURCHASE_ITEM_AMBIGUOUS, line.getItemId());
+ }
Long purchaseOrderItemId = purchaseOrderItemIdMap.get(line.getItemId());
if (purchaseOrderItemId == null || line.getQuantity() == null) {
continue;
}
- purchaseOrderApi.updateOrderItemReturnCount(purchaseOrderItemId, line.getQuantity());
+ if (!Boolean.TRUE.equals(purchaseOrderApi.updateOrderItemReturnCount(purchaseOrderItemId, line.getQuantity()).getCheckedData())) {
+ throw exception(WM_RETURN_VENDOR_ITEM_NOT_IN_PURCHASE_ORDER);
+ }
+ }
+ }
+
+ private void validateReturnVendorOrderQuantity(MesWmReturnVendorDO returnVendor) {
+ if (returnVendor.getPurchaseOrderId() == null) {
+ return;
+ }
+ List<ErpPurchaseOrderItemRespDTO> items = purchaseOrderApi
+ .getPurchaseOrderItemList(returnVendor.getPurchaseOrderId()).getCheckedData();
+ Map<Long, ErpPurchaseOrderItemRespDTO> byProduct = new HashMap<>();
+ Set<Long> ambiguousProductIds = new HashSet<>();
+ for (ErpPurchaseOrderItemRespDTO item : items) {
+ if (item.getProductId() != null && byProduct.putIfAbsent(item.getProductId(), item) != null) {
+ ambiguousProductIds.add(item.getProductId());
+ }
+ }
+ Map<Long, BigDecimal> requested = new HashMap<>();
+ for (MesWmReturnVendorLineDO line : returnVendorLineService.getReturnVendorLineListByReturnId(returnVendor.getId())) {
+ requested.merge(line.getItemId(), line.getQuantity(), BigDecimal::add);
+ }
+ for (Map.Entry<Long, BigDecimal> entry : requested.entrySet()) {
+ if (ambiguousProductIds.contains(entry.getKey())) {
+ throw exception(WM_RETURN_VENDOR_PURCHASE_ITEM_AMBIGUOUS, entry.getKey());
+ }
+ ErpPurchaseOrderItemRespDTO item = byProduct.get(entry.getKey());
+ if (item == null) {
+ throw exception(WM_RETURN_VENDOR_ITEM_NOT_IN_PURCHASE_ORDER);
+ }
+ BigDecimal available = (item.getInCount() == null ? BigDecimal.ZERO : item.getInCount())
+ .subtract(item.getReturnCount() == null ? BigDecimal.ZERO : item.getReturnCount());
+ if (entry.getValue().compareTo(available) > 0) {
+ throw exception(WM_RETURN_VENDOR_QUANTITY_EXCEED, entry.getKey(), entry.getValue(), available);
+ }
}
}
@@ -506,6 +566,15 @@
throw exception(WM_RETURN_VENDOR_CANCEL_NOT_ALLOWED);
}
+ // 瀹℃壒涓厛鎾ら攢 BPM 瀹炰緥锛屾挙閿�澶辫触鏃朵繚鐣欏崟鎹師鐘舵�佸拰寰呭姙銆�
+ if (MesWmReturnVendorStatusEnum.BPM_APPROVING.getStatus().equals(returnVendor.getStatus())) {
+ if (StrUtil.isBlank(returnVendor.getProcessInstanceId())) {
+ throw exception(WM_RETURN_VENDOR_APPROVAL_REQUIRED, returnVendor.getCode());
+ }
+ processInstanceApi.cancelProcessInstanceByStartUser(getCurrentUserId(),
+ returnVendor.getProcessInstanceId(), "渚涘簲鍟嗛��璐у崟鍙栨秷");
+ }
+
// 鍙栨秷
returnVendorMapper.updateById(new MesWmReturnVendorDO()
.setId(id).setStatus(MesWmReturnVendorStatusEnum.CANCELED.getStatus()));
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineService.java
index 1003b10..afaee78 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineService.java
@@ -60,6 +60,14 @@
List<MesWmSalesNoticeLineDO> getSalesNoticeLineListByNoticeId(Long noticeId);
/**
+ * 鎸夐�氱煡鍗曠紪鍙烽泦鍚堣幏寰楄鍒楄〃
+ *
+ * @param noticeIds 閫氱煡鍗曠紪鍙烽泦鍚�
+ * @return 琛屽垪琛�
+ */
+ List<MesWmSalesNoticeLineDO> getSalesNoticeLineListByNoticeIds(java.util.Collection<Long> noticeIds);
+
+ /**
* 鎸夐�氱煡鍗曠紪鍙锋壒閲忓垹闄よ
*
* @param noticeId 閫氱煡鍗曠紪鍙�
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineServiceImpl.java
index 94373e8..646a3f0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineServiceImpl.java
@@ -100,6 +100,11 @@
}
@Override
+ public List<MesWmSalesNoticeLineDO> getSalesNoticeLineListByNoticeIds(java.util.Collection<Long> noticeIds) {
+ return salesNoticeLineMapper.selectListByNoticeIds(noticeIds);
+ }
+
+ @Override
public void deleteSalesNoticeLineByNoticeId(Long noticeId) {
salesNoticeLineMapper.deleteByNoticeId(noticeId);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeService.java
index be5338c..83993e8 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeService.java
@@ -64,11 +64,28 @@
PageResult<MesWmSalesNoticeDO> getSalesNoticePage(MesWmSalesNoticePageReqVO pageReqVO);
/**
- * 鎻愪氦鍙戣揣閫氱煡鍗�
+ * 鎻愪氦鍙戣揣閫氱煡鍗曞鎵�
*
- * @param id 缂栧彿
+ * @param id 缂栧彿
+ * @param processDefinitionKey 娴佺▼瀹氫箟 Key锛堝叏灞�鍏嶅鎵规椂鍙负绌猴級
+ * @param userId 鎻愪氦浜虹紪鍙�
*/
- void submitSalesNotice(Long id);
+ void submitSalesNotice(Long id, String processDefinitionKey, Long userId);
+
+ /**
+ * 鏇存柊鍙戣揣鍗曞鎵圭粨鏋�
+ *
+ * @param id 缂栧彿
+ * @param bpmResult BPM 瀹℃壒缁撴灉
+ */
+ void updateSalesNoticeAuditStatus(Long id, Integer bpmResult);
+
+ /**
+ * 鑾峰彇鍙戣揣瀹℃壒鍙敤鐨勬祦绋嬪畾涔夊垪琛�
+ *
+ * @return 娴佺▼瀹氫箟鍒楄〃
+ */
+ List<java.util.Map<String, Object>> getSalesNoticeApproveProcessDefinitionList();
/**
* 鑾峰緱鍙戣揣閫氱煡鍗曞垪琛�
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
index 0c03975..7745b64 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
@@ -2,8 +2,15 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
+import cn.iocoder.yudao.module.bpm.service.definition.BpmCategoryService;
+import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
import cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo.MesWmSalesNoticePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo.MesWmSalesNoticeSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO;
@@ -15,6 +22,7 @@
import cn.iocoder.yudao.module.mes.dal.mysql.wm.salesnotice.MesWmSalesNoticeMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.salesnotice.MesWmSalesNoticeLineMapper;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmOutStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmSalesNoticeStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductSalesStatusEnum;
import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
@@ -24,14 +32,19 @@
import cn.iocoder.yudao.module.erp.api.sale.enums.ErpSaleOrderOutStatusEnum;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.repository.ProcessDefinition;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
@@ -44,6 +57,11 @@
@Validated
@Slf4j
public class MesWmSalesNoticeServiceImpl implements MesWmSalesNoticeService {
+
+ /**
+ * BPM 鍙戣揣瀹℃壒鍒嗙被缂栫爜锛堝鎵逛汉榛樿涓虹墿娴侊級
+ */
+ private static final String SALES_DELIVERY_APPROVE_CATEGORY_CODE = "sales_delivery_approve";
@Resource
private MesWmSalesNoticeMapper salesNoticeMapper;
@@ -65,6 +83,13 @@
@Resource
private MesWmSalesNoticeLineMapper salesNoticeLineMapper;
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
+ @Resource
+ private BpmCategoryService bpmCategoryService;
+ @Resource
+ private BpmProcessDefinitionService bpmProcessDefinitionService;
+
@Override
public Long createSalesNotice(MesWmSalesNoticeSaveReqVO createReqVO) {
// 鏍¢獙鏁版嵁
@@ -73,6 +98,8 @@
// 鎻掑叆
MesWmSalesNoticeDO notice = BeanUtils.toBean(createReqVO, MesWmSalesNoticeDO.class);
notice.setStatus(PREPARE.getStatus()); // 鑽夌鐘舵��
+ notice.setExpressFee(notice.getExpressFee() == null ? BigDecimal.ZERO : notice.getExpressFee());
+ notice.setInvoiceStatus(notice.getInvoiceStatus() == null ? 0 : notice.getInvoiceStatus());
salesNoticeMapper.insert(notice);
return notice.getId();
}
@@ -113,7 +140,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void submitSalesNotice(Long id) {
+ public void submitSalesNotice(Long id, String processDefinitionKey, Long userId) {
// 1.1 鏍¢獙瀛樺湪 + 鑽夌鐘舵��
MesWmSalesNoticeDO notice = validateSalesNoticeExistsAndDraft(id);
// 1.2 妫�鏌ユ槸鍚︽湁琛岄」鐩�
@@ -122,17 +149,111 @@
throw exception(WM_SALES_NOTICE_LINE_EMPTY);
}
- // 2. 鏇存柊鐘舵�侊細鑽夌 鈫� 寰呭嚭搴�
- salesNoticeMapper.updateById(new MesWmSalesNoticeDO()
- .setId(id).setStatus(APPROVED.getStatus()));
+ // 2. 鍏ㄥ眬鍏嶅鎵癸細鐩存帴杩涘叆寰呭嚭搴�
+ if (bpmProcessInstanceApi.isGlobalAutoApprove()) {
+ salesNoticeMapper.updateById(new MesWmSalesNoticeDO()
+ .setId(id).setProcessInstanceId("").setStatus(APPROVED.getStatus()));
+ reserveSaleOrderOutStatus(notice);
+ return;
+ }
- // 3. 鍥炲啓 ERP 閿�鍞鍗曞嚭搴撶姸鎬佷负"宸查鐣�"
+ // 3. 蹇呴』閫夋嫨娴佺▼锛屼笖鍒嗙被涓嬪瓨鍦ㄦ縺娲荤殑娴佺▼瀹氫箟
+ if (StrUtil.isBlank(processDefinitionKey)) {
+ throw exception(WM_SALES_NOTICE_SUBMIT_PROCESS_KEY_REQUIRED);
+ }
+ validateSalesNoticeApproveCategoryAndProcessDefinition();
+ ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
+ if (processDefinition == null) {
+ throw exception(WM_SALES_NOTICE_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+
+ // 4. 鍒涘缓瀹℃壒娴佺▼瀹炰緥锛岃繘鍏ュ鎵逛腑
+ String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(processDefinitionKey).setBusinessKey(String.valueOf(id)));
+ salesNoticeMapper.updateById(new MesWmSalesNoticeDO()
+ .setId(id).setProcessInstanceId(processInstanceId).setStatus(APPROVING.getStatus()));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateSalesNoticeAuditStatus(Long id, Integer bpmResult) {
+ MesWmSalesNoticeDO notice = validateSalesNoticeExists(id);
+ if (ObjUtil.notEqual(APPROVING.getStatus(), notice.getStatus())) {
+ MesWmSalesNoticeStatusEnum current = MesWmSalesNoticeStatusEnum.getByStatus(notice.getStatus());
+ log.error("[updateSalesNoticeAuditStatus][鍙戣揣鍗�({}) 涓嶅浜庡鎵逛腑锛屽綋鍓嶇姸鎬�({})锛屾棤娉曟洿鏂板鎵圭粨鏋�({})]",
+ id, current != null ? current.getName() : notice.getStatus(), bpmResult);
+ throw exception(WM_SALES_NOTICE_UPDATE_AUDIT_STATUS_FAIL_NOT_APPROVING, notice.getCode(),
+ current != null ? current.getName() : String.valueOf(notice.getStatus()));
+ }
+ if (ObjUtil.equal(bpmResult, BpmProcessInstanceStatusEnum.APPROVE.getStatus())) {
+ // 瀹℃壒閫氳繃锛氳繘鍏ュ緟鍑哄簱锛屽苟鍥炲啓閿�鍞鍗曞嚭搴撶姸鎬�
+ salesNoticeMapper.updateById(new MesWmSalesNoticeDO().setId(id).setStatus(APPROVED.getStatus()));
+ reserveSaleOrderOutStatus(notice);
+ } else if (ObjUtil.equal(bpmResult, BpmProcessInstanceStatusEnum.REJECT.getStatus())
+ || ObjUtil.equal(bpmResult, BpmProcessInstanceStatusEnum.CANCEL.getStatus())) {
+ // 椹冲洖/鍙栨秷锛氶��鍥炶崏绋匡紝鍏佽淇敼鍚庨噸鏂版彁浜�
+ salesNoticeMapper.updateById(new MesWmSalesNoticeDO().setId(id).setStatus(PREPARE.getStatus()));
+ } else {
+ log.warn("[updateSalesNoticeAuditStatus][鍙戣揣鍗�({}) 鏀跺埌鏈煡瀹℃壒缁撴灉({})锛屽拷鐣", id, bpmResult);
+ }
+ }
+
+ @Override
+ public List<Map<String, Object>> getSalesNoticeApproveProcessDefinitionList() {
+ validateSalesNoticeApproveCategoryAndProcessDefinition();
+ List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(SALES_DELIVERY_APPROVE_CATEGORY_CODE);
+ Set<String> processDefinitionIds = cn.iocoder.yudao.framework.common.util.collection.CollectionUtils
+ .convertSet(definitionInfoList, BpmProcessDefinitionInfoDO::getProcessDefinitionId);
+ List<ProcessDefinition> processDefinitions = bpmProcessDefinitionService.getProcessDefinitionList(processDefinitionIds);
+ Map<String, ProcessDefinition> latestVersionMap = new HashMap<>();
+ for (ProcessDefinition pd : processDefinitions) {
+ if (pd.isSuspended()) {
+ continue;
+ }
+ ProcessDefinition existing = latestVersionMap.get(pd.getKey());
+ if (existing == null || pd.getVersion() > existing.getVersion()) {
+ latestVersionMap.put(pd.getKey(), pd);
+ }
+ }
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (ProcessDefinition pd : latestVersionMap.values()) {
+ Map<String, Object> item = new HashMap<>();
+ item.put("id", pd.getId());
+ item.put("key", pd.getKey());
+ item.put("name", pd.getName());
+ item.put("version", pd.getVersion());
+ result.add(item);
+ }
+ return result;
+ }
+
+ private void reserveSaleOrderOutStatus(MesWmSalesNoticeDO notice) {
if (notice.getSaleOrderId() != null) {
saleOrderApi.updateOrderOutStatusTo(notice.getSaleOrderId(),
ErpSaleOrderOutStatusEnum.RESERVED.getStatus());
}
}
+ private void validateSalesNoticeApproveCategoryAndProcessDefinition() {
+ List<String> codes = Collections.singletonList(SALES_DELIVERY_APPROVE_CATEGORY_CODE);
+ Map<String, ?> categoryMap = bpmCategoryService.getCategoryMap(codes);
+ if (!categoryMap.containsKey(SALES_DELIVERY_APPROVE_CATEGORY_CODE)) {
+ throw exception(WM_SALES_NOTICE_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+ List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(SALES_DELIVERY_APPROVE_CATEGORY_CODE);
+ if (CollUtil.isEmpty(definitionInfoList)) {
+ throw exception(WM_SALES_NOTICE_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+ Set<String> processDefinitionIds = cn.iocoder.yudao.framework.common.util.collection.CollectionUtils
+ .convertSet(definitionInfoList, BpmProcessDefinitionInfoDO::getProcessDefinitionId);
+ List<ProcessDefinition> processDefinitions = bpmProcessDefinitionService.getProcessDefinitionList(processDefinitionIds);
+ if (processDefinitions.stream().noneMatch(pd -> !pd.isSuspended())) {
+ throw exception(WM_SALES_NOTICE_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+ }
+
@Override
public List<MesWmSalesNoticeDO> getSalesNoticeList(Collection<Long> ids) {
if (CollUtil.isEmpty(ids)) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/listener/MesWmSalesNoticeStatusListener.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/listener/MesWmSalesNoticeStatusListener.java
new file mode 100644
index 0000000..0a0195a
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/listener/MesWmSalesNoticeStatusListener.java
@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.module.mes.service.wm.salesnotice.listener;
+
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.salesnotice.MesWmSalesNoticeDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.salesnotice.MesWmSalesNoticeMapper;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmSalesNoticeStatusEnum;
+import cn.iocoder.yudao.module.mes.service.wm.salesnotice.MesWmSalesNoticeService;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+
+/**
+ * 鍙戣揣鍗曞鎵圭粨鏋滅洃鍚櫒锛氶�氳繃 businessKey锛堝彂璐у崟 ID锛夊尮閰嶏紝鏀寔銆屽彂璐у鎵广�嶅垎绫讳笅浠绘剰娴佺▼妯″瀷銆�
+ */
+@Component
+@Slf4j
+public class MesWmSalesNoticeStatusListener implements ApplicationListener<BpmProcessInstanceStatusEvent> {
+
+ @Resource
+ private MesWmSalesNoticeService salesNoticeService;
+ @Resource
+ private MesWmSalesNoticeMapper salesNoticeMapper;
+
+ @Override
+ public void onApplicationEvent(BpmProcessInstanceStatusEvent event) {
+ Long noticeId;
+ try {
+ noticeId = Long.parseLong(event.getBusinessKey());
+ } catch (NumberFormatException e) {
+ return;
+ }
+ MesWmSalesNoticeDO notice = salesNoticeMapper.selectById(noticeId);
+ if (notice == null
+ || !MesWmSalesNoticeStatusEnum.APPROVING.getStatus().equals(notice.getStatus())) {
+ return; // 涓嶆槸瀹℃壒涓殑鍙戣揣鍗曪紝蹇界暐
+ }
+ log.info("[onApplicationEvent] 鍙戣揣鍗�({}) 瀹℃壒鐘舵�佹洿鏂�: {}", noticeId, event.getStatus());
+ salesNoticeService.updateSalesNoticeAuditStatus(noticeId, event.getStatus());
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskLineService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskLineService.java
index 4e87db0..26d8dc7 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskLineService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskLineService.java
@@ -88,15 +88,22 @@
*/
Long createStockTakingTaskLine(MesWmStockTakingTaskResultSaveReqVO createReqVO);
+ /** 鍒犻櫎鎾ら攢缁撴灉鍚庣暀涓嬬殑娓呭崟澶栫洏鐩堣锛屼究浜庢寜姝g‘鎵规閲嶆柊褰曞叆銆� */
+ void deleteAutoGeneratedLine(Long lineId);
+
/**
- * 鏍规嵁 taskId + itemId + areaId 鏌ヨ鐩樼偣浠诲姟琛�
+ * 鏍规嵁鐩樼偣浠诲姟鍜屽簱瀛樼淮搴︽煡璇㈢洏鐐逛换鍔¤銆�
*
* @param taskId 鐩樼偣浠诲姟缂栧彿
* @param itemId 鐗╂枡缂栧彿
+ * @param warehouseId 浠撳簱缂栧彿
+ * @param locationId 搴撳尯缂栧彿
* @param areaId 搴撲綅缂栧彿
+ * @param batchId 鎵规缂栧彿
* @return 鐩樼偣浠诲姟琛�
*/
- MesWmStockTakingTaskLineDO getStockTakingTaskLine(Long taskId, Long itemId, Long areaId);
+ MesWmStockTakingTaskLineDO getStockTakingTaskLine(Long taskId, Long itemId, Long warehouseId,
+ Long locationId, Long areaId, Long batchId);
/**
* 鏍¢獙鐩樼偣浠诲姟琛屽瓨鍦�
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskLineServiceImpl.java
index 5f68604..22e8c6a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskLineServiceImpl.java
@@ -30,6 +30,7 @@
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_STOCK_TAKING_TASK_LINE_NOT_EXISTS;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_STOCK_TAKING_TASK_LINE_TASK_MISMATCH;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_STOCK_TAKING_TASK_NO_STOCK;
/**
@@ -104,11 +105,15 @@
public void updateStockTakingTaskLine(MesWmStockTakingTaskLineSaveReqVO updateReqVO) {
// 1.1 鏍¢獙鐩樼偣浠诲姟琛屽瓨鍦�
MesWmStockTakingTaskLineDO line = validateStockTakingTaskLineExists(updateReqVO.getId());
+ if (!Objects.equals(line.getTaskId(), updateReqVO.getTaskId())) {
+ throw exception(WM_STOCK_TAKING_TASK_LINE_TASK_MISMATCH);
+ }
// 1.2 鏍¢獙鐩樼偣浠诲姟瀛樺湪锛屽苟涓斿浜庛�愬噯澶囦腑銆戠姸鎬�
- stockTakingTaskService.validateStockTakingTaskExistsAndPrepare(updateReqVO.getTaskId());
+ stockTakingTaskService.validateStockTakingTaskExistsAndPrepare(line.getTaskId());
// 2. 鏇存柊鐩樼偣浠诲姟琛�
MesWmStockTakingTaskLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmStockTakingTaskLineDO.class);
+ updateObj.setTaskId(line.getTaskId());
stockTakingTaskLineMapper.updateById(updateObj);
}
@@ -171,8 +176,10 @@
}
@Override
- public MesWmStockTakingTaskLineDO getStockTakingTaskLine(Long taskId, Long itemId, Long areaId) {
- return stockTakingTaskLineMapper.selectByTaskIdAndItemIdAndAreaId(taskId, itemId, areaId);
+ public MesWmStockTakingTaskLineDO getStockTakingTaskLine(Long taskId, Long itemId, Long warehouseId,
+ Long locationId, Long areaId, Long batchId) {
+ return stockTakingTaskLineMapper.selectByStockDimensions(taskId, itemId, warehouseId,
+ locationId, areaId, batchId);
}
@Override
@@ -189,6 +196,7 @@
public Long createStockTakingTaskLine(MesWmStockTakingTaskResultSaveReqVO createReqVO) {
MesWmStockTakingTaskLineDO line = new MesWmStockTakingTaskLineDO()
.setTaskId(createReqVO.getTaskId()).setItemId(createReqVO.getItemId()).setBatchId(createReqVO.getBatchId())
+ .setBatchCode(createReqVO.getBatchCode())
.setWarehouseId(createReqVO.getWarehouseId()).setLocationId(createReqVO.getLocationId()).setAreaId(createReqVO.getAreaId())
.setQuantity(BigDecimal.ZERO) // 璐﹂潰鏁伴噺榛樿涓� 0
.setTakingQuantity(createReqVO.getTakingQuantity()) // 鐩樼偣鏁伴噺
@@ -197,6 +205,15 @@
return line.getId();
}
+ @Override
+ public void deleteAutoGeneratedLine(Long lineId) {
+ MesWmStockTakingTaskLineDO line = validateStockTakingTaskLineExists(lineId);
+ if (line.getMaterialStockId() == null && line.getQuantity() != null
+ && line.getQuantity().compareTo(BigDecimal.ZERO) == 0) {
+ stockTakingTaskLineMapper.deleteById(lineId);
+ }
+ }
+
/**
* 璁$畻鐩樼偣浠诲姟琛岀姸鎬�
*
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskResultServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskResultServiceImpl.java
index f7c8664..aad2c63 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskResultServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskResultServiceImpl.java
@@ -1,13 +1,17 @@
package cn.iocoder.yudao.module.mes.service.wm.stocktaking.task;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
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.stocktaking.task.vo.result.MesWmStockTakingTaskResultPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.result.MesWmStockTakingTaskResultSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task.MesWmStockTakingTaskLineDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task.MesWmStockTakingTaskResultDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.stocktaking.task.MesWmStockTakingTaskResultMapper;
+import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
+import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -15,10 +19,14 @@
import java.math.BigDecimal;
import java.util.List;
+import java.util.Objects;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_STOCK_TAKING_TASK_LINE_ALREADY_TAKEN;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_STOCK_TAKING_TASK_RESULT_NOT_EXISTS;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_STOCK_TAKING_TASK_RESULT_LINE_INVALID;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_STOCK_TAKING_TASK_RESULT_DUPLICATE;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_TRANSACTION_BATCH_NOT_EXISTS;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_TRANSACTION_BATCH_REQUIRED;
/**
* MES 鐩樼偣缁撴灉 Service 瀹炵幇绫�
@@ -36,6 +44,10 @@
private MesWmStockTakingTaskLineService stockTakingTaskLineService;
@Resource
private MesWmStockTakingTaskService stockTakingTaskService;
+ @Resource
+ private MesWmBatchService batchService;
+ @Resource
+ private MesMdmItemService mdmItemService;
@Override
public PageResult<MesWmStockTakingTaskResultDO> getStockTakingTaskResultPage(
@@ -58,10 +70,17 @@
Long lineId = createReqVO.getLineId();
MesWmStockTakingTaskLineDO existingLine = null;
if (lineId == null) {
+ resolveBatch(createReqVO);
// 2.1 鍩轰簬 taskId + itemId + areaId 鏌ヨ宸插瓨鍦ㄧ殑 line
existingLine = stockTakingTaskLineService.getStockTakingTaskLine(
- createReqVO.getTaskId(), createReqVO.getItemId(), createReqVO.getAreaId());
+ createReqVO.getTaskId(), createReqVO.getItemId(), createReqVO.getWarehouseId(),
+ createReqVO.getLocationId(), createReqVO.getAreaId(), createReqVO.getBatchId());
if (existingLine != null) {
+ if ((createReqVO.getBatchId() != null && !Objects.equals(existingLine.getBatchId(), createReqVO.getBatchId()))
+ || (StrUtil.isNotBlank(createReqVO.getBatchCode())
+ && !Objects.equals(existingLine.getBatchCode(), createReqVO.getBatchCode()))) {
+ throw exception(WM_STOCK_TAKING_TASK_RESULT_LINE_INVALID);
+ }
lineId = existingLine.getId();
} else {
// 2.2 鍒涘缓鏂扮殑 line锛堟敞鎰忥細褰撶洏鐐圭粨鏋滄病鏈夊搴旂殑鐩樼偣娓呭崟琛屾椂锛屼細鑷姩鍒涘缓涓�涓柊鐨勭洏鐐逛换鍔¤锛�
@@ -71,16 +90,26 @@
// 2.3 濡傛灉浼犻�掍簡 lineId锛屼粠 line 涓幏鍙� quantity
existingLine = stockTakingTaskLineService.validateStockTakingTaskLineExists(lineId);
}
- if (existingLine != null
- && existingLine.getTakingQuantity() != null
- && existingLine.getTakingQuantity().compareTo(BigDecimal.ZERO) > 0) {
- throw exception(WM_STOCK_TAKING_TASK_LINE_ALREADY_TAKEN);
+ if (existingLine == null) {
+ existingLine = stockTakingTaskLineService.validateStockTakingTaskLineExists(lineId);
}
- BigDecimal quantity = existingLine != null ? existingLine.getQuantity() : BigDecimal.ZERO; // 璐﹂潰鏁伴噺
+ if (!ObjUtil.equal(existingLine.getTaskId(), createReqVO.getTaskId())
+ || createReqVO.getTakingQuantity() == null || createReqVO.getTakingQuantity().signum() < 0) {
+ throw exception(WM_STOCK_TAKING_TASK_RESULT_LINE_INVALID);
+ }
+ Long resolvedLineId = lineId;
+ if (stockTakingTaskResultMapper.selectListByTaskId(createReqVO.getTaskId()).stream()
+ .anyMatch(result -> ObjUtil.equal(result.getLineId(), resolvedLineId))) {
+ throw exception(WM_STOCK_TAKING_TASK_RESULT_DUPLICATE);
+ }
// 3. 鎻掑叆 result 璁板綍
MesWmStockTakingTaskResultDO result = BeanUtils.toBean(createReqVO, MesWmStockTakingTaskResultDO.class)
- .setLineId(lineId).setQuantity(ObjUtil.defaultIfNull(quantity, createReqVO.getTakingQuantity()));
+ .setLineId(lineId).setQuantity(existingLine.getQuantity())
+ .setMaterialStockId(existingLine.getMaterialStockId()).setItemId(existingLine.getItemId())
+ .setBatchId(existingLine.getBatchId()).setBatchCode(existingLine.getBatchCode())
+ .setWarehouseId(existingLine.getWarehouseId()).setLocationId(existingLine.getLocationId())
+ .setAreaId(existingLine.getAreaId());
stockTakingTaskResultMapper.insert(result);
// 4. 鏇存柊 line 鐨勭洏鐐规暟閲忓拰鐘舵��
@@ -91,14 +120,21 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void updateStockTakingTaskResult(MesWmStockTakingTaskResultSaveReqVO updateReqVO) {
- updateReqVO.setLineId(null); // lineId 涓嶈兘淇敼锛岄伩鍏嶈鎿嶄綔
// 1.1 鏍¢獙璁板綍瀛樺湪
MesWmStockTakingTaskResultDO oldResult = validateStockTakingTaskResultExists(updateReqVO.getId());
// 1.2 鏍¢獙浠诲姟澶勪簬鐩樼偣涓姸鎬�
stockTakingTaskService.validateStockTakingTaskExistsAndApproving(oldResult.getTaskId());
+ if (updateReqVO.getTakingQuantity() == null || updateReqVO.getTakingQuantity().signum() < 0) {
+ throw exception(WM_STOCK_TAKING_TASK_RESULT_LINE_INVALID);
+ }
// 2. 鏇存柊 result 璁板綍
MesWmStockTakingTaskResultDO result = BeanUtils.toBean(updateReqVO, MesWmStockTakingTaskResultDO.class);
+ result.setTaskId(oldResult.getTaskId()).setLineId(oldResult.getLineId())
+ .setMaterialStockId(oldResult.getMaterialStockId()).setItemId(oldResult.getItemId())
+ .setBatchId(oldResult.getBatchId()).setBatchCode(oldResult.getBatchCode())
+ .setWarehouseId(oldResult.getWarehouseId()).setLocationId(oldResult.getLocationId())
+ .setAreaId(oldResult.getAreaId()).setQuantity(oldResult.getQuantity());
stockTakingTaskResultMapper.updateById(result);
// 3. 鍏宠仈鏇存柊 line 鐨勭洏鐐规暟閲忥紙瑕嗙洊寮忔洿鏂帮級
@@ -119,7 +155,30 @@
// 3. 鏇存柊瀵瑰簲 line 鐨勭洏鐐规暟閲忓拰鐘舵��
stockTakingTaskLineService.updateStockTakingTaskLineTakingQuantity(
- result.getLineId(), result.getTakingQuantity().negate());
+ result.getLineId(), BigDecimal.ZERO);
+ stockTakingTaskLineService.deleteAutoGeneratedLine(result.getLineId());
+ }
+
+ private void resolveBatch(MesWmStockTakingTaskResultSaveReqVO reqVO) {
+ MesWmBatchDO batch = null;
+ if (reqVO.getBatchId() != null) {
+ batch = batchService.getBatch(reqVO.getBatchId());
+ } else if (StrUtil.isNotBlank(reqVO.getBatchCode())) {
+ batch = batchService.getBatchByCode(reqVO.getBatchCode());
+ }
+ if (batch != null) {
+ if (!Objects.equals(batch.getItemId(), reqVO.getItemId())
+ || (StrUtil.isNotBlank(reqVO.getBatchCode())
+ && !Objects.equals(batch.getCode(), reqVO.getBatchCode()))) {
+ throw exception(WM_STOCK_TAKING_TASK_RESULT_LINE_INVALID);
+ }
+ reqVO.setBatchId(batch.getId());
+ reqVO.setBatchCode(batch.getCode());
+ } else if (reqVO.getBatchId() != null || StrUtil.isNotBlank(reqVO.getBatchCode())) {
+ throw exception(WM_TRANSACTION_BATCH_NOT_EXISTS);
+ } else if (Boolean.TRUE.equals(mdmItemService.validateItemExists(reqVO.getItemId()).getIsBatchManaged())) {
+ throw exception(WM_TRANSACTION_BATCH_REQUIRED);
+ }
}
@Override
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskServiceImpl.java
index a192e7a..e3f59e5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskServiceImpl.java
@@ -26,6 +26,11 @@
import java.math.BigDecimal;
import java.util.List;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
@@ -137,7 +142,7 @@
// 3. 鏍规嵁鍐荤粨鏍囪瘑锛屽鐗╄祫杩涜鍐荤粨
if (Boolean.TRUE.equals(task.getFrozen())) {
- updateMaterialStockFrozen(lines, true);
+ updateMaterialStockFrozen(id, lines, true);
}
}
@@ -146,6 +151,7 @@
public void finishStockTakingTask(Long id) {
// 1. 鏍¢獙浠诲姟瀛樺湪涓斾负瀹℃壒涓姸鎬�
MesWmStockTakingTaskDO task = validateStockTakingTaskExistsAndApproving(id);
+ validateAllLinesCounted(id);
// 2. 鏇存柊浠诲姟鐘舵�佷负宸插畬鎴�
stockTakingTaskMapper.updateById(new MesWmStockTakingTaskDO().setId(id)
@@ -154,7 +160,41 @@
// 3. 瑙e喕搴撳瓨
if (Boolean.TRUE.equals(task.getFrozen())) {
List<MesWmStockTakingTaskLineDO> lines = stockTakingTaskLineService.getStockTakingTaskLineListByTaskId(id);
- updateMaterialStockFrozen(lines, false);
+ updateMaterialStockFrozen(id, lines, false);
+ }
+ // 涓庡畬鎴愮姸鎬併�佽В鍐诲叡鐢ㄤ簨鍔★紱宸紓鍏ヨ处澶辫触鏃舵暣鍗曞洖婊氥��
+ processStockTakingDifference(id);
+ }
+
+ private void validateAllLinesCounted(Long taskId) {
+ List<MesWmStockTakingTaskLineDO> lines = stockTakingTaskLineService.getStockTakingTaskLineListByTaskId(taskId);
+ if (CollUtil.isEmpty(lines)) {
+ throw exception(WM_STOCK_TAKING_TASK_NO_LINE);
+ }
+ List<MesWmStockTakingTaskResultDO> results = stockTakingTaskResultService.getStockTakingTaskResultListByTaskId(taskId);
+ Map<Long, MesWmStockTakingTaskLineDO> lineMap = new HashMap<>();
+ lines.forEach(line -> lineMap.put(line.getId(), line));
+ Set<Long> counted = new HashSet<>();
+ for (MesWmStockTakingTaskResultDO result : results) {
+ MesWmStockTakingTaskLineDO line = lineMap.get(result.getLineId());
+ if (line == null || !ObjUtil.equal(result.getTaskId(), taskId)
+ || !ObjUtil.equal(result.getMaterialStockId(), line.getMaterialStockId())
+ || !ObjUtil.equal(result.getItemId(), line.getItemId())
+ || !ObjUtil.equal(result.getBatchId(), line.getBatchId())
+ || !ObjUtil.equal(result.getWarehouseId(), line.getWarehouseId())
+ || !ObjUtil.equal(result.getLocationId(), line.getLocationId())
+ || !ObjUtil.equal(result.getAreaId(), line.getAreaId())
+ || !ObjUtil.equal(result.getQuantity(), line.getQuantity())
+ || result.getTakingQuantity() == null || result.getTakingQuantity().signum() < 0
+ || !counted.add(result.getLineId())) {
+ throw exception(WM_STOCK_TAKING_TASK_RESULT_LINE_INVALID);
+ }
+ }
+ List<Long> missing = new ArrayList<>();
+ lines.stream().map(MesWmStockTakingTaskLineDO::getId)
+ .filter(lineId -> !counted.contains(lineId)).forEach(missing::add);
+ if (!missing.isEmpty()) {
+ throw exception(WM_STOCK_TAKING_TASK_INCOMPLETE, missing);
}
}
@@ -169,7 +209,7 @@
task.setStatus(MesWmStockTakingTaskStatusEnum.CANCELED.getStatus());
stockTakingTaskMapper.updateById(task);
if (Boolean.TRUE.equals(task.getFrozen())) {
- updateMaterialStockFrozen(stockTakingTaskLineService.getStockTakingTaskLineListByTaskId(id), false);
+ updateMaterialStockFrozen(id, stockTakingTaskLineService.getStockTakingTaskLineListByTaskId(id), false);
}
}
@@ -210,13 +250,13 @@
return stockTakingTaskMapper.selectPage(pageReqVO);
}
- private void updateMaterialStockFrozen(List<MesWmStockTakingTaskLineDO> lines, boolean frozen) {
+ private void updateMaterialStockFrozen(Long taskId, List<MesWmStockTakingTaskLineDO> lines, boolean frozen) {
if (CollUtil.isEmpty(lines)) {
return;
}
List<Long> materialStockIds = convertList(lines,
MesWmStockTakingTaskLineDO::getMaterialStockId, line -> line.getMaterialStockId() != null);
- materialStockService.updateMaterialStockFrozen(materialStockIds, frozen);
+ materialStockService.setMaterialStockFreeze(materialStockIds, "STOCK_TAKING", taskId, frozen);
}
private void validateStockTakingTaskCodeUnique(Long id, String code) {
@@ -236,6 +276,10 @@
MesWmStockTakingTaskDO task = validateStockTakingTaskExists(id);
if (!MesWmStockTakingTaskStatusEnum.FINISHED.getStatus().equals(task.getStatus())) {
throw exception(WM_STOCK_TAKING_TASK_NOT_FINISHED);
+ }
+ // 鍘熷瓙璁ら锛涢噸澶嶈皟鐢ㄤ笉浼氶噸澶嶇敓鎴愮洏鐩�/鐩樹簭娴佹按銆�
+ if (stockTakingTaskMapper.claimDifferenceProcessing(id) == 0) {
+ return;
}
// 2. 鑾峰彇鐩樼偣缁撴灉鍒楄〃
@@ -268,6 +312,7 @@
.setWarehouseId(result.getWarehouseId())
.setLocationId(result.getLocationId())
.setAreaId(result.getAreaId())
+ .setMaterialStockId(result.getMaterialStockId())
.setBizId(task.getId())
.setBizCode(task.getCode())
.setBizLineId(result.getLineId());
@@ -280,7 +325,7 @@
} else {
// 鐩樹簭锛氬簱瀛樺噺灏�
transaction.setType(MesWmTransactionTypeEnum.OUT.getType())
- .setQuantity(difference.negate()) // 鍑哄簱鏁伴噺浼犳鏁帮紝浣嗗唴閮ㄤ細杞负璐熸暟
+ .setQuantity(difference) // 鐩樹簭涓鸿礋鏁帮紝绗﹀悎鍑哄簱浜嬪姟鏂瑰悜
.setBizType(MesBizTypeConstants.WM_STOCK_TAKING);
}
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 9672e2e..eadb221 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
@@ -144,6 +144,7 @@
.itemId(reqDTO.getItemId()).batchId(reqDTO.getBatchId()).batchCode(reqDTO.getBatchCode())
.warehouseId(reqDTO.getWarehouseId()).locationId(reqDTO.getLocationId()).areaId(reqDTO.getAreaId())
.bizType(reqDTO.getBizType()).bizId(reqDTO.getBizId()).bizCode(reqDTO.getBizCode()).bizLineId(reqDTO.getBizLineId())
+ .workOrderId(reqDTO.getWorkOrderId())
.materialStockId(materialStock.getId()).relatedTransactionId(reqDTO.getRelatedTransactionId())
.build();
transactionMapper.insert(transaction);
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 62e95c8..c001cd0 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
@@ -48,6 +48,12 @@
*/
@NotNull(message = "涓氬姟琛� ID 涓嶈兘涓虹┖")
private Long bizLineId;
+ /**
+ * 鐢熶骇璁㈠崟锛堝伐鍗曪級ID
+ *
+ * 鐢熶骇鐩稿叧鐨勫嚭鍏ュ簱娴佹按浼犲叆锛岀敤浜庡嚭搴撳彴璐﹀睍绀虹敓浜ц鍗曞彿
+ */
+ private Long workOrderId;
// ===== 鐗╂枡缁村害 =====
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferServiceImpl.java
index 6dc6d6a..750e498 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferServiceImpl.java
@@ -220,11 +220,12 @@
.setBizType(MesBizTypeConstants.WM_TRANSFER_OUT).setBizId(transfer.getId())
.setBizCode(transfer.getCode()).setBizLineId(line.getId()));
// 2.2 鍐嶆墽琛屽叆搴擄細璋冩嫧绉诲叆锛堝悜鐩爣浠撳簱澧炲姞搴撳瓨锛夛紝鍏ュ簱鏁伴噺绛変簬鐩稿悓鏄庣粏鐨勬暟閲�
- // 娉ㄦ剰锛氬叆搴撴椂涓嶄紶 vendorId锛屼互蹇界暐渚涘簲鍟嗙淮搴︼紝鍚堝苟鍒扮洰鏍囧簱浣嶅凡鏈夊簱瀛�
+ // 璋冨叆娌跨敤鏉ユ簮搴撳瓨鐨勪緵搴斿晢锛岄伩鍏嶄笌鐩爣搴撲綅鍏跺畠渚涘簲鍟嗙殑鍚岀墿鏂欏簱瀛樻贩鍚堛��
wmTransactionService.createTransaction(new MesWmTransactionSaveReqDTO()
.setType(MesWmTransactionTypeEnum.MOVE_IN.getType()).setItemId(line.getItemId()) // 鐗╂枡淇℃伅鏉ヨ嚜 line
.setQuantity(detail.getQuantity()) // 搴撳瓨澧炲姞锛堟寜 detail 鐨勬暟閲忓叆锛�
.setBatchId(line.getBatchId()).setBatchCode(batchCode) // 鎵规淇℃伅鏉ヨ嚜 line
+ .setVendorId(vendorId)
.setWarehouseId(detail.getToWarehouseId()).setLocationId(detail.getToLocationId()).setAreaId(detail.getToAreaId())
.setBizType(MesBizTypeConstants.WM_TRANSFER_IN).setBizId(transfer.getId())
.setBizCode(transfer.getCode()).setBizLineId(line.getId())
@@ -341,7 +342,7 @@
}
List<Long> materialStockIds = convertList(lines,
MesWmTransferLineDO::getMaterialStockId, line -> line.getMaterialStockId() != null);
- materialStockService.updateMaterialStockFrozen(materialStockIds, frozen);
+ materialStockService.setMaterialStockFreeze(materialStockIds, "TRANSFER", transferId, frozen);
}
@Override
diff --git a/yudao-module-mes/src/main/resources/mapper/qc/statistics/MesQcStatisticsMapper.xml b/yudao-module-mes/src/main/resources/mapper/qc/statistics/MesQcStatisticsMapper.xml
new file mode 100644
index 0000000..471b72a
--- /dev/null
+++ b/yudao-module-mes/src/main/resources/mapper/qc/statistics/MesQcStatisticsMapper.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.mes.dal.mysql.qc.statistics.MesQcStatisticsMapper">
+
+ <!--
+ 璐ㄩ噺缁熻鍙e緞锛�
+ 1. 浠呯粺璁″凡瀹屾垚锛坰tatus = 4锛変笖鏈垹闄わ紙deleted = 0锛夌殑妫�楠屽崟锛�
+ 2. 鏃堕棿鑼冨洿鎸夋娴嬫棩鏈� inspect_date 杩囨护锛宐eginTime / endTime 鍧囧彲涓虹┖锛�
+ 3. 鍚勭被鍨嬪浐瀹氳緭鍑� IQC / IPQC / OQC / RQC锛屾棤鏁版嵁鏃� COUNT/SUM 杩斿洖 0銆�
+ -->
+
+ <!-- 鎸夋楠岀被鍨嬬粺璁★紙鍥涚被妫�楠屽崟 UNION ALL锛� -->
+ <select id="selectTypeStatistics" resultType="cn.iocoder.yudao.module.mes.controller.admin.qc.statistics.vo.MesQcStatisticsTypeVO">
+ SELECT 'IQC' AS qcType,
+ COUNT(*) AS qcCount,
+ IFNULL(SUM(check_quantity), 0) AS checkQuantity,
+ IFNULL(SUM(qualified_quantity), 0) AS qualifiedQuantity,
+ IFNULL(SUM(unqualified_quantity), 0) AS unqualifiedQuantity
+ FROM mes_qc_iqc
+ WHERE deleted = 0
+ AND status = 4
+ <if test="beginTime != null">
+ AND inspect_date >= #{beginTime}
+ </if>
+ <if test="endTime != null">
+ AND inspect_date <= #{endTime}
+ </if>
+ UNION ALL
+ SELECT 'IPQC' AS qcType,
+ COUNT(*) AS qcCount,
+ IFNULL(SUM(check_quantity), 0) AS checkQuantity,
+ IFNULL(SUM(qualified_quantity), 0) AS qualifiedQuantity,
+ IFNULL(SUM(unqualified_quantity), 0) AS unqualifiedQuantity
+ FROM mes_qc_ipqc
+ WHERE deleted = 0
+ AND status = 4
+ <if test="beginTime != null">
+ AND inspect_date >= #{beginTime}
+ </if>
+ <if test="endTime != null">
+ AND inspect_date <= #{endTime}
+ </if>
+ UNION ALL
+ SELECT 'OQC' AS qcType,
+ COUNT(*) AS qcCount,
+ IFNULL(SUM(check_quantity), 0) AS checkQuantity,
+ IFNULL(SUM(qualified_quantity), 0) AS qualifiedQuantity,
+ IFNULL(SUM(unqualified_quantity), 0) AS unqualifiedQuantity
+ FROM mes_qc_oqc
+ WHERE deleted = 0
+ AND status = 4
+ <if test="beginTime != null">
+ AND inspect_date >= #{beginTime}
+ </if>
+ <if test="endTime != null">
+ AND inspect_date <= #{endTime}
+ </if>
+ UNION ALL
+ SELECT 'RQC' AS qcType,
+ COUNT(*) AS qcCount,
+ IFNULL(SUM(check_quantity), 0) AS checkQuantity,
+ IFNULL(SUM(qualified_quantity), 0) AS qualifiedQuantity,
+ IFNULL(SUM(unqualified_quantity), 0) AS unqualifiedQuantity
+ FROM mes_qc_rqc
+ WHERE deleted = 0
+ AND status = 4
+ <if test="beginTime != null">
+ AND inspect_date >= #{beginTime}
+ </if>
+ <if test="endTime != null">
+ AND inspect_date <= #{endTime}
+ </if>
+ </select>
+
+ <!-- 鎸夊伐搴忕粺璁★紙浠� IPQC锛屽彧鏈� IPQC 琛ㄦ湁 process_id锛� -->
+ <select id="selectStatisticsByProcess" resultType="cn.iocoder.yudao.module.mes.controller.admin.qc.statistics.vo.MesQcStatisticsByProcessVO">
+ SELECT i.process_id AS processId,
+ IFNULL(p.name, '鏈寚瀹氬伐搴�') AS processName,
+ IFNULL(SUM(i.check_quantity), 0) AS checkQuantity,
+ IFNULL(SUM(i.qualified_quantity), 0) AS qualifiedQuantity,
+ IFNULL(SUM(i.unqualified_quantity), 0) AS unqualifiedQuantity
+ FROM mes_qc_ipqc i
+ LEFT JOIN mes_pro_process p ON p.id = i.process_id AND p.deleted = 0
+ WHERE i.deleted = 0
+ AND i.status = 4
+ <if test="beginTime != null">
+ AND i.inspect_date >= #{beginTime}
+ </if>
+ <if test="endTime != null">
+ AND i.inspect_date <= #{endTime}
+ </if>
+ GROUP BY i.process_id, p.name
+ ORDER BY checkQuantity DESC, processName ASC
+ </select>
+
+ <!-- 鎸夌敓浜у伐鍗曠粺璁★紙浠� IPQC锛屽彧鏈� IPQC 琛ㄦ湁 work_order_id锛� -->
+ <select id="selectStatisticsByWorkOrder" resultType="cn.iocoder.yudao.module.mes.controller.admin.qc.statistics.vo.MesQcStatisticsByWorkOrderVO">
+ SELECT i.work_order_id AS workOrderId,
+ IFNULL(w.code, '鏈寚瀹氬伐鍗�') AS workOrderCode,
+ IFNULL(item.name, IFNULL(w.name, '鏈寚瀹氫骇鍝�')) AS productName,
+ IFNULL(SUM(i.check_quantity), 0) AS checkQuantity,
+ IFNULL(SUM(i.qualified_quantity), 0) AS qualifiedQuantity,
+ IFNULL(SUM(i.unqualified_quantity), 0) AS unqualifiedQuantity
+ FROM mes_qc_ipqc i
+ LEFT JOIN mes_pro_work_order w ON w.id = i.work_order_id AND w.deleted = 0
+ LEFT JOIN mes_md_item item ON item.id = w.product_id AND item.deleted = 0
+ WHERE i.deleted = 0
+ AND i.status = 4
+ <if test="beginTime != null">
+ AND i.inspect_date >= #{beginTime}
+ </if>
+ <if test="endTime != null">
+ AND i.inspect_date <= #{endTime}
+ </if>
+ GROUP BY i.work_order_id, w.code, w.name, item.name
+ ORDER BY checkQuantity DESC, workOrderCode ASC
+ </select>
+
+</mapper>
diff --git a/yudao-module-mes/src/main/resources/templates/pd/project-tracking.docx b/yudao-module-mes/src/main/resources/templates/pd/project-tracking.docx
new file mode 100644
index 0000000..9dcabf5
--- /dev/null
+++ b/yudao-module-mes/src/main/resources/templates/pd/project-tracking.docx
Binary files differ
diff --git a/yudao-module-mes/src/main/resources/templates/wm/product-outbound.docx b/yudao-module-mes/src/main/resources/templates/wm/product-outbound.docx
new file mode 100644
index 0000000..02820ac
--- /dev/null
+++ b/yudao-module-mes/src/main/resources/templates/wm/product-outbound.docx
Binary files differ
diff --git a/yudao-module-mes/src/main/resources/templates/wm/sales-delivery.docx b/yudao-module-mes/src/main/resources/templates/wm/sales-delivery.docx
new file mode 100644
index 0000000..3f905e5
--- /dev/null
+++ b/yudao-module-mes/src/main/resources/templates/wm/sales-delivery.docx
Binary files differ
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanServiceImplTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanServiceImplTest.java
deleted file mode 100644
index 331bb11..0000000
--- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanServiceImplTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package cn.iocoder.yudao.module.mes.service.cal.plan;
-
-import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.MesCalPlanSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanDO;
-import cn.iocoder.yudao.module.mes.dal.mysql.cal.plan.MesCalPlanMapper;
-import cn.iocoder.yudao.module.mes.enums.cal.MesCalPlanStatusEnum;
-import cn.iocoder.yudao.module.mes.enums.cal.MesCalShiftMethodEnum;
-import cn.iocoder.yudao.module.mes.enums.cal.MesCalShiftTypeEnum;
-import cn.iocoder.yudao.module.mes.service.cal.team.MesCalTeamShiftService;
-import org.junit.jupiter.api.Test;
-import org.springframework.context.annotation.Import;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-
-import jakarta.annotation.Resource;
-
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-/**
- * {@link MesCalPlanServiceImpl} 鐨勫崟鍏冩祴璇�
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@Import(MesCalPlanServiceImpl.class)
-public class MesCalPlanServiceImplTest extends BaseDbUnitTest {
-
- @Resource
- private MesCalPlanServiceImpl planService;
-
- @Resource
- private MesCalPlanMapper planMapper;
-
- @MockitoBean
- private MesCalPlanShiftService planShiftService;
- @MockitoBean
- private MesCalPlanTeamService planTeamService;
- @MockitoBean
- private MesCalTeamShiftService teamShiftService;
-
- @Test
- public void testCreatePlan_singleShift_addDefaultShift() {
- // 鍑嗗鍙傛暟
- MesCalPlanSaveReqVO reqVO = new MesCalPlanSaveReqVO();
- reqVO.setCode("PLAN-SINGLE-001");
- reqVO.setName("鍗曠櫧鐝粯璁ょ彮娆�");
- reqVO.setCalendarType(1);
- reqVO.setStartDate(LocalDateTime.of(2026, 4, 1, 0, 0));
- reqVO.setEndDate(LocalDateTime.of(2026, 4, 30, 0, 0));
- reqVO.setShiftType(MesCalShiftTypeEnum.SINGLE.getType());
- reqVO.setShiftMethod(MesCalShiftMethodEnum.DAY.getMethod());
- reqVO.setShiftCount(1);
-
- // 璋冪敤
- Long planId = planService.createPlan(reqVO);
-
- // 鏂█ 1锛氳鍒掔姸鎬佷负鑽夌
- MesCalPlanDO plan = planMapper.selectById(planId);
- assertEquals(MesCalPlanStatusEnum.PREPARE.getStatus(), plan.getStatus());
- // 鏂█ 2锛氳嚜鍔ㄧ敓鎴愰粯璁ょ彮娆�
- verify(planShiftService).addDefaultPlanShift(planId, MesCalShiftTypeEnum.SINGLE.getType());
- }
-
- @Test
- public void testConfirmPlan_syncGenerateTeamShiftRecords() {
- // mock 鏁版嵁锛氭彃鍏ヤ竴鏉¤崏绋跨姸鎬佺殑鎺掔彮璁″垝
- MesCalPlanDO plan = randomPojo(MesCalPlanDO.class, o -> {
- o.setCalendarType(1);
- o.setStartDate(LocalDateTime.of(2026, 4, 1, 0, 0));
- o.setEndDate(LocalDateTime.of(2026, 4, 3, 0, 0));
- o.setStatus(MesCalPlanStatusEnum.PREPARE.getStatus());
- o.setShiftType(MesCalShiftTypeEnum.SINGLE.getType());
- o.setShiftMethod(MesCalShiftMethodEnum.DAY.getMethod());
- o.setShiftCount(1);
- });
- planMapper.insert(plan);
- // mock 鏂规硶锛氱彮缁勬暟閲忔弧瓒宠姹�
- when(planTeamService.getPlanTeamCountByPlanId(plan.getId())).thenReturn(1L);
-
- // 璋冪敤
- planService.confirmPlan(plan.getId());
-
- // 鏂█ 1锛氳鍒掔姸鎬佹洿鏂颁负宸茬‘璁�
- MesCalPlanDO updatePlan = planMapper.selectById(plan.getId());
- assertEquals(MesCalPlanStatusEnum.CONFIRMED.getStatus(), updatePlan.getStatus());
- // 鏂█ 2锛氳Е鍙戠敓鎴愮彮缁勬帓鐝褰�
- verify(teamShiftService).generateTeamShiftRecords(plan.getId());
- }
-
- @Test
- public void testDeletePlan_notCascadeDeleteTeamShift() {
- // mock 鏁版嵁锛氭彃鍏ヤ竴鏉¤崏绋跨姸鎬佺殑鎺掔彮璁″垝
- MesCalPlanDO plan = randomPojo(MesCalPlanDO.class, o -> {
- o.setCalendarType(1);
- o.setStartDate(LocalDateTime.of(2026, 4, 1, 0, 0));
- o.setEndDate(LocalDateTime.of(2026, 4, 3, 0, 0));
- o.setStatus(MesCalPlanStatusEnum.PREPARE.getStatus());
- o.setShiftType(MesCalShiftTypeEnum.SINGLE.getType());
- o.setShiftMethod(MesCalShiftMethodEnum.DAY.getMethod());
- o.setShiftCount(1);
- });
- planMapper.insert(plan);
-
- // 璋冪敤
- planService.deletePlan(plan.getId());
-
- // 鏂█ 1锛氳鍒掕鍒犻櫎
- assertNull(planMapper.selectById(plan.getId()));
- // 鏂█ 2锛氱骇鑱斿垹闄ょ彮娆″拰鐝粍鍏宠仈
- verify(planShiftService).deletePlanShiftByPlanId(plan.getId());
- verify(planTeamService).deleteByPlanId(plan.getId());
- // 鏂█ 3锛氫笉绾ц仈鍒犻櫎鐝粍鎺掔彮璁板綍
- verify(teamShiftService, never()).deleteByPlanId(plan.getId());
- }
-
-}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanShiftServiceImplTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanShiftServiceImplTest.java
deleted file mode 100644
index b7b106f..0000000
--- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanShiftServiceImplTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package cn.iocoder.yudao.module.mes.service.cal.plan;
-
-import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanShiftDO;
-import cn.iocoder.yudao.module.mes.dal.mysql.cal.plan.MesCalPlanShiftMapper;
-import cn.iocoder.yudao.module.mes.enums.cal.MesCalShiftTypeEnum;
-import org.junit.jupiter.api.Test;
-import org.springframework.context.annotation.Import;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-
-import jakarta.annotation.Resource;
-
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-/**
- * {@link MesCalPlanShiftServiceImpl} 鐨勫崟鍏冩祴璇�
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@Import(MesCalPlanShiftServiceImpl.class)
-public class MesCalPlanShiftServiceImplTest extends BaseDbUnitTest {
-
- @Resource
- private MesCalPlanShiftServiceImpl planShiftService;
-
- @Resource
- private MesCalPlanShiftMapper planShiftMapper;
-
- @MockitoBean
- private MesCalPlanService planService;
-
- @Test
- public void testAddDefaultPlanShift_singleShift_use18Clock() {
- // 鍑嗗鍙傛暟
- Long planId = 1001L;
-
- // 璋冪敤
- planShiftService.addDefaultPlanShift(planId, MesCalShiftTypeEnum.SINGLE.getType());
-
- // 鏂█锛氱敓鎴� 1 鏉¢粯璁ょ彮娆★紙鐧界彮 08:00~18:00锛�
- List<MesCalPlanShiftDO> shifts = planShiftMapper.selectListByPlanId(planId);
- assertEquals(1, shifts.size());
- MesCalPlanShiftDO shift = shifts.get(0);
- assertEquals(planId, shift.getPlanId());
- assertEquals(1, shift.getSort());
- assertEquals("鐧界彮", shift.getName());
- assertEquals("08:00", shift.getStartTime());
- assertEquals("18:00", shift.getEndTime());
- }
-
-}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamShiftServiceImplTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamShiftServiceImplTest.java
deleted file mode 100644
index 734d5aa..0000000
--- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamShiftServiceImplTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package cn.iocoder.yudao.module.mes.service.cal.team;
-
-import cn.hutool.core.collection.ListUtil;
-import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanShiftDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanTeamDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.cal.team.MesCalTeamShiftDO;
-import cn.iocoder.yudao.module.mes.dal.mysql.cal.team.MesCalTeamShiftMapper;
-import cn.iocoder.yudao.module.mes.enums.cal.MesCalShiftMethodEnum;
-import cn.iocoder.yudao.module.mes.enums.cal.MesCalShiftTypeEnum;
-import cn.iocoder.yudao.module.mes.service.cal.plan.MesCalPlanService;
-import cn.iocoder.yudao.module.mes.service.cal.plan.MesCalPlanShiftService;
-import cn.iocoder.yudao.module.mes.service.cal.plan.MesCalPlanTeamService;
-import org.junit.jupiter.api.Test;
-import org.springframework.context.annotation.Import;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-
-import jakarta.annotation.Resource;
-
-import java.time.LocalDateTime;
-import java.util.Comparator;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-/**
- * {@link MesCalTeamShiftServiceImpl} 鐨勫崟鍏冩祴璇�
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@Import(MesCalTeamShiftServiceImpl.class)
-public class MesCalTeamShiftServiceImplTest extends BaseDbUnitTest {
-
- @Resource
- private MesCalTeamShiftServiceImpl teamShiftService;
-
- @Resource
- private MesCalTeamShiftMapper teamShiftMapper;
-
- @MockitoBean
- private MesCalPlanService planService;
- @MockitoBean
- private MesCalPlanShiftService planShiftService;
- @MockitoBean
- private MesCalPlanTeamService planTeamService;
-
- @Test
- public void testGenerateTeamShiftRecords_threeShift_rotateThreeStates() {
- // 鍑嗗鍙傛暟
- Long planId = 3001L;
- // mock 鏂规硶锛氭帓鐝鍒掞紙涓夌彮鍊掋�佹寜澶╄疆鐝��3 澶╋級
- MesCalPlanDO plan = MesCalPlanDO.builder()
- .id(planId)
- .code("PLAN-THREE-001")
- .name("涓夌彮鍊掕疆杞�")
- .calendarType(1)
- .startDate(LocalDateTime.of(2026, 4, 1, 0, 0))
- .endDate(LocalDateTime.of(2026, 4, 3, 0, 0))
- .shiftType(MesCalShiftTypeEnum.THREE.getType())
- .shiftMethod(MesCalShiftMethodEnum.DAY.getMethod())
- .shiftCount(1)
- .build();
- List<MesCalPlanShiftDO> shifts = ListUtil.of(
- MesCalPlanShiftDO.builder().id(11L).planId(planId).sort(1).name("鐧界彮").startTime("08:00").endTime("16:00").build(),
- MesCalPlanShiftDO.builder().id(12L).planId(planId).sort(2).name("涓彮").startTime("16:00").endTime("00:00").build(),
- MesCalPlanShiftDO.builder().id(13L).planId(planId).sort(3).name("澶滅彮").startTime("00:00").endTime("08:00").build()
- );
- List<MesCalPlanTeamDO> teams = ListUtil.of(
- MesCalPlanTeamDO.builder().id(21L).planId(planId).teamId(101L).build(),
- MesCalPlanTeamDO.builder().id(22L).planId(planId).teamId(102L).build(),
- MesCalPlanTeamDO.builder().id(23L).planId(planId).teamId(103L).build()
- );
- when(planService.getPlan(planId)).thenReturn(plan);
- when(planShiftService.getPlanShiftListByPlanId(planId)).thenReturn(shifts);
- when(planTeamService.getPlanTeamListByPlanId(planId)).thenReturn(teams);
-
- // 璋冪敤
- teamShiftService.generateTeamShiftRecords(planId);
-
- // 鏂█锛�3 澶� 脳 3 鐝 = 9 鏉℃帓鐝褰曪紝鐝粍鎸夊ぉ杞浆
- List<MesCalTeamShiftDO> records = teamShiftMapper.selectListByPlanId(planId);
- records.sort(Comparator.comparing(MesCalTeamShiftDO::getDay).thenComparing(MesCalTeamShiftDO::getSort));
- assertEquals(9, records.size());
- // 鏂█锛氱 1 澶╋紙shiftIndex=0锛夛細A 鐧界彮銆丅 涓彮銆丆 澶滅彮
- assertRecord(records.get(0), LocalDateTime.of(2026, 4, 1, 0, 0), 1, 101L, 11L);
- assertRecord(records.get(1), LocalDateTime.of(2026, 4, 1, 0, 0), 2, 102L, 12L);
- assertRecord(records.get(2), LocalDateTime.of(2026, 4, 1, 0, 0), 3, 103L, 13L);
- // 鏂█锛氱 2 澶╋紙shiftIndex=1锛夛細C 鐧界彮銆丄 涓彮銆丅 澶滅彮
- assertRecord(records.get(3), LocalDateTime.of(2026, 4, 2, 0, 0), 1, 103L, 11L);
- assertRecord(records.get(4), LocalDateTime.of(2026, 4, 2, 0, 0), 2, 101L, 12L);
- assertRecord(records.get(5), LocalDateTime.of(2026, 4, 2, 0, 0), 3, 102L, 13L);
- // 鏂█锛氱 3 澶╋紙shiftIndex=2锛夛細B 鐧界彮銆丆 涓彮銆丄 澶滅彮
- assertRecord(records.get(6), LocalDateTime.of(2026, 4, 3, 0, 0), 1, 102L, 11L);
- assertRecord(records.get(7), LocalDateTime.of(2026, 4, 3, 0, 0), 2, 103L, 12L);
- assertRecord(records.get(8), LocalDateTime.of(2026, 4, 3, 0, 0), 3, 101L, 13L);
- }
-
- private static void assertRecord(MesCalTeamShiftDO actual, LocalDateTime day, Integer sort,
- Long teamId, Long shiftId) {
- assertEquals(day, actual.getDay());
- assertEquals(sort, actual.getSort());
- assertEquals(teamId, actual.getTeamId());
- assertEquals(shiftId, actual.getShiftId());
- }
-
-}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackMpsAllocationTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackMpsAllocationTest.java
new file mode 100644
index 0000000..99ad26e
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackMpsAllocationTest.java
@@ -0,0 +1,184 @@
+package cn.iocoder.yudao.module.mes.service.pro.feedback;
+
+import cn.iocoder.yudao.module.mes.api.mps.MesProMpsApi;
+import cn.iocoder.yudao.module.mes.api.mps.dto.MesProMpsRespDTO;
+import cn.iocoder.yudao.module.mes.api.event.ProductionFinishedEvent;
+import cn.iocoder.yudao.module.mes.enums.pro.MesProMpsStatusEnum;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderProcessDO;
+import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
+import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
+import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderProcessService;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.feedback.MesProFeedbackMapper;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.test.util.ReflectionTestUtils;
+import org.mockito.ArgumentCaptor;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static org.mockito.Mockito.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class MesProFeedbackMpsAllocationTest {
+
+ @Test
+ void mergedWorkOrderKeepsSurplusOutOfSaleOrders() {
+ MesProMpsApi mpsApi = mock(MesProMpsApi.class);
+ MesProFeedbackServiceImpl service = new MesProFeedbackServiceImpl();
+ ReflectionTestUtils.setField(service, "mpsApi", mpsApi);
+ when(mpsApi.getMpsListByWorkOrderId(28L)).thenReturn(List.of(
+ mps(1716L, 38, 0, MesProMpsStatusEnum.ISSUED),
+ mps(1737L, 1, 0, MesProMpsStatusEnum.ISSUED)));
+
+ service.allocateMpsProducedQuantity(28L, new BigDecimal("40"));
+
+ verify(mpsApi).updateMpsProducedQuantity(1716L, new BigDecimal("38"));
+ verify(mpsApi).updateMpsProducedQuantity(1737L, BigDecimal.ONE);
+ verify(mpsApi, times(2)).updateMpsProducedQuantity(anyLong(), any(BigDecimal.class));
+ }
+
+ @Test
+ void onlyRemainingDemandIsAssignedAndCanceledMpsIsSkipped() {
+ MesProMpsApi mpsApi = mock(MesProMpsApi.class);
+ MesProFeedbackServiceImpl service = new MesProFeedbackServiceImpl();
+ ReflectionTestUtils.setField(service, "mpsApi", mpsApi);
+ when(mpsApi.getMpsListByWorkOrderId(29L)).thenReturn(List.of(
+ mps(1L, 5, 0, MesProMpsStatusEnum.CANCELED),
+ mps(2L, 3, 2, MesProMpsStatusEnum.ISSUED)));
+
+ service.allocateMpsProducedQuantity(29L, new BigDecimal("4"));
+
+ verify(mpsApi).updateMpsProducedQuantity(2L, BigDecimal.ONE);
+ verify(mpsApi, never()).updateMpsProducedQuantity(eq(1L), any(BigDecimal.class));
+ verify(mpsApi, times(1)).updateMpsProducedQuantity(anyLong(), any(BigDecimal.class));
+ }
+
+ @Test
+ void mergedWorkOrderChecksBothSaleOrdersExactlyOnce() {
+ MesProMpsApi mpsApi = mock(MesProMpsApi.class);
+ ApplicationEventPublisher publisher = mock(ApplicationEventPublisher.class);
+ MesProFeedbackServiceImpl service = new MesProFeedbackServiceImpl();
+ ReflectionTestUtils.setField(service, "mpsApi", mpsApi);
+ ReflectionTestUtils.setField(service, "eventPublisher", publisher);
+ MesProMpsRespDTO first = mps(1716L, 38, 38, MesProMpsStatusEnum.ISSUED);
+ first.setSaleOrderId(512L);
+ MesProMpsRespDTO second = mps(1737L, 1, 1, MesProMpsStatusEnum.ISSUED);
+ second.setSaleOrderId(513L);
+ when(mpsApi.getMpsListByWorkOrderId(28L)).thenReturn(List.of(first, second));
+ when(mpsApi.checkAndFinishMps(1716L)).thenReturn(true);
+ when(mpsApi.checkAndFinishMps(1737L)).thenReturn(true);
+ when(mpsApi.checkSaleOrderProductionFinished(512L)).thenReturn(true);
+ when(mpsApi.checkSaleOrderProductionFinished(513L)).thenReturn(true);
+
+ service.checkAndPublishProductionFinished(28L);
+
+ verify(mpsApi).checkAndFinishMps(1716L);
+ verify(mpsApi).checkAndFinishMps(1737L);
+ ArgumentCaptor<ProductionFinishedEvent> events = ArgumentCaptor.forClass(ProductionFinishedEvent.class);
+ verify(publisher, times(2)).publishEvent(events.capture());
+ assertEquals(Set.of(512L, 513L), events.getAllValues().stream()
+ .map(ProductionFinishedEvent::getSaleOrderId).collect(Collectors.toSet()));
+ }
+
+ @Test
+ void lastProcessUpdatesWorkOrderEvenWhenItIsNotKeyProcess() {
+ MesProMpsApi mpsApi = mock(MesProMpsApi.class);
+ MesProTaskService taskService = mock(MesProTaskService.class);
+ MesProWorkOrderService workOrderService = mock(MesProWorkOrderService.class);
+ MesProWorkOrderProcessService processService = mock(MesProWorkOrderProcessService.class);
+ MesProFeedbackServiceImpl service = new MesProFeedbackServiceImpl();
+ ReflectionTestUtils.setField(service, "mpsApi", mpsApi);
+ ReflectionTestUtils.setField(service, "taskService", taskService);
+ ReflectionTestUtils.setField(service, "workOrderService", workOrderService);
+ ReflectionTestUtils.setField(service, "workOrderProcessService", processService);
+ when(processService.getLastWorkOrderProcessByWorkOrderId(28L))
+ .thenReturn(new MesProWorkOrderProcessDO().setProcessId(13L).setKeyFlag(false));
+ when(mpsApi.getMpsListByWorkOrderId(28L)).thenReturn(List.of(
+ mps(1716L, 38, 0, MesProMpsStatusEnum.ISSUED),
+ mps(1737L, 1, 0, MesProMpsStatusEnum.ISSUED)));
+ MesProFeedbackDO feedback = new MesProFeedbackDO().setWorkOrderId(28L)
+ .setTaskId(362L).setProcessId(13L).setFeedbackQuantity(new BigDecimal("40"));
+
+ service.updateTaskAndWorkOrderByFeedback(feedback);
+
+ verify(taskService).updateProducedQuantity(362L, new BigDecimal("40"), BigDecimal.ZERO, BigDecimal.ZERO);
+ verify(workOrderService).updateProducedQuantity(28L, new BigDecimal("40"));
+ verify(mpsApi).updateMpsProducedQuantity(1716L, new BigDecimal("38"));
+ verify(mpsApi).updateMpsProducedQuantity(1737L, BigDecimal.ONE);
+ }
+
+ @Test
+ void keyProcessBeforeLastOnlyUpdatesItsTask() {
+ MesProMpsApi mpsApi = mock(MesProMpsApi.class);
+ MesProTaskService taskService = mock(MesProTaskService.class);
+ MesProWorkOrderService workOrderService = mock(MesProWorkOrderService.class);
+ MesProWorkOrderProcessService processService = mock(MesProWorkOrderProcessService.class);
+ MesProFeedbackServiceImpl service = new MesProFeedbackServiceImpl();
+ ReflectionTestUtils.setField(service, "mpsApi", mpsApi);
+ ReflectionTestUtils.setField(service, "taskService", taskService);
+ ReflectionTestUtils.setField(service, "workOrderService", workOrderService);
+ ReflectionTestUtils.setField(service, "workOrderProcessService", processService);
+ when(processService.getLastWorkOrderProcessByWorkOrderId(28L))
+ .thenReturn(new MesProWorkOrderProcessDO().setProcessId(13L).setKeyFlag(false));
+ when(mpsApi.getMpsListByWorkOrderId(28L)).thenReturn(List.of());
+ MesProFeedbackDO feedback = new MesProFeedbackDO().setWorkOrderId(28L)
+ .setTaskId(360L).setProcessId(11L).setFeedbackQuantity(new BigDecimal("40"));
+
+ service.updateTaskAndWorkOrderByFeedback(feedback);
+
+ verify(taskService).updateProducedQuantity(360L, new BigDecimal("40"), BigDecimal.ZERO, BigDecimal.ZERO);
+ verify(workOrderService, never()).updateProducedQuantity(anyLong(), any(BigDecimal.class));
+ verify(mpsApi, never()).updateMpsProducedQuantity(anyLong(), any(BigDecimal.class));
+ }
+
+ @Test
+ void lastQcAutoFinishesOnlyAfterAllLastProcessFeedbacksAreFinished() {
+ MesProFeedbackMapper feedbackMapper = mock(MesProFeedbackMapper.class);
+ MesProWorkOrderService workOrderService = mock(MesProWorkOrderService.class);
+ MesProWorkOrderProcessService processService = mock(MesProWorkOrderProcessService.class);
+ MesProFeedbackServiceImpl service = new MesProFeedbackServiceImpl();
+ ReflectionTestUtils.setField(service, "feedbackMapper", feedbackMapper);
+ ReflectionTestUtils.setField(service, "workOrderService", workOrderService);
+ ReflectionTestUtils.setField(service, "workOrderProcessService", processService);
+ when(processService.getLastWorkOrderProcessByWorkOrderId(28L))
+ .thenReturn(new MesProWorkOrderProcessDO().setProcessId(13L));
+ MesProFeedbackDO lastFeedback = new MesProFeedbackDO().setWorkOrderId(28L).setProcessId(13L);
+ when(feedbackMapper.selectCount(any(com.baomidou.mybatisplus.core.conditions.Wrapper.class)))
+ .thenReturn(1L, 0L);
+
+ service.checkAndAutoFinishAfterLastQc(lastFeedback);
+ verify(workOrderService, never()).checkAndAutoFinishWorkOrder(28L);
+
+ service.checkAndAutoFinishAfterLastQc(lastFeedback);
+ verify(workOrderService).checkAndAutoFinishWorkOrder(28L);
+ }
+
+ @Test
+ void nonLastQcDoesNotAutoFinishWorkOrder() {
+ MesProWorkOrderService workOrderService = mock(MesProWorkOrderService.class);
+ MesProWorkOrderProcessService processService = mock(MesProWorkOrderProcessService.class);
+ MesProFeedbackServiceImpl service = new MesProFeedbackServiceImpl();
+ ReflectionTestUtils.setField(service, "workOrderService", workOrderService);
+ ReflectionTestUtils.setField(service, "workOrderProcessService", processService);
+ when(processService.getLastWorkOrderProcessByWorkOrderId(28L))
+ .thenReturn(new MesProWorkOrderProcessDO().setProcessId(13L));
+
+ service.checkAndAutoFinishAfterLastQc(new MesProFeedbackDO().setWorkOrderId(28L).setProcessId(11L));
+
+ verifyNoInteractions(workOrderService);
+ }
+
+ private static MesProMpsRespDTO mps(Long id, int planned, int produced, MesProMpsStatusEnum status) {
+ MesProMpsRespDTO mps = new MesProMpsRespDTO();
+ mps.setId(id);
+ mps.setQuantity(BigDecimal.valueOf(planned));
+ mps.setQuantityProduced(BigDecimal.valueOf(produced));
+ mps.setStatus(status.getStatus());
+ return mps;
+ }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleServiceTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleServiceTest.java
index 653fc24..bd17175 100644
--- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleServiceTest.java
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleServiceTest.java
@@ -13,7 +13,6 @@
import cn.iocoder.yudao.module.mes.dal.mysql.dv.machinery.MesDvMachineryMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.task.MesProTaskMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderMapper;
-import cn.iocoder.yudao.module.mes.service.cal.holiday.MesCalHolidayService;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
@@ -243,7 +242,6 @@
new MesMdWorkstationDO().setId(2L).setName("宸ヤ綔绔橞").setProcessId(2L).setStatus(0))));
set("machineryMapper", stub(MesDvMachineryMapper.class, (p,m,a) -> machines));
set("customerApi", stub(CrmCustomerApi.class, (p,m,a) -> null));
- set("holidayService", stub(MesCalHolidayService.class, (p,m,a) -> List.of()));
set("workOrderProcessService", stub(MesProWorkOrderProcessService.class, (p,m,a) -> processes));
var quantities = new MesProScheduleQuantityService();
ReflectionTestUtils.setField(quantities, "workOrderProcessService", stub(MesProWorkOrderProcessService.class, (p,m,a) -> processes));
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorApprovalTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorApprovalTest.java
new file mode 100644
index 0000000..5da1198
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorApprovalTest.java
@@ -0,0 +1,109 @@
+package cn.iocoder.yudao.module.mes.service.wm.returnvendor;
+
+import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor.MesWmReturnVendorDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor.MesWmReturnVendorLineDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor.MesWmReturnVendorDetailDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnvendor.MesWmReturnVendorMapper;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.util.List;
+import java.math.BigDecimal;
+
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class MesWmReturnVendorApprovalTest {
+
+ private final MesWmReturnVendorServiceImpl service = new MesWmReturnVendorServiceImpl();
+ @Mock private MesWmReturnVendorMapper mapper;
+ @Mock private MesWmReturnVendorLineService lineService;
+ @Mock private MesWmReturnVendorDetailService detailService;
+ @Mock private StorageAttachmentApi attachmentApi;
+ @Mock private BpmProcessInstanceApi processInstanceApi;
+
+ @BeforeEach
+ void setUp() {
+ ReflectionTestUtils.setField(service, "returnVendorMapper", mapper);
+ ReflectionTestUtils.setField(service, "returnVendorLineService", lineService);
+ ReflectionTestUtils.setField(service, "returnVendorDetailService", detailService);
+ ReflectionTestUtils.setField(service, "storageAttachmentApi", attachmentApi);
+ ReflectionTestUtils.setField(service, "processInstanceApi", processInstanceApi);
+ }
+
+ @Test
+ void ordinarySubmitStillRequiresAttachment() {
+ when(mapper.selectById(8L)).thenReturn(order(0, null, null));
+ when(lineService.getReturnVendorLineListByReturnId(8L)).thenReturn(List.of(new MesWmReturnVendorLineDO()));
+ assertServiceException(() -> service.submitReturnVendor(8L), WM_RETURN_VENDOR_ATTACHMENT_REQUIRED, "TEST-8");
+ verify(mapper, never()).updateById(any(MesWmReturnVendorDO.class));
+ }
+
+ @Test
+ void arbitraryProcessKeyIsRejected() {
+ assertServiceException(() -> service.submitReturnVendorApproval(8L, "other_process"),
+ WM_RETURN_VENDOR_APPROVAL_PROCESS_INVALID, "purchase_return_vendor_approve");
+ verifyNoInteractions(mapper);
+ }
+
+ @Test
+ void legacyBypassCannotStockOrFinish() {
+ when(mapper.selectById(8L)).thenReturn(order(2, null, null), order(3, null, null));
+ assertServiceException(() -> service.stockReturnVendor(8L), WM_RETURN_VENDOR_APPROVAL_REQUIRED, "TEST-8");
+ assertServiceException(() -> service.finishReturnVendor(8L), WM_RETURN_VENDOR_APPROVAL_REQUIRED, "TEST-8");
+ verify(mapper, never()).updateById(any(MesWmReturnVendorDO.class));
+ }
+
+ @Test
+ void approvedProcessCanStock() {
+ when(mapper.selectById(9L)).thenReturn(order(2, "purchase_return_vendor_approve", "process-1"));
+ service.stockReturnVendor(9L);
+ verify(mapper).updateById(argThat((MesWmReturnVendorDO value) -> value.getStatus() == 3));
+ }
+
+ @Test
+ void runningApprovalIsCanceledBeforeOrder() {
+ when(mapper.selectById(8L)).thenReturn(order(1, "purchase_return_vendor_approve", "process-1"));
+ service.cancelReturnVendor(8L);
+ var sequence = inOrder(processInstanceApi, mapper);
+ sequence.verify(processInstanceApi).cancelProcessInstanceByStartUser(null, "process-1", "渚涘簲鍟嗛��璐у崟鍙栨秷");
+ sequence.verify(mapper).updateById(argThat((MesWmReturnVendorDO value) -> value.getStatus() == 5));
+ }
+
+ @Test
+ void failedProcessCancelKeepsOrderRunning() {
+ when(mapper.selectById(8L)).thenReturn(order(1, "purchase_return_vendor_approve", "process-1"));
+ doThrow(new IllegalStateException("cancel rejected")).when(processInstanceApi)
+ .cancelProcessInstanceByStartUser(null, "process-1", "渚涘簲鍟嗛��璐у崟鍙栨秷");
+ org.junit.jupiter.api.Assertions.assertThrows(IllegalStateException.class, () -> service.cancelReturnVendor(8L));
+ verify(mapper, never()).updateById(any(MesWmReturnVendorDO.class));
+ }
+
+ @Test
+ void mismatchedPickedQuantityCannotSubmitOrStock() {
+ when(mapper.selectById(8L)).thenReturn(order(0, null, null),
+ order(2, "purchase_return_vendor_approve", "process-1"));
+ when(lineService.getReturnVendorLineListByReturnId(8L)).thenReturn(List.of(
+ new MesWmReturnVendorLineDO().setId(10L).setQuantity(BigDecimal.valueOf(3))));
+ when(detailService.getReturnVendorDetailListByReturnId(8L)).thenReturn(List.of(
+ new MesWmReturnVendorDetailDO().setQuantity(BigDecimal.valueOf(2))));
+ when(detailService.getReturnVendorDetailListByLineId(10L)).thenReturn(List.of(
+ new MesWmReturnVendorDetailDO().setQuantity(BigDecimal.valueOf(2))));
+ assertServiceException(() -> service.submitReturnVendor(8L), WM_RETURN_VENDOR_DETAIL_QUANTITY_MISMATCH);
+ assertServiceException(() -> service.stockReturnVendor(8L), WM_RETURN_VENDOR_DETAIL_QUANTITY_MISMATCH);
+ verify(mapper, never()).updateById(any(MesWmReturnVendorDO.class));
+ }
+
+ private MesWmReturnVendorDO order(int status, String key, String instanceId) {
+ return new MesWmReturnVendorDO().setId(8L).setCode("TEST-8").setStatus(status)
+ .setProcessDefinitionKey(key).setProcessInstanceId(instanceId);
+ }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailStateTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailStateTest.java
new file mode 100644
index 0000000..f6bf419
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailStateTest.java
@@ -0,0 +1,82 @@
+package cn.iocoder.yudao.module.mes.service.wm.returnvendor;
+
+import cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.detail.MesWmReturnVendorDetailSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor.MesWmReturnVendorDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor.MesWmReturnVendorDetailDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor.MesWmReturnVendorLineDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnvendor.MesWmReturnVendorDetailMapper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class MesWmReturnVendorDetailStateTest {
+
+ private final MesWmReturnVendorDetailServiceImpl service = new MesWmReturnVendorDetailServiceImpl();
+ @Mock private MesWmReturnVendorDetailMapper mapper;
+ @Mock private MesWmReturnVendorLineService lineService;
+ @Mock private MesWmReturnVendorService returnVendorService;
+
+ @BeforeEach
+ void setUp() {
+ ReflectionTestUtils.setField(service, "returnVendorDetailMapper", mapper);
+ ReflectionTestUtils.setField(service, "returnVendorLineService", lineService);
+ ReflectionTestUtils.setField(service, "returnVendorService", returnVendorService);
+ }
+
+ @Test
+ void runningApprovalCannotEditDetail() {
+ when(lineService.validateReturnVendorLineExists(10L))
+ .thenReturn(new MesWmReturnVendorLineDO().setId(10L).setReturnId(8L));
+ when(returnVendorService.validateReturnVendorExists(8L))
+ .thenReturn(new MesWmReturnVendorDO().setId(8L).setCode("TEST-8").setStatus(1));
+ assertServiceException(() -> service.createReturnVendorDetail(req()),
+ WM_RETURN_VENDOR_DETAIL_STATUS_INVALID, "TEST-8");
+ verify(mapper, never()).insert(any(MesWmReturnVendorDetailDO.class));
+ }
+
+ @Test
+ void finishedDetailCannotBeDeleted() {
+ when(mapper.selectById(4L)).thenReturn(new MesWmReturnVendorDetailDO().setId(4L).setReturnId(8L));
+ when(returnVendorService.validateReturnVendorExists(8L))
+ .thenReturn(new MesWmReturnVendorDO().setId(8L).setCode("TEST-8").setStatus(4));
+ assertServiceException(() -> service.deleteReturnVendorDetail(4L),
+ WM_RETURN_VENDOR_DETAIL_STATUS_INVALID, "TEST-8");
+ verify(mapper, never()).deleteById(4L);
+ }
+
+ @Test
+ void pendingPickDetailCanBeDeleted() {
+ when(mapper.selectById(4L)).thenReturn(new MesWmReturnVendorDetailDO().setId(4L).setReturnId(8L));
+ when(returnVendorService.validateReturnVendorExists(8L))
+ .thenReturn(new MesWmReturnVendorDO().setId(8L).setStatus(2));
+ service.deleteReturnVendorDetail(4L);
+ verify(mapper).deleteById(4L);
+ }
+
+ @Test
+ void updateCannotMoveDetailToAnotherOrder() {
+ when(mapper.selectById(4L)).thenReturn(new MesWmReturnVendorDetailDO()
+ .setId(4L).setReturnId(8L).setLineId(10L));
+ MesWmReturnVendorDetailSaveReqVO req = req();
+ req.setId(4L);
+ req.setReturnId(9L);
+ assertServiceException(() -> service.updateReturnVendorDetail(req),
+ WM_RETURN_VENDOR_DETAIL_PARENT_IMMUTABLE);
+ verify(mapper, never()).updateById(any(MesWmReturnVendorDetailDO.class));
+ }
+
+ private MesWmReturnVendorDetailSaveReqVO req() {
+ MesWmReturnVendorDetailSaveReqVO req = new MesWmReturnVendorDetailSaveReqVO();
+ req.setReturnId(8L);
+ req.setLineId(10L);
+ return req;
+ }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingCompletionTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingCompletionTest.java
new file mode 100644
index 0000000..84d3d2a
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingCompletionTest.java
@@ -0,0 +1,85 @@
+package cn.iocoder.yudao.module.mes.service.wm.stocktaking.task;
+
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task.MesWmStockTakingTaskDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task.MesWmStockTakingTaskLineDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task.MesWmStockTakingTaskResultDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.stocktaking.task.MesWmStockTakingTaskMapper;
+import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
+import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_STOCK_TAKING_TASK_INCOMPLETE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class MesWmStockTakingCompletionTest {
+
+ private final MesWmStockTakingTaskServiceImpl service = new MesWmStockTakingTaskServiceImpl();
+ @Mock private MesWmStockTakingTaskMapper taskMapper;
+ @Mock private MesWmStockTakingTaskLineService lineService;
+ @Mock private MesWmStockTakingTaskResultService resultService;
+ @Mock private MesWmTransactionService transactionService;
+
+ @BeforeEach
+ void setUp() {
+ ReflectionTestUtils.setField(service, "stockTakingTaskMapper", taskMapper);
+ ReflectionTestUtils.setField(service, "stockTakingTaskLineService", lineService);
+ ReflectionTestUtils.setField(service, "stockTakingTaskResultService", resultService);
+ ReflectionTestUtils.setField(service, "wmTransactionService", transactionService);
+ }
+
+ @Test
+ void missingResultBlocksCompletion() {
+ when(taskMapper.selectById(1L)).thenReturn(task(2));
+ when(lineService.getStockTakingTaskLineListByTaskId(1L)).thenReturn(List.of(line(11L), line(12L)));
+ when(resultService.getStockTakingTaskResultListByTaskId(1L)).thenReturn(List.of(result(11L, BigDecimal.ONE)));
+
+ assertServiceException(() -> service.finishStockTakingTask(1L),
+ WM_STOCK_TAKING_TASK_INCOMPLETE, List.of(12L));
+ verify(taskMapper, never()).updateById(any(MesWmStockTakingTaskDO.class));
+ verifyNoInteractions(transactionService);
+ }
+
+ @Test
+ void countedZeroIsValidAndPostsLoss() {
+ when(taskMapper.selectById(1L)).thenReturn(task(2), task(4));
+ when(taskMapper.claimDifferenceProcessing(1L)).thenReturn(1);
+ when(lineService.getStockTakingTaskLineListByTaskId(1L)).thenReturn(List.of(line(11L)));
+ when(resultService.getStockTakingTaskResultListByTaskId(1L))
+ .thenReturn(List.of(result(11L, BigDecimal.ZERO)));
+
+ service.finishStockTakingTask(1L);
+
+ verify(taskMapper).updateById(argThat((MesWmStockTakingTaskDO value) -> value.getStatus() == 4));
+ verify(transactionService).createTransaction(argThat((MesWmTransactionSaveReqDTO value) -> {
+ assertEquals(2, value.getType());
+ assertEquals(BigDecimal.ONE.negate(), value.getQuantity());
+ return true;
+ }));
+ }
+
+ private MesWmStockTakingTaskDO task(int status) {
+ return new MesWmStockTakingTaskDO().setId(1L).setCode("ST-1").setStatus(status).setFrozen(false);
+ }
+
+ private MesWmStockTakingTaskLineDO line(Long id) {
+ return new MesWmStockTakingTaskLineDO().setId(id).setTaskId(1L)
+ .setMaterialStockId(1039L).setItemId(1996L).setQuantity(BigDecimal.ONE);
+ }
+
+ private MesWmStockTakingTaskResultDO result(Long lineId, BigDecimal actual) {
+ return new MesWmStockTakingTaskResultDO().setTaskId(1L).setLineId(lineId)
+ .setMaterialStockId(1039L).setItemId(1996L)
+ .setQuantity(BigDecimal.ONE).setTakingQuantity(actual);
+ }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingDifferenceTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingDifferenceTest.java
new file mode 100644
index 0000000..0582fba
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingDifferenceTest.java
@@ -0,0 +1,65 @@
+package cn.iocoder.yudao.module.mes.service.wm.stocktaking.task;
+
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task.MesWmStockTakingTaskDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task.MesWmStockTakingTaskResultDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.stocktaking.task.MesWmStockTakingTaskMapper;
+import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
+import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class MesWmStockTakingDifferenceTest {
+
+ private final MesWmStockTakingTaskServiceImpl service = new MesWmStockTakingTaskServiceImpl();
+ @Mock private MesWmStockTakingTaskMapper taskMapper;
+ @Mock private MesWmStockTakingTaskResultService resultService;
+ @Mock private MesWmTransactionService transactionService;
+
+ @BeforeEach
+ void setUp() {
+ ReflectionTestUtils.setField(service, "stockTakingTaskMapper", taskMapper);
+ ReflectionTestUtils.setField(service, "stockTakingTaskResultService", resultService);
+ ReflectionTestUtils.setField(service, "wmTransactionService", transactionService);
+ }
+
+ @Test
+ void completedTaskPostsGainAndLossOnce() {
+ when(taskMapper.selectById(1L)).thenReturn(new MesWmStockTakingTaskDO()
+ .setId(1L).setCode("ST-1").setStatus(4));
+ when(taskMapper.claimDifferenceProcessing(1L)).thenReturn(1, 0);
+ when(resultService.getStockTakingTaskResultListByTaskId(1L)).thenReturn(List.of(
+ result(11L, BigDecimal.ONE, BigDecimal.valueOf(2)),
+ result(12L, BigDecimal.valueOf(3), BigDecimal.ONE)));
+
+ service.processStockTakingDifference(1L);
+ service.processStockTakingDifference(1L);
+
+ ArgumentCaptor<MesWmTransactionSaveReqDTO> captor = ArgumentCaptor.forClass(MesWmTransactionSaveReqDTO.class);
+ verify(transactionService, times(2)).createTransaction(captor.capture());
+ List<MesWmTransactionSaveReqDTO> transactions = captor.getAllValues();
+ assertEquals(1, transactions.get(0).getType());
+ assertEquals(BigDecimal.ONE, transactions.get(0).getQuantity());
+ assertEquals(11L, transactions.get(0).getMaterialStockId());
+ assertEquals(2, transactions.get(1).getType());
+ assertEquals(BigDecimal.valueOf(-2), transactions.get(1).getQuantity());
+ assertEquals(12L, transactions.get(1).getMaterialStockId());
+ }
+
+ private MesWmStockTakingTaskResultDO result(Long stockId, BigDecimal book, BigDecimal actual) {
+ return new MesWmStockTakingTaskResultDO().setTaskId(1L).setLineId(stockId)
+ .setMaterialStockId(stockId).setItemId(1996L).setQuantity(book)
+ .setTakingQuantity(actual).setWarehouseId(21L).setLocationId(6L).setAreaId(6L);
+ }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferVendorTraceTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferVendorTraceTest.java
new file mode 100644
index 0000000..b3c31b0
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferVendorTraceTest.java
@@ -0,0 +1,62 @@
+package cn.iocoder.yudao.module.mes.service.wm.transfer;
+
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstock.MesWmMaterialStockDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.transfer.MesWmTransferDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.transfer.MesWmTransferDetailDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.transfer.MesWmTransferLineDO;
+import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService;
+import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
+import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class MesWmTransferVendorTraceTest {
+
+ private final MesWmTransferServiceImpl service = new MesWmTransferServiceImpl();
+ @Mock private MesWmTransferDetailService detailService;
+ @Mock private MesWmMaterialStockService stockService;
+ @Mock private MesWmTransactionService transactionService;
+
+ @BeforeEach
+ void setUp() {
+ ReflectionTestUtils.setField(service, "transferDetailService", detailService);
+ ReflectionTestUtils.setField(service, "materialStockService", stockService);
+ ReflectionTestUtils.setField(service, "wmTransactionService", transactionService);
+ }
+
+ @Test
+ void pairedMoveKeepsSourceVendor() {
+ MesWmTransferDO transfer = new MesWmTransferDO().setId(7L).setCode("MOVE-7");
+ MesWmTransferLineDO line = new MesWmTransferLineDO().setId(11L).setMaterialStockId(1032L)
+ .setItemId(1996L).setFromWarehouseId(24L).setFromLocationId(9L).setFromAreaId(9L);
+ MesWmTransferDetailDO detail = new MesWmTransferDetailDO().setLineId(11L)
+ .setQuantity(BigDecimal.ONE).setToWarehouseId(25L).setToLocationId(10L).setToAreaId(10L);
+ when(detailService.getTransferDetailListByTransferId(7L)).thenReturn(List.of(detail));
+ when(stockService.getMaterialStock(1032L)).thenReturn(new MesWmMaterialStockDO()
+ .setId(1032L).setVendorId(1L));
+ when(transactionService.createTransaction(any())).thenReturn(100L, 101L);
+
+ ReflectionTestUtils.invokeMethod(service, "createTransferTransactions", transfer, List.of(line));
+
+ ArgumentCaptor<MesWmTransactionSaveReqDTO> captor = ArgumentCaptor.forClass(MesWmTransactionSaveReqDTO.class);
+ verify(transactionService, times(2)).createTransaction(captor.capture());
+ List<MesWmTransactionSaveReqDTO> transactions = captor.getAllValues();
+ assertEquals(1L, transactions.get(0).getVendorId());
+ assertEquals(1L, transactions.get(1).getVendorId());
+ assertEquals(100L, transactions.get(1).getRelatedTransactionId());
+ assertEquals(BigDecimal.ONE.negate(), transactions.get(0).getQuantity());
+ assertEquals(BigDecimal.ONE, transactions.get(1).getQuantity());
+ }
+}
diff --git a/yudao-module-qcreport/src/main/java/cn/iocoder/yudao/module/qcreport/engine/report/ReportEvaluator.java b/yudao-module-qcreport/src/main/java/cn/iocoder/yudao/module/qcreport/engine/report/ReportEvaluator.java
index 0b5abb7..2761b39 100644
--- a/yudao-module-qcreport/src/main/java/cn/iocoder/yudao/module/qcreport/engine/report/ReportEvaluator.java
+++ b/yudao-module-qcreport/src/main/java/cn/iocoder/yudao/module/qcreport/engine/report/ReportEvaluator.java
@@ -122,9 +122,11 @@
int total = items.size();
// 鍚堟牸鐜囩殑鍒嗘瘝鍙畻銆岃兘鍒ゅ畾銆嶇殑椤癸紝鏃犲垽瀹氳鍒欑殑椤规棦涓嶅姞鍒嗕篃涓嶅噺鍒�
int decidableCount = total - undecidableCount;
+ boolean hasPendingItem = items.stream().anyMatch(item -> QualityResult.PENDING_TEXT.equals(item.getResultText()));
QualityResult verdict = null;
- if (!reportRules.isEmpty()) {
+ // 缂哄皯妫�楠屼緷鎹椂锛屽嵆浣挎姤鍛婄骇瑙勫垯鑳界畻鍑哄竷灏斿�硷紝涔熶笉鑳界敓鎴愮‘瀹氱粨璁恒��
+ if (!hasPendingItem && !reportRules.isEmpty()) {
Map<String, Object> scoped = context.scope(items);
scoped.put("index", 0);
boolean passed = true;
@@ -140,7 +142,7 @@
}
}
verdict = failed ? null : (passed ? QualityResult.PASS : QualityResult.FAIL);
- } else if (decidableCount > 0) {
+ } else if (!hasPendingItem && decidableCount > 0) {
// 鍙湁銆屽叏閮ㄥ彲鍒ゅ畾椤归兘鍚堟牸銆嶆墠缁欏悎鏍肩粨璁恒�傛棤鍒ゅ畾瑙勫垯鐨勯」涓嶅弬涓庯紝瀹冧滑娌℃湁瀵归敊鍙█銆�
// 瀛樺湪寰呭垽瀹氶」锛堣鍒欒窇鎸傦級鏃朵笉缁欑粨璁猴細娌¢獙杩囦笉鑳借鍚堟牸锛屾病璇佹嵁涔熶笉鑳借涓嶅悎鏍硷紝
// 鍚﹀垯浼氬嚭鐜般�岀粨璁哄悎鏍笺�佸悎鏍肩巼 0%銆嶈繖绉嶈嚜鐩哥煕鐩剧殑鎶ュ憡銆�
diff --git a/yudao-module-qcreport/src/main/java/cn/iocoder/yudao/module/qcreport/engine/rule/RuleEvaluator.java b/yudao-module-qcreport/src/main/java/cn/iocoder/yudao/module/qcreport/engine/rule/RuleEvaluator.java
index ad9de51..dc8ad33 100644
--- a/yudao-module-qcreport/src/main/java/cn/iocoder/yudao/module/qcreport/engine/rule/RuleEvaluator.java
+++ b/yudao-module-qcreport/src/main/java/cn/iocoder/yudao/module/qcreport/engine/rule/RuleEvaluator.java
@@ -71,6 +71,15 @@
return asText(left).compareTo(asText(right));
}
+ private static int compareNumbers(Object left, Object right) {
+ double leftNumber = Paths.toNumber(left);
+ double rightNumber = Paths.toNumber(right);
+ if (!Double.isFinite(leftNumber) || !Double.isFinite(rightNumber)) {
+ throw new RuleRuntimeException("鏁板�兼瘮杈冪己灏戞湁鏁堝疄娴嬪�兼垨瑙勬牸闄愬��");
+ }
+ return Double.compare(leftNumber, rightNumber);
+ }
+
/** 鍒ゅ畾缁撴灉绫诲彇鍊肩粺涓�鎴� PASS / FAIL锛岃瘑鍒笉鍑鸿繑鍥炵┖涓� */
public static String normalizeResultToken(Object value) {
if (value instanceof Boolean bool) {
@@ -259,8 +268,8 @@
private static Object evaluateBetween(RuleNode.Between between, Object context) {
Object value = evaluateNode(between.value(), context);
- boolean hit = compare(value, evaluateNode(between.lower(), context)) >= 0
- && compare(value, evaluateNode(between.upper(), context)) <= 0;
+ boolean hit = compareNumbers(value, evaluateNode(between.lower(), context)) >= 0
+ && compareNumbers(value, evaluateNode(between.upper(), context)) <= 0;
return between.negated() != hit;
}
@@ -290,10 +299,10 @@
return switch (binary.operator()) {
case "=" -> compare(left, right) == 0;
case "!=" -> compare(left, right) != 0;
- case ">" -> compare(left, right) > 0;
- case ">=" -> compare(left, right) >= 0;
- case "<" -> compare(left, right) < 0;
- case "<=" -> compare(left, right) <= 0;
+ case ">" -> compareNumbers(left, right) > 0;
+ case ">=" -> compareNumbers(left, right) >= 0;
+ case "<" -> compareNumbers(left, right) < 0;
+ case "<=" -> compareNumbers(left, right) <= 0;
case "+" -> add(left, right);
case "-" -> Paths.toNumber(left) - Paths.toNumber(right);
case "*" -> Paths.toNumber(left) * Paths.toNumber(right);
@@ -412,4 +421,4 @@
}
-}
\ No newline at end of file
+}
diff --git a/yudao-module-qcreport/src/test/java/cn/iocoder/yudao/module/qcreport/engine/FrontendConformanceTest.java b/yudao-module-qcreport/src/test/java/cn/iocoder/yudao/module/qcreport/engine/FrontendConformanceTest.java
index c6e0e52..c1752d8 100644
--- a/yudao-module-qcreport/src/test/java/cn/iocoder/yudao/module/qcreport/engine/FrontendConformanceTest.java
+++ b/yudao-module-qcreport/src/test/java/cn/iocoder/yudao/module/qcreport/engine/FrontendConformanceTest.java
@@ -63,15 +63,15 @@
EvaluationOutcome evaluated = ReportEvaluator.evaluate(context, QualityReportEngine.rulesOf(schema));
- assertEquals("FAIL", evaluated.context().getReport().getResult());
- assertEquals("涓嶅悎鏍�", evaluated.context().getReport().getResultText());
+ assertEquals("", evaluated.context().getReport().getResult());
+ assertEquals("寰呭垽瀹�", evaluated.context().getReport().getResultText());
assertEquals(3, evaluated.context().getReport().getTotal());
assertEquals(1, evaluated.context().getReport().getPassCount());
- assertEquals(2, evaluated.context().getReport().getFailCount());
+ assertEquals(1, evaluated.context().getReport().getFailCount());
assertEquals("33.33%", evaluated.context().getReport().getPassRate());
List<InspectionItem> items = evaluated.context().getInspectionItems();
- assertEquals(List.of("FAIL", "PASS", "FAIL"), List.of(
+ assertEquals(List.of("", "PASS", "FAIL"), List.of(
items.get(0).getResult(), items.get(1).getResult(), items.get(2).getResult()),
"澶栬鏃犱笂涓嬮檺浣嗘湁瑙勫垯銆侀暱搴﹀湪瑙勬牸鍐呫�佺‖搴﹁秴涓婇檺");
}
@@ -169,4 +169,4 @@
}
}
-}
\ No newline at end of file
+}
diff --git a/yudao-module-qcreport/src/test/java/cn/iocoder/yudao/module/qcreport/engine/ReportEvaluatorTest.java b/yudao-module-qcreport/src/test/java/cn/iocoder/yudao/module/qcreport/engine/ReportEvaluatorTest.java
index c0b74e2..a0f80bf 100644
--- a/yudao-module-qcreport/src/test/java/cn/iocoder/yudao/module/qcreport/engine/ReportEvaluatorTest.java
+++ b/yudao-module-qcreport/src/test/java/cn/iocoder/yudao/module/qcreport/engine/ReportEvaluatorTest.java
@@ -32,6 +32,28 @@
class ReportEvaluatorTest {
@Test
+ void numericRuleRequiresRealMeasurementsAndLimits() {
+ ReportContext context = ReportContext.empty().setInspectionItems(List.of(
+ item("鏈娴�", "", 10.0, 0.0),
+ item("缂鸿鏍�", "5", null, null),
+ item("宸叉娴�", "5", 10.0, 0.0)));
+ List<QualityRuleDefinition> rules = List.of(
+ itemRule("鏁板�艰寖鍥�", "item.actualValue >= item.lowerLimit AND item.actualValue <= item.upperLimit"),
+ new QualityRuleDefinition("report-rate", "鏁翠綋鍚堟牸鐜�", RuleScope.REPORT,
+ "PASS_RATE(inspectionItems) >= 60", true));
+
+ EvaluationOutcome outcome = ReportEvaluator.evaluate(context, rules);
+ assertEquals("", outcome.context().getInspectionItems().get(0).getResult());
+ assertEquals("", outcome.context().getInspectionItems().get(1).getResult());
+ assertEquals("PASS", outcome.context().getInspectionItems().get(2).getResult());
+ assertEquals("", outcome.context().getReport().getResult());
+ assertEquals(QualityResult.PENDING_TEXT, outcome.context().getReport().getConclusion());
+ assertEquals("33.33%", outcome.context().getReport().getPassRate());
+ assertEquals(2, outcome.errors().size());
+ assertTrue(outcome.errors().stream().allMatch(error -> error.contains("鏁板�兼瘮杈冪己灏戞湁鏁堝疄娴嬪�兼垨瑙勬牸闄愬��")));
+ }
+
+ @Test
void blankOrNonNumericResultsWithLimitsStayPendingAndCannotProduceAPass() {
ReportContext context = ReportContext.empty().setInspectionItems(List.of(
item("閾�", "", 0.5, null),
diff --git a/yudao-module-qcreport/src/test/resources/qcreport/expected-html.html b/yudao-module-qcreport/src/test/resources/qcreport/expected-html.html
index b358a8b..99f5ef1 100644
--- a/yudao-module-qcreport/src/test/resources/qcreport/expected-html.html
+++ b/yudao-module-qcreport/src/test/resources/qcreport/expected-html.html
@@ -15,5 +15,5 @@
.qc-table { border-collapse:collapse }
</style>
</head>
-<body><div>鎶ュ憡缂栧彿锛歈C-2026-0001锛岀粨璁猴細涓嶅悎鏍�<table class="qc-table" style="width:100%"><thead><tr><th style="border:1px solid #d9d9d9">搴忓彿</th><th>妫�楠岄」鐩�</th></tr></thead><tbody><tr data-qc-id="qc-row-main"><td>1</td><td>澶栬</td><td>鍚堟牸</td><td>涓嶅悎鏍�</td></tr><tr data-qc-id="qc-row-main"><td>2</td><td>闀垮害</td><td>10.2</td><td>鍚堟牸</td></tr><tr data-qc-id="qc-row-main"><td>3</td><td>纭害</td><td>62</td><td>涓嶅悎鏍�</td></tr></tbody></table><div data-qc-id="qc-rate" title="鍚堟牸鐜�" style="margin:6px 0 0">鍚堟牸鐜囷細33.33%锛屽叡 3 椤�</div><div>瀹㈡埛锛氾綔渚涙柟缂栧彿锛�</div><div>鐗规畩瀛楃锛�<鍘熸牱>&"寮曞彿"</div></div></body>
+<body><div>鎶ュ憡缂栧彿锛歈C-2026-0001锛岀粨璁猴細寰呭垽瀹�<table class="qc-table" style="width:100%"><thead><tr><th style="border:1px solid #d9d9d9">搴忓彿</th><th>妫�楠岄」鐩�</th></tr></thead><tbody><tr data-qc-id="qc-row-main"><td>1</td><td>澶栬</td><td>鍚堟牸</td><td>寰呭垽瀹�</td></tr><tr data-qc-id="qc-row-main"><td>2</td><td>闀垮害</td><td>10.2</td><td>鍚堟牸</td></tr><tr data-qc-id="qc-row-main"><td>3</td><td>纭害</td><td>62</td><td>涓嶅悎鏍�</td></tr></tbody></table><div data-qc-id="qc-rate" title="鍚堟牸鐜�" style="margin:6px 0 0">鍚堟牸鐜囷細33.33%锛屽叡 3 椤�</div><div>瀹㈡埛锛氾綔渚涙柟缂栧彿锛�</div><div>鐗规畩瀛楃锛�<鍘熸牱>&"寮曞彿"</div></div></body>
</html>
\ No newline at end of file
diff --git a/yudao-module-qcreport/src/test/resources/qcreport/expected-rules.json b/yudao-module-qcreport/src/test/resources/qcreport/expected-rules.json
index 0d0616b..d87f4f9 100644
--- a/yudao-module-qcreport/src/test/resources/qcreport/expected-rules.json
+++ b/yudao-module-qcreport/src/test/resources/qcreport/expected-rules.json
@@ -1,5 +1,6 @@
{
"errors": [
+ "绗� 1 椤广�屽瑙傘�嶇殑瑙勫垯銆屽疄娴嬪�煎湪瑙勬牸鍐呫�嶆棤娉曟墽琛岋細鏁板�兼瘮杈冪己灏戞湁鏁堝疄娴嬪�兼垨瑙勬牸闄愬��",
"妯℃澘缁戝畾銆寋{report.supplierCode}}銆嶅湪褰撳墠鏁版嵁涓彇涓嶅埌鍊硷紝宸叉覆鏌撲负绌�"
],
"results": [
@@ -31,7 +32,7 @@
"expression": "FAIL_RATE(inspectionItems.result)",
"scope": "report",
"kind": "number",
- "text": "66.67"
+ "text": "33.33"
},
{
"expression": "COUNT(inspectionItems)",
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryConfirmReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryConfirmReqVO.java
index 56324fd..2bf6329 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryConfirmReqVO.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryConfirmReqVO.java
@@ -5,6 +5,7 @@
import lombok.Data;
import java.util.List;
+import java.time.LocalDate;
@Schema(description = "绠$悊鍚庡彴 - 璇环姣斾环纭杞鍗� Request VO")
@Data
@@ -14,6 +15,10 @@
@NotNull(message = "璇环鍗旾D涓嶈兘涓虹┖")
private Long id;
+ @Schema(description = "閲囪喘璁㈠崟浠樻鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "浠樻鏃ユ湡涓嶈兘涓虹┖锛岃閫夋嫨浠樻鏃ユ湡鍚庣‘璁よ浠�")
+ private LocalDate paymentDate;
+
@Schema(description = "姣忎釜浜у搧閫変腑鐨勪腑鏍囨姤浠凤紱涓虹┖鏃朵娇鐢ㄨ浠峰崟涓凡淇濆瓨鐨勪腑鏍囬�夋嫨")
private List<Selection> selections;
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierRespVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierRespVO.java
index 538b529..76226b7 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierRespVO.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierRespVO.java
@@ -47,6 +47,9 @@
@Schema(description = "鍏徃缃戝潃")
private String website;
+ @Schema(description = "鍏徃鐢佃瘽", example = "0513-88886666")
+ private String companyPhone;
+
@Schema(description = "鑱旂郴浜�")
private String contactName;
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierSaveReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierSaveReqVO.java
index 23d7cca..82ea3e7 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierSaveReqVO.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierSaveReqVO.java
@@ -50,6 +50,9 @@
@Schema(description = "鍏徃缃戝潃")
private String website;
+ @Schema(description = "鍏徃鐢佃瘽", example = "0513-88886666")
+ private String companyPhone;
+
@Schema(description = "鑱旂郴浜�")
private String contactName;
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierDO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierDO.java
index 1aa8317..0963428 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierDO.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierDO.java
@@ -35,6 +35,7 @@
private String legalPerson;
private String address;
private String website;
+ private String companyPhone;
private String contactName;
private String contactMobile;
private String contactEmail;
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryServiceImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryServiceImpl.java
index ac4ef43..10ebb6d 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryServiceImpl.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryServiceImpl.java
@@ -400,6 +400,7 @@
ErpPurchaseOrderCreateReqDTO createReqDTO = new ErpPurchaseOrderCreateReqDTO();
createReqDTO.setSupplierId(supplierId);
createReqDTO.setOrderTime(LocalDateTime.now());
+ createReqDTO.setPaymentDate(confirmReqVO.getPaymentDate().atStartOfDay());
createReqDTO.setDiscountPercent(BigDecimal.ZERO);
createReqDTO.setDepositPrice(BigDecimal.ZERO);
createReqDTO.setSourceType(2);
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 2334e00..bd5ea56 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
@@ -74,6 +74,7 @@
MES_WORK_ORDER_TECHNICAL_FILE("mes_work_order_technical_file", "鐢熶骇宸ュ崟鎶�鏈枃浠跺揩鐓�"),
MES_QC_IQC_ATTACHMENT("mes_qc_iqc_attachment", "鏉ユ枡璐ㄦ闄勪欢"),
MES_QC_IPQC_ATTACHMENT("mes_qc_ipqc_attachment", "杩囩▼璐ㄦ闄勪欢"),
+ MES_QC_IPQC_DETAIL_ATTACHMENT("mes_qc_ipqc_detail_attachment", "杩囩▼璐ㄦ妫�楠岃闄勪欢"),
MES_QC_OQC_ATTACHMENT("mes_qc_oqc_attachment", "鍑鸿揣璐ㄦ闄勪欢"),
MES_QC_PATROL_ATTACHMENT("mes_qc_patrol_attachment", "璐ㄩ噺宸℃闄勪欢"),
MES_QC_RQC_ATTACHMENT("mes_qc_rqc_attachment", "閫�璐ц川妫�闄勪欢"),
diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index 492e4c0..71b4ba9 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -212,8 +212,8 @@
qcreport: # 鏅鸿兘璐ㄦ鎶ュ憡
pdf: # PDF 鍑轰欢锛氭湇鍔$璋� Chromium 鎶婃姤鍛� HTML 鎵撳嵃鎴� PDF
enabled: true # 鍏虫帀鍚庡鍑烘帴鍙d細鏄庣‘鎶ャ�屾湭鍚敤銆嶏紝鑰屼笉鏄姏 500
- channel: chrome # 娴忚鍣ㄩ�氶亾锛屾湰鏈哄凡瑁� Chrome锛涚暀绌哄垯鐢� Playwright 鑷甫鐨� Chromium锛堥渶鍏堟墽琛� playwright install chromium锛岀害 150MB锛�
- executable-path: '' # 娴忚鍣ㄥ彲鎵ц鏂囦欢璺緞锛岄厤浜嗗氨浼樺厛浜� channel锛岀敤浜庤鍦ㄩ潪鏍囧噯浣嶇疆鐨勬祻瑙堝櫒
+ channel: '' # 浣跨敤涓嬮潰鎸囧畾鐨勬湰鏈烘祻瑙堝櫒
+ executable-path: '/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge' # 鏈満 Edge 鍙墽琛屾枃浠�
concurrency: 2 # 鍚屾椂杩涜鐨� PDF 娓叉煋涓婇檺锛孋hromium 寰堝悆鍐呭瓨锛屼笉瑕佹斁寮�
timeout-ms: 30000 # 鍗曟娓叉煋瓒呮椂锛堟绉掞級锛屽悓鏃朵篃鏄帓闃熺瓑骞跺彂鍚嶉鐨勪笂闄�
show-page-number: true # 椤佃剼鎵撳嵃銆岀 N 椤� / 鍏� M 椤点��
--
Gitblit v1.9.3