明细传输错误修正
This commit is contained in:
commit
650f89b7cb
3 files changed
+19
-52
No files matched your search
@@ -110,19 +110,10 @@ namespace DyeingComputer.UserClass
|
||||
Dictionary<string, object> WorkOrder_dat;
|
||||
WorkOrder_dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(SYSDAT);
|
||||
//WorkOrder_dat.GetValue("WorkOrder");
|
||||
bool dat_w = SQLDATA.WorkOrder(
|
||||
WorkOrder_dat.GetValue("WorkOrder").ToString(),
|
||||
WorkOrder_dat.GetValue("ProgramName").ToString(),
|
||||
WorkOrder_dat.GetValue("StartTime").ToString(),
|
||||
WorkOrder_dat.GetValue("EndTime").ToString(),
|
||||
WorkOrder_dat.GetValue("Time").ToString(),
|
||||
WorkOrder_dat.GetValue("Remark").ToString(),
|
||||
WorkOrder_dat.GetValue("lock").ToString(),
|
||||
WorkOrder_dat.GetValue("State").ToString(),
|
||||
WorkOrder_dat.GetValue("ProgramID").ToString(),
|
||||
WorkOrder_dat.GetValue("color").ToString(),
|
||||
WorkOrder_dat.GetValue("Dyelot").ToString());
|
||||
if (!dat_w)
|
||||
|
||||
object i = MainWindow.SQLiteHelpers.ExecuteScalar("select * from WorkOrder where WorkOrder = " + WorkOrder_dat.GetValue("WorkOrder").ToString(), null);
|
||||
|
||||
if (i != null)
|
||||
{
|
||||
client.SendAsync("SC910" + "[" + MainWindowViewModel.S01 + "]" +
|
||||
WorkOrder_dat.GetValue("WorkOrder").ToString());
|
||||
@@ -133,6 +124,8 @@ namespace DyeingComputer.UserClass
|
||||
WorkOrder_dat.GetValue("WorkOrder").ToString()); MainWindowViewModel.TX++;
|
||||
}
|
||||
|
||||
MainWindow.SQLiteHelpers.InsertData("WorkOrder", WorkOrder_dat);
|
||||
|
||||
APILog.DBlog(client.IP, SYSKEY, SYSAPI, SYSDAT);//记录指令
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
+1
-27
@@ -17,33 +17,7 @@ namespace DyeingComputer.UserClass
|
||||
// private static SQLiteHelper SQLiteHelpers = null; //定义数据库
|
||||
// private readonly static string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径
|
||||
|
||||
//WorkOrder表检查写入
|
||||
public static bool WorkOrder(string WorkOrder, string ProgramName, string StartTime, string EndTime, string Time, string Remark,string lock_,string state,string ProgramID, string color,string dyelot)
|
||||
{
|
||||
// SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
|
||||
// SQLiteHelpers.Open(); //打开数据库
|
||||
object i = MainWindow.SQLiteHelpers.ExecuteScalar("select * from WorkOrder where WorkOrder = "+ WorkOrder,null);
|
||||
if (i!=null)
|
||||
{
|
||||
//SQLiteHelpers.Close();
|
||||
return false;
|
||||
}
|
||||
Dictionary<string, object> WorkOrder_new = new Dictionary<string, object>();//缓存函数
|
||||
WorkOrder_new.Add("WorkOrder", WorkOrder);
|
||||
WorkOrder_new.Add("ProgramName", ProgramName);
|
||||
WorkOrder_new.Add("StartTime", StartTime);
|
||||
WorkOrder_new.Add("EndTime", EndTime);
|
||||
WorkOrder_new.Add("Time", Time);
|
||||
WorkOrder_new.Add("Remark", Remark);
|
||||
WorkOrder_new.Add("lock", Convert.ToInt16(lock_));
|
||||
WorkOrder_new.Add("state", Convert.ToInt16(state));
|
||||
WorkOrder_new.Add("ProgramID", ProgramID);
|
||||
WorkOrder_new.Add("color", color);
|
||||
WorkOrder_new.Add("Dyelot", dyelot);
|
||||
MainWindow.SQLiteHelpers.InsertData("WorkOrder", WorkOrder_new);
|
||||
//SQLiteHelpers.Close();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
public static bool WorkOderStep(DataTable WorkOrderStep_)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user