Commit @c748941c570d9053fa40bc6c836f598ab15bdc56 - OLD_Project/한미칼라

김성배 2022-04-22

업데이트

@c748941c570d9053fa40bc6c836f598ab15bdc56

3441264

c748941

02_Module/HANMI_J_SALE.dll (Binary)

--- 02_Module/HANMI_J_SALE.dll

+++ 02_Module/HANMI_J_SALE.dll

Binary file is not shown

3441264

c748941

02_Module/HANMI_SALE.dll (Binary)

--- 02_Module/HANMI_SALE.dll

+++ 02_Module/HANMI_SALE.dll

Binary file is not shown

3441264

c748941

02_Module/ko/HANMI_SALE.resources.dll (Binary)

--- 02_Module/ko/HANMI_SALE.resources.dll

+++ 02_Module/ko/HANMI_SALE.resources.dll

Binary file is not shown

3441264

c748941

HANMI_SALE/Report/BillManagerReport.Designer.cs

--- HANMI_SALE/Report/BillManagerReport.Designer.cs

+++ HANMI_SALE/Report/BillManagerReport.Designer.cs


             this.xrTableCell_ORDER_NORM = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell_ORDER_QTY = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell_FIN_QTY = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell_CURR_UNIT_MY = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell_CURR_MY = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell_LN_RMK = new DevExpress.XtraReports.UI.XRTableCell();
             this.TopMargin = new DevExpress.XtraReports.UI.TopMarginBand();

             this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
             this.GroupHeader_CUST_CD = new DevExpress.XtraReports.UI.GroupHeaderBand();

             this.xrLabel_VAT_MY = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel_CURR_MY = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel_PREV_MONTH_MY = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell_CURR_UNIT_MY = new DevExpress.XtraReports.UI.XRTableCell();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();

             this.xrTableCell_FIN_QTY.Text = "100매";
             this.xrTableCell_FIN_QTY.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
             this.xrTableCell_FIN_QTY.Weight = 0.29580169460718087D;
+            // 
+            // xrTableCell_CURR_UNIT_MY
+            // 
+            this.xrTableCell_CURR_UNIT_MY.Name = "xrTableCell_CURR_UNIT_MY";
+            this.xrTableCell_CURR_UNIT_MY.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell_CURR_UNIT_MY.StylePriority.UsePadding = false;
+            this.xrTableCell_CURR_UNIT_MY.StylePriority.UseTextAlignment = false;
+            this.xrTableCell_CURR_UNIT_MY.Text = "0";
+            this.xrTableCell_CURR_UNIT_MY.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell_CURR_UNIT_MY.Weight = 0.20390064684823461D;
             // 
             // xrTableCell_CURR_MY
             // 

             this.xrTableCell8.Text = "완료수량";
             this.xrTableCell8.Weight = 0.20112781876761698D;
             // 
+            // xrTableCell2
+            // 
+            this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell2.Name = "xrTableCell2";
+            this.xrTableCell2.StylePriority.UseBorders = false;
+            this.xrTableCell2.Text = "단가";
+            this.xrTableCell2.Weight = 0.13864048435696624D;
+            // 
             // xrTableCell18
             // 
             this.xrTableCell18.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) 

             // 
             this.xrLabel_COMPANY2.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.xrLabel_COMPANY2.Font = new System.Drawing.Font("굴림체", 10F);
-            this.xrLabel_COMPANY2.LocationFloat = new DevExpress.Utils.PointFloat(25.54026F, 62.99997F);
+            this.xrLabel_COMPANY2.LocationFloat = new DevExpress.Utils.PointFloat(10F, 62.99998F);
             this.xrLabel_COMPANY2.Name = "xrLabel_COMPANY2";
             this.xrLabel_COMPANY2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel_COMPANY2.SizeF = new System.Drawing.SizeF(381.8751F, 23F);
+            this.xrLabel_COMPANY2.SizeF = new System.Drawing.SizeF(417.2069F, 23F);
             this.xrLabel_COMPANY2.StylePriority.UseBorders = false;
             this.xrLabel_COMPANY2.StylePriority.UseFont = false;
             this.xrLabel_COMPANY2.StylePriority.UseTextAlignment = false;

             this.xrLabel_PREV_MONTH_MY.StylePriority.UseTextAlignment = false;
             this.xrLabel_PREV_MONTH_MY.Text = "전월잔액:";
             this.xrLabel_PREV_MONTH_MY.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            // 
