From 23ee356c6f260ecc1a48bbb8bd60932b979e4698 Mon Sep 17 00:00:00 2001
From: zhao
Date: 星期五, 02 七月 2021 16:22:19 +0800
Subject: [PATCH] 成型机带束出入库
---
HH.WMS.BLL/External/WmsApiBaseBLL.cs | 200 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 139 insertions(+), 61 deletions(-)
diff --git a/HH.WMS.BLL/External/WmsApiBaseBLL.cs b/HH.WMS.BLL/External/WmsApiBaseBLL.cs
index 4158271..adfa8c7 100644
--- a/HH.WMS.BLL/External/WmsApiBaseBLL.cs
+++ b/HH.WMS.BLL/External/WmsApiBaseBLL.cs
@@ -1593,6 +1593,8 @@
// 涓讳换鍔￠樁娈电疆涓哄崐鎴愬搧-婊℃墭鍏ュ簱
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);
@@ -1631,6 +1633,8 @@
// 涓讳换鍔￠樁娈电疆涓哄崐鎴愬搧-婊℃墭鍏ュ簱-绗簩闃舵
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);
@@ -1656,6 +1660,8 @@
// 闃舵缃负浠诲姟瀹屾垚
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);
@@ -1698,6 +1704,8 @@
// 涓讳换鍔￠樁娈电疆涓烘垚鍨嬫満-鍗婃垚鍝佸洖搴�绗簩闃舵
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);
@@ -1723,6 +1731,8 @@
// 涓讳换鍔￠樁娈电疆涓轰换鍔″畬鎴� 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);
@@ -1823,13 +1833,17 @@
// 涓讳换鍔￠樁娈电疆涓烘垚鍨嬫満-绌烘墭鍏ュ簱
CreateDAL<DapperDAL<TN_WM_TASKEntity>>().Update(new
{
+ 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_TASKBLL>>().Update(new
+ 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 });
@@ -1846,77 +1860,141 @@
#endregion
+ #region 鎴愬瀷鏈哄甫鏉�+
+ #region 鍗婃垚鍝�绌烘墭鍥炲簱
+
+ // 鎴愬瀷鏈哄甫鏉�鍗婃垚鍝�绌烘墭鍥炲簱绗竴鏉″瓙浠诲姟
+ else if (executeStatePara.transportTask.CN_S_EXT2 == TaskFlagConstants.DS_BCPKTHK_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.DS_BCPKTHK_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.DS_BCPKTHK_SECOND);
+ }
+ // 鎴愬瀷鏈哄甫鏉�鍗婃垚鍝�绌烘墭鍥炲簱绗簩鏉″瓙浠诲姟
+ 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
- //A鍒癇鐨凙GV鎼繍浠诲姟
- if (hzNo == "1")
+ #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_S_MODIFY = "",
- CN_S_MODIFY_BY = "",
CN_T_END = DateTime.Now,
CN_T_MODIFY = DateTime.Now,
- CN_S_STATE = Constants.TaskState_CompleteHalf
- }, new { CN_S_TASK_NO = fatherNo }, trans);
- Log.Detail(logPara, "鏇存柊涓讳换鍔＄姸鎬�浠诲姟鍙凤細" + fatherNo + "鐘舵�涓猴細" + Constants.TaskState_CompleteHalf);
+ 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);
}
- //B鍒癈鐨勭珛搴撴惉杩愪换鍔�- if (hzNo == "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_Complete
- }, new { CN_S_TASK_NO = fatherNo }, trans);
- Log.Detail(logPara, "鏇存柊涓讳换鍔＄姸鎬�浠诲姟鍙凤細" + fatherNo + "鐘舵�涓猴細" + Constants.TaskState_Complete);
+ #endregion
+ #endregion
- if (task != null)
- {
- // 鎺ラ┏浣嶇姸鎬佹敼涓�姝ｅ父
- 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);
-
- Log.Detail(logPara, "涓讳换鍔″畬鎴愶紝鏇存柊鎺ラ┏浣嶇姸鎬�璐т綅鍙凤細" + task.CN_S_CONNECT_BIT + "鐘舵�涓猴細" + Constants.Location_State_Normal);
-
- if (task.CN_S_TASK_TYPE == Constants.In)
- {
- // 鍏ュ簱瀹屾垚缁堢偣璐т綅鐘舵�鏀逛负:婊�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_Full
- }, new
- {
- CN_S_LOCATION_CODE = task.CN_S_END_BIT
- }, trans);
- Log.Detail(logPara, "涓讳换鍔″畬鎴愶紝鏇存柊缁堢偣绔嬪簱璐т綅鐘舵�-璐т綅鍙凤細" + task.CN_S_END_BIT + "鐘舵�涓猴細" + Constants.Location_State_Full);
- }
- else if (task.CN_S_TASK_TYPE == Constants.Out)
- {
- // 鍑哄簱瀹屾垚璧风偣璐т綅鐘舵�鏀逛负:绌�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_Empty
- }, new
- {
- CN_S_LOCATION_CODE = task.CN_S_START_BIT
- }, trans);
- Log.Detail(logPara, "涓讳换鍔″畬鎴愶紝鏇存柊璧风偣绔嬪簱璐т綅鐘舵�-璐т綅鍙凤細" + task.CN_S_START_BIT + "鐘舵�涓猴細" + Constants.Location_State_Empty);
- }
- }
- }
+ #endregion
}
if (executeStatePara.transportTask.CN_S_TASK_TYPE == null)
executeStatePara.transportTask.CN_S_TASK_TYPE = "";
--
Gitblit v1.9.1