Browse Source

修改。

master
yibo 8 years ago
parent
commit
7683d3fda5
6 changed files with 28 additions and 23 deletions
  1. +8
    -8
      BO/Utils/AfterLoginUtil.cs
  2. +1
    -1
      ButcherManageClient/Login.cs
  3. +0
    -5
      ButcherWeight/WeightContext.cs
  4. BIN
      Setup/Release/Setup.msi
  5. +0
    -5
      WeighAndGrading/GradeContext.cs
  6. +19
    -4
      WeighAndGrading/GradeFrom.cs

+ 8
- 8
BO/Utils/AfterLoginUtil.cs View File

@ -19,13 +19,13 @@ namespace BO.Utils
public static class AfterLoginUtil
{
static List<Tuple<string, string>> roleToAssemblies = new List<Tuple<string, string>>(){new Tuple<string,string>("排宰员",@"C:\BwpB3Project\src\B3ButcherManageClient\ButcherOrder\bin\Debug\ButcherOrder"),
new Tuple<string,string>("过磅员",@"C:\BwpB3Project\src\B3ButcherManageClient\ButcherWeight\bin\Debug\ButcherWeight"),
new Tuple<string,string>("验质员",@"C:\BwpB3Project\src\B3ButcherManageClient\QualityAndOrder\bin\Debug\QualityAndOrder"),new Tuple<string,string>("定级员",@"C:\BwpB3Project\src\B3ButcherManageClient\WeighAndGrading\bin\Debug\WeighAndGrading"),new Tuple<string,string>("窒晕员",@"C:\BwpB3Project\src\B3ButcherManageClient\OrderConfirm\bin\Debug\OrderConfirm")};
// static List<Tuple<string, string>> roleToAssemblies = new List<Tuple<string, string>>(){new Tuple<string,string>("排宰员",@"C:\BwpB3Project\src\B3ButcherManageClient\ButcherOrder\bin\Debug\ButcherOrder"),
//new Tuple<string,string>("过磅员",@"C:\BwpB3Project\src\B3ButcherManageClient\ButcherWeight\bin\Debug\ButcherWeight"),
// new Tuple<string,string>("验质员",@"C:\BwpB3Project\src\B3ButcherManageClient\QualityAndOrder\bin\Debug\QualityAndOrder"),new Tuple<string,string>("定级员",@"C:\BwpB3Project\src\B3ButcherManageClient\WeighAndGrading\bin\Debug\WeighAndGrading"),new Tuple<string,string>("窒晕员",@"C:\BwpB3Project\src\B3ButcherManageClient\OrderConfirm\bin\Debug\OrderConfirm")};
//static List<Tuple<string, string>> roleToAssemblies = new List<Tuple<string, string>>(){new Tuple<string,string>("排宰员",@"ButcherOrder"),
//new Tuple<string,string>("过磅员",@"ButcherWeight"),
// new Tuple<string,string>("验质员",@"QualityAndOrder"),new Tuple<string,string>("定级员",@"WeighAndGrading"),new Tuple<string,string>("窒晕员",@"OrderConfirm")};
static List<Tuple<string, string>> roleToAssemblies = new List<Tuple<string, string>>(){new Tuple<string,string>("排宰员",@"ButcherOrder"),
new Tuple<string,string>("过磅员",@"ButcherWeight"),
new Tuple<string,string>("验质员",@"QualityAndOrder"),new Tuple<string,string>("定级员",@"WeighAndGrading"),new Tuple<string,string>("窒晕员",@"OrderConfirm")};
public static Form CreateForm(string role)
@ -34,10 +34,10 @@ namespace BO.Utils
if (first == null)
throw new Exception("未注册的角色");
//#if debug
var filePath = string.Format("{0}.dll", first.Item2);
//var filePath = string.Format("{0}.dll", first.Item2);
//#endif
//#if !debug
//var filePath = Path.Combine(Application.StartupPath, string.Format("{0}.dll", first.Item2));
var filePath = Path.Combine(Application.StartupPath, string.Format("{0}.dll", first.Item2));
//#endif
if (!File.Exists(filePath))
throw new Exception("相关模块不存在");


+ 1
- 1
ButcherManageClient/Login.cs View File

@ -140,7 +140,7 @@ namespace ButcherManageClient
private void Login_Load(object sender, EventArgs e)
{
//AutoUpdate();
AutoUpdate();
}
}
}

