From e850f144083b2ab07c7c677ec92551eceb6e7041 Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Sat, 23 Sep 2017 23:09:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
BO/BO.csproj | 8 +-
BO/BO/BackRpcObj.cs | 19 +
BO/BO/Bill/GradeAndWeight/GradeAndWeight.cs | 2 +
.../GradeAndWeight/GradeAndWeight_Detail.cs | 6 +-
BO/BO/Bill/WeightBill/HouseAndSanctionEdit.cs | 32 +
BO/BO/Bill/WeightBill/HouseAndSanctionList.cs | 25 +
BO/BO/Bill/WeightBill/WeightBill.cs | 61 +-
BO/BO/Bill/WeightBill/WeightBillList.cs | 35 +
BO/BO/Bill/WeightBill/WeightBill_Detail.cs | 2 -
.../WeightBill/WeightBill_FarmerDetail.cs | 2 -
.../Bill/WeightBill/WeightBill_HouseDetail.cs | 2 -
.../WeightBill/WeightBill_SanctionDetail.cs | 2 -
BO/BO/SyncBase.cs | 9 +-
BO/BO/SyncBill.cs | 22 -
BO/Utils/AfterLoginUtil.cs | 2 +-
BO/Utils/BillRpc/GradeAndWeightRpc.cs | 10 +-
BO/Utils/BillRpc/HouseAndSanctionRpc.cs | 43 ++
BO/Utils/BillRpc/WeightBillRpc.cs | 363 ++-------
BWP.WinFormControl/UComboBox.cs | 14 +-
ButcherWeight/WeightContext.cs | 2 +-
ButcherWeight/WeightForm.Designer.cs | 718 +++++++++---------
ButcherWeight/WeightForm.cs | 132 +---
ButcherWeight/WeightForm.resx | 12 -
ButcherWeight/WeightFormWeightPart.cs | 84 +-
QualityAndOrder/QualityOrderForm.Designer.cs | 316 ++++----
QualityAndOrder/QualityOrderForm.cs | 101 +--
QualityAndOrder/QualityOrderForm.resx | 2 +-
QualityAndOrder/QualityOrderFormForTab2.cs | 2 +-
Setup/Release/Setup.msi | Bin 1310720 -> 1312256 bytes
WeighAndGrading/GradeContext.cs | 2 +-
WeighAndGrading/GradeFrom.Designer.cs | 357 ++-------
WeighAndGrading/GradeFrom.cs | 75 +-
WeighAndGrading/GradeFrom.resx | 6 +-
33 files changed, 937 insertions(+), 1531 deletions(-)
create mode 100644 BO/BO/BackRpcObj.cs
create mode 100644 BO/BO/Bill/WeightBill/HouseAndSanctionEdit.cs
create mode 100644 BO/BO/Bill/WeightBill/HouseAndSanctionList.cs
create mode 100644 BO/BO/Bill/WeightBill/WeightBillList.cs
delete mode 100644 BO/BO/SyncBill.cs
create mode 100644 BO/Utils/BillRpc/HouseAndSanctionRpc.cs
diff --git a/BO/BO.csproj b/BO/BO.csproj
index f5b37c6..fec1a47 100644
--- a/BO/BO.csproj
+++ b/BO/BO.csproj
@@ -53,16 +53,22 @@
+
+
+
+
+
+
@@ -71,8 +77,6 @@
-
-
diff --git a/BO/BO/BackRpcObj.cs b/BO/BO/BackRpcObj.cs
new file mode 100644
index 0000000..168b7f4
--- /dev/null
+++ b/BO/BO/BackRpcObj.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BO.BO
+{
+ public class BackRpcObj
+ {
+ public long ID { get; set; }
+
+ public string Flag { get; set; }
+
+ private List _detailBack = new List();
+
+ public List DetailBack { get { return _detailBack; } set { _detailBack = value; } }
+ }
+}
diff --git a/BO/BO/Bill/GradeAndWeight/GradeAndWeight.cs b/BO/BO/Bill/GradeAndWeight/GradeAndWeight.cs
index c580a54..ed9d5f5 100644
--- a/BO/BO/Bill/GradeAndWeight/GradeAndWeight.cs
+++ b/BO/BO/Bill/GradeAndWeight/GradeAndWeight.cs
@@ -12,6 +12,8 @@ namespace BO.BO.Bill
public int Order { get; set; }
+ public short Technics { get; set; }
+
public string Technics_Name { get; set; }
public int Number { get; set; }
diff --git a/BO/BO/Bill/GradeAndWeight/GradeAndWeight_Detail.cs b/BO/BO/Bill/GradeAndWeight/GradeAndWeight_Detail.cs
index 233e9ca..13b32bf 100644
--- a/BO/BO/Bill/GradeAndWeight/GradeAndWeight_Detail.cs
+++ b/BO/BO/Bill/GradeAndWeight/GradeAndWeight_Detail.cs
@@ -10,11 +10,11 @@ namespace BO.BO.Bill
{
public long ID { get; set; }
- public int Index { get; set; }
-
public long OrderDetail_ID { get; set; }
- public int? Order { get; set; }
+ public int Index { get; set; }
+
+ public DateTime Date { get; set; }
public short Technics { get; set; }
diff --git a/BO/BO/Bill/WeightBill/HouseAndSanctionEdit.cs b/BO/BO/Bill/WeightBill/HouseAndSanctionEdit.cs
new file mode 100644
index 0000000..a9a9581
--- /dev/null
+++ b/BO/BO/Bill/WeightBill/HouseAndSanctionEdit.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BO.BO
+{
+ public class HouseAndSanctionEdit
+ {
+ public long ID { get; set; }
+
+ public int? Number { get; set; }
+
+ public long? HogGrade_ID { get; set; }
+
+ #region 获取的时候不赋值,只负责接收
+ public string HogGrade_Name { get; set; }
+
+ public long? Inspector_ID { get; set; }
+
+ public string Inspector_Name { get; set; }
+ #endregion
+
+
+ private List _houseDetails = new List();
+ public List HouseDetails { get { return _houseDetails; } set { _houseDetails = value; } }
+
+ private List _sanctionDetails = new List();
+ public List SanctionDetails { get { return _sanctionDetails; } set { _sanctionDetails = value; } }
+ }
+}
diff --git a/BO/BO/Bill/WeightBill/HouseAndSanctionList.cs b/BO/BO/Bill/WeightBill/HouseAndSanctionList.cs
new file mode 100644
index 0000000..9d6f017
--- /dev/null
+++ b/BO/BO/Bill/WeightBill/HouseAndSanctionList.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BO.BO
+{
+ public class HouseAndSanctionList
+ {
+ public long ID { get; set; }
+
+ public long? B3ID { get; set; }
+
+ public string Employee_Name { get; set; }
+
+ public string Supplier_Name { get; set; }
+
+ public int? Number { get; set; }
+
+ public string HouseNames { get; set; }
+
+ public bool AlreadyHouse { get { return !string.IsNullOrEmpty(HouseNames); } }
+ }
+}
diff --git a/BO/BO/Bill/WeightBill/WeightBill.cs b/BO/BO/Bill/WeightBill/WeightBill.cs
index ad4b2ba..8488bc1 100644
--- a/BO/BO/Bill/WeightBill/WeightBill.cs
+++ b/BO/BO/Bill/WeightBill/WeightBill.cs
@@ -9,8 +9,14 @@ using TSingSoft.WebPluginFramework;
namespace BO.BO
{
[Serializable]
- public class WeightBill : SyncBill
+ public class WeightBill
{
+ public long ID { get; set; }
+
+ public long? B3ID { get; set; }
+
+ public string Creator { get; set; }
+
public long? AccountingUnit_ID { get; set; }
public long? Department_ID { get; set; }
@@ -76,59 +82,10 @@ namespace BO.BO
public string Remark { get; set; }
- public bool AlreadyHouse { get; set; }
-
private List _details = new List();
- public List Details { get { return _details; } }
-
- public int Number { get { return _details.Sum(x => (x.Number ?? 0)); } }
-
- public decimal Weight { get { return _details.Sum(x => (x.Weight ?? 0)); } }
+ public List Details { get { return _details; } set { _details = value; } }
private List _farmerDetails = new List();
- public List FarmerDetails { get { return _farmerDetails; } }
-
- public string FarmerNames
- {
- get
- {
- if (_farmerDetails.Any()) return string.Join(",", _farmerDetails.Select(x => x.Farmer_Name));
- return null;
- }
- }
-
- private List _houseDetails = new List();
- public List HouseDetails { get { return _houseDetails; } }
-
- public string HouseNames
- {
- get
- {
- if (_houseDetails.Any()) return string.Join(",", _houseDetails.Select(x => x.LiveColonyHouse_Name));
- return null;
- }
- }
-
- public int? HouseNumber { get { if (_houseDetails.Any()) return _houseDetails.Sum(x => (x.Number ?? 0)); return null; } }
-
- private List _sanctionDetails = new List();
- public List SanctionDetails { get { return _sanctionDetails; } }
-
- public int SanctionNumber { get { return _sanctionDetails.Sum(x => (x.Number ?? 0)); } }
-
- public int? FirstWeightNumber { get; set; }
-
- public bool FinishWeight
- {
- get
- {
- if (Details.Any())
- {
- var first = Details.First();
- return first.MaoWeight.HasValue && first.PiWeight.HasValue;
- }
- return false;
- }
- }
+ public List FarmerDetails { get { return _farmerDetails; } set { _farmerDetails = value; } }
}
}
diff --git a/BO/BO/Bill/WeightBill/WeightBillList.cs b/BO/BO/Bill/WeightBill/WeightBillList.cs
new file mode 100644
index 0000000..d8c7e09
--- /dev/null
+++ b/BO/BO/Bill/WeightBill/WeightBillList.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BO.BO
+{
+ public class WeightBillList
+ {
+ public long ID { get; set; }
+
+ public long? B3ID { get; set; }
+
+ public string Car_Name { get; set; }
+
+ public string Supplier_Name { get; set; }
+
+ public string Employee_Name { get; set; }
+
+ public string PurchaseType_Name { get; set; }
+
+ public int? Number { get; set; }
+
+ public decimal? Weight { get; set; }
+
+ public string HouseNames { get; set; }
+
+ public int? SanctionNumber { get; set; }
+
+ public string Remark { get; set; }
+
+ public bool FinishWeight { get; set; }
+ }
+}
diff --git a/BO/BO/Bill/WeightBill/WeightBill_Detail.cs b/BO/BO/Bill/WeightBill/WeightBill_Detail.cs
index 2546166..44222ca 100644
--- a/BO/BO/Bill/WeightBill/WeightBill_Detail.cs
+++ b/BO/BO/Bill/WeightBill/WeightBill_Detail.cs
@@ -11,8 +11,6 @@ namespace BO.BO
{
public long WeightBill_ID { get; set; }
- public int Index { get; set; }
-
public int? Number { get; set; }
public decimal? PiWeight { get; set; }
diff --git a/BO/BO/Bill/WeightBill/WeightBill_FarmerDetail.cs b/BO/BO/Bill/WeightBill/WeightBill_FarmerDetail.cs
index 42a9411..b0bc1b1 100644
--- a/BO/BO/Bill/WeightBill/WeightBill_FarmerDetail.cs
+++ b/BO/BO/Bill/WeightBill/WeightBill_FarmerDetail.cs
@@ -11,8 +11,6 @@ namespace BO.BO
{
public long WeightBill_ID { get; set; }
- public int Index { get; set; }
-
public long? Farmer_ID { get; set; }
public string Farmer_Name { get; set; }
diff --git a/BO/BO/Bill/WeightBill/WeightBill_HouseDetail.cs b/BO/BO/Bill/WeightBill/WeightBill_HouseDetail.cs
index 3336f3c..e9d43cb 100644
--- a/BO/BO/Bill/WeightBill/WeightBill_HouseDetail.cs
+++ b/BO/BO/Bill/WeightBill/WeightBill_HouseDetail.cs
@@ -11,8 +11,6 @@ namespace BO.BO
{
public long WeightBill_ID { get; set; }
- public int Index { get; set; }
-
public long? LiveColonyHouse_ID { get; set; }
public string LiveColonyHouse_Name { get; set; }
diff --git a/BO/BO/Bill/WeightBill/WeightBill_SanctionDetail.cs b/BO/BO/Bill/WeightBill/WeightBill_SanctionDetail.cs
index 975c4e1..929be03 100644
--- a/BO/BO/Bill/WeightBill/WeightBill_SanctionDetail.cs
+++ b/BO/BO/Bill/WeightBill/WeightBill_SanctionDetail.cs
@@ -11,8 +11,6 @@ namespace BO.BO
{
public long WeightBill_ID { get; set; }
- public int Index { get; set; }
-
///
/// 异常奖罚配置
///
diff --git a/BO/BO/SyncBase.cs b/BO/BO/SyncBase.cs
index ea43261..25836d0 100644
--- a/BO/BO/SyncBase.cs
+++ b/BO/BO/SyncBase.cs
@@ -6,19 +6,12 @@ using System.Threading.Tasks;
namespace BO.BO
{
- [Serializable]
public abstract class SyncBase
{
public long ID { get; set; }
- ///
- /// 对应B3ID
- ///
- public long? B3ID { get; set; }
+ public int Index { get; set; }
- ///
- /// 删除状态
- ///
public bool DeleteState { get; set; }
}
}
diff --git a/BO/BO/SyncBill.cs b/BO/BO/SyncBill.cs
deleted file mode 100644
index 138fcf7..0000000
--- a/BO/BO/SyncBill.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BO.BO
-{
- [Serializable]
- public class SyncBill : SyncBase
- {
- ///
- /// 单据创建人用户名
- ///
- public string Creator { get; set; }
-
- ///
- /// 单据是否完整可以上传
- ///
- public bool FinishCreate { get; set; }
- }
-}
diff --git a/BO/Utils/AfterLoginUtil.cs b/BO/Utils/AfterLoginUtil.cs
index bc11500..4ac0226 100644
--- a/BO/Utils/AfterLoginUtil.cs
+++ b/BO/Utils/AfterLoginUtil.cs
@@ -26,7 +26,7 @@ namespace BO.Utils
//#if !debug
// static List> roleToAssemblies = new List>(){new Tuple("排宰员",@"ButcherOrder"),
//new Tuple("过磅员",@"ButcherWeight"),
- // new Tuple("验质员",@"QualityAndOrder"),new Tuple("定级员",@"WeighAndGrading")};
+ // new Tuple("验质员",@"QualityAndOrder"),new Tuple("定级员",@"WeighAndGrading")};
//#endif
diff --git a/BO/Utils/BillRpc/GradeAndWeightRpc.cs b/BO/Utils/BillRpc/GradeAndWeightRpc.cs
index 6cf733a..9fc978d 100644
--- a/BO/Utils/BillRpc/GradeAndWeightRpc.cs
+++ b/BO/Utils/BillRpc/GradeAndWeightRpc.cs
@@ -20,18 +20,18 @@ namespace BO.Utils.BillRpc
return serializer.Deserialize>(result);
}
- public static List GetDetails(DateTime startDate, DateTime endDate, int? order, int type)
+ public static List GetDetails(DateTime date, int top = 15)
{
const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/GradeAndWeightRpc/GetDetailsList";
- var result = RpcFacade.Call(method, startDate, endDate, order, type);
+ var result = RpcFacade.Call(method, date, top);
result = result.ESerializeDateTime();
return serializer.Deserialize>(result);
}
- public static void InsertOrInsertDetail(GradeAndWeight_Detail detail)
+ public static void UpdateOrInsertDetail(GradeAndWeight_Detail detail, bool fillTechnics = false)
{
- const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/GradeAndWeightRpc/InsertOrInsertDetail";
- detail.ID = RpcFacade.Call(method, serializer.Serialize(detail));
+ const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/GradeAndWeightRpc/UpdateOrInsertDetail";
+ detail.ID = RpcFacade.Call(method, serializer.Serialize(detail), fillTechnics);
}
public static void UpdateLivestock(long id, long liveStockID, string liveStockName)
diff --git a/BO/Utils/BillRpc/HouseAndSanctionRpc.cs b/BO/Utils/BillRpc/HouseAndSanctionRpc.cs
new file mode 100644
index 0000000..7c2f098
--- /dev/null
+++ b/BO/Utils/BillRpc/HouseAndSanctionRpc.cs
@@ -0,0 +1,43 @@
+using BO.BO;
+using Forks.JsonRpc.Client;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web.Script.Serialization;
+
+namespace BO.Utils.BillRpc
+{
+ public static class HouseAndSanctionRpc
+ {
+ static JavaScriptSerializer serializer = new JavaScriptSerializer();
+ public static List GetHouseAndSanctionList(DateTime date)
+ {
+ const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/HouseAndSanctionRpc/GetHouseAndSanctionList";
+ var json = RpcFacade.Call(method, date);
+ return serializer.Deserialize>(json);
+ }
+
+ public static void UpdateInsertHouseAndSanction(HouseAndSanctionEdit bo)
+ {
+ const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/HouseAndSanctionRpc/UpdateInsertHouseAndSanction";
+ bo.Inspector_ID = ButcherAppContext.Context.UserConfig.Employee_ID;
+ bo.Inspector_Name = ButcherAppContext.Context.UserConfig.Employee_Name;
+ RpcFacade.Call(method, serializer.Serialize(bo));
+ }
+
+ public static int GetDetailTotalNumber(DateTime date)
+ {
+ const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/HouseAndSanctionRpc/GetDetailTotalNumber";
+ return RpcFacade.Call(method, date);
+ }
+
+ public static HouseAndSanctionEdit GetHouseAndSanctionDetail(long id)
+ {
+ const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/HouseAndSanctionRpc/GetHouseAndSanctionDetail";
+ var obj = RpcFacade.Call(method, id);
+ return serializer.Deserialize(obj);
+ }
+ }
+}
diff --git a/BO/Utils/BillRpc/WeightBillRpc.cs b/BO/Utils/BillRpc/WeightBillRpc.cs
index 485e304..f5f4921 100644
--- a/BO/Utils/BillRpc/WeightBillRpc.cs
+++ b/BO/Utils/BillRpc/WeightBillRpc.cs
@@ -13,125 +13,55 @@ namespace BO.Utils.BillRpc
public static class WeightBillRpc
{
static JavaScriptSerializer serializer = new JavaScriptSerializer();
- public static bool Send(WeightBill bo, List weightRecord)
+ public static List GetWeightBillList(long? carID, long? supplierID)
{
- const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/WeightBillRpc/UploadBill";
- var obj = new RpcObject("/MainSystem/B3ClientService/BO/WeightBill");
+ const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/WeightBillRpc/GetWeightBillList";
+ var obj = RpcFacade.Call(method, DateTime.Today, carID, supplierID);
+ return serializer.Deserialize>(obj);
+ }
+
+ public static WeightBill Load(long id)
+ {
+ const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/WeightBillRpc/Load";
+ var obj = RpcFacade.Call(method, id);
+ obj = obj.ESerializeDateTime();
+ return serializer.Deserialize(obj);
+ }
+
+ public static bool UpdateOrInsert(WeightBill bo, List weightRecord)
+ {
+ const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/WeightBillRpc/UpdateOrInsert";
if (bo.ID == 0)
{
bo.Creator = ButcherAppContext.Context.UserConfig.UserName;
bo.AccountingUnit_ID = ButcherAppContext.Context.UserConfig.AccountingUnit_ID;
bo.Department_ID = ButcherAppContext.Context.UserConfig.Department_ID;
}
- obj.Set("Creator", bo.Creator);
- obj.Set("AccountingUnit_ID", bo.AccountingUnit_ID);
- obj.Set("Department_ID", bo.Department_ID);
- //base
- obj.Set("ID", bo.ID);
-
- //bill
- obj.Set("FinishCreate", bo.FinishCreate);
- obj.Set("ModifyTime", DateTime.Now);
- //bill
- obj.Set("Employee_ID", bo.Employee_ID);
- obj.Set("Employee_Name", bo.Employee_Name);
- obj.Set("WeighTime", bo.WeighTime);
- obj.Set("Supplier_ID", bo.Supplier_ID);
- obj.Set("Supplier_Name", bo.Supplier_Name);
- obj.Set("Zone_ID", bo.Zone_ID);
- obj.Set("Zone_Name", bo.Zone_Name);
- obj.Set("PurchaseType_ID", bo.PurchaseType_ID);
- obj.Set("PurchaseType_Name", bo.PurchaseType_Name);
- obj.Set("Car_ID", bo.Car_ID);
- obj.Set("Car_Name", bo.Car_Name);
- obj.Set("LiveVarieties_ID", bo.LiveVarieties_ID);
- obj.Set("LiveVarieties_Name", bo.LiveVarieties_Name);
- obj.Set("HogGrade_ID", bo.HogGrade_ID);
- obj.Set("HogGrade_Name", bo.HogGrade_Name);
- obj.Set("ShackWeight", bo.ShackWeight);
- obj.Set("ShackPrice", bo.ShackPrice);
- obj.Set("JingJianFee", bo.JingJianFee);
- obj.Set("DiscontMoney", bo.DiscontMoney);
- obj.Set("AnimalTestNumber", bo.AnimalTestNumber);
- obj.Set("AnimalTestDate", bo.AnimalTestDate);
- obj.Set("AnimalTestMan", bo.AnimalTestMan);
- obj.Set("Remark", bo.Remark);
- //obj.Set("Inspector_ID", bo.Inspector_ID);
- //obj.Set("Inspector_Name", bo.Inspector_Name);
-
- const string detailErtPath = "/MainSystem/B3ClientService/BO/WeightBill_Detail";
-
- var details = new ManyList(detailErtPath);
- foreach (var detail in bo.Details)
- {
- var objDetail = new RpcObject(detailErtPath);
- objDetail.Set("ID", detail.ID);
- objDetail.Set("B3ID", detail.B3ID);
- objDetail.Set("DeleteState", detail.DeleteState);
- objDetail.Set("WeightBill_ID", detail.WeightBill_ID);
- objDetail.Set("Index", detail.Index);
- objDetail.Set("MaoWeight", detail.MaoWeight);
- objDetail.Set("PiWeight", detail.PiWeight);
- objDetail.Set("Weight", detail.Weight);
- objDetail.Set("Number", detail.Number);
- details.Add(objDetail);
- }
- obj.Set("Details", details);
-
- const string farmerDetailErtPath = "/MainSystem/B3ClientService/BO/WeightBill_FarmerDetail";
-
- var farmerDetils = new ManyList(farmerDetailErtPath);
- foreach (var detail in bo.FarmerDetails)
- {
- var objDetail = new RpcObject(farmerDetailErtPath);
- objDetail.Set("ID", detail.ID);
- objDetail.Set("B3ID", detail.B3ID);
- objDetail.Set("DeleteState", detail.DeleteState);
- objDetail.Set("WeightBill_ID", detail.WeightBill_ID);
- objDetail.Set("Index", detail.Index);
- objDetail.Set("Farmer_ID", detail.Farmer_ID);
- objDetail.Set("Farmer_Name", detail.Farmer_Name);
- objDetail.Set("Number", detail.Number);
- objDetail.Set("Weight", detail.Weight);
- farmerDetils.Add(objDetail);
- }
-
- obj.Set("FarmerDetails", farmerDetils);
var s = serializer.Serialize(weightRecord);
- var result = RpcFacade.Call(method, obj, s);
- if (bo.ID == 0)
- bo.ID = result.Get("ID");
- var detailReturns = result.Get>("DetailBack");
- foreach (var d in detailReturns)
+ var json = RpcFacade.Call(method, serializer.Serialize(bo), s);
+ var result = serializer.Deserialize(json);
+ bo.ID = result.ID;
+ foreach (var d in result.DetailBack)
{
- var dFlag = d.Get("Flag");
- switch (dFlag)
+ switch (d.Flag)
{
case "Details":
- var rdetails = d.Get>("DetailBack");
- foreach (var rd in rdetails)
+ foreach (var rd in d.DetailBack)
{
- 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;
- }
+ var idx = Convert.ToInt32(rd.Flag);
+ var first = bo.Details.First(x => !x.DeleteState && x.Index == idx);
+ first.ID = rd.ID;
+ first.WeightBill_ID = bo.ID;
}
break;
case "FarmerDetails":
- var rfarmerDetails = d.Get>("DetailBack");
- foreach (var rd in rfarmerDetails)
+ foreach (var rd in d.DetailBack)
{
- 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;
- }
+ var idx = Convert.ToInt32(rd.Flag);
+ var first = bo.FarmerDetails.First(x => !x.DeleteState && x.Index == idx);
+ first.ID = rd.ID;
+ first.WeightBill_ID = bo.ID;
}
break;
}
@@ -140,232 +70,25 @@ namespace BO.Utils.BillRpc
return true;
}
- public static bool Delete(long id)
- {
- const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/WeightBillRpc/DeleteBill";
- return RpcFacade.Call(method, id);
- }
-
- public static List GetWeightBillList(long? carID, long? supplierID)
- {
- const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/WeightBillRpc/GetWeightBillList";
- var list = RpcFacade.Call>(method, DateTime.Today, carID, supplierID);
- var result = new List();
- foreach (var obj in list)
- {
- var entity = new WeightBill();
- result.Add(entity);
- entity.Creator = obj.Get("Creator");
- entity.AccountingUnit_ID = obj.Get("AccountingUnit_ID");
- entity.Department_ID = obj.Get("Department_ID");
- entity.ID = obj.Get("ID");
- entity.B3ID = obj.Get("B3ID");
- entity.DeleteState = false;
- entity.FinishCreate = obj.Get("FinishCreate");
- entity.Employee_ID = obj.Get("Employee_ID");
- entity.Employee_Name = obj.Get("Employee_Name");
- entity.WeighTime = obj.Get("WeighTime");
- entity.Supplier_ID = obj.Get("Supplier_ID");
- entity.Supplier_Name = obj.Get("Supplier_Name");
- entity.Zone_ID = obj.Get("Zone_ID");
- entity.Zone_Name = obj.Get("Zone_Name");
- entity.PurchaseType_ID = obj.Get("PurchaseType_ID");
- entity.PurchaseType_Name = obj.Get("PurchaseType_Name");
- entity.Car_ID = obj.Get("Car_ID");
- entity.Car_Name = obj.Get("Car_Name");
- entity.LiveVarieties_ID = obj.Get("LiveVarieties_ID");
- entity.LiveVarieties_Name = obj.Get("LiveVarieties_Name");
- entity.HogGrade_ID = obj.Get("HogGrade_ID");
- entity.HogGrade_Name = obj.Get("HogGrade_Name");
- entity.ShackWeight = obj.Get("ShackWeight");
- entity.ShackPrice = obj.Get("ShackPrice");
- entity.JingJianFee = obj.Get("JingJianFee");
- entity.DiscontMoney = obj.Get("DiscontMoney");
- entity.AnimalTestNumber = obj.Get("AnimalTestNumber");
- entity.AnimalTestDate = obj.Get("AnimalTestDate");
- entity.AnimalTestMan = obj.Get("AnimalTestMan");
- entity.Remark = obj.Get("Remark");
- entity.Inspector_ID = obj.Get("Inspector_ID");
- entity.Inspector_Name = obj.Get("Inspector_Name");
- var details = obj.Get("Details");
- foreach (var detail in details)
- {
- var d = new WeightBill_Detail();
- d.DeleteState = detail.Get("DeleteState");
- if (d.DeleteState)
- continue;
- entity.Details.Add(d);
- d.ID = detail.Get("ID");
- d.B3ID = detail.Get("B3ID");
- d.Index = detail.Get("Index");
- d.MaoWeight = detail.Get("MaoWeight");
- d.PiWeight = detail.Get("PiWeight");
- d.Number = detail.Get("Number");
- d.Weight = detail.Get("Weight");
- d.WeightBill_ID = detail.Get("WeightBill_ID");
- }
-
- var farmers = obj.Get("FarmerDetails");
- foreach (var detail in farmers)
- {
- var d = new WeightBill_FarmerDetail();
- d.DeleteState = detail.Get("DeleteState");
- if (d.DeleteState)
- continue;
- entity.FarmerDetails.Add(d);
- d.ID = detail.Get("ID");
- d.B3ID = detail.Get("B3ID");
- d.Index = detail.Get("Index");
- d.Farmer_ID = detail.Get("Farmer_ID");
- d.Farmer_Name = detail.Get("Farmer_Name");
- d.Number = detail.Get("Number");
- d.WeightBill_ID = detail.Get("WeightBill_ID");
- }
- }
- return result;
- }
-
- public static List GetUnHousedBill(DateTime date)
- {
- const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/WeightBillRpc/GetNoHouseInfoWeightBills";
- var list = RpcFacade.Call>(method, date);
- var result = new List();
- foreach (var obj in list)
- {
- var entity = new WeightBill();
- result.Add(entity);
- var bill = obj.Get("Bill");
- entity.ID = bill.Get("ID");
- entity.B3ID = bill.Get("B3ID");
- entity.Employee_Name = bill.Get("Employee_Name");
- entity.Supplier_Name = bill.Get("Supplier_Name");
- entity.AlreadyHouse = bill.Get("AlreadyHouse");
- entity.FirstWeightNumber = bill.Get("FirstWeightNumber");
- 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");
- }
- }
- return result;
- }
-
- public static int UpdateInsertHouseAndSanctionInfo(WeightBill bo)
+ public static List GetWeightRecord(long id)
{
- const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/WeightBillRpc/UpdateInsertWeightBillHouseDetail";
- 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("FirstWeightNumber", bo.FirstWeightNumber);
- obj.Set("Inspector_ID", ButcherAppContext.Context.UserConfig.Employee_ID);
- obj.Set("Inspector_Name", ButcherAppContext.Context.UserConfig.Employee_Name);
-
- const string houseErtPath = "/MainSystem/B3ClientService/BO/WeightBill_HouseDetail";
-
- var houseDetails = new ManyList(houseErtPath);
- foreach (var detail in bo.HouseDetails)
- {
- var objDetail = new RpcObject(houseErtPath);
- objDetail.Set("WeightBill_ID", detail.WeightBill_ID);
- objDetail.Set("Index", detail.Index);
- objDetail.Set("LiveColonyHouse_ID", detail.LiveColonyHouse_ID);
- objDetail.Set("LiveColonyHouse_Name", detail.LiveColonyHouse_Name);
- objDetail.Set("Number", detail.Number);
- houseDetails.Add(objDetail);
- }
-
- obj.Set("HouseDetails", houseDetails);
-
- const string sanctionsErtPath = "/MainSystem/B3ClientService/BO/WeightBill_SanctionDetail";
-
- var sanctionDetails = new ManyList(sanctionsErtPath);
- foreach (var detail in bo.SanctionDetails)
- {
- var objDetail = new RpcObject(sanctionsErtPath);
- objDetail.Set("WeightBill_ID", detail.WeightBill_ID);
- objDetail.Set("Index", detail.Index);
- objDetail.Set("Sanction_ID", detail.Sanction_ID);
- objDetail.Set("AbnormalItem_ID", detail.AbnormalItem_ID);
- objDetail.Set("AbnormalItem_Name", detail.AbnormalItem_Name);
- objDetail.Set("Number", detail.Number);
- sanctionDetails.Add(objDetail);
- }
-
- obj.Set("SanctionDetails", sanctionDetails);
- return RpcFacade.Call(method, obj);
+ const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/WeightBillRpc/GetWeightRecord";
+ var obj = RpcFacade.Call(method, id);
+ obj = obj.ESerializeDateTime();
+ return serializer.Deserialize>(obj);
}
- public static int GetDetailTotalNumber(DateTime date)
+ public static bool Delete(long id)
{
- const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/WeightBillRpc/GetDetailTotalNumber";
- return RpcFacade.Call(method, date);
+ const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/WeightBillRpc/DeleteBill";
+ return RpcFacade.Call(method, id);
}
- public static List> SyncBillB3Ids(List ids)
+ 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);
- }
-
- public static List> SyncWeightDetailFirstNumber(List ids)
- {
- const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/WeightBillRpc/SyncWeightDetailFirstNumber";
- return RpcFacade.Call>>(method, ids);
- }
-
- public static WeightBill GetWeightBillOnHousePage(long id)
- {
- const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/WeightBillRpc/GetWeightBillOnHousePage";
- var obj = RpcFacade.Call(method, id);
- var entity = new WeightBill();
- var bill = obj.Get("Bill");
- entity.FirstWeightNumber = bill.Get("FirstWeightNumber");
- entity.HogGrade_ID = bill.Get("HogGrade_ID");
- var details = obj.Get>("Detail");
- //明细接收的数据不全,所以不能全量保存.
- foreach (var detail in details)
- {
- var d = new WeightBill_HouseDetail();
- entity.HouseDetails.Add(d);
- d.ID = detail.Get("ID");
- d.LiveColonyHouse_ID = detail.Get("LiveColonyHouse_ID");
- }
- var sanctionDetail = obj.Get>("SanctionDetail");
- //明细接收的数据不全,所以不能全量保存.
- foreach (var detail in sanctionDetail)
- {
- var d = new WeightBill_SanctionDetail();
- entity.SanctionDetails.Add(d);
- d.ID = detail.Get("ID");
- d.AbnormalItem_ID = detail.Get("AbnormalItem_ID");
- d.Number = detail.Get("Number");
- }
- return entity;
- }
-
- public static List GetWeightRecord(long id)
- {
- const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/WeightBillRpc/GetWeightRecord";
- var obj = RpcFacade.Call(method, id);
- obj = obj.ESerializeDateTime();
- return serializer.Deserialize>(obj);
+ var json = RpcFacade.Call(method, ids.ToArray());
+ return serializer.Deserialize>>(json);
}
}
}
diff --git a/BWP.WinFormControl/UComboBox.cs b/BWP.WinFormControl/UComboBox.cs
index 02213e4..f917054 100644
--- a/BWP.WinFormControl/UComboBox.cs
+++ b/BWP.WinFormControl/UComboBox.cs
@@ -18,13 +18,13 @@ namespace BWP.WinFormControl
this.DropDown += (sender, de) =>
{
CRefreshItems();
- if (string.IsNullOrEmpty(this.Text))
- return;
+ //if (string.IsNullOrEmpty(this.Text))
+ // return;
- if (_enableTopItem && Items.Count > 1)
- this.SelectedIndex = 1;
- else if (!_enableTopItem && Items.Count > 0)
- this.SelectedIndex = 0;
+ //if (_enableTopItem && Items.Count > 1)
+ // this.SelectedIndex = 1;
+ //else if (!_enableTopItem && Items.Count > 0)
+ // this.SelectedIndex = 0;
SelectionStart = Text.Length;
};
this.SelectedIndexChanged += (sender, e) =>
@@ -150,7 +150,7 @@ namespace BWP.WinFormControl
}
}
- private WordPair _selectedObj = new WordPair();
+ private WordPair _selectedObj = null;
protected override void OnDropDown(EventArgs e)
{
diff --git a/ButcherWeight/WeightContext.cs b/ButcherWeight/WeightContext.cs
index f375dd6..9632092 100644
--- a/ButcherWeight/WeightContext.cs
+++ b/ButcherWeight/WeightContext.cs
@@ -15,7 +15,7 @@ namespace ButcherWeight
private static string loginConfigPath = @"C:\BwpB3Project\src\B3ButcherManageClient\ButcherManageClient\bin\Debug\WeightSetting.xml";
//#endif
//#if !debug
- // private static string loginConfigPath = Application.StartupPath + "\\WeightSetting.xml";
+ //private static string loginConfigPath = Application.StartupPath + "\\WeightSetting.xml";
//#endif
private static WeightSetting _config;
public static WeightSetting Config
diff --git a/ButcherWeight/WeightForm.Designer.cs b/ButcherWeight/WeightForm.Designer.cs
index 375a71d..d8048f8 100644
--- a/ButcherWeight/WeightForm.Designer.cs
+++ b/ButcherWeight/WeightForm.Designer.cs
@@ -36,9 +36,6 @@
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = 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 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();
@@ -49,6 +46,9 @@
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = 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();
this.panel1 = new System.Windows.Forms.Panel();
this.enableCheckBox = new System.Windows.Forms.CheckBox();
this.weightSet = new System.Windows.Forms.Button();
@@ -99,70 +99,66 @@
this.panel3 = new System.Windows.Forms.Panel();
this.farmerSelect = new BWP.WinFormControl.UComboBox();
this.farmerGrid = new System.Windows.Forms.DataGridView();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label18 = new System.Windows.Forms.Label();
+ this.weightGrid = new System.Windows.Forms.DataGridView();
+ this.panel4 = new System.Windows.Forms.Panel();
+ this.houseGird = new System.Windows.Forms.DataGridView();
+ this.abnormalGrid = new System.Windows.Forms.DataGridView();
+ this.billGrid = new System.Windows.Forms.DataGridView();
+ this.M_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.M_FinishWeight = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.M_B3ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.M_Car_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.M_Supplier_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.M_Employee_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.M_PurchaseType_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.M_Number = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.M_Weight = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.M_HouseNames = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.M_SanctionNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.M_Remark = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.label15 = new System.Windows.Forms.Label();
+ this.label16 = new System.Windows.Forms.Label();
+ this.label17 = new System.Windows.Forms.Label();
+ this.panel5 = new System.Windows.Forms.Panel();
+ this.weightLabel = new System.Windows.Forms.Label();
+ this.weightSerialPort = new System.IO.Ports.SerialPort(this.components);
+ this.label4 = new System.Windows.Forms.Label();
+ this.label5 = new System.Windows.Forms.Label();
+ this.queryBtn = new System.Windows.Forms.Button();
+ this.qSupplierSelect = new BWP.WinFormControl.UComboBox();
+ this.qCarSelect = new BWP.WinFormControl.UComboBox();
+ this.farmerMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.farmerDelete = new System.Windows.Forms.ToolStripMenuItem();
+ this.viewDetailBtn = new System.Windows.Forms.Button();
this.F_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.F_B3ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.F_WeightBill_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.F_Farmer_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.F_Index = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.F_Farmer_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.F_Number = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.F_Weight = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.label3 = new System.Windows.Forms.Label();
- this.label18 = new System.Windows.Forms.Label();
- this.weightGrid = new System.Windows.Forms.DataGridView();
this.D_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.D_B3ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_WeightBill_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_Index = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_Number = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_MaoWeight = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_PiWeight = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.D_Weight = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.panel4 = new System.Windows.Forms.Panel();
- this.houseGird = new System.Windows.Forms.DataGridView();
this.H_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.H_B3ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.H_WeightBill_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.H_LiveColonyHouse_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.H_Index = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.H_LiveColonyHouse_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.H_Number = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.abnormalGrid = new System.Windows.Forms.DataGridView();
this.S_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.S_B3ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.S_WeightBill_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.S_Sanction_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.S_AbnormalItem_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.S_Index = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.S_AbnormalItem_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.S_Number = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.billGrid = new System.Windows.Forms.DataGridView();
- this.label15 = new System.Windows.Forms.Label();
- this.label16 = new System.Windows.Forms.Label();
- this.label17 = new System.Windows.Forms.Label();
- this.panel5 = new System.Windows.Forms.Panel();
- this.weightLabel = new System.Windows.Forms.Label();
- this.weightSerialPort = new System.IO.Ports.SerialPort(this.components);
- this.label4 = new System.Windows.Forms.Label();
- this.label5 = new System.Windows.Forms.Label();
- this.queryBtn = new System.Windows.Forms.Button();
- this.qSupplierSelect = new BWP.WinFormControl.UComboBox();
- this.qCarSelect = new BWP.WinFormControl.UComboBox();
- this.farmerMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
- this.farmerDelete = new System.Windows.Forms.ToolStripMenuItem();
- this.viewDetailBtn = new System.Windows.Forms.Button();
- this.M_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.M_FinishWeight = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.M_B3ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.M_Car_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.M_Supplier_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.M_Employee_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.M_PurchaseType_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.M_Number = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.M_Weight = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.M_HouseNames = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.M_SanctionNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.M_Remark = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.panel1.SuspendLayout();
this.panel2.SuspendLayout();
this.panel3.SuspendLayout();
@@ -777,7 +773,6 @@
this.farmerGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.farmerGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.F_ID,
- this.F_B3ID,
this.F_WeightBill_ID,
this.F_Farmer_ID,
this.F_Index,
@@ -796,63 +791,6 @@
this.farmerGrid.TabIndex = 8;
this.farmerGrid.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.farmerGrid_CellMouseDown);
//
- // F_ID
- //
- this.F_ID.DataPropertyName = "ID";
- this.F_ID.HeaderText = "ID";
- this.F_ID.Name = "F_ID";
- this.F_ID.Visible = false;
- //
- // F_B3ID
- //
- this.F_B3ID.DataPropertyName = "B3ID";
- this.F_B3ID.HeaderText = "B3ID";
- this.F_B3ID.Name = "F_B3ID";
- this.F_B3ID.Visible = false;
- //
- // F_WeightBill_ID
- //
- this.F_WeightBill_ID.DataPropertyName = "WeightBill_ID";
- this.F_WeightBill_ID.HeaderText = "WeightBill_ID";
- this.F_WeightBill_ID.Name = "F_WeightBill_ID";
- this.F_WeightBill_ID.Visible = false;
- //
- // F_Farmer_ID
- //
- this.F_Farmer_ID.DataPropertyName = "Farmer_ID";
- this.F_Farmer_ID.HeaderText = "Farmer_ID";
- this.F_Farmer_ID.Name = "F_Farmer_ID";
- this.F_Farmer_ID.Visible = false;
- //
- // F_Index
- //
- this.F_Index.DataPropertyName = "Index";
- this.F_Index.HeaderText = "序号";
- this.F_Index.Name = "F_Index";
- this.F_Index.ReadOnly = true;
- this.F_Index.Width = 80;
- //
- // F_Farmer_Name
- //
- this.F_Farmer_Name.DataPropertyName = "Farmer_Name";
- this.F_Farmer_Name.HeaderText = "养殖户";
- this.F_Farmer_Name.Name = "F_Farmer_Name";
- this.F_Farmer_Name.ReadOnly = true;
- this.F_Farmer_Name.Width = 120;
- //
- // F_Number
- //
- this.F_Number.DataPropertyName = "Number";
- this.F_Number.HeaderText = "头数";
- this.F_Number.Name = "F_Number";
- this.F_Number.Width = 80;
- //
- // F_Weight
- //
- this.F_Weight.DataPropertyName = "Weight";
- this.F_Weight.HeaderText = "重量";
- this.F_Weight.Name = "F_Weight";
- //
// label3
//
this.label3.AutoSize = true;
@@ -894,7 +832,6 @@
this.weightGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.weightGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.D_ID,
- this.D_B3ID,
this.D_WeightBill_ID,
this.D_Index,
this.D_Number,
@@ -912,72 +849,6 @@
this.weightGrid.Size = new System.Drawing.Size(400, 90);
this.weightGrid.TabIndex = 0;
//
- // D_ID
- //
- this.D_ID.DataPropertyName = "ID";
- this.D_ID.HeaderText = "ID";
- this.D_ID.Name = "D_ID";
- this.D_ID.Visible = false;
- //
- // D_B3ID
- //
- this.D_B3ID.DataPropertyName = "B3ID";
- this.D_B3ID.HeaderText = "B3ID";
- this.D_B3ID.Name = "D_B3ID";
- this.D_B3ID.Visible = false;
- //
- // D_WeightBill_ID
- //
- this.D_WeightBill_ID.DataPropertyName = "WeightBill_ID";
- this.D_WeightBill_ID.HeaderText = "WeightBill_ID";
- this.D_WeightBill_ID.Name = "D_WeightBill_ID";
- this.D_WeightBill_ID.Visible = false;
- //
- // D_Index
- //
- this.D_Index.DataPropertyName = "Index";
- this.D_Index.HeaderText = "序号";
- this.D_Index.Name = "D_Index";
- this.D_Index.ReadOnly = true;
- this.D_Index.Width = 55;
- //
- // D_Number
- //
- this.D_Number.DataPropertyName = "Number";
- this.D_Number.HeaderText = "头数";
- this.D_Number.Name = "D_Number";
- this.D_Number.Width = 75;
- //
- // D_MaoWeight
- //
- this.D_MaoWeight.DataPropertyName = "MaoWeight";
- dataGridViewCellStyle6.Format = "#0.######";
- this.D_MaoWeight.DefaultCellStyle = dataGridViewCellStyle6;
- this.D_MaoWeight.HeaderText = "毛重";
- this.D_MaoWeight.Name = "D_MaoWeight";
- this.D_MaoWeight.ReadOnly = true;
- this.D_MaoWeight.Width = 88;
- //
- // D_PiWeight
- //
- this.D_PiWeight.DataPropertyName = "PiWeight";
- dataGridViewCellStyle7.Format = "#0.######";
- this.D_PiWeight.DefaultCellStyle = dataGridViewCellStyle7;
- this.D_PiWeight.HeaderText = "皮重";
- this.D_PiWeight.Name = "D_PiWeight";
- this.D_PiWeight.ReadOnly = true;
- this.D_PiWeight.Width = 88;
- //
- // D_Weight
- //
- this.D_Weight.DataPropertyName = "Weight";
- dataGridViewCellStyle8.Format = "#0.######";
- this.D_Weight.DefaultCellStyle = dataGridViewCellStyle8;
- this.D_Weight.HeaderText = "重量";
- this.D_Weight.Name = "D_Weight";
- this.D_Weight.ReadOnly = true;
- this.D_Weight.Width = 88;
- //
// panel4
//
this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
@@ -1008,7 +879,6 @@
this.houseGird.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.houseGird.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.H_ID,
- this.H_B3ID,
this.H_WeightBill_ID,
this.H_LiveColonyHouse_ID,
this.H_Index,
@@ -1025,57 +895,6 @@
this.houseGird.Size = new System.Drawing.Size(400, 90);
this.houseGird.TabIndex = 1;
//
- // H_ID
- //
- this.H_ID.DataPropertyName = "ID";
- this.H_ID.HeaderText = "ID";
- this.H_ID.Name = "H_ID";
- this.H_ID.Visible = false;
- //
- // H_B3ID
- //
- this.H_B3ID.DataPropertyName = "B3ID";
- this.H_B3ID.HeaderText = "B3ID";
- this.H_B3ID.Name = "H_B3ID";
- this.H_B3ID.Visible = false;
- //
- // H_WeightBill_ID
- //
- this.H_WeightBill_ID.DataPropertyName = "WeightBill_ID";
- this.H_WeightBill_ID.HeaderText = "WeightBill_ID";
- this.H_WeightBill_ID.Name = "H_WeightBill_ID";
- this.H_WeightBill_ID.Visible = false;
- //
- // H_LiveColonyHouse_ID
- //
- this.H_LiveColonyHouse_ID.DataPropertyName = "LiveColonyHouse_ID";
- this.H_LiveColonyHouse_ID.HeaderText = "LiveColonyHouse_ID";
- this.H_LiveColonyHouse_ID.Name = "H_LiveColonyHouse_ID";
- this.H_LiveColonyHouse_ID.Visible = false;
- //
- // H_Index
- //
- this.H_Index.DataPropertyName = "Index";
- this.H_Index.HeaderText = "序号";
- this.H_Index.Name = "H_Index";
- this.H_Index.ReadOnly = true;
- this.H_Index.Width = 80;
- //
- // H_LiveColonyHouse_Name
- //
- this.H_LiveColonyHouse_Name.DataPropertyName = "LiveColonyHouse_Name";
- this.H_LiveColonyHouse_Name.HeaderText = "圈舍";
- this.H_LiveColonyHouse_Name.Name = "H_LiveColonyHouse_Name";
- this.H_LiveColonyHouse_Name.ReadOnly = true;
- this.H_LiveColonyHouse_Name.Width = 150;
- //
- // H_Number
- //
- this.H_Number.DataPropertyName = "Number";
- this.H_Number.HeaderText = "入圈头数";
- this.H_Number.Name = "H_Number";
- this.H_Number.Width = 130;
- //
// abnormalGrid
//
this.abnormalGrid.AllowUserToAddRows = false;
@@ -1097,7 +916,6 @@
this.abnormalGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.abnormalGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.S_ID,
- this.S_B3ID,
this.S_WeightBill_ID,
this.S_Sanction_ID,
this.S_AbnormalItem_ID,
@@ -1115,64 +933,7 @@
this.abnormalGrid.Size = new System.Drawing.Size(400, 237);
this.abnormalGrid.TabIndex = 1;
//
- // S_ID
- //
- this.S_ID.DataPropertyName = "ID";
- this.S_ID.HeaderText = "ID";
- this.S_ID.Name = "S_ID";
- this.S_ID.Visible = false;
- //
- // S_B3ID
- //
- this.S_B3ID.DataPropertyName = "B3ID";
- this.S_B3ID.HeaderText = "B3ID";
- this.S_B3ID.Name = "S_B3ID";
- this.S_B3ID.Visible = false;
- //
- // S_WeightBill_ID
- //
- this.S_WeightBill_ID.DataPropertyName = "WeightBill_ID";
- this.S_WeightBill_ID.HeaderText = "WeightBill_ID";
- this.S_WeightBill_ID.Name = "S_WeightBill_ID";
- this.S_WeightBill_ID.Visible = false;
- //
- // S_Sanction_ID
- //
- this.S_Sanction_ID.DataPropertyName = "Sanction_ID";
- this.S_Sanction_ID.HeaderText = "Sanction_ID";
- this.S_Sanction_ID.Name = "S_Sanction_ID";
- this.S_Sanction_ID.Visible = false;
- //
- // S_AbnormalItem_ID
- //
- this.S_AbnormalItem_ID.HeaderText = "AbnormalItem_ID";
- this.S_AbnormalItem_ID.Name = "S_AbnormalItem_ID";
- this.S_AbnormalItem_ID.Visible = false;
- //
- // S_Index
- //
- this.S_Index.DataPropertyName = "Index";
- this.S_Index.HeaderText = "序号";
- this.S_Index.Name = "S_Index";
- this.S_Index.ReadOnly = true;
- this.S_Index.Width = 80;
- //
- // S_AbnormalItem_Name
- //
- this.S_AbnormalItem_Name.DataPropertyName = "AbnormalItem_Name";
- this.S_AbnormalItem_Name.HeaderText = "异常项目";
- this.S_AbnormalItem_Name.Name = "S_AbnormalItem_Name";
- this.S_AbnormalItem_Name.ReadOnly = true;
- this.S_AbnormalItem_Name.Width = 150;
- //
- // S_Number
- //
- this.S_Number.DataPropertyName = "Number";
- this.S_Number.HeaderText = "头数";
- this.S_Number.Name = "S_Number";
- this.S_Number.Width = 130;
- //
- // billGrid
+ // billGrid
//
this.billGrid.AllowUserToAddRows = false;
this.billGrid.AllowUserToDeleteRows = false;
@@ -1217,6 +978,102 @@
this.billGrid.TabIndex = 0;
this.billGrid.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.billGrid_CellDoubleClick);
//
+ // M_ID
+ //
+ this.M_ID.DataPropertyName = "ID";
+ this.M_ID.HeaderText = "ID";
+ this.M_ID.Name = "M_ID";
+ this.M_ID.ReadOnly = true;
+ this.M_ID.Visible = false;
+ //
+ // M_FinishWeight
+ //
+ this.M_FinishWeight.DataPropertyName = "FinishWeight";
+ this.M_FinishWeight.HeaderText = "FinishWeight";
+ this.M_FinishWeight.Name = "M_FinishWeight";
+ this.M_FinishWeight.ReadOnly = true;
+ this.M_FinishWeight.Visible = false;
+ //
+ // M_B3ID
+ //
+ this.M_B3ID.DataPropertyName = "B3ID";
+ this.M_B3ID.HeaderText = "过磅单号";
+ this.M_B3ID.Name = "M_B3ID";
+ this.M_B3ID.ReadOnly = true;
+ //
+ // M_Car_Name
+ //
+ this.M_Car_Name.DataPropertyName = "Car_Name";
+ this.M_Car_Name.HeaderText = "车辆";
+ this.M_Car_Name.Name = "M_Car_Name";
+ this.M_Car_Name.ReadOnly = true;
+ this.M_Car_Name.Width = 120;
+ //
+ // M_Supplier_Name
+ //
+ this.M_Supplier_Name.DataPropertyName = "Supplier_Name";
+ this.M_Supplier_Name.HeaderText = "供应商";
+ this.M_Supplier_Name.Name = "M_Supplier_Name";
+ this.M_Supplier_Name.ReadOnly = true;
+ this.M_Supplier_Name.Width = 120;
+ //
+ // M_Employee_Name
+ //
+ this.M_Employee_Name.DataPropertyName = "Employee_Name";
+ this.M_Employee_Name.HeaderText = "业务员";
+ this.M_Employee_Name.Name = "M_Employee_Name";
+ this.M_Employee_Name.ReadOnly = true;
+ this.M_Employee_Name.Width = 110;
+ //
+ // M_PurchaseType_Name
+ //
+ this.M_PurchaseType_Name.DataPropertyName = "PurchaseType_Name";
+ this.M_PurchaseType_Name.HeaderText = "收购类型";
+ this.M_PurchaseType_Name.Name = "M_PurchaseType_Name";
+ this.M_PurchaseType_Name.ReadOnly = true;
+ this.M_PurchaseType_Name.Width = 110;
+ //
+ // M_Number
+ //
+ this.M_Number.DataPropertyName = "Number";
+ this.M_Number.HeaderText = "收购头数";
+ this.M_Number.Name = "M_Number";
+ this.M_Number.ReadOnly = true;
+ this.M_Number.Width = 110;
+ //
+ // M_Weight
+ //
+ this.M_Weight.DataPropertyName = "Weight";
+ dataGridViewCellStyle18.Format = "#0.######";
+ this.M_Weight.DefaultCellStyle = dataGridViewCellStyle18;
+ this.M_Weight.HeaderText = "收购重量";
+ this.M_Weight.Name = "M_Weight";
+ this.M_Weight.ReadOnly = true;
+ this.M_Weight.Width = 120;
+ //
+ // M_HouseNames
+ //
+ this.M_HouseNames.DataPropertyName = "HouseNames";
+ this.M_HouseNames.HeaderText = "圈舍";
+ this.M_HouseNames.Name = "M_HouseNames";
+ this.M_HouseNames.ReadOnly = true;
+ this.M_HouseNames.Width = 180;
+ //
+ // M_SanctionNumber
+ //
+ this.M_SanctionNumber.DataPropertyName = "SanctionNumber";
+ this.M_SanctionNumber.HeaderText = "异常明细";
+ this.M_SanctionNumber.Name = "M_SanctionNumber";
+ this.M_SanctionNumber.ReadOnly = true;
+ //
+ // M_Remark
+ //
+ this.M_Remark.DataPropertyName = "Remark";
+ this.M_Remark.HeaderText = "摘要";
+ this.M_Remark.Name = "M_Remark";
+ this.M_Remark.ReadOnly = true;
+ this.M_Remark.Width = 130;
+ //
// label15
//
this.label15.AutoSize = true;
@@ -1352,101 +1209,208 @@
this.viewDetailBtn.UseVisualStyleBackColor = true;
this.viewDetailBtn.Click += new System.EventHandler(this.viewDetailBtn_Click);
//
- // M_ID
+ // F_ID
//
- this.M_ID.DataPropertyName = "ID";
- this.M_ID.HeaderText = "ID";
- this.M_ID.Name = "M_ID";
- this.M_ID.ReadOnly = true;
- this.M_ID.Visible = false;
+ this.F_ID.DataPropertyName = "ID";
+ this.F_ID.HeaderText = "ID";
+ this.F_ID.Name = "F_ID";
+ this.F_ID.Visible = false;
//
- // M_FinishWeight
+ // F_WeightBill_ID
//
- this.M_FinishWeight.DataPropertyName = "FinishWeight";
- this.M_FinishWeight.HeaderText = "FinishWeight";
- this.M_FinishWeight.Name = "M_FinishWeight";
- this.M_FinishWeight.ReadOnly = true;
- this.M_FinishWeight.Visible = false;
+ this.F_WeightBill_ID.DataPropertyName = "WeightBill_ID";
+ this.F_WeightBill_ID.HeaderText = "WeightBill_ID";
+ this.F_WeightBill_ID.Name = "F_WeightBill_ID";
+ this.F_WeightBill_ID.Visible = false;
//
- // M_B3ID
+ // F_Farmer_ID
//
- this.M_B3ID.DataPropertyName = "B3ID";
- this.M_B3ID.HeaderText = "过磅单号";
- this.M_B3ID.Name = "M_B3ID";
- this.M_B3ID.ReadOnly = true;
+ this.F_Farmer_ID.DataPropertyName = "Farmer_ID";
+ this.F_Farmer_ID.HeaderText = "Farmer_ID";
+ this.F_Farmer_ID.Name = "F_Farmer_ID";
+ this.F_Farmer_ID.Visible = false;
//
- // M_Car_Name
+ // F_Index
//
- this.M_Car_Name.DataPropertyName = "Car_Name";
- this.M_Car_Name.HeaderText = "车辆";
- this.M_Car_Name.Name = "M_Car_Name";
- this.M_Car_Name.ReadOnly = true;
- this.M_Car_Name.Width = 120;
+ this.F_Index.DataPropertyName = "Index";
+ this.F_Index.HeaderText = "序号";
+ this.F_Index.Name = "F_Index";
+ this.F_Index.ReadOnly = true;
+ this.F_Index.Width = 80;
//
- // M_Supplier_Name
+ // F_Farmer_Name
//
- this.M_Supplier_Name.DataPropertyName = "Supplier_Name";
- this.M_Supplier_Name.HeaderText = "供应商";
- this.M_Supplier_Name.Name = "M_Supplier_Name";
- this.M_Supplier_Name.ReadOnly = true;
- this.M_Supplier_Name.Width = 120;
+ this.F_Farmer_Name.DataPropertyName = "Farmer_Name";
+ this.F_Farmer_Name.HeaderText = "养殖户";
+ this.F_Farmer_Name.Name = "F_Farmer_Name";
+ this.F_Farmer_Name.ReadOnly = true;
+ this.F_Farmer_Name.Width = 120;
//
- // M_Employee_Name
+ // F_Number
//
- this.M_Employee_Name.DataPropertyName = "Employee_Name";
- this.M_Employee_Name.HeaderText = "业务员";
- this.M_Employee_Name.Name = "M_Employee_Name";
- this.M_Employee_Name.ReadOnly = true;
- this.M_Employee_Name.Width = 110;
+ this.F_Number.DataPropertyName = "Number";
+ this.F_Number.HeaderText = "头数";
+ this.F_Number.Name = "F_Number";
+ this.F_Number.Width = 80;
//
- // M_PurchaseType_Name
+ // F_Weight
//
- this.M_PurchaseType_Name.DataPropertyName = "PurchaseType_Name";
- this.M_PurchaseType_Name.HeaderText = "收购类型";
- this.M_PurchaseType_Name.Name = "M_PurchaseType_Name";
- this.M_PurchaseType_Name.ReadOnly = true;
- this.M_PurchaseType_Name.Width = 110;
+ this.F_Weight.DataPropertyName = "Weight";
+ this.F_Weight.HeaderText = "重量";
+ this.F_Weight.Name = "F_Weight";
//
- // M_Number
+ // D_ID
//
- this.M_Number.DataPropertyName = "Number";
- this.M_Number.HeaderText = "收购头数";
- this.M_Number.Name = "M_Number";
- this.M_Number.ReadOnly = true;
- this.M_Number.Width = 110;
+ this.D_ID.DataPropertyName = "ID";
+ this.D_ID.HeaderText = "ID";
+ this.D_ID.Name = "D_ID";
+ this.D_ID.Visible = false;
//
- // M_Weight
+ // D_WeightBill_ID
//
- this.M_Weight.DataPropertyName = "Weight";
- dataGridViewCellStyle18.Format = "#0.######";
- this.M_Weight.DefaultCellStyle = dataGridViewCellStyle18;
- this.M_Weight.HeaderText = "收购重量";
- this.M_Weight.Name = "M_Weight";
- this.M_Weight.ReadOnly = true;
- this.M_Weight.Width = 120;
+ this.D_WeightBill_ID.DataPropertyName = "WeightBill_ID";
+ this.D_WeightBill_ID.HeaderText = "WeightBill_ID";
+ this.D_WeightBill_ID.Name = "D_WeightBill_ID";
+ this.D_WeightBill_ID.Visible = false;
//
- // M_HouseNames
+ // D_Index
//
- this.M_HouseNames.DataPropertyName = "HouseNames";
- this.M_HouseNames.HeaderText = "圈舍";
- this.M_HouseNames.Name = "M_HouseNames";
- this.M_HouseNames.ReadOnly = true;
- this.M_HouseNames.Width = 180;
+ this.D_Index.DataPropertyName = "Index";
+ this.D_Index.HeaderText = "序号";
+ this.D_Index.Name = "D_Index";
+ this.D_Index.ReadOnly = true;
+ this.D_Index.Width = 55;
//
- // M_SanctionNumber
+ // D_Number
//
- this.M_SanctionNumber.DataPropertyName = "SanctionNumber";
- this.M_SanctionNumber.HeaderText = "异常明细";
- this.M_SanctionNumber.Name = "M_SanctionNumber";
- this.M_SanctionNumber.ReadOnly = true;
+ this.D_Number.DataPropertyName = "Number";
+ this.D_Number.HeaderText = "头数";
+ this.D_Number.Name = "D_Number";
+ this.D_Number.Width = 75;
//
- // M_Remark
+ // D_MaoWeight
//
- this.M_Remark.DataPropertyName = "Remark";
- this.M_Remark.HeaderText = "摘要";
- this.M_Remark.Name = "M_Remark";
- this.M_Remark.ReadOnly = true;
- this.M_Remark.Width = 130;
+ this.D_MaoWeight.DataPropertyName = "MaoWeight";
+ dataGridViewCellStyle6.Format = "#0.######";
+ this.D_MaoWeight.DefaultCellStyle = dataGridViewCellStyle6;
+ this.D_MaoWeight.HeaderText = "毛重";
+ this.D_MaoWeight.Name = "D_MaoWeight";
+ this.D_MaoWeight.ReadOnly = true;
+ this.D_MaoWeight.Width = 88;
+ //
+ // D_PiWeight
+ //
+ this.D_PiWeight.DataPropertyName = "PiWeight";
+ dataGridViewCellStyle7.Format = "#0.######";
+ this.D_PiWeight.DefaultCellStyle = dataGridViewCellStyle7;
+ this.D_PiWeight.HeaderText = "皮重";
+ this.D_PiWeight.Name = "D_PiWeight";
+ this.D_PiWeight.ReadOnly = true;
+ this.D_PiWeight.Width = 88;
+ //
+ // D_Weight
+ //
+ this.D_Weight.DataPropertyName = "Weight";
+ dataGridViewCellStyle8.Format = "#0.######";
+ this.D_Weight.DefaultCellStyle = dataGridViewCellStyle8;
+ this.D_Weight.HeaderText = "重量";
+ this.D_Weight.Name = "D_Weight";
+ this.D_Weight.ReadOnly = true;
+ this.D_Weight.Width = 88;
+ //
+ // H_ID
+ //
+ this.H_ID.DataPropertyName = "ID";
+ this.H_ID.HeaderText = "ID";
+ this.H_ID.Name = "H_ID";
+ this.H_ID.Visible = false;
+ //
+ // H_WeightBill_ID
+ //
+ this.H_WeightBill_ID.DataPropertyName = "WeightBill_ID";
+ this.H_WeightBill_ID.HeaderText = "WeightBill_ID";
+ this.H_WeightBill_ID.Name = "H_WeightBill_ID";
+ this.H_WeightBill_ID.Visible = false;
+ //
+ // H_LiveColonyHouse_ID
+ //
+ this.H_LiveColonyHouse_ID.DataPropertyName = "LiveColonyHouse_ID";
+ this.H_LiveColonyHouse_ID.HeaderText = "LiveColonyHouse_ID";
+ this.H_LiveColonyHouse_ID.Name = "H_LiveColonyHouse_ID";
+ this.H_LiveColonyHouse_ID.Visible = false;
+ //
+ // H_Index
+ //
+ this.H_Index.DataPropertyName = "Index";
+ this.H_Index.HeaderText = "序号";
+ this.H_Index.Name = "H_Index";
+ this.H_Index.ReadOnly = true;
+ this.H_Index.Width = 80;
+ //
+ // H_LiveColonyHouse_Name
+ //
+ this.H_LiveColonyHouse_Name.DataPropertyName = "LiveColonyHouse_Name";
+ this.H_LiveColonyHouse_Name.HeaderText = "圈舍";
+ this.H_LiveColonyHouse_Name.Name = "H_LiveColonyHouse_Name";
+ this.H_LiveColonyHouse_Name.ReadOnly = true;
+ this.H_LiveColonyHouse_Name.Width = 150;
+ //
+ // H_Number
+ //
+ this.H_Number.DataPropertyName = "Number";
+ this.H_Number.HeaderText = "入圈头数";
+ this.H_Number.Name = "H_Number";
+ this.H_Number.Width = 130;
+ //
+ // S_ID
+ //
+ this.S_ID.DataPropertyName = "ID";
+ this.S_ID.HeaderText = "ID";
+ this.S_ID.Name = "S_ID";
+ this.S_ID.Visible = false;
+ //
+ // S_WeightBill_ID
+ //
+ this.S_WeightBill_ID.DataPropertyName = "WeightBill_ID";
+ this.S_WeightBill_ID.HeaderText = "WeightBill_ID";
+ this.S_WeightBill_ID.Name = "S_WeightBill_ID";
+ this.S_WeightBill_ID.Visible = false;
+ //
+ // S_Sanction_ID
+ //
+ this.S_Sanction_ID.DataPropertyName = "Sanction_ID";
+ this.S_Sanction_ID.HeaderText = "Sanction_ID";
+ this.S_Sanction_ID.Name = "S_Sanction_ID";
+ this.S_Sanction_ID.Visible = false;
+ //
+ // S_AbnormalItem_ID
+ //
+ this.S_AbnormalItem_ID.HeaderText = "AbnormalItem_ID";
+ this.S_AbnormalItem_ID.Name = "S_AbnormalItem_ID";
+ this.S_AbnormalItem_ID.Visible = false;
+ //
+ // S_Index
+ //
+ this.S_Index.DataPropertyName = "Index";
+ this.S_Index.HeaderText = "序号";
+ this.S_Index.Name = "S_Index";
+ this.S_Index.ReadOnly = true;
+ this.S_Index.Width = 80;
+ //
+ // S_AbnormalItem_Name
+ //
+ this.S_AbnormalItem_Name.DataPropertyName = "AbnormalItem_Name";
+ this.S_AbnormalItem_Name.HeaderText = "异常项目";
+ this.S_AbnormalItem_Name.Name = "S_AbnormalItem_Name";
+ this.S_AbnormalItem_Name.ReadOnly = true;
+ this.S_AbnormalItem_Name.Width = 150;
+ //
+ // S_Number
+ //
+ this.S_Number.DataPropertyName = "Number";
+ this.S_Number.HeaderText = "头数";
+ this.S_Number.Name = "S_Number";
+ this.S_Number.Width = 130;
//
// WeightForm
//
@@ -1546,21 +1510,6 @@
private System.Windows.Forms.Label label1;
private BWP.WinFormControl.UComboBox farmerSelect;
private System.Windows.Forms.Label label3;
- private System.Windows.Forms.DataGridViewTextBoxColumn H_ID;
- private System.Windows.Forms.DataGridViewTextBoxColumn H_B3ID;
- private System.Windows.Forms.DataGridViewTextBoxColumn H_WeightBill_ID;
- private System.Windows.Forms.DataGridViewTextBoxColumn H_LiveColonyHouse_ID;
- private System.Windows.Forms.DataGridViewTextBoxColumn H_Index;
- private System.Windows.Forms.DataGridViewTextBoxColumn H_LiveColonyHouse_Name;
- private System.Windows.Forms.DataGridViewTextBoxColumn H_Number;
- private System.Windows.Forms.DataGridViewTextBoxColumn S_ID;
- private System.Windows.Forms.DataGridViewTextBoxColumn S_B3ID;
- private System.Windows.Forms.DataGridViewTextBoxColumn S_WeightBill_ID;
- private System.Windows.Forms.DataGridViewTextBoxColumn S_Sanction_ID;
- private System.Windows.Forms.DataGridViewTextBoxColumn S_AbnormalItem_ID;
- private System.Windows.Forms.DataGridViewTextBoxColumn S_Index;
- private System.Windows.Forms.DataGridViewTextBoxColumn S_AbnormalItem_Name;
- private System.Windows.Forms.DataGridViewTextBoxColumn S_Number;
private System.Windows.Forms.Button createBtn;
private System.Windows.Forms.Button exitBtn;
private System.Windows.Forms.Button deleteBtn;
@@ -1575,25 +1524,9 @@
private BWP.WinFormControl.UComboBox qSupplierSelect;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Button queryBtn;
- private System.Windows.Forms.DataGridViewTextBoxColumn F_ID;
- private System.Windows.Forms.DataGridViewTextBoxColumn F_B3ID;
- private System.Windows.Forms.DataGridViewTextBoxColumn F_WeightBill_ID;
- private System.Windows.Forms.DataGridViewTextBoxColumn F_Farmer_ID;
- private System.Windows.Forms.DataGridViewTextBoxColumn F_Index;
- private System.Windows.Forms.DataGridViewTextBoxColumn F_Farmer_Name;
- private System.Windows.Forms.DataGridViewTextBoxColumn F_Number;
- private System.Windows.Forms.DataGridViewTextBoxColumn F_Weight;
private System.Windows.Forms.ContextMenuStrip farmerMenu;
private System.Windows.Forms.ToolStripMenuItem farmerDelete;
private System.Windows.Forms.Button viewDetailBtn;
- private System.Windows.Forms.DataGridViewTextBoxColumn D_ID;
- private System.Windows.Forms.DataGridViewTextBoxColumn D_B3ID;
- private System.Windows.Forms.DataGridViewTextBoxColumn D_WeightBill_ID;
- private System.Windows.Forms.DataGridViewTextBoxColumn D_Index;
- private System.Windows.Forms.DataGridViewTextBoxColumn D_Number;
- private System.Windows.Forms.DataGridViewTextBoxColumn D_MaoWeight;
- private System.Windows.Forms.DataGridViewTextBoxColumn D_PiWeight;
- private System.Windows.Forms.DataGridViewTextBoxColumn D_Weight;
private System.Windows.Forms.TextBox discontInput;
private System.Windows.Forms.Label label9;
private System.Windows.Forms.TextBox jingjianInput;
@@ -1610,5 +1543,32 @@
private System.Windows.Forms.DataGridViewTextBoxColumn M_HouseNames;
private System.Windows.Forms.DataGridViewTextBoxColumn M_SanctionNumber;
private System.Windows.Forms.DataGridViewTextBoxColumn M_Remark;
+ private System.Windows.Forms.DataGridViewTextBoxColumn F_ID;
+ private System.Windows.Forms.DataGridViewTextBoxColumn F_WeightBill_ID;
+ private System.Windows.Forms.DataGridViewTextBoxColumn F_Farmer_ID;
+ private System.Windows.Forms.DataGridViewTextBoxColumn F_Index;
+ private System.Windows.Forms.DataGridViewTextBoxColumn F_Farmer_Name;
+ private System.Windows.Forms.DataGridViewTextBoxColumn F_Number;
+ private System.Windows.Forms.DataGridViewTextBoxColumn F_Weight;
+ private System.Windows.Forms.DataGridViewTextBoxColumn D_ID;
+ private System.Windows.Forms.DataGridViewTextBoxColumn D_WeightBill_ID;
+ private System.Windows.Forms.DataGridViewTextBoxColumn D_Index;
+ private System.Windows.Forms.DataGridViewTextBoxColumn D_Number;
+ private System.Windows.Forms.DataGridViewTextBoxColumn D_MaoWeight;
+ private System.Windows.Forms.DataGridViewTextBoxColumn D_PiWeight;
+ private System.Windows.Forms.DataGridViewTextBoxColumn D_Weight;
+ private System.Windows.Forms.DataGridViewTextBoxColumn H_ID;
+ private System.Windows.Forms.DataGridViewTextBoxColumn H_WeightBill_ID;
+ private System.Windows.Forms.DataGridViewTextBoxColumn H_LiveColonyHouse_ID;
+ private System.Windows.Forms.DataGridViewTextBoxColumn H_Index;
+ private System.Windows.Forms.DataGridViewTextBoxColumn H_LiveColonyHouse_Name;
+ private System.Windows.Forms.DataGridViewTextBoxColumn H_Number;
+ private System.Windows.Forms.DataGridViewTextBoxColumn S_ID;
+ private System.Windows.Forms.DataGridViewTextBoxColumn S_WeightBill_ID;
+ private System.Windows.Forms.DataGridViewTextBoxColumn S_Sanction_ID;
+ private System.Windows.Forms.DataGridViewTextBoxColumn S_AbnormalItem_ID;
+ private System.Windows.Forms.DataGridViewTextBoxColumn S_Index;
+ private System.Windows.Forms.DataGridViewTextBoxColumn S_AbnormalItem_Name;
+ private System.Windows.Forms.DataGridViewTextBoxColumn S_Number;
}
}
\ No newline at end of file
diff --git a/ButcherWeight/WeightForm.cs b/ButcherWeight/WeightForm.cs
index 40853ab..2cc1b08 100644
--- a/ButcherWeight/WeightForm.cs
+++ b/ButcherWeight/WeightForm.cs
@@ -31,10 +31,17 @@ namespace ButcherWeight
private delegate void InvokeHandler();
bool mainIsRun = false;
+
+ private List dmoList;
+ private WeightBill Dmo = new WeightBill();
+ private List _farmerDetails = new List();
+ private List _details = new List();
+ private List _fDelete = new List();
+ private List weightRecord = new List();
+
public WeightForm()
{
InitializeComponent();
- Control.CheckForIllegalCrossThreadCalls = false;
supplierSelect.Init("BaseInfoRpc/GetSupplierList");
purchaseTypeSelect.Init("BaseInfoRpc/GetPurchaseTypeList");
carSelect.Init("BaseInfoRpc/GetCarList");
@@ -57,7 +64,7 @@ namespace ButcherWeight
abnormalGrid.AutoGenerateColumns = false;
BindWeightBill();
mainIsRun = true;
- var syncThread = new Thread(SyncTask) { IsBackground = true };
+ var syncThread = new Thread(SyncTask);
syncThread.Start();
this.FormClosing += delegate
{
@@ -89,85 +96,16 @@ namespace ButcherWeight
}
}
}
- var detailChange = SyncWeightDetailFirstNumber();
- if (changed || detailChange)
+ if (changed)
{
this.Invoke(new InvokeHandler(delegate()
{
billGrid.Refresh();
}));
}
- 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;
- }
- }
- }
}
}
- bool SyncWeightDetailFirstNumber()
- {
- var details = new List();
- foreach (var item in dmoList)
- {
- if (item.Details.Any())
- details.Add(item.Details.First());
-
- }
- if (details.Any())
- {
- var result = WeightBillRpc.SyncWeightDetailFirstNumber(details.Select(x => (long?)x.ID).ToList());
- bool change = false;
- foreach (var item in result)
- {
- var first = details.First(x => x.ID == item.Item2);
- if (first.Number != item.Item3)
- {
- first.Number = item.Item3;
- if (!change)
- change = true;
- if (first.WeightBill_ID == Dmo.ID)
- {
- _details.First(x => x.ID == first.ID).Number = first.Number;
- weightGrid.DataSource = _details;
- weightGrid.Refresh();
- }
- }
- }
- return change;
- }
- return false;
- }
-
void BindWeightBill()
{
billGrid.DataSource = dmoList.OrderByDescending(x => x.ID).OrderBy(x => x.FinishWeight).ToList();
@@ -179,13 +117,6 @@ namespace ButcherWeight
billGrid.Refresh();
}
- private List dmoList = new List();
- private WeightBill Dmo = new WeightBill();
- private List _farmerDetails = new List();
- private List _details = new List();
- private List _fDelete = new List();
- private List weightRecord = new List();
-
private void exitBtn_Click(object sender, EventArgs e)
{
if (enableCheckBox.Checked)
@@ -207,18 +138,37 @@ namespace ButcherWeight
Dmo.FarmerDetails.AddRange(_farmerDetails.ToList());
Dmo.FarmerDetails.AddRange(_fDelete.ToList());
- var isNew = Dmo.ID == 0;
var send = weightRecord.Where(x => x.Delete || x.ID == 0).ToList();
- var result = WeightBillRpc.Send(Dmo, send);
+ var result = WeightBillRpc.UpdateOrInsert(Dmo, send);
weightRecord.Clear();
- if (isNew)
- dmoList.Add(Dmo);
+ UpdateOrInsertList();
BindWeightBill();
if (result)
MessageBox.Show("保存成功!");
AppToUI();
}
+ void UpdateOrInsertList()
+ {
+ var entity = dmoList.FirstOrDefault(x => x.ID == Dmo.ID);
+ if (entity == null)
+ {
+ entity = new WeightBillList();
+ entity.ID = Dmo.ID;
+ entity.B3ID = Dmo.B3ID;
+ dmoList.Add(entity);
+ }
+ entity.Car_Name = Dmo.Car_Name;
+ entity.Supplier_Name = Dmo.Supplier_Name;
+ entity.Employee_Name = Dmo.Employee_Name;
+ entity.PurchaseType_Name = Dmo.PurchaseType_Name;
+ var detail = Dmo.Details.First();
+ entity.Number = detail.Number;
+ entity.Weight = detail.Weight;
+ entity.Remark = Dmo.Remark;
+ entity.FinishWeight = detail.MaoWeight.HasValue && detail.PiWeight.HasValue;
+ }
+
private void createBtn_Click(object sender, EventArgs e)
{
Dmo = new WeightBill();
@@ -398,19 +348,19 @@ namespace ButcherWeight
hogGradeSelect.Fill(Dmo.HogGrade_Name, Dmo.HogGrade_ID.ToString());
if (Dmo.ShackWeight.HasValue)
- penWeightInput.Text = Dmo.ShackWeight.Value.ToString();
+ penWeightInput.Text = Dmo.ShackWeight.Value.ToString("#0.######");
if (Dmo.ShackPrice.HasValue)
- penPriceInput.Text = Dmo.ShackPrice.Value.ToString();
+ penPriceInput.Text = Dmo.ShackPrice.Value.ToString("#0.######");
if (Dmo.ShackMoney.HasValue)
- penMoneyInput.Text = Dmo.ShackMoney.Value.ToString();
+ penMoneyInput.Text = Dmo.ShackMoney.Value.ToString("#0.######");
if (Dmo.JingJianFee.HasValue)
- jingjianInput.Text = Dmo.JingJianFee.Value.ToString();
+ jingjianInput.Text = Dmo.JingJianFee.Value.ToString("#0.######");
if (Dmo.DiscontMoney.HasValue)
- discontInput.Text = Dmo.DiscontMoney.Value.ToString();
+ discontInput.Text = Dmo.DiscontMoney.Value.ToString("#0.######");
if (!string.IsNullOrEmpty(Dmo.AnimalTestNumber))
testCardNumberInput.Text = Dmo.AnimalTestNumber;
@@ -426,6 +376,7 @@ namespace ButcherWeight
_farmerDetails = Dmo.FarmerDetails.Where(x => !x.DeleteState).ToList();
_details = Dmo.Details.ToList();
+ _fDelete.Clear();
weightRecord.Clear();
if (_farmerDetails.Any())
@@ -463,7 +414,7 @@ namespace ButcherWeight
return;
var id = Convert.ToInt64(billGrid.CurrentRow.Cells["M_ID"].Value);
- Dmo = dmoList.First(x => x.ID == id);
+ Dmo = WeightBillRpc.Load(id);
AppToUI();
}
@@ -478,7 +429,8 @@ namespace ButcherWeight
WeightBillRpc.Delete(Dmo.ID);
if (dmoList.Any(x => x.ID == Dmo.ID))
{
- dmoList.Remove(Dmo);
+ var idx = dmoList.FindIndex(x => x.ID == Dmo.ID);
+ dmoList.RemoveAt(idx);
BindWeightBill();
}
createBtn_Click(sender, e);
diff --git a/ButcherWeight/WeightForm.resx b/ButcherWeight/WeightForm.resx
index 42ede96..824df27 100644
--- a/ButcherWeight/WeightForm.resx
+++ b/ButcherWeight/WeightForm.resx
@@ -120,9 +120,6 @@
True
-
- True
-
True
@@ -144,9 +141,6 @@
True
-
- True
-
True
@@ -168,9 +162,6 @@
True
-
- True
-
True
@@ -189,9 +180,6 @@
True
-
- True
-
True
diff --git a/ButcherWeight/WeightFormWeightPart.cs b/ButcherWeight/WeightFormWeightPart.cs
index 37f3d56..958ab22 100644
--- a/ButcherWeight/WeightFormWeightPart.cs
+++ b/ButcherWeight/WeightFormWeightPart.cs
@@ -14,26 +14,11 @@ namespace ButcherWeight
partial class WeightForm
{
private IDataFormat _dataFormat;
- private Thread _inQueryThread, _outQueryThread;
+ private Thread _inQueryThread;
private bool _mainProcessIsRun;
readonly StringBuilder _dataStrBuilder = new StringBuilder();
- readonly ConcurrentQueue _dataQueue = new ConcurrentQueue();
- private const int WmUpdDisplayMessage = 0x0500 + 2;
private string _displayValue;
- private int _mainHandle;
-
- int MainHandle
- {
- get
- {
- if (_mainHandle == 0)
- {
- _mainHandle = WinApiSendMessage.FindWindow(null, this.Text);
- }
- return _mainHandle;
- }
- }
void OpenSerialPort()
{
@@ -85,9 +70,6 @@ namespace ButcherWeight
{
_inQueryThread = new Thread(InQuery);
_inQueryThread.Start();
-
- _outQueryThread = new Thread(OutQuery);
- _outQueryThread.Start();
}
string format = "{0:0.00}";
@@ -117,7 +99,17 @@ namespace ButcherWeight
else if (c == _dataFormat.Endchar || _dataStrBuilder.Length == _dataFormat.DataLength - 1)
{
_dataStrBuilder.Append(c);
- _dataQueue.Enqueue(_dataStrBuilder.ToString());
+ bool isStatic;
+ string str;
+ if (_dataFormat.ParseAscii(_dataStrBuilder.ToString(), out str, out isStatic))
+ {
+ if (string.IsNullOrEmpty(str))
+ str = "0";
+ this.Invoke(new InvokeHandler(delegate()
+ {
+ _displayValue = string.Format(format, decimal.Parse(str));
+ }));
+ }
_dataStrBuilder.Clear();
}
else if (_dataStrBuilder.Length != 0)
@@ -128,40 +120,6 @@ namespace ButcherWeight
}
}
- private void OutQuery()
- {
- while (_mainProcessIsRun)
- {
- try
- {
- bool isStatic;
- string str;
-
- string subStr;
-
- if (!_dataQueue.TryDequeue(out subStr))
- {
- Thread.Sleep(1);
- continue;
- }
- // 解析接受的端口数据
- if (_dataFormat.ParseAscii(subStr, out str, out isStatic))
- {
- if (string.IsNullOrEmpty(str))
- str = "0";
- _displayValue = string.Format(format, decimal.Parse(str));
- WinApiSendMessage.SendMessage(MainHandle, WmUpdDisplayMessage, 0, 0);
- }
- }
- catch (Exception)
- {
- Thread.Sleep(1000);
- continue;
- }
- Thread.Sleep(1);
- }
- }
-
void DisableWeight()
{
_mainProcessIsRun = false;
@@ -172,10 +130,6 @@ namespace ButcherWeight
{
_inQueryThread.Abort();
}
- if (_outQueryThread.IsAlive)
- {
- _outQueryThread.Abort();
- }
if (weightSerialPort.IsOpen)
weightSerialPort.Close();
}
@@ -204,19 +158,5 @@ namespace ButcherWeight
}
set { weightLabel.Text = string.Format(format, value); }
}
-
- protected override void DefWndProc(ref Message m)
- {
- switch (m.Msg)
- {
- case WmUpdDisplayMessage:
- weightLabel.Text = string.Format(format, decimal.Parse(_displayValue));
- break;
-
- default:
- base.DefWndProc(ref m);
- break;
- }
- }
}
}
diff --git a/QualityAndOrder/QualityOrderForm.Designer.cs b/QualityAndOrder/QualityOrderForm.Designer.cs
index 42c8741..b99c353 100644
--- a/QualityAndOrder/QualityOrderForm.Designer.cs
+++ b/QualityAndOrder/QualityOrderForm.Designer.cs
@@ -69,13 +69,6 @@
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_Employee_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.W_Supplier_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.W_FirstWeightNumber = 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();
@@ -90,6 +83,17 @@
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.preOrderGrid = new BWP.WinFormControl.UDataGridView();
+ this.P_WeightBill_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.P_Show = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.P_B3ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.P_Supplier_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.P_HouseNames = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.P_Number = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.P_AlreadyNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.P_LastNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.P_WeighTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.P_OKBtn = new System.Windows.Forms.DataGridViewButtonColumn();
+ this.P_Hidden = new System.Windows.Forms.DataGridViewButtonColumn();
this.orderGrid = new BWP.WinFormControl.UDataGridView();
this.O_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.O_IsHurryButcher = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -103,17 +107,13 @@
this.tab2SyncBtn = new System.Windows.Forms.Button();
this.tab2DateSelect = new BWP.WinFormControl.UDatePicker();
this.label4 = new System.Windows.Forms.Label();
- this.P_WeightBill_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.P_Show = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.P_B3ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.P_Supplier_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.P_HouseNames = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.P_Number = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.P_AlreadyNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.P_LastNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.P_WeighTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.P_OKBtn = new System.Windows.Forms.DataGridViewButtonColumn();
- this.P_Hidden = new System.Windows.Forms.DataGridViewButtonColumn();
+ 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_Employee_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.W_Supplier_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.W_Number = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.W_HouseNames = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.uTabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.panel1.SuspendLayout();
@@ -465,7 +465,7 @@
this.W_B3ID,
this.W_Employee_Name,
this.W_Supplier_Name,
- this.W_FirstWeightNumber,
+ this.W_Number,
this.W_HouseNames});
this.weightBillGrid.Location = new System.Drawing.Point(25, 77);
this.weightBillGrid.MultiSelect = false;
@@ -480,61 +480,6 @@
this.weightBillGrid.TabIndex = 34;
this.weightBillGrid.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.weightBillGrid_CellClick);
//
- // 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;
- this.W_B3ID.Width = 80;
- //
- // W_Employee_Name
- //
- this.W_Employee_Name.DataPropertyName = "Employee_Name";
- this.W_Employee_Name.HeaderText = "业务员";
- this.W_Employee_Name.Name = "W_Employee_Name";
- this.W_Employee_Name.ReadOnly = true;
- this.W_Employee_Name.Width = 80;
- //
- // 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;
- //
- // W_FirstWeightNumber
- //
- this.W_FirstWeightNumber.DataPropertyName = "FirstWeightNumber";
- this.W_FirstWeightNumber.HeaderText = "头数";
- this.W_FirstWeightNumber.Name = "W_FirstWeightNumber";
- this.W_FirstWeightNumber.ReadOnly = true;
- this.W_FirstWeightNumber.Width = 65;
- //
- // 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 = 105;
- //
// syncBtn
//
this.syncBtn.Font = new System.Drawing.Font("宋体", 15F);
@@ -732,6 +677,97 @@
this.preOrderGrid.TabIndex = 38;
this.preOrderGrid.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.preOrderGrid_CellClick);
//
+ // P_WeightBill_ID
+ //
+ this.P_WeightBill_ID.DataPropertyName = "WeightBill_ID";
+ this.P_WeightBill_ID.HeaderText = "WeightBill_ID";
+ this.P_WeightBill_ID.Name = "P_WeightBill_ID";
+ this.P_WeightBill_ID.ReadOnly = true;
+ this.P_WeightBill_ID.Visible = false;
+ //
+ // P_Show
+ //
+ this.P_Show.DataPropertyName = "Show";
+ this.P_Show.HeaderText = "Show";
+ this.P_Show.Name = "P_Show";
+ this.P_Show.ReadOnly = true;
+ this.P_Show.Visible = false;
+ //
+ // P_B3ID
+ //
+ this.P_B3ID.DataPropertyName = "B3ID";
+ this.P_B3ID.HeaderText = "磅单号";
+ this.P_B3ID.Name = "P_B3ID";
+ this.P_B3ID.ReadOnly = true;
+ this.P_B3ID.Width = 80;
+ //
+ // P_Supplier_Name
+ //
+ this.P_Supplier_Name.DataPropertyName = "Supplier_Name";
+ this.P_Supplier_Name.HeaderText = "供应商";
+ this.P_Supplier_Name.Name = "P_Supplier_Name";
+ this.P_Supplier_Name.ReadOnly = true;
+ this.P_Supplier_Name.Width = 80;
+ //
+ // P_HouseNames
+ //
+ this.P_HouseNames.DataPropertyName = "HouseNames";
+ this.P_HouseNames.HeaderText = "圈舍";
+ this.P_HouseNames.Name = "P_HouseNames";
+ this.P_HouseNames.ReadOnly = true;
+ this.P_HouseNames.Width = 95;
+ //
+ // P_Number
+ //
+ this.P_Number.DataPropertyName = "Number";
+ this.P_Number.HeaderText = "总头数";
+ this.P_Number.Name = "P_Number";
+ this.P_Number.ReadOnly = true;
+ this.P_Number.Width = 80;
+ //
+ // P_AlreadyNumber
+ //
+ this.P_AlreadyNumber.DataPropertyName = "AlreadyNumber";
+ this.P_AlreadyNumber.HeaderText = "已排";
+ this.P_AlreadyNumber.Name = "P_AlreadyNumber";
+ this.P_AlreadyNumber.ReadOnly = true;
+ this.P_AlreadyNumber.Width = 65;
+ //
+ // P_LastNumber
+ //
+ this.P_LastNumber.DataPropertyName = "LastNumber";
+ this.P_LastNumber.HeaderText = "剩余";
+ this.P_LastNumber.Name = "P_LastNumber";
+ this.P_LastNumber.ReadOnly = true;
+ this.P_LastNumber.Width = 65;
+ //
+ // P_WeighTime
+ //
+ this.P_WeighTime.DataPropertyName = "WeighTime";
+ this.P_WeighTime.HeaderText = "过磅时间";
+ this.P_WeighTime.Name = "P_WeighTime";
+ this.P_WeighTime.ReadOnly = true;
+ this.P_WeighTime.Width = 105;
+ //
+ // P_OKBtn
+ //
+ this.P_OKBtn.HeaderText = "排宰";
+ this.P_OKBtn.Name = "P_OKBtn";
+ this.P_OKBtn.ReadOnly = true;
+ this.P_OKBtn.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.P_OKBtn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ this.P_OKBtn.Text = "排宰";
+ this.P_OKBtn.UseColumnTextForButtonValue = true;
+ this.P_OKBtn.Width = 85;
+ //
+ // P_Hidden
+ //
+ this.P_Hidden.HeaderText = "隐藏";
+ this.P_Hidden.Name = "P_Hidden";
+ this.P_Hidden.ReadOnly = true;
+ this.P_Hidden.Text = "隐藏";
+ this.P_Hidden.Width = 85;
+ //
// orderGrid
//
this.orderGrid.AllowUserToAddRows = false;
@@ -881,96 +917,60 @@
this.label4.TabIndex = 35;
this.label4.Text = "日期:";
//
- // P_WeightBill_ID
- //
- this.P_WeightBill_ID.DataPropertyName = "WeightBill_ID";
- this.P_WeightBill_ID.HeaderText = "WeightBill_ID";
- this.P_WeightBill_ID.Name = "P_WeightBill_ID";
- this.P_WeightBill_ID.ReadOnly = true;
- this.P_WeightBill_ID.Visible = false;
- //
- // P_Show
- //
- this.P_Show.DataPropertyName = "Show";
- this.P_Show.HeaderText = "Show";
- this.P_Show.Name = "P_Show";
- this.P_Show.ReadOnly = true;
- this.P_Show.Visible = false;
- //
- // P_B3ID
- //
- this.P_B3ID.DataPropertyName = "B3ID";
- this.P_B3ID.HeaderText = "磅单号";
- this.P_B3ID.Name = "P_B3ID";
- this.P_B3ID.ReadOnly = true;
- this.P_B3ID.Width = 80;
- //
- // P_Supplier_Name
- //
- this.P_Supplier_Name.DataPropertyName = "Supplier_Name";
- this.P_Supplier_Name.HeaderText = "供应商";
- this.P_Supplier_Name.Name = "P_Supplier_Name";
- this.P_Supplier_Name.ReadOnly = true;
- this.P_Supplier_Name.Width = 80;
- //
- // P_HouseNames
+ // W_ID
//
- this.P_HouseNames.DataPropertyName = "HouseNames";
- this.P_HouseNames.HeaderText = "圈舍";
- this.P_HouseNames.Name = "P_HouseNames";
- this.P_HouseNames.ReadOnly = true;
- this.P_HouseNames.Width = 95;
+ 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;
//
- // P_Number
+ // W_AlreadyHouse
//
- this.P_Number.DataPropertyName = "Number";
- this.P_Number.HeaderText = "总头数";
- this.P_Number.Name = "P_Number";
- this.P_Number.ReadOnly = true;
- this.P_Number.Width = 80;
+ 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;
//
- // P_AlreadyNumber
+ // W_B3ID
//
- this.P_AlreadyNumber.DataPropertyName = "AlreadyNumber";
- this.P_AlreadyNumber.HeaderText = "已排";
- this.P_AlreadyNumber.Name = "P_AlreadyNumber";
- this.P_AlreadyNumber.ReadOnly = true;
- this.P_AlreadyNumber.Width = 65;
+ this.W_B3ID.DataPropertyName = "B3ID";
+ this.W_B3ID.HeaderText = "磅单号";
+ this.W_B3ID.Name = "W_B3ID";
+ this.W_B3ID.ReadOnly = true;
+ this.W_B3ID.Width = 80;
//
- // P_LastNumber
+ // W_Employee_Name
//
- this.P_LastNumber.DataPropertyName = "LastNumber";
- this.P_LastNumber.HeaderText = "剩余";
- this.P_LastNumber.Name = "P_LastNumber";
- this.P_LastNumber.ReadOnly = true;
- this.P_LastNumber.Width = 65;
+ this.W_Employee_Name.DataPropertyName = "Employee_Name";
+ this.W_Employee_Name.HeaderText = "业务员";
+ this.W_Employee_Name.Name = "W_Employee_Name";
+ this.W_Employee_Name.ReadOnly = true;
+ this.W_Employee_Name.Width = 80;
//
- // P_WeighTime
+ // W_Supplier_Name
//
- this.P_WeighTime.DataPropertyName = "WeighTime";
- this.P_WeighTime.HeaderText = "过磅时间";
- this.P_WeighTime.Name = "P_WeighTime";
- this.P_WeighTime.ReadOnly = true;
- this.P_WeighTime.Width = 105;
+ 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;
//
- // P_OKBtn
+ // W_Number
//
- this.P_OKBtn.HeaderText = "排宰";
- this.P_OKBtn.Name = "P_OKBtn";
- this.P_OKBtn.ReadOnly = true;
- this.P_OKBtn.Resizable = System.Windows.Forms.DataGridViewTriState.True;
- this.P_OKBtn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
- this.P_OKBtn.Text = "排宰";
- this.P_OKBtn.UseColumnTextForButtonValue = true;
- this.P_OKBtn.Width = 85;
+ this.W_Number.DataPropertyName = "Number";
+ this.W_Number.HeaderText = "头数";
+ this.W_Number.Name = "W_Number";
+ this.W_Number.ReadOnly = true;
+ this.W_Number.Width = 65;
//
- // P_Hidden
+ // W_HouseNames
//
- this.P_Hidden.HeaderText = "隐藏";
- this.P_Hidden.Name = "P_Hidden";
- this.P_Hidden.ReadOnly = true;
- this.P_Hidden.Text = "隐藏";
- this.P_Hidden.Width = 85;
+ this.W_HouseNames.DataPropertyName = "HouseNames";
+ this.W_HouseNames.HeaderText = "圈舍";
+ this.W_HouseNames.Name = "W_HouseNames";
+ this.W_HouseNames.ReadOnly = true;
+ this.W_HouseNames.Width = 105;
//
// QualityOrderForm
//
@@ -1057,13 +1057,6 @@
private System.Windows.Forms.DataGridViewButtonColumn O_OKBtn;
private System.Windows.Forms.DataGridViewButtonColumn O_HurryBtn;
private System.Windows.Forms.Panel panel2;
- 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_Employee_Name;
- private System.Windows.Forms.DataGridViewTextBoxColumn W_Supplier_Name;
- private System.Windows.Forms.DataGridViewTextBoxColumn W_FirstWeightNumber;
- private System.Windows.Forms.DataGridViewTextBoxColumn W_HouseNames;
private System.Windows.Forms.Panel panel3;
private System.Windows.Forms.RadioButton showHidden;
private System.Windows.Forms.RadioButton showAvailable;
@@ -1079,6 +1072,13 @@
private System.Windows.Forms.DataGridViewTextBoxColumn P_WeighTime;
private System.Windows.Forms.DataGridViewButtonColumn P_OKBtn;
private System.Windows.Forms.DataGridViewButtonColumn P_Hidden;
+ 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_Employee_Name;
+ private System.Windows.Forms.DataGridViewTextBoxColumn W_Supplier_Name;
+ private System.Windows.Forms.DataGridViewTextBoxColumn W_Number;
+ private System.Windows.Forms.DataGridViewTextBoxColumn W_HouseNames;
diff --git a/QualityAndOrder/QualityOrderForm.cs b/QualityAndOrder/QualityOrderForm.cs
index a600fd4..de529fd 100644
--- a/QualityAndOrder/QualityOrderForm.cs
+++ b/QualityAndOrder/QualityOrderForm.cs
@@ -34,7 +34,8 @@ namespace QualityAndOrder
List> hogGradeList;
List houseList;
List sanctionList;
- List weightBills;
+ List weightBills;
+ HouseAndSanctionEdit Dmo;
Thread syncThread;
readonly Color btnSelectForeColor = Color.FromArgb(255, 255, 255);
readonly Color btnSelectBackColor = Color.FromArgb(66, 163, 218);
@@ -44,9 +45,7 @@ namespace QualityAndOrder
public QualityOrderForm()
{
InitializeComponent();
- Control.CheckForIllegalCrossThreadCalls = false;
testTimeInput.Date = DateTime.Today;
- syncBtn.Focus();
this.uTabControl1.Selected += (sender, e) =>
{
this.Text = e.TabPage.Text;
@@ -65,7 +64,8 @@ namespace QualityAndOrder
numberBox.LostFocus += (sender, e) => { flag = 1; };
sanctionGrid.GotFocus += (sender, e) => { flag = 2; };
- syncThread = new Thread(SyncTask) { IsBackground = true };
+ syncThread = new Thread(SyncTask);
+ syncThread.Start();
this.FormClosing += delegate
{
if (syncThread.IsAlive)
@@ -73,7 +73,6 @@ namespace QualityAndOrder
if (tb2SyncThread != null && tb2SyncThread.IsAlive)
tb2SyncThread.Abort();
};
- syncThread.Start();
Tab2Init();
}
@@ -82,8 +81,11 @@ namespace QualityAndOrder
{
while (true)
{
- BindNumberLabel();
Thread.Sleep(2000);
+ this.Invoke(new InvokeHandler(delegate()
+ {
+ BindNumberLabel();
+ }));
}
}
@@ -334,23 +336,20 @@ namespace QualityAndOrder
private void commitBtn_Click(object sender, EventArgs e)
{
- var entity = GetHouseDataFromUI();
- entity.AlreadyHouse = true;
- var result = WeightBillRpc.UpdateInsertHouseAndSanctionInfo(entity);
- if (result == 1)
- {
- MessageBox.Show("提交成功");
- BindWeightBillGrid();
- BindNumberLabel();
- ResetTab1Controls();
- }
- else
- MessageBox.Show("结果", "提交失败", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ GetDataFromUI();
+ HouseAndSanctionRpc.UpdateInsertHouseAndSanction(Dmo);
+ var entity = weightBills.First(x => x.ID == Dmo.ID);
+ entity.HouseNames = string.Join(",", Dmo.HouseDetails.Select(x => x.LiveColonyHouse_Name));
+ entity.Number = Dmo.Number;
+ Dmo = null;
+ BindWeightBillGrid();
+ BindNumberLabel();
+ ResetTab1Controls();
}
private void syncBtn_Click(object sender, EventArgs e)
{
- weightBills = WeightBillRpc.GetUnHousedBill(testTimeInput.Date.Value);
+ weightBills = HouseAndSanctionRpc.GetHouseAndSanctionList(testTimeInput.Date.Value);
BindWeightBillGrid();
//BindNumberLabel();
//tab1SyncThread = new Thread(StartQuery) { IsBackground = true };
@@ -369,51 +368,56 @@ namespace QualityAndOrder
// weightBills = WeightBillRpc.GetUnHousedBill(testTimeInput.Date.Value);
// BindWeightBillGrid();
// }));
-
- // BindNumberLabel();
// Thread.Sleep(10000);
// }
//}
void BindNumberLabel()
{
- var inHouseNumber = WeightBillRpc.GetDetailTotalNumber(testTimeInput.Date.Value);
+ var inHouseNumber = HouseAndSanctionRpc.GetDetailTotalNumber(testTimeInput.Date.Value);
inHouseNumberLabel.Text = string.Format("{0}", inHouseNumber);
}
- WeightBill GetHouseDataFromUI()
+ void GetDataFromUI()
{
- if (weightBillGrid.CurrentRow == null)
- throw new Exception("请选择需要处理的记录");
- var entity = weightBillGrid.CurrentRow.DataBoundItem as WeightBill;
+ if (Dmo == null)
+ {
+ if (weightBillGrid.CurrentRow == null)
+ throw new Exception("请选择需要处理的记录");
+ Dmo = new HouseAndSanctionEdit();
+ Dmo.ID = (long)weightBillGrid.CurrentRow.Cells["W_ID"].Value;
+ }
+ else
+ {
+ Dmo.HouseDetails.Clear();
+ Dmo.SanctionDetails.Clear();
+ }
if (string.IsNullOrEmpty(numberBox.Text))
throw new Exception("数量不能为空");
if (currentBtn == null)
throw new Exception("请选等级");
if (houseSelectedBtn.Count == 0)
throw new Exception("请选择圈舍");
- entity.HouseDetails.Clear();
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 };
- entity.HouseDetails.Add(houseDetail);
- houseDetail.Index = entity.HouseDetails.Max(x => x.Index) + 1;
+ var houseDetail = new WeightBill_HouseDetail() { WeightBill_ID = Dmo.ID, LiveColonyHouse_ID = long.Parse(house.Item1), LiveColonyHouse_Name = house.Item2 };
+ Dmo.HouseDetails.Add(houseDetail);
+ houseDetail.Index = Dmo.HouseDetails.Max(x => x.Index) + 1;
}
var gradeTag = currentBtn.Tag as Tuple;
- entity.HogGrade_ID = long.Parse(gradeTag.Item1);
- entity.HogGrade_Name = gradeTag.Item2;
- entity.FirstWeightNumber = int.Parse(numberBox.Text);
- entity.SanctionDetails.Clear();
+ Dmo.HogGrade_ID = long.Parse(gradeTag.Item1);
+ Dmo.HogGrade_Name = gradeTag.Item2;
+ Dmo.Number = int.Parse(numberBox.Text);
foreach (DataGridViewRow row in sanctionGrid.Rows)
{
var tag = row.DataBoundItem as SanctionSplit3Part;
if (tag.Number1.HasValue)
{
var detail = new WeightBill_SanctionDetail();
- entity.SanctionDetails.Add(detail);
- detail.WeightBill_ID = entity.ID;
- detail.Index = entity.SanctionDetails.Max(x => x.Index) + 1;
+ Dmo.SanctionDetails.Add(detail);
+ detail.WeightBill_ID = Dmo.ID;
+ detail.Index = Dmo.SanctionDetails.Max(x => x.Index) + 1;
detail.Sanction_ID = tag.Sanction_ID1;
detail.AbnormalItem_ID = tag.AbnormalItem_ID1;
detail.AbnormalItem_Name = tag.AbnormalItem_Name1;
@@ -422,9 +426,9 @@ namespace QualityAndOrder
if (tag.Number2.HasValue)
{
var detail = new WeightBill_SanctionDetail();
- entity.SanctionDetails.Add(detail);
- detail.WeightBill_ID = entity.ID;
- detail.Index = entity.SanctionDetails.Max(x => x.Index) + 1;
+ Dmo.SanctionDetails.Add(detail);
+ detail.WeightBill_ID = Dmo.ID;
+ detail.Index = Dmo.SanctionDetails.Max(x => x.Index) + 1;
detail.Sanction_ID = tag.Sanction_ID2;
detail.AbnormalItem_ID = tag.AbnormalItem_ID2;
detail.AbnormalItem_Name = tag.AbnormalItem_Name2;
@@ -433,16 +437,15 @@ namespace QualityAndOrder
if (tag.Number3.HasValue)
{
var detail = new WeightBill_SanctionDetail();
- entity.SanctionDetails.Add(detail);
- detail.WeightBill_ID = entity.ID;
- detail.Index = entity.SanctionDetails.Max(x => x.Index) + 1;
+ Dmo.SanctionDetails.Add(detail);
+ detail.WeightBill_ID = Dmo.ID;
+ detail.Index = Dmo.SanctionDetails.Max(x => x.Index) + 1;
detail.Sanction_ID = tag.Sanction_ID3;
detail.AbnormalItem_ID = tag.AbnormalItem_ID3;
detail.AbnormalItem_Name = tag.AbnormalItem_Name3;
detail.Number = tag.Number3;
}
}
- return entity;
}
void ResetTab1Controls()
@@ -472,18 +475,18 @@ namespace QualityAndOrder
void Tab1AppToUI()
{
var id = Convert.ToInt64(weightBillGrid.CurrentRow.Cells["W_ID"].Value);
- var entity = WeightBillRpc.GetWeightBillOnHousePage(id);
+ Dmo = HouseAndSanctionRpc.GetHouseAndSanctionDetail(id);
numberBox.Text = string.Empty;
- if (entity.HogGrade_ID.HasValue)
+ if (Dmo.HogGrade_ID.HasValue)
{
- var first = hogGradeBtn.FirstOrDefault(x => x.Name == "_" + entity.HogGrade_ID);
+ var first = hogGradeBtn.FirstOrDefault(x => x.Name == "_" + Dmo.HogGrade_ID);
if (first != null)
{
currentBtn = first;
SetBtnChecked(currentBtn);
}
}
- foreach (var item in entity.HouseDetails)
+ foreach (var item in Dmo.HouseDetails)
{
var first = houseBtn.FirstOrDefault(x => x.Name == "_" + item.LiveColonyHouse_ID);
if (first != null)
@@ -492,7 +495,7 @@ namespace QualityAndOrder
houseSelectedBtn.Add(first);
}
}
- foreach (var item in entity.SanctionDetails)
+ foreach (var item in Dmo.SanctionDetails)
{
var first = sanctionList.FirstOrDefault(x => x.AbnormalItem_ID1 == item.AbnormalItem_ID);
if (first != null)
diff --git a/QualityAndOrder/QualityOrderForm.resx b/QualityAndOrder/QualityOrderForm.resx
index e72c0a1..f3b08c3 100644
--- a/QualityAndOrder/QualityOrderForm.resx
+++ b/QualityAndOrder/QualityOrderForm.resx
@@ -168,7 +168,7 @@
True
-
+
True
diff --git a/QualityAndOrder/QualityOrderFormForTab2.cs b/QualityAndOrder/QualityOrderFormForTab2.cs
index 209af72..bee632f 100644
--- a/QualityAndOrder/QualityOrderFormForTab2.cs
+++ b/QualityAndOrder/QualityOrderFormForTab2.cs
@@ -81,7 +81,7 @@ namespace QualityAndOrder
BindOrderGrid();
if (tb2SyncThread == null)
{
- tb2SyncThread = new Thread(Tab2SyncB3ID) { IsBackground = true };
+ tb2SyncThread = new Thread(Tab2SyncB3ID);
tb2SyncThread.Start();
}
}
diff --git a/Setup/Release/Setup.msi b/Setup/Release/Setup.msi
index bbdb7d87ccb0183ca8e366d546b4ac42e247a319..4fd565be92ff1d31d3d44d35c4330bafe9f8e7bf 100644
GIT binary patch
delta 261573
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 vn1Ad6h^b2Ph=L@V|b}h%a
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