From d72804d55d328bf0a4ba1cd3679da5e87e3eeffc Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 07 三月 2025 16:43:03 +0800
Subject: [PATCH] #新增 1. 新增采购PO单 2. 新增采购PO单明细
---
rsf-server/src/main/java/purchaseItem.sql | 18 +++---
rsf-admin/src/i18n/zh.js | 33 +++++++++++
rsf-admin/src/i18n/en.js | 48 ++++++++++++++++
rsf-admin/src/page/ResourceContent.js | 6 ++
rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java | 4
rsf-server/src/main/java/purchase.sql | 14 ++--
6 files changed, 106 insertions(+), 17 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 361b5b5..e2a33b9 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -137,6 +137,8 @@
serialRule: 'SerialRule',
asnOrder: 'AsnOrder',
asnOrderItem: 'AsnOrderItem',
+ purchase: 'Purchase',
+ purchaseItem: 'PurchaseItem',
whMat: 'Warehouse Mat',
},
table: {
@@ -431,6 +433,52 @@
packName: "packName",
ntyStatus: "ntyStatus",
},
+ purchaseItem: {
+ purchaseId: "purchaseId",
+ erpItemId: "erpItemId",
+ matnrCode: "matnrCode",
+ matnrName: "matnrName",
+ unit: "unit",
+ anfme: "anfme",
+ qty: "qty",
+ nromQty: "nromQty",
+ asnQty: "asnQty",
+ printQty: "printQty",
+ splrName: "splrName",
+ splrCode: "splrCode",
+ splrBatch: "splrBatch",
+ },
+ purchase: {
+ code: "code",
+ erpId: "erpId",
+ type: "type",
+ wkType: "wkType",
+ source: "source",
+ preArr: "preArr",
+ anfme: "anfme",
+ qty: "qty",
+ workQty: "workQty",
+ channel: "channel",
+ erpCode: "erpCode",
+ project: "project",
+ startTime: "startTime",
+ endTime: "endTime",
+ },
+ purchaseItem: {
+ purchaseId: "purchaseId",
+ erpItemId: "erpItemId",
+ matnrCode: "matnrCode",
+ matnrName: "matnrName",
+ unit: "unit",
+ anfme: "anfme",
+ qty: "qty",
+ nromQty: "nromQty",
+ asnQty: "asnQty",
+ printQty: "printQty",
+ splrName: "splrName",
+ splrCode: "splrCode",
+ splrBatch: "splrBatch",
+ },
}
},
page: {
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 13d96ee..a5b8c10 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -136,6 +136,8 @@
serialRule: '缂栫爜瑙勫垯',
asnOrder: '鏀惰揣閫氱煡鍗�',
asnOrderItem: '鏀惰揣鏄庣粏',
+ purchase: 'PO鍗�',
+ purchaseItem: 'PO鍗曟槑缁�',
whMat: '搴撳尯鐗╂枡鍏崇郴',
},
table: {
@@ -431,6 +433,37 @@
packName: "鍖呰鍚嶇О",
ntyStatus: "鎶ユ鐘舵��",
},
+ purchase: {
+ code: "缂栫爜",
+ erpId: "erp鏍囪瘑",
+ type: "鍗曟嵁绫诲瀷",
+ wkType: "涓氬姟绫诲瀷",
+ source: "鏉ユ簮",
+ preArr: "棰勮鍒拌揪",
+ anfme: "鏁伴噺",
+ qty: "宸插畬鎴愭暟閲�",
+ workQty: "鎵ц涓暟閲�",
+ channel: "鏀惰揣閫氶亾",
+ erpCode: "Erp缂栫爜",
+ project: "椤圭洰鍚嶇О",
+ startTime: "寮�濮嬫椂闂�",
+ endTime: "缁撴潫鏃堕棿",
+ },
+ purchaseItem: {
+ purchaseId: "PO涓诲崟鏍囪瘑",
+ erpItemId: "erp鏄庣粏鏍囪瘑",
+ matnrCode: "鐗╂枡缂栫爜",
+ matnrName: "鐗╂枡鍚嶇О",
+ unit: "璁￠噺鍗曚綅",
+ anfme: "鏁伴噺",
+ qty: "宸插畬鎴�",
+ nromQty: "鏍囧寘鏁伴噺",
+ asnQty: "鍗曟嵁鏁伴噺",
+ printQty: "鎵撳嵃鏁伴噺",
+ splrName: "渚涘簲鍟嗗悕绉�",
+ splrCode: "渚涘簲鍟嗙紪鐮�",
+ splrBatch: "渚涘簲鍟嗘壒娆�",
+ },
}
},
page: {
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index cdaf109..448aec3 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -29,6 +29,8 @@
import whMat from './basicInfo/whMat';
import asnOrder from './asnOrder';
import asnOrderItem from './asnOrderItem';
+import purchaseItem from './purchaseItem';
+import purchase from './purchase';
const ResourceContent = (node) => {
@@ -83,6 +85,10 @@
return asnOrder;
case 'asnOrderItem':
return asnOrderItem;
+ case 'purchaseItem':
+ return purchaseItem;
+ case 'purchase':
+ return purchase;
default:
return {
list: ListGuesser,
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
index cc710a8..68d4754 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
@@ -22,8 +22,8 @@
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table="man_asn_order_item";
- generator.tableDesc="ASN鍗曟嵁";
+ generator.table="man_purchase_item";
+ generator.tableDesc="閲囪喘鏄庣粏鍗�";
generator.packagePath="com.vincent.rsf.server.manager";
generator.build();
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
diff --git a/rsf-server/src/main/java/purchaseItem.sql b/rsf-server/src/main/java/purchaseItem.sql
index 25a5cc5..acb3d51 100644
--- a/rsf-server/src/main/java/purchaseItem.sql
+++ b/rsf-server/src/main/java/purchaseItem.sql
@@ -2,10 +2,10 @@
-- mysql
insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `tenant_id`, `status`) values ( 'menu.purchaseItem', '0', '/manager/purchaseItem', 'purchaseItem', '0' , '0', '1' , '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query ERP閲囪喘鍗�', '', '1', 'manager:purchaseItem:list', '0', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create ERP閲囪喘鍗�', '', '1', 'manager:purchaseItem:save', '1', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update ERP閲囪喘鍗�', '', '1', 'manager:purchaseItem:update', '2', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete ERP閲囪喘鍗�', '', '1', 'manager:purchaseItem:remove', '3', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query 閲囪喘鏄庣粏鍗�', '153', '1', 'manager:purchaseItem:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create 閲囪喘鏄庣粏鍗�', '153', '1', 'manager:purchaseItem:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update 閲囪喘鏄庣粏鍗�', '153', '1', 'manager:purchaseItem:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete 閲囪喘鏄庣粏鍗�', '153', '1', 'manager:purchaseItem:remove', '3', '1', '1');
-- locale menu name
purchaseItem: 'PurchaseItem',
@@ -13,18 +13,18 @@
-- locale field
purchaseItem: {
purchaseId: "purchaseId",
- erpId: "erpId",
+ erpItemId: "erpItemId",
matnrCode: "matnrCode",
matnrName: "matnrName",
unit: "unit",
anfme: "anfme",
qty: "qty",
- nomQty: "nomQty",
+ nromQty: "nromQty",
asnQty: "asnQty",
printQty: "printQty",
- pulrName: "pulrName",
- pulrCode: "pulrCode",
- pulrBatch: "pulrBatch",
+ splrName: "splrName",
+ splrCode: "splrCode",
+ splrBatch: "splrBatch",
},
-- ResourceContent
--
Gitblit v1.9.1