From 2bf02948d4954a6e0c1999d1925e48e5dfdc1bfd Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Mon, 18 Sep 2017 08:46:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BO/Utils/BillRpc/WeightBillRpc.cs | 1 + ButcherWeight/WeightForm.Designer.cs | 29 +-- ButcherWeight/WeightForm.resx | 197 +------------------ QualityAndOrder/QualityOrderForm.Designer.cs | 128 ++++++------ QualityAndOrder/QualityOrderForm.resx | 99 ++++++++++ 5 files changed, 180 insertions(+), 274 deletions(-) diff --git a/BO/Utils/BillRpc/WeightBillRpc.cs b/BO/Utils/BillRpc/WeightBillRpc.cs index 626f38e..f2457c8 100644 --- a/BO/Utils/BillRpc/WeightBillRpc.cs +++ b/BO/Utils/BillRpc/WeightBillRpc.cs @@ -230,6 +230,7 @@ namespace BO.Utils.BillRpc var bill = obj.Get("Bill"); entity.ID = bill.Get("ID"); entity.B3ID = bill.Get("B3ID"); + entity.Employee_Name = bill.Get("Employee_Name"); entity.Supplier_Name = bill.Get("Supplier_Name"); entity.AlreadyHouse = bill.Get("AlreadyHouse"); entity.FirstWeightNumber = bill.Get("FirstWeightNumber"); diff --git a/ButcherWeight/WeightForm.Designer.cs b/ButcherWeight/WeightForm.Designer.cs index f772d2a..0082a7f 100644 --- a/ButcherWeight/WeightForm.Designer.cs +++ b/ButcherWeight/WeightForm.Designer.cs @@ -143,8 +143,7 @@ this.M_B3ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.M_Car_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.M_Supplier_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.M_Zone_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.M_FarmerNames = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.M_Employee_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.M_PurchaseType_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.M_Number = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.M_Weight = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -1124,8 +1123,7 @@ this.M_B3ID, this.M_Car_Name, this.M_Supplier_Name, - this.M_Zone_Name, - this.M_FarmerNames, + this.M_Employee_Name, this.M_PurchaseType_Name, this.M_Number, this.M_Weight, @@ -1285,21 +1283,13 @@ this.M_Supplier_Name.ReadOnly = true; this.M_Supplier_Name.Width = 120; // - // M_Zone_Name + // M_Employee_Name // - this.M_Zone_Name.DataPropertyName = "Zone_Name"; - this.M_Zone_Name.HeaderText = "来源地"; - this.M_Zone_Name.Name = "M_Zone_Name"; - this.M_Zone_Name.ReadOnly = true; - this.M_Zone_Name.Width = 120; - // - // M_FarmerNames - // - this.M_FarmerNames.DataPropertyName = "FarmerNames"; - this.M_FarmerNames.HeaderText = "养殖户"; - this.M_FarmerNames.Name = "M_FarmerNames"; - this.M_FarmerNames.ReadOnly = true; - this.M_FarmerNames.Width = 120; + this.M_Employee_Name.DataPropertyName = "Employee_Name"; + this.M_Employee_Name.HeaderText = "业务员"; + this.M_Employee_Name.Name = "M_Employee_Name"; + this.M_Employee_Name.ReadOnly = true; + this.M_Employee_Name.Width = 120; // // M_PurchaseType_Name // @@ -1484,8 +1474,7 @@ private System.Windows.Forms.DataGridViewTextBoxColumn M_B3ID; private System.Windows.Forms.DataGridViewTextBoxColumn M_Car_Name; private System.Windows.Forms.DataGridViewTextBoxColumn M_Supplier_Name; - private System.Windows.Forms.DataGridViewTextBoxColumn M_Zone_Name; - private System.Windows.Forms.DataGridViewTextBoxColumn M_FarmerNames; + private System.Windows.Forms.DataGridViewTextBoxColumn M_Employee_Name; private System.Windows.Forms.DataGridViewTextBoxColumn M_PurchaseType_Name; private System.Windows.Forms.DataGridViewTextBoxColumn M_Number; private System.Windows.Forms.DataGridViewTextBoxColumn M_Weight; diff --git a/ButcherWeight/WeightForm.resx b/ButcherWeight/WeightForm.resx index 46615f3..cccc1f0 100644 --- a/ButcherWeight/WeightForm.resx +++ b/ButcherWeight/WeightForm.resx @@ -117,144 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -276,15 +138,6 @@ True - - True - - - True - - - True - True @@ -309,12 +162,6 @@ True - - True - - - True - True @@ -336,9 +183,6 @@ True - - True - True @@ -363,9 +207,6 @@ True - - True - True @@ -378,10 +219,7 @@ True - - True - - + True @@ -399,42 +237,9 @@ True - - True - - - True - - - True - - - True - - - True - 17, 17 - - True - - - True - - - True - - - True - - - True - - - True - 26 diff --git a/QualityAndOrder/QualityOrderForm.Designer.cs b/QualityAndOrder/QualityOrderForm.Designer.cs index 534c571..d8564eb 100644 --- a/QualityAndOrder/QualityOrderForm.Designer.cs +++ b/QualityAndOrder/QualityOrderForm.Designer.cs @@ -69,12 +69,6 @@ this.label1 = new System.Windows.Forms.Label(); this.keyBoardPanel = new System.Windows.Forms.FlowLayoutPanel(); this.weightBillGrid = new BWP.WinFormControl.UDataGridView(); - this.W_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.W_AlreadyHouse = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.W_B3ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.W_Supplier_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.W_FirstWeightNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.W_HouseNames = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.syncBtn = new System.Windows.Forms.Button(); this.testTimeInput = new BWP.WinFormControl.UDatePicker(); this.label20 = new System.Windows.Forms.Label(); @@ -107,6 +101,13 @@ this.tab2SyncBtn = new System.Windows.Forms.Button(); this.tab2DateSelect = new BWP.WinFormControl.UDatePicker(); this.label4 = new System.Windows.Forms.Label(); + this.W_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.W_AlreadyHouse = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.W_B3ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.W_Employee_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.W_Supplier_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.W_FirstWeightNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.W_HouseNames = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.uTabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.panel1.SuspendLayout(); @@ -455,6 +456,7 @@ this.W_ID, this.W_AlreadyHouse, this.W_B3ID, + this.W_Employee_Name, this.W_Supplier_Name, this.W_FirstWeightNumber, this.W_HouseNames}); @@ -471,52 +473,6 @@ this.weightBillGrid.TabIndex = 34; this.weightBillGrid.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.weightBillGrid_CellClick); // - // W_ID - // - this.W_ID.DataPropertyName = "ID"; - this.W_ID.HeaderText = "ID"; - this.W_ID.Name = "W_ID"; - this.W_ID.ReadOnly = true; - this.W_ID.Visible = false; - // - // W_AlreadyHouse - // - this.W_AlreadyHouse.DataPropertyName = "AlreadyHouse"; - this.W_AlreadyHouse.HeaderText = "AlreadyHouse"; - this.W_AlreadyHouse.Name = "W_AlreadyHouse"; - this.W_AlreadyHouse.ReadOnly = true; - this.W_AlreadyHouse.Visible = false; - // - // W_B3ID - // - this.W_B3ID.DataPropertyName = "B3ID"; - this.W_B3ID.HeaderText = "过磅单号"; - this.W_B3ID.Name = "W_B3ID"; - this.W_B3ID.ReadOnly = true; - // - // W_Supplier_Name - // - this.W_Supplier_Name.DataPropertyName = "Supplier_Name"; - this.W_Supplier_Name.HeaderText = "供应商"; - this.W_Supplier_Name.Name = "W_Supplier_Name"; - this.W_Supplier_Name.ReadOnly = true; - this.W_Supplier_Name.Width = 120; - // - // W_FirstWeightNumber - // - this.W_FirstWeightNumber.DataPropertyName = "FirstWeightNumber"; - this.W_FirstWeightNumber.HeaderText = "头数"; - this.W_FirstWeightNumber.Name = "W_FirstWeightNumber"; - this.W_FirstWeightNumber.ReadOnly = true; - // - // W_HouseNames - // - this.W_HouseNames.DataPropertyName = "HouseNames"; - this.W_HouseNames.HeaderText = "圈舍"; - this.W_HouseNames.Name = "W_HouseNames"; - this.W_HouseNames.ReadOnly = true; - this.W_HouseNames.Width = 120; - // // syncBtn // this.syncBtn.Font = new System.Drawing.Font("宋体", 15F); @@ -886,6 +842,61 @@ this.label4.TabIndex = 35; this.label4.Text = "日期："; // + // W_ID + // + this.W_ID.DataPropertyName = "ID"; + this.W_ID.HeaderText = "ID"; + this.W_ID.Name = "W_ID"; + this.W_ID.ReadOnly = true; + this.W_ID.Visible = false; + // + // W_AlreadyHouse + // + this.W_AlreadyHouse.DataPropertyName = "AlreadyHouse"; + this.W_AlreadyHouse.HeaderText = "AlreadyHouse"; + this.W_AlreadyHouse.Name = "W_AlreadyHouse"; + this.W_AlreadyHouse.ReadOnly = true; + this.W_AlreadyHouse.Visible = false; + // + // W_B3ID + // + this.W_B3ID.DataPropertyName = "B3ID"; + this.W_B3ID.HeaderText = "磅单号"; + this.W_B3ID.Name = "W_B3ID"; + this.W_B3ID.ReadOnly = true; + this.W_B3ID.Width = 80; + // + // W_Employee_Name + // + this.W_Employee_Name.DataPropertyName = "Employee_Name"; + this.W_Employee_Name.HeaderText = "业务员"; + this.W_Employee_Name.Name = "W_Employee_Name"; + this.W_Employee_Name.ReadOnly = true; + this.W_Employee_Name.Width = 80; + // + // W_Supplier_Name + // + this.W_Supplier_Name.DataPropertyName = "Supplier_Name"; + this.W_Supplier_Name.HeaderText = "供应商"; + this.W_Supplier_Name.Name = "W_Supplier_Name"; + this.W_Supplier_Name.ReadOnly = true; + // + // W_FirstWeightNumber + // + this.W_FirstWeightNumber.DataPropertyName = "FirstWeightNumber"; + this.W_FirstWeightNumber.HeaderText = "头数"; + this.W_FirstWeightNumber.Name = "W_FirstWeightNumber"; + this.W_FirstWeightNumber.ReadOnly = true; + this.W_FirstWeightNumber.Width = 65; + // + // W_HouseNames + // + this.W_HouseNames.DataPropertyName = "HouseNames"; + this.W_HouseNames.HeaderText = "圈舍"; + this.W_HouseNames.Name = "W_HouseNames"; + this.W_HouseNames.ReadOnly = true; + this.W_HouseNames.Width = 105; + // // QualityOrderForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -959,12 +970,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn S_AbnormalItem_ID2; private System.Windows.Forms.DataGridViewTextBoxColumn S_Sanction_ID3; private System.Windows.Forms.DataGridViewTextBoxColumn S_AbnormalItem_ID3; - private System.Windows.Forms.DataGridViewTextBoxColumn W_ID; - private System.Windows.Forms.DataGridViewTextBoxColumn W_AlreadyHouse; - private System.Windows.Forms.DataGridViewTextBoxColumn W_B3ID; - private System.Windows.Forms.DataGridViewTextBoxColumn W_Supplier_Name; - private System.Windows.Forms.DataGridViewTextBoxColumn W_FirstWeightNumber; - private System.Windows.Forms.DataGridViewTextBoxColumn W_HouseNames; private System.Windows.Forms.DataGridViewTextBoxColumn O_ID; private System.Windows.Forms.DataGridViewTextBoxColumn O_IsHurryButcher; private System.Windows.Forms.DataGridViewTextBoxColumn O_WeightBill_ID; @@ -984,6 +989,13 @@ private System.Windows.Forms.DataGridViewTextBoxColumn P_WeighTime; private System.Windows.Forms.DataGridViewButtonColumn R_OKBtn; private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.DataGridViewTextBoxColumn W_ID; + private System.Windows.Forms.DataGridViewTextBoxColumn W_AlreadyHouse; + private System.Windows.Forms.DataGridViewTextBoxColumn W_B3ID; + private System.Windows.Forms.DataGridViewTextBoxColumn W_Employee_Name; + private System.Windows.Forms.DataGridViewTextBoxColumn W_Supplier_Name; + private System.Windows.Forms.DataGridViewTextBoxColumn W_FirstWeightNumber; + private System.Windows.Forms.DataGridViewTextBoxColumn W_HouseNames; diff --git a/QualityAndOrder/QualityOrderForm.resx b/QualityAndOrder/QualityOrderForm.resx index 2f3175a..49479a6 100644 --- a/QualityAndOrder/QualityOrderForm.resx +++ b/QualityAndOrder/QualityOrderForm.resx @@ -117,6 +117,24 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + + + True + + + True + + + True + True @@ -153,6 +171,39 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True @@ -162,6 +213,9 @@ True + + True + True @@ -171,6 +225,36 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True @@ -198,6 +282,9 @@ True + + True + True @@ -225,4 +312,16 @@ True + + True + + + True + + + True + + + True + \ No newline at end of file