Browse Source

修改。

master
yibo 8 years ago
parent
commit
4dfa3372fb
5 changed files with 234 additions and 186 deletions
  1. +5
    -6
      BO/Utils/BillRpc/OrderDetailRpc.cs
  2. +180
    -136
      QualityAndOrder/QualityOrderForm.Designer.cs
  3. +40
    -40
      QualityAndOrder/QualityOrderForm.resx
  4. +9
    -4
      QualityAndOrder/QualityOrderFormForTab2.cs
  5. BIN
      Setup/Release/Setup.msi

+ 5
- 6
BO/Utils/BillRpc/OrderDetailRpc.cs View File

@ -27,10 +27,10 @@ namespace BO.Utils.BillRpc
return RpcFacade.Call<int>(method, weightId, orerID);
}
public static int GetMaxOrder()
public static int GetMaxOrder(DateTime date)
{
const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/OrderDetailRpc/GetMaxOrder";
return RpcFacade.Call<int>(method, DateTime.Today);
return RpcFacade.Call<int>(method, date);
}
public static int GetCurrentOrder(long id)
@ -39,10 +39,10 @@ namespace BO.Utils.BillRpc
return RpcFacade.Call<int>(method, id);
}
public static List<OrderDetail> GetOrderDetail(int? minOrder = null)
public static List<OrderDetail> GetOrderDetail(DateTime date, int? minOrder = null)
{
const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/OrderDetailRpc/GetOrderDetail";
var result = RpcFacade.Call<string>(method, DateTime.Today, minOrder);
var result = RpcFacade.Call<string>(method, date, minOrder);
result = result.ESerializeDateTime();
return serializer.Deserialize<List<OrderDetail>>(result);
}
@ -51,7 +51,6 @@ namespace BO.Utils.BillRpc
{
insert.AccountingUnit_ID = ButcherAppContext.Context.UserConfig.AccountingUnit_ID;
insert.Creator = ButcherAppContext.Context.UserConfig.UserName;
insert.Date = DateTime.Today;
const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/OrderDetailRpc/Insert";
insert.ID = RpcFacade.Call<long>(method, serializer.Serialize(insert));
}
@ -65,7 +64,7 @@ namespace BO.Utils.BillRpc
public static void UpdateHurryFlag(long id, bool flag)
{
const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/OrderDetailRpc/UpdateHurryFlag";
RpcFacade.Call<int>(method, id, flag);
RpcFacade.Call<int>(method, id, flag);
}
public static void Delete(long id)


+ 180
- 136
QualityAndOrder/QualityOrderForm.Designer.cs View File

