From 2fdf959ac739edd6de84aa8053b8b9683dce8e8b Mon Sep 17 00:00:00 2001
From: zhao
Date: 星期三, 07 七月 2021 14:53:24 +0800
Subject: [PATCH] 中策下任务接口
---
HH.WMS.BLL/External/WmsApiBaseBLL.cs | 483 ++++-------------------------------------------------
1 files changed, 42 insertions(+), 441 deletions(-)
diff --git a/HH.WMS.BLL/External/WmsApiBaseBLL.cs b/HH.WMS.BLL/External/WmsApiBaseBLL.cs
index adfa8c7..f737913 100644
--- a/HH.WMS.BLL/External/WmsApiBaseBLL.cs
+++ b/HH.WMS.BLL/External/WmsApiBaseBLL.cs
@@ -1512,29 +1512,23 @@
#endregion
+ string tno = executeStatePara.transportTask.CN_S_TASK_NO;
+ if (tno.IndexOf('_') > 0)
+ {
+ tno = tno.Substring(tno.IndexOf("_") + 1);
+ }
// 鑾峰彇涓讳换鍔�- var task = executeStatePara.transportTask;
- if (!string.IsNullOrEmpty(task.CN_S_EXT1))
+ var task = BLLCreator.CreateDapper<TN_WM_TASKEntity>().GetSingleEntity(new
{
- task = BLLCreator.CreateDapper<TN_WM_TASKEntity>().GetSingleEntity(new
- {
- CN_S_TASK_NO = task.CN_S_EXT1
- });
- }
- TN_WM_TASKEntity task_kthk = null;
- // 鐗规畩涓氬姟
- // 鎴愬瀷鏈烘弧鎵樺嚭搴撳畬鎴愭椂锛岃鎵ц绌烘墭鍥炲簱浠诲姟
- if (executeStatePara.transportTask.CN_S_EXT2 == TaskFlagConstants.CXJ_MTCK_SUB_2)
+ CN_S_TASK_NO = tno
+ });
+ Log.Detail(logPara, "鑾峰彇涓讳换鍔★細浠诲姟缂栧彿锛�" + tno);
+ // mes浠诲姟
+ var mes_task = BLLCreator.CreateDapper<TN_MES_TASK>().GetSingleEntity(new
{
- // 鏌ユ壘缁堢偣璐т綅(绾胯竟璐т綅)鏄惁鏈夋湭鎵ц鐨勭┖鎵樺洖搴撲换鍔�- task_kthk = BLLCreator.CreateDapper<TN_WM_TASKEntity>().GetSingleEntity(new
- {
- CN_S_START_AREA = executeStatePara.transportTask.CN_S_END_AREA,
- CN_S_START_BIT = executeStatePara.transportTask.CN_S_END_BIT,
- CN_S_STATE = Constants.TaskState_NoExecuted,
- CN_S_EXT3 = TaskSectionConstants.CXJ_KTHK_RECORD
- });
- }
+ task_no = task.CN_S_EXT1
+ });
+ Log.Detail(logPara, "鑾峰彇MES浠诲姟锛氫换鍔＄紪鍙凤細 " + task.CN_S_EXT1);
return UseTransaction(trans =>
{
@@ -1549,453 +1543,60 @@
}, new { executeStatePara.transportTask.CN_S_TASK_NO }, trans);
Log.Detail(logPara, "鏇存柊浠诲姟鐘舵�-浠诲姟鍙凤細" + executeStatePara.transportTask.CN_S_TASK_NO + "鐘舵�涓猴細" + executeStatePara.taskState);
- //绔嬪簱浠诲姟 瀛愪换鍔″畬鎴愭椂锛岄渶瑕佸悓姝ュ鐞嗕富浠诲姟
string taskNo = executeStatePara.transportTask.CN_S_TASK_NO;
+
+ //绔嬪簱浠诲姟 瀛愪换鍔″畬鎴愭椂锛岄渶瑕佸悓姝ュ鐞嗕富浠诲姟
if (taskNo.IndexOf('_') > 0)
{
- string fatherNo = taskNo.Substring(0, taskNo.IndexOf("_"));
- string childNo = taskNo.Substring(taskNo.IndexOf("_") + 1);
+ string topNo = taskNo.Substring(0, taskNo.IndexOf("_"));
+ string navNo = taskNo.Substring(taskNo.IndexOf("_") + 1);
- #region 娴锋疆涓瓥
-
- #region 鍗婃垚鍝�-
- #region 绌烘墭鍑哄簱
-
- // 鍗婃垚鍝�绌烘墭鍑哄簱绗竴鏉″瓙浠诲姟
- if (executeStatePara.transportTask.CN_S_EXT2 == TaskFlagConstants.BCP_KTCK_SUB_1)
+ //A鍒癇鐨凙GV鎼繍浠诲姟
+ if (navNo == "1")
{
- // 鎺ラ┏浣嶇姸鎬佹敼涓�婊�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
+ if (mes_task.SECTION == TaskSectionConstants.BCP_KTCK ||
+ mes_task.SECTION == TaskSectionConstants.CXJ_MTCK ||
+ mes_task.SECTION == TaskSectionConstants.DS_MTCK)
{
- CN_S_LOCATION_STATE = Constants.Location_State_Full
- }, new
- {
- CN_S_LOCATION_CODE = executeStatePara.transportTask.CN_S_END_BIT
- }, trans);
- // 绔嬪簱璐т綅鐘舵�鏀逛负:绌�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_Empty
- }, new
- {
- CN_S_LOCATION_CODE = executeStatePara.transportTask.CN_S_START_BIT
- }, trans);
- Log.Detail(logPara, "鍗婃垚鍝�绌烘墭鍑哄簱瀛愪换鍔′竴瀹屾垚-浠诲姟鍙凤細" + executeStatePara.transportTask.CN_S_TASK_NO
- + "锛屾洿鏂版帴椹充綅鐘舵�-璐т綅鍙凤細" + executeStatePara.transportTask.CN_S_END_BIT + "鐘舵�涓猴細" + Constants.Location_State_Full
- + "锛屾洿鏂扮珛搴撶姸鎬�璐т綅鍙凤細" + executeStatePara.transportTask.CN_S_START_BIT + "鐘舵�涓猴細" + Constants.Location_State_Empty);
- }
- // 鍗婃垚鍝�绌烘墭鍑哄簱绗簩鏉″瓙浠诲姟
- else if (executeStatePara.transportTask.CN_S_EXT2 == TaskFlagConstants.BCP_KTCK_SUB_2)
- {
- // 涓讳换鍔＄姸鎬佺疆涓哄畬鎴愰儴鍒�- // 涓讳换鍔￠樁娈电疆涓哄崐鎴愬搧-婊℃墭鍏ュ簱
- CreateDAL<DapperDAL<TN_WM_TASKEntity>>().Update(new
- {
- CN_T_END = DateTime.Now,
- CN_T_MODIFY = DateTime.Now,
- CN_S_STATE = Constants.TaskState_CompletePart,
- CN_S_EXT3 = TaskSectionConstants.BCP_MTRK
- }, new { CN_S_TASK_NO = task.CN_S_TASK_NO }, trans);
- // 鎺ラ┏浣嶇姸鎬佹敼涓�姝ｅ父
- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_Normal
- }, new
- {
- CN_S_LOCATION_CODE = task.CN_S_CONNECT_BIT
- }, trans);
- // 鍑嗗鐐硅揣浣嶇姸鎬佹敼涓�姝ｅ父
- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_Normal
- }, new
- {
- CN_S_LOCATION_CODE = executeStatePara.transportTask.CN_S_START_BIT
- }, trans);
- // 绾胯竟璐т綅涓嶇鎺�-
- Log.Detail(logPara, "鍗婃垚鍝�绌烘墭鍑哄簱瀛愪换鍔′簩瀹屾垚-浠诲姟鍙凤細" + executeStatePara.transportTask.CN_S_TASK_NO
- + "锛屾洿鏂版帴椹充綅鐘舵�-璐т綅鍙凤細" + task.CN_S_CONNECT_BIT + "鐘舵�涓猴細" + Constants.Location_State_Normal
- + "锛屾洿鏂板噯澶囩偣鐘舵�-璐т綅鍙凤細" + executeStatePara.transportTask.CN_S_START_BIT + "鐘舵�涓猴細" + Constants.Location_State_Normal
- + "锛屾洿鏂颁富浠诲姟-浠诲姟鍙凤細" + task.CN_S_TASK_NO + "鐘舵�涓猴細" + Constants.TaskState_CompletePart + "-闃舵涓猴細" + TaskSectionConstants.BCP_MTRK);
- }
-
- #endregion
-
- #region 婊℃墭鍏ュ簱
-
- // 鍗婃垚鍝�婊℃墭鍏ュ簱绗竴鏉″瓙浠诲姟
- else if (executeStatePara.transportTask.CN_S_EXT2 == TaskFlagConstants.BCP_MTRK_SUB_1)
- {
- // 涓讳换鍔＄姸鎬佺疆涓哄畬鎴愰儴鍒�- // 涓讳换鍔￠樁娈电疆涓哄崐鎴愬搧-婊℃墭鍏ュ簱-绗簩闃舵
- CreateDAL<DapperDAL<TN_WM_TASKEntity>>().Update(new
- {
- CN_T_END = DateTime.Now,
- CN_T_MODIFY = DateTime.Now,
- CN_S_STATE = Constants.TaskState_CompletePart,
- CN_S_EXT3 = TaskSectionConstants.BCP_MTRK_SECOND
- }, new { CN_S_TASK_NO = task.CN_S_TASK_NO }, trans);
- // 绾胯竟璐т綅涓嶇鎺�-
- // 鎺ラ┏浣嶇姸鎬佹敼涓�婊�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_Full
- }, new
- {
- CN_S_LOCATION_CODE = executeStatePara.transportTask.CN_S_END_BIT
- }, trans);
-
- Log.Detail(logPara, "鍗婃垚鍝�婊℃墭鍏ュ簱瀛愪换鍔′竴瀹屾垚-浠诲姟鍙凤細" + executeStatePara.transportTask.CN_S_TASK_NO
- + "锛屾洿鏂版帴椹充綅鐘舵�-璐т綅鍙凤細" + executeStatePara.transportTask.CN_S_END_BIT + "鐘舵�涓猴細" + Constants.Location_State_Full
- + "锛屾洿鏂颁富浠诲姟-浠诲姟鍙凤細" + task.CN_S_TASK_NO + "鐘舵�涓猴細" + Constants.TaskState_CompletePart + "-闃舵涓猴細" + TaskSectionConstants.BCP_MTRK_SECOND);
- }
- // 鍗婃垚鍝�婊℃墭鍏ュ簱绗簩鏉″瓙浠诲姟
- else if (executeStatePara.transportTask.CN_S_EXT2 == TaskFlagConstants.BCP_MTRK_SUB_2)
- {
- // 涓讳换鍔＄姸鎬佺疆涓哄畬鎴�- // 闃舵缃负浠诲姟瀹屾垚
- CreateDAL<DapperDAL<TN_WM_TASKEntity>>().Update(new
- {
- CN_T_END = DateTime.Now,
- CN_T_MODIFY = DateTime.Now,
- CN_S_STATE = Constants.TaskState_Complete,
- CN_S_EXT3 = TaskSectionConstants.COMPLETE
- }, new { CN_S_TASK_NO = task.CN_S_TASK_NO }, trans);
-
- // 鎺ラ┏浣嶇姸鎬佹敼涓�姝ｅ父
- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_Normal
- }, new
- {
- CN_S_LOCATION_CODE = executeStatePara.transportTask.CN_S_START_BIT
- }, trans);
- // 绔嬪簱鐘舵�鏀逛负:婊�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_Full
- }, new
- {
- CN_S_LOCATION_CODE = executeStatePara.transportTask.CN_S_END_BIT
- }, trans);
-
- Log.Detail(logPara, "鍗婃垚鍝�婊℃墭鍏ュ簱瀛愪换鍔′簩瀹屾垚-浠诲姟鍙凤細" + executeStatePara.transportTask.CN_S_TASK_NO
- + "锛屾洿鏂版帴椹充綅鐘舵�-璐т綅鍙凤細" + executeStatePara.transportTask.CN_S_START_BIT + "鐘舵�涓猴細" + Constants.Location_State_Normal
- + "锛屾洿鏂扮珛搴撶姸鎬�璐т綅鍙凤細" + executeStatePara.transportTask.CN_S_END_BIT + "鐘舵�涓猴細" + Constants.Location_State_Full
- + "锛屾洿鏂颁富浠诲姟-浠诲姟鍙凤細" + task.CN_S_TASK_NO + "鐘舵�涓猴細" + Constants.TaskState_Complete + "-闃舵涓猴細" + TaskSectionConstants.COMPLETE);
- }
-
- #endregion
-
- #endregion
-
- #region 鎴愬瀷鏈�-
- #region 鍗婃垚鍝佸洖搴�-
- // 鎴愬瀷鏈�鍗婃垚鍝佸洖搴撶涓�潯瀛愪换鍔�- else if (executeStatePara.transportTask.CN_S_EXT2 == TaskFlagConstants.CXJ_BCPHK_SUB_1)
- {
- // 涓讳换鍔＄姸鎬佺疆涓哄畬鎴愰儴鍒�- // 涓讳换鍔￠樁娈电疆涓烘垚鍨嬫満-鍗婃垚鍝佸洖搴�绗簩闃舵
- CreateDAL<DapperDAL<TN_WM_TASKEntity>>().Update(new
- {
- CN_T_END = DateTime.Now,
- CN_T_MODIFY = DateTime.Now,
- CN_S_STATE = Constants.TaskState_CompletePart,
- CN_S_EXT3 = TaskSectionConstants.CXJ_BCPHK_SECOND
- }, new { CN_S_TASK_NO = task.CN_S_TASK_NO }, trans);
- // 绾胯竟璐т綅涓嶇鎺�-
- // 鎺ラ┏浣嶇姸鎬佹敼涓�婊�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_Full
- }, new
- {
- CN_S_LOCATION_CODE = executeStatePara.transportTask.CN_S_END_BIT
- }, trans);
-
- Log.Detail(logPara, "鎴愬瀷鏈�鍗婃垚鍝佸洖搴撳瓙浠诲姟涓�畬鎴�浠诲姟鍙凤細" + executeStatePara.transportTask.CN_S_TASK_NO
- + "锛屾洿鏂版帴椹充綅鐘舵�-璐т綅鍙凤細" + executeStatePara.transportTask.CN_S_END_BIT + "鐘舵�涓猴細" + Constants.Location_State_Full
- + "锛屾洿鏂颁富浠诲姟-浠诲姟鍙凤細" + task.CN_S_TASK_NO + "鐘舵�涓猴細" + Constants.TaskState_CompletePart + "-闃舵涓猴細" + TaskSectionConstants.CXJ_BCPHK_SECOND);
- }
- // 鎴愬瀷鏈�鍗婃垚鍝佸洖搴撶浜屾潯瀛愪换鍔�- else if (executeStatePara.transportTask.CN_S_EXT2 == TaskFlagConstants.CXJ_BCPHK_SUB_2)
- {
- // 涓讳换鍔＄姸鎬佺疆涓哄畬鎴�- // 涓讳换鍔￠樁娈电疆涓轰换鍔″畬鎴�- CreateDAL<DapperDAL<TN_WM_TASKEntity>>().Update(new
- {
- CN_T_END = DateTime.Now,
- CN_T_MODIFY = DateTime.Now,
- CN_S_STATE = Constants.TaskState_Complete,
- CN_S_EXT3 = TaskSectionConstants.COMPLETE
- }, new { CN_S_TASK_NO = task.CN_S_TASK_NO }, trans);
-
- // 鎺ラ┏浣嶇姸鎬佹敼涓�姝ｅ父
- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_Normal
- }, new
- {
- CN_S_LOCATION_CODE = executeStatePara.transportTask.CN_S_START_BIT
- }, trans);
- // 绔嬪簱鐘舵�鏀逛负:婊�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_Full
- }, new
- {
- CN_S_LOCATION_CODE = executeStatePara.transportTask.CN_S_END_BIT
- }, trans);
-
- Log.Detail(logPara, "鎴愬瀷鏈�鍗婃垚鍝佸洖搴撳瓙浠诲姟浜屽畬鎴�浠诲姟鍙凤細" + executeStatePara.transportTask.CN_S_TASK_NO
- + "锛屾洿鏂版帴椹充綅鐘舵�-璐т綅鍙凤細" + executeStatePara.transportTask.CN_S_START_BIT + "鐘舵�涓猴細" + Constants.Location_State_Normal
- + "锛屾洿鏂扮珛搴撶姸鎬�璐т綅鍙凤細" + executeStatePara.transportTask.CN_S_END_BIT + "鐘舵�涓猴細" + Constants.Location_State_Full
- + "锛屾洿鏂颁富浠诲姟-浠诲姟鍙凤細" + task.CN_S_TASK_NO + "鐘舵�涓猴細" + Constants.TaskState_Complete + "-闃舵涓猴細" + TaskSectionConstants.COMPLETE);
- }
-
- #endregion
-
- #region 婊℃墭鍑哄簱
-
- // 鎴愬瀷鏈�婊℃墭鍑哄簱绗竴鏉″瓙浠诲姟
- if (executeStatePara.transportTask.CN_S_EXT2 == TaskFlagConstants.CXJ_MTCK_SUB_1)
- {
- // 鎺ラ┏浣嶇姸鎬佹敼涓�婊�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_Full
- }, new
- {
- CN_S_LOCATION_CODE = executeStatePara.transportTask.CN_S_END_BIT
- }, trans);
- // 绔嬪簱璐т綅鐘舵�鏀逛负:绌�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_Empty
- }, new
- {
- CN_S_LOCATION_CODE = executeStatePara.transportTask.CN_S_START_BIT
- }, trans);
-
- Log.Detail(logPara, "鎴愬瀷鏈�婊℃墭鍑哄簱瀛愪换鍔′竴瀹屾垚-浠诲姟鍙凤細" + executeStatePara.transportTask.CN_S_TASK_NO
- + "锛屾洿鏂版帴椹充綅鐘舵�-璐т綅鍙凤細" + executeStatePara.transportTask.CN_S_END_BIT + "鐘舵�涓猴細" + Constants.Location_State_Full
- + "锛屾洿鏂扮珛搴撶姸鎬�璐т綅鍙凤細" + executeStatePara.transportTask.CN_S_START_BIT + "鐘舵�涓猴細" + Constants.Location_State_Empty);
- }
- // 鎴愬瀷鏈�婊℃墭鍑哄簱绗簩鏉″瓙浠诲姟
- else if (executeStatePara.transportTask.CN_S_EXT2 == TaskFlagConstants.CXJ_MTCK_SUB_2)
- {
- // 鎺ラ┏浣嶇姸鎬佹敼涓�姝ｅ父
- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_Normal
- }, new
- {
- CN_S_LOCATION_CODE = task.CN_S_CONNECT_BIT
- }, trans);
- // 鍑嗗鐐硅揣浣嶇姸鎬佹敼涓�姝ｅ父
- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_Normal
- }, new
- {
- CN_S_LOCATION_CODE = executeStatePara.transportTask.CN_S_START_BIT
- }, trans);
- // 绾胯竟璐т綅涓嶇鎺�-
- if (task_kthk == null)
- {
- // 娌℃湁闇�鎵ц鐨勭┖鎵樺洖搴撲换鍔�- // 涓讳换鍔＄姸鎬佺疆涓哄畬鎴�- // 涓讳换鍔￠樁娈电疆涓哄畬鎴�- CreateDAL<DapperDAL<TN_WM_TASKEntity>>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Complete,
- CN_S_EXT3 = TaskSectionConstants.COMPLETE
- }, new { CN_S_TASK_NO = task.CN_S_TASK_NO }, trans);
-
- Log.Detail(logPara, "鎴愬瀷鏈�婊℃墭鍑哄簱瀛愪换鍔′簩瀹屾垚-浠诲姟鍙凤細" + executeStatePara.transportTask.CN_S_TASK_NO
- + "锛屾洿鏂版帴椹充綅鐘舵�-璐т綅鍙凤細" + task.CN_S_CONNECT_BIT + "鐘舵�涓猴細" + Constants.Location_State_Normal
- + "锛屾洿鏂板噯澶囩偣鐘舵�-璐т綅鍙凤細" + executeStatePara.transportTask.CN_S_START_BIT + "鐘舵�涓猴細" + Constants.Location_State_Normal
- + "锛屾洿鏂颁富浠诲姟-浠诲姟鍙凤細" + task.CN_S_TASK_NO + "鐘舵�涓猴細" + Constants.TaskState_Complete + "-闃舵涓猴細" + TaskSectionConstants.COMPLETE
- + "锛屾湭鍖归厤鍒扮┖鎵樺洖搴撲换鍔�);
}
else
{
- // 鏈夐渶瑕佹墽琛岀殑绌烘墭鍥炲簱浠诲姟
- // 涓讳换鍔＄姸鎬佺疆涓烘墽琛屼腑锛堥槻姝㈠啀娆″惊鐜埌锛�- // 涓讳换鍔￠樁娈电疆涓烘垚鍨嬫満-绌烘墭鍏ュ簱
+ //涓讳换鍔＄姸鎬佹洿鏀逛负:瀹屾垚涓�崐
CreateDAL<DapperDAL<TN_WM_TASKEntity>>().Update(new
{
+ CN_S_MODIFY = "",
+ CN_S_MODIFY_BY = "",
CN_T_END = DateTime.Now,
CN_T_MODIFY = DateTime.Now,
- CN_S_STATE = Constants.TaskState_Executing,
- CN_S_EXT3 = TaskSectionConstants.CXJ_KTRK
- }, new { CN_S_TASK_NO = task.CN_S_TASK_NO }, trans);
- // 绌烘墭鍥炲簱浠诲姟闃舵缃负鎴愬瀷鏈�绌烘墭鍥炲簱-鍏ュ簱闃舵
- // 绌烘墭鍥炲簱浠诲姟涓讳换鍔＄紪鍙风疆涓哄綋鍓嶄富浠诲姟
- CreateDAL<DapperDAL<TN_WM_TASKEntity>>().Update(new
- {
- CN_T_END = DateTime.Now,
- CN_T_MODIFY = DateTime.Now,
- CN_S_EXT3 = TaskSectionConstants.CXJ_KTHK_KTRK,
- CN_S_EXT1 = task.CN_S_TASK_NO
- }, new { CN_S_TASK_NO = task_kthk.CN_S_TASK_NO });
-
- Log.Detail(logPara, "鎴愬瀷鏈�婊℃墭鍑哄簱瀛愪换鍔′簩瀹屾垚-浠诲姟鍙凤細" + executeStatePara.transportTask.CN_S_TASK_NO
- + "锛屾洿鏂版帴椹充綅鐘舵�-璐т綅鍙凤細" + task.CN_S_CONNECT_BIT + "鐘舵�涓猴細" + Constants.Location_State_Normal
- + "锛屾洿鏂板噯澶囩偣鐘舵�-璐т綅鍙凤細" + executeStatePara.transportTask.CN_S_START_BIT + "鐘舵�涓猴細" + Constants.Location_State_Normal
- + "锛屾洿鏂颁富浠诲姟-浠诲姟鍙凤細" + task.CN_S_TASK_NO + "鐘舵�涓猴細" + Constants.TaskState_Executing + "-闃舵涓猴細" + TaskSectionConstants.CXJ_KTRK
- + "锛屽尮閰嶅埌绌烘墭鍥炲簱浠诲姟-浠诲姟鍙凤細" + task_kthk.CN_S_TASK_NO + "闃舵涓猴細" + TaskSectionConstants.CXJ_KTHK_KTRK + "-鍏宠仈涓讳换鍔★細" + task.CN_S_TASK_NO);
+ CN_S_STATE = Constants.TaskState_CompleteHalf
+ }, new { CN_S_TASK_NO = topNo }, trans);
+ Log.Detail(logPara, "鏇存柊涓讳换鍔＄姸鎬�浠诲姟鍙凤細" + topNo + "鐘舵�涓猴細" + Constants.TaskState_CompleteHalf);
}
}
- #endregion
-
- #endregion
-
- #region 鎴愬瀷鏈哄甫鏉�-
- #region 鍗婃垚鍝�绌烘墭鍥炲簱
-
- // 鎴愬瀷鏈哄甫鏉�鍗婃垚鍝�绌烘墭鍥炲簱绗竴鏉″瓙浠诲姟
- else if (executeStatePara.transportTask.CN_S_EXT2 == TaskFlagConstants.DS_BCPKTHK_SUB_1)
+ //B鍒癈鐨勭珛搴撴惉杩愪换鍔�+ if (navNo == "2")
{
- // 涓讳换鍔＄姸鎬佺疆涓哄畬鎴愰儴鍒�- // 涓讳换鍔￠樁娈电疆涓烘垚鍨嬫満甯︽潫-鍗婃垚鍝�绌烘墭鍥炲簱-绗簩闃舵
+ //涓讳换鍔＄姸鎬佹洿鏀逛负:瀹屾垚
CreateDAL<DapperDAL<TN_WM_TASKEntity>>().Update(new
{
+ CN_S_MODIFY = "",
+ CN_S_MODIFY_BY = "",
CN_T_END = DateTime.Now,
CN_T_MODIFY = DateTime.Now,
- CN_S_STATE = Constants.TaskState_CompletePart,
- CN_S_EXT3 = TaskSectionConstants.DS_BCPKTHK_SECOND
- }, new { CN_S_TASK_NO = task.CN_S_TASK_NO }, trans);
- // 绾胯竟璐т綅涓嶇鎺�+ CN_S_STATE = Constants.TaskState_Complete
+ }, new { CN_S_TASK_NO = topNo }, trans);
+ Log.Detail(logPara, "鏇存柊涓讳换鍔＄姸鎬�浠诲姟鍙凤細" + topNo + "鐘舵�涓猴細" + Constants.TaskState_Complete);
- // 鎺ラ┏浣嶇姸鎬佹敼涓�婊�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
+ // mes浠诲姟杩涘叆涓嬩竴闃舵
+ CreateDAL<DapperDAL<TN_MES_TASK>>().Update(new
{
- CN_S_LOCATION_STATE = Constants.Location_State_Full
- }, new
- {
- CN_S_LOCATION_CODE = executeStatePara.transportTask.CN_S_END_BIT
- }, trans);
-
- Log.Detail(logPara, "鎴愬瀷鏈哄甫鏉�鍗婃垚鍝�绌烘墭鍥炲簱瀛愪换鍔′竴瀹屾垚-浠诲姟鍙凤細" + executeStatePara.transportTask.CN_S_TASK_NO
- + "锛屾洿鏂版帴椹充綅鐘舵�-璐т綅鍙凤細" + executeStatePara.transportTask.CN_S_END_BIT + "鐘舵�涓猴細" + Constants.Location_State_Full
- + "锛屾洿鏂颁富浠诲姟-浠诲姟鍙凤細" + task.CN_S_TASK_NO + "鐘舵�涓猴細" + Constants.TaskState_CompletePart + "-闃舵涓猴細" + TaskSectionConstants.DS_BCPKTHK_SECOND);
+ NeedTrig = Constants.Y
+ }, new { task_no = mes_task.task_no }, trans);
}
- // 鎴愬瀷鏈哄甫鏉�鍗婃垚鍝�绌烘墭鍥炲簱绗簩鏉″瓙浠诲姟
- else if (executeStatePara.transportTask.CN_S_EXT2 == TaskFlagConstants.DS_BCPKTHK_SUB_2)
- {
- // 涓讳换鍔＄姸鎬佺疆涓哄畬鎴�- // 涓讳换鍔￠樁娈电疆涓轰换鍔″畬鎴�- CreateDAL<DapperDAL<TN_WM_TASKEntity>>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Complete,
- CN_S_EXT3 = TaskSectionConstants.COMPLETE
- }, new { CN_S_TASK_NO = task.CN_S_TASK_NO }, trans);
-
- // 鎺ラ┏浣嶇姸鎬佹敼涓�姝ｅ父
- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_Normal
- }, new
- {
- CN_S_LOCATION_CODE = executeStatePara.transportTask.CN_S_START_BIT
- }, trans);
- // 绔嬪簱鐘舵�鏀逛负:婊�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_Full
- }, new
- {
- CN_S_LOCATION_CODE = executeStatePara.transportTask.CN_S_END_BIT
- }, trans);
-
- Log.Detail(logPara, "鎴愬瀷鏈哄甫鏉�鍗婃垚鍝�绌烘墭鍥炲簱瀛愪换鍔′簩瀹屾垚-浠诲姟鍙凤細" + executeStatePara.transportTask.CN_S_TASK_NO
- + "锛屾洿鏂版帴椹充綅鐘舵�-璐т綅鍙凤細" + executeStatePara.transportTask.CN_S_START_BIT + "鐘舵�涓猴細" + Constants.Location_State_Normal
- + "锛屾洿鏂扮珛搴撶姸鎬�璐т綅鍙凤細" + executeStatePara.transportTask.CN_S_END_BIT + "鐘舵�涓猴細" + Constants.Location_State_Full
- + "锛屾洿鏂颁富浠诲姟-浠诲姟鍙凤細" + task.CN_S_TASK_NO + "鐘舵�涓猴細" + Constants.TaskState_Complete + "-闃舵涓猴細" + TaskSectionConstants.COMPLETE);
- }
-
- #endregion
-
- #region 婊℃墭鍑哄簱
-
- // 鎴愬瀷鏈哄甫鏉�婊℃墭鍑哄簱绗竴鏉″瓙浠诲姟
- if (executeStatePara.transportTask.CN_S_EXT2 == TaskFlagConstants.DS_MTCK_SUB_1)
- {
- // 鎺ラ┏浣嶇姸鎬佹敼涓�婊�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_Full
- }, new
- {
- CN_S_LOCATION_CODE = executeStatePara.transportTask.CN_S_END_BIT
- }, trans);
- // 绔嬪簱璐т綅鐘舵�鏀逛负:绌�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_Empty
- }, new
- {
- CN_S_LOCATION_CODE = executeStatePara.transportTask.CN_S_START_BIT
- }, trans);
-
- Log.Detail(logPara, "鎴愬瀷鏈哄甫鏉�婊℃墭鍑哄簱瀛愪换鍔′竴瀹屾垚-浠诲姟鍙凤細" + executeStatePara.transportTask.CN_S_TASK_NO
- + "锛屾洿鏂版帴椹充綅鐘舵�-璐т綅鍙凤細" + executeStatePara.transportTask.CN_S_END_BIT + "鐘舵�涓猴細" + Constants.Location_State_Full
- + "锛屾洿鏂扮珛搴撶姸鎬�璐т綅鍙凤細" + executeStatePara.transportTask.CN_S_START_BIT + "鐘舵�涓猴細" + Constants.Location_State_Empty);
- }
- // 鎴愬瀷鏈哄甫鏉�婊℃墭鍑哄簱绗簩鏉″瓙浠诲姟
- else if (executeStatePara.transportTask.CN_S_EXT2 == TaskFlagConstants.DS_MTCK_SUB_2)
- {
- // 鎺ラ┏浣嶇姸鎬佹敼涓�姝ｅ父
- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_Normal
- }, new
- {
- CN_S_LOCATION_CODE = task.CN_S_CONNECT_BIT
- }, trans);
- // 鍑嗗鐐硅揣浣嶇姸鎬佹敼涓�姝ｅ父
- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_Normal
- }, new
- {
- CN_S_LOCATION_CODE = executeStatePara.transportTask.CN_S_START_BIT
- }, trans);
- // 绾胯竟璐т綅涓嶇鎺�-
- // 涓讳换鍔＄姸鎬佺疆涓哄畬鎴�- // 涓讳换鍔￠樁娈电疆涓哄畬鎴�- CreateDAL<DapperDAL<TN_WM_TASKEntity>>().Update(new
- {
- CN_T_END = DateTime.Now,
- CN_T_MODIFY = DateTime.Now,
- CN_S_STATE = Constants.TaskState_Complete,
- CN_S_EXT3 = TaskSectionConstants.COMPLETE
- }, new { CN_S_TASK_NO = task.CN_S_TASK_NO }, trans);
-
- Log.Detail(logPara, "鎴愬瀷鏈哄甫鏉�婊℃墭鍑哄簱瀛愪换鍔′簩瀹屾垚-浠诲姟鍙凤細" + executeStatePara.transportTask.CN_S_TASK_NO
- + "锛屾洿鏂版帴椹充綅鐘舵�-璐т綅鍙凤細" + task.CN_S_CONNECT_BIT + "鐘舵�涓猴細" + Constants.Location_State_Normal
- + "锛屾洿鏂板噯澶囩偣鐘舵�-璐т綅鍙凤細" + executeStatePara.transportTask.CN_S_START_BIT + "鐘舵�涓猴細" + Constants.Location_State_Normal
- + "锛屾洿鏂颁富浠诲姟-浠诲姟鍙凤細" + task.CN_S_TASK_NO + "鐘舵�涓猴細" + Constants.TaskState_Complete + "-闃舵涓猴細" + TaskSectionConstants.COMPLETE);
- }
-
- #endregion
-
- #endregion
-
- #endregion
}
+
if (executeStatePara.transportTask.CN_S_TASK_TYPE == null)
executeStatePara.transportTask.CN_S_TASK_TYPE = "";
--
Gitblit v1.9.1