From d30f0f2c1917c59b20e5a2223180453c4b716bd1 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 06 七月 2022 10:53:18 +0800
Subject: [PATCH] 合并

---
 WebTM/views/grf/生产单.grf |  107 +++++++++++++++++++++++++++++++++++------------------
 1 files changed, 71 insertions(+), 36 deletions(-)

diff --git "a/WebTM/views/grf/\347\224\237\344\272\247\345\215\225.grf" "b/WebTM/views/grf/\347\224\237\344\272\247\345\215\225.grf"
index 1492e11..0e24dea 100644
--- "a/WebTM/views/grf/\347\224\237\344\272\247\345\215\225.grf"
+++ "b/WebTM/views/grf/\347\224\237\344\272\247\345\215\225.grf"
@@ -10,14 +10,14 @@
 		Oriention=Landscape
 		LeftMargin=1.5
 		TopMargin=0.5
-		RightMargin=1.5
+		RightMargin=1.03188
 		BottomMargin=0.5
 	End
 	Object DetailGrid
 		Object Recordset
 			Items Field
 				Item
-					Name='鏃ユ湡'
+					Name='閿�鍞鍗曟棩鏈�'
 				End
 				Item
 					Name='鍗曟嵁缂栧彿'
@@ -30,12 +30,17 @@
 				End
 				Item
 					Name='閿�鍞暟閲�'
+					Type=Float
+					Format='0.#####'
 				End
 				Item
 					Name='璐揣鍗曚綅'
 				End
 				Item
-					Name='鏀惰揣鏂硅仈绯讳汉'
+					Name='閿�鍞鍗曡仈绯讳汉'
+				End
+				Item
+					Name='閿�鍞鍗曠紪鍙�'
 				End
 					End
 	End
@@ -50,39 +55,43 @@
 		End
 		Item
 			Name='鐗╂枡浠ｇ爜'
-			Width=3.99521
+			Width=3.59833
 		End
 		Item
 			Name='鐗╂枡'
-			Width=3.41313
+			Width=3.01625
 		End
 		Item
 			Name='瑙勬牸鍨嬪彿'
-			Width=3.41313
+			Width=3.175
 		End
 		Item
 			Name='Column2'
-			Width=2.61938
+			Width=2.40771
 		End
 		Item
 			Name='Column6'
-			Width=2.93688
+			Width=1.61396
 		End
 		Item
 			Name='Column7'
-			Width=2.59292
+			Width=2.01083
 		End
 		Item
 			Name='Column8'
-			Width=2.19604
+			Width=2.38125
 		End
 		Item
 			Name='Column9'
-			Width=2.77813
+			Width=2.40771
+		End
+		Item
+			Name='Column10'
+			Width=2.59292
 		End
 	End
 Object ColumnContent
-	Height=2.59292
+	Height=2.19604
 	Items ColumnContentCell
 		Item
 			Column='搴忓彿'
@@ -111,7 +120,7 @@
 		End
 		WordWrap=T
 		ShrinkFontToFit=T
-		DataField='鏃ユ湡'
+		DataField='閿�鍞鍗曟棩鏈�'
 	End
 	Item
 		Column='鐗╂枡浠ｇ爜'
@@ -133,7 +142,7 @@
 		End
 		WordWrap=T
 		ShrinkFontToFit=T
-		DataField='閿�鍞墿鏂欏悕绉�'
+		DataField='閿�鍞鍗曠紪鍙�'
 	End
 	Item
 		Column='瑙勬牸鍨嬪彿'
@@ -144,7 +153,7 @@
 		End
 		WordWrap=T
 		ShrinkFontToFit=T
-		DataField='鍖呰鏂瑰紡'
+		DataField='閿�鍞墿鏂欏悕绉�'
 	End
 	Item
 		Column='Column2'
@@ -152,15 +161,15 @@
 		Items Control
 			Item
 				Type=FieldBox
-				Name='FieldBox1'
+				Name='FieldBox3'
 				Dock=Fill
 				Object Font
 					Name='瀹嬩綋'
 					Weight=400
 					Charset=134
 				End
