From 9f37292eeac1d30b5d3b10182a6df0cb33df6a23 Mon Sep 17 00:00:00 2001
From: geht <2947093423@qq.com>
Date: Wed, 20 May 2026 16:12:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=83=B6=E6=96=99=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E4=B8=BA=E8=83=B6=E6=96=99=E5=88=AB=E5=90=8D=EF=BC=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5=E5=92=8C?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E5=AD=97=E6=AE=B5=E4=BB=A5=E6=94=AF=E6=8C=81=E8=83=B6?=
 =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF=E8=A1=A5=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MesXslOpenMillParamController.java        |  2 +-
 .../xslmes/entity/MesXslOpenMillParam.java    |  4 +-
 ...3.9.2_85__mes_material_glue_fields_fix.sql | 39 +++++++++++++++++++
 .../MesXslOpenMillParam.data.ts               | 10 ++---
 .../components/MesXslOpenMillParamModal.vue   |  2 +-
 5 files changed, 48 insertions(+), 9 deletions(-)
 create mode 100644 jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_85__mes_material_glue_fields_fix.sql

diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslOpenMillParamController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslOpenMillParamController.java
index 36030fa..23d9d1e 100644
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslOpenMillParamController.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslOpenMillParamController.java
@@ -138,7 +138,7 @@ public class MesXslOpenMillParamController extends JeecgController<MesXslOpenMil
             return "所选胶料不存在，请重新选择";
         }
         model.setMaterialName(material.getMaterialName());
