diff --git a/ButcherFactory.BO/LocalBL/SegmentProductionBL.cs b/ButcherFactory.BO/LocalBL/SegmentProductionBL.cs index 48bf0ea..60ab510 100644 --- a/ButcherFactory.BO/LocalBL/SegmentProductionBL.cs +++ b/ButcherFactory.BO/LocalBL/SegmentProductionBL.cs @@ -18,6 +18,7 @@ namespace ButcherFactory.BO.LocalBL const string RpcPath = @"/MainSystem/B3ClientService/Rpcs/SegmentProductionRpc/"; const string ProductTaskRpc = @"/MainSystem/B3Sale/Rpcs/SaleOutStoreRpc/GetSaleOutStoreNumber"; const string BatchProductTaskRpc = @"/MainSystem/B3Sale/Rpcs/SaleOutStoreRpc/BatchGetSaleOutStoreNumber"; + const string GetMinWeightMethod = @"/MainSystem/B3Sale/Rpcs/SaleOutStoreRpc/GetMinWeight"; public static BindingList GetListByState(bool submited) { @@ -691,6 +692,11 @@ namespace ButcherFactory.BO.LocalBL session.Commit(); } } + + public static decimal GetMinWeight() + { + return ButcherFactoryUtil.SecondUrlCall(GetMinWeightMethod); + } } class SegmentProductionMin diff --git a/ButcherFactory.BO/Utils/AppContext.cs b/ButcherFactory.BO/Utils/AppContext.cs index f5784bc..5b3c5e4 100644 --- a/ButcherFactory.BO/Utils/AppContext.cs +++ b/ButcherFactory.BO/Utils/AppContext.cs @@ -9,6 +9,7 @@ namespace ButcherFactory.BO.Utils { public static class AppContext { + public static string Version = "202611182000"; public static bool RpcFacadeInited { get; set; } static ServerUrlConfig _connectInfo = ServerUrlConfig.Init(); public static ServerUrlConfig ConnectInfo { get { return _connectInfo; } } diff --git a/ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs b/ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs index 46596d0..20245fe 100644 --- a/ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs +++ b/ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs @@ -43,6 +43,7 @@ namespace ButcherFactory.SegmentProductionAuto_ long? batchID; DateTime? batchDate; DateTime butcherDate = DateTime.Today; + decimal minWeight = 0; NotAuto.SegmentProductionFormConfig config; List identityList; List specialGoodsCodes; @@ -125,6 +126,7 @@ namespace ButcherFactory.SegmentProductionAuto_ _freshTotalCode = SegmentProductionBL.InitFreshTotalCode(); _stayTotalCode = SegmentProductionBL.InitStayTotalCode(); identityList = SegmentProductionBL.GetGoodsIdentify(); + minWeight = SegmentProductionBL.GetMinWeight(); } void LoadBind() @@ -249,6 +251,12 @@ namespace ButcherFactory.SegmentProductionAuto_ MessageBox.Show("重量必须大于0"); return; } + if (minWeight > 0 && weight < minWeight) + { + MessageBox.Show(string.Format("重量:{0}小于最小重量:{1}", weight, minWeight)); + return; + } + if (g.StandardWeight.HasValue) { if (weight < (g.StandardWeightLow ?? 0) || weight > (g.StandardWeightUp ?? 0)) @@ -349,6 +357,11 @@ namespace ButcherFactory.SegmentProductionAuto_ //#endif if (weight <= 0) throw new Exception("重量必须大于0"); + if (minWeight > 0 && weight < minWeight) + { + MessageBox.Show(string.Format("重量:{0}小于最小重量:{1}", weight, minWeight)); + return; + } if (detail.StandardWeight.HasValue) { diff --git a/ButcherFactory.Login/Login.xaml.cs b/ButcherFactory.Login/Login.xaml.cs index 5764e32..931a5d7 100644 --- a/ButcherFactory.Login/Login.xaml.cs +++ b/ButcherFactory.Login/Login.xaml.cs @@ -110,28 +110,29 @@ namespace ButcherFactory.Login const string puKey = "c756e02cedb42a33f78091a466411bde8447d854"; void Login_Loaded(object sender, RoutedEventArgs e) - { - if (!File.Exists("ButcherFactory.AutoUpdate.exe")) - return; - var versionInfo = new ClientVersion(); - if (File.Exists("ClientVersion.xml")) - { - versionInfo = XmlUtil.DeserializeFromFile("ClientVersion.xml"); - versionLbl.Text = versionInfo.Version; - } - if (string.IsNullOrEmpty(versionInfo.ServerUrl)) - versionInfo.ServerUrl = serUri; + { + versionLbl.Text = BO.Utils.AppContext.Version; + //if (!File.Exists("ButcherFactory.AutoUpdate.exe")) + // return; + //var versionInfo = new ClientVersion(); + //if (File.Exists("ClientVersion.xml")) + //{ + // versionInfo = XmlUtil.DeserializeFromFile("ClientVersion.xml"); + // versionLbl.Text = versionInfo.Version; + //} + //if (string.IsNullOrEmpty(versionInfo.ServerUrl)) + // versionInfo.ServerUrl = serUri; - HttpWebRequest req = (HttpWebRequest)WebRequest.Create(versionInfo.ServerUrl); - req.Timeout = 5000; - HttpWebResponse resp = (HttpWebResponse)req.GetResponse(); - if (resp.StatusCode != HttpStatusCode.OK) - return; + //HttpWebRequest req = (HttpWebRequest)WebRequest.Create(versionInfo.ServerUrl); + //req.Timeout = 5000; + //HttpWebResponse resp = (HttpWebResponse)req.GetResponse(); + //if (resp.StatusCode != HttpStatusCode.OK) + // return; - var down = new System.Net.WebClient(); - var serverVersion = XmlUtil.XmlDeserializeObject(down.DownloadString(versionInfo.ServerUrl)); - if (versionInfo.Version != serverVersion.Version) - updateImg.Visibility = Visibility.Visible; + //var down = new System.Net.WebClient(); + //var serverVersion = XmlUtil.XmlDeserializeObject(down.DownloadString(versionInfo.ServerUrl)); + //if (versionInfo.Version != serverVersion.Version) + // updateImg.Visibility = Visibility.Visible; } private void UpdateBtn_Click(object sender, MouseButtonEventArgs e)