diff --git a/ButcherFactory.BO/BaseInfo/Store.cs b/ButcherFactory.BO/BaseInfo/Store.cs new file mode 100644 index 0000000..517b77c --- /dev/null +++ b/ButcherFactory.BO/BaseInfo/Store.cs @@ -0,0 +1,14 @@ +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_Store")] + public class Store : BaseInfo + { + } +} diff --git a/ButcherFactory.BO/Bill/SegmentInStore.cs b/ButcherFactory.BO/Bill/SegmentInStore.cs new file mode 100644 index 0000000..ca02ca6 --- /dev/null +++ b/ButcherFactory.BO/Bill/SegmentInStore.cs @@ -0,0 +1,61 @@ +using Forks.EnterpriseServices.DataDictionary; +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_SegmentInStore")] + [DBIndex("IDX_Butcher_SegmentProduction_Clustered", "BarCode", false, 0)] + [DBIndexType("IDX_Butcher_SegmentProduction_Clustered", IndexType.Clustered)] + public class SegmentInStore : SyncBill + { + 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? Store_ID { get; set; } + + public decimal? Weight { get; set; } + + public string Goods_Code { get; set; } + + public string Goods_Name { get; set; } + + public string Goods_Spec { get; set; } + + public DateTime? ProductTime { get; set; } + + public DateTime? InStoreTime { get; set; } + + //0 已入库 + //1 正在退库 + //2 已退库 + public int State { get; set; } + } + + [MapToTable("Butcher_SegmentCodeError")] + [KeyField("ID", KeyGenType.identity)] + public class SegmentCodeError + { + public long ID { get; set; } + + public string BarCode { get; set; } + + public string ExceptionInfo { get; set; } + } +} diff --git a/ButcherFactory.BO/ButcherFactory.BO.csproj b/ButcherFactory.BO/ButcherFactory.BO.csproj index cfc8514..a48a59b 100644 --- a/ButcherFactory.BO/ButcherFactory.BO.csproj +++ b/ButcherFactory.BO/ButcherFactory.BO.csproj @@ -58,12 +58,14 @@ + + @@ -78,6 +80,7 @@ + diff --git a/ButcherFactory.BO/LocalBL/SegmentInStoreBL.cs b/ButcherFactory.BO/LocalBL/SegmentInStoreBL.cs new file mode 100644 index 0000000..516715e --- /dev/null +++ b/ButcherFactory.BO/LocalBL/SegmentInStoreBL.cs @@ -0,0 +1,381 @@ +using Forks.EnterpriseServices.DomainObjects2; +using Forks.EnterpriseServices.DomainObjects2.DQuery; +using Forks.EnterpriseServices.SqlDoms; +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 SegmentInStoreBL + { + const string RpcPath = @"/MainSystem/B3ClientService/Rpcs/SegmentInStoreRpc/"; + + public static BindingList GetInStoreByStateList(int state) + { + var query = new DQueryDom(new JoinAlias("_main", typeof(SegmentInStore))); + query.Columns.Add(DQSelectColumn.Field("ID")); + query.Columns.Add(DQSelectColumn.Field("RowIndex")); + query.Columns.Add(DQSelectColumn.Field("BarCode")); + query.Columns.Add(DQSelectColumn.Field("Goods_Code")); + query.Columns.Add(DQSelectColumn.Field("Goods_Name")); + query.Columns.Add(DQSelectColumn.Field("Goods_Spec")); + query.Columns.Add(DQSelectColumn.Field("Weight")); + if (state == 0) + { + query.Columns.Add(DQSelectColumn.Field("InStoreTime")); + query.Range = SelectRange.Top(30); + } + else + query.Columns.Add(DQSelectColumn.Field("ProductTime")); + query.Where.Conditions.Add(DQCondition.EQ("State", state)); + if (state == 0) + query.Where.Conditions.Add(DQCondition.EQ(DQExpression.Snippet("CAST([_main].[InStoreTime] AS DATE)"), DQExpression.Value(DateTime.Today))); + query.Where.Conditions.Add(DQCondition.EQ("Delete", false)); + query.OrderBy.Expressions.Add(DQOrderByExpression.Create("RowIndex", true)); + var list = new List(); + using (var session = DmoSession.New()) + { + using (var reader = session.ExecuteReader(query)) + { + while (reader.Read()) + { + var entity = new SegmentInStore(); + entity.ID = (long)reader[0]; + entity.RowIndex = (int?)reader[1]; + entity.BarCode = (string)reader[2]; + entity.Goods_Code = (string)reader[3]; + entity.Goods_Name = (string)reader[4]; + entity.Goods_Spec = (string)reader[5]; + entity.Weight = (decimal?)reader[6]; + if (state == 0) + entity.InStoreTime = (DateTime)reader[7]; + else + entity.ProductTime = (DateTime?)reader[7]; + list.Add(entity); + } + } + } + return new BindingList(list); + } + + public static BindingList GetExceptionList() + { + var query = new DmoQuery(typeof(SegmentCodeError)); + query.OrderBy.Expressions.Add(DQOrderByExpression.Create("ID")); + using (var session = DmoSession.New()) + { + return new BindingList(session.ExecuteList(query).Cast().ToList()); + } + } + + public static BindingList GetUnInStoreList() + { + try + { + var json = RpcFacade.Call(RpcPath + "GetUnInStoreList"); + var list = JsonConvert.DeserializeObject>(json); + var inStored = GetInstoredList(list.Select(x => x.BarCode)); + var result = list.Where(x => !inStored.Any(y => x.BarCode == y)).ToList(); + var idx = 1; + foreach (var item in result) + { + item.RowIndex = idx; + idx++; + } + return new BindingList(result); + } + catch + { +#if DEBUG + throw; +#endif + return null; + } + } + + static List GetInstoredList(IEnumerable barCodes) + { + var query = new DQueryDom(new JoinAlias(typeof(SegmentInStore))); + 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()) + { + return query.EExecuteList(session); + } + } + + public static SegmentInStore InsertInStore(string barCode, long? storeID, int rowIndex) + { + using (var session = DmoSession.New()) + { + var entity = new SegmentInStore(); + entity.BarCode = barCode; + entity.Store_ID = storeID; + entity.InStoreTime = DateTime.Now; + entity.RowIndex = rowIndex; + + var localData = GetLocalData(session, barCode); + if (localData == null) //if not exist LoadFromServer + { + try + { + var json = RpcFacade.Call(RpcPath + "GetSegmentProductInfo", barCode); + var obj = JsonConvert.DeserializeObject(json); + entity.Goods_Code = obj.Goods_Code; + entity.Goods_Name = obj.Goods_Name; + entity.Goods_Spec = obj.Goods_Spec; + entity.ProductTime = obj.ProductTime; + entity.Weight = obj.Weight; + } + catch + { +#if DEBUG + throw; +#endif + } + } + else + { + if (localData.Item3) //if delete LoadFromLocal + { + var obj = LoadLocalData(session, localData.Item1); + entity.Goods_Code = obj.Goods_Code; + entity.Goods_Name = obj.Goods_Name; + entity.Goods_Spec = obj.Goods_Spec; + entity.ProductTime = obj.ProductTime; + entity.Weight = obj.Weight; + } + else + { + //if inStored Error 已入库 + //if isBacking Error 正在退库 + //if back Error 已退库 + var msg = "已入库"; + switch (localData.Item2) + { + case 1: + msg = "正在退库"; + break; + case 2: + msg = "已退库"; + break; + } + throw new Exception(string.Format("入库失败！当前条码{0}", msg)); + } + } + + session.Insert(entity); + session.Commit(); + return entity; + } + } + + static Tuple GetLocalData(IDmoSession session, string barCode) + { + var query = new DQueryDom(new JoinAlias(typeof(SegmentInStore))); + query.Columns.Add(DQSelectColumn.Field("ID")); + query.Columns.Add(DQSelectColumn.Field("State")); + query.Columns.Add(DQSelectColumn.Field("Delete")); + query.Where.Conditions.Add(DQCondition.EQ("BarCode", barCode)); + query.OrderBy.Expressions.Add(DQOrderByExpression.Create("ID", true)); + query.Range = SelectRange.Top(1); + return query.EExecuteScalar(session); + } + + static SegmentProductObj LoadLocalData(IDmoSession session, long id) + { + var query = new DQueryDom(new JoinAlias(typeof(SegmentInStore))); + query.Columns.Add(DQSelectColumn.Field("Goods_Code")); + query.Columns.Add(DQSelectColumn.Field("Goods_Name")); + query.Columns.Add(DQSelectColumn.Field("Goods_Spec")); + query.Columns.Add(DQSelectColumn.Field("ProductTime")); + query.Columns.Add(DQSelectColumn.Field("Weight")); + query.Where.Conditions.Add(DQCondition.EQ("ID", id)); + using (var reader = session.ExecuteReader(query)) + { + var obj = new SegmentProductObj(); + if (reader.Read()) + { + obj.Goods_Code = (string)reader[0]; + obj.Goods_Name = (string)reader[1]; + obj.Goods_Spec = (string)reader[2]; + obj.ProductTime = (DateTime?)reader[3]; + obj.Weight = (decimal?)reader[4]; + } + return obj; + } + } + + public static void SetAsBacking(string barCode, int rowIndex) + { + using (var session = DmoSession.New()) + { + var localData = GetLocalData(session, barCode); + if (localData == null) + throw new Exception("未入库，无法退库"); + if (localData.Item3) + throw new Exception("已删除，无法退库"); + switch (localData.Item2) + { + case 1: + throw new Exception("已在退库中，等待提交"); + case 2: + throw new Exception("已退库，无法重复退库"); + default: + UpdateAsBacking(session, localData.Item1, rowIndex); + session.Commit(); + break; + } + } + } + + static void UpdateAsBacking(IDmoSession session, long id, int rowIndex) + { + var update = new DQUpdateDom(typeof(SegmentInStore)); + update.Columns.Add(new DQUpdateColumn("State", 1)); + update.Columns.Add(new DQUpdateColumn("RowIndex", rowIndex)); + update.Columns.Add(new DQUpdateColumn("Sync", false)); + update.Columns.Add(new DQUpdateColumn("RowVersion", DQExpression.Add(DQExpression.Field("RowVersion"), DQExpression.Value(1)))); + update.Where.Conditions.Add(DQCondition.EQ("ID", id)); + session.ExecuteNonQuery(update); + } + + public static void Delete(long id) + { + var update = new DQUpdateDom(typeof(SegmentInStore)); + update.Columns.Add(new DQUpdateColumn("State", 0)); + update.Columns.Add(new DQUpdateColumn("Delete", 1)); + update.Columns.Add(new DQUpdateColumn("Sync", false)); + update.Columns.Add(new DQUpdateColumn("RowVersion", DQExpression.Add(DQExpression.Field("RowVersion"), DQExpression.Value(1)))); + update.Where.Conditions.Add(DQCondition.EQ("ID", id)); + using (var session = DmoSession.New()) + { + session.ExecuteNonQuery(update); + session.Commit(); + } + } + + public static void SubmitBackStore(IEnumerable ids) + { + var update = new DQUpdateDom(typeof(SegmentInStore)); + update.Columns.Add(new DQUpdateColumn("State", 2)); + update.Columns.Add(new DQUpdateColumn("Sync", false)); + update.Columns.Add(new DQUpdateColumn("RowVersion", DQExpression.Add(DQExpression.Field("RowVersion"), DQExpression.Value(1)))); + update.Where.Conditions.Add(DQCondition.InList(DQExpression.Field("ID"), ids.Select(x => DQExpression.Value(x)).ToArray())); + using (var session = DmoSession.New()) + { + session.ExecuteNonQuery(update); + session.Commit(); + } + } + + public static void InsertScanException(SegmentCodeError error) + { + using (var session = DmoSession.New()) + { + session.Insert(error); + session.Commit(); + } + } + + public static void UploadSegmentInstoreInfo() + { + try + { + using (var session = DmoSession.New()) + { + var needUpload = GetUnSyncData(session); + if (needUpload.Count == 0) + return; + + var json = JsonConvert.SerializeObject(needUpload); + RpcFacade.Call(RpcPath + "UploadSegmentInStoreInfo", json); + foreach (var item in needUpload) + SetLocalAsSyncd(item, session); + session.Commit(); + } + } + catch + { +#if DEBUG + throw; +#endif + } + } + + static List GetUnSyncData(IDmoSession session) + { + var query = new DQueryDom(new JoinAlias(typeof(SegmentInStore))); + query.Columns.Add(DQSelectColumn.Field("ID")); + query.Columns.Add(DQSelectColumn.Field("RowVersion")); + query.Columns.Add(DQSelectColumn.Field("BarCode")); + query.Columns.Add(DQSelectColumn.Field("InStoreTime")); + query.Columns.Add(DQSelectColumn.Field("Store_ID")); + query.Columns.Add(DQSelectColumn.Field("State")); + query.Columns.Add(DQSelectColumn.Field("Delete")); + query.Where.Conditions.Add(DQCondition.And(DQCondition.InEQ("State", 1), DQCondition.EQ("Sync", false))); + query.Range = SelectRange.Top(10); + query.OrderBy.Expressions.Add(DQOrderByExpression.Create("ID")); + + var upload = new List(); + using (var reader = session.ExecuteReader(query)) + { + while (reader.Read()) + { + var obj = new SegmentInStoreObj(); + obj.ID = (long)reader[0]; + obj.RowVersion = (int)reader[1]; + obj.BarCode = (string)reader[2]; + obj.InStoreTime = (DateTime)reader[3]; + obj.Store_ID = (long?)reader[4]; + obj.State = (int)reader[5]; + obj.Delete = (bool)reader[6]; + upload.Add(obj); + } + } + return upload; + } + + static void SetLocalAsSyncd(SegmentInStoreObj obj, IDmoSession session) + { + var update = new DQUpdateDom(typeof(SegmentInStore)); + update.Where.Conditions.Add(DQCondition.And(DQCondition.EQ("ID", obj.ID), DQCondition.EQ("RowVersion", obj.RowVersion))); + update.Columns.Add(new DQUpdateColumn("Sync", true)); + session.ExecuteNonQuery(update); + } + } + + class SegmentInStoreObj + { + [JsonIgnore] + public long ID { get; set; } + + [JsonIgnore] + public long RowVersion { get; set; } + + public string BarCode { get; set; } + + public DateTime InStoreTime { get; set; } + + public long? Store_ID { get; set; } + + public int State { get; set; } + + public bool Delete { get; set; } + } + + class SegmentProductObj + { + public string BarCode { get; set; } + public string Goods_Name { get; set; } + public string Goods_Code { get; set; } + public string Goods_Spec { get; set; } + public decimal? Weight { get; set; } + public DateTime? ProductTime { get; set; } + } +} diff --git a/ButcherFactory.Form/ButcherFactory.Form.csproj b/ButcherFactory.Form/ButcherFactory.Form.csproj index ef8a28a..0bd2f69 100644 --- a/ButcherFactory.Form/ButcherFactory.Form.csproj +++ b/ButcherFactory.Form/ButcherFactory.Form.csproj @@ -134,6 +134,7 @@ SegmentInStoreForm.cs + Form diff --git a/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.Designer.cs b/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.Designer.cs index 4ec4682..7446ad9 100644 --- a/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.Designer.cs +++ b/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.Designer.cs @@ -28,21 +28,783 @@ /// 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 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 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 dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = 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(); + this.panel1 = new System.Windows.Forms.Panel(); + this.netStateWatch1 = new WinFormControl.NetStateWatch(); + this.storeSelect = new System.Windows.Forms.ComboBox(); + this.uLabel3 = new WinFormControl.ULabel(); + this.uScanPanel1 = new WinFormControl.UScanPanel(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.inStoreGrid = new WinFormControl.UDataGridView(); + this.goodsNameLbl = new WinFormControl.ULabel(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.submitBtn = new WinFormControl.NButton(); + this.deleteBtn = new WinFormControl.NButton(); + this.backStoreGrid = new WinFormControl.UDataGridView(); + this.uLabel5 = new WinFormControl.ULabel(); + this.backBtn = new WinFormControl.NButton(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.refreshBtn = new WinFormControl.NButton(); + this.unInstoreGrid = new WinFormControl.UDataGridView(); + this.uLabel6 = new WinFormControl.ULabel(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.exceptionGrid = new WinFormControl.UDataGridView(); + this.E_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.E_RowIndex = new System.Windows.Forms.DataGridViewTextBoxColumn(); + 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_ProductTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.B_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.B_RowIndex = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.B_ShortCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.B_Goods_Code = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.B_Goods_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.B_Goods_Spec = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.B_Weight = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.B_ProductTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.U_RowIndex = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.U_ShortCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.U_Goods_Code = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.U_Goods_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.U_Goods_Spec = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.U_Weight = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.U_ProductTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.panel1.SuspendLayout(); + this.groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.inStoreGrid)).BeginInit(); + this.groupBox2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.backStoreGrid)).BeginInit(); + this.groupBox3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.unInstoreGrid)).BeginInit(); + this.groupBox4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.exceptionGrid)).BeginInit(); this.SuspendLayout(); // + // panel1 + // + this.panel1.Controls.Add(this.netStateWatch1); + this.panel1.Controls.Add(this.storeSelect); + this.panel1.Controls.Add(this.uLabel3); + this.panel1.Controls.Add(this.uScanPanel1); + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(611, 140); + this.panel1.TabIndex = 0; + // + // netStateWatch1 + // + this.netStateWatch1.BackColor = System.Drawing.Color.Transparent; + this.netStateWatch1.Location = new System.Drawing.Point(499, 3); + this.netStateWatch1.Name = "netStateWatch1"; + this.netStateWatch1.Size = new System.Drawing.Size(90, 39); + this.netStateWatch1.TabIndex = 18; + // + // storeSelect + // + this.storeSelect.Font = new System.Drawing.Font("宋体", 15F); + this.storeSelect.FormattingEnabled = true; + this.storeSelect.Location = new System.Drawing.Point(85, 83); + this.storeSelect.Name = "storeSelect"; + this.storeSelect.Size = new System.Drawing.Size(170, 28); + this.storeSelect.TabIndex = 16; + // + // uLabel3 + // + this.uLabel3.AutoSize = true; + this.uLabel3.BackColor = System.Drawing.Color.Transparent; + this.uLabel3.Font = new System.Drawing.Font("宋体", 15F); + this.uLabel3.Location = new System.Drawing.Point(23, 87); + this.uLabel3.Name = "uLabel3"; + this.uLabel3.Size = new System.Drawing.Size(69, 20); + this.uLabel3.TabIndex = 17; + this.uLabel3.Text = "仓库："; + // + // uScanPanel1 + // + this.uScanPanel1.BackColor = System.Drawing.Color.Transparent; + this.uScanPanel1.Location = new System.Drawing.Point(20, 33); + this.uScanPanel1.Name = "uScanPanel1"; + this.uScanPanel1.Size = new System.Drawing.Size(303, 32); + this.uScanPanel1.TabIndex = 9; + // + // groupBox1 + // + this.groupBox1.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.groupBox1.Controls.Add(this.inStoreGrid); + this.groupBox1.Controls.Add(this.goodsNameLbl); + this.groupBox1.Location = new System.Drawing.Point(11, 159); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(600, 434); + this.groupBox1.TabIndex = 1; + this.groupBox1.TabStop = false; + // + // inStoreGrid + // + this.inStoreGrid.AllowUserToAddRows = false; + 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; + 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; + this.inStoreGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.inStoreGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.I_ID, + this.I_RowIndex, + this.I_ShortCode, + this.I_Goods_Code, + this.I_Goods_Name, + this.I_Goods_Spec, + this.I_Weight, + this.I_ProductTime}); + this.inStoreGrid.Location = new System.Drawing.Point(3, 60); + this.inStoreGrid.MultiSelect = false; + 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; + 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; + // + // goodsNameLbl + // + this.goodsNameLbl.AutoSize = true; + this.goodsNameLbl.BackColor = System.Drawing.Color.White; + this.goodsNameLbl.Font = new System.Drawing.Font("宋体", 12F); + this.goodsNameLbl.ForeColor = System.Drawing.SystemColors.ControlText; + this.goodsNameLbl.Location = new System.Drawing.Point(6, 0); + this.goodsNameLbl.Name = "goodsNameLbl"; + this.goodsNameLbl.Size = new System.Drawing.Size(72, 16); + this.goodsNameLbl.TabIndex = 4; + this.goodsNameLbl.Text = "存货名称"; + // + // groupBox2 + // + this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.groupBox2.Controls.Add(this.submitBtn); + this.groupBox2.Controls.Add(this.deleteBtn); + this.groupBox2.Controls.Add(this.backStoreGrid); + this.groupBox2.Controls.Add(this.uLabel5); + this.groupBox2.Controls.Add(this.backBtn); + this.groupBox2.Location = new System.Drawing.Point(631, 159); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(655, 241); + this.groupBox2.TabIndex = 2; + this.groupBox2.TabStop = false; + // + // submitBtn + // + this.submitBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(136)))), ((int)(((byte)(255))))); + this.submitBtn.ClickColor = System.Drawing.Color.YellowGreen; + this.submitBtn.Font = new System.Drawing.Font("宋体", 12F); + this.submitBtn.ForeColor = System.Drawing.Color.White; + this.submitBtn.Location = new System.Drawing.Point(356, 11); + this.submitBtn.Name = "submitBtn"; + this.submitBtn.PlaySound = false; + this.submitBtn.Size = new System.Drawing.Size(95, 45); + this.submitBtn.SoundType = WinFormControl.SoundType.Click; + this.submitBtn.TabIndex = 10; + this.submitBtn.Text = "提交"; + this.submitBtn.ToColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(136)))), ((int)(((byte)(255))))); + this.submitBtn.UseVisualStyleBackColor = false; + this.submitBtn.Click += new System.EventHandler(this.submitBtn_Click); + // + // deleteBtn + // + this.deleteBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(136)))), ((int)(((byte)(255))))); + this.deleteBtn.ClickColor = System.Drawing.Color.YellowGreen; + this.deleteBtn.Font = new System.Drawing.Font("宋体", 12F); + this.deleteBtn.ForeColor = System.Drawing.Color.White; + this.deleteBtn.Location = new System.Drawing.Point(212, 11); + this.deleteBtn.Name = "deleteBtn"; + this.deleteBtn.PlaySound = false; + this.deleteBtn.Size = new System.Drawing.Size(95, 45); + this.deleteBtn.SoundType = WinFormControl.SoundType.Click; + this.deleteBtn.TabIndex = 9; + this.deleteBtn.Text = "删除"; + this.deleteBtn.ToColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(136)))), ((int)(((byte)(255))))); + this.deleteBtn.UseVisualStyleBackColor = false; + this.deleteBtn.Click += new System.EventHandler(this.deleteBtn_Click); + // + // backStoreGrid + // + this.backStoreGrid.AllowUserToAddRows = false; + 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; + 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; + this.backStoreGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.backStoreGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.B_ID, + this.B_RowIndex, + this.B_ShortCode, + this.B_Goods_Code, + this.B_Goods_Name, + this.B_Goods_Spec, + this.B_Weight, + this.B_ProductTime}); + this.backStoreGrid.Dock = System.Windows.Forms.DockStyle.Bottom; + this.backStoreGrid.Location = new System.Drawing.Point(3, 60); + this.backStoreGrid.MultiSelect = false; + 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; + this.backStoreGrid.RowTemplate.Height = 23; + this.backStoreGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.backStoreGrid.Size = new System.Drawing.Size(649, 178); + this.backStoreGrid.TabIndex = 8; + // + // uLabel5 + // + this.uLabel5.AutoSize = true; + this.uLabel5.BackColor = System.Drawing.Color.White; + this.uLabel5.Font = new System.Drawing.Font("宋体", 12F); + this.uLabel5.ForeColor = System.Drawing.SystemColors.ControlText; + this.uLabel5.Location = new System.Drawing.Point(6, 0); + this.uLabel5.Name = "uLabel5"; + this.uLabel5.Size = new System.Drawing.Size(40, 16); + this.uLabel5.TabIndex = 6; + this.uLabel5.Text = "退库"; + // + // backBtn + // + this.backBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(136)))), ((int)(((byte)(255))))); + this.backBtn.ClickColor = System.Drawing.Color.YellowGreen; + this.backBtn.Font = new System.Drawing.Font("宋体", 12F); + this.backBtn.ForeColor = System.Drawing.Color.White; + this.backBtn.Location = new System.Drawing.Point(64, 11); + this.backBtn.Name = "backBtn"; + this.backBtn.PlaySound = false; + this.backBtn.Size = new System.Drawing.Size(95, 45); + this.backBtn.SoundType = WinFormControl.SoundType.Click; + this.backBtn.TabIndex = 0; + this.backBtn.Text = "退库"; + this.backBtn.ToColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(136)))), ((int)(((byte)(255))))); + this.backBtn.UseVisualStyleBackColor = false; + this.backBtn.WithStataHode = true; + this.backBtn.Click += new System.EventHandler(this.backBtn_Click); + // + // groupBox3 + // + this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); + this.groupBox3.Controls.Add(this.refreshBtn); + this.groupBox3.Controls.Add(this.unInstoreGrid); + this.groupBox3.Controls.Add(this.uLabel6); + this.groupBox3.Location = new System.Drawing.Point(631, 421); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(655, 172); + this.groupBox3.TabIndex = 3; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "groupBox3"; + // + // refreshBtn + // + this.refreshBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(136)))), ((int)(((byte)(255))))); + this.refreshBtn.ClickColor = System.Drawing.Color.YellowGreen; + this.refreshBtn.Font = new System.Drawing.Font("宋体", 12F); + this.refreshBtn.ForeColor = System.Drawing.Color.White; + this.refreshBtn.Location = new System.Drawing.Point(122, 11); + this.refreshBtn.Name = "refreshBtn"; + this.refreshBtn.PlaySound = false; + this.refreshBtn.Size = new System.Drawing.Size(95, 45); + this.refreshBtn.SoundType = WinFormControl.SoundType.Click; + this.refreshBtn.TabIndex = 10; + this.refreshBtn.Text = "刷新"; + this.refreshBtn.ToColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(136)))), ((int)(((byte)(255))))); + this.refreshBtn.UseVisualStyleBackColor = false; + this.refreshBtn.Click += new System.EventHandler(this.refreshBtn_Click); + // + // unInstoreGrid + // + this.unInstoreGrid.AllowUserToAddRows = false; + 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; + 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; + this.unInstoreGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.unInstoreGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.dataGridViewTextBoxColumn8, + this.U_RowIndex, + this.U_ShortCode, + this.U_Goods_Code, + this.U_Goods_Name, + this.U_Goods_Spec, + this.U_Weight, + this.U_ProductTime}); + this.unInstoreGrid.Location = new System.Drawing.Point(3, 60); + this.unInstoreGrid.MultiSelect = false; + 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; + this.unInstoreGrid.RowTemplate.Height = 23; + this.unInstoreGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.unInstoreGrid.Size = new System.Drawing.Size(649, 109); + this.unInstoreGrid.TabIndex = 9; + // + // uLabel6 + // + this.uLabel6.AutoSize = true; + this.uLabel6.BackColor = System.Drawing.Color.White; + this.uLabel6.Font = new System.Drawing.Font("宋体", 12F); + this.uLabel6.ForeColor = System.Drawing.SystemColors.ControlText; + this.uLabel6.Location = new System.Drawing.Point(6, 0); + this.uLabel6.Name = "uLabel6"; + this.uLabel6.Size = new System.Drawing.Size(88, 16); + this.uLabel6.TabIndex = 7; + this.uLabel6.Text = "未入库条码"; + // + // groupBox4 + // + this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.groupBox4.Controls.Add(this.exceptionGrid); + this.groupBox4.Controls.Add(this.uLabel4); + this.groupBox4.Location = new System.Drawing.Point(631, 16); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Size = new System.Drawing.Size(655, 124); + this.groupBox4.TabIndex = 4; + this.groupBox4.TabStop = false; + this.groupBox4.Text = "groupBox4"; + // + // exceptionGrid + // + this.exceptionGrid.AllowUserToAddRows = false; + 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; + 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; + this.exceptionGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.exceptionGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.E_ID, + this.E_RowIndex, + this.E_BarCode, + this.E_ExceptionInfo}); + this.exceptionGrid.Dock = System.Windows.Forms.DockStyle.Fill; + this.exceptionGrid.Location = new System.Drawing.Point(3, 17); + this.exceptionGrid.MultiSelect = false; + 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; + this.exceptionGrid.RowTemplate.Height = 23; + this.exceptionGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.exceptionGrid.Size = new System.Drawing.Size(649, 104); + this.exceptionGrid.TabIndex = 9; + // + // E_ID + // + this.E_ID.DataPropertyName = "ID"; + this.E_ID.HeaderText = "ID"; + this.E_ID.Name = "E_ID"; + this.E_ID.ReadOnly = true; + this.E_ID.Visible = false; + // + // E_RowIndex + // + this.E_RowIndex.DataPropertyName = "RowIndex"; + this.E_RowIndex.HeaderText = "序号"; + this.E_RowIndex.Name = "E_RowIndex"; + this.E_RowIndex.ReadOnly = true; + // + // E_BarCode + // + this.E_BarCode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.E_BarCode.DataPropertyName = "BarCode"; + this.E_BarCode.HeaderText = "条码"; + this.E_BarCode.Name = "E_BarCode"; + this.E_BarCode.ReadOnly = true; + // + // E_ExceptionInfo + // + this.E_ExceptionInfo.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.E_ExceptionInfo.DataPropertyName = "ExceptionInfo"; + this.E_ExceptionInfo.HeaderText = "异常信息"; + this.E_ExceptionInfo.Name = "E_ExceptionInfo"; + this.E_ExceptionInfo.ReadOnly = true; + // + // uLabel4 + // + this.uLabel4.AutoSize = true; + this.uLabel4.BackColor = System.Drawing.Color.White; + this.uLabel4.Font = new System.Drawing.Font("宋体", 12F); + this.uLabel4.ForeColor = System.Drawing.SystemColors.ControlText; + this.uLabel4.Location = new System.Drawing.Point(6, -1); + this.uLabel4.Name = "uLabel4"; + this.uLabel4.Size = new System.Drawing.Size(72, 16); + 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 = "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_ProductTime + // + this.I_ProductTime.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells; + this.I_ProductTime.DataPropertyName = "ProductTime"; + dataGridViewCellStyle4.Format = "T"; + dataGridViewCellStyle4.NullValue = null; + this.I_ProductTime.DefaultCellStyle = dataGridViewCellStyle4; + this.I_ProductTime.HeaderText = "生产时间"; + this.I_ProductTime.Name = "I_ProductTime"; + this.I_ProductTime.ReadOnly = true; + this.I_ProductTime.Width = 97; + // + // B_ID + // + this.B_ID.DataPropertyName = "ID"; + this.B_ID.HeaderText = "ID"; + this.B_ID.Name = "B_ID"; + this.B_ID.ReadOnly = true; + this.B_ID.Visible = false; + // + // B_RowIndex + // + this.B_RowIndex.DataPropertyName = "RowIndex"; + this.B_RowIndex.HeaderText = "序号"; + this.B_RowIndex.Name = "B_RowIndex"; + this.B_RowIndex.ReadOnly = true; + this.B_RowIndex.Width = 65; + // + // B_ShortCode + // + this.B_ShortCode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells; + this.B_ShortCode.DataPropertyName = "ShortCode"; + this.B_ShortCode.HeaderText = "条码"; + this.B_ShortCode.Name = "B_ShortCode"; + this.B_ShortCode.ReadOnly = true; + this.B_ShortCode.Width = 65; + // + // B_Goods_Code + // + this.B_Goods_Code.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.B_Goods_Code.DataPropertyName = "Goods_Code"; + this.B_Goods_Code.HeaderText = "产品编号"; + this.B_Goods_Code.Name = "B_Goods_Code"; + this.B_Goods_Code.ReadOnly = true; + // + // B_Goods_Name + // + this.B_Goods_Name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.B_Goods_Name.DataPropertyName = "Goods_Name"; + this.B_Goods_Name.HeaderText = "产品名称"; + this.B_Goods_Name.Name = "B_Goods_Name"; + this.B_Goods_Name.ReadOnly = true; + // + // B_Goods_Spec + // + this.B_Goods_Spec.DataPropertyName = "Goods_Spec"; + this.B_Goods_Spec.HeaderText = "规格"; + this.B_Goods_Spec.Name = "B_Goods_Spec"; + this.B_Goods_Spec.ReadOnly = true; + this.B_Goods_Spec.Width = 70; + // + // B_Weight + // + this.B_Weight.DataPropertyName = "Weight"; + dataGridViewCellStyle8.Format = "#0.######"; + this.B_Weight.DefaultCellStyle = dataGridViewCellStyle8; + this.B_Weight.HeaderText = "重量"; + this.B_Weight.Name = "B_Weight"; + this.B_Weight.ReadOnly = true; + this.B_Weight.Width = 70; + // + // B_ProductTime + // + 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; + this.B_ProductTime.HeaderText = "生产时间"; + this.B_ProductTime.Name = "B_ProductTime"; + this.B_ProductTime.ReadOnly = true; + this.B_ProductTime.Width = 97; + // + // dataGridViewTextBoxColumn8 + // + this.dataGridViewTextBoxColumn8.DataPropertyName = "U_ID"; + this.dataGridViewTextBoxColumn8.HeaderText = "ID"; + this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8"; + this.dataGridViewTextBoxColumn8.ReadOnly = true; + this.dataGridViewTextBoxColumn8.Visible = false; + // + // U_RowIndex + // + this.U_RowIndex.DataPropertyName = "RowIndex"; + this.U_RowIndex.HeaderText = "序号"; + this.U_RowIndex.Name = "U_RowIndex"; + this.U_RowIndex.ReadOnly = true; + this.U_RowIndex.Width = 65; + // + // U_ShortCode + // + this.U_ShortCode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells; + this.U_ShortCode.DataPropertyName = "ShortCode"; + this.U_ShortCode.HeaderText = "条码"; + this.U_ShortCode.Name = "U_ShortCode"; + this.U_ShortCode.ReadOnly = true; + this.U_ShortCode.Width = 65; + // + // U_Goods_Code + // + this.U_Goods_Code.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.U_Goods_Code.DataPropertyName = "Goods_Code"; + this.U_Goods_Code.HeaderText = "产品编号"; + this.U_Goods_Code.Name = "U_Goods_Code"; + this.U_Goods_Code.ReadOnly = true; + // + // U_Goods_Name + // + this.U_Goods_Name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.U_Goods_Name.DataPropertyName = "Goods_Name"; + this.U_Goods_Name.HeaderText = "产品名称"; + this.U_Goods_Name.Name = "U_Goods_Name"; + this.U_Goods_Name.ReadOnly = true; + // + // U_Goods_Spec + // + this.U_Goods_Spec.DataPropertyName = "Goods_Spec"; + this.U_Goods_Spec.HeaderText = "规格"; + this.U_Goods_Spec.Name = "U_Goods_Spec"; + this.U_Goods_Spec.ReadOnly = true; + this.U_Goods_Spec.Width = 70; + // + // U_Weight + // + this.U_Weight.DataPropertyName = "Weight"; + dataGridViewCellStyle13.Format = "#0.######"; + this.U_Weight.DefaultCellStyle = dataGridViewCellStyle13; + this.U_Weight.HeaderText = "重量"; + this.U_Weight.Name = "U_Weight"; + this.U_Weight.ReadOnly = true; + this.U_Weight.Width = 70; + // + // U_ProductTime + // + 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; + this.U_ProductTime.HeaderText = "生产时间"; + this.U_ProductTime.Name = "U_ProductTime"; + this.U_ProductTime.ReadOnly = true; + this.U_ProductTime.Width = 97; + // // SegmentInStoreForm // 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(797, 488); + this.ClientSize = new System.Drawing.Size(1305, 611); + this.Controls.Add(this.groupBox4); + this.Controls.Add(this.panel1); + this.Controls.Add(this.groupBox3); + this.Controls.Add(this.groupBox2); + this.Controls.Add(this.groupBox1); + this.ImeMode = System.Windows.Forms.ImeMode.Disable; + this.KeyPreview = true; this.Name = "SegmentInStoreForm"; this.Text = "扫码入库"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.inStoreGrid)).EndInit(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.backStoreGrid)).EndInit(); + this.groupBox3.ResumeLayout(false); + this.groupBox3.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.unInstoreGrid)).EndInit(); + this.groupBox4.ResumeLayout(false); + this.groupBox4.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.exceptionGrid)).EndInit(); this.ResumeLayout(false); } #endregion + + private System.Windows.Forms.Panel panel1; + private WinFormControl.UScanPanel uScanPanel1; + private System.Windows.Forms.GroupBox groupBox1; + private WinFormControl.ULabel goodsNameLbl; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.GroupBox groupBox3; + private System.Windows.Forms.ComboBox storeSelect; + private WinFormControl.ULabel uLabel3; + private WinFormControl.NetStateWatch netStateWatch1; + private WinFormControl.ULabel uLabel5; + private WinFormControl.ULabel uLabel6; + private System.Windows.Forms.GroupBox groupBox4; + private WinFormControl.ULabel uLabel4; + private WinFormControl.UDataGridView backStoreGrid; + private WinFormControl.UDataGridView exceptionGrid; + private WinFormControl.UDataGridView unInstoreGrid; + private WinFormControl.UDataGridView inStoreGrid; + private WinFormControl.NButton backBtn; + private System.Windows.Forms.DataGridViewTextBoxColumn E_ID; + private System.Windows.Forms.DataGridViewTextBoxColumn E_RowIndex; + private System.Windows.Forms.DataGridViewTextBoxColumn E_BarCode; + private System.Windows.Forms.DataGridViewTextBoxColumn E_ExceptionInfo; + private WinFormControl.NButton submitBtn; + private WinFormControl.NButton deleteBtn; + private WinFormControl.NButton refreshBtn; + private System.Windows.Forms.DataGridViewTextBoxColumn I_ID; + private System.Windows.Forms.DataGridViewTextBoxColumn I_RowIndex; + private System.Windows.Forms.DataGridViewTextBoxColumn I_ShortCode; + private System.Windows.Forms.DataGridViewTextBoxColumn I_Goods_Code; + private System.Windows.Forms.DataGridViewTextBoxColumn I_Goods_Name; + private System.Windows.Forms.DataGridViewTextBoxColumn I_Goods_Spec; + private System.Windows.Forms.DataGridViewTextBoxColumn I_Weight; + private System.Windows.Forms.DataGridViewTextBoxColumn I_ProductTime; + private System.Windows.Forms.DataGridViewTextBoxColumn B_ID; + private System.Windows.Forms.DataGridViewTextBoxColumn B_RowIndex; + private System.Windows.Forms.DataGridViewTextBoxColumn B_ShortCode; + private System.Windows.Forms.DataGridViewTextBoxColumn B_Goods_Code; + private System.Windows.Forms.DataGridViewTextBoxColumn B_Goods_Name; + private System.Windows.Forms.DataGridViewTextBoxColumn B_Goods_Spec; + private System.Windows.Forms.DataGridViewTextBoxColumn B_Weight; + private System.Windows.Forms.DataGridViewTextBoxColumn B_ProductTime; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8; + private System.Windows.Forms.DataGridViewTextBoxColumn U_RowIndex; + private System.Windows.Forms.DataGridViewTextBoxColumn U_ShortCode; + private System.Windows.Forms.DataGridViewTextBoxColumn U_Goods_Code; + private System.Windows.Forms.DataGridViewTextBoxColumn U_Goods_Name; + private System.Windows.Forms.DataGridViewTextBoxColumn U_Goods_Spec; + private System.Windows.Forms.DataGridViewTextBoxColumn U_Weight; + private System.Windows.Forms.DataGridViewTextBoxColumn U_ProductTime; } } \ No newline at end of file diff --git a/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.cs b/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.cs index 4e45a95..c610a48 100644 --- a/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.cs +++ b/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.cs @@ -1,4 +1,5 @@ using ButcherFactory.BO; +using ButcherFactory.BO.Rpcs; using ButcherFactory.BO.Utils; using System; using System.Collections.Generic; @@ -7,13 +8,17 @@ using System.Data; using System.Drawing; using System.Linq; using System.Text; +using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; +using ButcherFactory.Utils; +using ButcherFactory.BO.LocalBL; namespace ButcherFactory.SegmentInStore_ { public partial class SegmentInStoreForm : Form, IWithRoleForm { + #region IWithRoleForm public List RoleName { get { return new List { (short)设备类别.扫码入库 }; } @@ -23,10 +28,178 @@ namespace ButcherFactory.SegmentInStore_ { return this; } + #endregion + + Thread uploadData; + BindingList inStoreList; + BindingList unInstoreList; + BindingList exceptionList; + BindingList backStoreList; + long? storeID; + bool isBack = false; public SegmentInStoreForm() { InitializeComponent(); + netStateWatch1.GetConnectState = () => LoginUtil.TestConnection(500); + uScanPanel1.AfterScan += uScanPanel1_AfterScan; + this.FormClosing += delegate + { + if (uploadData != null && uploadData.IsAlive) + uploadData.Abort(); + }; + + storeSelect.SelectedIndexChanged += delegate + { + if (storeSelect.SelectedValue == null) + storeID = null; + else + storeID = (long)storeSelect.SelectedValue; + XmlUtil.SerializerObjToFile(new SegmentInStoreFormConfig { StoreID = storeID }); + }; + } + + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + var initTask = new Thread(LoadBind); + initTask.Start(); + uploadData = new Thread(UpLoadLocalData); + uploadData.Start(); + } + + private void LoadBind() + { + this.Invoke(new Action(() => + { + if (netStateWatch1.NetState) + { + BaseInfoSyncRpc.SyncBaseInfo(); + BaseInfoSyncRpc.SyncBaseInfo(); + BaseInfoSyncRpc.SyncBaseInfo(); + } + var config = XmlUtil.DeserializeFromFile(); + storeSelect.EBindComboBox(x => x.ID == config.StoreID); + BindInStoreGrid(); + BindExceptionGrid(); + BindBackGrid(); + BindUnInStoreGrid(); + })); + } + + private void BindInStoreGrid() + { + inStoreList = SegmentInStoreBL.GetInStoreByStateList(0); + inStoreGrid.DataSource = inStoreList; + inStoreGrid.Refresh(); + } + + private void BindExceptionGrid() + { + exceptionList = SegmentInStoreBL.GetExceptionList(); + exceptionGrid.DataSource = exceptionList; + exceptionGrid.Refresh(); + } + + private void BindBackGrid() + { + backStoreList = SegmentInStoreBL.GetInStoreByStateList(1); + backStoreGrid.DataSource = backStoreList; + backStoreGrid.Refresh(); + } + + private void BindUnInStoreGrid() + { + unInstoreList = SegmentInStoreBL.GetUnInStoreList(); + if (unInstoreList == null) + unInstoreList = new BindingList(); + unInstoreGrid.DataSource = unInstoreList; + unInstoreGrid.Refresh(); + } + + private void UpLoadLocalData() + { + while (true) + { + if (this.IsHandleCreated) + { + this.Invoke(new Action(() => + { + if (netStateWatch1.NetState) + SegmentInStoreBL.UploadSegmentInstoreInfo(); + })); + } + Thread.Sleep(2000); + } + } + + private void uScanPanel1_AfterScan() + { + if (isBack) + { + var idx = backStoreList.Any() ? backStoreList.Last().RowIndex.Value : 0; + SegmentInStoreBL.SetAsBacking(uScanPanel1.TextBox.Text, idx + 1); + BindBackGrid(); + var fir = inStoreList.FirstOrDefault(x => x.BarCode == uScanPanel1.TextBox.Text); + if (fir != null) + { + inStoreList.Remove(fir); + inStoreGrid.Refresh(); + } + } + else + { + var idx = inStoreList.Any() ? inStoreList.Last().RowIndex.Value : 0; + var entity = SegmentInStoreBL.InsertInStore(uScanPanel1.TextBox.Text, storeID, idx + 1); + inStoreList.Insert(0, entity); + if (inStoreList.Count >= 30) + inStoreList.RemoveAt(30); + inStoreGrid.Refresh(); + var f = unInstoreList.FirstOrDefault(x => x.BarCode == entity.BarCode); + if (f != null) + { + unInstoreList.Remove(f); + unInstoreGrid.Refresh(); + } + } + uScanPanel1.TextBox.Clear(); + } + + private void backBtn_Click(object sender, EventArgs e) + { + isBack = !isBack; + backBtn.Text = isBack ? "等待退库" : "退库"; + } + + private void deleteBtn_Click(object sender, EventArgs e) + { + if (MessageBox.Show("确定删除该入库信息？", "删除确认", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) != DialogResult.OK) + return; + if (backStoreGrid.CurrentRow == null) + return; + var id = (long)backStoreGrid.CurrentRow.Cells["B_ID"].Value; + SegmentInStoreBL.Delete(id); + var tag = backStoreList.First(x => x.ID == id); + backStoreList.Remove(tag); + backStoreGrid.Refresh(); + tag.RowIndex = unInstoreList.Any() ? unInstoreList.Last().RowIndex + 1 : 1; + unInstoreList.Add(tag); + unInstoreGrid.Refresh(); + } + + private void submitBtn_Click(object sender, EventArgs e) + { + if (backStoreList.Count == 0) + return; + var ids = backStoreList.Select(x => x.ID); + SegmentInStoreBL.SubmitBackStore(ids); + backStoreList.Clear(); + backStoreGrid.Refresh(); + } + + private void refreshBtn_Click(object sender, EventArgs e) + { + BindUnInStoreGrid(); } } } diff --git a/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.resx b/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.resx index 1af7de1..f29c23f 100644 --- a/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.resx +++ b/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.resx @@ -117,4 +117,34 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + \ No newline at end of file diff --git a/ButcherFactory.Form/SegmentInStore_/SegmentInStoreFormConfig.cs b/ButcherFactory.Form/SegmentInStore_/SegmentInStoreFormConfig.cs new file mode 100644 index 0000000..1a445e1 --- /dev/null +++ b/ButcherFactory.Form/SegmentInStore_/SegmentInStoreFormConfig.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ButcherFactory.SegmentInStore_ +{ + public class SegmentInStoreFormConfig + { + public long? StoreID { get; set; } + } +} diff --git a/ButcherFactory.Form/SegmentProduction_/SegmentProductionForm.Designer.cs b/ButcherFactory.Form/SegmentProduction_/SegmentProductionForm.Designer.cs index c4f59f5..178b5d0 100644 --- a/ButcherFactory.Form/SegmentProduction_/SegmentProductionForm.Designer.cs +++ b/ButcherFactory.Form/SegmentProduction_/SegmentProductionForm.Designer.cs @@ -47,7 +47,6 @@ this.workUnitSelect = new System.Windows.Forms.ComboBox(); this.uLabel1 = new WinFormControl.ULabel(); this.uLabel2 = new WinFormControl.ULabel(); - this.netStateWatch1 = new WinFormControl.NetStateWatch(); this.uWeightControl1 = new WinFormControl.UWeightControl(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.submitBtn = new WinFormControl.UButton(); @@ -75,6 +74,7 @@ this.endBtn = new WinFormControl.UButton(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.startBtn = new WinFormControl.UButton(); + this.netStateWatch1 = new WinFormControl.NetStateWatch(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -209,14 +209,6 @@ this.uLabel2.TabIndex = 13; this.uLabel2.Text = "生产批次："; // - // netStateWatch1 - // - this.netStateWatch1.BackColor = System.Drawing.Color.Transparent; - this.netStateWatch1.Location = new System.Drawing.Point(359, 2); - this.netStateWatch1.Name = "netStateWatch1"; - this.netStateWatch1.Size = new System.Drawing.Size(90, 39); - this.netStateWatch1.TabIndex = 1; - // // uWeightControl1 // this.uWeightControl1.BackColor = System.Drawing.Color.Transparent; @@ -655,6 +647,14 @@ this.startBtn.WithStataHode = false; this.startBtn.Click += new System.EventHandler(this.startBtn_Click); // + // netStateWatch1 + // + this.netStateWatch1.BackColor = System.Drawing.Color.Transparent; + this.netStateWatch1.Location = new System.Drawing.Point(359, 2); + this.netStateWatch1.Name = "netStateWatch1"; + this.netStateWatch1.Size = new System.Drawing.Size(90, 39); + this.netStateWatch1.TabIndex = 1; + // // SegmentProductionForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -687,7 +687,6 @@ #endregion private System.Windows.Forms.SplitContainer splitContainer1; - private WinFormControl.NetStateWatch netStateWatch1; private WinFormControl.UWeightControl uWeightControl1; private WinFormControl.UButton closeBtn; private WinFormControl.UTimerLabel uTimerLabel1; @@ -722,5 +721,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn H_BarCode; private System.Windows.Forms.DataGridViewTextBoxColumn H_Goods_Name; private System.Windows.Forms.DataGridViewTextBoxColumn H_Weight; + private WinFormControl.NetStateWatch netStateWatch1; } } \ No newline at end of file diff --git a/ButcherFactory.Login/Login.xaml.cs b/ButcherFactory.Login/Login.xaml.cs index f26738d..6347659 100644 --- a/ButcherFactory.Login/Login.xaml.cs +++ b/ButcherFactory.Login/Login.xaml.cs @@ -16,7 +16,7 @@ namespace ButcherFactory.Login { InitializeComponent(); #if DEBUG - pwdInput.Password = "bwp2017"; + pwdInput.Password = "123"; #endif try diff --git a/SelfHelpClient/CarPaperPrint.html b/SelfHelpClient/CarPaperPrint.html new file mode 100644 index 0000000..185be6a --- /dev/null +++ b/SelfHelpClient/CarPaperPrint.html @@ -0,0 +1,27 @@ + + + + + + + 洗车票打印 + + + + + + + +
车牌号京A88888
司机张三三
规格大
费用25元
+ + \ No newline at end of file diff --git a/SelfHelpClient/SelfHelpClient.csproj b/SelfHelpClient/SelfHelpClient.csproj index f9f6024..31a818e 100644 --- a/SelfHelpClient/SelfHelpClient.csproj +++ b/SelfHelpClient/SelfHelpClient.csproj @@ -138,6 +138,9 @@ True + + +