BWPB3
/
ButcherFactorySolution
9
0
Fork 0
Code Issues 0 Pull Requests 0 Activity
Browse Source

调整。

master
yibo 7 years ago
parent
1b7686dca2
commit
dc3797b580
6 changed files with 307 additions and 294 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +9
    -1
      ButcherFactory.BO/Bill/CarcassSaleOut_Detail.cs
  2. +1
    -1
      ButcherFactory.BO/LocalBL/CarcassSaleOutBL.cs
  3. +211
    -196
      ButcherFactory.Form/CarcassSaleOut_/CarcassSaleOutForm.Designer.cs
  4. +38
    -5
      ButcherFactory.Form/CarcassSaleOut_/CarcassSaleOutForm.cs
  5. +6
    -3
      ButcherFactory.Form/CarcassSaleOut_/CarcassSaleOutForm.resx
  6. +42
    -88
      ButcherFactorySolution/ButcherFactorySolution.vdproj

+ 9
- 1
ButcherFactory.BO/Bill/CarcassSaleOut_Detail.cs View File

@ -39,7 +39,7 @@ namespace ButcherFactory.BO
public decimal Weight { get; set; } public decimal Weight { get; set; }
[NonDmoProperty] [NonDmoProperty]
public int Idx { get;set;}
public int Idx { get; set; }
[NonDmoProperty] [NonDmoProperty]
public decimal? DiffWeight public decimal? DiffWeight
@ -55,6 +55,14 @@ namespace ButcherFactory.BO
public DateTime Time { get; set; } public DateTime Time { get; set; }
public bool Filled { get; set; } public bool Filled { get; set; }
private bool mSelected = true;
[NonDmoProperty]
public bool Selected
{
get { return mSelected; }
set { mSelected = value; }
}
} }
public class SaleOutStore public class SaleOutStore


+ 1
- 1
ButcherFactory.BO/LocalBL/CarcassSaleOutBL.cs View File

