From 0b7d47d840d08201cdcef9a19b4950fb06c14c5e Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 04 九月 2025 17:30:33 +0800
Subject: [PATCH] art: 上料、报工业务表设计修改
---
db/双林新火炬MES数据库设计.pdma.json | 424 ++++++++++++++++++++++++++++++++++++++++++++--------
src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInventoryController.java | 2
2 files changed, 360 insertions(+), 66 deletions(-)
diff --git "a/db/\345\217\214\346\236\227\346\226\260\347\201\253\347\202\254MES\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json" "b/db/\345\217\214\346\236\227\346\226\260\347\201\253\347\202\254MES\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
index 5d0ef62..a6db9bb 100644
--- "a/db/\345\217\214\346\236\227\346\226\260\347\201\253\347\202\254MES\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
+++ "b/db/\345\217\214\346\236\227\346\226\260\347\201\253\347\202\254MES\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
@@ -2,9 +2,9 @@
"name": "鍙屾灄鏂扮伀鐐琈ES鏁版嵁搴撹璁�",
"describe": "鎻忚堪鍙岃柂鏂扮伀鐐琈ES鏁版嵁搴撹璁¤鎯�",
"avatar": "",
- "version": "4.9.4",
+ "version": "4.9.2",
"createdTime": "2025-3-10 16:38:19",
- "updatedTime": "2025-9-4 11:02:24",
+ "updatedTime": "2025-9-4 17:25:33",
"dbConns": [],
"profile": {
"default": {
@@ -632,7 +632,7 @@
"#DDE5FF"
],
"DDLToggleCase": "L",
- "menuWidth": "331px"
+ "menuWidth": "371px"
},
"entities": [
{
@@ -62296,7 +62296,7 @@
},
{
"defKey": "receiver",
- "defName": "鎺ユ敹浜�",
+ "defName": "鍏ュ簱浜�",
"comment": "",
"type": "",
"len": "",
@@ -62314,7 +62314,7 @@
},
{
"defKey": "receive_time",
- "defName": "鎺ユ敹鏃堕棿",
+ "defName": "鍏ュ簱鏃堕棿",
"comment": "",
"type": "",
"len": "",
@@ -63398,7 +63398,7 @@
"refDict": "",
"baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
"extProps": {},
- "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
"id": "0A646552-E539-44E6-AB49-69CF4BF16522"
},
{
@@ -63434,7 +63434,7 @@
"refDict": "",
"baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
"extProps": {},
- "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
"id": "6C143A29-E3B5-4308-A60F-D07E44C58B66"
},
{
@@ -65364,8 +65364,8 @@
"id": "FBAA1CFF-AA71-46F8-B401-4EC0D39B022A"
},
{
- "defKey": "work_order_id",
- "defName": "宸ュ崟ID",
+ "defKey": "factory_id",
+ "defName": "浜х嚎ID",
"comment": "",
"type": "",
"len": "",
@@ -65379,61 +65379,7 @@
"baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
"extProps": {},
"domain": "16120F75-6AA7-4483-868D-F07F511BB081",
- "id": "F9190578-1B7F-4A04-9F9F-EF15CE3E043C"
- },
- {
- "defKey": "equipment_id",
- "defName": "璁惧ID",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
- "extProps": {},
- "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
- "id": "291AF57C-AD4F-4691-BF15-1BDC4629A521"
- },
- {
- "defKey": "process_code",
- "defName": "宸ュ簭缂栫爜",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
- "extProps": {},
- "domain": "BE09D493-E183-402D-ACC4-EEA21EB35B8E",
- "id": "3501D104-6767-40E3-8A99-0BDF17960C29"
- },
- {
- "defKey": "process_name",
- "defName": "宸ュ簭鍚嶇О",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
- "extProps": {},
- "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
- "id": "73290052-0C81-442D-BE27-B8CF1496F69E"
+ "id": "2E08DF6D-E39A-4798-BC2A-B56CC7AE66B1"
},
{
"defKey": "material_number",
@@ -69017,6 +68963,353 @@
"correlations": [],
"indexes": [],
"type": "P"
+ },
+ {
+ "id": "A3B555E5-225C-4432-9CB0-05A1C372AB83",
+ "env": {
+ "base": {
+ "nameSpace": "",
+ "codeRoot": ""
+ }
+ },
+ "defKey": "mes_material_consumption_detail",
+ "defName": "鐗╂枡娑堣�楁槑缁�",
+ "comment": "",
+ "properties": {
+ "partitioned by": "(date string)",
+ "row format delimited": "",
+ "fields terminated by ','": "",
+ "collection items terminated by '-'": "",
+ "map keys terminated by ':'": "",
+ "store as textfile;": ""
+ },
+ "sysProps": {
+ "nameTemplate": "{defKey}[{defName}]"
+ },
+ "notes": {},
+ "headers": [
+ {
+ "refKey": "hideInGraph",
+ "hideInGraph": true
+ },
+ {
+ "refKey": "defKey",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "defName",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "primaryKey",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "notNull",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "autoIncrement",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "domain",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "type",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "len",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "scale",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "comment",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "refDict",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "defaultValue",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "isStandard",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "uiHint",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "extProps",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr1",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr2",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr3",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr4",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr5",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr6",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr7",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr8",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr9",
+ "freeze": false,
+ "hideInGraph": true
+ }
+ ],
+ "fields": [
+ {
+ "defKey": "id",
+ "defName": "涓婚敭",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": true,
+ "notNull": true,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+ "id": "E84CB7D9-BB16-4D0C-B592-8C4384FFAC3B"
+ },
+ {
+ "defKey": "create_by",
+ "defName": "鍒涘缓浜�",
+ "comment": "",
+ "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": true,
+ "refDict": "",
+ "uiHint": "",
+ "id": "9D7DA32B-70D5-4F8E-929F-F178796661E6",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
+ },
+ {
+ "defKey": "create_time",
+ "defName": "鍒涘缓鏃堕棿",
+ "comment": "",
+ "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": true,
+ "refDict": "",
+ "uiHint": "",
+ "id": "6FCE5A8C-426B-4191-B841-C9C529F927DA",
+ "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
+ },
+ {
+ "defKey": "order_id",
+ "defName": "璁㈠崟ID",
+ "comment": "鍗婃垚鍝佹姤宸ワ紝鏃犻渶缁戝畾鍒扮敓浜ц鍗�",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+ "refDict": "",
+ "extProps": {},
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "A9C8CDA4-F073-46FD-AAB4-D6401B7E5E8D",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
+ },
+ {
+ "defKey": "work_order_id",
+ "defName": "宸ュ崟ID",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+ "refDict": "",
+ "extProps": {},
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "9B945A59-DF7A-4234-8C3C-8AA7BBFE9509",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
+ },
+ {
+ "defKey": "factory_id",
+ "defName": "浜х嚎ID",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+ "refDict": "",
+ "extProps": {},
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "70FEFA77-AEE0-45C9-BAFE-D5B6E07AE987",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
+ },
+ {
+ "defKey": "reporting_id",
+ "defName": "鎶ュ伐ID",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+ "id": "C8586134-EFC2-4930-B87D-EFADF765F584"
+ },
+ {
+ "defKey": "loading_id",
+ "defName": "涓婃枡ID",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+ "id": "948875D7-C355-4E5F-8129-B3E8C2908594"
+ },
+ {
+ "defKey": "quantity",
+ "defName": "娑堣�楁暟閲�",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "1A0BDC09-0792-4174-9E8E-80BE8DF44B8E",
+ "extProps": {},
+ "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
+ "id": "73E2D815-80C9-4A31-BB07-020959BC00DD"
+ }
+ ],
+ "correlations": [],
+ "indexes": [],
+ "type": "P"
}
],
"views": [],
@@ -69858,7 +70151,8 @@
"D16FD5E0-8B16-4C0E-AD67-6E5C2FED1A65",
"5835D3E9-4B10-48DC-B116-584E447AA201",
"23C6B8F0-0010-4453-B3C2-9305746C37AB",
- "D3263A0C-1D6A-453A-B933-86651B5566FE"
+ "D3263A0C-1D6A-453A-B933-86651B5566FE",
+ "A3B555E5-225C-4432-9CB0-05A1C372AB83"
],
"refViews": [],
"refDiagrams": [],
diff --git a/src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInventoryController.java b/src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInventoryController.java
index b24ab65..289372e 100644
--- a/src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInventoryController.java
+++ b/src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInventoryController.java
@@ -45,7 +45,7 @@
*/
@ApiOperation(value = "鐗╂枡搴撳瓨淇℃伅-鍒嗛〉鍒楄〃鏌ヨ", notes = "鐗╂枡搴撳瓨淇℃伅-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
- public Result<IPage<LswMaterialInventory>> queryPageList(@RequestParam(name = "materialId") String materialId,
+ public Result<IPage<LswMaterialInventory>> queryPageList(@RequestParam(name = "materialId", defaultValue = "null") String materialId,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
LambdaQueryWrapper<LswMaterialInventory> queryWrapper = new LambdaQueryWrapper<>();
--
Gitblit v1.9.3