From bb1d35602457f3f767f60b350516ecf4e8b9fab0 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 17 十二月 2021 14:49:59 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/生产管理/Sc_ICMOBillList.resx | 54 ++--
WorkM/生产管理/Sc_ICMOBillList.designer.cs | 224 ++++++++++++---------
WebAPI/Controllers/博日自动扫码线/ScanlineAPIController.cs | 28 ++
WebAPI/WebAPI.csproj | 1
WebAPI/Models/GetWeekList.cs | 235 +++++++++++++++++++++++
5 files changed, 417 insertions(+), 125 deletions(-)
diff --git "a/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs" "b/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs"
index 1b23643..705ef1a 100644
--- "a/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs"
+++ "b/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs"
@@ -225,8 +225,8 @@
oCN.RunProc("Delete From Sc_PackUnionBillSub where HBarCode_Pack=" + packagebarcode.ToString());
//鍒犻櫎涓昏〃
oCN.RunProc("Delete From Sc_PackUnionBillMain where HBarCode_Pack=" + packagebarcode.ToString());
- //鍒犻櫎鏉＄爜妗ｆ琛�
- oCN.RunProc("Delete From Gy_BarCodeBill where HBarCode=" + packagebarcode.ToString());
+ //浣滃簾鏉＄爜妗ｆ琛�
+ oCN.RunProc("Update Gy_BarCodeBill set HStopflag='1' where HBarCode=" + packagebarcode.ToString());
oCN.Commit();
@@ -244,5 +244,29 @@
}
}
#endregion
+
+
+ [Route("packagebarcode/week")]
+ [HttpPost]
+ public object week(string tim)
+ {
+ try
+ {
+ GetWeekList list = new GetWeekList();
+ //string aa=list.getWeek(Convert.ToDateTime(tim));
+ string aa = list.GetCodeDateStr(Convert.ToDateTime(tim));
+ objJsonResult.status = 0;
+ objJsonResult.msg =aa.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.status = -1;
+ objJsonResult.msg = e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/GetWeekList.cs b/WebAPI/Models/GetWeekList.cs
new file mode 100644
index 0000000..5042541
--- /dev/null
+++ b/WebAPI/Models/GetWeekList.cs
@@ -0,0 +1,235 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class GetWeekList
+ {
+
+ #region 鏍规嵁鏃堕棿鑾峰彇褰撳墠鏄鍑犲懆
+
+ //濡傛灉12鏈�31鍙蜂笌涓嬩竴骞寸殑1鏈�1濂藉湪鍚屼竴涓槦鏈熷垯绠椾笅涓�骞寸殑绗竴鍛�
+ public int GetWeekIndex(DateTime dTime)
+ {
+ try
+ {
+ //纭畾姝ゆ椂闂村湪涓�骞翠腑鐨勪綅缃�(绗灏戝ぉ)
+ int dayOfYear = dTime.DayOfYear;
+
+ //褰撳勾绗竴澶�
+ DateTime tempDate = new DateTime(dTime.Year, 1, 1);
+ //纭畾褰撳勾绗竴澶╂槸鍛ㄥ嚑
+ int tempDayOfWeek = (int)tempDate.DayOfWeek;
+ //鍒ゆ柇褰撳墠涓�鏈堜竴鍙峰鏋滄槸鍛ㄦ棩(0),鍒欓粯璁や负鍛ㄤ竴
+ tempDayOfWeek = tempDayOfWeek == 0 ? 1 : tempDayOfWeek;
+
+ //纭畾褰撳墠鏃ユ湡鏄槦鏈熷嚑
+ int index = (int)dTime.DayOfWeek;
+ //鍒ゆ柇褰撳墠鏃ユ湡濡傛灉鏄懆鏃�(0),鍒欓粯璁や负鍛ㄤ竴
+ index = index == 0 ? 1 : index;
+
+ //褰撳墠鏃ユ湡鍛ㄧ殑鑼冨洿
+ DateTime retStartDay = dTime.AddDays(-(index - 1));
+ DateTime retEndDay = dTime.AddDays(7 - index);
+
+ //纭畾褰撳墠鏃ユ湡鏄鍑犲懆
+ int weekIndex = (int)Math.Ceiling(((double)dayOfYear + tempDayOfWeek - 1) / 7);
+
+ //瀵规瘮褰撳墠鏃ユ湡鍛ㄧ殑寮�濮嬪拰缁撴潫锛屽垽瀹氭槸鍚﹁法骞寸涓�鍛�
+ if (retStartDay.Year < retEndDay.Year)
+ {
+ weekIndex = 1;
+ }
+
+ return weekIndex;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ //string retVal = retStartDay.ToString("yyyy/MM/dd") + "锝�" + retEndDay.ToString("yyyy/MM/dd");
+
+ }
+ public int GetWeekIndex(string strDate)
+ {
+ try
+ {
+ //闇�瑕佸垽鏂殑鏃堕棿
+ DateTime dTime = Convert.ToDateTime(strDate);
+ return GetWeekIndex(dTime);
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+
+ }
+ #endregion
+
+ #region 浠ュ懆鏈负姣忓懆绗竴澶╂潵璁＄畻褰撳墠鏃ユ湡鎵�灞炲摢涓�骞寸鍑犲懆
+ public string getWeek(DateTime dtime)
+ {
+ int nowweekindex = 0;
+ //瀹氫箟姣忓懆绗竴澶╀负鍛ㄦ湯寮�濮�
+ int[] aweek = new int[] { 0, 1, 2, 3, 4, 5, 6 };
+ int weekd = 0;
+ string yearmonthweek = "";
+ //纭畾姝ゆ椂闂村湪涓�骞翠腑鐨勪綅缃�(绗灏戝ぉ)
+ int dayofyear = dtime.DayOfYear;
+ //纭畾姝ゆ椂闂村湪涓�骞翠腑鐨勬湀浠�
+ int dayofmonth = dtime.Month;
+ //纭畾褰撳勾绗竴澶╂槸鍛ㄥ嚑
+ //int dayofweek = (int)dtime.DayOfWeek;
+ //褰撳勾绗竴澶�
+ DateTime dtfirstday = new DateTime(dtime.Year, 1, 1);
+ //纭畾褰撳勾绗竴澶╂槸鍛ㄥ嚑
+ int dtfirstdayofweek = (int)dtfirstday.DayOfWeek;
+ //DateTime dtlastday = new DateTime(dtime.Year, 12, 31);
+ //涓嬩竴骞寸涓�澶�
+ DateTime dtnextyear = new DateTime(dtime.Year + 1, 1, 1);
+ //int dtnextyeardayofweek = (int)dtnextyear.DayOfWeek;
+ //涓嬩竴骞寸涓�澶╂槸鍛ㄥ嚑
+ int nextyear = sy(dtnextyear,aweek) - 1;
+ DateTime dtlastday1 = new DateTime(dtime.Year, 12, 31 - nextyear);
+ if ((int)dtime.DayOfYear - (int)dtfirstday.DayOfYear <= 7 - sy(dtfirstday,aweek))
+ {
+ nowweekindex = 1;
+ yearmonthweek = dtime.Year + "_" + dayofmonth + "_" + nowweekindex;
+ }
+ else if ((int)dtime.DayOfYear <= (int)dtlastday1.DayOfYear)
+ {
+ for (int j = 0; j < aweek.Length; j++)
+ {
+ if (Convert.ToInt32(aweek[j]) == dtfirstdayofweek)
+ {
+ int b = aweek.Length - (j + 1);
+ int x = (dayofyear - 1) - b;
+ weekd = x / 7;
+ int yushu = x % 7;
+ if (yushu != 0)
+ {
+ nowweekindex = weekd + 2;
+ yearmonthweek = dtime.Year + "_" + dayofmonth + "_" + nowweekindex;
+ }
+ else
+ {
+ nowweekindex = weekd + 1;
+ yearmonthweek = dtime.Year + "_" + dayofmonth + "_" + nowweekindex;
+ }
+ }
+ }
+ }
+ else
+ {
+ nowweekindex = weekd + 1;
+ yearmonthweek = dtime.Year + 1 + "_" + 1 + "_" + nowweekindex;
+ }
+ return yearmonthweek;
+ }
+
+
+ public static int sy(DateTime dtime, int[] aweek)
+ {
+ int midnum = 0;
+ int midof = (int)dtime.DayOfWeek;
+ for (int i = 0; i < aweek.Length; i++)
+ {
+ if (Convert.ToInt32(aweek[i]) == midof)
+ {
+ midnum = i;
+ }
+ }
+ return midnum + 1;
+ }
+ #endregion
+
+ public string GetCodeDateStr(DateTime dtime)
+ {
+ DateTime currentTime = dtime;
+ var year = GetOfYear(currentTime);
+ var week = GetWeekOfYear(currentTime);
+ var weekStr = week < 10 ? $"0{week}" : week.ToString();
+ var dateStr = $"{year}{weekStr}{getWeekOfDay(dtime)}"; ;
+ return dateStr;
+ }
+ private static int GetOfYear(DateTime dt)
+ {
+ var OfYear =int.Parse(dt.Year.ToString().ToCharArray()[3].ToString());
+ GregorianCalendar gc = new GregorianCalendar();
+ //鍒ゆ柇褰撳墠鏃ユ湡鏄惁鏄�12鏈堜唤
+ int dayofmonth = dt.Month;
+ //鍒ゆ柇褰撳墠鏃ユ湡鏄鍑犲懆
+ int dayofweek = gc.GetWeekOfYear(dt, CalendarWeekRule.FirstDay, DayOfWeek.Sunday);
+ //涓嬩竴骞寸殑绗竴澶�
+ DateTime dtfirstday = new DateTime(dt.Year + 1, 1, 1);
+ //纭畾涓嬩竴骞寸涓�澶╂槸鍛ㄥ嚑
+ int dtfirstdayofweek = (int)dtfirstday.DayOfWeek;
+ //鍒ゆ柇涓嬩竴骞寸涓�澶╀笉涓哄懆鏃ヤ笖褰撳墠鏃ユ湡涓烘湰骞寸12鏈堜笖褰撳墠鏃ユ湡涓烘湰骞寸53鍛�
+ if (dtfirstdayofweek != 0 && dayofmonth == 12 && dayofweek == 53)
+ {
+ OfYear = OfYear + 1; //鍔犱竴骞�
+ }
+ else
+ {
+ OfYear = int.Parse(dt.Year.ToString().ToCharArray()[3].ToString());
+ }
+ return OfYear;
+ }
+ private static int GetWeekOfYear(DateTime dt)
+ {
+ int weekOfYear = 1;
+ GregorianCalendar gc = new GregorianCalendar();
+ //鍒ゆ柇褰撳墠鏃ユ湡鏄惁鏄�12鏈堜唤
+ int dayofmonth = dt.Month;
+ //鍒ゆ柇褰撳墠鏃ユ湡鏄鍑犲懆
+ int dayofweek=gc.GetWeekOfYear(dt, CalendarWeekRule.FirstDay, DayOfWeek.Sunday);
+ //涓嬩竴骞寸殑绗竴澶�
+ DateTime dtfirstday = new DateTime(dt.Year+1, 1, 1);
+ //纭畾涓嬩竴骞寸涓�澶╂槸鍛ㄥ嚑
+ int dtfirstdayofweek = (int)dtfirstday.DayOfWeek;
+ //鍒ゆ柇涓嬩竴骞寸涓�澶╀笉涓哄懆鏃ヤ笖褰撳墠鏃ユ湡涓烘湰骞寸12鏈堜笖褰撳墠鏃ユ湡涓烘湰骞寸53鍛�
+ if (dtfirstdayofweek != 0&& dayofmonth == 12&&dayofweek ==53)
+ {
+ weekOfYear = 1; //涓嬩竴骞寸涓�鍛�
+ }
+ else
+ {
+ weekOfYear = gc.GetWeekOfYear(dt, CalendarWeekRule.FirstDay, DayOfWeek.Sunday);
+ }
+ return weekOfYear;
+ }
+ public static int getWeekOfDay(DateTime dtime)
+ {
+ int DayinWeek = 0;
+ string week = dtime.DayOfWeek.ToString();
+ switch (week)
+ {
+ case "Monday":
+ DayinWeek = 2;
+ break;
+ case "Tuesday":
+ DayinWeek = 3;
+ break;
+ case "Wednesday":
+ DayinWeek = 4;
+ break;
+ case "Thursday":
+ DayinWeek = 5;
+ break;
+ case "Friday":
+ DayinWeek = 6;
+ break;
+ case "Saturday":
+ DayinWeek = 7;
+ break;
+ case "Sunday":
+ DayinWeek = 1;
+ break;
+ }
+ return DayinWeek;
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 3b54b4a..35cbee5 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -458,6 +458,7 @@
<Compile Include="Models\ClsGy_StockCheckItemBill.cs" />
<Compile Include="Models\ClsSc_PackUnionBillMain.cs" />
<Compile Include="Models\ClsSc_PackUnionBillSub.cs" />
+ <Compile Include="Models\GetWeekList.cs" />
<Compile Include="Models\jsonScanline.cs" />
<Compile Include="Models\ScanLineCode.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillEmp.cs" />
diff --git "a/WorkM/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOBillList.designer.cs" "b/WorkM/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOBillList.designer.cs"
index 54f8745..f5a9918 100644
--- "a/WorkM/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOBillList.designer.cs"
+++ "b/WorkM/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOBillList.designer.cs"
@@ -70,6 +70,9 @@
this.grdPrint = new System.Windows.Forms.DataGridView();
this.grdSum = new System.Windows.Forms.DataGridView();
this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.txtHBillNo2 = new System.Windows.Forms.TextBox();
+ this.label8 = new System.Windows.Forms.Label();
+ this.btnTB = new System.Windows.Forms.Button();
this.cmbHStatus = new System.Windows.Forms.ComboBox();
this.label7 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
@@ -85,9 +88,6 @@
this.btnOK = new System.Windows.Forms.Button();
this.txtHBillNo = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
- this.txtHBillNo2 = new System.Windows.Forms.TextBox();
- this.label8 = new System.Windows.Forms.Label();
- this.btnTB = new System.Windows.Forms.Button();
this.pPic.SuspendLayout();
this.panel1.SuspendLayout();
this.Tool.SuspendLayout();
@@ -105,9 +105,10 @@
this.pPic.Controls.Add(this.panel1);
this.pPic.Controls.Add(this.lblCaption);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
- this.pPic.Location = new System.Drawing.Point(0, 50);
+ this.pPic.Location = new System.Drawing.Point(0, 75);
+ this.pPic.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1246, 53);
+ this.pPic.Size = new System.Drawing.Size(1869, 80);
this.pPic.TabIndex = 15;
//
// panel1
@@ -115,26 +116,29 @@
this.panel1.Controls.Add(this.lbljl);
this.panel1.Controls.Add(this.lbldj);
this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel1.Location = new System.Drawing.Point(1032, 0);
+ this.panel1.Location = new System.Drawing.Point(1548, 0);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(214, 53);
+ this.panel1.Size = new System.Drawing.Size(321, 80);
this.panel1.TabIndex = 7;
//
// lbljl
//
this.lbljl.AutoSize = true;
- this.lbljl.Location = new System.Drawing.Point(24, 30);
+ this.lbljl.Location = new System.Drawing.Point(36, 45);
+ this.lbljl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbljl.Name = "lbljl";
- this.lbljl.Size = new System.Drawing.Size(11, 12);
+ this.lbljl.Size = new System.Drawing.Size(17, 18);
this.lbljl.TabIndex = 1;
this.lbljl.Text = " ";
//
// lbldj
//
this.lbldj.AutoSize = true;
- this.lbldj.Location = new System.Drawing.Point(24, 12);
+ this.lbldj.Location = new System.Drawing.Point(36, 18);
+ this.lbldj.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbldj.Name = "lbldj";
- this.lbldj.Size = new System.Drawing.Size(0, 12);
+ this.lbldj.Size = new System.Drawing.Size(0, 18);
this.lbldj.TabIndex = 0;
//
// lblCaption
@@ -143,9 +147,10 @@
this.lblCaption.BackColor = System.Drawing.Color.Transparent;
this.lblCaption.Cursor = System.Windows.Forms.Cursors.No;
this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblCaption.Location = new System.Drawing.Point(12, 15);
+ this.lblCaption.Location = new System.Drawing.Point(18, 22);
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(98, 21);
+ this.lblCaption.Size = new System.Drawing.Size(147, 33);
this.lblCaption.TabIndex = 4;
this.lblCaption.Text = "鍗曟嵁鍒楄〃";
this.lblCaption.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -160,9 +165,9 @@
this.toolStripDropDownButton1,
this.dc,
this.dy,
+ this.cx,
this.yl,
this.toolStripSeparator2,
- this.cx,
this.sx,
this.toolStripSeparator1,
this.xz,
@@ -186,7 +191,7 @@
this.Tool.Location = new System.Drawing.Point(0, 0);
this.Tool.Name = "Tool";
this.Tool.Padding = new System.Windows.Forms.Padding(0);
- this.Tool.Size = new System.Drawing.Size(1246, 50);
+ this.Tool.Size = new System.Drawing.Size(1869, 75);
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
@@ -200,7 +205,7 @@
this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
- this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 47);
+ this.toolStripDropDownButton1.Size = new System.Drawing.Size(64, 70);
this.toolStripDropDownButton1.Text = "寮曞嚭";
this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -208,14 +213,14 @@
// eXCELToolStripMenuItem
//
this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
- this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
+ this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(163, 34);
this.eXCELToolStripMenuItem.Text = "EXCEL";
this.eXCELToolStripMenuItem.Click += new System.EventHandler(this.eXCELToolStripMenuItem_Click);
//
// cSVToolStripMenuItem
//
this.cSVToolStripMenuItem.Name = "cSVToolStripMenuItem";
- this.cSVToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
+ this.cSVToolStripMenuItem.Size = new System.Drawing.Size(163, 34);
this.cSVToolStripMenuItem.Text = "CSV";
this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
@@ -265,7 +270,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 75);
//
// cx
//
@@ -298,7 +303,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 75);
//
// xz
//
@@ -346,7 +351,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 75);
this.toolStripSeparator5.Visible = false;
//
// sh
@@ -382,7 +387,7 @@
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 75);
//
// down
//
@@ -401,7 +406,7 @@
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 75);
//
// xd
//
@@ -420,7 +425,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 75);
//
// tc
//
@@ -439,13 +444,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 75);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 75);
//
// mrlk
//
@@ -455,7 +460,7 @@
this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
this.mrlk.Name = "mrlk";
- this.mrlk.Size = new System.Drawing.Size(60, 47);
+ this.mrlk.Size = new System.Drawing.Size(86, 70);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -465,7 +470,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 75);
//
// bclk
//
@@ -475,7 +480,7 @@
this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.bclk.ImageTransparentColor = System.Drawing.Color.White;
this.bclk.Name = "bclk";
- this.bclk.Size = new System.Drawing.Size(60, 47);
+ this.bclk.Size = new System.Drawing.Size(86, 70);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -485,7 +490,7 @@
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 75);
//
// timer1
//
@@ -503,11 +508,13 @@
this.grdMain.BackgroundColor = System.Drawing.SystemColors.InactiveCaption;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(0, 167);
+ this.grdMain.Location = new System.Drawing.Point(0, 251);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersWidth = 62;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1246, 345);
+ this.grdMain.Size = new System.Drawing.Size(1869, 517);
this.grdMain.TabIndex = 19;
this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
@@ -517,10 +524,12 @@
// grdPrint
//
this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdPrint.Location = new System.Drawing.Point(772, 146);
+ this.grdPrint.Location = new System.Drawing.Point(1158, 219);
+ this.grdPrint.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdPrint.Name = "grdPrint";
+ this.grdPrint.RowHeadersWidth = 62;
this.grdPrint.RowTemplate.Height = 23;
- this.grdPrint.Size = new System.Drawing.Size(25, 24);
+ this.grdPrint.Size = new System.Drawing.Size(38, 36);
this.grdPrint.TabIndex = 8;
this.grdPrint.Visible = false;
//
@@ -531,12 +540,14 @@
this.grdSum.BackgroundColor = System.Drawing.SystemColors.Control;
this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.grdSum.Location = new System.Drawing.Point(0, 512);
+ this.grdSum.Location = new System.Drawing.Point(0, 768);
+ this.grdSum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
+ this.grdSum.RowHeadersWidth = 62;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(1246, 19);
+ this.grdSum.Size = new System.Drawing.Size(1869, 28);
this.grdSum.TabIndex = 47;
//
// groupBox1
@@ -561,11 +572,42 @@
this.groupBox1.Controls.Add(this.txtHBillNo);
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
- this.groupBox1.Location = new System.Drawing.Point(0, 103);
+ this.groupBox1.Location = new System.Drawing.Point(0, 155);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(1246, 64);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox1.Size = new System.Drawing.Size(1869, 96);
this.groupBox1.TabIndex = 52;
this.groupBox1.TabStop = false;
+ //
+ // txtHBillNo2
+ //
+ this.txtHBillNo2.Location = new System.Drawing.Point(1454, 16);
+ this.txtHBillNo2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHBillNo2.Name = "txtHBillNo2";
+ this.txtHBillNo2.Size = new System.Drawing.Size(193, 28);
+ this.txtHBillNo2.TabIndex = 27;
+ //
+ // label8
+ //
+ this.label8.AutoSize = true;
+ this.label8.Location = new System.Drawing.Point(1370, 22);
+ this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(80, 18);
+ this.label8.TabIndex = 26;
+ this.label8.Text = "鍗曟嵁鍙凤細";
+ //
+ // btnTB
+ //
+ this.btnTB.Location = new System.Drawing.Point(1662, 14);
+ this.btnTB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnTB.Name = "btnTB";
+ this.btnTB.Size = new System.Drawing.Size(110, 36);
+ this.btnTB.TabIndex = 25;
+ this.btnTB.Text = "閲嶆柊鍚屾";
+ this.btnTB.UseVisualStyleBackColor = true;
+ this.btnTB.Click += new System.EventHandler(this.btnTB_Click);
//
// cmbHStatus
//
@@ -577,111 +619,124 @@
"宸插鏍�",
"鏈叧闂�",
"宸插叧闂�"});
- this.cmbHStatus.Location = new System.Drawing.Point(291, 41);
+ this.cmbHStatus.Location = new System.Drawing.Point(436, 62);
+ this.cmbHStatus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbHStatus.Name = "cmbHStatus";
- this.cmbHStatus.Size = new System.Drawing.Size(81, 20);
+ this.cmbHStatus.Size = new System.Drawing.Size(120, 26);
this.cmbHStatus.TabIndex = 1;
this.cmbHStatus.Visible = false;
//
// label7
//
this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(207, 15);
+ this.label7.Location = new System.Drawing.Point(310, 22);
+ this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(77, 12);
+ this.label7.Size = new System.Drawing.Size(116, 18);
this.label7.TabIndex = 9;
this.label7.Text = "璁㈠崟璺熻釜鍙凤細";
//
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(213, 41);
+ this.label5.Location = new System.Drawing.Point(320, 62);
+ this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(41, 12);
+ this.label5.Size = new System.Drawing.Size(62, 18);
this.label5.TabIndex = 9;
this.label5.Text = "鐘舵�侊細";
this.label5.Visible = false;
//
// txtHOrderProcNO
//
- this.txtHOrderProcNO.Location = new System.Drawing.Point(291, 12);
+ this.txtHOrderProcNO.Location = new System.Drawing.Point(436, 18);
+ this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHOrderProcNO.Name = "txtHOrderProcNO";
- this.txtHOrderProcNO.Size = new System.Drawing.Size(108, 21);
+ this.txtHOrderProcNO.Size = new System.Drawing.Size(160, 28);
this.txtHOrderProcNO.TabIndex = 10;
//
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(395, 41);
+ this.label6.Location = new System.Drawing.Point(592, 62);
+ this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(65, 12);
+ this.label6.Size = new System.Drawing.Size(98, 18);
this.label6.TabIndex = 8;
this.label6.Text = "鐢熶骇杞﹂棿锛�";
//
// txtHDeptID
//
- this.txtHDeptID.Location = new System.Drawing.Point(460, 36);
+ this.txtHDeptID.Location = new System.Drawing.Point(690, 54);
+ this.txtHDeptID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHDeptID.Name = "txtHDeptID";
- this.txtHDeptID.Size = new System.Drawing.Size(162, 21);
+ this.txtHDeptID.Size = new System.Drawing.Size(241, 28);
this.txtHDeptID.TabIndex = 4;
//
// dtpHBDate
//
this.dtpHBDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHBDate.Location = new System.Drawing.Point(78, 11);
+ this.dtpHBDate.Location = new System.Drawing.Point(117, 16);
+ this.dtpHBDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dtpHBDate.Name = "dtpHBDate";
this.dtpHBDate.ShowCheckBox = true;
- this.dtpHBDate.Size = new System.Drawing.Size(122, 21);
+ this.dtpHBDate.Size = new System.Drawing.Size(181, 28);
this.dtpHBDate.TabIndex = 1;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(15, 14);
+ this.label2.Location = new System.Drawing.Point(22, 21);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(65, 12);
+ this.label2.Size = new System.Drawing.Size(98, 18);
this.label2.TabIndex = 2;
this.label2.Text = "寮�濮嬫棩鏈燂細";
//
// txtHMaterID
//
- this.txtHMaterID.Location = new System.Drawing.Point(683, 10);
+ this.txtHMaterID.Location = new System.Drawing.Point(1024, 15);
+ this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMaterID.Name = "txtHMaterID";
- this.txtHMaterID.Size = new System.Drawing.Size(200, 21);
+ this.txtHMaterID.Size = new System.Drawing.Size(298, 28);
this.txtHMaterID.TabIndex = 5;
//
// dtpHEDate
//
this.dtpHEDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHEDate.Location = new System.Drawing.Point(78, 37);
+ this.dtpHEDate.Location = new System.Drawing.Point(117, 56);
+ this.dtpHEDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dtpHEDate.Name = "dtpHEDate";
this.dtpHEDate.ShowCheckBox = true;
- this.dtpHEDate.Size = new System.Drawing.Size(122, 21);
+ this.dtpHEDate.Size = new System.Drawing.Size(181, 28);
this.dtpHEDate.TabIndex = 2;
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(636, 15);
+ this.label4.Location = new System.Drawing.Point(954, 22);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(47, 12);
+ this.label4.Size = new System.Drawing.Size(71, 18);
this.label4.TabIndex = 7;
this.label4.Text = "鐗� 鏂欙細";
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(407, 15);
+ this.label1.Location = new System.Drawing.Point(610, 22);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(53, 12);
+ this.label1.Size = new System.Drawing.Size(80, 18);
this.label1.TabIndex = 0;
this.label1.Text = "鍗曟嵁鍙凤細";
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(683, 33);
+ this.btnOK.Location = new System.Drawing.Point(1024, 50);
+ this.btnOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnOK.Name = "btnOK";
- this.btnOK.Size = new System.Drawing.Size(200, 24);
+ this.btnOK.Size = new System.Drawing.Size(300, 36);
this.btnOK.TabIndex = 6;
this.btnOK.Text = "蹇�熻繃婊�";
this.btnOK.UseVisualStyleBackColor = true;
@@ -689,57 +744,34 @@
//
// txtHBillNo
//
- this.txtHBillNo.Location = new System.Drawing.Point(460, 11);
+ this.txtHBillNo.Location = new System.Drawing.Point(690, 16);
+ this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHBillNo.Name = "txtHBillNo";
- this.txtHBillNo.Size = new System.Drawing.Size(162, 21);
+ this.txtHBillNo.Size = new System.Drawing.Size(241, 28);
this.txtHBillNo.TabIndex = 3;
//
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(14, 40);
+ this.label3.Location = new System.Drawing.Point(21, 60);
+ this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(65, 12);
+ this.label3.Size = new System.Drawing.Size(98, 18);
this.label3.TabIndex = 4;
this.label3.Text = "缁撴潫鏃ユ湡锛�";
//
- // txtHBillNo2
- //
- this.txtHBillNo2.Location = new System.Drawing.Point(969, 11);
- this.txtHBillNo2.Name = "txtHBillNo2";
- this.txtHBillNo2.Size = new System.Drawing.Size(130, 21);
- this.txtHBillNo2.TabIndex = 27;
- //
- // label8
- //
- this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(913, 15);
- this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(53, 12);
- this.label8.TabIndex = 26;
- this.label8.Text = "鍗曟嵁鍙凤細";
- //
- // btnTB
- //
- this.btnTB.Location = new System.Drawing.Point(1108, 9);
- this.btnTB.Name = "btnTB";
- this.btnTB.Size = new System.Drawing.Size(73, 24);
- this.btnTB.TabIndex = 25;
- this.btnTB.Text = "閲嶆柊鍚屾";
- this.btnTB.UseVisualStyleBackColor = true;
- this.btnTB.Click += new System.EventHandler(this.btnTB_Click);
- //
// Sc_ICMOBillList
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1246, 531);
+ this.ClientSize = new System.Drawing.Size(1869, 796);
this.Controls.Add(this.grdMain);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.grdSum);
this.Controls.Add(this.pPic);
this.Controls.Add(this.Tool);
this.Controls.Add(this.grdPrint);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Sc_ICMOBillList";
this.Text = "鍗曟嵁鍒楄〃";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
diff --git "a/WorkM/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOBillList.resx" "b/WorkM/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOBillList.resx"
index b50f76f..c8b9356 100644
--- "a/WorkM/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOBillList.resx"
+++ "b/WorkM/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOBillList.resx"
@@ -3917,7 +3917,7 @@
<data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
7+/P+f/iUsf/x8fK/t/Zmfz/2hr//xcW2v9PS0v7f+DAgf8MDAwIA2aeAWqdaYxiwDuoAY9gBqwFGWD3
v9AbqBGkGZ8BX1+vh7sAZMDdXSAXBIBdADIgNWMh8QY8PlYO9QLCgDR8BvwBewFiwMtLnfAwuAoNA4IG
QMIAZMBsoAGIMLhKrAvAXkByAaoBkEBMzcRiwPTjv8CShHBmwYr/abgMmHzgy//+7W/+d657/L91ya3/
@@ -3929,7 +3929,7 @@
<data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
asEiqeQ73O4glHb8C9uaPNFr+su7dy0EQYBHBQCsYXGh6zpsjcGmabCqKixLjUVRYJ7nmKUZKqUwiiIM
wxCFlD0gjuMBMgKMBygnQOYDpNgB1AzQEyAlwIUuWMCWgycdJKQH6U66ka4kBpxJm4AXFccWtOOAW3Ad
iLUWLKCet+BnIJYBNsS/AJwppFlqASe6KOQOQNGhP0Yf8PMUVkM07eCAAbMWkgMP6TNEHmPihLjrgAHa
@@ -3939,17 +3939,29 @@
<data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
u3/Bo2wICEG/Oo9XdCIYwhNr8dl8ZRwfdQAAAABJRU5ErkJggg==
</value>
</data>
+ <data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
+ UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
+ F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
+ KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
+ oXs9qiieYFzuPSiSvmMYkef5B9h5hyvM1NoFGlmIXFPo6IWcJv9h5clA7oepFQ4HHLTFi7svsPoMG2+Q
+ UtDPT4GC2XgTpCe5X/YktlNs733486C5AJ9FHdrrRaLxARuoscFuuEjwX1RQNqzRzWXDfhTy670qMY7z
+ BdYeeKA8svstAAAAAElFTkSuQmCC
+</value>
+ </data>
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -3959,22 +3971,10 @@
AABJRU5ErkJggg==
</value>
</data>
- <data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
- UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
- F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
- KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
- oXs9qiieYFzuPSiSvmMYkef5B9h5hyvM1NoFGlmIXFPo6IWcJv9h5clA7oepFQ4HHLTFi7svsPoMG2+Q
- UtDPT4GC2XgTpCe5X/YktlNs733486C5AJ9FHdrrRaLxARuoscFuuEjwX1RQNqzRzWXDfhTy670qMY7z
- BdYeeKA8svstAAAAAElFTkSuQmCC
-</value>
- </data>
<data name="sx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -3988,7 +3988,7 @@
<data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
ybZE5D2ippYty7Ic1NgclOLiqhAlym44yF3JuzW7s2tedvcxzzO7jbWDT337PfN7nu935vdrYH51EwXf
BgpLor18Is75A+gP7CDYMetdx/9Y9l3wahsy7VnjZiqVshXh9Z7xSuSETLpXuJFIJm1FLC6e85ohK2Rc
WOJNTU/Yir5B3DjEptZObGnrxv2DY57PACOzC1woqm4rVdMxaaRIchzfwhLPhioL8bQYuIbBaQ8XcUX7
@@ -4002,7 +4002,7 @@
<data name="dj.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -4012,7 +4012,7 @@
<data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
iEgSIsQKqcVyPjQ2Z9mS0ooSlqElQ07RaGRib6zmeHmf27O3zSZcdbXnfp77+r33PRZKZdXN8Le4/pt4
wO15g0vykvn5V4j/1/5iEfsSv/iPbPbjQAgvHp5ecXrlwv6ZE7bDC1h2j7BitWNpzYZ5swUG0zL6Jxag
GZxCe68+GFBe14rjkzOMjs9iSD+DPt0ktAN6dHQPQ63pR0N7N+pbtdBNL6KmRRNijVo1jWexHcLjfcbN
@@ -4026,7 +4026,7 @@
<data name="sh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
@@ -4039,7 +4039,7 @@
<data name="qsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
C0MzEmpQFi4LpWEjUhaGMYqyUINQjEtqGEqkcZkY4zLO1CGP73vPN2cujdtTv97vPd/7PL2ncyhZTTWE
TKjrn6UGUVRgVElhnlF/DamvzjJN36FmMkteHk8RbhYJODXQNwnXHkJgmrA2+I+A51VC1Et4WPlnwN4Y
4UQMX7gIV27C5ZzR+8TzZccfA/bHCUcTBL/YRtZd5x8DpKoqyrE+RMzGMME7YHDlG4WUGvtZMsRtJ8bV
@@ -4052,7 +4052,7 @@
<data name="down.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEXSURBVDhPpZG/TsJQFMbvO/kOsjrAzNI+Qu0L4MzCwg66
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAEXSURBVDhPpZG/TsJQFMbvO/kOsjrAzNI+Qu0L4MzCwg66
mMgAC2wYmEggECCQdtDUuGhQFiWQfJxz7+0VUmgv8SRn6T395fsjeAbVK5SLInV934c8PjUMAAbYbrr4
WTWxfqvjc1nB+7CE154nAXR2HhIDdhLQIkANHwsG3BnA9PHmPOQYoBRIwKiEFwLQydEmIAbwqxR8swK2
MCIFfQ9B28H8qYDxw3UGgBV8ESD6A7CCkAENBuTSAYchqgxUiEHbxayRx+Q+A7DbPGuAVsAhsoWOSxby
@@ -4063,7 +4063,7 @@
<data name="xd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
EGSEmEwXoo0iRkR/ZBkSaC3m74qmC3/GjS7Edv5RTQNCMzUyNMWUWFaTo6AIaqjQ2/d999id61SLXnjh
cr73ec8991yVqXZPLzq9PfD6e+AL2M1rnZ4n4IyO29Xa0YUf27twhwDlJfv3mdaawz8lw1mNWbrV7sHa
6jrcUxsYTOOPbprelAxnNWbp+r1HWF1ZhnoMDHwFKp8BeYO0s0+b38IDyXBWY5au3nmIdOqbhC6HgYIh
@@ -4078,7 +4078,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -4088,7 +4088,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -4103,7 +4103,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
--
Gitblit v1.9.1