@ -159,7 +159,7 @@ namespace ButcherFactory.BO.LocalBL
return JsonConvert.DeserializeObject<List<ProductBatch>>(json); return JsonConvert.DeserializeObject<List<ProductBatch>>(json);
} }
public static void SubmitDetails(BindingList<CarcassSaleOut_Detail> details, SaleOutStore_Detail detail)
public static void SubmitDetails(IEnumerable<CarcassSaleOut_Detail> details, SaleOutStore_Detail detail)
{ {
var arr = details.Select(x => new WeightRecord { WeightTime = x.Time, MainUnitNum = x.Weight, SecondNumber = x.Number, ProductBatch_ID = x.ProductBatch_ID, BarCode = x.BarCode }); var arr = details.Select(x => new WeightRecord { WeightTime = x.Time, MainUnitNum = x.Weight, SecondNumber = x.Number, ProductBatch_ID = x.ProductBatch_ID, BarCode = x.BarCode });
RpcFacade.Call<int>(RpcPath + "SaleOutStoreRpc/SaveWeightRecord", JsonConvert.SerializeObject(arr), detail.ID); RpcFacade.Call<int>(RpcPath + "SaleOutStoreRpc/SaveWeightRecord", JsonConvert.SerializeObject(arr), detail.ID);


+ 211
- 196
ButcherFactory.Form/CarcassSaleOut_/CarcassSaleOutForm.Designer.cs View File

@ -31,24 +31,25 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CarcassSaleOutForm)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CarcassSaleOutForm));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = 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 dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = 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 dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = 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 dataGridViewCellStyle19 = 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 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 dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
this.uWeightControl1 = new WinFormControl.UWeightControl(); this.uWeightControl1 = new WinFormControl.UWeightControl();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.carNumberLabel = new WinFormControl.ULabel(); this.carNumberLabel = new WinFormControl.ULabel();
@ -78,6 +79,7 @@
this.uLabel3 = new WinFormControl.ULabel(); this.uLabel3 = new WinFormControl.ULabel();
this.uLabel1 = new WinFormControl.ULabel(); this.uLabel1 = new WinFormControl.ULabel();
this.panel3 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel();
this.alreadyViewBtn = new WinFormControl.UButton();
this.goodsFinishBtn = new WinFormControl.UButton(); this.goodsFinishBtn = new WinFormControl.UButton();
this.weightRecordBtn = new WinFormControl.UButton(); this.weightRecordBtn = new WinFormControl.UButton();
this.mainGridView = new WinFormControl.UDataGridView(); this.mainGridView = new WinFormControl.UDataGridView();
@ -88,12 +90,23 @@
this.panel4 = new System.Windows.Forms.Panel(); this.panel4 = new System.Windows.Forms.Panel();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.orderGridView = new WinFormControl.UDataGridView(); this.orderGridView = new WinFormControl.UDataGridView();
this.D_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_SaleOutStore_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_Customer_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_Goods_Code = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_Goods_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_SecondNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_Number = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_SSecondNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_SNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_DiffNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.sendGridView = new WinFormControl.UDataGridView(); this.sendGridView = new WinFormControl.UDataGridView();
this.commitBtn = new WinFormControl.UButton(); this.commitBtn = new WinFormControl.UButton();
this.alreadyViewBtn = new WinFormControl.UButton();
this.deleteBtn = new WinFormControl.UButton(); this.deleteBtn = new WinFormControl.UButton();
this.F_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.F_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.F_Selected = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.F_Image = new System.Windows.Forms.DataGridViewImageColumn();
this.F_Idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.F_Idx = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.F_BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.F_BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.F_GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.F_GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@ -103,17 +116,6 @@
this.F_Weight = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.F_Weight = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.F_DiffWeight = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.F_DiffWeight = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.F_Time = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.F_Time = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_HasSubmit = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_SaleOutStore_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_Customer_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_Goods_Code = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_Goods_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_SecondNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_Number = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_SSecondNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_SNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_DiffNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.panel2.SuspendLayout(); this.panel2.SuspendLayout();
this.panel3.SuspendLayout(); this.panel3.SuspendLayout();
@ -294,9 +296,9 @@
this.uTimerLabel1.Format = "M月d日 H:mm:ss"; this.uTimerLabel1.Format = "M月d日 H:mm:ss";
this.uTimerLabel1.Location = new System.Drawing.Point(1167, 49); this.uTimerLabel1.Location = new System.Drawing.Point(1167, 49);
this.uTimerLabel1.Name = "uTimerLabel1"; this.uTimerLabel1.Name = "uTimerLabel1";
this.uTimerLabel1.Size = new System.Drawing.Size(136, 16);
this.uTimerLabel1.Size = new System.Drawing.Size(128, 16);
this.uTimerLabel1.TabIndex = 11; this.uTimerLabel1.TabIndex = 11;
this.uTimerLabel1.Text = "5月22日 18:45:17";
this.uTimerLabel1.Text = "5月23日 9:28:31";
// //
// uScanPanel1 // uScanPanel1
// //
@ -475,6 +477,27 @@
this.panel3.Size = new System.Drawing.Size(492, 70); this.panel3.Size = new System.Drawing.Size(492, 70);
this.panel3.TabIndex = 4; this.panel3.TabIndex = 4;
// //
// alreadyViewBtn
//
this.alreadyViewBtn.AsClicked = false;
this.alreadyViewBtn.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("alreadyViewBtn.BackgroundImage")));
this.alreadyViewBtn.EnableGroup = false;
this.alreadyViewBtn.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(155)))), ((int)(((byte)(214)))));
this.alreadyViewBtn.FlatAppearance.BorderSize = 0;
this.alreadyViewBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.alreadyViewBtn.ForeColor = System.Drawing.Color.Black;
this.alreadyViewBtn.Location = new System.Drawing.Point(31, 17);
this.alreadyViewBtn.Name = "alreadyViewBtn";
this.alreadyViewBtn.PlaySound = false;
this.alreadyViewBtn.SelfControlEnable = false;
this.alreadyViewBtn.Size = new System.Drawing.Size(100, 30);
this.alreadyViewBtn.SoundType = WinFormControl.SoundType.Click;
this.alreadyViewBtn.TabIndex = 14;
this.alreadyViewBtn.Text = "已配货";
this.alreadyViewBtn.UseVisualStyleBackColor = true;
this.alreadyViewBtn.WithStataHode = false;
this.alreadyViewBtn.Click += new System.EventHandler(this.alreadyViewBtn_Click);
//
// goodsFinishBtn // goodsFinishBtn
// //
this.goodsFinishBtn.AsClicked = false; this.goodsFinishBtn.AsClicked = false;
@ -544,18 +567,18 @@
this.mainGridView.MultiSelect = false; this.mainGridView.MultiSelect = false;
this.mainGridView.Name = "mainGridView"; this.mainGridView.Name = "mainGridView";
this.mainGridView.ReadOnly = true; this.mainGridView.ReadOnly = true;
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F);
dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.mainGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
this.mainGridView.RowHeadersVisible = false;
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F); dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F);
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
this.mainGridView.RowsDefaultCellStyle = dataGridViewCellStyle4;
dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.mainGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle4;
this.mainGridView.RowHeadersVisible = false;
dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F);
dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
this.mainGridView.RowsDefaultCellStyle = dataGridViewCellStyle5;
this.mainGridView.RowTemplate.Height = 40; this.mainGridView.RowTemplate.Height = 40;
this.mainGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.mainGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.mainGridView.Size = new System.Drawing.Size(493, 254); this.mainGridView.Size = new System.Drawing.Size(493, 254);
@ -582,6 +605,8 @@
// //
this.M_SendTime.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.M_SendTime.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.M_SendTime.DataPropertyName = "SendTime"; this.M_SendTime.DataPropertyName = "SendTime";
dataGridViewCellStyle3.Format = "yyyy/MM/dd";
this.M_SendTime.DefaultCellStyle = dataGridViewCellStyle3;
this.M_SendTime.HeaderText = "发货时间"; this.M_SendTime.HeaderText = "发货时间";
this.M_SendTime.Name = "M_SendTime"; this.M_SendTime.Name = "M_SendTime";
this.M_SendTime.ReadOnly = true; this.M_SendTime.ReadOnly = true;
@ -624,19 +649,18 @@
this.orderGridView.AllowUserToDeleteRows = false; this.orderGridView.AllowUserToDeleteRows = false;
this.orderGridView.AllowUserToResizeColumns = false; this.orderGridView.AllowUserToResizeColumns = false;
this.orderGridView.AllowUserToResizeRows = false; this.orderGridView.AllowUserToResizeRows = false;
dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
this.orderGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5;
dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
this.orderGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6;
this.orderGridView.BackgroundColor = System.Drawing.Color.White; this.orderGridView.BackgroundColor = System.Drawing.Color.White;
this.orderGridView.BorderStyle = System.Windows.Forms.BorderStyle.None; this.orderGridView.BorderStyle = System.Windows.Forms.BorderStyle.None;
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F);
dataGridViewCellStyle6.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.orderGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 9F);
dataGridViewCellStyle7.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.orderGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
this.orderGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.orderGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.orderGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.orderGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.D_ID, this.D_ID,
this.D_HasSubmit,
this.D_SaleOutStore_ID, this.D_SaleOutStore_ID,
this.D_Customer_Name, this.D_Customer_Name,
this.D_Goods_Code, this.D_Goods_Code,
@ -652,9 +676,9 @@
this.orderGridView.Name = "orderGridView"; this.orderGridView.Name = "orderGridView";
this.orderGridView.ReadOnly = true; this.orderGridView.ReadOnly = true;
this.orderGridView.RowHeadersVisible = false; this.orderGridView.RowHeadersVisible = false;
dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 9F);
dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
this.orderGridView.RowsDefaultCellStyle = dataGridViewCellStyle12;
dataGridViewCellStyle13.Font = new System.Drawing.Font("宋体", 9F);
dataGridViewCellStyle13.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
this.orderGridView.RowsDefaultCellStyle = dataGridViewCellStyle13;
this.orderGridView.RowTemplate.Height = 40; this.orderGridView.RowTemplate.Height = 40;
this.orderGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.orderGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.orderGridView.Size = new System.Drawing.Size(789, 200); this.orderGridView.Size = new System.Drawing.Size(789, 200);
@ -662,6 +686,94 @@
this.orderGridView.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.orderGridView_CellClick); this.orderGridView.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.orderGridView_CellClick);
this.orderGridView.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.orderGridView_RowPrePaint); this.orderGridView.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.orderGridView_RowPrePaint);
// //
// D_ID
//
this.D_ID.DataPropertyName = "ID";
this.D_ID.HeaderText = "ID";
this.D_ID.Name = "D_ID";
this.D_ID.ReadOnly = true;
this.D_ID.Visible = false;
//
// D_SaleOutStore_ID
//
this.D_SaleOutStore_ID.DataPropertyName = "SaleOutStore_ID";
this.D_SaleOutStore_ID.HeaderText = "单号";
this.D_SaleOutStore_ID.Name = "D_SaleOutStore_ID";
this.D_SaleOutStore_ID.ReadOnly = true;
this.D_SaleOutStore_ID.Width = 90;
//
// D_Customer_Name
//
this.D_Customer_Name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.D_Customer_Name.DataPropertyName = "Customer_Name";
this.D_Customer_Name.HeaderText = "客户名称";
this.D_Customer_Name.MinimumWidth = 100;
this.D_Customer_Name.Name = "D_Customer_Name";
this.D_Customer_Name.ReadOnly = true;
//
// D_Goods_Code
//
this.D_Goods_Code.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.D_Goods_Code.DataPropertyName = "Goods_Code";
this.D_Goods_Code.HeaderText = "产品编码";
this.D_Goods_Code.MinimumWidth = 100;
this.D_Goods_Code.Name = "D_Goods_Code";
this.D_Goods_Code.ReadOnly = true;
//
// D_Goods_Name
//
this.D_Goods_Name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
this.D_Goods_Name.DataPropertyName = "Goods_Name";
this.D_Goods_Name.HeaderText = "产品名称";
this.D_Goods_Name.MinimumWidth = 100;
this.D_Goods_Name.Name = "D_Goods_Name";
this.D_Goods_Name.ReadOnly = true;
//
// D_SecondNumber
//
this.D_SecondNumber.DataPropertyName = "SecondNumber";
dataGridViewCellStyle8.Format = "#0.######";
this.D_SecondNumber.DefaultCellStyle = dataGridViewCellStyle8;
this.D_SecondNumber.HeaderText = "辅数量";
this.D_SecondNumber.Name = "D_SecondNumber";
this.D_SecondNumber.ReadOnly = true;
//
// D_Number
//
this.D_Number.DataPropertyName = "Number";
dataGridViewCellStyle9.Format = "#0.######";
this.D_Number.DefaultCellStyle = dataGridViewCellStyle9;
this.D_Number.HeaderText = "报价数量";
this.D_Number.Name = "D_Number";
this.D_Number.ReadOnly = true;
//
// D_SSecondNumber
//
this.D_SSecondNumber.DataPropertyName = "SSecondNumber";
dataGridViewCellStyle10.Format = "#0.######";
this.D_SSecondNumber.DefaultCellStyle = dataGridViewCellStyle10;
this.D_SSecondNumber.HeaderText = "配货辅数量";
this.D_SSecondNumber.Name = "D_SSecondNumber";
this.D_SSecondNumber.ReadOnly = true;
//
// D_SNumber
//
this.D_SNumber.DataPropertyName = "SNumber";
dataGridViewCellStyle11.Format = "#0.######";
this.D_SNumber.DefaultCellStyle = dataGridViewCellStyle11;
this.D_SNumber.HeaderText = "配货数量";
this.D_SNumber.Name = "D_SNumber";
this.D_SNumber.ReadOnly = true;
//
// D_DiffNumber
//
this.D_DiffNumber.DataPropertyName = "DiffNumber";
dataGridViewCellStyle12.Format = "#0.######";
this.D_DiffNumber.DefaultCellStyle = dataGridViewCellStyle12;
this.D_DiffNumber.HeaderText = "差异数量";
this.D_DiffNumber.Name = "D_DiffNumber";
this.D_DiffNumber.ReadOnly = true;
//
// groupBox2 // groupBox2
// //
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
@ -679,18 +791,20 @@
this.sendGridView.AllowUserToDeleteRows = false; this.sendGridView.AllowUserToDeleteRows = false;
this.sendGridView.AllowUserToResizeColumns = false; this.sendGridView.AllowUserToResizeColumns = false;
this.sendGridView.AllowUserToResizeRows = false; this.sendGridView.AllowUserToResizeRows = false;
dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
this.sendGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle13;
dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
this.sendGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle14;
this.sendGridView.BackgroundColor = System.Drawing.Color.White; this.sendGridView.BackgroundColor = System.Drawing.Color.White;
this.sendGridView.BorderStyle = System.Windows.Forms.BorderStyle.None; this.sendGridView.BorderStyle = System.Windows.Forms.BorderStyle.None;
dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle14.Font = new System.Drawing.Font("宋体", 9F);
dataGridViewCellStyle14.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.sendGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle14;
dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle15.Font = new System.Drawing.Font("宋体", 9F);
dataGridViewCellStyle15.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.sendGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;
this.sendGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.sendGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.sendGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.sendGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.F_ID, this.F_ID,
this.F_Selected,
this.F_Image,
this.F_Idx, this.F_Idx,
this.F_BarCode, this.F_BarCode,
this.F_GoodsCode, this.F_GoodsCode,
@ -706,13 +820,14 @@
this.sendGridView.Name = "sendGridView"; this.sendGridView.Name = "sendGridView";
this.sendGridView.ReadOnly = true; this.sendGridView.ReadOnly = true;
this.sendGridView.RowHeadersVisible = false; this.sendGridView.RowHeadersVisible = false;
dataGridViewCellStyle20.Font = new System.Drawing.Font("宋体", 9F);
dataGridViewCellStyle20.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
this.sendGridView.RowsDefaultCellStyle = dataGridViewCellStyle20;
this.sendGridView.RowTemplate.Height = 23;
dataGridViewCellStyle21.Font = new System.Drawing.Font("宋体", 9F);
dataGridViewCellStyle21.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
this.sendGridView.RowsDefaultCellStyle = dataGridViewCellStyle21;
this.sendGridView.RowTemplate.Height = 40;
this.sendGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.sendGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.sendGridView.Size = new System.Drawing.Size(789, 200); this.sendGridView.Size = new System.Drawing.Size(789, 200);
this.sendGridView.TabIndex = 1; this.sendGridView.TabIndex = 1;
this.sendGridView.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.sendGridView_CellClick);
// //
// commitBtn // commitBtn
// //
@ -736,27 +851,6 @@
this.commitBtn.WithStataHode = false; this.commitBtn.WithStataHode = false;
this.commitBtn.Click += new System.EventHandler(this.commitBtn_Click); this.commitBtn.Click += new System.EventHandler(this.commitBtn_Click);
// //
// alreadyViewBtn
//
this.alreadyViewBtn.AsClicked = false;
this.alreadyViewBtn.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("alreadyViewBtn.BackgroundImage")));
this.alreadyViewBtn.EnableGroup = false;
this.alreadyViewBtn.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(155)))), ((int)(((byte)(214)))));
this.alreadyViewBtn.FlatAppearance.BorderSize = 0;
this.alreadyViewBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.alreadyViewBtn.ForeColor = System.Drawing.Color.Black;
this.alreadyViewBtn.Location = new System.Drawing.Point(31, 17);
this.alreadyViewBtn.Name = "alreadyViewBtn";
this.alreadyViewBtn.PlaySound = false;
this.alreadyViewBtn.SelfControlEnable = false;
this.alreadyViewBtn.Size = new System.Drawing.Size(100, 30);
this.alreadyViewBtn.SoundType = WinFormControl.SoundType.Click;
this.alreadyViewBtn.TabIndex = 14;
this.alreadyViewBtn.Text = "已配货";
this.alreadyViewBtn.UseVisualStyleBackColor = true;
this.alreadyViewBtn.WithStataHode = false;
this.alreadyViewBtn.Click += new System.EventHandler(this.alreadyViewBtn_Click);
//
// deleteBtn // deleteBtn
// //
this.deleteBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.deleteBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
@ -787,6 +881,22 @@
this.F_ID.ReadOnly = true; this.F_ID.ReadOnly = true;
this.F_ID.Visible = false; this.F_ID.Visible = false;
// //
// F_Selected
//
this.F_Selected.DataPropertyName = "Selected";
this.F_Selected.HeaderText = "Selected";
this.F_Selected.Name = "F_Selected";
this.F_Selected.ReadOnly = true;
this.F_Selected.Visible = false;
//
// F_Image
//
this.F_Image.HeaderText = "选中";
this.F_Image.Name = "F_Image";
this.F_Image.ReadOnly = true;
this.F_Image.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.F_Image.Width = 50;
//
// F_Idx // F_Idx
// //
this.F_Idx.DataPropertyName = "Idx"; this.F_Idx.DataPropertyName = "Idx";
@ -825,8 +935,8 @@
// F_Number // F_Number
// //
this.F_Number.DataPropertyName = "Number"; this.F_Number.DataPropertyName = "Number";
dataGridViewCellStyle15.Format = "#0.######";
this.F_Number.DefaultCellStyle = dataGridViewCellStyle15;
dataGridViewCellStyle16.Format = "#0.######";
this.F_Number.DefaultCellStyle = dataGridViewCellStyle16;
this.F_Number.HeaderText = "数量"; this.F_Number.HeaderText = "数量";
this.F_Number.Name = "F_Number"; this.F_Number.Name = "F_Number";
this.F_Number.ReadOnly = true; this.F_Number.ReadOnly = true;
@ -834,8 +944,8 @@
// F_InStoreWeight // F_InStoreWeight
// //
this.F_InStoreWeight.DataPropertyName = "InStoreWeight"; this.F_InStoreWeight.DataPropertyName = "InStoreWeight";
dataGridViewCellStyle16.Format = "#0.######";
this.F_InStoreWeight.DefaultCellStyle = dataGridViewCellStyle16;
dataGridViewCellStyle17.Format = "#0.######";
this.F_InStoreWeight.DefaultCellStyle = dataGridViewCellStyle17;
this.F_InStoreWeight.HeaderText = "入库重量"; this.F_InStoreWeight.HeaderText = "入库重量";
this.F_InStoreWeight.Name = "F_InStoreWeight"; this.F_InStoreWeight.Name = "F_InStoreWeight";
this.F_InStoreWeight.ReadOnly = true; this.F_InStoreWeight.ReadOnly = true;
@ -843,8 +953,8 @@
// F_Weight // F_Weight
// //
this.F_Weight.DataPropertyName = "Weight"; this.F_Weight.DataPropertyName = "Weight";
dataGridViewCellStyle17.Format = "#0.######";
this.F_Weight.DefaultCellStyle = dataGridViewCellStyle17;
dataGridViewCellStyle18.Format = "#0.######";
this.F_Weight.DefaultCellStyle = dataGridViewCellStyle18;
this.F_Weight.HeaderText = "重量"; this.F_Weight.HeaderText = "重量";
this.F_Weight.Name = "F_Weight"; this.F_Weight.Name = "F_Weight";
this.F_Weight.ReadOnly = true; this.F_Weight.ReadOnly = true;
@ -852,8 +962,8 @@
// F_DiffWeight // F_DiffWeight
// //
this.F_DiffWeight.DataPropertyName = "DiffWeight"; this.F_DiffWeight.DataPropertyName = "DiffWeight";
dataGridViewCellStyle18.Format = "#0.######";
this.F_DiffWeight.DefaultCellStyle = dataGridViewCellStyle18;
dataGridViewCellStyle19.Format = "#0.######";
this.F_DiffWeight.DefaultCellStyle = dataGridViewCellStyle19;
this.F_DiffWeight.HeaderText = "差异"; this.F_DiffWeight.HeaderText = "差异";
this.F_DiffWeight.Name = "F_DiffWeight"; this.F_DiffWeight.Name = "F_DiffWeight";
this.F_DiffWeight.ReadOnly = true; this.F_DiffWeight.ReadOnly = true;
@ -861,109 +971,13 @@
// F_Time // F_Time
// //
this.F_Time.DataPropertyName = "Time"; this.F_Time.DataPropertyName = "Time";
dataGridViewCellStyle19.Format = "MM/dd HH:mm:ss";
this.F_Time.DefaultCellStyle = dataGridViewCellStyle19;
dataGridViewCellStyle20.Format = "MM/dd HH:mm:ss";
this.F_Time.DefaultCellStyle = dataGridViewCellStyle20;
this.F_Time.HeaderText = "时间"; this.F_Time.HeaderText = "时间";
this.F_Time.Name = "F_Time"; this.F_Time.Name = "F_Time";
this.F_Time.ReadOnly = true; this.F_Time.ReadOnly = true;
this.F_Time.Width = 120; this.F_Time.Width = 120;
// //
// D_ID
//
this.D_ID.DataPropertyName = "ID";
this.D_ID.HeaderText = "ID";
this.D_ID.Name = "D_ID";
this.D_ID.ReadOnly = true;
this.D_ID.Visible = false;
//
// D_HasSubmit
//
this.D_HasSubmit.DataPropertyName = "HasSubmit";
this.D_HasSubmit.HeaderText = "HasSubmit";
this.D_HasSubmit.Name = "D_HasSubmit";
this.D_HasSubmit.ReadOnly = true;
this.D_HasSubmit.Visible = false;
//
// D_SaleOutStore_ID
//
this.D_SaleOutStore_ID.DataPropertyName = "SaleOutStore_ID";
this.D_SaleOutStore_ID.HeaderText = "单号";
this.D_SaleOutStore_ID.Name = "D_SaleOutStore_ID";
this.D_SaleOutStore_ID.ReadOnly = true;
this.D_SaleOutStore_ID.Width = 90;
//
// D_Customer_Name
//
this.D_Customer_Name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.D_Customer_Name.DataPropertyName = "Customer_Name";
this.D_Customer_Name.HeaderText = "客户名称";
this.D_Customer_Name.MinimumWidth = 100;
this.D_Customer_Name.Name = "D_Customer_Name";
this.D_Customer_Name.ReadOnly = true;
//
// D_Goods_Code
//
this.D_Goods_Code.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.D_Goods_Code.DataPropertyName = "Goods_Code";
this.D_Goods_Code.HeaderText = "产品编码";
this.D_Goods_Code.MinimumWidth = 100;
this.D_Goods_Code.Name = "D_Goods_Code";
this.D_Goods_Code.ReadOnly = true;
//
// D_Goods_Name
//
this.D_Goods_Name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
this.D_Goods_Name.DataPropertyName = "Goods_Name";
this.D_Goods_Name.HeaderText = "产品名称";
this.D_Goods_Name.MinimumWidth = 100;
this.D_Goods_Name.Name = "D_Goods_Name";
this.D_Goods_Name.ReadOnly = true;
//
// D_SecondNumber
//
this.D_SecondNumber.DataPropertyName = "SecondNumber";
dataGridViewCellStyle7.Format = "#0.######";
this.D_SecondNumber.DefaultCellStyle = dataGridViewCellStyle7;
this.D_SecondNumber.HeaderText = "辅数量";
this.D_SecondNumber.Name = "D_SecondNumber";
this.D_SecondNumber.ReadOnly = true;
//
// D_Number
//
this.D_Number.DataPropertyName = "Number";
dataGridViewCellStyle8.Format = "#0.######";
this.D_Number.DefaultCellStyle = dataGridViewCellStyle8;
this.D_Number.HeaderText = "报价数量";
this.D_Number.Name = "D_Number";
this.D_Number.ReadOnly = true;
//
// D_SSecondNumber
//
this.D_SSecondNumber.DataPropertyName = "SSecondNumber";
dataGridViewCellStyle9.Format = "#0.######";
this.D_SSecondNumber.DefaultCellStyle = dataGridViewCellStyle9;
this.D_SSecondNumber.HeaderText = "配货辅数量";
this.D_SSecondNumber.Name = "D_SSecondNumber";
this.D_SSecondNumber.ReadOnly = true;
//
// D_SNumber
//
this.D_SNumber.DataPropertyName = "SNumber";
dataGridViewCellStyle10.Format = "#0.######";
this.D_SNumber.DefaultCellStyle = dataGridViewCellStyle10;
this.D_SNumber.HeaderText = "配货数量";
this.D_SNumber.Name = "D_SNumber";
this.D_SNumber.ReadOnly = true;
//
// D_DiffNumber
//
this.D_DiffNumber.DataPropertyName = "DiffNumber";
dataGridViewCellStyle11.Format = "#0.######";
this.D_DiffNumber.DefaultCellStyle = dataGridViewCellStyle11;
this.D_DiffNumber.HeaderText = "差异数量";
this.D_DiffNumber.Name = "D_DiffNumber";
this.D_DiffNumber.ReadOnly = true;
//
// CarcassSaleOutForm // CarcassSaleOutForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@ -1036,14 +1050,26 @@
private System.Windows.Forms.TextBox billStateBox; private System.Windows.Forms.TextBox billStateBox;
private System.Windows.Forms.TextBox storeBox; private System.Windows.Forms.TextBox storeBox;
private System.Windows.Forms.TextBox customerBox; private System.Windows.Forms.TextBox customerBox;
private WinFormControl.UButton clearBtn;
private WinFormControl.UButton alreadyViewBtn;
private WinFormControl.UButton deleteBtn;
private System.Windows.Forms.DataGridViewTextBoxColumn D_ID;
private System.Windows.Forms.DataGridViewTextBoxColumn D_SaleOutStore_ID;
private System.Windows.Forms.DataGridViewTextBoxColumn D_Customer_Name;
private System.Windows.Forms.DataGridViewTextBoxColumn D_Goods_Code;
private System.Windows.Forms.DataGridViewTextBoxColumn D_Goods_Name;
private System.Windows.Forms.DataGridViewTextBoxColumn D_SecondNumber;
private System.Windows.Forms.DataGridViewTextBoxColumn D_Number;
private System.Windows.Forms.DataGridViewTextBoxColumn D_SSecondNumber;
private System.Windows.Forms.DataGridViewTextBoxColumn D_SNumber;
private System.Windows.Forms.DataGridViewTextBoxColumn D_DiffNumber;
private System.Windows.Forms.DataGridViewTextBoxColumn M_ID; private System.Windows.Forms.DataGridViewTextBoxColumn M_ID;
private System.Windows.Forms.DataGridViewTextBoxColumn M_Customer_Name; private System.Windows.Forms.DataGridViewTextBoxColumn M_Customer_Name;
private System.Windows.Forms.DataGridViewTextBoxColumn M_SendTime; private System.Windows.Forms.DataGridViewTextBoxColumn M_SendTime;
private System.Windows.Forms.DataGridViewTextBoxColumn M_DeliverGoodsLine_Name; private System.Windows.Forms.DataGridViewTextBoxColumn M_DeliverGoodsLine_Name;
private WinFormControl.UButton clearBtn;
private WinFormControl.UButton alreadyViewBtn;
private WinFormControl.UButton deleteBtn;
private System.Windows.Forms.DataGridViewTextBoxColumn F_ID; private System.Windows.Forms.DataGridViewTextBoxColumn F_ID;
private System.Windows.Forms.DataGridViewTextBoxColumn F_Selected;
private System.Windows.Forms.DataGridViewImageColumn F_Image;
private System.Windows.Forms.DataGridViewTextBoxColumn F_Idx; private System.Windows.Forms.DataGridViewTextBoxColumn F_Idx;
private System.Windows.Forms.DataGridViewTextBoxColumn F_BarCode; private System.Windows.Forms.DataGridViewTextBoxColumn F_BarCode;
private System.Windows.Forms.DataGridViewTextBoxColumn F_GoodsCode; private System.Windows.Forms.DataGridViewTextBoxColumn F_GoodsCode;
@ -1053,16 +1079,5 @@
private System.Windows.Forms.DataGridViewTextBoxColumn F_Weight; private System.Windows.Forms.DataGridViewTextBoxColumn F_Weight;
private System.Windows.Forms.DataGridViewTextBoxColumn F_DiffWeight; private System.Windows.Forms.DataGridViewTextBoxColumn F_DiffWeight;
private System.Windows.Forms.DataGridViewTextBoxColumn F_Time; private System.Windows.Forms.DataGridViewTextBoxColumn F_Time;
private System.Windows.Forms.DataGridViewTextBoxColumn D_ID;
private System.Windows.Forms.DataGridViewTextBoxColumn D_HasSubmit;
private System.Windows.Forms.DataGridViewTextBoxColumn D_SaleOutStore_ID;
private System.Windows.Forms.DataGridViewTextBoxColumn D_Customer_Name;
private System.Windows.Forms.DataGridViewTextBoxColumn D_Goods_Code;
private System.Windows.Forms.DataGridViewTextBoxColumn D_Goods_Name;
private System.Windows.Forms.DataGridViewTextBoxColumn D_SecondNumber;
private System.Windows.Forms.DataGridViewTextBoxColumn D_Number;
private System.Windows.Forms.DataGridViewTextBoxColumn D_SSecondNumber;
private System.Windows.Forms.DataGridViewTextBoxColumn D_SNumber;
private System.Windows.Forms.DataGridViewTextBoxColumn D_DiffNumber;
} }
} }

