Browse Source

需求单No.6009 带日期+js8180+分类

qdwf_with_date_js8180
Robin_PC\robin 3 days ago
parent
commit
ab5990479b
4 changed files with 40 additions and 30 deletions
  1. +6
    -0
      ButcherFactory.BO/LocalBL/SegmentProductionBL.cs
  2. +1
    -0
      ButcherFactory.BO/Utils/AppContext.cs
  3. +13
    -11
      ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs
  4. +20
    -19
      ButcherFactory.Login/Login.xaml.cs

+ 6
- 0
ButcherFactory.BO/LocalBL/SegmentProductionBL.cs View File

@ -18,6 +18,7 @@ namespace ButcherFactory.BO.LocalBL
const string RpcPath = @"/MainSystem/B3ClientService/Rpcs/SegmentProductionRpc/"; const string RpcPath = @"/MainSystem/B3ClientService/Rpcs/SegmentProductionRpc/";
const string ProductTaskRpc = @"/MainSystem/B3Sale/Rpcs/SaleOutStoreRpc/GetSaleOutStoreNumber"; const string ProductTaskRpc = @"/MainSystem/B3Sale/Rpcs/SaleOutStoreRpc/GetSaleOutStoreNumber";
const string BatchProductTaskRpc = @"/MainSystem/B3Sale/Rpcs/SaleOutStoreRpc/BatchGetSaleOutStoreNumber"; const string BatchProductTaskRpc = @"/MainSystem/B3Sale/Rpcs/SaleOutStoreRpc/BatchGetSaleOutStoreNumber";
const string GetMinWeightMethod = @"/MainSystem/B3Sale/Rpcs/SaleOutStoreRpc/GetMinWeight";
public static BindingList<SegmentProduction> GetListByState(bool submited) public static BindingList<SegmentProduction> GetListByState(bool submited)
{ {
@ -691,6 +692,11 @@ namespace ButcherFactory.BO.LocalBL
session.Commit(); session.Commit();
} }
} }
public static decimal GetMinWeight()
{
return ButcherFactoryUtil.SecondUrlCall<decimal>(GetMinWeightMethod);
}
} }
class SegmentProductionMin class SegmentProductionMin


+ 1
- 0
ButcherFactory.BO/Utils/AppContext.cs View File

@ -9,6 +9,7 @@ namespace ButcherFactory.BO.Utils
{ {
public static class AppContext public static class AppContext
{ {
public static string Version = "202611181920";
public static bool RpcFacadeInited { get; set; } public static bool RpcFacadeInited { get; set; }
static ServerUrlConfig _connectInfo = ServerUrlConfig.Init(); static ServerUrlConfig _connectInfo = ServerUrlConfig.Init();
public static ServerUrlConfig ConnectInfo { get { return _connectInfo; } } public static ServerUrlConfig ConnectInfo { get { return _connectInfo; } }


+ 13
- 11
ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs View File

@ -47,6 +47,7 @@ namespace ButcherFactory.SegmentProductionAuto_
DateTime? batchDate; DateTime? batchDate;
DateTime butcherDate = DateTime.Today; DateTime butcherDate = DateTime.Today;
DateTime scDateValue = DateTime.Today; DateTime scDateValue = DateTime.Today;
decimal minWeight = 0;
NotAuto.SegmentProductionFormConfig config; NotAuto.SegmentProductionFormConfig config;
List<GoodsIdentify> identityList; List<GoodsIdentify> identityList;
List<string> specialGoodsCodes; List<string> specialGoodsCodes;
@ -180,6 +181,7 @@ namespace ButcherFactory.SegmentProductionAuto_
_freshTotalCode = SegmentProductionBL.InitFreshTotalCode(); _freshTotalCode = SegmentProductionBL.InitFreshTotalCode();
_stayTotalCode = SegmentProductionBL.InitStayTotalCode(); _stayTotalCode = SegmentProductionBL.InitStayTotalCode();
identityList = SegmentProductionBL.GetGoodsIdentify(); identityList = SegmentProductionBL.GetGoodsIdentify();
minWeight = SegmentProductionBL.GetMinWeight();
} }
void LoadBind() void LoadBind()
@ -324,6 +326,11 @@ namespace ButcherFactory.SegmentProductionAuto_
MessageBox.Show("重量必须大于0"); MessageBox.Show("重量必须大于0");
return; return;
} }
if (minWeight > 0 && weight < minWeight)
{
MessageBox.Show(string.Format("重量:{0}小于最小重量:{1}", weight, minWeight));
return;
}
if (g.StandardWeight.HasValue) if (g.StandardWeight.HasValue)
{ {
if (weight < (g.StandardWeightLow ?? 0) || weight > (g.StandardWeightUp ?? 0)) if (weight < (g.StandardWeightLow ?? 0) || weight > (g.StandardWeightUp ?? 0))
@ -424,7 +431,11 @@ namespace ButcherFactory.SegmentProductionAuto_
//#endif //#endif
if (weight <= 0) if (weight <= 0)
throw new Exception("重量必须大于0"); throw new Exception("重量必须大于0");
if (minWeight > 0 && weight < minWeight)
{
MessageBox.Show(string.Format("重量:{0}小于最小重量:{1}", weight, minWeight));
return;
}
if (detail.StandardWeight.HasValue) if (detail.StandardWeight.HasValue)
{ {
if (weight < (detail.StandardWeightLow ?? 0) || weight > (detail.StandardWeightUp ?? 0)) if (weight < (detail.StandardWeightLow ?? 0) || weight > (detail.StandardWeightUp ?? 0))
@ -1187,15 +1198,6 @@ namespace ButcherFactory.SegmentProductionAuto_
scDate .Text = scDateValue.ToString("yyyy-MM-dd"); scDate .Text = scDateValue.ToString("yyyy-MM-dd");
} }
} }
private void flowLayoutPanel2_Paint(object sender, PaintEventArgs e)
{
}
private void label3_Click(object sender, EventArgs e)
{
}
} }
} }

+ 20
- 19
ButcherFactory.Login/Login.xaml.cs View File

@ -111,27 +111,28 @@ namespace ButcherFactory.Login
void Login_Loaded(object sender, RoutedEventArgs e) 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>("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>("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<ClientVersion>(down.DownloadString(versionInfo.ServerUrl));
if (versionInfo.Version != serverVersion.Version)
updateImg.Visibility = Visibility.Visible;
//var down = new System.Net.WebClient();
//var serverVersion = XmlUtil.XmlDeserializeObject<ClientVersion>(down.DownloadString(versionInfo.ServerUrl));
//if (versionInfo.Version != serverVersion.Version)
// updateImg.Visibility = Visibility.Visible;
} }
private void UpdateBtn_Click(object sender, MouseButtonEventArgs e) private void UpdateBtn_Click(object sender, MouseButtonEventArgs e)


Loading…
Cancel
Save