From a76e1d17d67641993dea6335cb8e1465a94df58d Mon Sep 17 00:00:00 2001 From: liding <756868258@qq.com> Date: 星期四, 21 五月 2026 15:39:05 +0800 Subject: [PATCH] feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.xml添加排序功能 2- 在ProductionProductMainDto中新增bomInputQty字段用于产品结构投入数量 3- 修改ProductionProductMainServiceImpl中投入数量计算逻辑，使用前端传入的bomInputQty值 4- 在ProductWorkOrderDto中添加bomInputQty字段并在服务实现中计算标准投入数量 5- 更新SalesLedgerMapper.xml查询逻辑，从product_summary获取电压信息 6- 为SalesLedgerProduct添加stockId字段并修改库存扣减逻辑使用具体库存ID 7- 重构StockInventoryController中的成品库存树查询接口和导入导出功能 8- 新增成品和非成品库存导入导出的数据模型和Excel工具类 9- 优化StockInventoryServiceImpl中的库存扣减逻辑，支持按特定库存ID操作 10- 更新库存导入导出功能，区分成品和非成品类型并提供相应模板 --- doc/create_table_process_route_item.sql | 64 ++++++++++++++++++++++++++++--- 1 files changed, 57 insertions(+), 7 deletions(-) diff --git a/doc/create_table_process_route_item.sql b/doc/create_table_process_route_item.sql index baab7d9..a1efff9 100644 --- a/doc/create_table_process_route_item.sql +++ b/doc/create_table_process_route_item.sql @@ -2,11 +2,61 @@ drop table if exists process_route_item; create table process_route_item ( - id bigint auto_increment primary key, - route_id bigint not null default 0 comment '宸ヨ壓璺嚎id', - product_model_id bigint not null default 0 comment '浜у搧id', - process_id bigint not null default 0 comment '宸ュ簭id', - tenant_id bigint not null comment '绉熸埛id', - create_time datetime null comment '褰曞叆鏃堕棿', - update_time datetime null comment '鏇存柊鏃堕棿' + id bigint auto_increment primary key, + route_id bigint not null default 0 comment '宸ヨ壓璺嚎id', + product_model_id bigint not null default 0 comment '浜у搧id', + process_id bigint not null default 0 comment '宸ュ簭id', + tenant_id bigint not null comment '绉熸埛id', + create_time datetime null comment '褰曞叆鏃堕棿', + update_time datetime null comment '鏇存柊鏃堕棿' ); + +# 鐢熶骇宸ヨ壓璺嚎椤圭洰 +drop table if exists product_process_route_item; +create table product_process_route_item +( + id bigint auto_increment primary key, + route_id bigint not null default 0 comment '宸ヨ壓璺嚎id', + product_model_id bigint not null default 0 comment '閿�鍞彴璐︿骇鍝乮d', + process_id bigint not null default 0 comment '宸ュ簭id', + tenant_id bigint not null comment '绉熸埛id', + create_time datetime null comment '褰曞叆鏃堕棿', + update_time datetime null comment '鏇存柊鏃堕棿' +); + +# 鐢熶骇璁㈠崟 +drop table if exists product_order; +create table product_order +( + id bigint auto_increment primary key, + sales_ledger_id bigint not null default 0 comment '閿�鍞彴璐d', + product_model_id bigint not null default 0 comment '閿�鍞彴璐︿骇鍝乮d', + route_id bigint not null default 0 comment '宸ヨ壓璺嚎id', + nps_no varchar(255) not null default '' comment '鐢熶骇璁㈠崟鍙�', + status int not null default 0 comment '鐘舵�� 0 寰呯‘璁� 1 宸茬‘璁�', + tenant_id bigint not null comment '绉熸埛id', + create_time datetime null comment '褰曞叆鏃堕棿', + update_time datetime null comment '鏇存柊鏃堕棿' +); +alter table quality_inspect + add purchase_ledger_id int null comment '閲囪喘璁㈠崟id'; + +# 鐢熶骇宸ュ崟 +drop table if exists product_work_order; +create table product_work_order +( + id bigint auto_increment primary key, + product_process_route_item_id bigint not null default 0 comment '宸ヨ壓璺嚎椤圭洰id', + create_time datetime null comment '褰曞叆鏃堕棿', + update_time datetime null comment '鏇存柊鏃堕棿', + work_order_no varchar(255) not null default '' comment '宸ュ崟缂栧彿', + plan_start_time datetime null comment '璁″垝寮�濮嬫椂闂�', + plan_end_time datetime null comment '璁″垝缁撴潫鏃堕棿', + actual_start_time datetime null comment '瀹為檯寮�濮嬫椂闂�', + actual_end_time datetime null comment '瀹為檯缁撴潫鏃堕棿', + status int not null default 0 comment '鐘舵�� 1 寰呯‘璁� 2 寰呯敓浜� 3鐢熶骇涓� 4宸茬敓浜� ', + tenant_id bigint not null comment '绉熸埛id' +); + +alter table product_process + add salary_quota numeric(16,3) null comment '宸ヨ祫瀹氶'; \ No newline at end of file -- Gitblit v1.9.3