From 8eaee61fbbdea1eaa294b0f1a7d9f2a10da9ade9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 10 三月 2025 17:06:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev

---
 rsf-server/src/main/java/matnr.sql |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/rsf-server/src/main/java/matnr.sql b/rsf-server/src/main/java/matnr.sql
index 281034f..b5ffa42 100644
--- a/rsf-server/src/main/java/matnr.sql
+++ b/rsf-server/src/main/java/matnr.sql
@@ -2,33 +2,41 @@
 -- mysql
 insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `tenant_id`, `status`) values ( 'menu.matnr', '0', '/manager/matnr', 'matnr', '0' , '0', '1' , '1');
 
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query 鐗╂枡琛�', '57', '1', 'manager:matnr:list', '0', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create 鐗╂枡琛�', '57', '1', 'manager:matnr:save', '1', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update 鐗╂枡琛�', '57', '1', 'manager:matnr:update', '2', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete 鐗╂枡琛�', '57', '1', 'manager:matnr:remove', '3', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query 鐗╂枡淇℃伅琛�', '', '1', 'manager:matnr:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create 鐗╂枡淇℃伅琛�', '', '1', 'manager:matnr:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update 鐗╂枡淇℃伅琛�', '', '1', 'manager:matnr:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete 鐗╂枡淇℃伅琛�', '', '1', 'manager:matnr:remove', '3', '1', '1');
 
 -- locale menu name
 matnr: 'Matnr',
 
 -- locale field
 matnr: {
-    shipperId: "shipperId",
     name: "name",
     code: "code",
+    shipperId: "shipperId",
     groupId: "groupId",
+    batchRegularId: "batchRegularId",
     erpCode: "erpCode",
     spec: "spec",
     model: "model",
     weight: "weight",
     color: "color",
     size: "size",
-    desc: "desc",
+    describle: "describle",
     nromNum: "nromNum",
     unit: "unit",
     purchaseUnit: "purchaseUnit",
     stockUnit: "stockUnit",
     stockLeval: "stockLeval",
     isLabelMange: "isLabelMange",
+    safetyQty: "safetyQty",
+    minQty: "minQty",
+    maxQty: "maxQty",
+    stagnate: "stagnate",
+    validity: "validity",
+    validityWarr: "validityWarr",
+    flagCheck: "flagCheck",
 },
 
 -- ResourceContent

--
Gitblit v1.9.1