@ -28,23 +28,23 @@
/// </summary>
private void InitializeComponent()
{
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
this.uTabControl1 = new BWP.WinFormControl.UTabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.vScrollBar1 = new System.Windows.Forms.VScrollBar();
@ -110,9 +110,6 @@
this.P_OKBtn = new System.Windows.Forms.DataGridViewButtonColumn();
this.P_Hidden = new System.Windows.Forms.DataGridViewButtonColumn();
this.orderGrid = new BWP.WinFormControl.UDataGridView();
this.tab2SyncBtn = new System.Windows.Forms.Button();
this.tab2DateSelect = new BWP.WinFormControl.UDatePicker();
this.label4 = new System.Windows.Forms.Label();
this.O_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.O_IsHurryButcher = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.O_WeightBill_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
@ -123,6 +120,12 @@
this.O_LiveColonyHouse_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.O_OKBtn = new System.Windows.Forms.DataGridViewButtonColumn();
this.O_HurryBtn = new System.Windows.Forms.DataGridViewButtonColumn();
this.tab2SyncBtn = new System.Windows.Forms.Button();
this.tab2DateSelect = new BWP.WinFormControl.UDatePicker();
this.label4 = new System.Windows.Forms.Label();
this.butcherSearch = new System.Windows.Forms.Button();
this.butcherDateInput = new BWP.WinFormControl.UDatePicker();
this.label3 = new System.Windows.Forms.Label();
this.uTabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.panel1.SuspendLayout();
@ -223,17 +226,17 @@
this.sanctionGrid.AllowUserToDeleteRows = false;
this.sanctionGrid.AllowUserToResizeColumns = false;
this.sanctionGrid.AllowUserToResizeRows = false;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
this.sanctionGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
dataGridViewCellStyle29.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
this.sanctionGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle29;
this.sanctionGrid.BackgroundColor = System.Drawing.Color.White;
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 12F);
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.sanctionGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle30.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle30.Font = new System.Drawing.Font("宋体", 12F);
dataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.sanctionGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle30;
this.sanctionGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.sanctionGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.S_AbnormalItem_Name1,
@ -254,9 +257,9 @@
this.sanctionGrid.Name = "sanctionGrid";
this.sanctionGrid.ReadOnly = true;
this.sanctionGrid.RowHeadersVisible = false;
dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
this.sanctionGrid.RowsDefaultCellStyle = dataGridViewCellStyle3;
dataGridViewCellStyle31.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle31.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
this.sanctionGrid.RowsDefaultCellStyle = dataGridViewCellStyle31;
this.sanctionGrid.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.sanctionGrid.RowTemplate.Height = 50;
this.sanctionGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
@ -465,17 +468,17 @@
this.weightBillGrid.AllowUserToDeleteRows = false;
this.weightBillGrid.AllowUserToResizeColumns = false;
this.weightBillGrid.AllowUserToResizeRows = false;
dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
this.weightBillGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4;
dataGridViewCellStyle32.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
this.weightBillGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle32;
this.weightBillGrid.BackgroundColor = System.Drawing.Color.White;
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 12F);
dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.weightBillGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle33.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle33.Font = new System.Drawing.Font("宋体", 12F);
dataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.weightBillGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle33;
this.weightBillGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.weightBillGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.W_ID,
@ -490,11 +493,11 @@
this.weightBillGrid.Name = "weightBillGrid";
this.weightBillGrid.ReadOnly = true;
this.weightBillGrid.RowHeadersVisible = false;
dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle6.ForeColor = System.Drawing.Color.Black;
dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
dataGridViewCellStyle6.SelectionForeColor = System.Drawing.Color.Black;
this.weightBillGrid.RowsDefaultCellStyle = dataGridViewCellStyle6;
dataGridViewCellStyle34.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle34.ForeColor = System.Drawing.Color.Black;
dataGridViewCellStyle34.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
dataGridViewCellStyle34.SelectionForeColor = System.Drawing.Color.Black;
this.weightBillGrid.RowsDefaultCellStyle = dataGridViewCellStyle34;
this.weightBillGrid.RowTemplate.Height = 40;
this.weightBillGrid.ScrollBars = System.Windows.Forms.ScrollBars.None;
this.weightBillGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
@ -560,7 +563,7 @@
// syncBtn
//
this.syncBtn.Font = new System.Drawing.Font("宋体", 15F);
this.syncBtn.Location = new System.Drawing.Point(277, 9);
this.syncBtn.Location = new System.Drawing.Point(277, 6);
this.syncBtn.Name = "syncBtn";
this.syncBtn.Size = new System.Drawing.Size(94, 56);
this.syncBtn.TabIndex = 33;
@ -574,7 +577,7 @@
this.testTimeInput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.testTimeInput.Date = new System.DateTime(2017, 9, 8, 0, 0, 0, 0);
this.testTimeInput.Font = new System.Drawing.Font("宋体", 15F);
this.testTimeInput.Location = new System.Drawing.Point(124, 19);
this.testTimeInput.Location = new System.Drawing.Point(124, 16);
this.testTimeInput.Name = "testTimeInput";
this.testTimeInput.Size = new System.Drawing.Size(135, 30);
this.testTimeInput.TabIndex = 32;
@ -586,7 +589,7 @@
//
this.label20.AutoSize = true;
this.label20.Font = new System.Drawing.Font("宋体", 14F);
this.label20.Location = new System.Drawing.Point(23, 25);
this.label20.Location = new System.Drawing.Point(23, 22);
this.label20.Name = "label20";
this.label20.Size = new System.Drawing.Size(104, 19);
this.label20.TabIndex = 31;
@ -594,6 +597,9 @@
//
// tabPage2
//
this.tabPage2.Controls.Add(this.butcherSearch);
this.tabPage2.Controls.Add(this.butcherDateInput);
this.tabPage2.Controls.Add(this.label3);
this.tabPage2.Controls.Add(this.vScrollBar3);
this.tabPage2.Controls.Add(this.vScrollBar2);
this.tabPage2.Controls.Add(this.panel3);
@ -633,7 +639,7 @@
this.panel3.Controls.Add(this.showHidden);
this.panel3.Controls.Add(this.showAvailable);
this.panel3.Controls.Add(this.showAll);
this.panel3.Location = new System.Drawing.Point(706, 45);
this.panel3.Location = new System.Drawing.Point(706, 82);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(416, 42);
this.panel3.TabIndex = 45;
@ -709,7 +715,7 @@
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("宋体", 15F);
this.label6.ForeColor = System.Drawing.Color.Red;
this.label6.Location = new System.Drawing.Point(587, 61);
this.label6.Location = new System.Drawing.Point(587, 98);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(89, 20);
this.label6.TabIndex = 39;
@ -720,7 +726,7 @@
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("宋体", 15F);
this.label5.ForeColor = System.Drawing.Color.Red;
this.label5.Location = new System.Drawing.Point(23, 61);
this.label5.Location = new System.Drawing.Point(21, 54);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(89, 20);
this.label5.TabIndex = 39;
@ -732,17 +738,17 @@
this.preOrderGrid.AllowUserToDeleteRows = false;
this.preOrderGrid.AllowUserToResizeColumns = false;
this.preOrderGrid.AllowUserToResizeRows = false;
dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
this.preOrderGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7;
dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
this.preOrderGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle18;
this.preOrderGrid.BackgroundColor = System.Drawing.Color.White;
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 12F);
dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.preOrderGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle19.Font = new System.Drawing.Font("宋体", 12F);
dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.preOrderGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle19;
this.preOrderGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.preOrderGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.P_WeightBill_ID,
@ -756,20 +762,20 @@
this.P_WeighTime,
this.P_OKBtn,
this.P_Hidden});
this.preOrderGrid.Location = new System.Drawing.Point(591, 93);
this.preOrderGrid.Location = new System.Drawing.Point(591, 130);
this.preOrderGrid.MultiSelect = false;
this.preOrderGrid.Name = "preOrderGrid";
this.preOrderGrid.ReadOnly = true;
this.preOrderGrid.RowHeadersVisible = false;
dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle12.ForeColor = System.Drawing.Color.Black;
dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
dataGridViewCellStyle12.SelectionForeColor = System.Drawing.Color.Black;
this.preOrderGrid.RowsDefaultCellStyle = dataGridViewCellStyle12;
dataGridViewCellStyle23.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle23.ForeColor = System.Drawing.Color.Black;
dataGridViewCellStyle23.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
dataGridViewCellStyle23.SelectionForeColor = System.Drawing.Color.Black;
this.preOrderGrid.RowsDefaultCellStyle = dataGridViewCellStyle23;
this.preOrderGrid.RowTemplate.Height = 60;
this.preOrderGrid.ScrollBars = System.Windows.Forms.ScrollBars.None;
this.preOrderGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.preOrderGrid.Size = new System.Drawing.Size(743, 663);
this.preOrderGrid.Size = new System.Drawing.Size(743, 626);
this.preOrderGrid.TabIndex = 38;
this.preOrderGrid.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.preOrderGrid_CellClick);
this.preOrderGrid.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.preOrderGrid_CellContentClick);
@ -841,9 +847,9 @@
// P_WeighTime
//
this.P_WeighTime.DataPropertyName = "WeighTime";
dataGridViewCellStyle9.Format = "MM/dd HH:mm";
dataGridViewCellStyle9.NullValue = null;
this.P_WeighTime.DefaultCellStyle = dataGridViewCellStyle9;
dataGridViewCellStyle20.Format = "MM/dd HH:mm";
dataGridViewCellStyle20.NullValue = null;
this.P_WeighTime.DefaultCellStyle = dataGridViewCellStyle20;
this.P_WeighTime.HeaderText = "过磅时间";
this.P_WeighTime.Name = "P_WeighTime";
this.P_WeighTime.ReadOnly = true;
@ -851,9 +857,9 @@
//
// P_OKBtn
//
dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle10.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10);
this.P_OKBtn.DefaultCellStyle = dataGridViewCellStyle10;
dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle21.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10);
this.P_OKBtn.DefaultCellStyle = dataGridViewCellStyle21;
this.P_OKBtn.HeaderText = "排宰";
this.P_OKBtn.Name = "P_OKBtn";
this.P_OKBtn.ReadOnly = true;
@ -865,9 +871,9 @@
//
// P_Hidden
//
dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle11.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10);
this.P_Hidden.DefaultCellStyle = dataGridViewCellStyle11;
dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle22.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10);
this.P_Hidden.DefaultCellStyle = dataGridViewCellStyle22;
this.P_Hidden.HeaderText = "隐藏";
this.P_Hidden.Name = "P_Hidden";
this.P_Hidden.ReadOnly = true;
@ -880,17 +886,17 @@
this.orderGrid.AllowUserToDeleteRows = false;
this.orderGrid.AllowUserToResizeColumns = false;
this.orderGrid.AllowUserToResizeRows = false;
dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
this.orderGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle13;
dataGridViewCellStyle24.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
this.orderGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle24;
this.orderGrid.BackgroundColor = System.Drawing.Color.White;
dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle14.Font = new System.Drawing.Font("宋体", 12F);
dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.orderGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle14;
dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle25.Font = new System.Drawing.Font("宋体", 12F);
dataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.orderGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle25;
this.orderGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.orderGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.O_ID,
@ -908,11 +914,11 @@
this.orderGrid.Name = "orderGrid";
this.orderGrid.ReadOnly = true;
this.orderGrid.RowHeadersVisible = false;
dataGridViewCellStyle17.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle17.ForeColor = System.Drawing.Color.Black;
dataGridViewCellStyle17.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
dataGridViewCellStyle17.SelectionForeColor = System.Drawing.Color.Black;
this.orderGrid.RowsDefaultCellStyle = dataGridViewCellStyle17;
dataGridViewCellStyle28.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle28.ForeColor = System.Drawing.Color.Black;
dataGridViewCellStyle28.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
dataGridViewCellStyle28.SelectionForeColor = System.Drawing.Color.Black;
this.orderGrid.RowsDefaultCellStyle = dataGridViewCellStyle28;
this.orderGrid.RowTemplate.Height = 60;
this.orderGrid.ScrollBars = System.Windows.Forms.ScrollBars.None;
this.orderGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
@ -921,41 +927,6 @@
this.orderGrid.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.orderGrid_CellClick);
this.orderGrid.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.orderGrid_CellContentClick);
//
// tab2SyncBtn
//
this.tab2SyncBtn.Font = new System.Drawing.Font("宋体", 15F);
this.tab2SyncBtn.Location = new System.Drawing.Point(277, 9);
this.tab2SyncBtn.Name = "tab2SyncBtn";
this.tab2SyncBtn.Size = new System.Drawing.Size(94, 56);
this.tab2SyncBtn.TabIndex = 37;
this.tab2SyncBtn.Text = "同步";
this.tab2SyncBtn.UseVisualStyleBackColor = true;
this.tab2SyncBtn.Click += new System.EventHandler(this.tab2SyncBtn_Click);
//
// tab2DateSelect
//
this.tab2DateSelect.BackColor = System.Drawing.Color.White;
this.tab2DateSelect.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tab2DateSelect.Date = new System.DateTime(2017, 9, 8, 0, 0, 0, 0);
this.tab2DateSelect.Font = new System.Drawing.Font("宋体", 15F);
this.tab2DateSelect.Location = new System.Drawing.Point(124, 19);
this.tab2DateSelect.Name = "tab2DateSelect";
this.tab2DateSelect.Size = new System.Drawing.Size(135, 30);
this.tab2DateSelect.TabIndex = 36;
this.tab2DateSelect.Text = "2017/09/08";
this.tab2DateSelect.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.tab2DateSelect.Type = BWP.WinFormControl.DateTimeType.Date;
//
// label4
//
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("宋体", 14F);
this.label4.Location = new System.Drawing.Point(23, 25);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(104, 19);
this.label4.TabIndex = 35;
this.label4.Text = "过磅日期:";
//
// O_ID
//
this.O_ID.DataPropertyName = "ID";
@ -1021,9 +992,9 @@
//
// O_OKBtn
//
dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle15.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10);
this.O_OKBtn.DefaultCellStyle = dataGridViewCellStyle15;
dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle26.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10);
this.O_OKBtn.DefaultCellStyle = dataGridViewCellStyle26;
this.O_OKBtn.HeaderText = "确定";
this.O_OKBtn.Name = "O_OKBtn";
this.O_OKBtn.ReadOnly = true;
@ -1033,9 +1004,9 @@
//
// O_HurryBtn
//
dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle16.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10);
this.O_HurryBtn.DefaultCellStyle = dataGridViewCellStyle16;
dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle27.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10);
this.O_HurryBtn.DefaultCellStyle = dataGridViewCellStyle27;
this.O_HurryBtn.HeaderText = "急宰";
this.O_HurryBtn.Name = "O_HurryBtn";
this.O_HurryBtn.ReadOnly = true;
@ -1043,6 +1014,76 @@
this.O_HurryBtn.UseColumnTextForButtonValue = true;
this.O_HurryBtn.Width = 95;
//
// tab2SyncBtn
//
this.tab2SyncBtn.Font = new System.Drawing.Font("宋体", 15F);
this.tab2SyncBtn.Location = new System.Drawing.Point(841, 7);
this.tab2SyncBtn.Name = "tab2SyncBtn";
this.tab2SyncBtn.Size = new System.Drawing.Size(94, 56);
this.tab2SyncBtn.TabIndex = 37;
this.tab2SyncBtn.Text = "同步";
this.tab2SyncBtn.UseVisualStyleBackColor = true;
this.tab2SyncBtn.Click += new System.EventHandler(this.tab2SyncBtn_Click);
//
// tab2DateSelect
//
this.tab2DateSelect.BackColor = System.Drawing.Color.White;
this.tab2DateSelect.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tab2DateSelect.Date = new System.DateTime(2017, 9, 8, 0, 0, 0, 0);
this.tab2DateSelect.Font = new System.Drawing.Font("宋体", 15F);
this.tab2DateSelect.Location = new System.Drawing.Point(688, 17);
this.tab2DateSelect.Name = "tab2DateSelect";
this.tab2DateSelect.Size = new System.Drawing.Size(135, 30);
this.tab2DateSelect.TabIndex = 36;
this.tab2DateSelect.Text = "2017/09/08";
this.tab2DateSelect.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.tab2DateSelect.Type = BWP.WinFormControl.DateTimeType.Date;
//
// label4
//
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("宋体", 14F);
this.label4.Location = new System.Drawing.Point(587, 23);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(104, 19);
this.label4.TabIndex = 35;
this.label4.Text = "过磅日期:";
//
// butcherSearch
//
this.butcherSearch.Font = new System.Drawing.Font("宋体", 15F);
this.butcherSearch.Location = new System.Drawing.Point(277, 6);
this.butcherSearch.Name = "butcherSearch";
this.butcherSearch.Size = new System.Drawing.Size(94, 56);
this.butcherSearch.TabIndex = 57;
this.butcherSearch.Text = "查询";
this.butcherSearch.UseVisualStyleBackColor = true;
this.butcherSearch.Click += new System.EventHandler(this.butcherSearch_Click);
//
// butcherDateInput
//
this.butcherDateInput.BackColor = System.Drawing.Color.White;
this.butcherDateInput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.butcherDateInput.Date = new System.DateTime(2017, 9, 8, 0, 0, 0, 0);
this.butcherDateInput.Font = new System.Drawing.Font("宋体", 15F);
this.butcherDateInput.Location = new System.Drawing.Point(124, 16);
this.butcherDateInput.Name = "butcherDateInput";
this.butcherDateInput.Size = new System.Drawing.Size(135, 30);
this.butcherDateInput.TabIndex = 56;
this.butcherDateInput.Text = "2017/09/08";
this.butcherDateInput.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.butcherDateInput.Type = BWP.WinFormControl.DateTimeType.Date;
//
// label3
//
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("宋体", 14F);
this.label3.Location = new System.Drawing.Point(23, 22);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(104, 19);
this.label3.TabIndex = 55;
this.label3.Text = "宰杀日期:";
//
// QualityOrderForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@ -1154,6 +1195,9 @@
private System.Windows.Forms.DataGridViewTextBoxColumn O_LiveColonyHouse_Name;
private System.Windows.Forms.DataGridViewButtonColumn O_OKBtn;
private System.Windows.Forms.DataGridViewButtonColumn O_HurryBtn;
private System.Windows.Forms.Button butcherSearch;
private BWP.WinFormControl.UDatePicker butcherDateInput;
private System.Windows.Forms.Label label3;


