diff --git a/B3ButcherManageClient.sln b/B3ButcherManageClient.sln
index b80ab2d..fff9f88 100644
--- a/B3ButcherManageClient.sln
+++ b/B3ButcherManageClient.sln
@@ -15,6 +15,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ButcherWeight", "ButcherWei
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QualityAndOrder", "QualityAndOrder\QualityAndOrder.csproj", "{0C26ABF1-A45D-4107-ADC8-0235BCD18043}"
EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{69447304-329D-448B-A6D4-342B9FBAD15D}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -45,6 +47,8 @@ Global
{0C26ABF1-A45D-4107-ADC8-0235BCD18043}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0C26ABF1-A45D-4107-ADC8-0235BCD18043}.Release|Any CPU.ActiveCfg = Release|Any CPU
{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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/BO/BO.csproj b/BO/BO.csproj
index 2589ded..d67d0cc 100644
--- a/BO/BO.csproj
+++ b/BO/BO.csproj
@@ -52,6 +52,7 @@
+
diff --git a/BO/BO/Bill/WeightBill/WeightBill.cs b/BO/BO/Bill/WeightBill/WeightBill.cs
index 1f23033..41a81ef 100644
--- a/BO/BO/Bill/WeightBill/WeightBill.cs
+++ b/BO/BO/Bill/WeightBill/WeightBill.cs
@@ -72,6 +72,7 @@ namespace BO.BO
public string Remark { get; set; }
+ public bool AlreadyHouse { get; set; }
private List _details = new List();
public List Details { get { return _details; } }
diff --git a/BO/Utils/AfterLoginUtil.cs b/BO/Utils/AfterLoginUtil.cs
new file mode 100644
index 0000000..ac7a1ad
--- /dev/null
+++ b/BO/Utils/AfterLoginUtil.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace BO.Utils
+{
+ public interface IAfterLogin
+ {
+ string RoleName { get; }
+
+ Form Generate();
+ }
+
+ public static class AfterLoginUtil
+ {
+//#if debug
+ static List> roleToAssemblies= new List>(){new Tuple("排宰员",@"C:\B3Service\src\B3ButcherManageClient\ButcherOrder\bin\Debug\ButcherOrder"),
+ new Tuple("过磅员",@"C:\B3Service\src\B3ButcherManageClient\ButcherWeight\bin\Debug\ButcherWeight"),
+ new Tuple("验质员",@"C:\B3Service\src\B3ButcherManageClient\QualityAndOrder\bin\Debug\QualityAndOrder")};
+//#endif
+//#if relase
+ // static List> roleToAssemblies = new List>(){new Tuple("排宰员",@"ButcherOrder"),
+ // new Tuple("过磅员",@"ButcherWeight"),
+ // new Tuple("验质员",@"QualityAndOrder")};
+//#endif
+
+
+ public static Form CreateForm(string role)
+ {
+ var first = roleToAssemblies.FirstOrDefault(x => x.Item1 == role);
+ if (first == null)
+ throw new Exception("未注册的角色");
+//#if debug
+ var filePath = string.Format("{0}.dll", first.Item2);
+//#endif
+//#if relase
+ // var filePath = Path.Combine(Application.StartupPath, string.Format("{0}.dll", first.Item2));
+//#endif
+ if (!File.Exists(filePath))
+ throw new Exception("相关模块不存在");
+ var formType = typeof(IAfterLogin);
+ foreach (var type in Assembly.LoadFile(filePath).GetTypes())
+ {
+ if (formType.IsAssignableFrom(type))
+ {
+ var instance = (IAfterLogin)Activator.CreateInstance(type);
+ if (role == instance.RoleName)
+ return instance.Generate();
+ }
+ }
+ return null;
+ }
+ }
+}
diff --git a/BO/Utils/BillRpc/WeightBillRpc.cs b/BO/Utils/BillRpc/WeightBillRpc.cs
index cc6a469..5b41af2 100644
--- a/BO/Utils/BillRpc/WeightBillRpc.cs
+++ b/BO/Utils/BillRpc/WeightBillRpc.cs
@@ -102,19 +102,41 @@ namespace BO.Utils.BillRpc
obj.Set("FarmerDetails", farmerDetils);
var result = RpcFacade.Call(method, obj);
- bo.ID = result.Get("ID");
+ if (bo.ID == 0)
+ bo.ID = result.Get("ID");
var detailReturns = result.Get>("DetailBack");
- var rDetails = detailReturns[0].Get>("DetailBack");
- foreach (var item in rDetails)
- {
- var idx = Convert.ToInt32(item.Get("Flag"));
- bo.Details.First(x => x.Index == idx).ID = item.Get("ID");
- }
- var rFarmerDetails = detailReturns[1].Get>("DetailBack");
- foreach (var item in rFarmerDetails)
+ foreach (var d in detailReturns)
{
- var idx = Convert.ToInt32(item.Get("Flag"));
- bo.FarmerDetails.First(x => x.Index == idx).ID = item.Get("ID");
+ var dFlag = d.Get("Flag");
+ switch (dFlag)
+ {
+ case "Details":
+ var rdetails = d.Get>("DetailBack");
+ foreach (var rd in rdetails)
+ {
+ var idx = Convert.ToInt32(rd.Get("Flag"));
+ var first = bo.Details.First(x => x.Index == idx);
+ if (first.ID == 0)
+ {
+ first.ID = rd.Get("ID");
+ first.WeightBill_ID = bo.ID;
+ }
+ }
+ break;
+ case "FarmerDetails":
+ var rfarmerDetails = d.Get>("DetailBack");
+ foreach (var rd in rfarmerDetails)
+ {
+ var idx = Convert.ToInt32(rd.Get("Flag"));
+ var first = bo.FarmerDetails.First(x => x.Index == idx);
+ if (first.ID == 0)
+ {
+ first.ID = rd.Get("ID");
+ first.WeightBill_ID = bo.ID;
+ }
+ }
+ break;
+ }
}
return true;
@@ -212,9 +234,19 @@ namespace BO.Utils.BillRpc
{
var entity = new WeightBill();
result.Add(entity);
- entity.ID = obj.Get("ID");
- entity.B3ID = obj.Get("B3ID");
- entity.Supplier_Name = obj.Get("Supplier_Name");
+ var bill = obj.Get("Bill");
+ entity.ID = bill.Get("ID");
+ entity.B3ID = bill.Get("B3ID");
+ entity.Supplier_Name = bill.Get("Supplier_Name");
+ entity.AlreadyHouse = bill.Get("AlreadyHouse");
+ var details = obj.Get>("Detail");
+ foreach (var detail in details)
+ {
+ var d = new WeightBill_HouseDetail();
+ entity.HouseDetails.Add(d);
+ d.LiveColonyHouse_Name = detail.Get("LiveColonyHouse_Name");
+ d.Number = detail.Get("Number");
+ }
}
return result;
}
@@ -223,9 +255,10 @@ namespace BO.Utils.BillRpc
{
const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/WeightBillRpc/InsertWeightBillHouseDetail";
var obj = new RpcObject("/MainSystem/B3ClientService/BO/WeightBill");
-
+ obj.Set("ID", bo.ID);
obj.Set("HogGrade_ID", bo.HogGrade_ID);
obj.Set("HogGrade_Name", bo.HogGrade_Name);
+ obj.Set("AlreadyHouse", bo.AlreadyHouse);
obj.Set("Inspector_ID", ButcherAppContext.Context.UserConfig.Employee_ID);
obj.Set("Inspector_Name", ButcherAppContext.Context.UserConfig.Employee_Name);
@@ -269,5 +302,23 @@ namespace BO.Utils.BillRpc
const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/WeightBillRpc/GetHouseDetailTotalNumber";
return RpcFacade.Call(method, date);
}
+
+ public static List> SyncBillB3Ids(List ids)
+ {
+ const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/WeightBillRpc/SyncBillB3Ids";
+ return RpcFacade.Call>>(method, ids.ToArray());
+ }
+
+ public static List> SyncWeightDetailB3Ids(List ids)
+ {
+ const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/WeightBillRpc/SyncWeightDetailB3Ids";
+ return RpcFacade.Call>>(method, ids);
+ }
+
+ public static List> SyncFarmerDetailB3Ids(List ids)
+ {
+ const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/WeightBillRpc/SyncFarmerDetailB3Ids";
+ return RpcFacade.Call>>(method, ids);
+ }
}
}
diff --git a/BO/Utils/LoginRpcUtil.cs b/BO/Utils/LoginRpcUtil.cs
index 599ea31..c50db0a 100644
--- a/BO/Utils/LoginRpcUtil.cs
+++ b/BO/Utils/LoginRpcUtil.cs
@@ -25,10 +25,10 @@ namespace BO.Utils
return string.Empty;
}
- public static void FillUserEmpInfo(string name,LoginUserInfo userInfo)
+ public static void FillUserEmpInfo(string name, LoginUserInfo userInfo)
{
const string wpfUserMethod = "/MainSystem/B3ClientService/Rpcs/UserInfoRpc/GetUserEmpInfo";
- var obj= RpcFacade.Call(wpfUserMethod, name);
+ var obj = RpcFacade.Call(wpfUserMethod, name);
if (obj != null)
{
userInfo.ID = obj.Get("User_ID");
@@ -40,6 +40,7 @@ namespace BO.Utils
userInfo.Department_Name = obj.Get("Department_Name");
userInfo.Employee_ID = obj.Get("Employee_ID");
userInfo.Employee_Name = obj.Get("Employee_Name");
+ userInfo.Role = obj.Get("Role");
}
}
}
diff --git a/BO/Utils/LoginUserInfo.cs b/BO/Utils/LoginUserInfo.cs
index 7c776e4..86d94e7 100644
--- a/BO/Utils/LoginUserInfo.cs
+++ b/BO/Utils/LoginUserInfo.cs
@@ -25,5 +25,7 @@ namespace BO.Utils
public long Employee_ID { get; set; }
public string Employee_Name { get; set; }
+
+ public string Role { get; set; }
}
}
diff --git a/BWP.WinFormControl/WeightControl.Designer.cs b/BWP.WinFormControl/WeightControl.Designer.cs
index e0f9844..d7d4ebb 100644
--- a/BWP.WinFormControl/WeightControl.Designer.cs
+++ b/BWP.WinFormControl/WeightControl.Designer.cs
@@ -1,4 +1,5 @@
-namespace BWP.WinFormControl
+using System.Windows.Forms;
+namespace BWP.WinFormControl
{
partial class WeightControl
{
@@ -13,6 +14,12 @@
/// 如果应释放托管资源，为 true；否则为 false。
protected override void Dispose(bool disposing)
{
+ enableWeightBox.CheckState = CheckState.Unchecked;
+ if (weightSerialPort.IsOpen)
+ {
+ weightSerialPort.Close();
+ weightSerialPort.Dispose();
+ }
if (disposing && (components != null))
{
components.Dispose();
@@ -59,6 +66,7 @@
//
// enableWeightBox
//
+ this.enableWeightBox.AutoCheck = false;
this.enableWeightBox.AutoSize = true;
this.enableWeightBox.Font = new System.Drawing.Font("宋体", 18F);
this.enableWeightBox.Location = new System.Drawing.Point(16, 60);
@@ -67,7 +75,7 @@
this.enableWeightBox.TabIndex = 1;
this.enableWeightBox.Text = "启用称重";
this.enableWeightBox.UseVisualStyleBackColor = true;
- this.enableWeightBox.CheckedChanged += new System.EventHandler(this.enableWeightBox_CheckedChanged);
+ this.enableWeightBox.Click += new System.EventHandler(this.enableWeightBox_Click);
//
// WeightControl
//
diff --git a/BWP.WinFormControl/WeightControl.cs b/BWP.WinFormControl/WeightControl.cs
index 2d5b8b6..6cbe6dd 100644
--- a/BWP.WinFormControl/WeightControl.cs
+++ b/BWP.WinFormControl/WeightControl.cs
@@ -11,7 +11,6 @@ using System.IO.Ports;
using System.Threading;
using System.Collections.Concurrent;
using BWP.WinFormControl.WeightDataFormat;
-using System.Windows.Forms;
namespace BWP.WinFormControl
{
@@ -22,15 +21,17 @@ namespace BWP.WinFormControl
Xk3190A9,
Xk3190D10
}
-
public partial class WeightControl : UserControl
{
+ public event EventHandler InitWeightInfo;
+
#region weight Need
private IDataFormat _dataFormat;
- private Thread _inQueryThread, _outQueryThread;
+ private Thread _inQueryThread;
+ //, _outQueryThread;
readonly StringBuilder _dataStrBuilder = new StringBuilder();
- readonly ConcurrentQueue _dataQueue = new ConcurrentQueue();
+ //readonly ConcurrentQueue _dataQueue = new ConcurrentQueue();
Form mainForm;
#endregion
@@ -87,13 +88,14 @@ namespace BWP.WinFormControl
public WeightControl()
{
InitializeComponent();
+ Control.CheckForIllegalCrossThreadCalls = false;
}
private void OpenSerialPort()
{
if (!inited)
throw new Exception("Com口没有实例化，请先调用InitSerialPort");
-
+ Thread.Sleep(10);
// 打开串口
if (!weightSerialPort.IsOpen)
{
@@ -118,15 +120,17 @@ namespace BWP.WinFormControl
void ReadData()
{
_inQueryThread = new Thread(InQuery);
+ //_inQueryThread.IsBackground = true;
_inQueryThread.Start();
- _outQueryThread = new Thread(OutQuery);
- _outQueryThread.Start();
+ //_outQueryThread = new Thread(OutQuery);
+ //_outQueryThread.IsBackground = true;
+ //_outQueryThread.Start();
}
private void InQuery()
{
- while (enableWeightBox.Checked)
+ while (enableWeightBox.CheckState == CheckState.Checked)
{
int availableCount = weightSerialPort.BytesToRead;
if (availableCount == 0)
@@ -149,7 +153,14 @@ namespace BWP.WinFormControl
else if (c == _dataFormat.Endchar || _dataStrBuilder.Length > _dataFormat.Bufsize)
{
_dataStrBuilder.Append(c);
- _dataQueue.Enqueue(_dataStrBuilder.ToString());
+ bool isStatic;
+ string str;
+ if (_dataFormat.ParseAscii(_dataStrBuilder.ToString(), out str, out isStatic))
+ {
+ Value = decimal.Parse(str);
+ break;
+ }
+ // _dataQueue.Enqueue(_dataStrBuilder.ToString());
_dataStrBuilder.Clear();
}
else
@@ -160,36 +171,36 @@ namespace BWP.WinFormControl
}
}
- private void OutQuery()
- {
- while (enableWeightBox.Checked)
- {
- try
- {
- bool isStatic;
- string str;
+ //private void OutQuery()
+ //{
+ // while (enableWeightBox.CheckState == CheckState.Checked)
+ // {
+ // try
+ // {
+ // bool isStatic;
+ // string str;
- string subStr;
+ // string subStr;
- if (!_dataQueue.TryDequeue(out subStr))
- {
- Thread.Sleep(1);
- continue;
- }
- // 解析接受的端口数据
- if (_dataFormat.ParseAscii(subStr, out str, out isStatic))
- {
- Value = decimal.Parse(str);
- }
- }
- catch (Exception)
- {
- Thread.Sleep(1000);
- continue;
- }
- Thread.Sleep(1);
- }
- }
+ // if (!_dataQueue.TryDequeue(out subStr))
+ // {
+ // Thread.Sleep(1);
+ // continue;
+ // }
+ // // 解析接受的端口数据
+ // if (_dataFormat.ParseAscii(subStr, out str, out isStatic))
+ // {
+ // Value = decimal.Parse(str);
+ // }
+ // }
+ // catch (Exception)
+ // {
+ // Thread.Sleep(1000);
+ // continue;
+ // }
+ // Thread.Sleep(1);
+ // }
+ //}
void InitWeightType()
{
@@ -216,38 +227,33 @@ namespace BWP.WinFormControl
{
mainForm.FormClosed -= MainFrom_FormClosed;
Thread.Sleep(10);
-
- if (weightSerialPort.IsOpen)
- {
- weightSerialPort.Close();
- }
-
if (_inQueryThread.IsAlive)
{
_inQueryThread.Abort();
}
- if (_outQueryThread.IsAlive)
- {
- _outQueryThread.Abort();
- }
+ //if (_outQueryThread.IsAlive)
+ //{
+ // _outQueryThread.Abort();
+ //}
+ weightSerialPort.Close();
Value = 0;
}
private void MainFrom_FormClosed(object sender, FormClosedEventArgs e)
{
- if (!enableWeightBox.Checked)
+ if (enableWeightBox.CheckState == CheckState.Checked)
return;
DisableWeight();
}
- private void enableWeightBox_CheckedChanged(object sender, EventArgs e)
+ private void enableWeightBox_Click(object sender, EventArgs e)
{
+ if (InitWeightInfo == null)
+ throw new Exception("InitWeightInfo是用来实例化称参数的，请给此委托赋值并在其中实例化称参数");
+ InitWeightInfo(this, EventArgs.Empty);
if (!inited)
- {
- enableWeightBox.Checked = false;
throw new Exception("Com口没有实例化，请先调用InitSerialPort");
- }
- if (enableWeightBox.Checked)
+ if (!enableWeightBox.Checked)
{
InitWeightType();
OpenSerialPort();
@@ -255,6 +261,7 @@ namespace BWP.WinFormControl
}
else
DisableWeight();
+ enableWeightBox.CheckState = enableWeightBox.Checked ? CheckState.Unchecked : CheckState.Checked;
}
}
}
diff --git a/ButcherManageClient/AfterLoginUtil.cs b/ButcherManageClient/AfterLoginUtil.cs
deleted file mode 100644
index c0c625c..0000000
--- a/ButcherManageClient/AfterLoginUtil.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace ButcherManageClient
-{
- public interface IAfterLogin
- {
- string RoleName { get; }
-
- Form Generate();
- }
-
- internal static class AfterLoginUtil
- {
- static List> roleToAssemblies = new List> {
- new Tuple("1测试",@"C:\B3Service\src\B3ButcherManageClient\ButcherOrder\bin\Debug\ButcherOrder"),
- new Tuple("_2",@"C:\B3Service\src\B3ButcherManageClient\ButcherWeight\bin\Debug\ButcherWeight"),
- new Tuple("_1",@"C:\B3Service\src\B3ButcherManageClient\QualityAndOrder\bin\Debug\QualityAndOrder"),
- new Tuple("小新",""),
- };
-
- public static Form CreateForm(string role)
- {
- var first = roleToAssemblies.FirstOrDefault(x => x.Item1 == role);
- if (first == null)
- throw new Exception("未注册的角色");
- //var filePath = Path.Combine(Application.StartupPath, string.Format("{0}.dll", first.Item2));
- var filePath = string.Format("{0}.dll", first.Item2);
- if (!File.Exists(filePath))
- throw new Exception("相关模块不存在");
- var formType = typeof(IAfterLogin);
- foreach (var type in Assembly.LoadFile(filePath).GetTypes())
- {
- if (formType.IsAssignableFrom(type))
- {
- var instance = (IAfterLogin)Activator.CreateInstance(type);
- if (role == instance.RoleName)
- return instance.Generate();
- }
- }
- return null;
- }
- }
-}
diff --git a/ButcherManageClient/ButcherManageClient.csproj b/ButcherManageClient/ButcherManageClient.csproj
index 6051e89..f9818ae 100644
--- a/ButcherManageClient/ButcherManageClient.csproj
+++ b/ButcherManageClient/ButcherManageClient.csproj
@@ -60,7 +60,6 @@
-
Form
diff --git a/ButcherManageClient/Login.cs b/ButcherManageClient/Login.cs
index 3ecf207..82b6c03 100644
--- a/ButcherManageClient/Login.cs
+++ b/ButcherManageClient/Login.cs
@@ -51,7 +51,7 @@ namespace ButcherManageClient
await Task.Factory.StartNew(() => RpcFacade.Login(username, pwd));
LoginRpcUtil.FillUserEmpInfo(username, ButcherAppContext.Context.UserConfig);
ButcherAppContext.Context.Save();
- var form = AfterLoginUtil.CreateForm("_1");
+ var form = AfterLoginUtil.CreateForm(ButcherAppContext.Context.UserConfig.Role);
if (form == null)
throw new Exception("权限不符");
form.FormClosing += delegate { SubFormClosing(); };
diff --git a/ButcherOrder/ButcherOrder.csproj b/ButcherOrder/ButcherOrder.csproj
index ea4bd70..826bfb8 100644
--- a/ButcherOrder/ButcherOrder.csproj
+++ b/ButcherOrder/ButcherOrder.csproj
@@ -64,10 +64,6 @@
{8968f14a-c7c7-4751-96ce-b114fbfd65ef}
BO
-
- {59b13436-4884-4533-9c7e-80e8580cbf55}
- ButcherManageClient
-
{A782B23E-BE6D-4F51-B5CB-5CD259BA97CC}
BWP.WinFormControl
diff --git a/ButcherOrder/ButcherOrderForm.cs b/ButcherOrder/ButcherOrderForm.cs
index aee2c21..e48d4e6 100644
--- a/ButcherOrder/ButcherOrderForm.cs
+++ b/ButcherOrder/ButcherOrderForm.cs
@@ -1,12 +1,6 @@
-using ButcherManageClient;
+using BO.Utils;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Windows.Forms;
namespace ButcherOrder
diff --git a/ButcherWeight/ButcherWeight.csproj b/ButcherWeight/ButcherWeight.csproj
index bc56dcd..f935354 100644
--- a/ButcherWeight/ButcherWeight.csproj
+++ b/ButcherWeight/ButcherWeight.csproj
@@ -58,28 +58,34 @@
+
+ Form
+
+
+ WeightConfig.cs
+
Form
WeightForm.cs
+
{8968f14a-c7c7-4751-96ce-b114fbfd65ef}
BO
-
- {59b13436-4884-4533-9c7e-80e8580cbf55}
- ButcherManageClient
-
{A782B23E-BE6D-4F51-B5CB-5CD259BA97CC}
BWP.WinFormControl
+
+ WeightConfig.cs
+
WeightForm.cs
diff --git a/ButcherWeight/WeightConfig.Designer.cs b/ButcherWeight/WeightConfig.Designer.cs
new file mode 100644
index 0000000..87dfb78
--- /dev/null
+++ b/ButcherWeight/WeightConfig.Designer.cs
@@ -0,0 +1,203 @@
+namespace ButcherWeight
+{
+ partial class WeightConfig
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.label1 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label4 = new System.Windows.Forms.Label();
+ this.weightSet = new System.Windows.Forms.ComboBox();
+ this.comSet = new System.Windows.Forms.ComboBox();
+ this.rateSet = new System.Windows.Forms.ComboBox();
+ this.bitSet = new System.Windows.Forms.ComboBox();
+ this.saveBtn = new System.Windows.Forms.Button();
+ this.closeBtn = new System.Windows.Forms.Button();
+ this.label5 = new System.Windows.Forms.Label();
+ this.format = new System.Windows.Forms.TextBox();
+ this.SuspendLayout();
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Font = new System.Drawing.Font("宋体", 15F);
+ this.label1.Location = new System.Drawing.Point(39, 30);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(89, 20);
+ this.label1.TabIndex = 0;
+ this.label1.Text = "称型号：";
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Font = new System.Drawing.Font("宋体", 15F);
+ this.label2.Location = new System.Drawing.Point(39, 78);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(89, 20);
+ this.label2.TabIndex = 1;
+ this.label2.Text = "端口号：";
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Font = new System.Drawing.Font("宋体", 15F);
+ this.label3.Location = new System.Drawing.Point(39, 128);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(89, 20);
+ this.label3.TabIndex = 2;
+ this.label3.Text = "波特率：";
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Font = new System.Drawing.Font("宋体", 15F);
+ this.label4.Location = new System.Drawing.Point(39, 180);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(89, 20);
+ this.label4.TabIndex = 3;
+ this.label4.Text = "数据位：";
+ //
+ // weightSet
+ //
+ this.weightSet.Font = new System.Drawing.Font("宋体", 15F);
+ this.weightSet.FormattingEnabled = true;
+ this.weightSet.Location = new System.Drawing.Point(161, 27);
+ this.weightSet.Name = "weightSet";
+ this.weightSet.Size = new System.Drawing.Size(121, 28);
+ this.weightSet.TabIndex = 4;
+ //
+ // comSet
+ //
+ this.comSet.Font = new System.Drawing.Font("宋体", 15F);
+ this.comSet.FormattingEnabled = true;
+ this.comSet.Location = new System.Drawing.Point(161, 75);
+ this.comSet.Name = "comSet";
+ this.comSet.Size = new System.Drawing.Size(121, 28);
+ this.comSet.TabIndex = 5;
+ //
+ // rateSet
+ //
+ this.rateSet.Font = new System.Drawing.Font("宋体", 15F);
+ this.rateSet.FormattingEnabled = true;
+ this.rateSet.Location = new System.Drawing.Point(161, 125);
+ this.rateSet.Name = "rateSet";
+ this.rateSet.Size = new System.Drawing.Size(121, 28);
+ this.rateSet.TabIndex = 5;
+ //
+ // bitSet
+ //
+ this.bitSet.Font = new System.Drawing.Font("宋体", 15F);
+ this.bitSet.FormattingEnabled = true;
+ this.bitSet.Location = new System.Drawing.Point(161, 177);
+ this.bitSet.Name = "bitSet";
+ this.bitSet.Size = new System.Drawing.Size(121, 28);
+ this.bitSet.TabIndex = 5;
+ //
+ // saveBtn
+ //
+ this.saveBtn.Font = new System.Drawing.Font("宋体", 15F);
+ this.saveBtn.Location = new System.Drawing.Point(71, 280);
+ this.saveBtn.Name = "saveBtn";
+ this.saveBtn.Size = new System.Drawing.Size(75, 35);
+ this.saveBtn.TabIndex = 6;
+ this.saveBtn.Text = "保存";
+ this.saveBtn.UseVisualStyleBackColor = true;
+ this.saveBtn.Click += new System.EventHandler(this.saveBtn_Click);
+ //
+ // closeBtn
+ //
+ this.closeBtn.Font = new System.Drawing.Font("宋体", 15F);
+ this.closeBtn.Location = new System.Drawing.Point(177, 280);
+ this.closeBtn.Name = "closeBtn";
+ this.closeBtn.Size = new System.Drawing.Size(75, 35);
+ this.closeBtn.TabIndex = 7;
+ this.closeBtn.Text = "关闭";
+ this.closeBtn.UseVisualStyleBackColor = true;
+ this.closeBtn.Click += new System.EventHandler(this.closeBtn_Click);
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Font = new System.Drawing.Font("宋体", 15F);
+ this.label5.Location = new System.Drawing.Point(39, 230);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(109, 20);
+ this.label5.TabIndex = 8;
+ this.label5.Text = "显示格式：";
+ //
+ // format
+ //
+ this.format.Font = new System.Drawing.Font("宋体", 14F);
+ this.format.Location = new System.Drawing.Point(161, 228);
+ this.format.Name = "format";
+ this.format.Size = new System.Drawing.Size(121, 29);
+ this.format.TabIndex = 9;
+ //
+ // WeightConfig
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(354, 343);
+ this.Controls.Add(this.format);
+ this.Controls.Add(this.label5);
+ this.Controls.Add(this.closeBtn);
+ this.Controls.Add(this.saveBtn);
+ this.Controls.Add(this.bitSet);
+ this.Controls.Add(this.rateSet);
+ this.Controls.Add(this.comSet);
+ this.Controls.Add(this.weightSet);
+ this.Controls.Add(this.label4);
+ this.Controls.Add(this.label3);
+ this.Controls.Add(this.label2);
+ this.Controls.Add(this.label1);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+ this.MaximizeBox = false;
+ this.Name = "WeightConfig";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "称设置";
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.ComboBox weightSet;
+ private System.Windows.Forms.ComboBox comSet;
+ private System.Windows.Forms.ComboBox rateSet;
+ private System.Windows.Forms.ComboBox bitSet;
+ private System.Windows.Forms.Button saveBtn;
+ private System.Windows.Forms.Button closeBtn;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.TextBox format;
+ }
+}
\ No newline at end of file
diff --git a/ButcherWeight/WeightConfig.cs b/ButcherWeight/WeightConfig.cs
new file mode 100644
index 0000000..6118032
--- /dev/null
+++ b/ButcherWeight/WeightConfig.cs
@@ -0,0 +1,64 @@
+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 ButcherWeight
+{
+ public partial class WeightConfig : Form
+ {
+ List weight = new List { "IND560", "Xk3124", "Xk3190A9", "Xk3190D10" };
+ List com = new List { "COM1", "COM2", "COM3", "COM4", "COM5" };
+ List rate = new List { "4800", "7200", "9600" };
+ List bit = new List { "5", "6", "7", "8" };
+ public WeightConfig()
+ {
+ InitializeComponent();
+ weightSet.DataSource = weight;
+ comSet.DataSource = com;
+ rateSet.DataSource = rate;
+ bitSet.DataSource = bit;
+ if (!string.IsNullOrEmpty(WeightContext.Config.WeightSet))
+ weightSet.SelectedIndex = weight.IndexOf(WeightContext.Config.WeightSet);
+ else
+ weightSet.SelectedIndex = 0;
+ if (!string.IsNullOrEmpty(WeightContext.Config.ComSet))
+ comSet.SelectedIndex = com.IndexOf(WeightContext.Config.ComSet);
+ else
+ comSet.SelectedIndex = 0;
+ if (WeightContext.Config.RateSet.HasValue)
+ rateSet.SelectedIndex = rate.IndexOf(WeightContext.Config.RateSet.ToString());
+ else
+ rateSet.SelectedIndex = 2;
+ if (WeightContext.Config.BitSet.HasValue)
+ bitSet.SelectedIndex = bit.IndexOf(WeightContext.Config.BitSet.ToString());
+ else
+ bitSet.SelectedIndex = 3;
+ if (string.IsNullOrEmpty(WeightContext.Config.Format))
+ format.Text = "0.00";
+ else
+ format.Text = WeightContext.Config.Format;
+ }
+
+ private void saveBtn_Click(object sender, EventArgs e)
+ {
+ WeightContext.Config.WeightSet = weight[this.weightSet.SelectedIndex];
+ WeightContext.Config.ComSet = com[this.comSet.SelectedIndex];
+ WeightContext.Config.RateSet = int.Parse(rate[this.rateSet.SelectedIndex]);
+ WeightContext.Config.BitSet = int.Parse(bit[this.bitSet.SelectedIndex]);
+ WeightContext.Config.Format = format.Text;
+ WeightContext.Save();
+ MessageBox.Show("保存成功！");
+ }
+
+ private void closeBtn_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+ }
+}
diff --git a/ButcherWeight/WeightConfig.resx b/ButcherWeight/WeightConfig.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/ButcherWeight/WeightConfig.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/ButcherWeight/WeightContext.cs b/ButcherWeight/WeightContext.cs
new file mode 100644
index 0000000..c7edcc8
--- /dev/null
+++ b/ButcherWeight/WeightContext.cs
@@ -0,0 +1,78 @@
+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 ButcherWeight
+{
+ public static class WeightContext
+ {
+//#if relase
+ // private static string loginConfigPath = Application.StartupPath + "\\WeightSetting.xml";
+//#endif
+//#if debug
+ private static string loginConfigPath = @"C:\B3Service\src\B3ButcherManageClient\ButcherManageClient\bin\Debug\WeightSetting.xml";
+//#endif
+ private static WeightSetting _config;
+ public static WeightSetting Config
+ {
+ get
+ {
+ if (_config == null)
+ _config = CreateConfig();
+ return _config;
+ }
+ }
+ static WeightSetting CreateConfig()
+ {
+ var config = new WeightSetting();
+ if (!File.Exists(loginConfigPath))
+ {
+ XmlUtil.SerializerObjToFile(config, loginConfigPath);
+ }
+ else
+ config = XmlUtil.DeserializeFromFile(loginConfigPath);
+ return config;
+ }
+
+ public static void Save()
+ {
+ if (string.IsNullOrEmpty(_config.WeightSet))
+ throw new Exception("请选择称型号");
+ if (string.IsNullOrEmpty(_config.ComSet))
+ throw new Exception("请选择Com口");
+ if (_config.RateSet==null)
+ throw new Exception("请选择波特率");
+ if (_config.BitSet == null)
+ throw new Exception("请选择数据位");
+ if (string.IsNullOrEmpty(_config.Format))
+ throw new Exception("请填写显示格式");
+ try
+ {
+ string.Format("{0:" + _config.Format + "}", 1);
+ }
+ catch (Exception ex)
+ {
+ throw new Exception("显示格式填写错误\n" + ex.Message);
+ }
+ XmlUtil.SerializerObjToFile(_config, loginConfigPath);
+ }
+ }
+
+ public class WeightSetting
+ {
+ public string WeightSet{get;set;}
+
+ public string ComSet{get;set;}
+
+ public int? RateSet{get;set;}
+
+ public int? BitSet{get;set;}
+
+ public string Format{get;set;}
+ }
+}
diff --git a/ButcherWeight/WeightForm.Designer.cs b/ButcherWeight/WeightForm.Designer.cs
index 0007080..4fb9c31 100644
--- a/ButcherWeight/WeightForm.Designer.cs
+++ b/ButcherWeight/WeightForm.Designer.cs
@@ -13,6 +13,7 @@
/// true if managed resources should be disposed; otherwise, false.
protected override void Dispose(bool disposing)
{
+ mainIsRun = false;
if (disposing && (components != null))
{
components.Dispose();
@@ -28,22 +29,23 @@
///
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 dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle();
this.panel1 = new System.Windows.Forms.Panel();
+ this.weightSet = new System.Windows.Forms.Button();
this.weightControl = new BWP.WinFormControl.WeightControl();
this.exitBtn = new System.Windows.Forms.Button();
this.deleteBtn = new System.Windows.Forms.Button();
@@ -152,6 +154,7 @@
// panel1
//
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.panel1.Controls.Add(this.weightSet);
this.panel1.Controls.Add(this.weightControl);
this.panel1.Controls.Add(this.exitBtn);
this.panel1.Controls.Add(this.deleteBtn);
@@ -165,6 +168,17 @@
this.panel1.Size = new System.Drawing.Size(1252, 95);
this.panel1.TabIndex = 1;
//
+ // weightSet
+ //
+ this.weightSet.Font = new System.Drawing.Font("宋体", 15F);
+ this.weightSet.Location = new System.Drawing.Point(1146, 0);
+ this.weightSet.Name = "weightSet";
+ this.weightSet.Size = new System.Drawing.Size(101, 59);
+ this.weightSet.TabIndex = 10;
+ this.weightSet.Text = "称设置";
+ this.weightSet.UseVisualStyleBackColor = true;
+ this.weightSet.Click += new System.EventHandler(this.weightSet_Click);
+ //
// weightControl
//
this.weightControl.Location = new System.Drawing.Point(0, 0);
@@ -194,6 +208,7 @@
this.deleteBtn.TabIndex = 5;
this.deleteBtn.Text = "删除";
this.deleteBtn.UseVisualStyleBackColor = true;
+ this.deleteBtn.Click += new System.EventHandler(this.deleteBtn_Click);
//
// printBtn
//
@@ -674,17 +689,17 @@
this.farmerGrid.AllowUserToAddRows = false;
this.farmerGrid.AllowUserToResizeColumns = false;
this.farmerGrid.AllowUserToResizeRows = false;
- dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
- this.farmerGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+ dataGridViewCellStyle31.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+ this.farmerGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle31;
this.farmerGrid.BackgroundColor = System.Drawing.Color.White;
- dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 12F);
- dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.farmerGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+ dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle32.Font = new System.Drawing.Font("宋体", 12F);
+ dataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.farmerGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle32;
this.farmerGrid.ColumnHeadersHeight = 24;
this.farmerGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.farmerGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -699,8 +714,8 @@
this.farmerGrid.MultiSelect = false;
this.farmerGrid.Name = "farmerGrid";
this.farmerGrid.RowHeadersVisible = false;
- dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
- this.farmerGrid.RowsDefaultCellStyle = dataGridViewCellStyle3;
+ dataGridViewCellStyle33.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
+ this.farmerGrid.RowsDefaultCellStyle = dataGridViewCellStyle33;
this.farmerGrid.RowTemplate.Height = 23;
this.farmerGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.farmerGrid.Size = new System.Drawing.Size(400, 112);
@@ -783,17 +798,17 @@
this.weightGrid.AllowUserToAddRows = false;
this.weightGrid.AllowUserToResizeColumns = false;
this.weightGrid.AllowUserToResizeRows = false;
- dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
- this.weightGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4;
+ dataGridViewCellStyle34.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+ this.weightGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle34;
this.weightGrid.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.weightGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
+ dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle35.Font = new System.Drawing.Font("宋体", 12F);
+ dataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.weightGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle35;
this.weightGrid.ColumnHeadersHeight = 24;
this.weightGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.weightGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -809,8 +824,8 @@
this.weightGrid.MultiSelect = false;
this.weightGrid.Name = "weightGrid";
this.weightGrid.RowHeadersVisible = false;
- dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
- this.weightGrid.RowsDefaultCellStyle = dataGridViewCellStyle6;
+ dataGridViewCellStyle36.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
+ this.weightGrid.RowsDefaultCellStyle = dataGridViewCellStyle36;
this.weightGrid.RowTemplate.Height = 23;
this.weightGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.weightGrid.Size = new System.Drawing.Size(400, 90);
@@ -891,17 +906,17 @@
this.houseGird.AllowUserToDeleteRows = false;
this.houseGird.AllowUserToResizeColumns = false;
this.houseGird.AllowUserToResizeRows = false;
- dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
- this.houseGird.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7;
+ dataGridViewCellStyle37.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+ this.houseGird.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle37;
this.houseGird.BackgroundColor = System.Drawing.Color.White;
- dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 12F);
- dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.houseGird.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
+ dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle38.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle38.Font = new System.Drawing.Font("宋体", 12F);
+ dataGridViewCellStyle38.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle38.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle38.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.houseGird.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle38;
this.houseGird.ColumnHeadersHeight = 24;
this.houseGird.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.houseGird.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -916,8 +931,8 @@
this.houseGird.MultiSelect = false;
this.houseGird.Name = "houseGird";
this.houseGird.RowHeadersVisible = false;
- dataGridViewCellStyle9.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
- this.houseGird.RowsDefaultCellStyle = dataGridViewCellStyle9;
+ dataGridViewCellStyle39.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
+ this.houseGird.RowsDefaultCellStyle = dataGridViewCellStyle39;
this.houseGird.RowTemplate.Height = 23;
this.houseGird.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.houseGird.Size = new System.Drawing.Size(400, 90);
@@ -980,17 +995,17 @@
this.abnormalGrid.AllowUserToDeleteRows = false;
this.abnormalGrid.AllowUserToResizeColumns = false;
this.abnormalGrid.AllowUserToResizeRows = false;
- dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
- this.abnormalGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10;
+ dataGridViewCellStyle40.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+ this.abnormalGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle40;
this.abnormalGrid.BackgroundColor = System.Drawing.Color.White;
- dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle11.Font = new System.Drawing.Font("宋体", 12F);
- dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.abnormalGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
+ dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle41.Font = new System.Drawing.Font("宋体", 12F);
+ dataGridViewCellStyle41.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle41.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle41.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.abnormalGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle41;
this.abnormalGrid.ColumnHeadersHeight = 24;
this.abnormalGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.abnormalGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -1006,8 +1021,8 @@
this.abnormalGrid.MultiSelect = false;
this.abnormalGrid.Name = "abnormalGrid";
this.abnormalGrid.RowHeadersVisible = false;
- dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
- this.abnormalGrid.RowsDefaultCellStyle = dataGridViewCellStyle12;
+ dataGridViewCellStyle42.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
+ this.abnormalGrid.RowsDefaultCellStyle = dataGridViewCellStyle42;
this.abnormalGrid.RowTemplate.Height = 23;
this.abnormalGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.abnormalGrid.Size = new System.Drawing.Size(400, 237);
@@ -1076,17 +1091,17 @@
this.billGrid.AllowUserToDeleteRows = false;
this.billGrid.AllowUserToResizeColumns = false;
this.billGrid.AllowUserToResizeRows = false;
- dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
- this.billGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle13;
+ dataGridViewCellStyle43.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+ this.billGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle43;
this.billGrid.BackgroundColor = System.Drawing.Color.White;
- dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle14.Font = new System.Drawing.Font("宋体", 12F);
- dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.billGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle14;
+ dataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle44.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle44.Font = new System.Drawing.Font("宋体", 12F);
+ dataGridViewCellStyle44.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle44.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle44.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle44.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.billGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle44;
this.billGrid.ColumnHeadersHeight = 24;
this.billGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.billGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -1105,8 +1120,8 @@
this.billGrid.Name = "billGrid";
this.billGrid.ReadOnly = true;
this.billGrid.RowHeadersVisible = false;
- dataGridViewCellStyle15.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
- this.billGrid.RowsDefaultCellStyle = dataGridViewCellStyle15;
+ dataGridViewCellStyle45.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
+ this.billGrid.RowsDefaultCellStyle = dataGridViewCellStyle45;
this.billGrid.RowTemplate.Height = 23;
this.billGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.billGrid.Size = new System.Drawing.Size(1250, 281);
@@ -1358,5 +1373,6 @@
private System.Windows.Forms.Button deleteBtn;
private System.Windows.Forms.Button printBtn;
private BWP.WinFormControl.WeightControl weightControl;
+ private System.Windows.Forms.Button weightSet;
}
}
\ No newline at end of file
diff --git a/ButcherWeight/WeightForm.cs b/ButcherWeight/WeightForm.cs
index c4ef4c6..6ae54af 100644
--- a/ButcherWeight/WeightForm.cs
+++ b/ButcherWeight/WeightForm.cs
@@ -1,7 +1,6 @@
using BO.BO;
using BO.Utils;
using BO.Utils.BillRpc;
-using ButcherManageClient;
using BWP.WinFormControl;
using System;
using System.Collections.Generic;
@@ -10,6 +9,7 @@ using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
+using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -20,7 +20,7 @@ namespace ButcherWeight
#region IAfterLogin Member
public string RoleName
{
- get { return "_11"; }
+ get { return "过磅员"; }
}
public Form Generate()
@@ -29,6 +29,9 @@ namespace ButcherWeight
}
#endregion
+ private const int WmUpdDisplayMessage = 0x0500 + 2;
+
+ bool mainIsRun = false;
public WeightForm()
{
InitializeComponent();
@@ -49,18 +52,106 @@ namespace ButcherWeight
weightGrid.AutoGenerateColumns = false;
houseGird.AutoGenerateColumns = false;
abnormalGrid.AutoGenerateColumns = false;
- weightControl.EnableCheckBox.CheckedChanged += delegate
+ weightControl.InitWeightInfo += WeightControlInitWeightInfo;
+ weightControl.EnableCheckBox.CheckStateChanged += delegate
{
readMaoBtn.Enabled = readPiBtn.Enabled = weightControl.EnableCheckBox.Checked;
};
- weightControl.InitSerialPort("COM2", 9600, 8);
- weightControl.TypeOfWeight = WeightType.Xk3190A9;
BindWeightBill();
+ mainIsRun = true;
+ var syncThread = new Thread(SyncTask) { IsBackground = true };
+ syncThread.Start();
+ }
+
+ private void SyncTask()
+ {
+ while (mainIsRun)
+ {
+ bool changed = false;
+ var ids = dmoList.Where(x => x.B3ID == null).Select(x => (long?)x.ID).ToList();
+ if (ids.Any())
+ {
+ var result = WeightBillRpc.SyncBillB3Ids(ids);
+ foreach (var item in result)
+ {
+ var first = dmoList.FirstOrDefault(x => x.ID == item.Item1);
+ if (first != null)
+ {
+ first.B3ID = item.Item2;
+ if (!changed)
+ changed = true;
+ }
+ }
+ if (changed)
+ {
+ BindWeightBill();
+ }
+ }
+ var details = new List();
+ var farms = new List();
+ foreach (var dmo in dmoList)
+ {
+ details.AddRange(dmo.Details.Where(x => x.B3ID == null));
+ farms.AddRange(dmo.FarmerDetails.Where(x => x.B3ID == null));
+ }
+ if (details.Any())
+ {
+ var dids = details.Select(x => (long?)x.ID).ToList();
+ var result2 = WeightBillRpc.SyncWeightDetailB3Ids(dids);
+ foreach (var item in result2)
+ {
+ var first = details.FirstOrDefault(x => x.ID == item.Item1);
+ if (first != null)
+ {
+ first.B3ID = item.Item2;
+ }
+ }
+ }
+
+ if (farms.Any())
+ {
+ var dids = farms.Select(x => (long?)x.ID).ToList();
+ var result2 = WeightBillRpc.SyncFarmerDetailB3Ids(dids);
+ foreach (var item in result2)
+ {
+ var first = details.FirstOrDefault(x => x.ID == item.Item1);
+ if (first != null)
+ {
+ first.B3ID = item.Item2;
+ }
+ }
+ }
+ }
+ }
+
+ void WeightControlInitWeightInfo(object sender, EventArgs e)
+ {
+ if (weightControl.EnableCheckBox.Checked)
+ return;
+ if (WeightContext.Config.RateSet == null)
+ throw new Exception("请先配置称相关信息");
+ weightControl.InitSerialPort(WeightContext.Config.ComSet, WeightContext.Config.RateSet.Value, WeightContext.Config.BitSet.Value);
+ switch (WeightContext.Config.WeightSet)
+ {
+ case "IND560":
+ weightControl.TypeOfWeight = WeightType.IND560;
+ break;
+ case "Xk3124":
+ weightControl.TypeOfWeight = WeightType.Xk3124;
+ break;
+ case "Xk3190A9":
+ weightControl.TypeOfWeight = WeightType.Xk3190A9;
+ break;
+ default:
+ weightControl.TypeOfWeight = WeightType.Xk3190D10;
+ break;
+ }
+ //weightControl.InitWeightInfo -= WeightControlInitWeightInfo;
}
void BindWeightBill()
{
- billGrid.DataSource = dmoList.OrderBy(x => x.FinishCreate).ToList();
+ billGrid.DataSource = dmoList.OrderByDescending(x => x.ID).ToList();
billGrid.Refresh();
}
@@ -289,8 +380,10 @@ namespace ButcherWeight
_farmerDetails = Dmo.FarmerDetails.ToList();
_details = Dmo.Details.ToList();
- farmerGrid.DataSource = _farmerDetails;
- weightGrid.DataSource = _details;
+ if (_farmerDetails.Any())
+ farmerGrid.DataSource = _farmerDetails;
+ if (_details.Any())
+ weightGrid.DataSource = _details;
}
void ResetControl()
@@ -323,5 +416,20 @@ namespace ButcherWeight
Dmo = dmoList.First(x => x.ID == id);
AppToUI();
}
+
+ private void weightSet_Click(object sender, EventArgs e)
+ {
+ new WeightConfig().ShowDialog();
+ }
+
+ private void deleteBtn_Click(object sender, EventArgs e)
+ {
+ if (Dmo.ID != 0)
+ WeightBillRpc.Delete(Dmo.ID);
+ dmoList.Remove(Dmo);
+ BindWeightBill();
+ createBtn_Click(sender, e);
+ MessageBox.Show("删除成功！");
+ }
}
}
\ No newline at end of file
diff --git a/QualityAndOrder/QualityAndOrder.csproj b/QualityAndOrder/QualityAndOrder.csproj
index d7d5a84..470da40 100644
--- a/QualityAndOrder/QualityAndOrder.csproj
+++ b/QualityAndOrder/QualityAndOrder.csproj
@@ -61,10 +61,6 @@
{8968f14a-c7c7-4751-96ce-b114fbfd65ef}
BO
-
- {59b13436-4884-4533-9c7e-80e8580cbf55}
- ButcherManageClient
-
{a782b23e-be6d-4f51-b5cb-5cd259ba97cc}
BWP.WinFormControl
diff --git a/QualityAndOrder/QualityOrderForm.Designer.cs b/QualityAndOrder/QualityOrderForm.Designer.cs
index 0431923..79e3106 100644
--- a/QualityAndOrder/QualityOrderForm.Designer.cs
+++ b/QualityAndOrder/QualityOrderForm.Designer.cs
@@ -69,6 +69,12 @@
this.label1 = new System.Windows.Forms.Label();
this.keyBoardPanel = new System.Windows.Forms.FlowLayoutPanel();
this.weightBillGrid = new BWP.WinFormControl.UDataGridView();
+ this.W_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.W_AlreadyHouse = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.W_B3ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.W_Supplier_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.W_HouseNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.W_HouseNames = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.syncBtn = new System.Windows.Forms.Button();
this.testTimeInput = new BWP.WinFormControl.UDatePicker();
this.label20 = new System.Windows.Forms.Label();
@@ -96,12 +102,6 @@
this.tab2SyncBtn = new System.Windows.Forms.Button();
this.tab2DateSelect = new BWP.WinFormControl.UDatePicker();
this.label4 = new System.Windows.Forms.Label();
- this.W_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.W_B3ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.W_Supplier_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.W_HouseNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.W_HouseNames = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.W_FinishCreate = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.uTabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.panel1.SuspendLayout();
@@ -125,7 +125,7 @@
this.uTabControl1.Location = new System.Drawing.Point(0, 0);
this.uTabControl1.Name = "uTabControl1";
this.uTabControl1.SelectedIndex = 0;
- this.uTabControl1.Size = new System.Drawing.Size(1276, 741);
+ this.uTabControl1.Size = new System.Drawing.Size(1276, 873);
this.uTabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
this.uTabControl1.TabIndex = 0;
//
@@ -147,7 +147,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 54);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(1268, 683);
+ this.tabPage1.Size = new System.Drawing.Size(1268, 815);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "验质分圈";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -447,11 +447,11 @@
this.weightBillGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.weightBillGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.W_ID,
+ this.W_AlreadyHouse,
this.W_B3ID,
this.W_Supplier_Name,
this.W_HouseNumber,
- this.W_HouseNames,
- this.W_FinishCreate});
+ this.W_HouseNames});
this.weightBillGrid.Location = new System.Drawing.Point(25, 77);
this.weightBillGrid.MultiSelect = false;
this.weightBillGrid.Name = "weightBillGrid";
@@ -464,6 +464,52 @@
this.weightBillGrid.Size = new System.Drawing.Size(452, 401);
this.weightBillGrid.TabIndex = 34;
//
+ // W_ID
+ //
+ this.W_ID.DataPropertyName = "ID";
+ this.W_ID.HeaderText = "ID";
+ this.W_ID.Name = "W_ID";
+ this.W_ID.ReadOnly = true;
+ this.W_ID.Visible = false;
+ //
+ // W_AlreadyHouse
+ //
+ this.W_AlreadyHouse.DataPropertyName = "AlreadyHouse";
+ this.W_AlreadyHouse.HeaderText = "AlreadyHouse";
+ this.W_AlreadyHouse.Name = "W_AlreadyHouse";
+ this.W_AlreadyHouse.ReadOnly = true;
+ this.W_AlreadyHouse.Visible = false;
+ //
+ // W_B3ID
+ //
+ this.W_B3ID.DataPropertyName = "B3ID";
+ this.W_B3ID.HeaderText = "过磅单号";
+ this.W_B3ID.Name = "W_B3ID";
+ this.W_B3ID.ReadOnly = true;
+ //
+ // W_Supplier_Name
+ //
+ this.W_Supplier_Name.DataPropertyName = "Supplier_Name";
+ this.W_Supplier_Name.HeaderText = "供应商";
+ this.W_Supplier_Name.Name = "W_Supplier_Name";
+ this.W_Supplier_Name.ReadOnly = true;
+ this.W_Supplier_Name.Width = 120;
+ //
+ // W_HouseNumber
+ //
+ this.W_HouseNumber.DataPropertyName = "HouseNumber";
+ this.W_HouseNumber.HeaderText = "头数";
+ this.W_HouseNumber.Name = "W_HouseNumber";
+ this.W_HouseNumber.ReadOnly = true;
+ //
+ // W_HouseNames
+ //
+ this.W_HouseNames.DataPropertyName = "HouseNames";
+ this.W_HouseNames.HeaderText = "圈舍";
+ this.W_HouseNames.Name = "W_HouseNames";
+ this.W_HouseNames.ReadOnly = true;
+ this.W_HouseNames.Width = 120;
+ //
// syncBtn
//
this.syncBtn.Font = new System.Drawing.Font("宋体", 15F);
@@ -768,57 +814,11 @@
this.label4.TabIndex = 35;
this.label4.Text = "日期：";
//
- // W_ID
- //
- this.W_ID.DataPropertyName = "ID";
- this.W_ID.HeaderText = "ID";
- this.W_ID.Name = "W_ID";
- this.W_ID.ReadOnly = true;
- this.W_ID.Visible = false;
- //
- // W_B3ID
- //
- this.W_B3ID.DataPropertyName = "B3ID";
- this.W_B3ID.HeaderText = "过磅单号";
- this.W_B3ID.Name = "W_B3ID";
- this.W_B3ID.ReadOnly = true;
- //
- // W_Supplier_Name
- //
- this.W_Supplier_Name.DataPropertyName = "Supplier_Name";
- this.W_Supplier_Name.HeaderText = "供应商";
- this.W_Supplier_Name.Name = "W_Supplier_Name";
- this.W_Supplier_Name.ReadOnly = true;
- this.W_Supplier_Name.Width = 120;
- //
- // W_HouseNumber
- //
- this.W_HouseNumber.DataPropertyName = "HouseNumber";
- this.W_HouseNumber.HeaderText = "头数";
- this.W_HouseNumber.Name = "W_HouseNumber";
- this.W_HouseNumber.ReadOnly = true;
- //
- // W_HouseNames
- //
- this.W_HouseNames.DataPropertyName = "HouseNames";
- this.W_HouseNames.HeaderText = "圈舍";
- this.W_HouseNames.Name = "W_HouseNames";
- this.W_HouseNames.ReadOnly = true;
- this.W_HouseNames.Width = 120;
- //
- // W_FinishCreate
- //
- this.W_FinishCreate.DataPropertyName = "FinishCreate";
- this.W_FinishCreate.HeaderText = "标识列勿去";
- this.W_FinishCreate.Name = "W_FinishCreate";
- this.W_FinishCreate.ReadOnly = true;
- this.W_FinishCreate.Visible = false;
- //
// QualityOrderForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1276, 741);
+ this.ClientSize = new System.Drawing.Size(1276, 873);
this.Controls.Add(this.uTabControl1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.MaximizeBox = false;
@@ -901,11 +901,11 @@
private System.Windows.Forms.DataGridViewTextBoxColumn S_Sanction_ID3;
private System.Windows.Forms.DataGridViewTextBoxColumn S_AbnormalItem_ID3;
private System.Windows.Forms.DataGridViewTextBoxColumn W_ID;
+ private System.Windows.Forms.DataGridViewTextBoxColumn W_AlreadyHouse;
private System.Windows.Forms.DataGridViewTextBoxColumn W_B3ID;
private System.Windows.Forms.DataGridViewTextBoxColumn W_Supplier_Name;
private System.Windows.Forms.DataGridViewTextBoxColumn W_HouseNumber;
private System.Windows.Forms.DataGridViewTextBoxColumn W_HouseNames;
- private System.Windows.Forms.DataGridViewTextBoxColumn W_FinishCreate;
diff --git a/QualityAndOrder/QualityOrderForm.cs b/QualityAndOrder/QualityOrderForm.cs
index 20fa987..85a8bb0 100644
--- a/QualityAndOrder/QualityOrderForm.cs
+++ b/QualityAndOrder/QualityOrderForm.cs
@@ -1,7 +1,6 @@
using BO.BO;
using BO.Utils;
using BO.Utils.BillRpc;
-using ButcherManageClient;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -9,6 +8,7 @@ using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
+using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -19,7 +19,7 @@ namespace QualityAndOrder
#region IAfterLogin
public string RoleName
{
- get { return "_1"; }
+ get { return "验质员"; }
}
public Form Generate()
@@ -33,15 +33,23 @@ namespace QualityAndOrder
List houseList;
List sanctionList;
List weightBills;
+ private Thread tab1SyncThread;
+ bool mainIsRun = false;
readonly Color btnSelectForeColor = Color.FromArgb(255, 255, 255);
readonly Color btnSelectBackColor = Color.FromArgb(66, 163, 218);
Color btnUnSelectForeColor = SystemColors.ControlText;
Color btnUnSelectBackColor = Color.FromArgb(225, 225, 225);
- int inHouseNumber = 0;
public QualityOrderForm()
{
InitializeComponent();
+ this.FormClosing += delegate
+ {
+ if (tab1SyncThread != null && tab1SyncThread.IsAlive)
+ {
+ tab1SyncThread.Abort();
+ }
+ };
testTimeInput.Date = tab2DateSelect.Date = DateTime.Today;
syncBtn.Focus();
this.uTabControl1.Selected += (sender, e) =>
@@ -63,18 +71,19 @@ namespace QualityAndOrder
numberBox.LostFocus += (sender, e) => { flag = 1; };
sanctionGrid.GotFocus += (sender, e) => { flag = 2; };
+ mainIsRun = true;
}
int flag = 0;
private void BindWeightBillGrid()
{
- weightBillGrid.DataSource = weightBills.OrderBy(x => x.ID).OrderBy(x => x.FinishCreate).ToList();
+ weightBillGrid.DataSource = null;
+ weightBillGrid.DataSource = weightBills.OrderBy(x => x.ID).OrderBy(x => x.AlreadyHouse).ToList();
foreach (DataGridViewRow row in weightBillGrid.Rows)
{
- if ((bool)row.Cells["W_FinishCreate"].Value)
+ if ((bool)row.Cells["W_AlreadyHouse"].Value)
row.DefaultCellStyle.BackColor = Color.YellowGreen;
-
}
weightBillGrid.Refresh();
}
@@ -309,15 +318,14 @@ namespace QualityAndOrder
private void commitBtn_Click(object sender, EventArgs e)
{
var entity = GetHouseDataFromUI();
+ entity.AlreadyHouse = true;
var result = WeightBillRpc.InsertHouseAndSanctionInfo(entity);
if (result == 1)
{
MessageBox.Show("提交成功");
- entity.FinishCreate = true;
- BindWeightBillGrid();
- inHouseNumber += (entity.HouseNumber ?? 0);
- inHouseNumberLabel.Text = inHouseNumber.ToString();
- ResetTab1Controls();
+ BindWeightBillGrid();
+ BindNumberLabel();
+ ResetTab1Controls();
}
else
MessageBox.Show("结果", "提交失败", MessageBoxButtons.OK, MessageBoxIcon.Error);
@@ -325,10 +333,24 @@ namespace QualityAndOrder
private void syncBtn_Click(object sender, EventArgs e)
{
- weightBills = WeightBillRpc.GetUnHousedBill(testTimeInput.Date.Value);
- BindWeightBillGrid();
+ tab1SyncThread = new Thread(StartQuery) { IsBackground = true };
+ tab1SyncThread.Start();
+ }
+
+ private void StartQuery()
+ {
+ while (mainIsRun)
+ {
+ weightBills = WeightBillRpc.GetUnHousedBill(testTimeInput.Date.Value);
+ BindWeightBillGrid();
+ BindNumberLabel();
+ Thread.Sleep(5000);
+ }
+ }
- inHouseNumber = WeightBillRpc.GetHouseDetailTotalNumber(testTimeInput.Date.Value);
+ void BindNumberLabel()
+ {
+ var inHouseNumber = WeightBillRpc.GetHouseDetailTotalNumber(testTimeInput.Date.Value);
inHouseNumberLabel.Text = inHouseNumber.ToString();
}
@@ -345,11 +367,13 @@ namespace QualityAndOrder
throw new Exception("请选等级");
if (houseSelectedBtn.Count == 0)
throw new Exception("请选择圈舍");
-
- if (houseSelectedBtn.Count > 1)
- throw new Exception("不允许分圈");
- var house = houseSelectedBtn[0].Tag as Tuple;
- entity.HouseDetails.Add(new WeightBill_HouseDetail() { WeightBill_ID = entity.ID, Index = 1, LiveColonyHouse_ID = long.Parse(house.Item1), LiveColonyHouse_Name = house.Item2, Number = int.Parse(numberBox.Text) });
+ foreach (var btn in houseSelectedBtn)
+ {
+ var house = btn.Tag as Tuple;
+ var houseDetail = new WeightBill_HouseDetail() { WeightBill_ID = entity.ID, LiveColonyHouse_ID = long.Parse(house.Item1), LiveColonyHouse_Name = house.Item2, Number = int.Parse(numberBox.Text) };
+ entity.HouseDetails.Add(houseDetail);
+ houseDetail.Index = entity.HouseDetails.Max(x => x.Index) + 1;
+ }
var gradeTag = currentBtn.Tag as Tuple;
entity.HogGrade_ID = long.Parse(gradeTag.Item1);
entity.HogGrade_Name = gradeTag.Item2;
diff --git a/QualityAndOrder/QualityOrderForm.resx b/QualityAndOrder/QualityOrderForm.resx
index d9e6c6a..b36c803 100644
--- a/QualityAndOrder/QualityOrderForm.resx
+++ b/QualityAndOrder/QualityOrderForm.resx
@@ -156,6 +156,9 @@
True
+
+ True
+
True
@@ -168,9 +171,6 @@
True
-
- True
-
True
diff --git a/Setup/Release/Setup.msi b/Setup/Release/Setup.msi
new file mode 100644
index 0000000..1f2d5f3
Binary files /dev/null and b/Setup/Release/Setup.msi differ
diff --git a/Setup/Release/setup.exe b/Setup/Release/setup.exe
new file mode 100644
index 0000000..b88526e
Binary files /dev/null and b/Setup/Release/setup.exe differ
diff --git a/Setup/Setup.vdproj b/Setup/Setup.vdproj
new file mode 100644
index 0000000..08cc61a
--- /dev/null
+++ b/Setup/Setup.vdproj
@@ -0,0 +1,1293 @@
+"DeployProject"
+{
+"VSVersion" = "3:800"
+"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}"
+"IsWebType" = "8:FALSE"
+"ProjectName" = "8:Setup"
+"LanguageId" = "3:2052"
+"CodePage" = "3:936"
+"UILanguageId" = "3:2052"
+"SccProjectName" = "8:"
+"SccLocalPath" = "8:"
+"SccAuxPath" = "8:"
+"SccProvider" = "8:"
+ "Hierarchy"
+ {
+ "Entry"
+ {
+ "MsmKey" = "8:_256D496D5DAF74C74B6417F600F173BF"
+ "OwnerKey" = "8:_5028DE72CC42424CB6B2165E77BED521"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_5028DE72CC42424CB6B2165E77BED521"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_561DA641348F488AB17CF44013258EBD"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_5DDE73D6E26642C99C1F3ED80EAAA5D0"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_72C299799A4A4FCE805FFC4FC20FAFEF"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_830258A5E5B0C75EB3217B2F333721DD"
+ "OwnerKey" = "8:_5028DE72CC42424CB6B2165E77BED521"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_830258A5E5B0C75EB3217B2F333721DD"
+ "OwnerKey" = "8:_72C299799A4A4FCE805FFC4FC20FAFEF"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_830258A5E5B0C75EB3217B2F333721DD"
+ "OwnerKey" = "8:_5DDE73D6E26642C99C1F3ED80EAAA5D0"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_830258A5E5B0C75EB3217B2F333721DD"
+ "OwnerKey" = "8:_561DA641348F488AB17CF44013258EBD"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_89319829C5BC8CDDFC1FB1D262E6991C"
+ "OwnerKey" = "8:_256D496D5DAF74C74B6417F600F173BF"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_89319829C5BC8CDDFC1FB1D262E6991C"
+ "OwnerKey" = "8:_5028DE72CC42424CB6B2165E77BED521"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_979CC2EB59B6C7E491AD72579499256C"
+ "OwnerKey" = "8:_D70677C1F9DC077D2965162D8840C815"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_979CC2EB59B6C7E491AD72579499256C"
+ "OwnerKey" = "8:_5028DE72CC42424CB6B2165E77BED521"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_979CC2EB59B6C7E491AD72579499256C"
+ "OwnerKey" = "8:_256D496D5DAF74C74B6417F600F173BF"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "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:_830258A5E5B0C75EB3217B2F333721DD"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_D70677C1F9DC077D2965162D8840C815"
+ "OwnerKey" = "8:_5028DE72CC42424CB6B2165E77BED521"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_D70677C1F9DC077D2965162D8840C815"
+ "OwnerKey" = "8:_98A60679F483030FB04D2F427A69CA4A"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_DF7E0B7862E40C1FF8767A6E515DF857"
+ "OwnerKey" = "8:_256D496D5DAF74C74B6417F600F173BF"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_DF7E0B7862E40C1FF8767A6E515DF857"
+ "OwnerKey" = "8:_5028DE72CC42424CB6B2165E77BED521"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_F84D369AFA59BAC8CB50CE356C763AA0"
+ "OwnerKey" = "8:_256D496D5DAF74C74B6417F600F173BF"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_F84D369AFA59BAC8CB50CE356C763AA0"
+ "OwnerKey" = "8:_5028DE72CC42424CB6B2165E77BED521"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_F84D369AFA59BAC8CB50CE356C763AA0"
+ "OwnerKey" = "8:_89319829C5BC8CDDFC1FB1D262E6991C"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_979CC2EB59B6C7E491AD72579499256C"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_5DDE73D6E26642C99C1F3ED80EAAA5D0"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_561DA641348F488AB17CF44013258EBD"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_72C299799A4A4FCE805FFC4FC20FAFEF"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_5028DE72CC42424CB6B2165E77BED521"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_256D496D5DAF74C74B6417F600F173BF"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_89319829C5BC8CDDFC1FB1D262E6991C"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_F84D369AFA59BAC8CB50CE356C763AA0"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_DF7E0B7862E40C1FF8767A6E515DF857"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_98A60679F483030FB04D2F427A69CA4A"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_830258A5E5B0C75EB3217B2F333721DD"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_D70677C1F9DC077D2965162D8840C815"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ }
+ "Configurations"
+ {
+ "Debug"
+ {
+ "DisplayName" = "8:Debug"
+ "IsDebugOnly" = "11:TRUE"
+ "IsReleaseOnly" = "11:FALSE"
+ "OutputFilename" = "8:Debug\\Setup.msi"
+ "PackageFilesAs" = "3:2"
+ "PackageFileSize" = "3:-2147483648"
+ "CabType" = "3:1"
+ "Compression" = "3:2"
+ "SignOutput" = "11:FALSE"
+ "CertificateFile" = "8:"
+ "PrivateKeyFile" = "8:"
+ "TimeStampServer" = "8:"
+ "InstallerBootstrapper" = "3:2"
+ }
+ "Release"
+ {
+ "DisplayName" = "8:Release"
+ "IsDebugOnly" = "11:FALSE"
+ "IsReleaseOnly" = "11:TRUE"
+ "OutputFilename" = "8:Release\\Setup.msi"
+ "PackageFilesAs" = "3:2"
+ "PackageFileSize" = "3:-2147483648"
+ "CabType" = "3:1"
+ "Compression" = "3:2"
+ "SignOutput" = "11:FALSE"
+ "CertificateFile" = "8:"
+ "PrivateKeyFile" = "8:"
+ "TimeStampServer" = "8:"
+ "InstallerBootstrapper" = "3:2"
+ }
+ }
+ "Deployable"
+ {
+ "CustomAction"
+ {
+ }
+ "DefaultFeature"
+ {
+ "Name" = "8:DefaultFeature"
+ "Title" = "8:"
+ "Description" = "8:"
+ }
+ "ExternalPersistence"
+ {
+ "LaunchCondition"
+ {
+ "{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_87DEA6432A6F4BDAADF51C7D10F8327B"
+ {
+ "Name" = "8:.NET Framework"
+ "Message" = "8:[VSDNETMSG]"
+ "FrameworkVersion" = "8:.NETFramework,Version=v4.5"
+ "AllowLaterVersions" = "11:FALSE"
+ "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=395269"
+ }
+ }
+ }
+ "File"
+ {
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_256D496D5DAF74C74B6417F600F173BF"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:Forks.EnterpriseServices, Version=3.1.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_256D496D5DAF74C74B6417F600F173BF"
+ {
+ "Name" = "8:Forks.EnterpriseServices.dll"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:Forks.EnterpriseServices.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}:_561DA641348F488AB17CF44013258EBD"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:ButcherOrder, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_561DA641348F488AB17CF44013258EBD"
+ {
+ "Name" = "8:ButcherOrder.dll"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:..\\ButcherOrder\\bin\\Release\\ButcherOrder.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:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5DDE73D6E26642C99C1F3ED80EAAA5D0"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:QualityAndOrder, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_5DDE73D6E26642C99C1F3ED80EAAA5D0"
+ {
+ "Name" = "8:QualityAndOrder.dll"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:..\\QualityAndOrder\\bin\\Release\\QualityAndOrder.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:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_72C299799A4A4FCE805FFC4FC20FAFEF"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:ButcherWeight, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_72C299799A4A4FCE805FFC4FC20FAFEF"
+ {
+ "Name" = "8:ButcherWeight.dll"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:..\\ButcherWeight\\bin\\Release\\ButcherWeight.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:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_830258A5E5B0C75EB3217B2F333721DD"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:BO, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_830258A5E5B0C75EB3217B2F333721DD"
+ {
+ "Name" = "8:BO.dll"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:BO.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}:_89319829C5BC8CDDFC1FB1D262E6991C"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:MongoDB.Driver, Version=1.4.0.4468, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_89319829C5BC8CDDFC1FB1D262E6991C"
+ {
+ "Name" = "8:MongoDB.Driver.dll"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:MongoDB.Driver.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}:_979CC2EB59B6C7E491AD72579499256C"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:Forks.Json, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_979CC2EB59B6C7E491AD72579499256C"
+ {
+ "Name" = "8:Forks.Json.dll"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:Forks.Json.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}:_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"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:Forks.JsonRpc.Client, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_D70677C1F9DC077D2965162D8840C815"
+ {
+ "Name" = "8:Forks.JsonRpc.Client.dll"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:Forks.JsonRpc.Client.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}:_DF7E0B7862E40C1FF8767A6E515DF857"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:Forks.Utils, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_DF7E0B7862E40C1FF8767A6E515DF857"
+ {
+ "Name" = "8:Forks.Utils.dll"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:Forks.Utils.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}:_F84D369AFA59BAC8CB50CE356C763AA0"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:MongoDB.Bson, Version=1.4.0.4468, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_F84D369AFA59BAC8CB50CE356C763AA0"
+ {
+ "Name" = "8:MongoDB.Bson.dll"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:MongoDB.Bson.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:"
+ }
+ }
+ "FileType"
+ {
+ }
+ "Folder"
+ {
+ "{1525181F-901A-416C-8A58-119130FE478E}:_149CF5B66959486BBEFE9A20DCE0CB90"
+ {
+ "Name" = "8:#1916"
+ "AlwaysCreate" = "11:FALSE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:DesktopFolder"
+ "Folders"
+ {
+ }
+ }
+ "{1525181F-901A-416C-8A58-119130FE478E}:_600CD7DD410D4CF9BC484C76FFCE1659"
+ {
+ "Name" = "8:#1919"
+ "AlwaysCreate" = "11:FALSE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:ProgramMenuFolder"
+ "Folders"
+ {
+ "{9EF0B969-E518-4E46-987F-47570745A589}:_6A9AEF82A91D4871A418FFFC8B0CA444"
+ {
+ "Name" = "8:青花瓷屠宰场管理"
+ "AlwaysCreate" = "11:FALSE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:_D80AE9DF85504035A92647D1207B01C1"
+ "Folders"
+ {
+ }
+ }
+ }
+ }
+ "{3C67513D-01DD-4637-8A68-80971EB9504F}:_BEB5263E66544AA0ADFECA514F610FF5"
+ {
+ "DefaultLocation" = "8:[ProgramFilesFolder]\\BWP\\ButcherMangeClient"
+ "Name" = "8:#1925"
+ "AlwaysCreate" = "11:FALSE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:TARGETDIR"
+ "Folders"
+ {
+ }
+ }
+ }
+ "LaunchCondition"
+ {
+ }
+ "Locator"
+ {
+ }
+ "MsiBootstrapper"
+ {
+ "LangId" = "3:2052"
+ "RequiresElevation" = "11:FALSE"
+ }
+ "Product"
+ {
+ "Name" = "8:Microsoft Visual Studio"
+ "ProductName" = "8:Setup"
+ "ProductCode" = "8:{9750270C-239F-49FC-8F8D-9B43F86B061D}"
+ "PackageCode" = "8:{F8FFD89C-6BD8-40E4-8CC5-F9AE5D8BB416}"
+ "UpgradeCode" = "8:{36F49E93-1C91-49B0-BB59-9984FC596D30}"
+ "AspNetVersion" = "8:4.0.30319.0"
+ "RestartWWWService" = "11:FALSE"
+ "RemovePreviousVersions" = "11:FALSE"
+ "DetectNewerInstalledVersion" = "11:TRUE"
+ "InstallAllUsers" = "11:FALSE"
+ "ProductVersion" = "8:1.0.0"
+ "Manufacturer" = "8:Default Company Name"
+ "ARPHELPTELEPHONE" = "8:"
+ "ARPHELPLINK" = "8:"
+ "Title" = "8:Setup"
+ "Subject" = "8:"
+ "ARPCONTACT" = "8:Default Company Name"
+ "Keywords" = "8:"
+ "ARPCOMMENTS" = "8:"
+ "ARPURLINFOABOUT" = "8:"
+ "ARPPRODUCTICON" = "8:"
+ "ARPIconIndex" = "3:0"
+ "SearchPath" = "8:"
+ "UseSystemSearchPath" = "11:TRUE"
+ "TargetPlatform" = "3:0"
+ "PreBuildEvent" = "8:"
+ "PostBuildEvent" = "8:"
+ "RunPostBuildEvent" = "3:0"
+ }
+ "Registry"
+ {
+ "HKLM"
+ {
+ "Keys"
+ {
+ "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_1AA59FA39D9E482FADFD5C269B4B6F41"
+ {
+ "Name" = "8:Software"
+ "Condition" = "8:"
+ "AlwaysCreate" = "11:FALSE"
+ "DeleteAtUninstall" = "11:FALSE"
+ "Transitive" = "11:FALSE"
+ "Keys"
+ {
+ "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_C915B76A693447B0B56F6857A45269FF"
+ {
+ "Name" = "8:[Manufacturer]"
+ "Condition" = "8:"
+ "AlwaysCreate" = "11:FALSE"
+ "DeleteAtUninstall" = "11:FALSE"
+ "Transitive" = "11:FALSE"
+ "Keys"
+ {
+ }
+ "Values"
+ {
+ }
+ }
+ }
+ "Values"
+ {
+ }
+ }
+ }
+ }
+ "HKCU"
+ {
+ "Keys"
+ {
+ "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_31C0DB210D06414C924DD9443012A38F"
+ {
+ "Name" = "8:Software"
+ "Condition" = "8:"
+ "AlwaysCreate" = "11:FALSE"
+ "DeleteAtUninstall" = "11:FALSE"
+ "Transitive" = "11:FALSE"
+ "Keys"
+ {
+ "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_EC8D02CF157E417B9B81F0AF09E0F4E3"
+ {
+ "Name" = "8:[Manufacturer]"
+ "Condition" = "8:"
+ "AlwaysCreate" = "11:FALSE"
+ "DeleteAtUninstall" = "11:FALSE"
+ "Transitive" = "11:FALSE"
+ "Keys"
+ {
+ }
+ "Values"
+ {
+ }
+ }
+ }
+ "Values"
+ {
+ }
+ }
+ }
+ }
+ "HKCR"
+ {
+ "Keys"
+ {
+ }
+ }
+ "HKU"
+ {
+ "Keys"
+ {
+ }
+ }
+ "HKPU"
+ {
+ "Keys"
+ {
+ }
+ }
+ }
+ "Sequences"
+ {
+ }
+ "Shortcut"
+ {
+ "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_3D53A90C023F4FB98959EC159270FF9C"
+ {
+ "Name" = "8:青花瓷屠宰场管理"
+ "Arguments" = "8:"
+ "Description" = "8:"
+ "ShowCmd" = "3:1"
+ "IconIndex" = "3:0"
+ "Transitive" = "11:FALSE"
+ "Target" = "8:_5028DE72CC42424CB6B2165E77BED521"
+ "Folder" = "8:_149CF5B66959486BBEFE9A20DCE0CB90"
+ "WorkingFolder" = "8:_BEB5263E66544AA0ADFECA514F610FF5"
+ "Icon" = "8:"
+ "Feature" = "8:"
+ }
+ "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_E2245F47FFC946D6A0BB8A0E566D4DCE"
+ {
+ "Name" = "8:青花瓷屠宰场管理"
+ "Arguments" = "8:"
+ "Description" = "8:"
+ "ShowCmd" = "3:1"
+ "IconIndex" = "3:0"
+ "Transitive" = "11:FALSE"
+ "Target" = "8:_5028DE72CC42424CB6B2165E77BED521"
+ "Folder" = "8:_6A9AEF82A91D4871A418FFFC8B0CA444"
+ "WorkingFolder" = "8:_BEB5263E66544AA0ADFECA514F610FF5"
+ "Icon" = "8:"
+ "Feature" = "8:"
+ }
+ }
+ "UserInterface"
+ {
+ "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_0AA7E39E1C6E44D7BFB4C593DEC6A095"
+ {
+ "Name" = "8:#1900"
+ "Sequence" = "3:2"
+ "Attributes" = "3:1"
+ "Dialogs"
+ {
+ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_5314408DF0C54342B9791610912B508F"
+ {
+ "Sequence" = "3:300"
+ "DisplayName" = "8:确认安装"
+ "UseDynamicProperties" = "11:TRUE"
+ "IsDependency" = "11:FALSE"
+ "SourcePath" = "8:\\VsdAdminConfirmDlg.wid"
+ "Properties"
+ {
+ "BannerBitmap"
+ {
+ "Name" = "8:BannerBitmap"
+ "DisplayName" = "8:#1001"
+ "Description" = "8:#1101"
+ "Type" = "3:8"
+ "ContextData" = "8:Bitmap"
+ "Attributes" = "3:4"
+ "Setting" = "3:1"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ }
+ }
+ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_9A0552F35B524CBD8053D6C3A1230025"
+ {
+ "Sequence" = "3:200"
+ "DisplayName" = "8:安装文件夹"
+ "UseDynamicProperties" = "11:TRUE"
+ "IsDependency" = "11:FALSE"
+ "SourcePath" = "8:\\VsdAdminFolderDlg.wid"
+ "Properties"
+ {
+ "BannerBitmap"
+ {
+ "Name" = "8:BannerBitmap"
+ "DisplayName" = "8:#1001"
+ "Description" = "8:#1101"
+ "Type" = "3:8"
+ "ContextData" = "8:Bitmap"
+ "Attributes" = "3:4"
+ "Setting" = "3:1"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ }
+ }
+ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_A7C7E04BDD4849389C332AA717BE950D"
+ {
+ "Sequence" = "3:100"
+ "DisplayName" = "8:欢迎使用"
+ "UseDynamicProperties" = "11:TRUE"
+ "IsDependency" = "11:FALSE"
+ "SourcePath" = "8:\\VsdAdminWelcomeDlg.wid"
+ "Properties"
+ {
+ "BannerBitmap"
+ {
+ "Name" = "8:BannerBitmap"
+ "DisplayName" = "8:#1001"
+ "Description" = "8:#1101"
+ "Type" = "3:8"
+ "ContextData" = "8:Bitmap"
+ "Attributes" = "3:4"
+ "Setting" = "3:1"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ "CopyrightWarning"
+ {
+ "Name" = "8:CopyrightWarning"
+ "DisplayName" = "8:#1002"
+ "Description" = "8:#1102"
+ "Type" = "3:3"
+ "ContextData" = "8:"
+ "Attributes" = "3:0"
+ "Setting" = "3:1"
+ "Value" = "8:#1202"
+ "DefaultValue" = "8:#1202"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ "Welcome"
+ {
+ "Name" = "8:Welcome"
+ "DisplayName" = "8:#1003"
+ "Description" = "8:#1103"
+ "Type" = "3:3"
+ "ContextData" = "8:"
+ "Attributes" = "3:0"
+ "Setting" = "3:1"
+ "Value" = "8:#1203"
+ "DefaultValue" = "8:#1203"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ }
+ }
+ }
+ }
+ "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_10A53DC935BD4964AEDC4D2DE570B941"
+ {
+ "Name" = "8:#1900"
+ "Sequence" = "3:1"
+ "Attributes" = "3:1"
+ "Dialogs"
+ {
+ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_47DB09EE9AB14E30AEC12EE01D5C7EBA"
+ {
+ "Sequence" = "3:200"
+ "DisplayName" = "8:安装文件夹"
+ "UseDynamicProperties" = "11:TRUE"
+ "IsDependency" = "11:FALSE"
+ "SourcePath" = "8:\\VsdFolderDlg.wid"
+ "Properties"
+ {
+ "BannerBitmap"
+ {
+ "Name" = "8:BannerBitmap"
+ "DisplayName" = "8:#1001"
+ "Description" = "8:#1101"
+ "Type" = "3:8"
+ "ContextData" = "8:Bitmap"
+ "Attributes" = "3:4"
+ "Setting" = "3:1"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ "InstallAllUsersVisible"
+ {
+ "Name" = "8:InstallAllUsersVisible"
+ "DisplayName" = "8:#1059"
+ "Description" = "8:#1159"
+ "Type" = "3:5"
+ "ContextData" = "8:1;True=1;False=0"
+ "Attributes" = "3:0"
+ "Setting" = "3:0"
+ "Value" = "3:1"
+ "DefaultValue" = "3:1"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ }
+ }
+ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_90BD7CFE4B964440AED9537FB45265AD"
+ {
+ "Sequence" = "3:300"
+ "DisplayName" = "8:确认安装"
+ "UseDynamicProperties" = "11:TRUE"
+ "IsDependency" = "11:FALSE"
+ "SourcePath" = "8:\\VsdConfirmDlg.wid"
+ "Properties"
+ {
+ "BannerBitmap"
+ {
+ "Name" = "8:BannerBitmap"
+ "DisplayName" = "8:#1001"
+ "Description" = "8:#1101"
+ "Type" = "3:8"
+ "ContextData" = "8:Bitmap"
+ "Attributes" = "3:4"
+ "Setting" = "3:1"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ }
+ }
+ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_D5E24B62C01A46CF83613A8548EE623F"
+ {
+ "Sequence" = "3:100"
+ "DisplayName" = "8:欢迎使用"
+ "UseDynamicProperties" = "11:TRUE"
+ "IsDependency" = "11:FALSE"
+ "SourcePath" = "8:\\VsdWelcomeDlg.wid"
+ "Properties"
+ {
+ "BannerBitmap"
+ {
+ "Name" = "8:BannerBitmap"
+ "DisplayName" = "8:#1001"
+ "Description" = "8:#1101"
+ "Type" = "3:8"
+ "ContextData" = "8:Bitmap"
+ "Attributes" = "3:4"
+ "Setting" = "3:1"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ "CopyrightWarning"
+ {
+ "Name" = "8:CopyrightWarning"
+ "DisplayName" = "8:#1002"
+ "Description" = "8:#1102"
+ "Type" = "3:3"
+ "ContextData" = "8:"
+ "Attributes" = "3:0"
+ "Setting" = "3:1"
+ "Value" = "8:#1202"
+ "DefaultValue" = "8:#1202"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ "Welcome"
+ {
+ "Name" = "8:Welcome"
+ "DisplayName" = "8:#1003"
+ "Description" = "8:#1103"
+ "Type" = "3:3"
+ "ContextData" = "8:"
+ "Attributes" = "3:0"
+ "Setting" = "3:1"
+ "Value" = "8:#1203"
+ "DefaultValue" = "8:#1203"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ }
+ }
+ }
+ }
+ "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_2095541621184261A84FADACD7C1719C"
+ {
+ "Name" = "8:#1902"
+ "Sequence" = "3:2"
+ "Attributes" = "3:3"
+ "Dialogs"
+ {
+ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_5DDF87A2EA8E4A0FB50CEBA664B67AFF"
+ {
+ "Sequence" = "3:100"
+ "DisplayName" = "8:已完成"
+ "UseDynamicProperties" = "11:TRUE"
+ "IsDependency" = "11:FALSE"
+ "SourcePath" = "8:\\VsdAdminFinishedDlg.wid"
+ "Properties"
+ {
+ "BannerBitmap"
+ {
+ "Name" = "8:BannerBitmap"
+ "DisplayName" = "8:#1001"
+ "Description" = "8:#1101"
+ "Type" = "3:8"
+ "ContextData" = "8:Bitmap"
+ "Attributes" = "3:4"
+ "Setting" = "3:1"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ }
+ }
+ }
+ }
+ "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_61E89899F6354FC2A7D8F3C43879133B"
+ {
+ "Name" = "8:#1901"
+ "Sequence" = "3:2"
+ "Attributes" = "3:2"
+ "Dialogs"
+ {
+ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_4138522ABFD84506BC76197E0428EC59"
+ {
+ "Sequence" = "3:100"
+ "DisplayName" = "8:进度"
+ "UseDynamicProperties" = "11:TRUE"
+ "IsDependency" = "11:FALSE"
+ "SourcePath" = "8:\\VsdAdminProgressDlg.wid"
+ "Properties"
+ {
+ "BannerBitmap"
+ {
+ "Name" = "8:BannerBitmap"
+ "DisplayName" = "8:#1001"
+ "Description" = "8:#1101"
+ "Type" = "3:8"
+ "ContextData" = "8:Bitmap"
+ "Attributes" = "3:4"
+ "Setting" = "3:1"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ "ShowProgress"
+ {
+ "Name" = "8:ShowProgress"
+ "DisplayName" = "8:#1009"
+ "Description" = "8:#1109"
+ "Type" = "3:5"
+ "ContextData" = "8:1;True=1;False=0"
+ "Attributes" = "3:0"
+ "Setting" = "3:0"
+ "Value" = "3:1"
+ "DefaultValue" = "3:1"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ }
+ }
+ }
+ }
+ "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_8215E73BB322413C822742B2338EC99C"
+ {
+ "UseDynamicProperties" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "SourcePath" = "8:\\VsdBasicDialogs.wim"
+ }
+ "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_9517003558424B77A9806588742B99BD"
+ {
+ "Name" = "8:#1902"
+ "Sequence" = "3:1"
+ "Attributes" = "3:3"
+ "Dialogs"
+ {
+ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_C7AAC1067A634BCA9450AF1E52F2AB35"
+ {
+ "Sequence" = "3:100"
+ "DisplayName" = "8:已完成"
+ "UseDynamicProperties" = "11:TRUE"
+ "IsDependency" = "11:FALSE"
+ "SourcePath" = "8:\\VsdFinishedDlg.wid"
+ "Properties"
+ {
+ "BannerBitmap"
+ {
+ "Name" = "8:BannerBitmap"
+ "DisplayName" = "8:#1001"
+ "Description" = "8:#1101"
+ "Type" = "3:8"
+ "ContextData" = "8:Bitmap"
+ "Attributes" = "3:4"
+ "Setting" = "3:1"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ "UpdateText"
+ {
+ "Name" = "8:UpdateText"
+ "DisplayName" = "8:#1058"
+ "Description" = "8:#1158"
+ "Type" = "3:15"
+ "ContextData" = "8:"
+ "Attributes" = "3:0"
+ "Setting" = "3:1"
+ "Value" = "8:#1258"
+ "DefaultValue" = "8:#1258"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ }
+ }
+ }
+ }
+ "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_E4C82EE2AD9046B78DD4F88B55EB9630"
+ {
+ "Name" = "8:#1901"
+ "Sequence" = "3:1"
+ "Attributes" = "3:2"
+ "Dialogs"
+ {
+ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_5ADD7F2E39744B0092BF843F297CD9D8"
+ {
+ "Sequence" = "3:100"
+ "DisplayName" = "8:进度"
+ "UseDynamicProperties" = "11:TRUE"
+ "IsDependency" = "11:FALSE"
+ "SourcePath" = "8:\\VsdProgressDlg.wid"
+ "Properties"
+ {
+ "BannerBitmap"
+ {
+ "Name" = "8:BannerBitmap"
+ "DisplayName" = "8:#1001"
+ "Description" = "8:#1101"
+ "Type" = "3:8"
+ "ContextData" = "8:Bitmap"
+ "Attributes" = "3:4"
+ "Setting" = "3:1"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ "ShowProgress"
+ {
+ "Name" = "8:ShowProgress"
+ "DisplayName" = "8:#1009"
+ "Description" = "8:#1109"
+ "Type" = "3:5"
+ "ContextData" = "8:1;True=1;False=0"
+ "Attributes" = "3:0"
+ "Setting" = "3:0"
+ "Value" = "3:1"
+ "DefaultValue" = "3:1"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ }
+ }
+ }
+ }
+ "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_F8B073C3CA8048B984ECB57002BD5FEE"
+ {
+ "UseDynamicProperties" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "SourcePath" = "8:\\VsdUserInterface.wim"
+ }
+ }
+ "MergeModule"
+ {
+ }
+ "ProjectOutput"
+ {
+ "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_5028DE72CC42424CB6B2165E77BED521"
+ {
+ "SourcePath" = "8:..\\ButcherManageClient\\obj\\Release\\ButcherManageClient.exe"
+ "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:FALSE"
+ "IsolateTo" = "8:"
+ "ProjectOutputGroupRegister" = "3:1"
+ "OutputConfiguration" = "8:"
+ "OutputGroupCanonicalName" = "8:Built"
+ "OutputProjectGuid" = "8:{59B13436-4884-4533-9C7E-80E8580CBF55}"
+ "ShowKeyOutput" = "11:TRUE"
+ "ExcludeFilters"
+ {
+ }
+ }
+ }
+ }
+}