-            // xrTableCell2
-            // 
-            this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell2.Name = "xrTableCell2";
-            this.xrTableCell2.StylePriority.UseBorders = false;
-            this.xrTableCell2.Text = "단가";
-            this.xrTableCell2.Weight = 0.13864048435696624D;
-            // 
-            // xrTableCell_CURR_UNIT_MY
-            // 
-            this.xrTableCell_CURR_UNIT_MY.Name = "xrTableCell_CURR_UNIT_MY";
-            this.xrTableCell_CURR_UNIT_MY.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell_CURR_UNIT_MY.StylePriority.UsePadding = false;
-            this.xrTableCell_CURR_UNIT_MY.StylePriority.UseTextAlignment = false;
-            this.xrTableCell_CURR_UNIT_MY.Text = "0";
-            this.xrTableCell_CURR_UNIT_MY.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell_CURR_UNIT_MY.Weight = 0.20390064684823461D;
             // 
             // BillManagerReport
             // 

3441264

c748941

HANMI_SALE/Report/BillManagerReport.cs

--- HANMI_SALE/Report/BillManagerReport.cs

+++ HANMI_SALE/Report/BillManagerReport.cs

...	...	@@ -96,12 +96,13 @@
96	96	{
97	97	xrLabel_ORDER_DATE.Text = "일자 : " + order_date;
98	98
99		- if (UtilClass.isEqual(ConstClass._USER, "H1_DB"))
	99	+ if (UtilClass.isEqual(ConstClass._USER, "H4_DB"))
100	100	{
101	101	//xrLabel_COMPANY1.Text = "하나은행 (주)한미칼라 139-910019-12704"; // 2020.01.02 하나->국민
102	102	//xrLabel_COMPANY1.Text = "국민은행 (주)한미칼라 003101-04-043081"; //2020.06.08 국민->기업
103	103	xrLabel_COMPANY1.Text = "기업은행 (주)한미칼라 034-070740-04-011";
104		- xrLabel_COMPANY2.Text = "* 한미칼라 신사옥 주소 : 서울 특별시 중구 서애로5길 17";
	104	+ //xrLabel_COMPANY2.Text = "* 한미칼라 신사옥 주소 : 서울 특별시 중구 서애로5길 17";
	105	+ xrLabel_COMPANY2.Text = "* 한미칼라 신사옥 주소 : 경기도 파주시 신촌1로20,3층(신촌동)";
105	106	}
106	107	else
107	108	{

Add a comment

Open 0
Closed 0

List

...	...	@@ -38,6 +38,7 @@
38	38	this.xrTableCell_ORDER_NORM = new DevExpress.XtraReports.UI.XRTableCell();
39	39	this.xrTableCell_ORDER_QTY = new DevExpress.XtraReports.UI.XRTableCell();
40	40	this.xrTableCell_FIN_QTY = new DevExpress.XtraReports.UI.XRTableCell();
	41	+ this.xrTableCell_CURR_UNIT_MY = new DevExpress.XtraReports.UI.XRTableCell();
41	42	this.xrTableCell_CURR_MY = new DevExpress.XtraReports.UI.XRTableCell();
42	43	this.xrTableCell_LN_RMK = new DevExpress.XtraReports.UI.XRTableCell();
43	44	this.TopMargin = new DevExpress.XtraReports.UI.TopMarginBand();
...	...	@@ -54,6 +55,7 @@
54	55	this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
55	56	this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
56	57	this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
	58	+ this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
57	59	this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
58	60	this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
59	61	this.GroupHeader_CUST_CD = new DevExpress.XtraReports.UI.GroupHeaderBand();
...	...	@@ -74,8 +76,6 @@
74	76	this.xrLabel_VAT_MY = new DevExpress.XtraReports.UI.XRLabel();
75	77	this.xrLabel_CURR_MY = new DevExpress.XtraReports.UI.XRLabel();
76	78	this.xrLabel_PREV_MONTH_MY = new DevExpress.XtraReports.UI.XRLabel();
77		- this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
78		- this.xrTableCell_CURR_UNIT_MY = new DevExpress.XtraReports.UI.XRTableCell();
79	79	((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
80	80	((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
81	81	((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
...	...	@@ -194,6 +194,16 @@
194	194	this.xrTableCell_FIN_QTY.Text = "100매";
195	195	this.xrTableCell_FIN_QTY.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
196	196	this.xrTableCell_FIN_QTY.Weight = 0.29580169460718087D;
	197	+ //
	198	+ // xrTableCell_CURR_UNIT_MY
	199	+ //
	200	+ this.xrTableCell_CURR_UNIT_MY.Name = "xrTableCell_CURR_UNIT_MY";
	201	+ this.xrTableCell_CURR_UNIT_MY.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
	202	+ this.xrTableCell_CURR_UNIT_MY.StylePriority.UsePadding = false;
	203	+ this.xrTableCell_CURR_UNIT_MY.StylePriority.UseTextAlignment = false;
	204	+ this.xrTableCell_CURR_UNIT_MY.Text = "0";
	205	+ this.xrTableCell_CURR_UNIT_MY.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
	206	+ this.xrTableCell_CURR_UNIT_MY.Weight = 0.20390064684823461D;
197	207	//
198	208	// xrTableCell_CURR_MY
199	209	//
...	...	@@ -378,6 +388,15 @@
378	388	this.xrTableCell8.Text = "완료수량";
379	389	this.xrTableCell8.Weight = 0.20112781876761698D;
380	390	//
	391	+ // xrTableCell2
	392	+ //
	393	+ this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top \| DevExpress.XtraPrinting.BorderSide.Right)
	394	+ \| DevExpress.XtraPrinting.BorderSide.Bottom)));
	395	+ this.xrTableCell2.Name = "xrTableCell2";
	396	+ this.xrTableCell2.StylePriority.UseBorders = false;
	397	+ this.xrTableCell2.Text = "단가";
	398	+ this.xrTableCell2.Weight = 0.13864048435696624D;
	399	+ //
381	400	// xrTableCell18
382	401	//
383	402	this.xrTableCell18.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top \| DevExpress.XtraPrinting.BorderSide.Right)
...	...	@@ -506,10 +525,10 @@
506	525	//
507	526	this.xrLabel_COMPANY2.Borders = DevExpress.XtraPrinting.BorderSide.None;
508	527	this.xrLabel_COMPANY2.Font = new System.Drawing.Font("굴림체", 10F);
509		- this.xrLabel_COMPANY2.LocationFloat = new DevExpress.Utils.PointFloat(25.54026F, 62.99997F);
	528	+ this.xrLabel_COMPANY2.LocationFloat = new DevExpress.Utils.PointFloat(10F, 62.99998F);
510	529	this.xrLabel_COMPANY2.Name = "xrLabel_COMPANY2";
511	530	this.xrLabel_COMPANY2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
512		- this.xrLabel_COMPANY2.SizeF = new System.Drawing.SizeF(381.8751F, 23F);
	531	+ this.xrLabel_COMPANY2.SizeF = new System.Drawing.SizeF(417.2069F, 23F);
513	532	this.xrLabel_COMPANY2.StylePriority.UseBorders = false;
514	533	this.xrLabel_COMPANY2.StylePriority.UseFont = false;
515	534	this.xrLabel_COMPANY2.StylePriority.UseTextAlignment = false;
...	...	@@ -659,25 +678,6 @@
659	678	this.xrLabel_PREV_MONTH_MY.StylePriority.UseTextAlignment = false;
660	679	this.xrLabel_PREV_MONTH_MY.Text = "전월잔액:";
661	680	this.xrLabel_PREV_MONTH_MY.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
662		- //
663		- // xrTableCell2
664		- //
665		- this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top \| DevExpress.XtraPrinting.BorderSide.Right)
666		- \| DevExpress.XtraPrinting.BorderSide.Bottom)));
667		- this.xrTableCell2.Name = "xrTableCell2";
668		- this.xrTableCell2.StylePriority.UseBorders = false;
669		- this.xrTableCell2.Text = "단가";
670		- this.xrTableCell2.Weight = 0.13864048435696624D;
671		- //
672		- // xrTableCell_CURR_UNIT_MY
673		- //
674		- this.xrTableCell_CURR_UNIT_MY.Name = "xrTableCell_CURR_UNIT_MY";
675		- this.xrTableCell_CURR_UNIT_MY.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
676		- this.xrTableCell_CURR_UNIT_MY.StylePriority.UsePadding = false;
677		- this.xrTableCell_CURR_UNIT_MY.StylePriority.UseTextAlignment = false;
678		- this.xrTableCell_CURR_UNIT_MY.Text = "0";
679		- this.xrTableCell_CURR_UNIT_MY.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
680		- this.xrTableCell_CURR_UNIT_MY.Weight = 0.20390064684823461D;
681	681	//
682	682	// BillManagerReport
683	683	//

Delete comment