diff --git a/ButcherFactory.BO/Bill/SegmentSaleOut_Detail.cs b/ButcherFactory.BO/Bill/SegmentSaleOut_Detail.cs
new file mode 100644
index 0000000..dd5e005
--- /dev/null
+++ b/ButcherFactory.BO/Bill/SegmentSaleOut_Detail.cs
@@ -0,0 +1,65 @@
+using Forks.EnterpriseServices.DomainObjects2;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ButcherFactory.BO
+{
+ [MapToTable("Butcher_SegmentSaleOut_Detail")]
+ [KeyField("ID", KeyGenType.identity)]
+ public class SegmentSaleOut_Detail
+ {
+ public SegmentSaleOut_Detail()
+ {
+ Time = DateTime.Now;
+ }
+
+ public long ID { get; set; }
+
+ public long? BillID { get; set; }
+
+ public long? DetailID { get; set; }
+
+ public string BarCode { get; set; }
+
+ [NonDmoProperty]
+ public string ShortCode
+ {
+ get
+ {
+ if (string.IsNullOrEmpty(BarCode))
+ return null;
+ if (BarCode.Contains("260912011"))
+ return BarCode.Replace("260912011", "");
+ return BarCode;
+ }
+ }
+
+ public long? Goods_ID { get; set; }
+
+ public string Goods_Name { get; set; }
+
+ public string Goods_Code { get; set; }
+
+ public long? ProductBatch_ID { get; set; }
+
+ public decimal Number { get; set; }
+
+ public decimal? DiscontWeight { get; set; }
+
+ public decimal? SecondNumber { get; set; }
+
+ [NonDmoProperty]
+ public int Idx { get; set; }
+
+ public DateTime Time { get; set; }
+
+ public long? WeightRecord_ID { get; set; }
+
+ public long? ScanRecord_ID { get; set; }
+
+ public string Operator { get; set; }
+ }
+}
diff --git a/ButcherFactory.BO/ButcherFactory.BO.csproj b/ButcherFactory.BO/ButcherFactory.BO.csproj
index 982a856..431d226 100644
--- a/ButcherFactory.BO/ButcherFactory.BO.csproj
+++ b/ButcherFactory.BO/ButcherFactory.BO.csproj
@@ -67,6 +67,7 @@
+
@@ -83,6 +84,7 @@
+
diff --git a/ButcherFactory.BO/Enums/DriveType.cs b/ButcherFactory.BO/Enums/DriveType.cs
index 62bd722..21fb785 100644
--- a/ButcherFactory.BO/Enums/DriveType.cs
+++ b/ButcherFactory.BO/Enums/DriveType.cs
@@ -16,6 +16,7 @@ namespace ButcherFactory.BO
//B3从51开始
白条发货 = 51,
销售备货 = 52,
+ 销售发货 = 53,
//101-200是留给屠宰车间使用
diff --git a/ButcherFactory.BO/LocalBL/CarcassSaleOutBL.cs b/ButcherFactory.BO/LocalBL/CarcassSaleOutBL.cs
index b68c96f..e413525 100644
--- a/ButcherFactory.BO/LocalBL/CarcassSaleOutBL.cs
+++ b/ButcherFactory.BO/LocalBL/CarcassSaleOutBL.cs
@@ -176,7 +176,7 @@ namespace ButcherFactory.BO.LocalBL
public static void SubmitDetails(IEnumerable details, SaleOutStore_Detail detail)
{
- var arr = details.Select(x => new WeightRecord { ID = x.ID, WeightTime = x.Time, MainUnitNum = x.Weight, SecondNumber = x.Number, ProductBatch_ID = x.ProductBatch_ID, BarCode = x.BarCode });
+ var arr = details.Select(x => new WeightRecord { Flag = 0, ID = x.ID, WeightTime = x.Time, MainUnitNum = x.Weight, SecondNumber = x.Number, ProductBatch_ID = x.ProductBatch_ID, BarCode = x.BarCode });
var json = RpcFacade.Call(RpcPath + "SaleOutStoreRpc/SaveWeightRecord", JsonConvert.SerializeObject(arr), detail.ID);
var back = JsonConvert.DeserializeObject>(json);
using (var session = DmoSession.New())
@@ -219,7 +219,7 @@ namespace ButcherFactory.BO.LocalBL
using (var session = DmoSession.New())
{
session.Insert(detail);
- var arr = new List { new WeightRecord { ID = detail.ID, WeightTime = detail.Time, MainUnitNum = detail.Weight, SecondNumber = detail.Number } };
+ var arr = new List { new WeightRecord { Flag = 0, ID = detail.ID, WeightTime = detail.Time, MainUnitNum = detail.Weight, SecondNumber = detail.Number } };
var json = RpcFacade.Call(RpcPath + "SaleOutStoreRpc/SaveWeightRecord", JsonConvert.SerializeObject(arr), detail.DetailID);
var back = JsonConvert.DeserializeObject>(json);
@@ -264,6 +264,8 @@ namespace ButcherFactory.BO.LocalBL
class WeightRecord
{
+ //0、白条；1、分割品；2、副产品；
+ public int Flag { get; set; }
public long ID { get; set; }
public string BarCode { get; set; }
public long? ProductBatch_ID { get; set; }
diff --git a/ButcherFactory.BO/LocalBL/SegmentInStoreBL.cs b/ButcherFactory.BO/LocalBL/SegmentInStoreBL.cs
index f2175cf..ba806ed 100644
--- a/ButcherFactory.BO/LocalBL/SegmentInStoreBL.cs
+++ b/ButcherFactory.BO/LocalBL/SegmentInStoreBL.cs
@@ -102,6 +102,7 @@ namespace ButcherFactory.BO.LocalBL
static List GetInstoredList(IEnumerable barCodes)
{
var query = new DQueryDom(new JoinAlias(typeof(SegmentInStore)));
+ query.Columns.Add(DQSelectColumn.Field("BarCode"));
query.Where.Conditions.Add(DQCondition.And(DQCondition.InList(DQExpression.Field("BarCode"), barCodes.Select(x => DQExpression.Value(x)).ToArray()), DQCondition.EQ("Delete", false)));
using (var session = DmoSession.New())
{
diff --git a/ButcherFactory.BO/LocalBL/SegmentSaleOutBL.cs b/ButcherFactory.BO/LocalBL/SegmentSaleOutBL.cs
new file mode 100644
index 0000000..d71a04c
--- /dev/null
+++ b/ButcherFactory.BO/LocalBL/SegmentSaleOutBL.cs
@@ -0,0 +1,175 @@
+using ButcherFactory.BO.Utils;
+using Forks.EnterpriseServices.DomainObjects2;
+using Forks.EnterpriseServices.DomainObjects2.DQuery;
+using Forks.JsonRpc.Client;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ButcherFactory.BO.LocalBL
+{
+ public static class SegmentSaleOutBL
+ {
+ const string RpcPath = @"/MainSystem/B3Sale/Rpcs/";
+ const string MESPath = @"/MainSystem/B3ClientService/Rpcs/";
+ public static BindingList GetSaleOutStoreList(DateTime sendDate, long? deliverGoodsLineID, long? customerID, int billState, long? storeID, bool already = false)
+ {
+ return CarcassSaleOutBL.GetSaleOutStoreList(sendDate, deliverGoodsLineID, customerID, billState, storeID, already);
+ }
+
+ public static BindingList GetSaleOutStoreDetailList(long id)
+ {
+ return CarcassSaleOutBL.GetSaleOutStoreDetailList(id);
+ }
+
+ public static BindingList GetWeightRecord(long detailID)
+ {
+ var query = new DmoQuery(typeof(SegmentSaleOut_Detail));
+ query.Where.Conditions.Add(DQCondition.EQ("DetailID", detailID));
+ query.OrderBy.Expressions.Add(DQOrderByExpression.Create("ID", true));
+ var list = query.EExecuteList().Cast().ToList();
+ var idx = list.Count;
+ foreach (var item in list)
+ {
+ item.Idx = idx;
+ idx--;
+ }
+ return new BindingList(list);
+ }
+
+ public static SegmentSaleOut_Detail Insert(decimal weight)
+ {
+ using (var session = DmoSession.New())
+ {
+ var detail = new SegmentSaleOut_Detail() { Number = weight, SecondNumber = 1 };
+ session.Insert(detail);
+ session.Commit();
+ return detail;
+ }
+ }
+
+ public static List GetBatchFromEMS()
+ {
+ return CarcassSaleOutBL.GetBatchFromEMS();
+ }
+
+ static void SubmitDetails(IEnumerable details, SaleOutStore_Detail detail, int flag)
+ {
+ var arr = details.Select(x => new WeightRecord { Flag = flag, ID = x.ID, WeightTime = x.Time, MainUnitNum = x.Number, SecondNumber = x.SecondNumber, ProductBatch_ID = x.ProductBatch_ID, BarCode = x.BarCode });
+ var json = RpcFacade.Call(RpcPath + "SaleOutStoreRpc/SaveWeightRecord", JsonConvert.SerializeObject(arr), detail.ID);
+ var back = JsonConvert.DeserializeObject>(json);
+ using (var session = DmoSession.New())
+ {
+ foreach (var item in details)
+ {
+ var first = back.First(x => x.LongExt1 == item.ID);
+
+ Update(session, item.ID,
+ new Tuple("WeightRecord_ID", first.LongExt2),
+ new Tuple("ScanRecord_ID", first.LongExt3)
+ );
+ }
+ session.Commit();
+ }
+ }
+
+ static void Update(IDmoSession session, long id, params Tuple[] pops)
+ {
+ var update = new DQUpdateDom(typeof(SegmentSaleOut_Detail));
+ foreach (var item in pops)
+ update.Columns.Add(new DQUpdateColumn(item.Item1, item.Item2));
+ update.Where.Conditions.Add(DQCondition.EQ("ID", id));
+ session.ExecuteNonQuery(update);
+ }
+
+ public static void SetGoodsFinish(long id)
+ {
+ CarcassSaleOutBL.SetGoodsFinish(id);
+ }
+
+ public static void SetGoodsUnFinish(long id)
+ {
+ CarcassSaleOutBL.SetGoodsUnFinish(id);
+ }
+
+ static void Delete(long id)
+ {
+ var delete = new DQDeleteDom(typeof(SegmentSaleOut_Detail));
+ delete.Where.Conditions.Add(DQCondition.EQ("ID", id));
+ delete.EExecute();
+ }
+
+ public static void AddAndUpdate(SegmentSaleOut_Detail detail)
+ {
+ using (var session = DmoSession.New())
+ {
+ session.Insert(detail);
+ var arr = new List { new WeightRecord { Flag = 2, ID = detail.ID, WeightTime = detail.Time, MainUnitNum = detail.Number, SecondNumber = detail.SecondNumber } };
+ var json = RpcFacade.Call(RpcPath + "SaleOutStoreRpc/SaveWeightRecord", JsonConvert.SerializeObject(arr), detail.DetailID);
+ var back = JsonConvert.DeserializeObject>(json);
+
+ var first = back.First();
+
+ Update(session, detail.ID, new Tuple("WeightRecord_ID", first.LongExt2),
+ new Tuple("ScanRecord_ID", first.LongExt3)
+ );
+
+ session.Commit();
+ }
+ }
+
+ public static void DeleteAndUpdate(SegmentSaleOut_Detail tag)
+ {
+ var json = JsonConvert.SerializeObject(new List() { new ExtensionObj { LongExt1 = tag.DetailID, LongExt2 = tag.WeightRecord_ID, LongExt3 = tag.ScanRecord_ID } });
+ RpcFacade.Call(RpcPath + "SaleOutStoreRpc/DeleteAndUpdate", json);
+ Delete(tag.ID);
+ }
+
+ public static void InsertByCode(SaleOutStore_Detail orderDetail, SegmentSaleOut_Detail detail)
+ {
+ var json = ButcherFactoryUtil.SimpleMESCall(MESPath + "SegmentSaleOutStoreRpc/GetSegmentInfo", detail.BarCode);
+ var scanInfo = JsonConvert.DeserializeObject(json);
+ if (scanInfo.StringExt1 != orderDetail.Goods_Code)
+ throw new Exception("扫码明细与发货明细 存货不一致！");
+ detail.BillID = orderDetail.SaleOutStore_ID;
+ detail.DetailID = orderDetail.ID;
+ detail.Goods_ID = orderDetail.Goods_ID;
+ detail.Goods_Code = orderDetail.Goods_Code;
+ detail.Goods_Name = orderDetail.Goods_Name;
+ detail.Number = scanInfo.DecimalExt1.Value;
+ if (orderDetail.Number.HasValue && orderDetail.SecondNumber.HasValue && orderDetail.Number != 0)
+ detail.SecondNumber = decimal.Round(orderDetail.SecondNumber.Value * detail.Number / orderDetail.Number.Value, 2);
+ detail.Operator = "扫码发货";
+ using (var session = DmoSession.New())
+ {
+ session.Insert(detail);
+ session.Commit();
+ }
+
+ SubmitDetails(new SegmentSaleOut_Detail[] { detail }, orderDetail, 1);
+ }
+
+ public static void InsertReadWeight(SaleOutStore_Detail orderDetail, SegmentSaleOut_Detail detail)
+ {
+ detail.BillID = orderDetail.SaleOutStore_ID;
+ detail.DetailID = orderDetail.ID;
+ detail.Goods_ID = orderDetail.Goods_ID;
+ detail.Goods_Code = orderDetail.Goods_Code;
+ detail.Goods_Name = orderDetail.Goods_Name;
+ if (orderDetail.Number.HasValue && orderDetail.SecondNumber.HasValue && orderDetail.Number != 0)
+ detail.SecondNumber = decimal.Round(orderDetail.SecondNumber.Value * detail.Number / orderDetail.Number.Value, 2);
+ detail.Operator = "读入重量";
+ using (var session = DmoSession.New())
+ {
+ session.Insert(detail);
+ session.Commit();
+ }
+
+ SubmitDetails(new SegmentSaleOut_Detail[] { detail }, orderDetail, 2);
+ }
+ }
+}
diff --git a/ButcherFactory.Form/ButcherFactory.Form.csproj b/ButcherFactory.Form/ButcherFactory.Form.csproj
index 36c77f7..5483547 100644
--- a/ButcherFactory.Form/ButcherFactory.Form.csproj
+++ b/ButcherFactory.Form/ButcherFactory.Form.csproj
@@ -203,6 +203,31 @@
TrunOutDialog.cs
+
+ Form
+
+
+ AddWeightRecord.cs
+
+
+ Form
+
+
+ DiscontSetDialog.cs
+
+
+ Form
+
+
+ SegmentSaleOutForm.cs
+
+
+
+ Form
+
+
+ WeightRecordDialog.cs
+
Form
@@ -282,6 +307,18 @@
TrunOutDialog.cs
+
+ AddWeightRecord.cs
+
+
+ DiscontSetDialog.cs
+
+
+ SegmentSaleOutForm.cs
+
+
+ WeightRecordDialog.cs
+
SegmentStockUpForm.cs
diff --git a/ButcherFactory.Form/CarcassSaleOut2_/CarcassSaleOutForm.cs b/ButcherFactory.Form/CarcassSaleOut2_/CarcassSaleOutForm.cs
index 6b4c1ea..2de6da3 100644
--- a/ButcherFactory.Form/CarcassSaleOut2_/CarcassSaleOutForm.cs
+++ b/ButcherFactory.Form/CarcassSaleOut2_/CarcassSaleOutForm.cs
@@ -201,7 +201,7 @@ namespace ButcherFactory.CarcassSaleOut2_
var id = (long)mainGridView.CurrentRow.Cells[0].Value;
var ds = CarcassSaleOutBL.GetSaleOutStoreDetailList(id);
- if (ds.Any(x => x.SSecondNumber == null || x.SSecondNumber == 0))
+ if (ds.Any(x => x.SNumber == null || x.SNumber == 0))
{
if (MessageBox.Show("有未配货的明细，确认配货完成？", "配货完成确认", MessageBoxButtons.OKCancel) != DialogResult.OK)
return;
@@ -214,7 +214,7 @@ namespace ButcherFactory.CarcassSaleOut2_
private void unFinishBtn_Click(object sender, EventArgs e)
{
if (mainGridView.CurrentRow == null)
- throw new Exception("请选择要配货完成的发货单");
+ throw new Exception("请选择要撤销完毕的发货单");
var id = (long)mainGridView.CurrentRow.Cells[0].Value;
CarcassSaleOutBL.SetGoodsUnFinish(id);
AfterChangeFinishGoods(id);
diff --git a/ButcherFactory.Form/Controls/ColorButton.cs b/ButcherFactory.Form/Controls/ColorButton.cs
index ae9f44c..9688b1b 100644
--- a/ButcherFactory.Form/Controls/ColorButton.cs
+++ b/ButcherFactory.Form/Controls/ColorButton.cs
@@ -24,7 +24,7 @@ namespace ButcherFactory.Controls
this.BackColor = Color.FromArgb(77, 135, 245);
}
- Color selectedColor = Color.FromArgb(158, 234, 106);
+ Color selectedColor = Color.FromArgb(15, 215, 107);
[Browsable(true)]
public Color SelectedColor
{
@@ -174,6 +174,7 @@ namespace ButcherFactory.Controls
if (btn == null)
continue;
btn.Selected = btn.Text == this.Text;
+ btn.Invalidate();
}
}
else if (StateHold)
diff --git a/ButcherFactory.Form/Dialogs/AddWeightRecord.Designer.cs b/ButcherFactory.Form/Dialogs/AddWeightRecord.Designer.cs
index dc4fc05..3eba175 100644
--- a/ButcherFactory.Form/Dialogs/AddWeightRecord.Designer.cs
+++ b/ButcherFactory.Form/Dialogs/AddWeightRecord.Designer.cs
@@ -28,18 +28,17 @@
///
private void InitializeComponent()
{
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddWeightRecord));
this.uLabel1 = new WinFormControl.ULabel();
this.uLabel2 = new WinFormControl.ULabel();
this.uLabel3 = new WinFormControl.ULabel();
- this.okBtn = new WinFormControl.UButton();
- this.cancelBtn = new WinFormControl.UButton();
this.goodsLabel = new WinFormControl.ULabel();
this.panel1 = new System.Windows.Forms.Panel();
- this.fullBtn = new WinFormControl.UButton();
- this.helfBtn = new WinFormControl.UButton();
+ this.fullBtn = new ButcherFactory.Controls.ColorButton();
+ this.helfBtn = new ButcherFactory.Controls.ColorButton();
this.weightInput = new WinFormControl.UTextBoxWithPad();
this.numberInput = new WinFormControl.UTextBoxWithPad();
+ this.okBtn = new ButcherFactory.Controls.ColorButton();
+ this.cancelBtn = new ButcherFactory.Controls.ColorButton();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
@@ -76,50 +75,6 @@
this.uLabel3.TabIndex = 2;
this.uLabel3.Text = "重 量：";
//
- // okBtn
- //
- this.okBtn.AsClicked = false;
- this.okBtn.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("okBtn.BackgroundImage")));
- this.okBtn.EnableGroup = false;
- this.okBtn.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(155)))), ((int)(((byte)(214)))));
- this.okBtn.FlatAppearance.BorderSize = 0;
- this.okBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.okBtn.Font = new System.Drawing.Font("宋体", 12F);
- this.okBtn.ForeColor = System.Drawing.Color.Black;
- this.okBtn.Location = new System.Drawing.Point(174, 310);
- this.okBtn.Name = "okBtn";
- this.okBtn.PlaySound = false;
- this.okBtn.SelfControlEnable = false;
- this.okBtn.Size = new System.Drawing.Size(92, 40);
- this.okBtn.SoundType = WinFormControl.SoundType.Click;
- this.okBtn.TabIndex = 4;
- this.okBtn.Text = "确定";
- this.okBtn.UseVisualStyleBackColor = true;
- this.okBtn.WithStataHode = false;
- this.okBtn.Click += new System.EventHandler(this.okBtn_Click);
- //
- // cancelBtn
- //
- this.cancelBtn.AsClicked = false;
- this.cancelBtn.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("cancelBtn.BackgroundImage")));
- this.cancelBtn.EnableGroup = false;
- this.cancelBtn.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(155)))), ((int)(((byte)(214)))));
- this.cancelBtn.FlatAppearance.BorderSize = 0;
- this.cancelBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.cancelBtn.Font = new System.Drawing.Font("宋体", 12F);
- this.cancelBtn.ForeColor = System.Drawing.Color.Black;
- this.cancelBtn.Location = new System.Drawing.Point(332, 310);
- this.cancelBtn.Name = "cancelBtn";
- this.cancelBtn.PlaySound = false;
- this.cancelBtn.SelfControlEnable = false;
- this.cancelBtn.Size = new System.Drawing.Size(92, 40);
- this.cancelBtn.SoundType = WinFormControl.SoundType.Click;
- this.cancelBtn.TabIndex = 5;
- this.cancelBtn.Text = "取消";
- this.cancelBtn.UseVisualStyleBackColor = true;
- this.cancelBtn.WithStataHode = false;
- this.cancelBtn.Click += new System.EventHandler(this.cancelBtn_Click);
- //
// goodsLabel
//
this.goodsLabel.AutoSize = true;
@@ -143,46 +98,33 @@
//
// fullBtn
//
- this.fullBtn.AsClicked = true;
- this.fullBtn.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("fullBtn.BackgroundImage")));
+ this.fullBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(106)))), ((int)(((byte)(201)))));
this.fullBtn.EnableGroup = true;
- this.fullBtn.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(155)))), ((int)(((byte)(214)))));
- this.fullBtn.FlatAppearance.BorderSize = 0;
- this.fullBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.fullBtn.Font = new System.Drawing.Font("宋体", 12F);
+ this.fullBtn.Font = new System.Drawing.Font("黑体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.fullBtn.ForeColor = System.Drawing.Color.White;
this.fullBtn.Location = new System.Drawing.Point(154, 3);
this.fullBtn.Name = "fullBtn";
- this.fullBtn.PlaySound = false;
- this.fullBtn.SelfControlEnable = false;
+ this.fullBtn.Selected = true;
+ this.fullBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(25)))));
this.fullBtn.Size = new System.Drawing.Size(85, 36);
- this.fullBtn.SoundType = WinFormControl.SoundType.Click;
- this.fullBtn.TabIndex = 1;
+ this.fullBtn.TabIndex = 7;
this.fullBtn.Text = "1";
- this.fullBtn.UseVisualStyleBackColor = true;
- this.fullBtn.WithStataHode = true;
+ this.fullBtn.UseVisualStyleBackColor = false;
this.fullBtn.Click += new System.EventHandler(this.fullBtn_Click);
//
// helfBtn
//
- this.helfBtn.AsClicked = false;
- this.helfBtn.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("helfBtn.BackgroundImage")));
+ this.helfBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(106)))), ((int)(((byte)(201)))));
this.helfBtn.EnableGroup = true;
- this.helfBtn.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(155)))), ((int)(((byte)(214)))));
- this.helfBtn.FlatAppearance.BorderSize = 0;
- this.helfBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.helfBtn.Font = new System.Drawing.Font("宋体", 12F);
- this.helfBtn.ForeColor = System.Drawing.Color.Black;
+ this.helfBtn.Font = new System.Drawing.Font("黑体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.helfBtn.ForeColor = System.Drawing.Color.White;
this.helfBtn.Location = new System.Drawing.Point(3, 3);
this.helfBtn.Name = "helfBtn";
- this.helfBtn.PlaySound = false;
- this.helfBtn.SelfControlEnable = false;
+ this.helfBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(25)))));
this.helfBtn.Size = new System.Drawing.Size(85, 36);
- this.helfBtn.SoundType = WinFormControl.SoundType.Click;
- this.helfBtn.TabIndex = 0;
+ this.helfBtn.TabIndex = 7;
this.helfBtn.Text = "0.5";
- this.helfBtn.UseVisualStyleBackColor = true;
- this.helfBtn.WithStataHode = true;
+ this.helfBtn.UseVisualStyleBackColor = false;
this.helfBtn.Click += new System.EventHandler(this.helfBtn_Click);
//
// weightInput
@@ -193,6 +135,7 @@
this.weightInput.Size = new System.Drawing.Size(242, 38);
this.weightInput.TabIndex = 3;
this.weightInput.Type = WinFormControl.UTextBoxWithPad.TextBoxType.Number;
+ this.weightInput.Click += new System.EventHandler(this.weightInput_Click);
//
// numberInput
//
@@ -202,6 +145,35 @@
this.numberInput.Size = new System.Drawing.Size(242, 38);
this.numberInput.TabIndex = 2;
this.numberInput.Type = WinFormControl.UTextBoxWithPad.TextBoxType.Number;
+ this.numberInput.Click += new System.EventHandler(this.weightInput_Click);
+ //
+ // okBtn
+ //
+ this.okBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(194)))), ((int)(((byte)(76)))));
+ this.okBtn.Font = new System.Drawing.Font("黑体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.okBtn.ForeColor = System.Drawing.Color.White;
+ this.okBtn.Location = new System.Drawing.Point(181, 310);
+ this.okBtn.Name = "okBtn";
+ this.okBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(215)))), ((int)(((byte)(107)))));
+ this.okBtn.Size = new System.Drawing.Size(92, 40);
+ this.okBtn.TabIndex = 7;
+ this.okBtn.Text = "确定";
+ this.okBtn.UseVisualStyleBackColor = false;
+ this.okBtn.Click += new System.EventHandler(this.okBtn_Click);
+ //
+ // cancelBtn
+ //
+ this.cancelBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(77)))), ((int)(((byte)(135)))), ((int)(((byte)(245)))));
+ this.cancelBtn.Font = new System.Drawing.Font("黑体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.cancelBtn.ForeColor = System.Drawing.Color.White;
+ this.cancelBtn.Location = new System.Drawing.Point(325, 310);
+ this.cancelBtn.Name = "cancelBtn";
+ this.cancelBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(215)))), ((int)(((byte)(107)))));
+ this.cancelBtn.Size = new System.Drawing.Size(92, 40);
+ this.cancelBtn.TabIndex = 8;
+ this.cancelBtn.Text = "取消";
+ this.cancelBtn.UseVisualStyleBackColor = false;
+ this.cancelBtn.Click += new System.EventHandler(this.cancelBtn_Click);
//
// AddWeightRecord
//
@@ -210,12 +182,12 @@
this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(582, 394);
this.ControlBox = false;
+ this.Controls.Add(this.cancelBtn);
+ this.Controls.Add(this.okBtn);
this.Controls.Add(this.numberInput);
this.Controls.Add(this.weightInput);
this.Controls.Add(this.panel1);
this.Controls.Add(this.goodsLabel);
- this.Controls.Add(this.cancelBtn);
- this.Controls.Add(this.okBtn);
this.Controls.Add(this.uLabel3);
this.Controls.Add(this.uLabel2);
this.Controls.Add(this.uLabel1);
@@ -234,13 +206,13 @@
private WinFormControl.ULabel uLabel1;
private WinFormControl.ULabel uLabel2;
private WinFormControl.ULabel uLabel3;
- private WinFormControl.UButton okBtn;
- private WinFormControl.UButton cancelBtn;
private WinFormControl.ULabel goodsLabel;
private System.Windows.Forms.Panel panel1;
- private WinFormControl.UButton helfBtn;
private WinFormControl.UTextBoxWithPad weightInput;
- private WinFormControl.UButton fullBtn;
private WinFormControl.UTextBoxWithPad numberInput;
+ private Controls.ColorButton helfBtn;
+ private Controls.ColorButton fullBtn;
+ private Controls.ColorButton okBtn;
+ private Controls.ColorButton cancelBtn;
}
}
\ No newline at end of file
diff --git a/ButcherFactory.Form/Dialogs/AddWeightRecord.cs b/ButcherFactory.Form/Dialogs/AddWeightRecord.cs
index fe1f7b1..761a20d 100644
--- a/ButcherFactory.Form/Dialogs/AddWeightRecord.cs
+++ b/ButcherFactory.Form/Dialogs/AddWeightRecord.cs
@@ -10,6 +10,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
+using WinFormControl;
namespace ButcherFactory.Dialogs
{
@@ -50,7 +51,6 @@ namespace ButcherFactory.Dialogs
CarcassSaleOutBL.AddAndUpdate(record);
DialogResult = DialogResult.OK;
- this.Close();
}
private void cancelBtn_Click(object sender, EventArgs e)
@@ -67,5 +67,12 @@ namespace ButcherFactory.Dialogs
{
numberInput.Text = "1";
}
+
+ private void weightInput_Click(object sender, EventArgs e)
+ {
+ var keyBoard = new NumberPad();
+ if (keyBoard.ShowDialog() == true)
+ (sender as TextBox).Text = keyBoard.Result;
+ }
}
}
diff --git a/ButcherFactory.Form/Dialogs/AddWeightRecord.resx b/ButcherFactory.Form/Dialogs/AddWeightRecord.resx
index 4178b2b..1af7de1 100644
--- a/ButcherFactory.Form/Dialogs/AddWeightRecord.resx
+++ b/ButcherFactory.Form/Dialogs/AddWeightRecord.resx
@@ -117,37 +117,4 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAAGAAAAAwCAIAAABhdOiYAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wwAADsMBx2+oZAAAAHNJREFUaEPt0AENACAMwDAkowVB14aDz0CTKui5b1gICoKCoCAoCAqCgqAgKAgK
- goKgICgICoKCoCAoCAqCgqAgKAgKgoKgICgICoKCoCAoCAqCgqAgKAgKgoKgICgICoKCoCAoCAqCgqAg
- KAgKgoKg1ZsPvpCB0hBohjQAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAAGAAAAAwCAIAAABhdOiYAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wwAADsMBx2+oZAAAAHNJREFUaEPt0AENACAMwDAkowVB14aDz0CTKui5b1gICoKCoCAoCAqCgqAgKAgK
- goKgICgICoKCoCAoCAqCgqAgKAgKgoKgICgICoKCoCAoCAqCgqAgKAgKgoKgICgICoKCoCAoCAqCgqAg
- KAgKgoKg1ZsPvpCB0hBohjQAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAAGAAAAAwCAIAAABhdOiYAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
- dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABzSURBVGhD7dABDQAgDMAwDKEYX9eDg89AkyrouW9Y
- CAqCgqAgKAgKgoKgICgICoKCoCAoCAqCgqAgKAgKgoKgICgICoKCoCAoCAqCgqAgKAgKgoKgICgICoKC
- oCAoCAqCgqAgKAgKgoKgICgICoKCoNWbDyxvHbTQUKATAAAAAElFTkSuQmCC
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAAGAAAAAwCAIAAABhdOiYAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wwAADsMBx2+oZAAAAHNJREFUaEPt0AENACAMwDAkowVB14aDz0CTKui5b1gICoKCoCAoCAqCgqAgKAgK
- goKgICgICoKCoCAoCAqCgqAgKAgKgoKgICgICoKCoCAoCAqCgqAgKAgKgoKgICgICoKCoCAoCAqCgqAg
- KAgKgoKg1ZsPvpCB0hBohjQAAAAASUVORK5CYII=
-
-
\ No newline at end of file
diff --git a/ButcherFactory.Form/Dialogs/WeightRecordDialog.Designer.cs b/ButcherFactory.Form/Dialogs/WeightRecordDialog.Designer.cs
index 748b324..1c6ca64 100644
--- a/ButcherFactory.Form/Dialogs/WeightRecordDialog.Designer.cs
+++ b/ButcherFactory.Form/Dialogs/WeightRecordDialog.Designer.cs
@@ -35,7 +35,6 @@
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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WeightRecordDialog));
this.uDataGridView1 = new WinFormControl.UDataGridView();
this.R_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.R_Selected = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -50,11 +49,11 @@
this.R_DiffWeight = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.R_Operator = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.R_Time = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.addBtn = new WinFormControl.UButton();
this.panel1 = new System.Windows.Forms.Panel();
- this.rollBackBtn = new WinFormControl.UButton();
- this.closeBtn = new WinFormControl.UButton();
- this.deleteBtn = new WinFormControl.UButton();
+ this.addBtn = new ButcherFactory.Controls.ColorButton();
+ this.deleteBtn = new ButcherFactory.Controls.ColorButton();
+ this.rollBackBtn = new ButcherFactory.Controls.ColorButton();
+ this.closeBtn = new ButcherFactory.Controls.ColorButton();
((System.ComponentModel.ISupportInitialize)(this.uDataGridView1)).BeginInit();
this.panel1.SuspendLayout();
this.SuspendLayout();
@@ -218,107 +217,75 @@
this.R_Time.ReadOnly = true;
this.R_Time.Width = 120;
//
- // addBtn
- //
- this.addBtn.AsClicked = false;
- this.addBtn.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("addBtn.BackgroundImage")));
- this.addBtn.EnableGroup = false;
- this.addBtn.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(155)))), ((int)(((byte)(214)))));
- this.addBtn.FlatAppearance.BorderSize = 0;
- this.addBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.addBtn.Font = new System.Drawing.Font("宋体", 12F);
- this.addBtn.ForeColor = System.Drawing.Color.Black;
- this.addBtn.Location = new System.Drawing.Point(3, 5);
- this.addBtn.Name = "addBtn";
- this.addBtn.PlaySound = false;
- this.addBtn.SelfControlEnable = false;
- this.addBtn.Size = new System.Drawing.Size(117, 43);
- this.addBtn.SoundType = WinFormControl.SoundType.Click;
- this.addBtn.TabIndex = 1;
- this.addBtn.Text = "新增";
- this.addBtn.UseVisualStyleBackColor = true;
- this.addBtn.WithStataHode = false;
- this.addBtn.Click += new System.EventHandler(this.addBtn_Click);
- //
// panel1
//
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
- this.panel1.Controls.Add(this.rollBackBtn);
this.panel1.Controls.Add(this.closeBtn);
+ this.panel1.Controls.Add(this.rollBackBtn);
this.panel1.Controls.Add(this.deleteBtn);
this.panel1.Controls.Add(this.addBtn);
this.panel1.Location = new System.Drawing.Point(185, 468);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(776, 52);
+ this.panel1.Size = new System.Drawing.Size(744, 52);
this.panel1.TabIndex = 2;
//
+ // addBtn
+ //
+ this.addBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(198)))), ((int)(((byte)(58)))));
+ this.addBtn.Font = new System.Drawing.Font("黑体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.addBtn.ForeColor = System.Drawing.Color.White;
+ this.addBtn.Location = new System.Drawing.Point(3, 5);
+ this.addBtn.Name = "addBtn";
+ this.addBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(215)))), ((int)(((byte)(107)))));
+ this.addBtn.Size = new System.Drawing.Size(117, 43);
+ this.addBtn.TabIndex = 3;
+ this.addBtn.Text = "新增";
+ this.addBtn.UseVisualStyleBackColor = false;
+ this.addBtn.Click += new System.EventHandler(this.addBtn_Click);
+ //
+ // deleteBtn
+ //
+ this.deleteBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(25)))));
+ this.deleteBtn.Font = new System.Drawing.Font("黑体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.deleteBtn.ForeColor = System.Drawing.Color.White;
+ this.deleteBtn.Location = new System.Drawing.Point(207, 5);
+ this.deleteBtn.Name = "deleteBtn";
+ this.deleteBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(215)))), ((int)(((byte)(107)))));
+ this.deleteBtn.Size = new System.Drawing.Size(117, 43);
+ this.deleteBtn.TabIndex = 5;
+ this.deleteBtn.Text = "删除且更新";
+ this.deleteBtn.UseVisualStyleBackColor = false;
+ this.deleteBtn.Click += new System.EventHandler(this.deleteBtn_Click);
+ //
// rollBackBtn
//
- this.rollBackBtn.AsClicked = false;
- this.rollBackBtn.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("rollBackBtn.BackgroundImage")));
- this.rollBackBtn.EnableGroup = false;
- this.rollBackBtn.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(155)))), ((int)(((byte)(214)))));
- this.rollBackBtn.FlatAppearance.BorderSize = 0;
- this.rollBackBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.rollBackBtn.Font = new System.Drawing.Font("宋体", 12F);
- this.rollBackBtn.ForeColor = System.Drawing.Color.Black;
- this.rollBackBtn.Location = new System.Drawing.Point(414, 5);
+ this.rollBackBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(238)))), ((int)(((byte)(75)))), ((int)(((byte)(71)))));
+ this.rollBackBtn.Font = new System.Drawing.Font("黑体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.rollBackBtn.ForeColor = System.Drawing.Color.White;
+ this.rollBackBtn.Location = new System.Drawing.Point(428, 5);
this.rollBackBtn.Name = "rollBackBtn";
- this.rollBackBtn.PlaySound = false;
- this.rollBackBtn.SelfControlEnable = false;
+ this.rollBackBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(215)))), ((int)(((byte)(107)))));
this.rollBackBtn.Size = new System.Drawing.Size(117, 43);
- this.rollBackBtn.SoundType = WinFormControl.SoundType.Click;
- this.rollBackBtn.TabIndex = 4;
+ this.rollBackBtn.TabIndex = 6;
this.rollBackBtn.Text = "退回";
- this.rollBackBtn.UseVisualStyleBackColor = true;
- this.rollBackBtn.WithStataHode = false;
+ this.rollBackBtn.UseVisualStyleBackColor = false;
this.rollBackBtn.Click += new System.EventHandler(this.rollBackBtn_Click);
//
// closeBtn
//
- this.closeBtn.AsClicked = false;
- this.closeBtn.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("closeBtn.BackgroundImage")));
- this.closeBtn.EnableGroup = false;
- this.closeBtn.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(155)))), ((int)(((byte)(214)))));
- this.closeBtn.FlatAppearance.BorderSize = 0;
- this.closeBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.closeBtn.Font = new System.Drawing.Font("宋体", 12F);
- this.closeBtn.ForeColor = System.Drawing.Color.Black;
- this.closeBtn.Location = new System.Drawing.Point(623, 5);
+ this.closeBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(77)))), ((int)(((byte)(135)))), ((int)(((byte)(245)))));
+ this.closeBtn.Font = new System.Drawing.Font("黑体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.closeBtn.ForeColor = System.Drawing.Color.White;
+ this.closeBtn.Location = new System.Drawing.Point(624, 5);
this.closeBtn.Name = "closeBtn";
- this.closeBtn.PlaySound = false;
- this.closeBtn.SelfControlEnable = false;
+ this.closeBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(215)))), ((int)(((byte)(107)))));
this.closeBtn.Size = new System.Drawing.Size(117, 43);
- this.closeBtn.SoundType = WinFormControl.SoundType.Click;
this.closeBtn.TabIndex = 3;
this.closeBtn.Text = "关闭";
- this.closeBtn.UseVisualStyleBackColor = true;
- this.closeBtn.WithStataHode = false;
+ this.closeBtn.UseVisualStyleBackColor = false;
this.closeBtn.Click += new System.EventHandler(this.closeBtn_Click);
//
- // deleteBtn
- //
- this.deleteBtn.AsClicked = false;
- this.deleteBtn.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("deleteBtn.BackgroundImage")));
- this.deleteBtn.EnableGroup = false;
- this.deleteBtn.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(155)))), ((int)(((byte)(214)))));
- this.deleteBtn.FlatAppearance.BorderSize = 0;
- this.deleteBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.deleteBtn.Font = new System.Drawing.Font("宋体", 12F);
- this.deleteBtn.ForeColor = System.Drawing.Color.Black;
- this.deleteBtn.Location = new System.Drawing.Point(204, 5);
- this.deleteBtn.Name = "deleteBtn";
- this.deleteBtn.PlaySound = false;
- this.deleteBtn.SelfControlEnable = false;
- this.deleteBtn.Size = new System.Drawing.Size(117, 43);
- this.deleteBtn.SoundType = WinFormControl.SoundType.Click;
- this.deleteBtn.TabIndex = 2;
- this.deleteBtn.Text = "删除且更新";
- this.deleteBtn.UseVisualStyleBackColor = true;
- this.deleteBtn.WithStataHode = false;
- this.deleteBtn.Click += new System.EventHandler(this.deleteBtn_Click);
- //
// WeightRecordDialog
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -341,11 +308,7 @@
#endregion
private WinFormControl.UDataGridView uDataGridView1;
- private WinFormControl.UButton addBtn;
private System.Windows.Forms.Panel panel1;
- private WinFormControl.UButton deleteBtn;
- private WinFormControl.UButton closeBtn;
- private WinFormControl.UButton rollBackBtn;
private System.Windows.Forms.DataGridViewTextBoxColumn R_ID;
private System.Windows.Forms.DataGridViewTextBoxColumn R_Selected;
private System.Windows.Forms.DataGridViewImageColumn R_Image;
@@ -359,5 +322,9 @@
private System.Windows.Forms.DataGridViewTextBoxColumn R_DiffWeight;
private System.Windows.Forms.DataGridViewTextBoxColumn R_Operator;
private System.Windows.Forms.DataGridViewTextBoxColumn R_Time;
+ private Controls.ColorButton addBtn;
+ private Controls.ColorButton deleteBtn;
+ private Controls.ColorButton rollBackBtn;
+ private Controls.ColorButton closeBtn;
}
}
\ No newline at end of file
diff --git a/ButcherFactory.Form/Dialogs/WeightRecordDialog.resx b/ButcherFactory.Form/Dialogs/WeightRecordDialog.resx
index 49cc29e..e5fb04f 100644
--- a/ButcherFactory.Form/Dialogs/WeightRecordDialog.resx
+++ b/ButcherFactory.Form/Dialogs/WeightRecordDialog.resx
@@ -156,37 +156,4 @@
True
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAAGAAAAAwCAIAAABhdOiYAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wwAADsMBx2+oZAAAAHNJREFUaEPt0AENACAMwDAkowVB14aDz0CTKui5b1gICoKCoCAoCAqCgqAgKAgK
- goKgICgICoKCoCAoCAqCgqAgKAgKgoKgICgICoKCoCAoCAqCgqAgKAgKgoKgICgICoKCoCAoCAqCgqAg
- KAgKgoKg1ZsPvpCB0hBohjQAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAAGAAAAAwCAIAAABhdOiYAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wwAADsMBx2+oZAAAAHNJREFUaEPt0AENACAMwDAkowVB14aDz0CTKui5b1gICoKCoCAoCAqCgqAgKAgK
- goKgICgICoKCoCAoCAqCgqAgKAgKgoKgICgICoKCoCAoCAqCgqAgKAgKgoKgICgICoKCoCAoCAqCgqAg
- KAgKgoKg1ZsPvpCB0hBohjQAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAAGAAAAAwCAIAAABhdOiYAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wwAADsMBx2+oZAAAAHNJREFUaEPt0AENACAMwDAkowVB14aDz0CTKui5b1gICoKCoCAoCAqCgqAgKAgK
- goKgICgICoKCoCAoCAqCgqAgKAgKgoKgICgICoKCoCAoCAqCgqAgKAgKgoKgICgICoKCoCAoCAqCgqAg
- KAgKgoKg1ZsPvpCB0hBohjQAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAAGAAAAAwCAIAAABhdOiYAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wwAADsMBx2+oZAAAAHNJREFUaEPt0AENACAMwDAkowVB14aDz0CTKui5b1gICoKCoCAoCAqCgqAgKAgK
- goKgICgICoKCoCAoCAqCgqAgKAgKgoKgICgICoKCoCAoCAqCgqAgKAgKgoKgICgICoKCoCAoCAqCgqAg
- KAgKgoKg1ZsPvpCB0hBohjQAAAAASUVORK5CYII=
-
-
\ No newline at end of file
diff --git a/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.Designer.cs b/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.Designer.cs
index c3b1b65..2dc09a7 100644
--- a/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.Designer.cs
+++ b/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.Designer.cs
@@ -28,24 +28,24 @@
///
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 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 dataGridViewCellStyle10 = 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 dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = 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 dataGridViewCellStyle16 = 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 dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle51 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle49 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle50 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle52 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle53 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle54 = new System.Windows.Forms.DataGridViewCellStyle();
this.panel1 = new System.Windows.Forms.Panel();
this.inStoreViewBtn = new WinFormControl.NButton();
this.netStateWatch1 = new WinFormControl.NetStateWatch();
@@ -54,6 +54,14 @@
this.uScanPanel1 = new WinFormControl.UScanPanel();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.inStoreGrid = new WinFormControl.UDataGridView();
+ this.I_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.I_RowIndex = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.I_ShortCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.I_Goods_Code = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.I_Goods_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.I_Goods_Spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.I_Weight = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.I_InStoreTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.goodsNameLbl = new WinFormControl.ULabel();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.submitBtn = new WinFormControl.NButton();
@@ -88,14 +96,6 @@
this.E_BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.E_ExceptionInfo = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.uLabel4 = new WinFormControl.ULabel();
- this.I_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.I_RowIndex = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.I_ShortCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.I_Goods_Code = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.I_Goods_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.I_Goods_Spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.I_Weight = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.I_InStoreTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.panel1.SuspendLayout();
this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.inStoreGrid)).BeginInit();
@@ -191,18 +191,18 @@
this.inStoreGrid.AllowUserToDeleteRows = false;
this.inStoreGrid.AllowUserToResizeColumns = false;
this.inStoreGrid.AllowUserToResizeRows = false;
- dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
- this.inStoreGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+ dataGridViewCellStyle37.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+ this.inStoreGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle37;
this.inStoreGrid.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.inStoreGrid.BackgroundColor = System.Drawing.Color.White;
this.inStoreGrid.BorderStyle = System.Windows.Forms.BorderStyle.None;
- dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 12F);
- dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.inStoreGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+ dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle38.Font = new System.Drawing.Font("宋体", 12F);
+ dataGridViewCellStyle38.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.inStoreGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle38;
this.inStoreGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.inStoreGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.I_ID,
@@ -218,14 +218,85 @@
this.inStoreGrid.Name = "inStoreGrid";
this.inStoreGrid.ReadOnly = true;
this.inStoreGrid.RowHeadersVisible = false;
- dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
- this.inStoreGrid.RowsDefaultCellStyle = dataGridViewCellStyle5;
+ dataGridViewCellStyle41.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle41.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
+ this.inStoreGrid.RowsDefaultCellStyle = dataGridViewCellStyle41;
this.inStoreGrid.RowTemplate.Height = 23;
this.inStoreGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.inStoreGrid.Size = new System.Drawing.Size(595, 371);
this.inStoreGrid.TabIndex = 9;
//
+ // I_ID
+ //
+ this.I_ID.DataPropertyName = "ID";
+ this.I_ID.HeaderText = "ID";
+ this.I_ID.Name = "I_ID";
+ this.I_ID.ReadOnly = true;
+ this.I_ID.Visible = false;
+ //
+ // I_RowIndex
+ //
+ this.I_RowIndex.DataPropertyName = "RowIndex";
+ this.I_RowIndex.HeaderText = "序号";
+ this.I_RowIndex.Name = "I_RowIndex";
+ this.I_RowIndex.ReadOnly = true;
+ this.I_RowIndex.Width = 65;
+ //
+ // I_ShortCode
+ //
+ this.I_ShortCode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+ this.I_ShortCode.DataPropertyName = "ShortCode";
+ this.I_ShortCode.HeaderText = "条码";
+ this.I_ShortCode.Name = "I_ShortCode";
+ this.I_ShortCode.ReadOnly = true;
+ this.I_ShortCode.Width = 60;
+ //
+ // I_Goods_Code
+ //
+ this.I_Goods_Code.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+ this.I_Goods_Code.DataPropertyName = "Goods_Code";
+ this.I_Goods_Code.HeaderText = "产品编号";
+ this.I_Goods_Code.Name = "I_Goods_Code";
+ this.I_Goods_Code.ReadOnly = true;
+ //
+ // I_Goods_Name
+ //
+ this.I_Goods_Name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+ this.I_Goods_Name.DataPropertyName = "Goods_Name";
+ this.I_Goods_Name.HeaderText = "产品名称";
+ this.I_Goods_Name.Name = "I_Goods_Name";
+ this.I_Goods_Name.ReadOnly = true;
+ //
+ // I_Goods_Spec
+ //
+ this.I_Goods_Spec.DataPropertyName = "Goods_Spec";
+ this.I_Goods_Spec.HeaderText = "规格";
+ this.I_Goods_Spec.Name = "I_Goods_Spec";
+ this.I_Goods_Spec.ReadOnly = true;
+ this.I_Goods_Spec.Width = 70;
+ //
+ // I_Weight
+ //
+ this.I_Weight.DataPropertyName = "Weight";
+ dataGridViewCellStyle39.Format = "#0.######";
+ this.I_Weight.DefaultCellStyle = dataGridViewCellStyle39;
+ this.I_Weight.HeaderText = "重量";
+ this.I_Weight.Name = "I_Weight";
+ this.I_Weight.ReadOnly = true;
+ this.I_Weight.Width = 70;
+ //
+ // I_InStoreTime
+ //
+ this.I_InStoreTime.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+ this.I_InStoreTime.DataPropertyName = "InStoreTime";
+ dataGridViewCellStyle40.Format = "T";
+ dataGridViewCellStyle40.NullValue = null;
+ this.I_InStoreTime.DefaultCellStyle = dataGridViewCellStyle40;
+ this.I_InStoreTime.HeaderText = "入库时间";
+ this.I_InStoreTime.Name = "I_InStoreTime";
+ this.I_InStoreTime.ReadOnly = true;
+ this.I_InStoreTime.Width = 60;
+ //
// goodsNameLbl
//
this.goodsNameLbl.AutoSize = true;
@@ -292,15 +363,15 @@
this.backStoreGrid.AllowUserToDeleteRows = false;
this.backStoreGrid.AllowUserToResizeColumns = false;
this.backStoreGrid.AllowUserToResizeRows = false;
- dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
- this.backStoreGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6;
+ dataGridViewCellStyle42.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+ this.backStoreGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle42;
this.backStoreGrid.BackgroundColor = System.Drawing.Color.White;
this.backStoreGrid.BorderStyle = System.Windows.Forms.BorderStyle.None;
- dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 12F);
- dataGridViewCellStyle7.ForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.backStoreGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
+ dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle43.Font = new System.Drawing.Font("宋体", 12F);
+ dataGridViewCellStyle43.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.backStoreGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle43;
this.backStoreGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.backStoreGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.B_ID,
@@ -317,9 +388,9 @@
this.backStoreGrid.Name = "backStoreGrid";
this.backStoreGrid.ReadOnly = true;
this.backStoreGrid.RowHeadersVisible = false;
- dataGridViewCellStyle10.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
- this.backStoreGrid.RowsDefaultCellStyle = dataGridViewCellStyle10;
+ dataGridViewCellStyle46.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle46.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
+ this.backStoreGrid.RowsDefaultCellStyle = dataGridViewCellStyle46;
this.backStoreGrid.RowTemplate.Height = 23;
this.backStoreGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.backStoreGrid.Size = new System.Drawing.Size(649, 178);
@@ -377,8 +448,8 @@
// B_Weight
//
this.B_Weight.DataPropertyName = "Weight";
- dataGridViewCellStyle8.Format = "#0.######";
- this.B_Weight.DefaultCellStyle = dataGridViewCellStyle8;
+ dataGridViewCellStyle44.Format = "#0.######";
+ this.B_Weight.DefaultCellStyle = dataGridViewCellStyle44;
this.B_Weight.HeaderText = "重量";
this.B_Weight.Name = "B_Weight";
this.B_Weight.ReadOnly = true;
@@ -388,9 +459,9 @@
//
this.B_ProductTime.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
this.B_ProductTime.DataPropertyName = "ProductTime";
- dataGridViewCellStyle9.Format = "T";
- dataGridViewCellStyle9.NullValue = null;
- this.B_ProductTime.DefaultCellStyle = dataGridViewCellStyle9;
+ dataGridViewCellStyle45.Format = "T";
+ dataGridViewCellStyle45.NullValue = null;
+ this.B_ProductTime.DefaultCellStyle = dataGridViewCellStyle45;
this.B_ProductTime.HeaderText = "生产时间";
this.B_ProductTime.Name = "B_ProductTime";
this.B_ProductTime.ReadOnly = true;
@@ -463,16 +534,16 @@
this.unInstoreGrid.AllowUserToDeleteRows = false;
this.unInstoreGrid.AllowUserToResizeColumns = false;
this.unInstoreGrid.AllowUserToResizeRows = false;
- dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
- this.unInstoreGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11;
+ dataGridViewCellStyle47.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+ this.unInstoreGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle47;
this.unInstoreGrid.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)));
this.unInstoreGrid.BackgroundColor = System.Drawing.Color.White;
this.unInstoreGrid.BorderStyle = System.Windows.Forms.BorderStyle.None;
- dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 12F);
- dataGridViewCellStyle12.ForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.unInstoreGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12;
+ dataGridViewCellStyle48.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle48.Font = new System.Drawing.Font("宋体", 12F);
+ dataGridViewCellStyle48.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle48.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.unInstoreGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle48;
this.unInstoreGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.unInstoreGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.dataGridViewTextBoxColumn8,
@@ -488,9 +559,9 @@
this.unInstoreGrid.Name = "unInstoreGrid";
this.unInstoreGrid.ReadOnly = true;
this.unInstoreGrid.RowHeadersVisible = false;
- dataGridViewCellStyle15.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle15.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
- this.unInstoreGrid.RowsDefaultCellStyle = dataGridViewCellStyle15;
+ dataGridViewCellStyle51.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle51.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
+ this.unInstoreGrid.RowsDefaultCellStyle = dataGridViewCellStyle51;
this.unInstoreGrid.RowTemplate.Height = 23;
this.unInstoreGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.unInstoreGrid.Size = new System.Drawing.Size(649, 109);
@@ -548,8 +619,8 @@
// U_Weight
//
this.U_Weight.DataPropertyName = "Weight";
- dataGridViewCellStyle13.Format = "#0.######";
- this.U_Weight.DefaultCellStyle = dataGridViewCellStyle13;
+ dataGridViewCellStyle49.Format = "#0.######";
+ this.U_Weight.DefaultCellStyle = dataGridViewCellStyle49;
this.U_Weight.HeaderText = "重量";
this.U_Weight.Name = "U_Weight";
this.U_Weight.ReadOnly = true;
@@ -559,9 +630,9 @@
//
this.U_ProductTime.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
this.U_ProductTime.DataPropertyName = "ProductTime";
- dataGridViewCellStyle14.Format = "T";
- dataGridViewCellStyle14.NullValue = null;
- this.U_ProductTime.DefaultCellStyle = dataGridViewCellStyle14;
+ dataGridViewCellStyle50.Format = "T";
+ dataGridViewCellStyle50.NullValue = null;
+ this.U_ProductTime.DefaultCellStyle = dataGridViewCellStyle50;
this.U_ProductTime.HeaderText = "生产时间";
this.U_ProductTime.Name = "U_ProductTime";
this.U_ProductTime.ReadOnly = true;
@@ -597,15 +668,15 @@
this.exceptionGrid.AllowUserToDeleteRows = false;
this.exceptionGrid.AllowUserToResizeColumns = false;
this.exceptionGrid.AllowUserToResizeRows = false;
- dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
- this.exceptionGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle16;
+ dataGridViewCellStyle52.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+ this.exceptionGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle52;
this.exceptionGrid.BackgroundColor = System.Drawing.Color.White;
this.exceptionGrid.BorderStyle = System.Windows.Forms.BorderStyle.None;
- dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle17.Font = new System.Drawing.Font("宋体", 12F);
- dataGridViewCellStyle17.ForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.exceptionGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17;
+ dataGridViewCellStyle53.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle53.Font = new System.Drawing.Font("宋体", 12F);
+ dataGridViewCellStyle53.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle53.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.exceptionGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle53;
this.exceptionGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.exceptionGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.E_ID,
@@ -618,9 +689,9 @@
this.exceptionGrid.Name = "exceptionGrid";
this.exceptionGrid.ReadOnly = true;
this.exceptionGrid.RowHeadersVisible = false;
- dataGridViewCellStyle18.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle18.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
- this.exceptionGrid.RowsDefaultCellStyle = dataGridViewCellStyle18;
+ dataGridViewCellStyle54.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle54.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
+ this.exceptionGrid.RowsDefaultCellStyle = dataGridViewCellStyle54;
this.exceptionGrid.RowTemplate.Height = 23;
this.exceptionGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.exceptionGrid.Size = new System.Drawing.Size(649, 104);
@@ -669,77 +740,6 @@
this.uLabel4.TabIndex = 5;
this.uLabel4.Text = "异常记录";
//
- // I_ID
- //
- this.I_ID.DataPropertyName = "ID";
- this.I_ID.HeaderText = "ID";
- this.I_ID.Name = "I_ID";
- this.I_ID.ReadOnly = true;
- this.I_ID.Visible = false;
- //
- // I_RowIndex
- //
- this.I_RowIndex.DataPropertyName = "RowIndex";
- this.I_RowIndex.HeaderText = "序号";
- this.I_RowIndex.Name = "I_RowIndex";
- this.I_RowIndex.ReadOnly = true;
- this.I_RowIndex.Width = 65;
- //
- // I_ShortCode
- //
- this.I_ShortCode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
- this.I_ShortCode.DataPropertyName = "ShortCode";
- this.I_ShortCode.HeaderText = "条码";
- this.I_ShortCode.Name = "I_ShortCode";
- this.I_ShortCode.ReadOnly = true;
- this.I_ShortCode.Width = 65;
- //
- // I_Goods_Code
- //
- this.I_Goods_Code.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
- this.I_Goods_Code.DataPropertyName = "Goods_Code";
- this.I_Goods_Code.HeaderText = "产品编号";
- this.I_Goods_Code.Name = "I_Goods_Code";
- this.I_Goods_Code.ReadOnly = true;
- //
- // I_Goods_Name
- //
- this.I_Goods_Name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
- this.I_Goods_Name.DataPropertyName = "Goods_Name";
- this.I_Goods_Name.HeaderText = "产品名称";
- this.I_Goods_Name.Name = "I_Goods_Name";
- this.I_Goods_Name.ReadOnly = true;
- //
- // I_Goods_Spec
- //
- this.I_Goods_Spec.DataPropertyName = "Goods_Spec";
- this.I_Goods_Spec.HeaderText = "规格";
- this.I_Goods_Spec.Name = "I_Goods_Spec";
- this.I_Goods_Spec.ReadOnly = true;
- this.I_Goods_Spec.Width = 70;
- //
- // I_Weight
- //
- this.I_Weight.DataPropertyName = "Weight";
- dataGridViewCellStyle3.Format = "#0.######";
- this.I_Weight.DefaultCellStyle = dataGridViewCellStyle3;
- this.I_Weight.HeaderText = "重量";
- this.I_Weight.Name = "I_Weight";
- this.I_Weight.ReadOnly = true;
- this.I_Weight.Width = 70;
- //
- // I_InStoreTime
- //
- this.I_InStoreTime.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
- this.I_InStoreTime.DataPropertyName = "InStoreTime";
- dataGridViewCellStyle4.Format = "T";
- dataGridViewCellStyle4.NullValue = null;
- this.I_InStoreTime.DefaultCellStyle = dataGridViewCellStyle4;
- this.I_InStoreTime.HeaderText = "入库时间";
- this.I_InStoreTime.Name = "I_InStoreTime";
- this.I_InStoreTime.ReadOnly = true;
- this.I_InStoreTime.Width = 97;
- //
// SegmentInStoreForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
diff --git a/ButcherFactory.Form/SegmentSaleOut_/AddWeightRecord.Designer.cs b/ButcherFactory.Form/SegmentSaleOut_/AddWeightRecord.Designer.cs
new file mode 100644
index 0000000..73fa433
--- /dev/null
+++ b/ButcherFactory.Form/SegmentSaleOut_/AddWeightRecord.Designer.cs
@@ -0,0 +1,168 @@
+namespace ButcherFactory.SegmentSaleOut_
+{
+ partial class AddWeightRecord
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.cancelBtn = new ButcherFactory.Controls.ColorButton();
+ this.okBtn = new ButcherFactory.Controls.ColorButton();
+ this.numberInput = new WinFormControl.UTextBoxWithPad();
+ this.weightInput = new WinFormControl.UTextBoxWithPad();
+ this.goodsLabel = new WinFormControl.ULabel();
+ this.uLabel3 = new WinFormControl.ULabel();
+ this.uLabel2 = new WinFormControl.ULabel();
+ this.uLabel1 = new WinFormControl.ULabel();
+ this.SuspendLayout();
+ //
+ // cancelBtn
+ //
+ this.cancelBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(77)))), ((int)(((byte)(135)))), ((int)(((byte)(245)))));
+ this.cancelBtn.Font = new System.Drawing.Font("黑体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.cancelBtn.ForeColor = System.Drawing.Color.White;
+ this.cancelBtn.Location = new System.Drawing.Point(375, 259);
+ this.cancelBtn.Name = "cancelBtn";
+ this.cancelBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(215)))), ((int)(((byte)(107)))));
+ this.cancelBtn.Size = new System.Drawing.Size(92, 40);
+ this.cancelBtn.TabIndex = 17;
+ this.cancelBtn.Text = "取消";
+ this.cancelBtn.UseVisualStyleBackColor = false;
+ this.cancelBtn.Click += new System.EventHandler(this.cancelBtn_Click);
+ //
+ // okBtn
+ //
+ this.okBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(194)))), ((int)(((byte)(76)))));
+ this.okBtn.Font = new System.Drawing.Font("黑体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.okBtn.ForeColor = System.Drawing.Color.White;
+ this.okBtn.Location = new System.Drawing.Point(231, 259);
+ this.okBtn.Name = "okBtn";
+ this.okBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(215)))), ((int)(((byte)(107)))));
+ this.okBtn.Size = new System.Drawing.Size(92, 40);
+ this.okBtn.TabIndex = 16;
+ this.okBtn.Text = "确定";
+ this.okBtn.UseVisualStyleBackColor = false;
+ this.okBtn.Click += new System.EventHandler(this.okBtn_Click);
+ //
+ // numberInput
+ //
+ this.numberInput.Font = new System.Drawing.Font("宋体", 20F);
+ this.numberInput.Location = new System.Drawing.Point(228, 99);
+ this.numberInput.Name = "numberInput";
+ this.numberInput.Size = new System.Drawing.Size(242, 38);
+ this.numberInput.TabIndex = 11;
+ this.numberInput.Type = WinFormControl.UTextBoxWithPad.TextBoxType.Number;
+ this.numberInput.Click += new System.EventHandler(this.weightInput_Click);
+ //
+ // weightInput
+ //
+ this.weightInput.Font = new System.Drawing.Font("宋体", 20F);
+ this.weightInput.Location = new System.Drawing.Point(228, 175);
+ this.weightInput.Name = "weightInput";
+ this.weightInput.Size = new System.Drawing.Size(242, 38);
+ this.weightInput.TabIndex = 13;
+ this.weightInput.Type = WinFormControl.UTextBoxWithPad.TextBoxType.Number;
+ this.weightInput.Click += new System.EventHandler(this.weightInput_Click);
+ //
+ // goodsLabel
+ //
+ this.goodsLabel.AutoSize = true;
+ this.goodsLabel.BackColor = System.Drawing.Color.Transparent;
+ this.goodsLabel.Font = new System.Drawing.Font("宋体", 15F);
+ this.goodsLabel.ForeColor = System.Drawing.Color.Red;
+ this.goodsLabel.Location = new System.Drawing.Point(227, 43);
+ this.goodsLabel.Name = "goodsLabel";
+ this.goodsLabel.Size = new System.Drawing.Size(49, 20);
+ this.goodsLabel.TabIndex = 14;
+ this.goodsLabel.Text = "存货";
+ //
+ // uLabel3
+ //
+ this.uLabel3.AutoSize = true;
+ this.uLabel3.BackColor = System.Drawing.Color.Transparent;
+ this.uLabel3.Font = new System.Drawing.Font("宋体", 12F);
+ this.uLabel3.Location = new System.Drawing.Point(107, 184);
+ this.uLabel3.Name = "uLabel3";
+ this.uLabel3.Size = new System.Drawing.Size(80, 16);
+ this.uLabel3.TabIndex = 12;
+ this.uLabel3.Text = "重 量：";
+ //
+ // uLabel2
+ //
+ this.uLabel2.AutoSize = true;
+ this.uLabel2.BackColor = System.Drawing.Color.Transparent;
+ this.uLabel2.Font = new System.Drawing.Font("宋体", 12F);
+ this.uLabel2.Location = new System.Drawing.Point(110, 111);
+ this.uLabel2.Name = "uLabel2";
+ this.uLabel2.Size = new System.Drawing.Size(80, 16);
+ this.uLabel2.TabIndex = 10;
+ this.uLabel2.Text = "数 量：";
+ //
+ // uLabel1
+ //
+ this.uLabel1.AutoSize = true;
+ this.uLabel1.BackColor = System.Drawing.Color.Transparent;
+ this.uLabel1.Font = new System.Drawing.Font("宋体", 12F);
+ this.uLabel1.Location = new System.Drawing.Point(110, 43);
+ this.uLabel1.Name = "uLabel1";
+ this.uLabel1.Size = new System.Drawing.Size(88, 16);
+ this.uLabel1.TabIndex = 9;
+ this.uLabel1.Text = "存货名称：";
+ //
+ // AddWeightRecord
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackColor = System.Drawing.Color.White;
+ this.ClientSize = new System.Drawing.Size(582, 357);
+ this.ControlBox = false;
+ this.Controls.Add(this.cancelBtn);
+ this.Controls.Add(this.okBtn);
+ this.Controls.Add(this.numberInput);
+ this.Controls.Add(this.weightInput);
+ this.Controls.Add(this.goodsLabel);
+ this.Controls.Add(this.uLabel3);
+ this.Controls.Add(this.uLabel2);
+ this.Controls.Add(this.uLabel1);
+ this.Name = "AddWeightRecord";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "新增";
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private Controls.ColorButton cancelBtn;
+ private Controls.ColorButton okBtn;
+ private WinFormControl.UTextBoxWithPad numberInput;
+ private WinFormControl.UTextBoxWithPad weightInput;
+ private WinFormControl.ULabel goodsLabel;
+ private WinFormControl.ULabel uLabel3;
+ private WinFormControl.ULabel uLabel2;
+ private WinFormControl.ULabel uLabel1;
+ }
+}
\ No newline at end of file
diff --git a/ButcherFactory.Form/SegmentSaleOut_/AddWeightRecord.cs b/ButcherFactory.Form/SegmentSaleOut_/AddWeightRecord.cs
new file mode 100644
index 0000000..67f3cc4
--- /dev/null
+++ b/ButcherFactory.Form/SegmentSaleOut_/AddWeightRecord.cs
@@ -0,0 +1,66 @@
+using ButcherFactory.BO;
+using ButcherFactory.BO.LocalBL;
+using ButcherFactory.BO.Utils;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using WinFormControl;
+
+namespace ButcherFactory.SegmentSaleOut_
+{
+ public partial class AddWeightRecord : Form
+ {
+ SaleOutStore_Detail mDetail;
+ long? mBatchID = null;
+ public AddWeightRecord(SaleOutStore_Detail detail, long? batchID)
+ {
+ InitializeComponent();
+ mDetail = detail;
+ mBatchID = batchID;
+ goodsLabel.Text = mDetail.Goods_Name;
+ }
+
+ private void okBtn_Click(object sender, EventArgs e)
+ {
+ decimal weight = 0;
+ if (!decimal.TryParse(weightInput.Text, out weight))
+ throw new Exception("请输入重量");
+ decimal number = 0;
+ if (!decimal.TryParse(numberInput.Text, out number))
+ throw new Exception("请输入数量");
+ if (number < 0)
+ throw new Exception("数量不能为负");
+ var record = new SegmentSaleOut_Detail();
+ record.BillID = mDetail.SaleOutStore_ID;
+ record.DetailID = mDetail.ID;
+ record.ProductBatch_ID = mBatchID;
+ record.Goods_Code = mDetail.Goods_Code;
+ record.Goods_ID = mDetail.Goods_ID;
+ record.Goods_Name = mDetail.Goods_Name;
+ record.Number = weight;
+ record.SecondNumber = number;
+ record.Operator = AppContext.Worker.Name;
+
+ SegmentSaleOutBL.AddAndUpdate(record);
+ DialogResult = DialogResult.OK;
+ }
+
+ private void cancelBtn_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+
+ private void weightInput_Click(object sender, EventArgs e)
+ {
+ var keyBoard = new NumberPad();
+ if (keyBoard.ShowDialog() == true)
+ (sender as TextBox).Text = keyBoard.Result;
+ }
+ }
+}
diff --git a/ButcherFactory.Form/SegmentSaleOut_/AddWeightRecord.resx b/ButcherFactory.Form/SegmentSaleOut_/AddWeightRecord.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/ButcherFactory.Form/SegmentSaleOut_/AddWeightRecord.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/ButcherFactory.Form/SegmentSaleOut_/DiscontSetDialog.Designer.cs b/ButcherFactory.Form/SegmentSaleOut_/DiscontSetDialog.Designer.cs
new file mode 100644
index 0000000..dc653ba
--- /dev/null
+++ b/ButcherFactory.Form/SegmentSaleOut_/DiscontSetDialog.Designer.cs
@@ -0,0 +1,180 @@
+namespace ButcherFactory.SegmentSaleOut_
+{
+ partial class DiscontSetDialog
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.label1 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label4 = new System.Windows.Forms.Label();
+ this.lbl1 = new System.Windows.Forms.Label();
+ this.lbl2 = new System.Windows.Forms.Label();
+ this.lbl3 = new System.Windows.Forms.Label();
+ this.lbl4 = new System.Windows.Forms.Label();
+ this.okBtn = new ButcherFactory.Controls.ColorButton();
+ this.SuspendLayout();
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Font = new System.Drawing.Font("宋体", 12F);
+ this.label1.Location = new System.Drawing.Point(72, 32);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(56, 16);
+ this.label1.TabIndex = 0;
+ this.label1.Text = "扣重一";
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Font = new System.Drawing.Font("宋体", 12F);
+ this.label2.Location = new System.Drawing.Point(72, 87);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(56, 16);
+ this.label2.TabIndex = 1;
+ this.label2.Text = "扣重一";
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Font = new System.Drawing.Font("宋体", 12F);
+ this.label3.Location = new System.Drawing.Point(72, 144);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(56, 16);
+ this.label3.TabIndex = 2;
+ this.label3.Text = "扣重一";
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Font = new System.Drawing.Font("宋体", 12F);
+ this.label4.Location = new System.Drawing.Point(72, 201);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(56, 16);
+ this.label4.TabIndex = 3;
+ this.label4.Text = "扣重一";
+ //
+ // lbl1
+ //
+ this.lbl1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.lbl1.Font = new System.Drawing.Font("黑体", 12F);
+ this.lbl1.ForeColor = System.Drawing.Color.Red;
+ this.lbl1.Location = new System.Drawing.Point(161, 29);
+ this.lbl1.Name = "lbl1";
+ this.lbl1.Size = new System.Drawing.Size(100, 30);
+ this.lbl1.TabIndex = 4;
+ this.lbl1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.lbl1.Click += new System.EventHandler(this.lbl1_Click);
+ //
+ // lbl2
+ //
+ this.lbl2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.lbl2.Font = new System.Drawing.Font("黑体", 12F);
+ this.lbl2.ForeColor = System.Drawing.Color.Red;
+ this.lbl2.Location = new System.Drawing.Point(161, 84);
+ this.lbl2.Name = "lbl2";
+ this.lbl2.Size = new System.Drawing.Size(100, 30);
+ this.lbl2.TabIndex = 5;
+ this.lbl2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.lbl2.Click += new System.EventHandler(this.lbl1_Click);
+ //
+ // lbl3
+ //
+ this.lbl3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.lbl3.Font = new System.Drawing.Font("黑体", 12F);
+ this.lbl3.ForeColor = System.Drawing.Color.Red;
+ this.lbl3.Location = new System.Drawing.Point(161, 141);
+ this.lbl3.Name = "lbl3";
+ this.lbl3.Size = new System.Drawing.Size(100, 30);
+ this.lbl3.TabIndex = 6;
+ this.lbl3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.lbl3.Click += new System.EventHandler(this.lbl1_Click);
+ //
+ // lbl4
+ //
+ this.lbl4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.lbl4.Font = new System.Drawing.Font("黑体", 12F);
+ this.lbl4.ForeColor = System.Drawing.Color.Red;
+ this.lbl4.Location = new System.Drawing.Point(161, 198);
+ this.lbl4.Name = "lbl4";
+ this.lbl4.Size = new System.Drawing.Size(100, 30);
+ this.lbl4.TabIndex = 7;
+ this.lbl4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.lbl4.Click += new System.EventHandler(this.lbl1_Click);
+ //
+ // okBtn
+ //
+ this.okBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(77)))), ((int)(((byte)(135)))), ((int)(((byte)(245)))));
+ this.okBtn.Font = new System.Drawing.Font("宋体", 12F);
+ this.okBtn.ForeColor = System.Drawing.Color.White;
+ this.okBtn.Location = new System.Drawing.Point(119, 271);
+ this.okBtn.Name = "okBtn";
+ this.okBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(234)))), ((int)(((byte)(106)))));
+ this.okBtn.Size = new System.Drawing.Size(98, 43);
+ this.okBtn.TabIndex = 8;
+ this.okBtn.Text = "确定";
+ this.okBtn.UseVisualStyleBackColor = false;
+ this.okBtn.Click += new System.EventHandler(this.okBtn_Click);
+ //
+ // DiscontSetDialog
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackColor = System.Drawing.Color.White;
+ this.ClientSize = new System.Drawing.Size(343, 343);
+ this.ControlBox = false;
+ this.Controls.Add(this.okBtn);
+ this.Controls.Add(this.lbl4);
+ this.Controls.Add(this.lbl3);
+ this.Controls.Add(this.lbl2);
+ this.Controls.Add(this.lbl1);
+ this.Controls.Add(this.label4);
+ this.Controls.Add(this.label3);
+ this.Controls.Add(this.label2);
+ this.Controls.Add(this.label1);
+ this.Name = "DiscontSetDialog";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "扣重设置";
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.Label lbl1;
+ private System.Windows.Forms.Label lbl2;
+ private System.Windows.Forms.Label lbl3;
+ private System.Windows.Forms.Label lbl4;
+ private Controls.ColorButton okBtn;
+ }
+}
\ No newline at end of file
diff --git a/ButcherFactory.Form/SegmentSaleOut_/DiscontSetDialog.cs b/ButcherFactory.Form/SegmentSaleOut_/DiscontSetDialog.cs
new file mode 100644
index 0000000..4303a83
--- /dev/null
+++ b/ButcherFactory.Form/SegmentSaleOut_/DiscontSetDialog.cs
@@ -0,0 +1,69 @@
+using ButcherFactory.BO.Utils;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using WinFormControl;
+
+namespace ButcherFactory.SegmentSaleOut_
+{
+ public partial class DiscontSetDialog : Form
+ {
+ public string disCont = string.Empty;
+ SegmentSaleOutFormConfig config;
+ List