-				TextAlign=MiddleCenter
-				DataField='閿�鍞暟閲�'
+				WordWrap=T
+				DataField='鍖呰鏂瑰紡'
 			End
 			End
 End
@@ -175,9 +184,11 @@
 	Items Control
 		Item
 			Type=FieldBox
-			Name='FieldBox2'
+			Name='FieldBox1'
 			Dock=Fill
-			DataField='鏀惰揣鏂硅仈绯讳汉'
+			WordWrap=T
+			TextAlign=MiddleCenter
+			DataField='閿�鍞暟閲�'
 		End
 	End
 End
@@ -202,15 +213,11 @@
 			Text='[#鍗曟嵁缂栧彿#]'
 		End
 		Item
-			Type=Barcode
-			Name='Barcode4'
-			Left=0.185208
-			Top=0.343958
-			Width=2.19604
-			Height=1.98438
-			BarcodeType=QRCode
-			CaptionPosition=None
-			Text='[#鍗曟嵁缂栧彿#]'
+			Type=FieldBox
+			Name='FieldBox2'
+			Dock=Fill
+			WordWrap=T
+			DataField='閿�鍞鍗曡仈绯讳汉'
 		End
 	End
 End
@@ -222,9 +229,26 @@
 		Charset=134
 	End
 	FreeCell=T
+	Items Control
+		Item
+			Type=Barcode
+			Name='Barcode5'
+			Left=0.185208
+			Top=0.238125
+			Width=1.95792
+			Height=1.77271
+			BarcodeType=QRCode
+			CaptionPosition=None
+			Text='[#鍗曟嵁缂栧彿#]'
+		End
+	End
 End
 Item
 	Column='Column9'
+	TextAlign=MiddleCenter
+End
+Item
+	Column='Column10'
 	TextAlign=MiddleCenter
 End
 End
@@ -253,7 +277,7 @@
 				Charset=134
 			End
 			TextAlign=MiddleCenter
-			Text='鏃ユ湡'
+			Text='閿�鍞鍗曟棩鏈�'
 		End
 		Item
 			GroupTitle=F
@@ -277,7 +301,7 @@
 			End
 			WordWrap=T
 			TextAlign=MiddleCenter
-			Text='閿�鍞墿鏂欏悕绉�'
+			Text='閿�鍞鍗曠紪鍙�'
 		End
 		Item
 			GroupTitle=F
@@ -289,7 +313,7 @@
 			End
 			WordWrap=T
 			TextAlign=MiddleCenter
-			Text='鍖呰鏂瑰紡'
+			Text='閿�鍞墿鏂欏悕绉�'
 		End
 		Item
 			GroupTitle=F
@@ -301,7 +325,7 @@
 			End
 			WordWrap=T
 			TextAlign=MiddleCenter
-			Text='閿�鍞暟閲�'
+			Text='鍖呰鏂瑰紡'
 		End
 		Item
 			GroupTitle=F
@@ -313,7 +337,7 @@
 			End
 			WordWrap=T
 			TextAlign=MiddleCenter
-			Text='鏀惰揣鏂硅仈绯讳汉'
+			Text='閿�鍞暟閲�'
 		End
 		Item
 			GroupTitle=F
@@ -325,7 +349,7 @@
 			End
 			WordWrap=T
 			TextAlign=MiddleCenter
-			Text='锛堜簩缁寸爜锛�'
+			Text='鑱旂郴浜�'
 		End
 		Item
 			GroupTitle=F
@@ -337,7 +361,7 @@
 			End
 			WordWrap=T
 			TextAlign=MiddleCenter
-			Text='宸茬敓浜�'
+			Text='锛堜簩缁寸爜锛�'
 		End
 		Item
 			GroupTitle=F
@@ -348,6 +372,17 @@
 				Charset=134
 			End
 			TextAlign=MiddleCenter
+			Text='宸茬敓浜�'
+		End
+		Item
+			GroupTitle=F
+			Column='Column10'
+			Object Font
+				Name='瀹嬩綋'
+				Weight=400
+				Charset=134
+			End
+			TextAlign=MiddleCenter
 			Text='澶囨敞'
 		End
 	End

--
Gitblit v1.9.1