+ 0
- 5
ButcherWeight/WeightContext.cs View File

@ -11,12 +11,7 @@ namespace ButcherWeight
{
public static class WeightContext
{
//#if debug
//private static string loginConfigPath = @"C:\BwpB3Project\src\B3ButcherManageClient\ButcherManageClient\bin\Debug\WeightSetting.xml";
//#endif
//#if !debug
private static string loginConfigPath = Application.StartupPath + "\\WeightSetting.xml";
//#endif
private static WeightSetting _config;
public static WeightSetting Config
{


BIN
Setup/Release/Setup.msi View File


+ 0
- 5
WeighAndGrading/GradeContext.cs View File

@ -11,12 +11,7 @@ namespace WeighAndGrading
{
public static class GradeContext
{
//#if debug
//private static string loginConfigPath = @"C:\BwpB3Project\src\B3ButcherManageClient\ButcherManageClient\bin\Debug\GradeConfig.xml";
//#endif
//#if !debug
private static string loginConfigPath = Application.StartupPath + "\\GradeConfig.xml";
//#endif
private static GradeConfig _config;
public static GradeConfig Config
{


+ 19
- 4
WeighAndGrading/GradeFrom.cs View File

@ -49,6 +49,7 @@ namespace WeighAndGrading
List<long> localTang, localMao;
string maoFilePath, tangFilePath;
string discontPath = Path.Combine(DATA_PATH, "Disconts.xml");
bool connection = false;
@ -834,17 +835,16 @@ namespace WeighAndGrading
Button disBtn = null;
void BuildDiscontPanel(bool firstLoad)
{
var fileName = Path.Combine(DATA_PATH, "Disconts.xml");
var disconts = new List<BodyDiscontItem>();
if (!firstLoad)
VerifyConnection();
if (connection)
{
disconts = GradeAndWeightRpc.GetBodyDiscontItem();
XmlUtil.SerializerObjToFile(disconts, fileName);
XmlUtil.SerializerObjToFile(disconts, discontPath);
}
else
disconts = XmlUtil.DeserializeFromFile<List<BodyDiscontItem>>(fileName);
disconts = XmlUtil.DeserializeFromFile<List<BodyDiscontItem>>(discontPath);
disconts = disconts.Where(x => x.Discont > 0).OrderBy(x => x.ID).ToList();
discontPanel.Controls.Clear();
@ -974,7 +974,6 @@ namespace WeighAndGrading
SaveEntityToLocal(tang);
}
bool? last = null;
void VerifyConnection()
{
@ -1010,6 +1009,7 @@ namespace WeighAndGrading
{
SyncLocalMainFinish(ref localTang, true);
SyncLocalMainFinish(ref localMao, false);
SyncDiscontToSever();
LocalGradeAndWeightBL.Sync();
}
catch(Exception ex) {
@ -1020,5 +1020,20 @@ namespace WeighAndGrading
Thread.Sleep(2000);
}
}
void SyncDiscontToSever()
{
var changeFlagPath = Path.Combine(GradeFrom.DATA_PATH, "DiscontsChanged.txt");
bool existFile = File.Exists(changeFlagPath);
if (existFile)
{
var list = XmlUtil.DeserializeFromFile<List<BodyDiscontItem>>(discontPath);
var changes = new List<CTuple<long, decimal?>>();
foreach (var item in list)
changes.Add(new CTuple<long, decimal?>(item.ID, item.Discont));
GradeAndWeightRpc.SaveBodyDiscontItem(changes);
File.Delete(changeFlagPath);
}
}
}
}

Loading…
Cancel
Save