From a89bc32ac906ba535feae041fba5ae2b9adce9d9 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期二, 12 八月 2025 12:40:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 db/双林新火炬MES数据库设计.pdma.json                                         |   61 +++++++++++++++++++++++++++++-
 src/main/java/org/jeecg/modules/mes/entity/MesProductionOrder.java |    6 +++
 2 files changed, 64 insertions(+), 3 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 2308f0a..8b3fc7f 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-8-7 10:18:16",
+  "updatedTime": "2025-8-12 12:29:31",
   "dbConns": [],
   "profile": {
     "default": {
@@ -10982,6 +10982,42 @@
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
           "id": "6E75C587-8628-4A76-BE8A-07CB2185F61B"
+        },
+        {
+          "defKey": "qualified_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": "B4405701-40E7-4987-B540-759F22DC5A91"
+        },
+        {
+          "defKey": "scrap_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": "48F2218D-6129-47BF-85BA-72737EEDCCAC"
         },
         {
           "defKey": "remark",
@@ -28089,6 +28125,24 @@
           "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098",
           "extProps": {},
           "uiHint": "642D2E0A-8846-4549-BE56-8C0473F26EDE"
+        },
+        {
+          "defKey": "open_id",
+          "defName": "椋炰功鐢ㄦ埛OPENID",
+          "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": "BDE72375-D196-41E2-A887-59B59C9A9479"
         }
       ],
       "indexes": [
@@ -28262,7 +28316,8 @@
           "hideInGraph": true
         }
       ],
-      "correlations": []
+      "correlations": [],
+      "notes": {}
     },
     {
       "id": "ADF40C7F-5C97-4196-BCA7-E780FCC8E2FB",
diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesProductionOrder.java b/src/main/java/org/jeecg/modules/mes/entity/MesProductionOrder.java
index 2d2f5fa..be2c9e7 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesProductionOrder.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesProductionOrder.java
@@ -126,6 +126,12 @@
     /**瀹㈡埛鍚嶇О*/
     @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
     private String customer;
+    /**鍚堟牸鏁伴噺*/
+    @ApiModelProperty(value = "鍚堟牸鏁伴噺")
+    private BigDecimal qualifiedQuantity;
+    /**鎶ュ簾鏁伴噺*/
+    @ApiModelProperty(value = "鎶ュ簾鏁伴噺")
+    private BigDecimal scrapQuantity;
     /**澶囨敞*/
     @ApiModelProperty(value = "澶囨敞")
     private String remark;

--
Gitblit v1.9.3