+ 40
- 40
QualityAndOrder/QualityOrderForm.resx View File

@ -117,124 +117,124 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="S_AbnormalItem_Name1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="P_WeightBill_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="S_Number1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="P_Show.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="S_AbnormalItem_Name2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="P_B3ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="S_Number2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="P_Supplier_Name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="S_AbnormalItem_Name3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="P_HouseNames.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="S_Number3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="P_Number.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="S_Sanction_ID1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="P_AlreadyNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="S_AbnormalItem_ID1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="P_LastNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="S_Sanction_ID2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="P_WeighTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="S_AbnormalItem_ID2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="P_OKBtn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="S_Sanction_ID3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="P_Hidden.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="S_AbnormalItem_ID3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="O_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="W_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="O_IsHurryButcher.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="W_AlreadyHouse.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="O_WeightBill_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="W_B3ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="O_SecondarySplit.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="W_Employee_Name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="O_Order.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="W_Supplier_Name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="O_B3WeighBill_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="W_Number.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="O_PlanNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="W_HouseNames.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="O_LiveColonyHouse_Name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="P_WeightBill_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="O_OKBtn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="P_Show.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="O_HurryBtn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="P_B3ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="S_AbnormalItem_Name1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="P_Supplier_Name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="S_Number1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="P_HouseNames.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="S_AbnormalItem_Name2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="P_Number.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="S_Number2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="P_AlreadyNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="S_AbnormalItem_Name3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="P_LastNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="S_Number3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="P_WeighTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="S_Sanction_ID1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="P_OKBtn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="S_AbnormalItem_ID1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="P_Hidden.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="S_Sanction_ID2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="O_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="S_AbnormalItem_ID2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="O_IsHurryButcher.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="S_Sanction_ID3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="O_WeightBill_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="S_AbnormalItem_ID3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="O_SecondarySplit.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="W_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="O_Order.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="W_AlreadyHouse.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="O_B3WeighBill_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="W_B3ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="O_PlanNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="W_Employee_Name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="O_LiveColonyHouse_Name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="W_Supplier_Name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="O_OKBtn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="W_Number.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="O_HurryBtn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="W_HouseNames.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>

