From 33cbf43ad1d22318a8c9798c46d43f9ddefb6bf5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 15 九月 2020 13:29:34 +0800
Subject: [PATCH] #修改物料结构
---
src/main/resources/UpdateThread.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/UpdateThread.cs b/src/main/resources/UpdateThread.cs
index bf7d0f4..321e938 100644
--- a/src/main/resources/UpdateThread.cs
+++ b/src/main/resources/UpdateThread.cs
@@ -835,7 +835,7 @@
goto re;
}
- ///鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗ｇ墿鏂欑紪鐮�
+ ///鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗ｄ骇鍝佷唬鍙�
string sqlDetl = "";
string sqlWaitIn = "";
sql = "select lgnum,tbnum,tbpos,zmatid,matnr,maktx,werks,anfme,altme,zpallet,bname from asr_wrk_detl where wrk_no=" + li_wrk_no;
@@ -910,7 +910,7 @@
#endregion
#region 鎷ｆ枡鍐嶅叆搴�
case 53:
- ///鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗ｇ墿鏂欑紪鐮�
+ ///鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗ｄ骇鍝佷唬鍙�
sqlDetl = "";
sqlWaitIn = "";
sql = "select lgnum,tbnum,tbpos,zmatid,matnr,maktx,werks,anfme,altme,zpallet,bname from asr_wrk_detl where wrk_no=" + li_wrk_no;
@@ -964,7 +964,7 @@
#endregion
#region 骞舵澘鍐嶅叆搴�
case 54:
- ///鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗ｇ墿鏂欑紪鐮�
+ ///鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗ｄ骇鍝佷唬鍙�
sqlDetl = "";
sqlWaitIn = "";
sql = "select lgnum,tbnum,tbpos,zmatid,matnr,maktx,werks,anfme,altme,zpallet,bname from asr_wrk_detl where wrk_no=" + li_wrk_no;
@@ -1030,7 +1030,7 @@
#endregion
#region 鐩樼偣鍐嶅叆搴�
case 57:
- ///鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗ｇ墿鏂欑紪鐮�
+ ///鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗ｄ骇鍝佷唬鍙�
sqlDetl = "";
sqlWaitIn = "";
sql = "select lgnum,tbnum,tbpos,matnr from asr_wrk_detl where wrk_no=" + li_wrk_no;
@@ -1133,7 +1133,7 @@
{
#region 鍏ㄦ澘鍑哄簱
case 101:
- ///鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗ｇ墿鏂欑紪鐮�
+ ///鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗ｄ骇鍝佷唬鍙�
string sqlWaitIn = "";
sql = "select lgnum,tbnum,tbpos,matnr from asr_wrk_detl where wrk_no=" + li_wrk_no;
DataView dv_wrkdetl = Common.ExecAsrsSelect(sql);
@@ -1375,12 +1375,12 @@
}
/// <summary>
- /// 杞凡瀹屾垚鐗╂枡淇℃伅鍒板巻鍙叉。
+ /// 杞凡瀹屾垚浜у搧淇℃伅鍒板巻鍙叉。
/// </summary>
public void ProcMatCodeToLog(string seq)
{
string ls_error_memo = "", mat_no = "";
- DisplayInfo(seq, "N", "--澶勭悊宸插畬鎴愮墿鏂欐暟鎹浆鍘嗗彶妗�......");
+ DisplayInfo(seq, "N", "--澶勭悊宸插畬鎴愪骇鍝佹暟鎹浆鍘嗗彶妗�......");
try
{
string condition = " and mat_no not in (select mat_no from asr_loc_detl) and mat_no not in (select mat_no from asr_wrk_detl) ";
@@ -1389,7 +1389,7 @@
DataView dv = Common.ExecAsrsSelect(sql0);
if (dv.Count <= 0)
{
- DisplayInfo("", "N", " " + seq + ".1 鐗╂枡妗� [bas_mat_code] 娌℃湁璧勬枡澶勭悊!");
+ DisplayInfo("", "N", " " + seq + ".1 浜у搧妗� [bas_mat_code] 娌℃湁璧勬枡澶勭悊!");
return;
}
@@ -1428,7 +1428,7 @@
{
sqltrans.Rollback();
//sqlcommon.Close();
- ls_error_memo = " " + seq + ".1 宸插畬鎴愮墿鏂欐暟鎹浆鍘嗗彶妗ｉ敊璇� ! 寮傚父:" + t.Message;
+ ls_error_memo = " " + seq + ".1 宸插畬鎴愪骇鍝佹暟鎹浆鍘嗗彶妗ｉ敊璇� ! 寮傚父:" + t.Message;
DisplayInfo("", "E", ls_error_memo);
}
finally
@@ -1440,7 +1440,7 @@
}
catch (Exception t)
{
- ls_error_memo = " " + seq + ".2 宸插畬鎴愮墿鏂欐暟鎹浆鍘嗗彶妗ｅけ璐�! 寮傚父:" + t.Message;
+ ls_error_memo = " " + seq + ".2 宸插畬鎴愪骇鍝佹暟鎹浆鍘嗗彶妗ｅけ璐�! 寮傚父:" + t.Message;
DisplayInfo("", "E", ls_error_memo);
}
}
@@ -1539,7 +1539,7 @@
{
sqltrans1.Rollback();
//sqlcommon.Close();
- ls_error_memo = " " + seq + ".1 宸插畬鎴愮墿鏂欐暟鎹浆鍘嗗彶妗ｉ敊璇� ! 寮傚父:" + t.Message;
+ ls_error_memo = " " + seq + ".1 宸插畬鎴愪骇鍝佹暟鎹浆鍘嗗彶妗ｉ敊璇� ! 寮傚父:" + t.Message;
DisplayInfo("", "E", ls_error_memo);
}
finally
@@ -1707,7 +1707,7 @@
//鍫嗗灈鏈�&PLC鍛戒护杞巻鍙叉。
ProcDevCommandToLog("4"); // done
- //杞凡瀹屾垚鐗╂枡淇℃伅鍒板巻鍙叉。
+ //杞凡瀹屾垚浜у搧淇℃伅鍒板巻鍙叉。
//ProcMatCodeToLog("5");
//杞嚭搴撳畬鎴愬緟鍑哄簱妗ｆ暟鎹埌鍘嗗彶妗�
ProcCheckToWorkData("5");
--
Gitblit v1.9.1