diff --git a/klp-ui/src/views/wms/coil/merge.vue b/klp-ui/src/views/wms/coil/merge.vue
index 41503338..1f6df764 100644
--- a/klp-ui/src/views/wms/coil/merge.vue
+++ b/klp-ui/src/views/wms/coil/merge.vue
@@ -766,10 +766,12 @@ export default {
const coilId = response.data;
- addCoilContractRel({
- coilId: coilId,
- contractId: this.targetCoil.contractId,
- })
+ if (this.targetCoil.contractId) {
+ addCoilContractRel({
+ coilId: coilId,
+ contractId: this.targetCoil.contractId,
+ })
+ }
this.$message.success('合卷保存成功');
// 延迟返回，让用户看到成功提示
diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
index cb9fdc68..c2c1a0ef 100644
--- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue
+++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
@@ -675,10 +675,12 @@ export default {
// 新增分条：调用创建接口
res = await createSpecialChild(this.coilId, this.actionId, splitData)
// 新增分条后，需要添加分条的合同关系
- addCoilContractRel({
- coilId: res.data.coilId,
- contractId: this.splitForm.contractId,
- })
+ if (this.splitForm.contractId) {
+ addCoilContractRel({
+ coilId: res.data.coilId,
+ contractId: this.splitForm.contractId,
+ })
+ }
}
this.$message.success(this.splitForm.coilId ? '编辑分条成功' : '新增分条成功')
diff --git a/klp-ui/src/views/wms/coil/split.vue b/klp-ui/src/views/wms/coil/split.vue
index ae430500..17871357 100644
--- a/klp-ui/src/views/wms/coil/split.vue
+++ b/klp-ui/src/views/wms/coil/split.vue
@@ -684,12 +684,15 @@ export default {
// 拿到多个子卷的coilId
const newCoilIds = response.msg.split(',');
+ // 先构建所有的请求体，并移除合同为空为空的项
+ const requests = newCoilIds.map((coilId, index) => ({
+ coilId,
+ contractId: this.splitList[index].contractId
+ }))
+ .filter(req => req.contractId);
// 为每个子卷添加合同关联
- Promise.all(newCoilIds.map(async (coilId, index) => {
- addCoilContractRel({
- coilId,
- contractId: this.splitList[index].contractId
- });
+ Promise.all(requests.map(async (req, index) => {
+ addCoilContractRel(req);
}));
// 如果是从待操作列表进来的，标记操作为完成
diff --git a/klp-ui/src/views/wms/report/template/comprehensive.vue b/klp-ui/src/views/wms/report/template/comprehensive.vue
index 04e7748b..d2b61d38 100644
--- a/klp-ui/src/views/wms/report/template/comprehensive.vue
+++ b/klp-ui/src/views/wms/report/template/comprehensive.vue
@@ -26,10 +26,10 @@
+ type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始日期">
至
+ type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束日期">
diff --git a/script/sql/mysql/spec.sql b/script/sql/mysql/spec.sql
new file mode 100644
index 00000000..7f632341
--- /dev/null
+++ b/script/sql/mysql/spec.sql
@@ -0,0 +1,93 @@
+create table wms_process_spec
+(
+ spec_id bigint auto_increment comment '规程ID'
+ primary key,
+ spec_code varchar(50) not null comment '规程编号',
+ spec_name varchar(100) not null comment '规程名称',
+ spec_type varchar(20) not null comment '规程类型（PROCESS=工艺规程，STANDARD=工艺标准）',
+ line_id bigint not null comment '产线ID',
+ product_type varchar(50) null comment '产品类型（如HB）',
+ is_enabled tinyint(1) default 1 not null comment '是否启用（0=否，1=是）',
+ del_flag tinyint(1) default 0 not null comment '删除标志（0=未删除，1=已删除）',
+ remark varchar(255) null comment '备注',
+ create_time datetime default CURRENT_TIMESTAMP not null comment '创建时间',
+ create_by varchar(50) null comment '创建人',
+ update_time datetime default CURRENT_TIMESTAMP not null on update CURRENT_TIMESTAMP comment '更新时间',
+ update_by varchar(50) null comment '更新人',
+ constraint uk_spec_code
+ unique (spec_code)
+)
+ comment '规程/工艺标准主表'
+ engine = InnoDB
+ row_format = DYNAMIC;
+
+
+create table wms_process_spec_version
+(
+ version_id bigint auto_increment comment '版本ID'
+ primary key,
+ spec_id bigint not null comment '规程ID',
+ version_code varchar(50) not null comment '版本号',
+ is_active tinyint(1) default 0 not null comment '是否当前生效版本（1=是）',
+ status tinyint(1) default 1 not null comment '状态（0=禁用，1=启用）',
+ del_flag tinyint(1) default 0 not null comment '删除标志',
+ remark varchar(255) null comment '备注',
+ create_time datetime default CURRENT_TIMESTAMP not null comment '创建时间',
+ create_by varchar(50) null comment '创建人',
+ update_time datetime default CURRENT_TIMESTAMP not null on update CURRENT_TIMESTAMP comment '更新时间',
+ update_by varchar(50) null comment '更新人',
+ constraint uk_spec_version
+ unique (spec_id, version_code)
+)
+ comment '规程版本表'
+ engine = InnoDB
+ row_format = DYNAMIC;
+
+create table wms_process_plan
+(
+ plan_id bigint auto_increment comment '方案ID'
+ primary key,
+ version_id bigint not null comment '版本ID',
+ segment_type varchar(50) not null comment '段类型（INLET/PROCESS/OUTLET）',
+ segment_name varchar(100) not null comment '段名称',
+ point_name varchar(100) not null comment '点位名称',
+ point_code varchar(100) null comment '点位编码',
+ actual_point_id bigint null comment '实际点位ID（设备点位）',
+ sort_order int default 0 not null comment '排序',
+ del_flag tinyint(1) default 0 not null comment '删除标志',
+ remark varchar(255) null comment '备注',
+ create_time datetime default CURRENT_TIMESTAMP not null comment '创建时间',
+ create_by varchar(50) null comment '创建人',
+ update_time datetime default CURRENT_TIMESTAMP not null on update CURRENT_TIMESTAMP comment '更新时间',
+ update_by varchar(50) null comment '更新人',
+
+ index idx_version_id (version_id)
+)
+ comment '方案点位表'
+ engine = InnoDB
+ row_format = DYNAMIC;
+
+create table wms_process_plan_param
+(
+ param_id bigint auto_increment comment '参数ID'
+ primary key,
+ plan_id bigint not null comment '方案ID',
+ param_code varchar(50) not null comment '参数编码（TEMP/PRESS等）',
+ param_name varchar(100) not null comment '参数名称',
+ target_value decimal(18, 4) null comment '设定值',
+ lower_limit decimal(18, 4) null comment '下限',
+ upper_limit decimal(18, 4) null comment '上限',
+ unit varchar(20) null comment '单位',
+ sort_order int default 0 not null comment '排序',
+ del_flag tinyint(1) default 0 not null comment '删除标志',
+ remark varchar(255) null comment '备注',
+ create_time datetime default CURRENT_TIMESTAMP not null comment '创建时间',
+ create_by varchar(50) null comment '创建人',
+ update_time datetime default CURRENT_TIMESTAMP not null on update CURRENT_TIMESTAMP comment '更新时间',
+ update_by varchar(50) null comment '更新人',
+
+ index idx_plan_id (plan_id)
+)
+ comment '方案参数表'
+ engine = InnoDB
+ row_format = DYNAMIC;