From d54186539b00fab8f4b639752aaf9b758c914ffd Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 21 七月 2023 17:05:56 +0800
Subject: [PATCH] 出入库检斤、货位卡
---
igds-core/src/main/java/com/ld/igds/models/Building.java | 6
igds-web/src/main/resources/templates/test/TCheckPoundIn.html | 216 ++++++++++++++++++++++++
igds-core/src/main/java/com/ld/igds/models/DepotStore.java | 4
igds-web/src/main/resources/templates/test/TDepot.html | 126 ++++++++++++++
igds-core/src/main/java/com/ld/igds/view/Building.view.xml | 5
igds-web/src/main/resources/templates/test/TCheckPoundOut.html | 148 ++++++++++++++++
igds-core/src/main/java/models/igds.model.xml | 4
7 files changed, 499 insertions(+), 10 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/models/Building.java b/igds-core/src/main/java/com/ld/igds/models/Building.java
index 6f116e7..a96d9b1 100644
--- a/igds-core/src/main/java/com/ld/igds/models/Building.java
+++ b/igds-core/src/main/java/com/ld/igds/models/Building.java
@@ -36,9 +36,9 @@
@PropertyDef(label = "缁勭粐缂栫爜")
private String companyId;
- @Column(name = "gbm", length = 50)
- @PropertyDef(label = "寤掗棿鍥藉埆鐮�")
- private String gbm;
+ @Column(name = "ggm", length = 50)
+ @PropertyDef(label = "鍥借鐮�")
+ private String ggm;
@Column(name = "DEPT_ID_", length = 40)
@PropertyDef(label = "鎵�灞炲簱鐐�")
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 28acf5e..79f4529 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
@@ -118,12 +118,12 @@
@Column(name = "UPDATE_USER_", length = 50)
@PropertyDef(label = "淇敼浜�")
private String updateUser;
-
+
@Column(name = "UPDATE_DATE_")
@PropertyDef(label = "淇敼鏃堕棿")
private Date updateDate;
-
+
@Column(name = "CREATE_DATE_")
private Date createDate;
diff --git a/igds-core/src/main/java/com/ld/igds/view/Building.view.xml b/igds-core/src/main/java/com/ld/igds/view/Building.view.xml
index 51a8b03..695fb29 100644
--- a/igds-core/src/main/java/com/ld/igds/view/Building.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/view/Building.view.xml
@@ -153,8 +153,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">gbm</Property>
- <Property name="property">gbm</Property>
+ <Property name="name">ggm</Property>
+ <Property name="property">ggm</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -176,7 +176,6 @@
<AutoFormElement>
<Property name="name">roofTruss</Property>
<Property name="property">roofTruss</Property>
- <Property name="trigger">ddCustomer</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
diff --git a/igds-core/src/main/java/models/igds.model.xml b/igds-core/src/main/java/models/igds.model.xml
index 3bf87e6..28b1f92 100644
--- a/igds-core/src/main/java/models/igds.model.xml
+++ b/igds-core/src/main/java/models/igds.model.xml
@@ -154,9 +154,9 @@
<Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
- <PropertyDef name="gbm">
+ <PropertyDef name="ggm">
<Property/>
- <Property name="label">寤掗棿鍥藉埆鐮�</Property>
+ <Property name="label">鍥借鐮�</Property>
</PropertyDef>
</DataType>
<DataType name="dtDepot">
diff --git a/igds-web/src/main/resources/templates/test/TCheckPoundIn.html b/igds-web/src/main/resources/templates/test/TCheckPoundIn.html
new file mode 100644
index 0000000..53cbb6a
--- /dev/null
+++ b/igds-web/src/main/resources/templates/test/TCheckPoundIn.html
@@ -0,0 +1,216 @@
+<!DOCTYPE html>
+<html lang='zh-cn'>
+<head>
+ <meta http-equiv='Content-Type' content='text/html;charset=UTF-8'>
+ <title>鍏ュ簱妫�鏂よ川妫�缁撶畻鍗�</title>
+ <style>body {
+ text-align: center;
+ padding: 10px
+ }
+
+ .tit {
+ margin: 10px;
+ font-size: 24px;
+ font-family: '瀹嬩綋';
+ padding-top: 15px
+ }
+
+ .div-tit {
+ text-align: right;
+ padding-top: 10px;
+ padding-right: 20px;
+ }
+
+ table {
+ width: 100%;
+ border-right: 1px solid;
+ border-bottom: 1px solid;
+ font-size: 14px
+ }
+
+ table td {
+ border-left: 1px solid;
+ border-top: 1px solid;
+ height: 38px
+ }
+ </style>
+</head>
+<body><h1 class='tit'>鍏ュ簱妫�鏂よ川妫�缁撶畻鍗�</h1>
+<div class='div-tit'>缂栫爜锛歴erId</div>
+<table cellspacing='0' cellpadding='0'>
+ <tr>
+ <td `width`="22%" colspan="2">鍗曚綅鍚嶇О</td>
+ <td width='23%' colspan='3'>customerName</td>
+ <td width='11%'>搴撳尯鍚嶇О</td>
+ <td colspan='4' `width`='44%'>deptName</td>
+ </tr>
+ <tr>
+ <td width='11%'>鍏ヤ粨</td>
+ <td width='11%'>浠撴埧鍚嶇О</td>
+ <td width='12%'>depotName</td>
+ <td width='11%'>璐т綅鍚嶇О</td>
+ <td width='11%'>hwmc</td>
+ <td width='11%'>淇濈鍛�</td>
+ <td width='33%' colspan="4">storeKeeperName</td>
+ </tr>
+ <tr>
+ <td rowspan="4">瀹㈡埛鍙婄粨绠�</td>
+ <td>瀹㈡埛鍚嶇О锛堝崟浣嶅悕绉帮級</td>
+ <td>customerName</td>
+ <td>韬唤璇侊紙绀句細淇＄敤浠ｇ爜锛�</td>
+ <td>userId</td>
+ <td colspan="4"></td>
+ </tr>
+ <tr>
+ <td>鑱旂郴鐢佃瘽</td>
+ <td>phone</td>
+ <td>鍦板潃</td>
+ <td colspan="5">address</td>
+ </tr>
+ <tr>
+ <td>鍚堝悓鍙�</td>
+ <td>contractId</td>
+ <td>閾惰璐﹀彿</td>
+ <td>bankNum</td>
+ <td>寮�鎴疯</td>
+ <td colspan="3">customerBank</td>
+ </tr>
+ <tr>
+ <td>缁撶畻鍗曚环</td>
+ <td>DPrice</td>
+ <td>缁撶畻鎬讳环</td>
+ <td>ZPrice</td>
+ <td colspan="4"></td>
+ </tr>
+ <tr>
+ <td rowspan="2">鎵胯繍</td>
+ <td>鎵胯繍浜�</td>
+ <td>driverName</td>
+ <td>韬唤璇佸彿</td>
+ <td>driverId</td>
+ <td>鑱旂郴鐢佃瘽</td>
+ <td colspan="3"></td>
+ </tr>
+ <tr>
+ <td>杩愯緭宸ュ叿</td>
+ <td>transType</td>
+ <td>杞﹁埞鍙�</td>
+ <td>plateNum</td>
+ <td colspan="4"></td>
+ </tr>
+ <tr>
+ <td rowspan="2">鐧昏</td>
+ <td>鍏ラ棬鏃堕棿</td>
+ <td>inTime</td>
+ <td>鐧昏鍛�</td>
+ <td>inRegistrar</td>
+ <td colspan="4"></td>
+ </tr>
+ <tr>
+ <td>鍑洪棬鏃堕棿</td>
+ <td>outTime</td>
+ <td>鐧昏鍛�</td>
+ <td>outRegistrar</td>
+ <td colspan="4"></td>
+ </tr>
+ <tr>
+ <td rowspan="4">妫�鏂�</td>
+ <td>姣涢噸锛堝惃锛�</td>
+ <td>fullWeight</td>
+ <td>姣涢噸妫�鏂ゆ椂闂�</td>
+ <td>fullWeightTime</td>
+ <td>妫�鏂ゅ憳</td>
+ <td>JJYFullWeight</td>
+ <td>鐩戠鍛�</td>
+ <td>JBYFullWeight</td>
+ </tr>
+ <tr>
+ <td>鐨噸锛堝惃锛�</td>
+ <td>emptyWeight</td>
+ <td>鐨噸妫�鏂ゆ椂闂�</td>
+ <td>emptyWeightTime</td>
+ <td>妫�鏂ゅ憳</td>
+ <td>JJYEmptyWeight</td>
+ <td>鐩戠鍛�</td>
+ <td>JBYEmptyWeight</td>
+ </tr>
+ <tr>
+ <td>鍑�閲嶏紙鍚級</td>
+ <td>netWeight</td>
+ <td>姘存潅鎵ｏ紙澧烇級閲�</td>
+ <td>deOrAddCheck KG</td>
+ <td>鍏朵粬鎵ｉ噸</td>
+ <td colspan="3">deOther KG</td>
+ </tr>
+ <tr>
+ <td>璁′环鏁伴噺锛堝惃锛�</td>
+ <td>storageSettle</td>
+ <td>鍏朵粬鎵ｉ噸璇存槑</td>
+ <td colspan="5">deOtherInfo</td>
+ </tr>
+ <tr>
+ <td rowspan="5">妫�楠�</td>
+ <td>鍝佺</td>
+ <td>foodVariety</td>
+ <td>绛夌骇</td>
+ <td>foodLevel</td>
+ <td>瀹归噸锛坓/L锛�</td>
+ <td colspan="3">bulkWeight</td>
+ </tr>
+ <tr>
+ <td>鏉傝川锛�%锛�</td>
+ <td>C02</td>
+ <td>姘村垎锛�%锛�</td>
+ <td>C01</td>
+ <td>鑹叉辰銆佹皵鍛�</td>
+ <td colspan="3">C06</td>
+ </tr>
+ <tr>
+ <td>涓嶅畬鍠勭矑锛�%锛�</td>
+ <td>C04</td>
+ <td>鐢熻娊绮掞紙%锛�</td>
+ <td>C35</td>
+ <td>鐢熼湁绮掞紙%锛�</td>
+ <td colspan="3">C29</td>
+ </tr>
+
+ <tr>
+ <td>闈㈢瓔鍚告按閲忥紙%锛�</td>
+ <td>C08</td>
+ <td>鍝佸皾鍒嗗��</td>
+ <td>C07</td>
+ <td>鑹叉辰銆佹皵鍛�</td>
+ <td colspan="3">C06</td>
+ </tr>
+ <tr>
+ <td>鍛曞悙姣掞紙mg/kg锛�</td>
+ <td>C27</td>
+ <td>鐜夌背璧ら湁鐑叜锛埼糶/kg锛�</td>
+ <td>C31</td>
+ <td>閾咃紙mg/kg锛�</td>
+ <td colspan="3">C32</td>
+ </tr>
+ <tr>
+ <td rowspan="2">妫�楠�</td>
+ <td>闀夛紙mg/kg锛�</td>
+ <td>C25</td>
+ <td>姹烇紙渭g/kg锛�</td>
+ <td>C33</td>
+ <td>鏃犳満鐮凤紙mg/kg锛�</td>
+ <td colspan="3">C30</td>
+ </tr>
+ <tr>
+ <td>鎵︽牱鍛�</td>
+ <td>sampleUser</td>
+ <td>妫�楠屽憳</td>
+ <td>checkUser</td>
+ <td>妫�楠屾椂闂�</td>
+ <td colspan="3">checkTime</td>
+ </tr>
+ <tr>
+ <td>澶囨敞</td>
+ <td colspan="8">remark</td>
+ </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/igds-web/src/main/resources/templates/test/TCheckPoundOut.html b/igds-web/src/main/resources/templates/test/TCheckPoundOut.html
new file mode 100644
index 0000000..10170b7
--- /dev/null
+++ b/igds-web/src/main/resources/templates/test/TCheckPoundOut.html
@@ -0,0 +1,148 @@
+<!DOCTYPE html>
+<html lang='zh-cn'>
+<head>
+ <meta http-equiv='Content-Type' content='text/html;charset=UTF-8'>
+ <title>鍑哄簱妫�鏂よ川妫�缁撶畻鍗�</title>
+ <style>body {
+ text-align: center;
+ padding: 10px
+ }
+
+ .tit {
+ margin: 10px;
+ font-size: 24px;
+ font-family: '瀹嬩綋';
+ padding-top: 15px
+ }
+
+ .div-tit {
+ text-align: right;
+ padding-top: 10px;
+ padding-right: 20px;
+ }
+
+ table {
+ width: 100%;
+ border-right: 1px solid;
+ border-bottom: 1px solid;
+ font-size: 14px
+ }
+
+ table td {
+ border-left: 1px solid;
+ border-top: 1px solid;
+ height: 38px
+ }
+ </style>
+</head>
+<body><h1 class='tit'>鍑哄簱妫�鏂よ川妫�缁撶畻鍗�</h1>
+<div class='div-tit'>缂栫爜锛歴erId</div>
+<table cellspacing='0' cellpadding='0'>
+ <tr>
+ <td `width`="22%" colspan="2">鍗曚綅鍚嶇О</td>
+ <td width='23%' colspan='3'>customerName</td>
+ <td width='11%'>搴撳尯鍚嶇О</td>
+ <td colspan='4' `width`='44%'>deptName</td>
+ </tr>
+ <tr>
+ <td width='11%'>鍑轰粨</td>
+ <td width='11%'>浠撴埧鍚嶇О</td>
+ <td width='12%'>depotName</td>
+ <td width='11%'>璐т綅鍚嶇О</td>
+ <td width='11%'>hwmc</td>
+ <td width='11%'>淇濈鍛�</td>
+ <td width='33%' colspan="4">storeKeeperName</td>
+ </tr>
+ <tr>
+ <td rowspan="2">瀹㈡埛</td>
+ <td>瀹㈡埛鍚嶇О锛堝崟浣嶅悕绉帮級</td>
+ <td>customerName</td>
+ <td>韬唤璇侊紙绀句細淇＄敤浠ｇ爜锛�</td>
+ <td>userId</td>
+ <td colspan="4"></td>
+ </tr>
+ <tr>
+ <td>鑱旂郴鐢佃瘽</td>
+ <td>phone</td>
+ <td>鍦板潃</td>
+ <td colspan="5">address</td>
+ </tr>
+ <tr>
+ <td rowspan="2">鎵胯繍</td>
+ <td>鎵胯繍浜�</td>
+ <td>driverName</td>
+ <td>韬唤璇佸彿</td>
+ <td>driverId</td>
+ <td>鑱旂郴鐢佃瘽</td>
+ <td colspan="3"></td>
+ </tr>
+ <tr>
+ <td>杩愯緭宸ュ叿</td>
+ <td>transType</td>
+ <td>杞﹁埞鍙�</td>
+ <td>plateNum</td>
+ <td colspan="4"></td>
+ </tr>
+
+ <tr>
+ <td>璁″垝閫氱煡</td>
+ <td>鍑哄簱璁″垝鏂囧彿/鍚堝悓鍙�</td>
+ <td>referenceNumber</td>
+ <td>鍑哄簱閫氱煡鍗曞彿</td>
+ <td colspan="5">noticeId</td>
+ </tr>
+ <tr>
+ <td rowspan="2">鐧昏</td>
+ <td>鍏ラ棬鏃堕棿</td>
+ <td>inTime</td>
+ <td>鐧昏鍛�</td>
+ <td>inRegistrar</td>
+ <td colspan="4"></td>
+ </tr>
+ <tr>
+ <td>鍑洪棬鏃堕棿</td>
+ <td>outTime</td>
+ <td>鐧昏鍛�</td>
+ <td>outRegistrar</td>
+ <td colspan="4"></td>
+ </tr>
+ <tr>
+ <td rowspan="4">妫�鏂�</td>
+ <td>姣涢噸锛堝惃锛�</td>
+ <td>fullWeight</td>
+ <td>姣涢噸妫�鏂ゆ椂闂�</td>
+ <td>fullWeightTime</td>
+ <td>妫�鏂ゅ憳</td>
+ <td>JJYFullWeight</td>
+ <td>鐩戠鍛�</td>
+ <td>JBYFullWeight</td>
+ </tr>
+ <tr>
+ <td>鐨噸锛堝惃锛�</td>
+ <td>emptyWeight</td>
+ <td>鐨噸妫�鏂ゆ椂闂�</td>
+ <td>emptyWeightTime</td>
+ <td>妫�鏂ゅ憳</td>
+ <td>JJYEmptyWeight</td>
+ <td>鐩戠鍛�</td>
+ <td>JBYEmptyWeight</td>
+ </tr>
+ <tr>
+ <td>鍑�閲嶏紙鍚級</td>
+ <td>netWeight</td>
+ <td>鎵ｏ紙澧烇級閲嶏紙鍏枻锛�</td>
+ <td>deOrAddCheck</td>
+ <td>璁′环鏁伴噺锛堝惃锛�</td>
+ <td colspan="3">storageSettle</td>
+ </tr>
+ <tr>
+ <td>妫�楠�</td>
+ <td colspan="8">鍑哄簱妫�娴嬫姤鍛�</td>
+ </tr>
+ <tr>
+ <td>澶囨敞</td>
+ <td colspan="8">remark</td>
+ </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/igds-web/src/main/resources/templates/test/TDepot.html b/igds-web/src/main/resources/templates/test/TDepot.html
new file mode 100644
index 0000000..21afa53
--- /dev/null
+++ b/igds-web/src/main/resources/templates/test/TDepot.html
@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<html lang='zh-cn'>
+<head>
+ <meta http-equiv='Content-Type' content='text/html;charset=UTF-8'>
+ <title>璐т綅鍗�</title>
+ <style>body {
+ text-align: center;
+ padding: 10px
+ }
+
+ .tit {
+ margin: 10px;
+ font-size: 24px;
+ font-family: '瀹嬩綋';
+ padding-top: 15px
+ }
+
+ .div-tit {
+ text-align: left;
+ padding-left: 10px;
+ padding-bottom: 5px;
+ }
+
+ table {
+ width: 100%;
+ border-right: 1px solid;
+ border-bottom: 1px solid;
+ font-size: 14px
+ }
+
+ table td {
+ border-left: 1px solid;
+ border-top: 1px solid;
+ height: 38px
+ }
+ </style>
+</head>
+<body><h1 class='tit'>璐т綅鍗�</h1>
+<div class="div-tit">淇濈鍗曚綅锛� customerKeeper</div>
+<div class="div-tit">缁熻鎶ヨ处鍗曚綅锛� accountKeeper</div>
+<table cellspacing='0' cellpadding='0'>
+ <tr>
+ <td width='14%' rowspan="2">浠撴埧璐т綅</td>
+ <td width='14%'>浠撴埧鍚嶇О</td>
+ <td width='14%'>depotName</td>
+ <td width='14%'>璐т綅鍚嶇О</td>
+ <td width='15%'>hwmc</td>
+ <td width='14%'>淇濈鍛�</td>
+ <td width='15%'>storeKeeperName</td>
+ </tr>
+ <tr>
+ <td>浠撳瀷</td>
+ <td>depotType</td>
+ <td>璁捐浠撳锛堝惃锛�</td>
+ <td>storageMax</td>
+ <td>鐘舵��</td>
+ <td>depotStatus</td>
+ </tr>
+ <tr>
+ <td rowspan="6">搴撳瓨淇℃伅</td>
+ <td>瀛樺偍绫诲瀷</td>
+ <td>storeType</td>
+ <td>鍌ㄧ伯鎬ц川</td>
+ <td>foodType</td>
+ <td>鏀跺偍鍦扮偣</td>
+ <td>storeLocation</td>
+ </tr>
+ <tr>
+ <td>淇濈鏂瑰紡</td>
+ <td>KeepType</td>
+ <td>瀹為檯鏁伴噺锛堝惃锛�</td>
+ <td>storageReal</td>
+ <td>璁′环鏁伴噺锛堝惃锛�</td>
+ <td>storageSettle</td>
+ </tr>
+ <tr>
+ <td>鏁ｅ瓨绮綋绉�</td>
+ <td>bulkVolume</td>
+ <td>闀�/瀹�/楂橈紙绫筹級</td>
+ <td>CKG</td>
+ <td>鍖呭瓨绮寘鏁�</td>
+ <td>packages</td>
+ </tr>
+ <tr>
+ <td>浜у湴</td>
+ <td>foodLocation</td>
+ <td>鏀惰幏骞村害</td>
+ <td>foodYear</td>
+ <td>鍏ヤ粨骞村害</td>
+ <td>inYear</td>
+ </tr>
+ <tr>
+ <td>鍝佺</td>
+ <td>foodVariety</td>
+ <td>绛夌骇</td>
+ <td>FoodLevel</td>
+ <td>瀹归噸锛坓/L锛�</td>
+ <td>bulkWeight</td>
+ </tr>
+ <tr>
+ <td>鏉傝川锛�%锛�</td>
+ <td>C02</td>
+ <td>鎶樺悎姘村垎锛�%锛�</td>
+ <td>C01</td>
+ <td>鑹叉辰銆佹皵鍛�</td>
+ <td>C06</td>
+ </tr>
+ <tr>
+ <td rowspan="sampleNumber">妫�娴嬭褰�</td>
+ <td colspan="2">鎵︽牱鏃堕棿</td>
+ <td colspan="2">妫�娴嬬被鍨�</td>
+ <td colspan="2">妫�娴嬫満鏋�</td>
+ </tr>
+ <!--闇�瑕佸惊鐜� sampleNumber - 1娆�-->
+ <tr>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td>澶囨敞</td>
+ <td colspan="6">remark</td>
+ </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
--
Gitblit v1.9.3