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/purchase.sql |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/rsf-server/src/main/java/purchase.sql b/rsf-server/src/main/java/purchase.sql
index 6b17750..976bf84 100644
--- a/rsf-server/src/main/java/purchase.sql
+++ b/rsf-server/src/main/java/purchase.sql
@@ -2,10 +2,10 @@
 -- mysql
 insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `tenant_id`, `status`) values ( 'menu.purchase', '0', '/manager/purchase', 'purchase', '0' , '0', '1' , '1');
 
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query ERP閲囪喘鍗�', '', '1', 'manager:purchase:list', '0', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create ERP閲囪喘鍗�', '', '1', 'manager:purchase:save', '1', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update ERP閲囪喘鍗�', '', '1', 'manager:purchase:update', '2', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete ERP閲囪喘鍗�', '', '1', 'manager:purchase:remove', '3', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query 閲囪喘鍗�', '148', '1', 'manager:purchase:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create 閲囪喘鍗�', '148', '1', 'manager:purchase:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update 閲囪喘鍗�', '148', '1', 'manager:purchase:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete 閲囪喘鍗�', '148', '1', 'manager:purchase:remove', '3', '1', '1');
 
 -- locale menu name
 purchase: 'Purchase',
@@ -13,17 +13,19 @@
 -- locale field
 purchase: {
     code: "code",
+    erpId: "erpId",
     type: "type",
-    from: "from",
+    wkType: "wkType",
+    source: "source",
     preArr: "preArr",
     anfme: "anfme",
     qty: "qty",
     workQty: "workQty",
     channel: "channel",
     erpCode: "erpCode",
+    project: "project",
     startTime: "startTime",
     endTime: "endTime",
-    project: "project",
 },
 
 -- ResourceContent

--
Gitblit v1.9.1