From 9e253a7fd8f57e1f7c3e7288a36167ff878ab28d Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 06 十一月 2023 21:59:43 +0800
Subject: [PATCH] 库存管理添加粮权字段

---
 igds-core/src/main/java/com/ld/igds/models/DepotStore.java   |    4 ++++
 igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml |   12 ++++++------
 igds-core/src/main/resources/mapper/CommonMapper.xml         |    9 ++++++---
 igds-core/src/main/java/models/igds.model.xml                |    8 ++++++--
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/igds-core/src/main/java/com/ld/igds/models/DepotStore.java b/igds-core/src/main/java/com/ld/igds/models/DepotStore.java
index 79f4529..1478a45 100644
--- a/igds-core/src/main/java/com/ld/igds/models/DepotStore.java
+++ b/igds-core/src/main/java/com/ld/igds/models/DepotStore.java
@@ -119,6 +119,10 @@
     @PropertyDef(label = "淇敼浜�")
     private String updateUser;
 
+    @PropertyDef(label = "绮潈褰掑睘鍗曚綅浠g爜")
+    @Column(name = "lqgsdwdm", length = 18)
+    private String lqgsdwdm;
+
 
     @Column(name = "UPDATE_DATE_")
     @PropertyDef(label = "淇敼鏃堕棿")
diff --git a/igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml b/igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml
index 6b30a9d..591ede9 100644
--- a/igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml
@@ -152,6 +152,7 @@
           <Property name="labelAlign">right</Property>
           <Property name="cols">*,*</Property>
           <Property name="labelWidth">120</Property>
+          <Property name="height">85%</Property>
           <AutoFormElement>
             <Property name="name">depotId</Property>
             <Property name="property">depotId</Property>
@@ -187,16 +188,15 @@
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
+            <Property name="name">lqgsdwdm</Property>
+            <Property name="property">lqgsdwdm</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
             <Property name="name">manageType</Property>
             <Property name="property">manageType</Property>
             <Editor/>
           </AutoFormElement>
-          <Label>
-            <Property name="style">
-              <Property name="color">red</Property>
-              <Property name="font-size">12px</Property>
-            </Property>
-          </Label>
           <AutoFormElement>
             <Property name="name">foodYear</Property>
             <Property name="property">foodYear</Property>
diff --git a/igds-core/src/main/java/models/igds.model.xml b/igds-core/src/main/java/models/igds.model.xml
index 49293d4..d1503fb 100644
--- a/igds-core/src/main/java/models/igds.model.xml
+++ b/igds-core/src/main/java/models/igds.model.xml
@@ -504,6 +504,10 @@
     <PropertyDef name="createDate">
       <Property name="dataType">Date</Property>
     </PropertyDef>
+    <PropertyDef name="lqgsdwdm">
+      <Property/>
+      <Property name="label">绮潈鍗曚綅浠g爜</Property>
+    </PropertyDef>
   </DataType>
   <DataType name="dtDevice">
     <Property name="creationType">com.ld.igds.models.Device</Property>
@@ -959,7 +963,7 @@
       </Property>
     </PropertyDef>
     <PropertyDef name="pestSer">
-      <Property/>
+      <Property></Property>
       <Property name="label">姘斾綋鍒嗘満</Property>
       <Property name="mapping">
         <Property name="mapValues">${dorado.getDataProvider(&quot;deviceSerPR#getAllSerCache&quot;).getResult()}</Property>
@@ -968,7 +972,7 @@
       </Property>
     </PropertyDef>
     <PropertyDef name="verbSer">
-      <Property/>
+      <Property></Property>
       <Property name="label">閫氶鍒嗘満</Property>
       <Property name="mapping">
         <Property name="mapValues">${dorado.getDataProvider(&quot;deviceSerPR#getAllSerCache&quot;).getResult()}</Property>
diff --git a/igds-core/src/main/resources/mapper/CommonMapper.xml b/igds-core/src/main/resources/mapper/CommonMapper.xml
index a31668c..99e26a3 100644
--- a/igds-core/src/main/resources/mapper/CommonMapper.xml
+++ b/igds-core/src/main/resources/mapper/CommonMapper.xml
@@ -58,7 +58,8 @@
 		GRAIN_VOLUME_ as grainVolume,
 		UPDATE_USER_ as updateUser,
 		UPDATE_DATE_ as updateDate,
-		CREATE_DATE_ as createDate
+		CREATE_DATE_ as createDate,
+        lqgsdwdm as lqgsdwdm
 		from D_DEPOT_STORE
 		where  DEPOT_ID_ = #{depotId}
 		ORDER  BY CREATE_DATE_ DESC
@@ -89,7 +90,8 @@
 	    REMARK_,
 	    UPDATE_USER_,
 	    UPDATE_DATE_,
-	    CREATE_DATE_
+	    CREATE_DATE_,
+		lqgsdwdm
 		) values(
 		#{data.id},
 		#{data.companyId},
@@ -111,7 +113,8 @@
 		#{data.remark},
 		#{data.updateUser},
 		#{data.updateDate},
-		#{data.createDate}
+		#{data.createDate},
+		#{data.lqgsdwdm}
 		)
 	</insert>
 

--
Gitblit v1.9.3