-        model.setMaterialCode(material.getMaterialCode());
+        model.setMaterialCode(oConvertUtils.isEmpty(material.getAliasName()) ? "" : material.getAliasName());
         String timeErr = validateTimeFields(model);
         if (timeErr != null) {
             return timeErr;
diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslOpenMillParam.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslOpenMillParam.java
index 44b6d53..43c3d6d 100644
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslOpenMillParam.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslOpenMillParam.java
@@ -39,8 +39,8 @@ public class MesXslOpenMillParam implements Serializable {
     @Schema(description = "胶料名称冗余")
     private String materialName;
 
-    @Excel(name = "胶料编码", width = 15)
-    @Schema(description = "胶料编码冗余")
+    @Excel(name = "胶料别名", width = 15)
+    @Schema(description = "胶料别名冗余（取自 mes_material.alias_name）")
     private String materialCode;
 
     @Excel(name = "R0进胶时间(秒)", width = 14)
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_85__mes_material_glue_fields_fix.sql b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_85__mes_material_glue_fields_fix.sql
new file mode 100644
index 0000000..bb66e2c
--- /dev/null
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_85__mes_material_glue_fields_fix.sql
@@ -0,0 +1,39 @@
+-- mes_material 胶料字段补全（幂等，可重复执行）
+SET NAMES utf8mb4;
+
+SET @db = DATABASE();
+
+SET @sql = IF(
+  (SELECT COUNT(*) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'mes_material' AND COLUMN_NAME = 'erp_code') = 0,
+  'ALTER TABLE `mes_material` ADD COLUMN `erp_code` varchar(64) DEFAULT NULL COMMENT ''ERP编号'' AFTER `customer_id`',
+  'SELECT 1'
+);
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @sql = IF(
+  (SELECT COUNT(*) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'mes_material' AND COLUMN_NAME = 'final_shelf_life_days') = 0,
+  'ALTER TABLE `mes_material` ADD COLUMN `final_shelf_life_days` int DEFAULT NULL COMMENT ''终炼胶保质期（天）'' AFTER `erp_code`',
+  'SELECT 1'
+);
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @sql = IF(
+  (SELECT COUNT(*) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'mes_material' AND COLUMN_NAME = 'master_shelf_life_days') = 0,
+  'ALTER TABLE `mes_material` ADD COLUMN `master_shelf_life_days` int DEFAULT NULL COMMENT ''母炼胶保质期（天）'' AFTER `final_shelf_life_days`',
+  'SELECT 1'
+);
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @sql = IF(
+  (SELECT COUNT(*) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'mes_material' AND COLUMN_NAME = 'min_standing_hours') = 0,
+  'ALTER TABLE `mes_material` ADD COLUMN `min_standing_hours` int DEFAULT NULL COMMENT ''最小停放时间（时）'' AFTER `master_shelf_life_days`',
+  'SELECT 1'
+);
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @sql = IF(
+  (SELECT COUNT(*) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'mes_material' AND COLUMN_NAME = 'is_special_rubber') = 0,
+  'ALTER TABLE `mes_material` ADD COLUMN `is_special_rubber` tinyint DEFAULT 0 COMMENT ''是否为特种胶（0否1是）'' AFTER `enable_flag`',
+  'SELECT 1'
+);
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslOpenMillParam/MesXslOpenMillParam.data.ts b/jeecgboot-vue3/src/views/xslmes/mesXslOpenMillParam/MesXslOpenMillParam.data.ts
index c4fc1e6..d45b3d0 100644
--- a/jeecgboot-vue3/src/views/xslmes/mesXslOpenMillParam/MesXslOpenMillParam.data.ts
+++ b/jeecgboot-vue3/src/views/xslmes/mesXslOpenMillParam/MesXslOpenMillParam.data.ts
@@ -2,7 +2,7 @@ import { BasicColumn, FormSchema } from '/@/components/Table';
 
 export const columns: BasicColumn[] = [
   { title: '胶料名称', align: 'center', dataIndex: 'materialName', width: 160 },
-  { title: '胶料编码', align: 'center', dataIndex: 'materialCode', width: 130 },
+  { title: '胶料别名', align: 'center', dataIndex: 'materialCode', width: 130 },
   { title: 'R0进胶时间(秒)', align: 'center', dataIndex: 'r0FeedTime', width: 120 },
   { title: 'R0成环时间(秒)', align: 'center', dataIndex: 'r0RingTime', width: 120 },
   { title: 'R0拉断时间(秒)', align: 'center', dataIndex: 'r0BreakTime', width: 120 },
@@ -27,7 +27,7 @@ export const searchFormSchema: FormSchema[] = [
     },
     colProps: { span: 6 },
   },
-  { label: '胶料编码', field: 'materialCode', component: 'JInput', colProps: { span: 6 } },
+  { label: '胶料别名', field: 'materialCode', component: 'JInput', colProps: { span: 6 } },
   { label: '胶料名称', field: 'materialName', component: 'JInput', colProps: { span: 6 } },
 ];
 
@@ -47,10 +47,10 @@ export const formSchema: FormSchema[] = [
     componentProps: { disabled: true, placeholder: '选择胶料后自动带出' },
   },
   {
-    label: '胶料编码',
+    label: '胶料别名',
     field: 'materialCode',
     component: 'Input',
-    componentProps: { disabled: true, placeholder: '选择胶料后自动带出' },
+    componentProps: { disabled: true, placeholder: '选择胶料后自动带出别名' },
   },
   {
     label: 'R0进胶时间',
@@ -111,7 +111,7 @@ export const superQuerySchema = {
     dictCode: 'id',
     dictText: 'material_name',
   },
-  materialCode: { title: '胶料编码', order: 1, view: 'text' },
+  materialCode: { title: '胶料别名', order: 1, view: 'text' },
   materialName: { title: '胶料名称', order: 2, view: 'text' },
   r0FeedTime: { title: 'R0进胶时间', order: 3, view: 'number' },
   r0RingTime: { title: 'R0成环时间', order: 4, view: 'number' },
diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslOpenMillParam/components/MesXslOpenMillParamModal.vue b/jeecgboot-vue3/src/views/xslmes/mesXslOpenMillParam/components/MesXslOpenMillParamModal.vue
index 4d9ba80..af80734 100644
--- a/jeecgboot-vue3/src/views/xslmes/mesXslOpenMillParam/components/MesXslOpenMillParamModal.vue
+++ b/jeecgboot-vue3/src/views/xslmes/mesXslOpenMillParam/components/MesXslOpenMillParamModal.vue
@@ -67,7 +67,7 @@
       const row = (raw as Recordable)?.materialName != null ? raw : (raw as Recordable)?.result;
       if (row) {
         model.materialName = row.materialName ?? '';
-        model.materialCode = row.materialCode ?? '';
+        model.materialCode = row.aliasName ?? '';
       }
     } catch {
       model.materialName = '';