+ 9
- 4
QualityAndOrder/QualityOrderFormForTab2.cs View File

@ -22,7 +22,7 @@ namespace QualityAndOrder
void Tab2Init()
{
tab2DateSelect.Date = DateTime.Today;
butcherDateInput.Date = DateTime.Today;
orderGrid.AutoGenerateColumns = false;
preOrderGrid.AutoGenerateColumns = false;
orderGrid.DataSource = null;
@ -73,9 +73,13 @@ namespace QualityAndOrder
orderGrid.Refresh();
}
private void tab2SyncBtn_Click(object sender, EventArgs e)
private void butcherSearch_Click(object sender, EventArgs e)
{
BindOrderGrid();
}
private void tab2SyncBtn_Click(object sender, EventArgs e)
{
if (tb2SyncB3IDThread == null)
{
tb2SyncB3IDThread = new Thread(Tab2SyncB3ID);
@ -201,7 +205,7 @@ namespace QualityAndOrder
OrderDetail lastOrderDetail;
void BindOrderGrid()
{
orderList = OrderDetailRpc.GetOrderDetail();
orderList = OrderDetailRpc.GetOrderDetail(butcherDateInput.Date.Value);
orderGrid.DataSource = orderList.OrderByDescending(x => x.Order).ToList();
if (lastOrderDetail == null && orderGrid.CurrentRow != null)
{
@ -254,7 +258,7 @@ namespace QualityAndOrder
if (lastOrderDetail != null)
currentOrder = OrderDetailRpc.GetCurrentOrder(lastOrderDetail.ID);
else
currentOrder = OrderDetailRpc.GetMaxOrder();
currentOrder = OrderDetailRpc.GetMaxOrder(butcherDateInput.Date.Value);
currentOrder++;
var order = new OrderDetail();
order.Order = currentOrder;
@ -262,6 +266,7 @@ namespace QualityAndOrder
order.PlanNumber = entity.LastNumber;
order.WeightBill_ID = entity.WeightBill_ID;
order.B3WeighBill_ID = entity.B3ID;
order.Date = butcherDateInput.Date.Value;
OrderDetailRpc.Insert(order);
BindOrderGrid();
}


BIN
Setup/Release/Setup.msi View File


Loading…
Cancel
Save