+ 38
- 5
ButcherFactory.Form/CarcassSaleOut_/CarcassSaleOutForm.cs View File

@ -53,6 +53,19 @@ namespace ButcherFactory.CarcassSaleOut_
else else
batchID = (long)productBatchSelect.SelectedValue; batchID = (long)productBatchSelect.SelectedValue;
}; };
sendGridView.CellFormatting += sendGridView_CellFormatting;
}
static Image CheckImg = System.Drawing.Image.FromFile("Images\\check.png");
static Image UnCheckImg = System.Drawing.Image.FromFile("Images\\uCheck.png");
void sendGridView_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e)
{
if (e.RowIndex < 0 || e.ColumnIndex != 2)
return;
var v = (bool)sendGridView.Rows[e.RowIndex].Cells[1].Value;
e.Value = v ? CheckImg : UnCheckImg;
} }
protected override void OnLoad(EventArgs e) protected override void OnLoad(EventArgs e)
@ -160,16 +173,24 @@ namespace ButcherFactory.CarcassSaleOut_
{ {
if (orderGridView.CurrentRow == null) if (orderGridView.CurrentRow == null)
throw new Exception("请选择配货明细"); throw new Exception("请选择配货明细");
if (weightRecord.Count == 0)
var subList = weightRecord.Where(x => x.Selected).ToList();
if (subList.Count() == 0)
throw new Exception("没有发货明细"); throw new Exception("没有发货明细");
if (weightRecord.Any(x => !x.Filled))
if (subList.Any(x => !x.Filled))
throw new Exception("有未扫码的明细"); throw new Exception("有未扫码的明细");
var detailID = (long)orderGridView.CurrentRow.Cells[0].Value; var detailID = (long)orderGridView.CurrentRow.Cells[0].Value;
var detail = details.First(x => x.ID == detailID); var detail = details.First(x => x.ID == detailID);
CarcassSaleOutBL.SubmitDetails(weightRecord, detail);
weightRecord.Clear();
sendGridView.Refresh();
CarcassSaleOutBL.SubmitDetails(subList, detail);
foreach (var item in subList)
weightRecord.Remove(item);
var idx = weightRecord.Count;
foreach (var item in weightRecord)
{
item.Idx = idx;
idx--;
}
sendGridView.Refresh();
orderGridView.Refresh(); orderGridView.Refresh();
UMessageBox.Show("提交成功！"); UMessageBox.Show("提交成功！");
} }
@ -311,6 +332,8 @@ namespace ButcherFactory.CarcassSaleOut_
private void orderGridView_CellClick(object sender, DataGridViewCellEventArgs e) private void orderGridView_CellClick(object sender, DataGridViewCellEventArgs e)
{ {
if (already)
return;
if (e.RowIndex < 0 || e.ColumnIndex < orderGridView.Columns.Count - 3) if (e.RowIndex < 0 || e.ColumnIndex < orderGridView.Columns.Count - 3)
return; return;
var keyBoard = new NumberPad(); var keyBoard = new NumberPad();
@ -327,5 +350,15 @@ namespace ButcherFactory.CarcassSaleOut_
} }
} }
private void sendGridView_CellClick(object sender, DataGridViewCellEventArgs e)
{
if (e.RowIndex < 0)
return;
var id = (long)sendGridView.CurrentRow.Cells[0].Value;
var first = weightRecord.First(x => x.ID == id);
first.Selected = !first.Selected;
sendGridView.Refresh();
}
} }
} }

