diff --git a/B3ButcherManageClient.sln b/B3ButcherManageClient.sln index fff9f88..15ec306 100644 --- a/B3ButcherManageClient.sln +++ b/B3ButcherManageClient.sln @@ -17,6 +17,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QualityAndOrder", "QualityA EndProject Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{69447304-329D-448B-A6D4-342B9FBAD15D}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WeighAndGrading", "WeighAndGrading\WeighAndGrading.csproj", "{BFC366E2-994C-433F-9EE2-5377DBA9D948}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -49,6 +51,10 @@ Global {0C26ABF1-A45D-4107-ADC8-0235BCD18043}.Release|Any CPU.Build.0 = Release|Any CPU {69447304-329D-448B-A6D4-342B9FBAD15D}.Debug|Any CPU.ActiveCfg = Debug {69447304-329D-448B-A6D4-342B9FBAD15D}.Release|Any CPU.ActiveCfg = Release + {BFC366E2-994C-433F-9EE2-5377DBA9D948}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BFC366E2-994C-433F-9EE2-5377DBA9D948}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BFC366E2-994C-433F-9EE2-5377DBA9D948}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BFC366E2-994C-433F-9EE2-5377DBA9D948}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/BO/Utils/AfterLoginUtil.cs b/BO/Utils/AfterLoginUtil.cs index 3ac68e7..81aa178 100644 --- a/BO/Utils/AfterLoginUtil.cs +++ b/BO/Utils/AfterLoginUtil.cs @@ -36,10 +36,10 @@ namespace BO.Utils if (first == null) throw new Exception("未注册的角色"); //#if debug - var filePath = string.Format("{0}.dll", first.Item2); + var filePath = string.Format("{0}.dll", first.Item2); //#endif //#if !debug - // var filePath = Path.Combine(Application.StartupPath, string.Format("{0}.dll", first.Item2)); + //var filePath = Path.Combine(Application.StartupPath, string.Format("{0}.dll", first.Item2)); //#endif if (!File.Exists(filePath)) throw new Exception("相关模块不存在"); diff --git a/ButcherOrder - 副本/App.config b/ButcherOrder - 副本/App.config deleted file mode 100644 index 8e15646..0000000 --- a/ButcherOrder - 副本/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ButcherOrder - 副本/AppContext.cs b/ButcherOrder - 副本/AppContext.cs deleted file mode 100644 index cf88185..0000000 --- a/ButcherOrder - 副本/AppContext.cs +++ /dev/null @@ -1,61 +0,0 @@ -//using BO.Utils; -//using System; -//using System.Collections.Generic; -//using System.IO; -//using System.Linq; -//using System.Text; -//using System.Threading.Tasks; -//using System.Windows.Forms; - -//namespace ButcherOrder -//{ -// public class AppContext -// { -// private static string loginConfigPath = Application.StartupPath + "\\Config.xml"; -// public ServerUrlConfig UrlConfig -// { -// get; -// set; -// } - -// public LoginUserInfo UserConfig -// { -// get; -// set; -// } - -// private AppContext() -// { -// UrlConfig = new ServerUrlConfig(); -// UserConfig = new LoginUserInfo(); -// } - -// public static AppContext Context -// { -// get -// { -// if (_appContext == null) -// _appContext = CreateAppContext(); -// return _appContext; -// } -// } - -// private static AppContext _appContext; -// static AppContext CreateAppContext() -// { -// var config = new AppContext(); -// if (!File.Exists(loginConfigPath)) -// { -// XmlUtil.SerializerObjToFile(config, loginConfigPath); -// } -// else -// config = XmlUtil.DeserializeFromFile(loginConfigPath); -// return config; -// } - -// public void Save() -// { -// XmlUtil.SerializerObjToFile(_appContext, loginConfigPath); -// } -// } -//} diff --git a/ButcherOrder - 副本/ButcherOrder.csproj b/ButcherOrder - 副本/ButcherOrder.csproj deleted file mode 100644 index 4009e6f..0000000 --- a/ButcherOrder - 副本/ButcherOrder.csproj +++ /dev/null @@ -1,114 +0,0 @@ - - - - - Debug - AnyCPU - {2D425E5E-A44F-4781-8F7A-9CDDB8431684} - WinExe - Properties - ButcherOrder - ButcherOrder - v4.5 - 512 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - False - D:\BwpB3Project\tsref\Debug\Forks.EnterpriseServices.dll - - - False - ..\..\..\..\BwpB3Project\tsref\Debug\Forks.JsonRpc.Client.dll - - - False - D:\BwpB3Project\tsref\Debug\Forks.Utils.dll - - - - - - - - - - - - - - - - - - - - Form - - - ButcherOrderForm.cs - - - - ButcherOrderForm.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - - - {8968f14a-c7c7-4751-96ce-b114fbfd65ef} - BO - - - {A782B23E-BE6D-4F51-B5CB-5CD259BA97CC} - BWP.WinFormControl - - - - - \ No newline at end of file diff --git a/ButcherOrder - 副本/ButcherOrderForm.Designer.cs b/ButcherOrder - 副本/ButcherOrderForm.Designer.cs deleted file mode 100644 index 71385bb..0000000 --- a/ButcherOrder - 副本/ButcherOrderForm.Designer.cs +++ /dev/null @@ -1,63 +0,0 @@ -namespace ButcherOrder -{ - partial class ButcherOrderForm - { - /// - /// 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.SuspendLayout(); - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("宋体", 18F); - this.label1.Location = new System.Drawing.Point(20, 24); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(130, 24); - this.label1.TabIndex = 0; - this.label1.Text = "宰杀日期："; - // - // ButcherOrderForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1020, 690); - this.Controls.Add(this.label1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.MaximizeBox = false; - this.Name = "ButcherOrderForm"; - this.Text = "排宰挑选"; - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.Label label1; - } -} \ No newline at end of file diff --git a/ButcherOrder - 副本/ButcherOrderForm.cs b/ButcherOrder - 副本/ButcherOrderForm.cs deleted file mode 100644 index 0582b6c..0000000 --- a/ButcherOrder - 副本/ButcherOrderForm.cs +++ /dev/null @@ -1,20 +0,0 @@ -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; - -namespace ButcherOrder -{ - public partial class ButcherOrderForm : Form - { - public ButcherOrderForm() - { - InitializeComponent(); - } - } -} diff --git a/ButcherOrder - 副本/Properties/AssemblyInfo.cs b/ButcherOrder - 副本/Properties/AssemblyInfo.cs deleted file mode 100644 index 6b76d40..0000000 --- a/ButcherOrder - 副本/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 有关程序集的常规信息通过以下 -// 特性集控制。更改这些特性值可修改 -// 与程序集关联的信息。 -[assembly: AssemblyTitle("ButcherOrder")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ButcherOrder")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// 将 ComVisible 设置为 false 使此程序集中的类型 -// 对 COM 组件不可见。 如果需要从 COM 访问此程序集中的类型， -// 则将该类型上的 ComVisible 特性设置为 true。 -[assembly: ComVisible(false)] - -// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID -[assembly: Guid("304dabe0-ecb3-451b-b97a-ad824562b183")] - -// 程序集的版本信息由下面四个值组成: -// -// 主版本 -// 次版本 -// 生成号 -// 修订号 -// -// 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， -// 方法是按如下所示使用“*”: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/ButcherOrder - 副本/Properties/Resources.Designer.cs b/ButcherOrder - 副本/Properties/Resources.Designer.cs deleted file mode 100644 index 2f724d1..0000000 --- a/ButcherOrder - 副本/Properties/Resources.Designer.cs +++ /dev/null @@ -1,71 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// 运行时版本: 4.0.30319.42000 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将丢失。 -// -//------------------------------------------------------------------------------ - -namespace ButcherOrder.Properties -{ - - - /// - /// 一个强类型的资源类，用于查找本地化的字符串等。 - /// - // 此类是由 StronglyTypedResourceBuilder - // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 - // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen - // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { - } - - /// - /// 返回此类使用的、缓存的 ResourceManager 实例。 - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ButcherOrder.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// 为所有资源查找重写当前线程的 CurrentUICulture 属性， - /// 方法是使用此强类型资源类。 - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - } -} diff --git a/ButcherOrder - 副本/Properties/Resources.resx b/ButcherOrder - 副本/Properties/Resources.resx deleted file mode 100644 index af7dbeb..0000000 --- a/ButcherOrder - 副本/Properties/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/ButcherOrder - 副本/Properties/Settings.Designer.cs b/ButcherOrder - 副本/Properties/Settings.Designer.cs deleted file mode 100644 index 2d01d37..0000000 --- a/ButcherOrder - 副本/Properties/Settings.Designer.cs +++ /dev/null @@ -1,30 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace ButcherOrder.Properties -{ - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { - return defaultInstance; - } - } - } -} diff --git a/ButcherOrder - 副本/Properties/Settings.settings b/ButcherOrder - 副本/Properties/Settings.settings deleted file mode 100644 index 3964565..0000000 --- a/ButcherOrder - 副本/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/ButcherOrder/ButcherOrderForm.resx b/ButcherOrder/ButcherOrderForm.resx index 0df345f..ffc4c55 100644 --- a/ButcherOrder/ButcherOrderForm.resx +++ b/ButcherOrder/ButcherOrderForm.resx @@ -117,6 +117,39 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True @@ -141,4 +174,7 @@ True + + True + \ No newline at end of file diff --git a/ButcherWeight/WeightContext.cs b/ButcherWeight/WeightContext.cs index b8eb3de..71758d7 100644 --- a/ButcherWeight/WeightContext.cs +++ b/ButcherWeight/WeightContext.cs @@ -15,7 +15,7 @@ namespace ButcherWeight private static string loginConfigPath = @"C:\B3Service\src\B3ButcherManageClient\ButcherManageClient\bin\Debug\WeightSetting.xml"; //#endif //#if !debug - // private static string loginConfigPath = Application.StartupPath + "\\WeightSetting.xml"; + // private static string loginConfigPath = Application.StartupPath + "\\WeightSetting.xml"; //#endif private static WeightSetting _config; public static WeightSetting Config diff --git a/ButcherWeight/WeightForm.Designer.cs b/ButcherWeight/WeightForm.Designer.cs index 0082a7f..6c7bd78 100644 --- a/ButcherWeight/WeightForm.Designer.cs +++ b/ButcherWeight/WeightForm.Designer.cs @@ -91,13 +91,6 @@ this.panel3 = new System.Windows.Forms.Panel(); this.farmerSelect = new BWP.WinFormControl.UComboBox(); this.farmerGrid = new System.Windows.Forms.DataGridView(); - this.F_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.F_B3ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.F_WeightBill_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.F_Farmer_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.F_Index = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.F_Farmer_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.F_Number = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.label3 = new System.Windows.Forms.Label(); this.label18 = new System.Windows.Forms.Label(); this.weightGrid = new System.Windows.Forms.DataGridView(); @@ -128,6 +121,16 @@ this.S_AbnormalItem_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.S_Number = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.billGrid = new System.Windows.Forms.DataGridView(); + this.M_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.M_B3ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.M_Car_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.M_Supplier_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.M_Employee_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.M_PurchaseType_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.M_Number = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.M_Weight = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.M_HouseNames = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.M_SanctionNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.label15 = new System.Windows.Forms.Label(); this.label16 = new System.Windows.Forms.Label(); this.label17 = new System.Windows.Forms.Label(); @@ -139,16 +142,14 @@ this.qSupplierSelect = new BWP.WinFormControl.UComboBox(); this.label5 = new System.Windows.Forms.Label(); this.queryBtn = new System.Windows.Forms.Button(); - this.M_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.M_B3ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.M_Car_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.M_Supplier_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.M_Employee_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.M_PurchaseType_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.M_Number = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.M_Weight = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.M_HouseNames = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.M_SanctionNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.F_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.F_B3ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.F_WeightBill_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.F_Farmer_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.F_Index = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.F_Farmer_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.F_Number = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.F_Weight = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); this.panel3.SuspendLayout(); @@ -723,7 +724,8 @@ this.F_Farmer_ID, this.F_Index, this.F_Farmer_Name, - this.F_Number}); + this.F_Number, + this.F_Weight}); this.farmerGrid.Location = new System.Drawing.Point(0, 124); this.farmerGrid.MultiSelect = false; this.farmerGrid.Name = "farmerGrid"; @@ -735,57 +737,6 @@ this.farmerGrid.Size = new System.Drawing.Size(400, 112); this.farmerGrid.TabIndex = 8; // - // F_ID - // - this.F_ID.DataPropertyName = "ID"; - this.F_ID.HeaderText = "ID"; - this.F_ID.Name = "F_ID"; - this.F_ID.Visible = false; - // - // F_B3ID - // - this.F_B3ID.DataPropertyName = "B3ID"; - this.F_B3ID.HeaderText = "B3ID"; - this.F_B3ID.Name = "F_B3ID"; - this.F_B3ID.Visible = false; - // - // F_WeightBill_ID - // - this.F_WeightBill_ID.DataPropertyName = "WeightBill_ID"; - this.F_WeightBill_ID.HeaderText = "WeightBill_ID"; - this.F_WeightBill_ID.Name = "F_WeightBill_ID"; - this.F_WeightBill_ID.Visible = false; - // - // F_Farmer_ID - // - this.F_Farmer_ID.DataPropertyName = "Farmer_ID"; - this.F_Farmer_ID.HeaderText = "Farmer_ID"; - this.F_Farmer_ID.Name = "F_Farmer_ID"; - this.F_Farmer_ID.Visible = false; - // - // F_Index - // - this.F_Index.DataPropertyName = "Index"; - this.F_Index.HeaderText = "序号"; - this.F_Index.Name = "F_Index"; - this.F_Index.ReadOnly = true; - this.F_Index.Width = 80; - // - // F_Farmer_Name - // - this.F_Farmer_Name.DataPropertyName = "Farmer_Name"; - this.F_Farmer_Name.HeaderText = "养殖户"; - this.F_Farmer_Name.Name = "F_Farmer_Name"; - this.F_Farmer_Name.ReadOnly = true; - this.F_Farmer_Name.Width = 150; - // - // F_Number - // - this.F_Number.DataPropertyName = "Number"; - this.F_Number.HeaderText = "头数"; - this.F_Number.Name = "F_Number"; - this.F_Number.Width = 130; - // // label3 // this.label3.AutoSize = true; @@ -1142,6 +1093,84 @@ this.billGrid.TabIndex = 0; this.billGrid.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.billGrid_CellDoubleClick); // + // M_ID + // + this.M_ID.DataPropertyName = "ID"; + this.M_ID.HeaderText = "ID"; + this.M_ID.Name = "M_ID"; + this.M_ID.ReadOnly = true; + this.M_ID.Visible = false; + // + // M_B3ID + // + this.M_B3ID.DataPropertyName = "B3ID"; + this.M_B3ID.HeaderText = "过磅单号"; + this.M_B3ID.Name = "M_B3ID"; + this.M_B3ID.ReadOnly = true; + // + // M_Car_Name + // + this.M_Car_Name.DataPropertyName = "Car_Name"; + this.M_Car_Name.HeaderText = "车辆"; + this.M_Car_Name.Name = "M_Car_Name"; + this.M_Car_Name.ReadOnly = true; + this.M_Car_Name.Width = 120; + // + // M_Supplier_Name + // + this.M_Supplier_Name.DataPropertyName = "Supplier_Name"; + this.M_Supplier_Name.HeaderText = "供应商"; + this.M_Supplier_Name.Name = "M_Supplier_Name"; + this.M_Supplier_Name.ReadOnly = true; + this.M_Supplier_Name.Width = 120; + // + // M_Employee_Name + // + this.M_Employee_Name.DataPropertyName = "Employee_Name"; + this.M_Employee_Name.HeaderText = "业务员"; + this.M_Employee_Name.Name = "M_Employee_Name"; + this.M_Employee_Name.ReadOnly = true; + this.M_Employee_Name.Width = 120; + // + // M_PurchaseType_Name + // + this.M_PurchaseType_Name.DataPropertyName = "PurchaseType_Name"; + this.M_PurchaseType_Name.HeaderText = "收购类型"; + this.M_PurchaseType_Name.Name = "M_PurchaseType_Name"; + this.M_PurchaseType_Name.ReadOnly = true; + this.M_PurchaseType_Name.Width = 120; + // + // M_Number + // + this.M_Number.DataPropertyName = "Number"; + this.M_Number.HeaderText = "收购头数"; + this.M_Number.Name = "M_Number"; + this.M_Number.ReadOnly = true; + this.M_Number.Width = 120; + // + // M_Weight + // + this.M_Weight.DataPropertyName = "Weight"; + this.M_Weight.HeaderText = "收购重量"; + this.M_Weight.Name = "M_Weight"; + this.M_Weight.ReadOnly = true; + this.M_Weight.Width = 120; + // + // M_HouseNames + // + this.M_HouseNames.DataPropertyName = "HouseNames"; + this.M_HouseNames.HeaderText = "圈舍"; + this.M_HouseNames.Name = "M_HouseNames"; + this.M_HouseNames.ReadOnly = true; + this.M_HouseNames.Width = 180; + // + // M_SanctionNumber + // + this.M_SanctionNumber.DataPropertyName = "SanctionNumber"; + this.M_SanctionNumber.HeaderText = "异常明细"; + this.M_SanctionNumber.Name = "M_SanctionNumber"; + this.M_SanctionNumber.ReadOnly = true; + // // label15 // this.label15.AutoSize = true; @@ -1252,83 +1281,62 @@ this.queryBtn.UseVisualStyleBackColor = true; this.queryBtn.Click += new System.EventHandler(this.queryBtn_Click); // - // M_ID - // - this.M_ID.DataPropertyName = "ID"; - this.M_ID.HeaderText = "ID"; - this.M_ID.Name = "M_ID"; - this.M_ID.ReadOnly = true; - this.M_ID.Visible = false; - // - // M_B3ID - // - this.M_B3ID.DataPropertyName = "B3ID"; - this.M_B3ID.HeaderText = "过磅单号"; - this.M_B3ID.Name = "M_B3ID"; - this.M_B3ID.ReadOnly = true; - // - // M_Car_Name + // F_ID // - this.M_Car_Name.DataPropertyName = "Car_Name"; - this.M_Car_Name.HeaderText = "车辆"; - this.M_Car_Name.Name = "M_Car_Name"; - this.M_Car_Name.ReadOnly = true; - this.M_Car_Name.Width = 120; + this.F_ID.DataPropertyName = "ID"; + this.F_ID.HeaderText = "ID"; + this.F_ID.Name = "F_ID"; + this.F_ID.Visible = false; // - // M_Supplier_Name + // F_B3ID // - this.M_Supplier_Name.DataPropertyName = "Supplier_Name"; - this.M_Supplier_Name.HeaderText = "供应商"; - this.M_Supplier_Name.Name = "M_Supplier_Name"; - this.M_Supplier_Name.ReadOnly = true; - this.M_Supplier_Name.Width = 120; + this.F_B3ID.DataPropertyName = "B3ID"; + this.F_B3ID.HeaderText = "B3ID"; + this.F_B3ID.Name = "F_B3ID"; + this.F_B3ID.Visible = false; // - // M_Employee_Name + // F_WeightBill_ID // - this.M_Employee_Name.DataPropertyName = "Employee_Name"; - this.M_Employee_Name.HeaderText = "业务员"; - this.M_Employee_Name.Name = "M_Employee_Name"; - this.M_Employee_Name.ReadOnly = true; - this.M_Employee_Name.Width = 120; + this.F_WeightBill_ID.DataPropertyName = "WeightBill_ID"; + this.F_WeightBill_ID.HeaderText = "WeightBill_ID"; + this.F_WeightBill_ID.Name = "F_WeightBill_ID"; + this.F_WeightBill_ID.Visible = false; // - // M_PurchaseType_Name + // F_Farmer_ID // - this.M_PurchaseType_Name.DataPropertyName = "PurchaseType_Name"; - this.M_PurchaseType_Name.HeaderText = "收购类型"; - this.M_PurchaseType_Name.Name = "M_PurchaseType_Name"; - this.M_PurchaseType_Name.ReadOnly = true; - this.M_PurchaseType_Name.Width = 120; + this.F_Farmer_ID.DataPropertyName = "Farmer_ID"; + this.F_Farmer_ID.HeaderText = "Farmer_ID"; + this.F_Farmer_ID.Name = "F_Farmer_ID"; + this.F_Farmer_ID.Visible = false; // - // M_Number + // F_Index // - this.M_Number.DataPropertyName = "Number"; - this.M_Number.HeaderText = "收购头数"; - this.M_Number.Name = "M_Number"; - this.M_Number.ReadOnly = true; - this.M_Number.Width = 120; + this.F_Index.DataPropertyName = "Index"; + this.F_Index.HeaderText = "序号"; + this.F_Index.Name = "F_Index"; + this.F_Index.ReadOnly = true; + this.F_Index.Width = 80; // - // M_Weight + // F_Farmer_Name // - this.M_Weight.DataPropertyName = "Weight"; - this.M_Weight.HeaderText = "收购重量"; - this.M_Weight.Name = "M_Weight"; - this.M_Weight.ReadOnly = true; - this.M_Weight.Width = 120; + this.F_Farmer_Name.DataPropertyName = "Farmer_Name"; + this.F_Farmer_Name.HeaderText = "养殖户"; + this.F_Farmer_Name.Name = "F_Farmer_Name"; + this.F_Farmer_Name.ReadOnly = true; + this.F_Farmer_Name.Width = 120; // - // M_HouseNames + // F_Number // - this.M_HouseNames.DataPropertyName = "HouseNames"; - this.M_HouseNames.HeaderText = "圈舍"; - this.M_HouseNames.Name = "M_HouseNames"; - this.M_HouseNames.ReadOnly = true; - this.M_HouseNames.Width = 180; + this.F_Number.DataPropertyName = "Number"; + this.F_Number.HeaderText = "头数"; + this.F_Number.Name = "F_Number"; + this.F_Number.Width = 80; // - // M_SanctionNumber + // F_Weight // - this.M_SanctionNumber.DataPropertyName = "SanctionNumber"; - this.M_SanctionNumber.HeaderText = "异常明细"; - this.M_SanctionNumber.Name = "M_SanctionNumber"; - this.M_SanctionNumber.ReadOnly = true; + this.F_Weight.DataPropertyName = "Weight"; + this.F_Weight.HeaderText = "重量"; + this.F_Weight.Name = "F_Weight"; // // WeightForm // @@ -1426,13 +1434,6 @@ private System.Windows.Forms.Label label1; private BWP.WinFormControl.UComboBox farmerSelect; private System.Windows.Forms.Label label3; - private System.Windows.Forms.DataGridViewTextBoxColumn F_ID; - private System.Windows.Forms.DataGridViewTextBoxColumn F_B3ID; - private System.Windows.Forms.DataGridViewTextBoxColumn F_WeightBill_ID; - private System.Windows.Forms.DataGridViewTextBoxColumn F_Farmer_ID; - private System.Windows.Forms.DataGridViewTextBoxColumn F_Index; - private System.Windows.Forms.DataGridViewTextBoxColumn F_Farmer_Name; - private System.Windows.Forms.DataGridViewTextBoxColumn F_Number; private System.Windows.Forms.DataGridViewTextBoxColumn D_ID; private System.Windows.Forms.DataGridViewTextBoxColumn D_B3ID; private System.Windows.Forms.DataGridViewTextBoxColumn D_WeightBill_ID; @@ -1480,5 +1481,13 @@ private System.Windows.Forms.DataGridViewTextBoxColumn M_Weight; private System.Windows.Forms.DataGridViewTextBoxColumn M_HouseNames; private System.Windows.Forms.DataGridViewTextBoxColumn M_SanctionNumber; + private System.Windows.Forms.DataGridViewTextBoxColumn F_ID; + private System.Windows.Forms.DataGridViewTextBoxColumn F_B3ID; + private System.Windows.Forms.DataGridViewTextBoxColumn F_WeightBill_ID; + private System.Windows.Forms.DataGridViewTextBoxColumn F_Farmer_ID; + private System.Windows.Forms.DataGridViewTextBoxColumn F_Index; + private System.Windows.Forms.DataGridViewTextBoxColumn F_Farmer_Name; + private System.Windows.Forms.DataGridViewTextBoxColumn F_Number; + private System.Windows.Forms.DataGridViewTextBoxColumn F_Weight; } } \ No newline at end of file diff --git a/ButcherWeight/WeightForm.resx b/ButcherWeight/WeightForm.resx index cccc1f0..643b2c6 100644 --- a/ButcherWeight/WeightForm.resx +++ b/ButcherWeight/WeightForm.resx @@ -138,6 +138,9 @@ True + + True + True diff --git a/QualityAndOrder/QualityOrderForm.cs b/QualityAndOrder/QualityOrderForm.cs index 0c85772..a600fd4 100644 --- a/QualityAndOrder/QualityOrderForm.cs +++ b/QualityAndOrder/QualityOrderForm.cs @@ -473,7 +473,7 @@ namespace QualityAndOrder { var id = Convert.ToInt64(weightBillGrid.CurrentRow.Cells["W_ID"].Value); var entity = WeightBillRpc.GetWeightBillOnHousePage(id); - numberBox.Text = string.Format("{0}", entity.FirstWeightNumber); + numberBox.Text = string.Empty; if (entity.HogGrade_ID.HasValue) { var first = hogGradeBtn.FirstOrDefault(x => x.Name == "_" + entity.HogGrade_ID); diff --git a/Setup/Release/Setup.msi b/Setup/Release/Setup.msi index 4b3ffae..891c9d6 100644 Binary files a/Setup/Release/Setup.msi and b/Setup/Release/Setup.msi differ diff --git a/Setup/Setup.vdproj b/Setup/Setup.vdproj index 41d56aa..cfe9ba0 100644 --- a/Setup/Setup.vdproj +++ b/Setup/Setup.vdproj @@ -15,84 +15,66 @@ { "Entry" { - "MsmKey" = "8:_256D496D5DAF74C74B6417F600F173BF" - "OwnerKey" = "8:_5028DE72CC42424CB6B2165E77BED521" + "MsmKey" = "8:_2028496CE76A4260A4BE696C231D92C4" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_36D54F50B1800D0556355E2A07DD448E" + "MsmKey" = "8:_256D496D5DAF74C74B6417F600F173BF" "OwnerKey" = "8:_5028DE72CC42424CB6B2165E77BED521" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_36D54F50B1800D0556355E2A07DD448E" - "OwnerKey" = "8:_72C299799A4A4FCE805FFC4FC20FAFEF" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_36D54F50B1800D0556355E2A07DD448E" - "OwnerKey" = "8:_5DDE73D6E26642C99C1F3ED80EAAA5D0" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_36D54F50B1800D0556355E2A07DD448E" - "OwnerKey" = "8:_561DA641348F488AB17CF44013258EBD" + "MsmKey" = "8:_5028DE72CC42424CB6B2165E77BED521" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5028DE72CC42424CB6B2165E77BED521" + "MsmKey" = "8:_561DA641348F488AB17CF44013258EBD" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_561DA641348F488AB17CF44013258EBD" + "MsmKey" = "8:_5DDE73D6E26642C99C1F3ED80EAAA5D0" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5DDE73D6E26642C99C1F3ED80EAAA5D0" + "MsmKey" = "8:_72C299799A4A4FCE805FFC4FC20FAFEF" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7078C2CDB91B0A81ECE4C1014E1C5566" + "MsmKey" = "8:_830258A5E5B0C75EB3217B2F333721DD" "OwnerKey" = "8:_5028DE72CC42424CB6B2165E77BED521" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7078C2CDB91B0A81ECE4C1014E1C5566" + "MsmKey" = "8:_830258A5E5B0C75EB3217B2F333721DD" "OwnerKey" = "8:_72C299799A4A4FCE805FFC4FC20FAFEF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7078C2CDB91B0A81ECE4C1014E1C5566" + "MsmKey" = "8:_830258A5E5B0C75EB3217B2F333721DD" "OwnerKey" = "8:_5DDE73D6E26642C99C1F3ED80EAAA5D0" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7078C2CDB91B0A81ECE4C1014E1C5566" + "MsmKey" = "8:_830258A5E5B0C75EB3217B2F333721DD" "OwnerKey" = "8:_561DA641348F488AB17CF44013258EBD" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_72C299799A4A4FCE805FFC4FC20FAFEF" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_89319829C5BC8CDDFC1FB1D262E6991C" "OwnerKey" = "8:_256D496D5DAF74C74B6417F600F173BF" "MsmSig" = "8:_UNDEFINED" @@ -123,8 +105,32 @@ } "Entry" { + "MsmKey" = "8:_98A60679F483030FB04D2F427A69CA4A" + "OwnerKey" = "8:_5028DE72CC42424CB6B2165E77BED521" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_98A60679F483030FB04D2F427A69CA4A" + "OwnerKey" = "8:_72C299799A4A4FCE805FFC4FC20FAFEF" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_98A60679F483030FB04D2F427A69CA4A" + "OwnerKey" = "8:_5DDE73D6E26642C99C1F3ED80EAAA5D0" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_98A60679F483030FB04D2F427A69CA4A" + "OwnerKey" = "8:_561DA641348F488AB17CF44013258EBD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_D70677C1F9DC077D2965162D8840C815" - "OwnerKey" = "8:_36D54F50B1800D0556355E2A07DD448E" + "OwnerKey" = "8:_830258A5E5B0C75EB3217B2F333721DD" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -136,7 +142,7 @@ "Entry" { "MsmKey" = "8:_D70677C1F9DC077D2965162D8840C815" - "OwnerKey" = "8:_7078C2CDB91B0A81ECE4C1014E1C5566" + "OwnerKey" = "8:_98A60679F483030FB04D2F427A69CA4A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -178,6 +184,12 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_2028496CE76A4260A4BE696C231D92C4" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_72C299799A4A4FCE805FFC4FC20FAFEF" "MsmSig" = "8:_UNDEFINED" } @@ -220,13 +232,13 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_7078C2CDB91B0A81ECE4C1014E1C5566" + "OwnerKey" = "8:_98A60679F483030FB04D2F427A69CA4A" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_36D54F50B1800D0556355E2A07DD448E" + "OwnerKey" = "8:_830258A5E5B0C75EB3217B2F333721DD" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -266,6 +278,14 @@ "PrerequisitesLocation" = "2:1" "Url" = "8:" "ComponentsUrl" = "8:" + "Items" + { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.5" + { + "Name" = "8:Microsoft .NET Framework 4.5 (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.5" + } + } } } "Release" @@ -290,6 +310,14 @@ "PrerequisitesLocation" = "2:1" "Url" = "8:" "ComponentsUrl" = "8:" + "Items" + { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.5" + { + "Name" = "8:Microsoft .NET Framework 4.5 (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.5" + } + } } } } @@ -320,20 +348,20 @@ } "File" { - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_256D496D5DAF74C74B6417F600F173BF" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2028496CE76A4260A4BE696C231D92C4" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Forks.EnterpriseServices, Version=3.1.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:WeighAndGrading, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_256D496D5DAF74C74B6417F600F173BF" + "_2028496CE76A4260A4BE696C231D92C4" { - "Name" = "8:Forks.EnterpriseServices.dll" + "Name" = "8:WeighAndGrading.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Forks.EnterpriseServices.dll" + "SourcePath" = "8:..\\WeighAndGrading\\bin\\Release\\WeighAndGrading.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_BEB5263E66544AA0ADFECA514F610FF5" @@ -348,23 +376,23 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_36D54F50B1800D0556355E2A07DD448E" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_256D496D5DAF74C74B6417F600F173BF" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:BO, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Forks.EnterpriseServices, Version=3.1.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL" "ScatterAssemblies" { - "_36D54F50B1800D0556355E2A07DD448E" + "_256D496D5DAF74C74B6417F600F173BF" { - "Name" = "8:BO.dll" + "Name" = "8:Forks.EnterpriseServices.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:BO.dll" + "SourcePath" = "8:Forks.EnterpriseServices.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_BEB5263E66544AA0ADFECA514F610FF5" @@ -444,20 +472,20 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7078C2CDB91B0A81ECE4C1014E1C5566" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_72C299799A4A4FCE805FFC4FC20FAFEF" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:BWP.WinFormControl, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:ButcherWeight, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_7078C2CDB91B0A81ECE4C1014E1C5566" + "_72C299799A4A4FCE805FFC4FC20FAFEF" { - "Name" = "8:BWP.WinFormControl.dll" + "Name" = "8:ButcherWeight.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:BWP.WinFormControl.dll" + "SourcePath" = "8:..\\ButcherWeight\\bin\\Release\\ButcherWeight.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_BEB5263E66544AA0ADFECA514F610FF5" @@ -472,23 +500,23 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_72C299799A4A4FCE805FFC4FC20FAFEF" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_830258A5E5B0C75EB3217B2F333721DD" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ButcherWeight, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:BO, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_72C299799A4A4FCE805FFC4FC20FAFEF" + "_830258A5E5B0C75EB3217B2F333721DD" { - "Name" = "8:ButcherWeight.dll" + "Name" = "8:BO.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:..\\ButcherWeight\\bin\\Release\\ButcherWeight.dll" + "SourcePath" = "8:BO.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_BEB5263E66544AA0ADFECA514F610FF5" @@ -503,7 +531,7 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" + "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_89319829C5BC8CDDFC1FB1D262E6991C" @@ -568,6 +596,37 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_98A60679F483030FB04D2F427A69CA4A" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:BWP.WinFormControl, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_98A60679F483030FB04D2F427A69CA4A" + { + "Name" = "8:BWP.WinFormControl.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:BWP.WinFormControl.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_BEB5263E66544AA0ADFECA514F610FF5" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D70677C1F9DC077D2965162D8840C815" { "AssemblyRegister" = "3:1" @@ -1278,7 +1337,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_5028DE72CC42424CB6B2165E77BED521" { - "SourcePath" = "8:..\\ButcherManageClient\\obj\\Debug\\ButcherManageClient.exe" + "SourcePath" = "8:..\\ButcherManageClient\\obj\\Release\\ButcherManageClient.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_BEB5263E66544AA0ADFECA514F610FF5" diff --git a/WeighAndGrading/App.config b/WeighAndGrading/App.config deleted file mode 100644 index 8e15646..0000000 --- a/WeighAndGrading/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/WeighAndGrading/Form1.Designer.cs b/WeighAndGrading/Form1.Designer.cs deleted file mode 100644 index 1c9dbbf..0000000 --- a/WeighAndGrading/Form1.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace WeighAndGrading -{ - partial class Form1 - { - /// - /// 必需的设计器变量。 - /// - private System.ComponentModel.IContainer components = null; - - /// - /// 清理所有正在使用的资源。 - /// - /// 如果应释放托管资源，为 true；否则为 false。 - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows 窗体设计器生成的代码 - - /// - /// 设计器支持所需的方法 - 不要 - /// 使用代码编辑器修改此方法的内容。 - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Text = "Form1"; - } - - #endregion - } -} - diff --git a/WeighAndGrading/GradeFrom.Designer.cs b/WeighAndGrading/GradeFrom.Designer.cs new file mode 100644 index 0000000..5fe3e01 --- /dev/null +++ b/WeighAndGrading/GradeFrom.Designer.cs @@ -0,0 +1,353 @@ +namespace WeighAndGrading +{ + partial class GradeFrom + { + /// + /// 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() + { + 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(); + this.label1 = new System.Windows.Forms.Label(); + this.uDatePicker1 = new BWP.WinFormControl.UDatePicker(); + this.button1 = new System.Windows.Forms.Button(); + this.uDataGridView1 = new BWP.WinFormControl.UDataGridView(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); + this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.enableWeight = new System.Windows.Forms.CheckBox(); + this.isPrintCheckBox = new System.Windows.Forms.CheckBox(); + this.printBtn = new System.Windows.Forms.Button(); + this.panel1 = new System.Windows.Forms.Panel(); + this.lblChengZhong = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.uDataGridView1)).BeginInit(); + this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("宋体", 15F); + this.label1.Location = new System.Drawing.Point(12, 131); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(109, 20); + this.label1.TabIndex = 0; + this.label1.Text = "宰杀日期："; + // + // uDatePicker1 + // + this.uDatePicker1.BackColor = System.Drawing.Color.White; + this.uDatePicker1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.uDatePicker1.Date = new System.DateTime(2017, 9, 5, 0, 0, 0, 0); + this.uDatePicker1.Font = new System.Drawing.Font("宋体", 15F); + this.uDatePicker1.Location = new System.Drawing.Point(116, 126); + this.uDatePicker1.Name = "uDatePicker1"; + this.uDatePicker1.Size = new System.Drawing.Size(133, 30); + this.uDatePicker1.TabIndex = 2; + this.uDatePicker1.Text = "2017/09/05"; + this.uDatePicker1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.uDatePicker1.Type = BWP.WinFormControl.DateTimeType.Date; + // + // button1 + // + this.button1.Font = new System.Drawing.Font("宋体", 15F); + this.button1.Location = new System.Drawing.Point(287, 120); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(102, 43); + this.button1.TabIndex = 3; + this.button1.Text = "同步数据"; + this.button1.UseVisualStyleBackColor = true; + // + // uDataGridView1 + // + this.uDataGridView1.AllowUserToAddRows = false; + this.uDataGridView1.AllowUserToDeleteRows = false; + this.uDataGridView1.AllowUserToResizeColumns = false; + this.uDataGridView1.AllowUserToResizeRows = false; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); + this.uDataGridView1.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + this.uDataGridView1.BackgroundColor = System.Drawing.Color.White; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 12F); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.uDataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; + this.uDataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.uDataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column1, + this.Column2, + this.Column3, + this.Column4}); + this.uDataGridView1.Location = new System.Drawing.Point(12, 175); + this.uDataGridView1.MultiSelect = false; + this.uDataGridView1.Name = "uDataGridView1"; + this.uDataGridView1.ReadOnly = true; + this.uDataGridView1.RowHeadersVisible = false; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); + this.uDataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle6; + this.uDataGridView1.RowTemplate.Height = 23; + this.uDataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.uDataGridView1.Size = new System.Drawing.Size(377, 480); + this.uDataGridView1.TabIndex = 4; + // + // Column1 + // + this.Column1.HeaderText = "屠宰顺序"; + this.Column1.Name = "Column1"; + this.Column1.ReadOnly = true; + // + // Column2 + // + this.Column2.HeaderText = "工艺"; + this.Column2.Name = "Column2"; + this.Column2.ReadOnly = true; + this.Column2.Width = 80; + // + // Column3 + // + this.Column3.HeaderText = "头数"; + this.Column3.Name = "Column3"; + this.Column3.ReadOnly = true; + this.Column3.Width = 80; + // + // Column4 + // + this.Column4.HeaderText = "已宰"; + this.Column4.Name = "Column4"; + this.Column4.ReadOnly = true; + this.Column4.Width = 80; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Font = new System.Drawing.Font("宋体", 15F); + this.label2.Location = new System.Drawing.Point(447, 101); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(109, 20); + this.label2.TabIndex = 5; + this.label2.Text = "屠宰顺序："; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Font = new System.Drawing.Font("宋体", 15F); + this.label3.Location = new System.Drawing.Point(562, 101); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(19, 20); + this.label3.TabIndex = 6; + this.label3.Text = "0"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Font = new System.Drawing.Font("宋体", 15F); + this.label4.Location = new System.Drawing.Point(617, 100); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(69, 20); + this.label4.TabIndex = 7; + this.label4.Text = "已宰："; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Font = new System.Drawing.Font("宋体", 15F); + this.label5.Location = new System.Drawing.Point(702, 100); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(19, 20); + this.label5.TabIndex = 8; + this.label5.Text = "0"; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.flowLayoutPanel1); + this.groupBox1.Location = new System.Drawing.Point(439, 154); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(345, 288); + this.groupBox1.TabIndex = 9; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "烫褪"; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.flowLayoutPanel2); + this.groupBox2.Location = new System.Drawing.Point(439, 473); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(345, 332); + this.groupBox2.TabIndex = 10; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "毛剥"; + // + // flowLayoutPanel1 + // + this.flowLayoutPanel1.Location = new System.Drawing.Point(12, 21); + this.flowLayoutPanel1.Name = "flowLayoutPanel1"; + this.flowLayoutPanel1.Size = new System.Drawing.Size(319, 251); + this.flowLayoutPanel1.TabIndex = 0; + // + // flowLayoutPanel2 + // + this.flowLayoutPanel2.Location = new System.Drawing.Point(12, 32); + this.flowLayoutPanel2.Name = "flowLayoutPanel2"; + this.flowLayoutPanel2.Size = new System.Drawing.Size(319, 251); + this.flowLayoutPanel2.TabIndex = 1; + // + // groupBox3 + // + this.groupBox3.Location = new System.Drawing.Point(853, 154); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(384, 651); + this.groupBox3.TabIndex = 11; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "记录"; + // + // enableWeight + // + this.enableWeight.AutoSize = true; + this.enableWeight.Font = new System.Drawing.Font("宋体", 15F); + this.enableWeight.Location = new System.Drawing.Point(10, 91); + this.enableWeight.Name = "enableWeight"; + this.enableWeight.Size = new System.Drawing.Size(108, 24); + this.enableWeight.TabIndex = 31; + this.enableWeight.Text = "启用称重"; + this.enableWeight.UseVisualStyleBackColor = true; + // + // isPrintCheckBox + // + this.isPrintCheckBox.AutoSize = true; + this.isPrintCheckBox.Font = new System.Drawing.Font("宋体", 15F); + this.isPrintCheckBox.Location = new System.Drawing.Point(281, 2); + this.isPrintCheckBox.Name = "isPrintCheckBox"; + this.isPrintCheckBox.Size = new System.Drawing.Size(108, 24); + this.isPrintCheckBox.TabIndex = 30; + this.isPrintCheckBox.Text = "打印条码"; + this.isPrintCheckBox.UseVisualStyleBackColor = true; + // + // printBtn + // + this.printBtn.Font = new System.Drawing.Font("宋体", 15F); + this.printBtn.Location = new System.Drawing.Point(287, 37); + this.printBtn.Name = "printBtn"; + this.printBtn.Size = new System.Drawing.Size(102, 43); + this.printBtn.TabIndex = 29; + this.printBtn.Text = "打印测试"; + this.printBtn.UseVisualStyleBackColor = true; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.Black; + this.panel1.Controls.Add(this.lblChengZhong); + this.panel1.Location = new System.Drawing.Point(12, 2); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(237, 78); + this.panel1.TabIndex = 28; + // + // lblChengZhong + // + this.lblChengZhong.AutoSize = true; + this.lblChengZhong.Font = new System.Drawing.Font("宋体", 30F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lblChengZhong.ForeColor = System.Drawing.Color.Red; + this.lblChengZhong.Location = new System.Drawing.Point(15, 18); + this.lblChengZhong.Name = "lblChengZhong"; + this.lblChengZhong.Size = new System.Drawing.Size(97, 40); + this.lblChengZhong.TabIndex = 0; + this.lblChengZhong.Text = "0.00"; + // + // GradeFrom + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1276, 865); + this.Controls.Add(this.enableWeight); + this.Controls.Add(this.groupBox3); + this.Controls.Add(this.isPrintCheckBox); + this.Controls.Add(this.groupBox2); + this.Controls.Add(this.printBtn); + this.Controls.Add(this.groupBox1); + this.Controls.Add(this.panel1); + this.Controls.Add(this.label5); + this.Controls.Add(this.label4); + this.Controls.Add(this.label3); + this.Controls.Add(this.label2); + this.Controls.Add(this.uDataGridView1); + this.Controls.Add(this.button1); + this.Controls.Add(this.uDatePicker1); + this.Controls.Add(this.label1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.MaximizeBox = false; + this.Name = "GradeFrom"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "称重定级"; + ((System.ComponentModel.ISupportInitialize)(this.uDataGridView1)).EndInit(); + this.groupBox1.ResumeLayout(false); + this.groupBox2.ResumeLayout(false); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label1; + private BWP.WinFormControl.UDatePicker uDatePicker1; + private System.Windows.Forms.Button button1; + private BWP.WinFormControl.UDataGridView uDataGridView1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column2; + private System.Windows.Forms.DataGridViewTextBoxColumn Column3; + private System.Windows.Forms.DataGridViewTextBoxColumn Column4; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2; + private System.Windows.Forms.GroupBox groupBox3; + private System.Windows.Forms.CheckBox enableWeight; + private System.Windows.Forms.CheckBox isPrintCheckBox; + private System.Windows.Forms.Button printBtn; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Label lblChengZhong; + } +} \ No newline at end of file diff --git a/WeighAndGrading/Form1.cs b/WeighAndGrading/GradeFrom.cs similarity index 82% rename from WeighAndGrading/Form1.cs rename to WeighAndGrading/GradeFrom.cs index ea33226..0e88b32 100644 --- a/WeighAndGrading/Form1.cs +++ b/WeighAndGrading/GradeFrom.cs @@ -10,9 +10,9 @@ using System.Windows.Forms; namespace WeighAndGrading { - public partial class Form1 : Form + public partial class GradeFrom : Form { - public Form1() + public GradeFrom() { InitializeComponent(); } diff --git a/ButcherOrder - 副本/ButcherOrderForm.resx b/WeighAndGrading/GradeFrom.resx similarity index 88% rename from ButcherOrder - 副本/ButcherOrderForm.resx rename to WeighAndGrading/GradeFrom.resx index 1af7de1..1d910af 100644 --- a/ButcherOrder - 副本/ButcherOrderForm.resx +++ b/WeighAndGrading/GradeFrom.resx @@ -117,4 +117,16 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + + + True + \ No newline at end of file diff --git a/WeighAndGrading/Program.cs b/WeighAndGrading/Program.cs deleted file mode 100644 index 8ff4dcf..0000000 --- a/WeighAndGrading/Program.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace WeighAndGrading -{ - static class Program - { - /// - /// 应用程序的主入口点。 - /// - [STAThread] - static void Main() - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Form1()); - } - } -} diff --git a/WeighAndGrading/Properties/AssemblyInfo.cs b/WeighAndGrading/Properties/AssemblyInfo.cs index 7c8ba70..92e04b7 100644 --- a/WeighAndGrading/Properties/AssemblyInfo.cs +++ b/WeighAndGrading/Properties/AssemblyInfo.cs @@ -20,7 +20,7 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] // 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID -[assembly: Guid("3e34be44-2699-42dc-a5de-c743919db7a2")] +[assembly: Guid("6c2a57dc-8d08-4de4-86a7-986a6dc38b3b")] // 程序集的版本信息由下面四个值组成: // diff --git a/WeighAndGrading/Properties/Resources.Designer.cs b/WeighAndGrading/Properties/Resources.Designer.cs deleted file mode 100644 index 5a818e2..0000000 --- a/WeighAndGrading/Properties/Resources.Designer.cs +++ /dev/null @@ -1,71 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// 运行时版本: 4.0.30319.42000 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将丢失。 -// -//------------------------------------------------------------------------------ - -namespace WeighAndGrading.Properties -{ - - - /// - /// 一个强类型的资源类，用于查找本地化的字符串等。 - /// - // 此类是由 StronglyTypedResourceBuilder - // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 - // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen - // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { - } - - /// - /// 返回此类使用的、缓存的 ResourceManager 实例。 - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WeighAndGrading.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// 为所有资源查找重写当前线程的 CurrentUICulture 属性， - /// 方法是使用此强类型资源类。 - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - } -} diff --git a/WeighAndGrading/Properties/Resources.resx b/WeighAndGrading/Properties/Resources.resx deleted file mode 100644 index af7dbeb..0000000 --- a/WeighAndGrading/Properties/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/WeighAndGrading/Properties/Settings.Designer.cs b/WeighAndGrading/Properties/Settings.Designer.cs deleted file mode 100644 index 5005d29..0000000 --- a/WeighAndGrading/Properties/Settings.Designer.cs +++ /dev/null @@ -1,30 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace WeighAndGrading.Properties -{ - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { - return defaultInstance; - } - } - } -} diff --git a/WeighAndGrading/Properties/Settings.settings b/WeighAndGrading/Properties/Settings.settings deleted file mode 100644 index 3964565..0000000 --- a/WeighAndGrading/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/WeighAndGrading/WeighAndGrading.csproj b/WeighAndGrading/WeighAndGrading.csproj index d1f0d23..97283b0 100644 --- a/WeighAndGrading/WeighAndGrading.csproj +++ b/WeighAndGrading/WeighAndGrading.csproj @@ -4,8 +4,8 @@ Debug AnyCPU - {71598ACD-6C4A-4D61-937B-51147A5EA36E} - WinExe + {BFC366E2-994C-433F-9EE2-5377DBA9D948} + Library Properties WeighAndGrading WeighAndGrading @@ -13,7 +13,6 @@ 512 - AnyCPU true full false @@ -23,7 +22,6 @@ 4 - AnyCPU pdbonly true bin\Release\ @@ -32,55 +30,40 @@ 4 - - False - D:\BwpB3Project\tsref\Debug\Forks.EnterpriseServices.dll - - - False - D:\BwpB3Project\tsref\Debug\Forks.Utils.dll - + + + + + + - - - + - + Form - - Form1.cs + + GradeFrom.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer + + + + GradeFrom.cs - - True - Resources.resx - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - + + {A782B23E-BE6D-4F51-B5CB-5CD259BA97CC} + BWP.WinFormControl + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/WeightClient/Program.cs b/WeightClient/Program.cs deleted file mode 100644 index 4c49540..0000000 --- a/WeightClient/Program.cs +++ /dev/null @@ -1,76 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace WeightClient -{ - static class Program - { - /// - /// 应用程序的主入口点。 - /// - [STAThread] - static void Main() - { - try - { - //处理未捕获的异常 - Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException); - //处理UI线程异常 - Application.ThreadException += Application_ThreadException; - //处理非UI线程异常 - AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; - - var aProcessName = Process.GetCurrentProcess().ProcessName; - if ((Process.GetProcessesByName(aProcessName)).GetUpperBound(0) > 0) - { - MessageBox.Show(@"系统已经在运行中，如果要重新启动，请从进程中关闭...", @"系统警告", MessageBoxButtons.OK, MessageBoxIcon.Asterisk); - } - else - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Login()); - } - } - catch (Exception e) - { - // LogUtil.WriteError(e); - MessageBox.Show("错误：" + e.Message); - } - } - - /// - /// 在发生未处理异常时处理的方法 - /// - /// - /// - private static void Application_ThreadException(object sender, ThreadExceptionEventArgs e) - { - var ex = e.Exception; - var err = String.Empty; - if (ex != null) - { - //LogUtil.WriteError(ex); - err = ex.Message; - } - MessageBox.Show("错误：" + err); - } - - private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) - { - var err = String.Empty; - var ex = e.ExceptionObject as Exception; - if (ex != null) - { - //LogUtil.WriteError(ex); - err = ex.Message; - } - MessageBox.Show("错误：" + err); - } - } -} diff --git a/WeightClient/Properties/AssemblyInfo.cs b/WeightClient/Properties/AssemblyInfo.cs deleted file mode 100644 index dcbe2b7..0000000 --- a/WeightClient/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 有关程序集的常规信息通过以下 -// 特性集控制。更改这些特性值可修改 -// 与程序集关联的信息。 -[assembly: AssemblyTitle("WeightClient")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("WeightClient")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// 将 ComVisible 设置为 false 使此程序集中的类型 -// 对 COM 组件不可见。 如果需要从 COM 访问此程序集中的类型， -// 则将该类型上的 ComVisible 特性设置为 true。 -[assembly: ComVisible(false)] - -// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID -[assembly: Guid("062ee4a6-19d4-47a4-afe6-57869c15442b")] - -// 程序集的版本信息由下面四个值组成: -// -// 主版本 -// 次版本 -// 生成号 -// 修订号 -// -// 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， -// 方法是按如下所示使用“*”: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/WeightClient/Properties/Resources.Designer.cs b/WeightClient/Properties/Resources.Designer.cs deleted file mode 100644 index db29fbc..0000000 --- a/WeightClient/Properties/Resources.Designer.cs +++ /dev/null @@ -1,71 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// 运行时版本: 4.0.30319.42000 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将丢失。 -// -//------------------------------------------------------------------------------ - -namespace WeightClient.Properties -{ - - - /// - /// 一个强类型的资源类，用于查找本地化的字符串等。 - /// - // 此类是由 StronglyTypedResourceBuilder - // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 - // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen - // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { - } - - /// - /// 返回此类使用的、缓存的 ResourceManager 实例。 - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WeightClient.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// 为所有资源查找重写当前线程的 CurrentUICulture 属性， - /// 方法是使用此强类型资源类。 - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - } -} diff --git a/WeightClient/Properties/Resources.resx b/WeightClient/Properties/Resources.resx deleted file mode 100644 index af7dbeb..0000000 --- a/WeightClient/Properties/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/WeightClient/Properties/Settings.Designer.cs b/WeightClient/Properties/Settings.Designer.cs deleted file mode 100644 index 95e7be2..0000000 --- a/WeightClient/Properties/Settings.Designer.cs +++ /dev/null @@ -1,30 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace WeightClient.Properties -{ - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { - return defaultInstance; - } - } - } -} diff --git a/WeightClient/Properties/Settings.settings b/WeightClient/Properties/Settings.settings deleted file mode 100644 index 3964565..0000000 --- a/WeightClient/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/WeightClient/SettingForm.Designer.cs b/WeightClient/SettingForm.Designer.cs deleted file mode 100644 index 8d057c2..0000000 --- a/WeightClient/SettingForm.Designer.cs +++ /dev/null @@ -1,103 +0,0 @@ -namespace WeightClient -{ - partial class SettingForm - { - /// - /// 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 System.Windows.Forms.Button(); - this.saveBtn = new System.Windows.Forms.Button(); - this.uTextBoxWithPad1 = new BWP.WinFormControl.UTextBoxWithPad(); - this.label1 = new System.Windows.Forms.Label(); - this.SuspendLayout(); - // - // cancelBtn - // - this.cancelBtn.Font = new System.Drawing.Font("宋体", 20F); - this.cancelBtn.Location = new System.Drawing.Point(241, 110); - this.cancelBtn.Name = "cancelBtn"; - this.cancelBtn.Size = new System.Drawing.Size(81, 53); - this.cancelBtn.TabIndex = 7; - this.cancelBtn.Text = "关闭"; - this.cancelBtn.UseVisualStyleBackColor = true; - this.cancelBtn.Click += new System.EventHandler(this.cancelBtn_Click); - // - // saveBtn - // - this.saveBtn.Font = new System.Drawing.Font("宋体", 20F); - this.saveBtn.Location = new System.Drawing.Point(100, 110); - this.saveBtn.Name = "saveBtn"; - this.saveBtn.Size = new System.Drawing.Size(81, 53); - this.saveBtn.TabIndex = 6; - this.saveBtn.Text = "保存"; - this.saveBtn.UseVisualStyleBackColor = true; - this.saveBtn.Click += new System.EventHandler(this.saveBtn_Click); - // - // uTextBoxWithPad1 - // - this.uTextBoxWithPad1.Font = new System.Drawing.Font("宋体", 15F); - this.uTextBoxWithPad1.Location = new System.Drawing.Point(140, 41); - this.uTextBoxWithPad1.Name = "uTextBoxWithPad1"; - this.uTextBoxWithPad1.Size = new System.Drawing.Size(246, 30); - this.uTextBoxWithPad1.TabIndex = 5; - this.uTextBoxWithPad1.Type = BWP.WinFormControl.UTextBoxWithPad.TextBoxType.Normal; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("宋体", 15F); - this.label1.Location = new System.Drawing.Point(18, 44); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(129, 20); - this.label1.TabIndex = 4; - this.label1.Text = "服务器地址："; - // - // SettingForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(404, 205); - this.Controls.Add(this.cancelBtn); - this.Controls.Add(this.saveBtn); - this.Controls.Add(this.uTextBoxWithPad1); - this.Controls.Add(this.label1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.MaximizeBox = false; - this.Name = "SettingForm"; - this.Text = "SettingForm"; - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.Button cancelBtn; - private System.Windows.Forms.Button saveBtn; - private BWP.WinFormControl.UTextBoxWithPad uTextBoxWithPad1; - private System.Windows.Forms.Label label1; - } -} \ No newline at end of file diff --git a/WeightClient/SettingForm.cs b/WeightClient/SettingForm.cs deleted file mode 100644 index 690d786..0000000 --- a/WeightClient/SettingForm.cs +++ /dev/null @@ -1,33 +0,0 @@ -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; - -namespace WeightClient -{ - public partial class SettingForm : Form - { - public SettingForm() - { - InitializeComponent(); - uTextBoxWithPad1.Text = AppContext.Context.UrlConfig.ServerUrl; - } - - private void cancelBtn_Click(object sender, EventArgs e) - { - this.Close(); - } - - private void saveBtn_Click(object sender, EventArgs e) - { - AppContext.Context.UrlConfig.ServerUrl = this.uTextBoxWithPad1.Text.Trim(); - AppContext.Context.Save(); - MessageBox.Show("设置保存成功!"); - } - } -} diff --git a/WeightClient/SettingForm.resx b/WeightClient/SettingForm.resx deleted file mode 100644 index 1af7de1..0000000 --- a/WeightClient/SettingForm.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/WeightClient/WeightClient.csproj b/WeightClient/WeightClient.csproj deleted file mode 100644 index ccc3134..0000000 --- a/WeightClient/WeightClient.csproj +++ /dev/null @@ -1,124 +0,0 @@ - - - - - Debug - AnyCPU - {CB51A020-8823-4D64-898D-CC1632A298DB} - WinExe - Properties - WeightClient - WeightClient - v4.5 - 512 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - False - ..\..\..\..\BwpB3Project\tsref\Debug\Forks.EnterpriseServices.dll - - - False - ..\..\..\..\BwpB3Project\tsref\Debug\Forks.JsonRpc.Client.dll - - - False - ..\..\..\..\BwpB3Project\tsref\Debug\Forks.Utils.dll - - - - - - - - - - - - - - - - - - - - Form - - - Login.cs - - - - - Form - - - SettingForm.cs - - - Login.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - - - SettingForm.cs - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - - - {8968f14a-c7c7-4751-96ce-b114fbfd65ef} - BO - - - {a782b23e-be6d-4f51-b5cb-5cd259ba97cc} - BWP.WinFormControl - - - - - \ No newline at end of file