+ 6
- 3
ButcherFactory.Form/CarcassSaleOut_/CarcassSaleOutForm.resx View File

@ -181,9 +181,6 @@
<metadata name="D_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="D_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="D_HasSubmit.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="D_SaleOutStore_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="D_SaleOutStore_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
@ -214,6 +211,12 @@
<metadata name="F_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="F_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="F_Selected.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="F_Image.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="F_Idx.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="F_Idx.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>


+ 42
- 88
ButcherFactorySolution/ButcherFactorySolution.vdproj View File

@ -45,14 +45,14 @@
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_2CD201EEFEC0BBA37C6ACFDFBC3FA4D2"
"OwnerKey" = "8:_CDEF0D7FE4F14E5E84A3902D05B165EC"
"MsmKey" = "8:_3E728084E6413DC3E740199EBCA6CF15"
"OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_3E728084E6413DC3E740199EBCA6CF15" "MsmKey" = "8:_3E728084E6413DC3E740199EBCA6CF15"
"OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430"
"OwnerKey" = "8:_CDEF0D7FE4F14E5E84A3902D05B165EC"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
@ -70,6 +70,12 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_4083346C24A7D8470DB4B61D58809784" "MsmKey" = "8:_4083346C24A7D8470DB4B61D58809784"
"OwnerKey" = "8:_CDEF0D7FE4F14E5E84A3902D05B165EC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_4083346C24A7D8470DB4B61D58809784"
"OwnerKey" = "8:_60407C93181F42DFB15499FA85D78DE3" "OwnerKey" = "8:_60407C93181F42DFB15499FA85D78DE3"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -93,6 +99,12 @@
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_654AEDD527E14D5B8535CC81E96B8185"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_70C18C0E0DFD66B15418411D1857F74B" "MsmKey" = "8:_70C18C0E0DFD66B15418411D1857F74B"
"OwnerKey" = "8:_9F705636DF3FC7591C089E51A914B437" "OwnerKey" = "8:_9F705636DF3FC7591C089E51A914B437"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
@ -178,12 +190,6 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_9F705636DF3FC7591C089E51A914B437" "MsmKey" = "8:_9F705636DF3FC7591C089E51A914B437"
"OwnerKey" = "8:_2CD201EEFEC0BBA37C6ACFDFBC3FA4D2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_9F705636DF3FC7591C089E51A914B437"
"OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430" "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -202,12 +208,6 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_AED9467B5BDCD87EC2746DB4EF7A24D2" "MsmKey" = "8:_AED9467B5BDCD87EC2746DB4EF7A24D2"
"OwnerKey" = "8:_2CD201EEFEC0BBA37C6ACFDFBC3FA4D2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_AED9467B5BDCD87EC2746DB4EF7A24D2"
"OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430" "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -262,12 +262,6 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_DE32A8488C67365FC9BBB4CAF2E074E2" "MsmKey" = "8:_DE32A8488C67365FC9BBB4CAF2E074E2"
"OwnerKey" = "8:_2CD201EEFEC0BBA37C6ACFDFBC3FA4D2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_DE32A8488C67365FC9BBB4CAF2E074E2"
"OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430" "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -279,8 +273,8 @@
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_F16C72D69D06D5578EA2A1E10DDBF8D3"
"OwnerKey" = "8:_CDEF0D7FE4F14E5E84A3902D05B165EC"
"MsmKey" = "8:_F45F0EE0BF2446558F2C1F4F902125DB"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
@ -304,12 +298,6 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_FD82AF7F959387F3F4C23A0EB1AC0E35" "MsmKey" = "8:_FD82AF7F959387F3F4C23A0EB1AC0E35"
"OwnerKey" = "8:_2CD201EEFEC0BBA37C6ACFDFBC3FA4D2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_FD82AF7F959387F3F4C23A0EB1AC0E35"
"OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430" "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -328,12 +316,6 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_UNDEFINED" "MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_F16C72D69D06D5578EA2A1E10DDBF8D3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_083AAEAE39990B76FE06389D076F1D2C" "OwnerKey" = "8:_083AAEAE39990B76FE06389D076F1D2C"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -346,12 +328,6 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_UNDEFINED" "MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_2CD201EEFEC0BBA37C6ACFDFBC3FA4D2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430" "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -615,37 +591,6 @@
"IsDependency" = "11:FALSE" "IsDependency" = "11:FALSE"
"IsolateTo" = "8:" "IsolateTo" = "8:"
} }
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2CD201EEFEC0BBA37C6ACFDFBC3FA4D2"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:ButcherFactory.BO, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_2CD201EEFEC0BBA37C6ACFDFBC3FA4D2"
{
"Name" = "8:ButcherFactory.BO.DLL"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:ButcherFactory.BO.DLL"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_A4535DAA71C54DC088A3FA09FCED8C88"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3E728084E6413DC3E740199EBCA6CF15" "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3E728084E6413DC3E740199EBCA6CF15"
{ {
"AssemblyRegister" = "3:1" "AssemblyRegister" = "3:1"
@ -779,6 +724,26 @@
"IsDependency" = "11:FALSE" "IsDependency" = "11:FALSE"
"IsolateTo" = "8:" "IsolateTo" = "8:"
} }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_654AEDD527E14D5B8535CC81E96B8185"
{
"SourcePath" = "8:..\\ButcherFactory.Login\\bin\\Debug\\Images\\check.png"
"TargetName" = "8:check.png"
"Tag" = "8:"
"Folder" = "8:_86D9513B15F44137B1E283FBC72D78ED"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_70C18C0E0DFD66B15418411D1857F74B" "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_70C18C0E0DFD66B15418411D1857F74B"
{ {
"AssemblyRegister" = "3:1" "AssemblyRegister" = "3:1"
@ -1227,23 +1192,12 @@
"IsDependency" = "11:TRUE" "IsDependency" = "11:TRUE"
"IsolateTo" = "8:" "IsolateTo" = "8:"
} }
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F16C72D69D06D5578EA2A1E10DDBF8D3"
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F45F0EE0BF2446558F2C1F4F902125DB"
{ {
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:WinFormControl, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_F16C72D69D06D5578EA2A1E10DDBF8D3"
{
"Name" = "8:WinFormControl.DLL"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:WinFormControl.DLL"
"TargetName" = "8:"
"SourcePath" = "8:..\\ButcherFactory.Login\\bin\\Debug\\Images\\uCheck.png"
"TargetName" = "8:uCheck.png"
"Tag" = "8:" "Tag" = "8:"
"Folder" = "8:_A4535DAA71C54DC088A3FA09FCED8C88"
"Folder" = "8:_86D9513B15F44137B1E283FBC72D78ED"
"Condition" = "8:" "Condition" = "8:"
"Transitive" = "11:FALSE" "Transitive" = "11:FALSE"
"Vital" = "11:TRUE" "Vital" = "11:TRUE"
@ -1255,7 +1209,7 @@
"PackageAs" = "3:1" "PackageAs" = "3:1"
"Register" = "3:1" "Register" = "3:1"
"Exclude" = "11:FALSE" "Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:" "IsolateTo" = "8:"
} }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F6C3568789ED47638FCE9494DA24CF51" "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F6C3568789ED47638FCE9494DA24CF51"


Write Preview
Loading…
Cancel
Save