From 0821715ebc11d3934d0594a1cc2c39686d808906 Mon Sep 17 00:00:00 2001
From: zhao
Date: 星期五, 09 七月 2021 14:12:43 +0800
Subject: [PATCH] 增加ChageWay接口
---
HH.WMS.WebApi/Controllers/WmsApiController.cs | 110 +++
HH.WMS.Entitys/HH.WMS.Entitys.csproj | 1
HH.WMS.BLL/Pda/ZCBLL.cs | 1788 ------------------------------------------------------
HH.WMS.Entitys/External/ChangeWayResult.cs | 16
HH.WMS.BLL/SysMgr/TN_WM_TASKBLL.cs | 44 +
5 files changed, 167 insertions(+), 1,792 deletions(-)
diff --git a/HH.WMS.BLL/Pda/ZCBLL.cs b/HH.WMS.BLL/Pda/ZCBLL.cs
index b22554d..afe1ceb 100644
--- a/HH.WMS.BLL/Pda/ZCBLL.cs
+++ b/HH.WMS.BLL/Pda/ZCBLL.cs
@@ -782,35 +782,6 @@
Log.Info("澶勭悊浣嶇疆淇℃伅浣嶇疆涓夛細", JsonConvert.SerializeObject(entity));
}
- private OperateResult TransportSuccess(TN_WM_SERVICE_EXECEntity _serviceExec)
- {
- return UseTransaction(trans =>
- {
- if (_serviceExec.Update)
- {
- var or = BLLCreator.CreateDapper<TN_WM_SERVICE_EXECEntity>().Update(new
- {
- CN_S_START_LOCATION = _serviceExec.CN_S_START_LOCATION,
- CN_S_END_LOCATION = _serviceExec.CN_S_END_LOCATION,
- CN_C_COMPLETE = _serviceExec.CN_C_COMPLETE,
- CN_C_SEND_MES = _serviceExec.CN_C_SEND_MES,
- CN_S_MSG = _serviceExec.CN_S_MSG
- }, new
- {
- CN_S_TASK_NO = _serviceExec.CN_S_TASK_NO
- });
- if (!or.Success)
- throw new Exception(or.Msg);
- }
- else
- {
- var or = BLLCreator.CreateDapper<TN_WM_SERVICE_EXECEntity>().Add(_serviceExec);
- if (!or.Success)
- throw new Exception(or.Msg);
- }
- });
- }
-
#region 鏈嶅姟鎵ц璁板綍鏃ュ織鍒嗛〉
/// <summary>
/// 鏈嶅姟鎵ц璁板綍鏃ュ織鍒嗛〉
@@ -1198,1648 +1169,6 @@
Log.DomainInfo("SelfManageTask Error", ex.Message);
}
}
-
- #region 璐т綅鐘舵�
-
- // 鎺ラ┏浣嶉攣瀹氱姸鎬侊細棰勫叆搴撻攣瀹氥�棰勫嚭搴撻攣瀹�- // 鎺ラ┏浣嶇┖闂茬姸鎬侊細姝ｅ父
- // 鍑嗗鐐圭姸鎬佸悓鎺ラ┏浣�- // 绔嬪簱閿佸畾鐘舵�锛� 棰勫叆搴撻攣瀹氥�棰勫嚭搴撻攣瀹�- // 绔嬪簱绌洪棽鐘舵�锛� 绌�鍏ュ簱鍓�銆佹弧(鍑哄簱鍓�
-
- // 鍒涘缓浠诲姟鍓嶃�鎵ц浠诲姟鍓� 妫�煡璐т綅鐘舵�
- // 瀹屾垚浠诲姟鍚� 娓呴櫎璐т綅鐘舵�
- // 鎵ц澶辫触鍚� 濡備綍澶勭悊?
-
- #endregion
-
- #region 鍗婃垚鍝�-
- #region 绌烘墭鍑哄簱
-
- /// <summary>
- /// 鍒涘缓绌烘墭鍑哄簱骞惰瀛愪换鍔�- /// </summary>
- public OperateResult ExecBCP_KTCK_Add(TN_WM_TASKEntity task, ConnectBitDto bit)
- {
- OperateResult re = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- // 绌烘墭鍑哄簱鍜屾弧鎵樺叆搴撴槸鍙嶅悜鐨�- // 鎺ラ┏浣�- var connectBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.bit
- });
- // 鍑嗗鐐�- var readyBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.readybit
- });
- if (connectBit == null)
- throw new Exception("鏈壘鍒版帴椹充綅璐т綅锛� + bit.bit);
- if (connectBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鎺ラ┏浣嶏細" + bit.bit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- if (readyBit == null)
- throw new Exception("鏈壘鍒板噯澶囩偣璐т綅锛� + bit.readybit);
- if (readyBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鍑嗗鐐硅揣浣嶏細" + bit.readybit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- // 绔嬪簱->鎺ラ┏浣�- TN_WM_TASKEntity taskEntity1 = new TN_WM_TASKEntity()
- {
- CN_S_TASK_NO = task.CN_S_TASK_NO + "_1",
- CN_S_TRAY_CODE = task.CN_S_TRAY_CODE,
- CN_S_STATE = Constants.TaskState_NoExecuted,
- CN_S_BF_TASK_NO = "",
- CN_S_AF_TASK_NO = "",
- CN_S_STOCK_CODE = task.CN_S_STOCK_CODE,
- CN_S_START_AREA = task.CN_S_END_AREA,
- CN_S_START_BIT = task.CN_S_END_BIT,
- CN_S_END_AREA = connectBit.CN_S_AREA_CODE,
- CN_S_END_BIT = connectBit.CN_S_LOCATION_CODE,
- CN_N_PRIORITY = 1,
- CN_S_CREATOR = "sys",
- CN_S_CREATOR_BY = "sys",
- CN_T_CREATE = DateTime.Now,
- CN_T_MODIFY = DateTime.Now,
- CN_S_REMARK = "",
- CN_S_TASK_FLAG = Constants.TaskFlag_ZG,
- CN_S_EXT1 = task.CN_S_TASK_NO,
- CN_S_EXT2 = TaskFlagConstants.BCP_KTCK_SUB_1,
- CN_S_EXT3 = ""
- };
- // 鍑嗗鐐�>绾胯竟
- TN_WM_TASKEntity taskEntity2 = new TN_WM_TASKEntity()
- {
- CN_S_TASK_NO = task.CN_S_TASK_NO + "_2",
- CN_S_TRAY_CODE = task.CN_S_TRAY_CODE,
- CN_S_STATE = Constants.TaskState_NoExecuted,
- CN_S_BF_TASK_NO = "",
- CN_S_AF_TASK_NO = "",
- CN_S_STOCK_CODE = task.CN_S_STOCK_CODE,
- CN_S_START_AREA = readyBit.CN_S_AREA_CODE,
- CN_S_START_BIT = readyBit.CN_S_LOCATION_CODE,
- CN_S_END_AREA = task.CN_S_START_AREA,
- CN_S_END_BIT = task.CN_S_START_BIT,
- CN_N_PRIORITY = 1,
- CN_S_CREATOR = "sys",
- CN_S_CREATOR_BY = "sys",
- CN_T_CREATE = DateTime.Now,
- CN_T_MODIFY = DateTime.Now,
- CN_S_REMARK = "",
- CN_S_TASK_FLAG = Constants.TaskFlag_ZG,
- CN_S_EXT1 = task.CN_S_TASK_NO,
- CN_S_EXT2 = TaskFlagConstants.BCP_KTCK_SUB_2,
- CN_S_EXT3 = ""
- };
-
- UseTransaction(trans =>
- {
- // 鍒涘缓鍗婃垚鍝�绌烘墭鍑哄簱瀛愪换鍔′竴
- re = CreateDapperDAL<TN_WM_TASKEntity>().Add(taskEntity1);
- if (!re.Success)
- throw new Exception(re.Msg);
-
- // 鍒涘缓鍗婃垚鍝�绌烘墭鍑哄簱瀛愪换鍔′簩
- re = CreateDapperDAL<TN_WM_TASKEntity>().Add(taskEntity2);
- if (!re.Success)
- throw new Exception(re.Msg);
-
- // 涓讳换鍔＄姸鎬佺疆涓烘墽琛屼腑 璁板綍鎺ラ┏浣�- re = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing,
- CN_S_CONNECT_BIT = bit.bit
- }, new { CN_S_TASK_NO = task.CN_S_TASK_NO }, trans);
- if (!re.Success)
- throw new Exception(re.Msg);
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鍒涘缓鍗婃垚鍝�绌烘墭鍑哄簱瀛愪换鍔″け璐ワ紝涓讳换鍔＄紪鍙�" + task.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
-
- return re;
- }
- /// <summary>
- /// 鎵ц绌烘墭鍑哄簱鐨勭涓�潯瀛愪换鍔�- /// </summary>
- /// <param name="task"></param>
- /// <param name=""></param>
- /// <returns></returns>
- public OperateResult ExecBCP_KTCK_Sub1(TN_WM_TASKEntity task1, ConnectBitDto bit)
- {
- OperateResult or = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- // 鎵ц鍓嶆鏌ヨ揣浣嶇姸鎬�- // 鎺ラ┏浣�- var connectBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.bit
- });
- if (connectBit == null)
- throw new Exception("鏈壘鍒版帴椹充綅璐т綅锛� + bit.bit);
- if (connectBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鎺ラ┏浣嶏細" + bit.bit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- UseTransaction(trans =>
- {
- // 绔嬪簱 棰勫嚭搴撻攣瀹�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_OutLock
- }, new { CN_S_LOCATION_CODE = task1.CN_S_START_BIT }, trans);
- // 鎺ラ┏浣�棰勫叆搴撻攣瀹�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_InLock
- }, new { CN_S_LOCATION_CODE = bit.bit }, trans);
- // 瀛愪换鍔�鐘舵�缃负鎵ц涓�- or = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing
- }, new { CN_S_TASK_NO = task1.CN_S_TASK_NO }, trans);
- // 鍙戦�Wcs浠诲姟
- Log.Detail(LogType.LogPara("璋冪敤WCS鎺ュ彛鎵ц浠诲姟"), "浠诲姟淇℃伅锛� + JsonConvert.SerializeObject(task1));
- or = BLLCreator.Create<OtherSysApi>().SendWcsCreateTask(task1);
- Log.Detail(LogType.LogPara("璋冪敤WCS鎺ュ彛鎵ц浠诲姟"), "鎵ц缁撴灉锛� + JsonConvert.SerializeObject(or));
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鎵ц鍗婃垚鍝�绌烘墭鍑哄簱瀛愪换鍔′竴澶辫触锛屼换鍔＄紪鍙�" + task1.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
- return or;
- }
- /// <summary>
- /// 鎵ц绌烘墭鍑哄簱鐨勭浜屾潯瀛愪换鍔�- /// </summary>
- /// <param name="task"></param>
- /// <param name="connectBit"></param>
- /// <returns></returns>
- public OperateResult ExecBCP_KTCK_Sub2(TN_WM_TASKEntity task2, ConnectBitDto bit)
- {
- OperateResult or = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- // 鎵ц鍓嶆鏌ヨ揣浣嶇姸鎬�- // 鎺ラ┏浣嶇殑鍑嗗鐐硅揣浣�- var readyBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.readybit
- });
- if (readyBit == null)
- throw new Exception("鏈壘鍒板噯澶囩偣璐т綅锛� + bit.readybit);
- if (readyBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鍑嗗鐐硅揣浣嶏細" + bit.readybit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- UseTransaction(trans =>
- {
- // 鍑嗗鐐�棰勫嚭搴撻攣瀹�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_OutLock
- }, new { CN_S_LOCATION_CODE = bit.readybit }, trans);
- // 绾胯竟璐т綅涓嶇鎺�-
- // 瀛愪换鍔�鐘舵�缃负鎵ц涓�- or = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing
- }, new { CN_S_TASK_NO = task2.CN_S_TASK_NO }, trans);
- // 鍙戦�Ams浠诲姟
- Log.Detail(LogType.LogPara("璋冪敤AMS鎺ュ彛鎵ц浠诲姟"), "浠诲姟淇℃伅锛� + JsonConvert.SerializeObject(task2));
- or = BLLCreator.Create<OtherSysApi>().SendAmsTask(task2);
- Log.Detail(LogType.LogPara("璋冪敤AMS鎺ュ彛鎵ц浠诲姟"), "鎵ц缁撴灉锛� + JsonConvert.SerializeObject(or));
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鎵ц鍗婃垚鍝�绌烘墭鍑哄簱瀛愪换鍔′簩澶辫触锛屼换鍔＄紪鍙�" + task2.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
- return or;
- }
-
- #endregion
-
- #region 婊℃墭鍏ュ簱
-
- /// <summary>
- /// 鍒涘缓 鍗婃垚鍝�婊℃墭鍏ュ簱 瀛愪换鍔′竴
- /// </summary>
- public OperateResult ExecBCP_MTRK_AddSub1(TN_WM_TASKEntity task, ConnectBitDto bit)
- {
- OperateResult re = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- var connectBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.bit
- });
-
- if (connectBit == null)
- throw new Exception("鏈壘鍒版帴椹充綅璐т綅锛� + bit.bit);
- if (connectBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鎺ラ┏浣嶏細" + bit.bit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- // 绾胯竟->鎺ラ┏浣�- TN_WM_TASKEntity taskEntity1 = new TN_WM_TASKEntity()
- {
- CN_S_TASK_NO = task.CN_S_TASK_NO + "_3",
- CN_S_TRAY_CODE = task.CN_S_TRAY_CODE,
- CN_S_STATE = Constants.TaskState_NoExecuted,
- CN_S_BF_TASK_NO = "",
- CN_S_AF_TASK_NO = "",
- CN_S_STOCK_CODE = task.CN_S_STOCK_CODE,
- CN_S_START_AREA = task.CN_S_START_AREA,
- CN_S_START_BIT = task.CN_S_START_BIT,
- CN_S_END_AREA = connectBit.CN_S_AREA_CODE,
- CN_S_END_BIT = connectBit.CN_S_LOCATION_CODE,
- CN_N_PRIORITY = 1,
- CN_S_CREATOR = "sys",
- CN_S_CREATOR_BY = "sys",
- CN_T_CREATE = DateTime.Now,
- CN_T_MODIFY = DateTime.Now,
- CN_S_REMARK = "",
- CN_S_TASK_FLAG = Constants.TaskFlag_ZG,
- CN_S_EXT1 = task.CN_S_TASK_NO,
- CN_S_EXT2 = TaskFlagConstants.BCP_MTRK_SUB_1,
- CN_S_EXT3 = ""
- };
-
- UseTransaction(trans =>
- {
- // 鍒涘缓鍗婃垚鍝�婊℃墭鍏ュ簱瀛愪换鍔′竴
- re = CreateDapperDAL<TN_WM_TASKEntity>().Add(taskEntity1);
- if (!re.Success)
- throw new Exception(re.Msg);
-
- // 涓讳换鍔＄姸鎬佺疆涓烘墽琛屼腑
- re = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing
- }, new { CN_S_TASK_NO = task.CN_S_TASK_NO }, trans);
- if (!re.Success)
- throw new Exception(re.Msg);
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鍒涘缓鍗婃垚鍝�婊℃墭鍏ュ簱瀛愪换鍔′竴澶辫触锛屼换鍔＄紪鍙�" + task.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
-
- return re;
- }
- /// <summary>
- /// 鍒涘缓 鍗婃垚鍝�婊℃墭鍏ュ簱 瀛愪换鍔′簩
- /// </summary>
- public OperateResult ExecBCP_MTRK_AddSub2(TN_WM_TASKEntity task, ConnectBitDto bit)
- {
- OperateResult re = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- var connectBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.bit
- });
-
- if (connectBit == null)
- throw new Exception("鏈壘鍒版帴椹充綅璐т綅锛� + bit.bit);
- if (connectBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鎺ラ┏浣嶏細" + bit.bit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- // 鎺ラ┏浣�>绔嬪簱
- TN_WM_TASKEntity taskEntity2 = new TN_WM_TASKEntity()
- {
- CN_S_TASK_NO = task.CN_S_TASK_NO + "_4",
- CN_S_TRAY_CODE = task.CN_S_TRAY_CODE,
- CN_S_STATE = Constants.TaskState_NoExecuted,
- CN_S_BF_TASK_NO = "",
- CN_S_AF_TASK_NO = "",
- CN_S_STOCK_CODE = task.CN_S_STOCK_CODE,
- CN_S_START_AREA = connectBit.CN_S_AREA_CODE,
- CN_S_START_BIT = connectBit.CN_S_LOCATION_CODE,
- CN_S_END_AREA = task.CN_S_END_AREA,
- CN_S_END_BIT = task.CN_S_END_BIT,
- CN_N_PRIORITY = 1,
- CN_S_CREATOR = "sys",
- CN_S_CREATOR_BY = "sys",
- CN_T_CREATE = DateTime.Now,
- CN_T_MODIFY = DateTime.Now,
- CN_S_REMARK = "",
- CN_S_TASK_FLAG = Constants.TaskFlag_ZG,
- CN_S_EXT1 = task.CN_S_TASK_NO,
- CN_S_EXT2 = TaskFlagConstants.BCP_MTRK_SUB_2,
- CN_S_EXT3 = ""
- };
-
- UseTransaction(trans =>
- {
- // 鍒涘缓婊℃墭鍏ュ簱瀛愪换鍔′簩
- re = CreateDapperDAL<TN_WM_TASKEntity>().Add(taskEntity2);
- if (!re.Success)
- throw new Exception(re.Msg);
-
- // 涓讳换鍔＄姸鎬佺疆涓烘墽琛屼腑
- re = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing
- }, new { CN_S_TASK_NO = task.CN_S_TASK_NO }, trans);
- if (!re.Success)
- throw new Exception(re.Msg);
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鍒涘缓鍗婃垚鍝�婊℃墭鍏ュ簱瀛愪换鍔′簩澶辫触锛屼换鍔＄紪鍙�" + task.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
-
- return re;
- }
-
- /// <summary>
- /// 鎵ц鍗婃垚鍝�婊℃墭鍏ュ簱鐨勭涓�潯瀛愪换鍔�- /// </summary>
- /// <param name="task"></param>
- /// <param name=""></param>
- /// <returns></returns>
- public OperateResult ExecBCP_MTRK_Sub1(TN_WM_TASKEntity task1, ConnectBitDto bit)
- {
- OperateResult or = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- // 鎵ц鍓嶆鏌ヨ揣浣嶇姸鎬�- // 鎺ラ┏浣�- var connectBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.bit
- });
-
- if (connectBit == null)
- throw new Exception("鏈壘鍒版帴椹充綅璐т綅锛� + bit.bit);
- if (connectBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鎺ラ┏浣嶏細" + bit.bit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- UseTransaction(trans =>
- {
- // 绾胯竟璐т綅涓嶇鎺�-
- // 鎺ラ┏浣�棰勫叆搴撻攣瀹�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_InLock
- }, new { CN_S_LOCATION_CODE = bit.bit }, trans);
- // 瀛愪换鍔′竴鐘舵�缃负鎵ц涓�- or = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing
- }, new { CN_S_TASK_NO = task1.CN_S_TASK_NO }, trans);
- // 鍙戦�Ams浠诲姟
- Log.Detail(LogType.LogPara("璋冪敤AMS鎺ュ彛鎵ц浠诲姟"), "浠诲姟淇℃伅锛� + JsonConvert.SerializeObject(task1));
- or = BLLCreator.Create<OtherSysApi>().SendAmsTask(task1);
- Log.Detail(LogType.LogPara("璋冪敤AMS鎺ュ彛鎵ц浠诲姟"), "鎵ц缁撴灉锛� + JsonConvert.SerializeObject(or));
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鎵ц鍗婃垚鍝�婊℃墭鍏ュ簱瀛愪换鍔′竴澶辫触锛屼换鍔＄紪鍙�" + task1.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
- return or;
- }
- /// <summary>
- /// 鎵ц鍗婃垚鍝�婊℃墭鍏ュ簱鐨勭浜屾潯瀛愪换鍔�- /// </summary>
- /// <param name="task"></param>
- /// <param name="connectBit"></param>
- /// <returns></returns>
- public OperateResult ExecBCP_MTRK_Sub2(TN_WM_TASKEntity task2, ConnectBitDto bit)
- {
- OperateResult or = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- // 鎵ц鍓嶆鏌ヨ揣浣嶇姸鎬�- // 鎺ラ┏浣�- var connectBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.bit
- });
-
- if (connectBit == null)
- throw new Exception("鏈壘鍒版帴椹充綅璐т綅锛� + bit.bit);
- if (connectBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鎺ラ┏浣嶏細" + bit.bit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- UseTransaction(trans =>
- {
- // 鎺ラ┏浣�棰勫嚭搴撻攣瀹�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_OutLock
- }, new { CN_S_LOCATION_CODE = bit.bit }, trans);
- // 绔嬪簱棰勫叆搴撻攣瀹�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_InLock
- }, new { CN_S_LOCATION_CODE = task2.CN_S_END_BIT }, trans);
-
- // 瀛愪换鍔′簩鐘舵�缃负鎵ц涓�- or = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing
- }, new { CN_S_TASK_NO = task2.CN_S_TASK_NO }, trans);
- // 鍙戦�Wcs浠诲姟
- Log.Detail(LogType.LogPara("璋冪敤WCS鎺ュ彛鎵ц浠诲姟"), "浠诲姟淇℃伅锛� + JsonConvert.SerializeObject(task2));
- or = BLLCreator.Create<OtherSysApi>().SendWcsCreateTask(task2);
- Log.Detail(LogType.LogPara("璋冪敤WCS鎺ュ彛鎵ц浠诲姟"), "鎵ц缁撴灉锛� + JsonConvert.SerializeObject(or));
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鎵ц鍗婃垚鍝�婊℃墭鍏ュ簱瀛愪换鍔′簩澶辫触锛屼换鍔＄紪鍙�" + task2.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
- return or;
- }
-
- #endregion
-
- #endregion
-
- #region 鎴愬瀷鏈�-
- #region 鍗婃垚鍝佸洖搴�-
- /// <summary>
- /// 鍒涘缓 鎴愬瀷鏈�鍗婃垚鍝佸洖搴�瀛愪换鍔′竴
- /// </summary>
- public OperateResult ExecCXJ_BCPHK_AddSub1(TN_WM_TASKEntity task, ConnectBitDto bit)
- {
- OperateResult re = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- var connectBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.bit
- });
-
- if (connectBit == null)
- throw new Exception("鏈壘鍒版帴椹充綅璐т綅锛� + bit.bit);
- if (connectBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鎺ラ┏浣嶏細" + bit.bit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- // 绾胯竟->鎺ラ┏浣�- TN_WM_TASKEntity taskEntity1 = new TN_WM_TASKEntity()
- {
- CN_S_TASK_NO = task.CN_S_TASK_NO + "_1",
- CN_S_TRAY_CODE = task.CN_S_TRAY_CODE,
- CN_S_STATE = Constants.TaskState_NoExecuted,
- CN_S_BF_TASK_NO = "",
- CN_S_AF_TASK_NO = "",
- CN_S_STOCK_CODE = task.CN_S_STOCK_CODE,
- CN_S_START_AREA = task.CN_S_START_AREA,
- CN_S_START_BIT = task.CN_S_START_BIT,
- CN_S_END_AREA = connectBit.CN_S_AREA_CODE,
- CN_S_END_BIT = connectBit.CN_S_LOCATION_CODE,
- CN_N_PRIORITY = 1,
- CN_S_CREATOR = "sys",
- CN_S_CREATOR_BY = "sys",
- CN_T_CREATE = DateTime.Now,
- CN_T_MODIFY = DateTime.Now,
- CN_S_REMARK = "",
- CN_S_TASK_FLAG = Constants.TaskFlag_ZG,
- CN_S_EXT1 = task.CN_S_TASK_NO,
- CN_S_EXT2 = TaskFlagConstants.CXJ_BCPHK_SUB_1,
- CN_S_EXT3 = ""
- };
-
- UseTransaction(trans =>
- {
- // 鍒涘缓鎴愬瀷鏈�鍗婃垚鍝佸洖搴撳瓙浠诲姟涓�- re = CreateDapperDAL<TN_WM_TASKEntity>().Add(taskEntity1);
- if (!re.Success)
- throw new Exception(re.Msg);
-
- // 涓讳换鍔＄姸鎬佺疆涓烘墽琛屼腑
- re = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing
- }, new { CN_S_TASK_NO = task.CN_S_TASK_NO }, trans);
- if (!re.Success)
- throw new Exception(re.Msg);
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鍒涘缓鎴愬瀷鏈�鍗婃垚鍝佸洖搴撳瓙浠诲姟涓�け璐ワ紝浠诲姟缂栧彿=" + task.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
-
- return re;
- }
- /// <summary>
- /// 鍒涘缓 鎴愬瀷鏈�鍗婃垚鍝佸洖搴�瀛愪换鍔′簩
- /// </summary>
- public OperateResult ExecCXJ_BCPHK_AddSub2(TN_WM_TASKEntity task, ConnectBitDto bit)
- {
- OperateResult re = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- var connectBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.bit
- });
-
- if (connectBit == null)
- throw new Exception("鏈壘鍒版帴椹充綅璐т綅锛� + bit.bit);
- if (connectBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鎺ラ┏浣嶏細" + bit.bit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- // 鎺ラ┏浣�>绔嬪簱
- TN_WM_TASKEntity taskEntity2 = new TN_WM_TASKEntity()
- {
- CN_S_TASK_NO = task.CN_S_TASK_NO + "_2",
- CN_S_TRAY_CODE = task.CN_S_TRAY_CODE,
- CN_S_STATE = Constants.TaskState_NoExecuted,
- CN_S_BF_TASK_NO = "",
- CN_S_AF_TASK_NO = "",
- CN_S_STOCK_CODE = task.CN_S_STOCK_CODE,
- CN_S_START_AREA = connectBit.CN_S_AREA_CODE,
- CN_S_START_BIT = connectBit.CN_S_LOCATION_CODE,
- CN_S_END_AREA = task.CN_S_END_AREA,
- CN_S_END_BIT = task.CN_S_END_BIT,
- CN_N_PRIORITY = 1,
- CN_S_CREATOR = "sys",
- CN_S_CREATOR_BY = "sys",
- CN_T_CREATE = DateTime.Now,
- CN_T_MODIFY = DateTime.Now,
- CN_S_REMARK = "",
- CN_S_TASK_FLAG = Constants.TaskFlag_ZG,
- CN_S_EXT1 = task.CN_S_TASK_NO,
- CN_S_EXT2 = TaskFlagConstants.CXJ_BCPHK_SUB_2,
- CN_S_EXT3 = ""
- };
-
- UseTransaction(trans =>
- {
- // 鍒涘缓鎴愬瀷鏈�鍗婃垚鍝佸洖搴撳瓙浠诲姟浜�- re = CreateDapperDAL<TN_WM_TASKEntity>().Add(taskEntity2);
- if (!re.Success)
- throw new Exception(re.Msg);
-
- // 涓讳换鍔＄姸鎬佺疆涓烘墽琛屼腑
- re = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing
- }, new { CN_S_TASK_NO = task.CN_S_TASK_NO }, trans);
- if (!re.Success)
- throw new Exception(re.Msg);
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鍒涘缓鎴愬瀷鏈�鍗婃垚鍝佸洖搴撳瓙浠诲姟浜屽け璐ワ紝浠诲姟缂栧彿=" + task.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
-
- return re;
- }
-
- /// <summary>
- /// 鎵ц鎴愬瀷鏈�鍗婃垚鍝佸洖搴撶殑绗竴鏉″瓙浠诲姟
- /// </summary>
- /// <param name="task"></param>
- /// <param name=""></param>
- /// <returns></returns>
- public OperateResult ExecCXJ_BCPHK_Sub1(TN_WM_TASKEntity task1, ConnectBitDto bit)
- {
- OperateResult or = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- // 鎵ц鍓嶆鏌ヨ揣浣嶇姸鎬�- // 鎺ラ┏浣�- var connectBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.bit
- });
-
- if (connectBit == null)
- throw new Exception("鏈壘鍒版帴椹充綅璐т綅锛� + bit.bit);
- if (connectBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鎺ラ┏浣嶏細" + bit.bit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- UseTransaction(trans =>
- {
- // 绾胯竟璐т綅涓嶇鎺�-
- // 鎺ラ┏浣�棰勫叆搴撻攣瀹�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_InLock
- }, new { CN_S_LOCATION_CODE = bit.bit }, trans);
- // 瀛愪换鍔′竴鐘舵�缃负鎵ц涓�- or = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing
- }, new { CN_S_TASK_NO = task1.CN_S_TASK_NO }, trans);
- // 鍙戦�Ams浠诲姟
- Log.Detail(LogType.LogPara("璋冪敤AMS鎺ュ彛鎵ц浠诲姟"), "浠诲姟淇℃伅锛� + JsonConvert.SerializeObject(task1));
- or = BLLCreator.Create<OtherSysApi>().SendAmsTask(task1);
- Log.Detail(LogType.LogPara("璋冪敤AMS鎺ュ彛鎵ц浠诲姟"), "鎵ц缁撴灉锛� + JsonConvert.SerializeObject(or));
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鎵ц鎴愬瀷鏈�鍗婃垚鍝佸洖搴撳瓙浠诲姟涓�け璐ワ紝浠诲姟缂栧彿=" + task1.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
- return or;
- }
- /// <summary>
- /// 鎵ц鎴愬瀷鏈�鍗婃垚鍝佸洖搴撶殑绗簩鏉″瓙浠诲姟
- /// </summary>
- /// <param name="task"></param>
- /// <param name="connectBit"></param>
- /// <returns></returns>
- public OperateResult ExecCXJ_BCPHK_Sub2(TN_WM_TASKEntity task2, ConnectBitDto bit)
- {
- OperateResult or = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- // 鎵ц鍓嶆鏌ヨ揣浣嶇姸鎬�- // 鎺ラ┏浣�- var connectBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.bit
- });
-
- if (connectBit == null)
- throw new Exception("鏈壘鍒版帴椹充綅璐т綅锛� + bit.bit);
- if (connectBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鎺ラ┏浣嶏細" + bit.bit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- UseTransaction(trans =>
- {
- // 鎺ラ┏浣�棰勫嚭搴撻攣瀹�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_OutLock
- }, new { CN_S_LOCATION_CODE = bit.bit }, trans);
- // 绔嬪簱棰勫叆搴撻攣瀹�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_InLock
- }, new { CN_S_LOCATION_CODE = task2.CN_S_END_BIT }, trans);
-
- // 瀛愪换鍔′簩鐘舵�缃负鎵ц涓�- or = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing
- }, new { CN_S_TASK_NO = task2.CN_S_TASK_NO }, trans);
- // 鍙戦�Wcs浠诲姟
- Log.Detail(LogType.LogPara("璋冪敤WCS鎺ュ彛鎵ц浠诲姟"), "浠诲姟淇℃伅锛� + JsonConvert.SerializeObject(task2));
- or = BLLCreator.Create<OtherSysApi>().SendWcsCreateTask(task2);
- Log.Detail(LogType.LogPara("璋冪敤WCS鎺ュ彛鎵ц浠诲姟"), "鎵ц缁撴灉锛� + JsonConvert.SerializeObject(or));
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鎵ц鎴愬瀷鏈�鍗婃垚鍝佸洖搴撳瓙浠诲姟浜屽け璐ワ紝浠诲姟缂栧彿=" + task2.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
- return or;
- }
-
- #endregion
-
- #region 婊℃墭鍑哄簱
-
- /// <summary>
- /// 鍒涘缓婊℃墭鍑哄簱骞惰瀛愪换鍔�- /// </summary>
- public OperateResult ExecCXJ_MTCK_Add(TN_WM_TASKEntity task, ConnectBitDto bit)
- {
- OperateResult re = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- // 鎺ラ┏浣�- var connectBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.bit
- });
- // 鍑嗗鐐�- var readyBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.readybit
- });
- if (connectBit == null)
- throw new Exception("鏈壘鍒版帴椹充綅璐т綅锛� + bit.bit);
- if (connectBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鎺ラ┏浣嶏細" + bit.bit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- if (readyBit == null)
- throw new Exception("鏈壘鍒板噯澶囩偣璐т綅锛� + bit.readybit);
- if (readyBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鍑嗗鐐硅揣浣嶏細" + bit.readybit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- // 绔嬪簱->鎺ラ┏浣�- TN_WM_TASKEntity taskEntity1 = new TN_WM_TASKEntity()
- {
- CN_S_TASK_NO = task.CN_S_TASK_NO + "_1",
- CN_S_TRAY_CODE = task.CN_S_TRAY_CODE,
- CN_S_STATE = Constants.TaskState_NoExecuted,
- CN_S_BF_TASK_NO = "",
- CN_S_AF_TASK_NO = "",
- CN_S_STOCK_CODE = task.CN_S_STOCK_CODE,
- CN_S_START_AREA = task.CN_S_START_AREA,
- CN_S_START_BIT = task.CN_S_START_BIT,
- CN_S_END_AREA = connectBit.CN_S_AREA_CODE,
- CN_S_END_BIT = connectBit.CN_S_LOCATION_CODE,
- CN_N_PRIORITY = 1,
- CN_S_CREATOR = "sys",
- CN_S_CREATOR_BY = "sys",
- CN_T_CREATE = DateTime.Now,
- CN_T_MODIFY = DateTime.Now,
- CN_S_REMARK = "",
- CN_S_TASK_FLAG = Constants.TaskFlag_ZG,
- CN_S_EXT1 = task.CN_S_TASK_NO,
- CN_S_EXT2 = TaskFlagConstants.CXJ_MTCK_SUB_1,
- CN_S_EXT3 = ""
- };
- // 鍑嗗鐐�>绾胯竟
- TN_WM_TASKEntity taskEntity2 = new TN_WM_TASKEntity()
- {
- CN_S_TASK_NO = task.CN_S_TASK_NO + "_2",
- CN_S_TRAY_CODE = task.CN_S_TRAY_CODE,
- CN_S_STATE = Constants.TaskState_NoExecuted,
- CN_S_BF_TASK_NO = "",
- CN_S_AF_TASK_NO = "",
- CN_S_STOCK_CODE = task.CN_S_STOCK_CODE,
- CN_S_START_AREA = readyBit.CN_S_AREA_CODE,
- CN_S_START_BIT = readyBit.CN_S_LOCATION_CODE,
- CN_S_END_AREA = task.CN_S_END_AREA,
- CN_S_END_BIT = task.CN_S_END_BIT,
- CN_N_PRIORITY = 1,
- CN_S_CREATOR = "sys",
- CN_S_CREATOR_BY = "sys",
- CN_T_CREATE = DateTime.Now,
- CN_T_MODIFY = DateTime.Now,
- CN_S_REMARK = "",
- CN_S_TASK_FLAG = Constants.TaskFlag_ZG,
- CN_S_EXT1 = task.CN_S_TASK_NO,
- CN_S_EXT2 = TaskFlagConstants.CXJ_MTCK_SUB_2,
- CN_S_EXT3 = ""
- };
-
- UseTransaction(trans =>
- {
- // 鍒涘缓鎴愬瀷鏈�婊℃墭鍑哄簱瀛愪换鍔′竴
- re = CreateDapperDAL<TN_WM_TASKEntity>().Add(taskEntity1);
- if (!re.Success)
- throw new Exception(re.Msg);
-
- // 鍒涘缓鎴愬瀷鏈�婊℃墭鍑哄簱瀛愪换鍔′簩
- re = CreateDapperDAL<TN_WM_TASKEntity>().Add(taskEntity2);
- if (!re.Success)
- throw new Exception(re.Msg);
-
- // 涓讳换鍔＄姸鎬佺疆涓烘墽琛屼腑 璁板綍鎺ラ┏浣�- re = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing,
- CN_S_CONNECT_BIT = bit.bit
- }, new { CN_S_TASK_NO = task.CN_S_TASK_NO }, trans);
- if (!re.Success)
- throw new Exception(re.Msg);
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鍒涘缓鎴愬瀷鏈�婊℃墭鍑哄簱瀛愪换鍔″け璐ワ紝涓讳换鍔＄紪鍙�" + task.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
-
- return re;
- }
- /// <summary>
- /// 鎵ц婊℃墭鍑哄簱鐨勭涓�潯瀛愪换鍔�- /// </summary>
- /// <param name="task"></param>
- /// <param name=""></param>
- /// <returns></returns>
- public OperateResult ExecCXJ_MTCK_Sub1(TN_WM_TASKEntity task1, ConnectBitDto bit)
- {
- OperateResult or = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- // 鎵ц鍓嶆鏌ヨ揣浣嶇姸鎬�- // 鎺ラ┏浣�- var connectBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.bit
- });
- if (connectBit == null)
- throw new Exception("鏈壘鍒版帴椹充綅璐т綅锛� + bit.bit);
- if (connectBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鎺ラ┏浣嶏細" + bit.bit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- UseTransaction(trans =>
- {
- // 绔嬪簱 棰勫嚭搴撻攣瀹�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_OutLock
- }, new { CN_S_LOCATION_CODE = task1.CN_S_START_BIT }, trans);
- // 鎺ラ┏浣�棰勫叆搴撻攣瀹�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_InLock
- }, new { CN_S_LOCATION_CODE = bit.bit }, trans);
- // 瀛愪换鍔�鐘舵�缃负鎵ц涓�- or = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing
- }, new { CN_S_TASK_NO = task1.CN_S_TASK_NO }, trans);
- // 鍙戦�Wcs浠诲姟
- Log.Detail(LogType.LogPara("璋冪敤WCS鎺ュ彛鎵ц浠诲姟"), "浠诲姟淇℃伅锛� + JsonConvert.SerializeObject(task1));
- or = BLLCreator.Create<OtherSysApi>().SendWcsCreateTask(task1);
- Log.Detail(LogType.LogPara("璋冪敤WCS鎺ュ彛鎵ц浠诲姟"), "鎵ц缁撴灉锛� + JsonConvert.SerializeObject(or));
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鎵ц鎴愬瀷鏈�婊℃墭鍑哄簱瀛愪换鍔′竴澶辫触锛屼换鍔＄紪鍙�" + task1.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
- return or;
- }
- /// <summary>
- /// 鎵ц婊℃墭鍑哄簱鐨勭浜屾潯瀛愪换鍔�- /// </summary>
- /// <param name="task"></param>
- /// <param name="connectBit"></param>
- /// <returns></returns>
- public OperateResult ExecCXJ_MTCK_Sub2(TN_WM_TASKEntity task2, ConnectBitDto bit)
- {
- OperateResult or = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- // 鎵ц鍓嶆鏌ヨ揣浣嶇姸鎬�- // 鎺ラ┏浣嶇殑鍑嗗鐐硅揣浣�- var readyBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.readybit
- });
- if (readyBit == null)
- throw new Exception("鏈壘鍒板噯澶囩偣璐т綅锛� + bit.readybit);
- if (readyBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鍑嗗鐐硅揣浣嶏細" + bit.readybit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- UseTransaction(trans =>
- {
- // 鍑嗗鐐�棰勫嚭搴撻攣瀹�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_OutLock
- }, new { CN_S_LOCATION_CODE = bit.readybit }, trans);
- // 绾胯竟璐т綅涓嶇鎺�-
- // 瀛愪换鍔�鐘舵�缃负鎵ц涓�- or = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing
- }, new { CN_S_TASK_NO = task2.CN_S_TASK_NO }, trans);
- // 鍙戦�Ams浠诲姟
- Log.Detail(LogType.LogPara("璋冪敤AMS鎺ュ彛鎵ц浠诲姟"), "浠诲姟淇℃伅锛� + JsonConvert.SerializeObject(task2));
- or = BLLCreator.Create<OtherSysApi>().SendAmsTask(task2);
- Log.Detail(LogType.LogPara("璋冪敤AMS鎺ュ彛鎵ц浠诲姟"), "鎵ц缁撴灉锛� + JsonConvert.SerializeObject(or));
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鎵ц鎴愬瀷鏈�婊℃墭鍑哄簱瀛愪换鍔′簩澶辫触锛屼换鍔＄紪鍙�" + task2.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
- return or;
- }
-
- #endregion
-
- #region 鍥炴墭鍥炲簱-绌烘墭鍏ュ簱
-
- /// <summary>
- /// 鍒涘缓 鎴愬瀷鏈�绌烘墭鍥炲簱-绌烘墭鍏ュ簱 瀛愪换鍔′竴
- /// </summary>
- public OperateResult ExecCXJ_KTHK_KTRK_AddSub1(TN_WM_TASKEntity task, ConnectBitDto bit)
- {
- OperateResult re = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- var connectBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.bit
- });
-
- if (connectBit == null)
- throw new Exception("鏈壘鍒版帴椹充綅璐т綅锛� + bit.bit);
- if (connectBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鎺ラ┏浣嶏細" + bit.bit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- // 绾胯竟->鎺ラ┏浣�- TN_WM_TASKEntity taskEntity1 = new TN_WM_TASKEntity()
- {
- CN_S_TASK_NO = task.CN_S_TASK_NO + "_1",
- CN_S_TRAY_CODE = task.CN_S_TRAY_CODE,
- CN_S_STATE = Constants.TaskState_NoExecuted,
- CN_S_BF_TASK_NO = "",
- CN_S_AF_TASK_NO = "",
- CN_S_STOCK_CODE = task.CN_S_STOCK_CODE,
- CN_S_START_AREA = task.CN_S_START_AREA,
- CN_S_START_BIT = task.CN_S_START_BIT,
- CN_S_END_AREA = connectBit.CN_S_AREA_CODE,
- CN_S_END_BIT = connectBit.CN_S_LOCATION_CODE,
- CN_N_PRIORITY = 1,
- CN_S_CREATOR = "sys",
- CN_S_CREATOR_BY = "sys",
- CN_T_CREATE = DateTime.Now,
- CN_T_MODIFY = DateTime.Now,
- CN_S_REMARK = "",
- CN_S_TASK_FLAG = Constants.TaskFlag_ZG,
- CN_S_EXT1 = task.CN_S_TASK_NO,
- CN_S_EXT2 = TaskFlagConstants.CXJ_KTHK_KTRK_SUB_1,
- CN_S_EXT3 = ""
- };
-
- UseTransaction(trans =>
- {
- // 鍒涘缓鎴愬瀷鏈�绌烘墭鍥炲簱-绌烘墭鍏ュ簱瀛愪换鍔′竴
- re = CreateDapperDAL<TN_WM_TASKEntity>().Add(taskEntity1);
- if (!re.Success)
- throw new Exception(re.Msg);
-
- // 涓讳换鍔＄姸鎬佺疆涓烘墽琛屼腑
- re = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing
- }, new { CN_S_TASK_NO = task.CN_S_TASK_NO }, trans);
- if (!re.Success)
- throw new Exception(re.Msg);
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鍒涘缓鎴愬瀷鏈�绌烘墭鍥炲簱-绌烘墭鍏ュ簱瀛愪换鍔′竴澶辫触锛屼换鍔＄紪鍙�" + task.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
-
- return re;
- }
- /// <summary>
- /// 鍒涘缓 鎴愬瀷鏈�绌烘墭鍥炲簱-绌烘墭鍏ュ簱 瀛愪换鍔′簩
- /// </summary>
- public OperateResult ExecCXJ_KTHK_KTRK_AddSub2(TN_WM_TASKEntity task, ConnectBitDto bit)
- {
- OperateResult re = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- var connectBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.bit
- });
-
- if (connectBit == null)
- throw new Exception("鏈壘鍒版帴椹充綅璐т綅锛� + bit.bit);
- if (connectBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鎺ラ┏浣嶏細" + bit.bit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- // 鎺ラ┏浣�>绔嬪簱
- TN_WM_TASKEntity taskEntity2 = new TN_WM_TASKEntity()
- {
- CN_S_TASK_NO = task.CN_S_TASK_NO + "_2",
- CN_S_TRAY_CODE = task.CN_S_TRAY_CODE,
- CN_S_STATE = Constants.TaskState_NoExecuted,
- CN_S_BF_TASK_NO = "",
- CN_S_AF_TASK_NO = "",
- CN_S_STOCK_CODE = task.CN_S_STOCK_CODE,
- CN_S_START_AREA = connectBit.CN_S_AREA_CODE,
- CN_S_START_BIT = connectBit.CN_S_LOCATION_CODE,
- CN_S_END_AREA = task.CN_S_END_AREA,
- CN_S_END_BIT = task.CN_S_END_BIT,
- CN_N_PRIORITY = 1,
- CN_S_CREATOR = "sys",
- CN_S_CREATOR_BY = "sys",
- CN_T_CREATE = DateTime.Now,
- CN_T_MODIFY = DateTime.Now,
- CN_S_REMARK = "",
- CN_S_TASK_FLAG = Constants.TaskFlag_ZG,
- CN_S_EXT1 = task.CN_S_TASK_NO,
- CN_S_EXT2 = TaskFlagConstants.CXJ_KTHK_KTRK_SUB_2,
- CN_S_EXT3 = ""
- };
-
- UseTransaction(trans =>
- {
- // 鍒涘缓鎴愬瀷鏈�绌烘墭鍥炲簱-绌烘墭鍏ュ簱瀛愪换鍔′簩
- re = CreateDapperDAL<TN_WM_TASKEntity>().Add(taskEntity2);
- if (!re.Success)
- throw new Exception(re.Msg);
-
- // 涓讳换鍔＄姸鎬佺疆涓烘墽琛屼腑
- re = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing
- }, new { CN_S_TASK_NO = task.CN_S_TASK_NO }, trans);
- if (!re.Success)
- throw new Exception(re.Msg);
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鍒涘缓鎴愬瀷鏈�绌烘墭鍥炲簱-绌烘墭鍏ュ簱瀛愪换鍔′簩澶辫触锛屼换鍔＄紪鍙�" + task.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
-
- return re;
- }
-
- /// <summary>
- /// 鎵ц鎴愬瀷鏈�绌烘墭鍥炲簱-绌烘墭鍏ュ簱鐨勭涓�潯瀛愪换鍔�- /// </summary>
- /// <param name="task"></param>
- /// <param name=""></param>
- /// <returns></returns>
- public OperateResult ExecCXJ_KTHK_KTRK_Sub1(TN_WM_TASKEntity task1, ConnectBitDto bit)
- {
- OperateResult or = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- // 鎵ц鍓嶆鏌ヨ揣浣嶇姸鎬�- // 鎺ラ┏浣�- var connectBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.bit
- });
-
- if (connectBit == null)
- throw new Exception("鏈壘鍒版帴椹充綅璐т綅锛� + bit.bit);
- if (connectBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鎺ラ┏浣嶏細" + bit.bit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- UseTransaction(trans =>
- {
- // 绾胯竟璐т綅涓嶇鎺�-
- // 鎺ラ┏浣�棰勫叆搴撻攣瀹�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_InLock
- }, new { CN_S_LOCATION_CODE = bit.bit }, trans);
- // 瀛愪换鍔′竴鐘舵�缃负鎵ц涓�- or = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing
- }, new { CN_S_TASK_NO = task1.CN_S_TASK_NO }, trans);
- // 鍙戦�Ams浠诲姟
- Log.Detail(LogType.LogPara("璋冪敤AMS鎺ュ彛鎵ц浠诲姟"), "浠诲姟淇℃伅锛� + JsonConvert.SerializeObject(task1));
- or = BLLCreator.Create<OtherSysApi>().SendAmsTask(task1);
- Log.Detail(LogType.LogPara("璋冪敤AMS鎺ュ彛鎵ц浠诲姟"), "鎵ц缁撴灉锛� + JsonConvert.SerializeObject(or));
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鎵ц鎴愬瀷鏈�绌烘墭鍥炲簱-绌烘墭鍏ュ簱瀛愪换鍔′竴澶辫触锛屼换鍔＄紪鍙�" + task1.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
- return or;
- }
- /// <summary>
- /// 鎵ц鎴愬瀷鏈�绌烘墭鍥炲簱-绌烘墭鍏ュ簱鐨勭浜屾潯瀛愪换鍔�- /// </summary>
- /// <param name="task"></param>
- /// <param name="connectBit"></param>
- /// <returns></returns>
- public OperateResult ExecCXJ_KTHK_KTRK_Sub2(TN_WM_TASKEntity task2, ConnectBitDto bit)
- {
- OperateResult or = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- // 鎵ц鍓嶆鏌ヨ揣浣嶇姸鎬�- // 鎺ラ┏浣�- var connectBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.bit
- });
-
- if (connectBit == null)
- throw new Exception("鏈壘鍒版帴椹充綅璐т綅锛� + bit.bit);
- if (connectBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鎺ラ┏浣嶏細" + bit.bit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- UseTransaction(trans =>
- {
- // 鎺ラ┏浣�棰勫嚭搴撻攣瀹�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_OutLock
- }, new { CN_S_LOCATION_CODE = bit.bit }, trans);
- // 绔嬪簱棰勫叆搴撻攣瀹�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_InLock
- }, new { CN_S_LOCATION_CODE = task2.CN_S_END_BIT }, trans);
-
- // 瀛愪换鍔′簩鐘舵�缃负鎵ц涓�- or = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing
- }, new { CN_S_TASK_NO = task2.CN_S_TASK_NO }, trans);
- // 鍙戦�Wcs浠诲姟
- Log.Detail(LogType.LogPara("璋冪敤WCS鎺ュ彛鎵ц浠诲姟"), "浠诲姟淇℃伅锛� + JsonConvert.SerializeObject(task2));
- or = BLLCreator.Create<OtherSysApi>().SendWcsCreateTask(task2);
- Log.Detail(LogType.LogPara("璋冪敤WCS鎺ュ彛鎵ц浠诲姟"), "鎵ц缁撴灉锛� + JsonConvert.SerializeObject(or));
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鎵ц鎴愬瀷鏈�绌烘墭鍥炲簱-绌烘墭鍏ュ簱瀛愪换鍔′簩澶辫触锛屼换鍔＄紪鍙�" + task2.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
- return or;
- }
-
- #endregion
-
- #endregion
-
- #region 甯︽潫
-
- #region 鍗婃垚鍝佸強绌烘墭鍥炲簱
-
- /// <summary>
- /// 鍒涘缓 鎴愬瀷鏈哄甫鏉�鍗婃垚鍝�绌烘墭鍥炲簱 瀛愪换鍔′竴
- /// </summary>
- public OperateResult ExecDS_BCPKTHK_AddSub1(TN_WM_TASKEntity task, ConnectBitDto bit)
- {
- OperateResult re = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- var connectBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.bit
- });
-
- if (connectBit == null)
- throw new Exception("鏈壘鍒版帴椹充綅璐т綅锛� + bit.bit);
- if (connectBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鎺ラ┏浣嶏細" + bit.bit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- // 绾胯竟->鎺ラ┏浣�- TN_WM_TASKEntity taskEntity1 = new TN_WM_TASKEntity()
- {
- CN_S_TASK_NO = task.CN_S_TASK_NO + "_1",
- CN_S_TRAY_CODE = task.CN_S_TRAY_CODE,
- CN_S_STATE = Constants.TaskState_NoExecuted,
- CN_S_BF_TASK_NO = "",
- CN_S_AF_TASK_NO = "",
- CN_S_STOCK_CODE = task.CN_S_STOCK_CODE,
- CN_S_START_AREA = task.CN_S_START_AREA,
- CN_S_START_BIT = task.CN_S_START_BIT,
- CN_S_END_AREA = connectBit.CN_S_AREA_CODE,
- CN_S_END_BIT = connectBit.CN_S_LOCATION_CODE,
- CN_N_PRIORITY = 1,
- CN_S_CREATOR = "sys",
- CN_S_CREATOR_BY = "sys",
- CN_T_CREATE = DateTime.Now,
- CN_T_MODIFY = DateTime.Now,
- CN_S_REMARK = "",
- CN_S_TASK_FLAG = Constants.TaskFlag_ZG,
- CN_S_EXT1 = task.CN_S_TASK_NO,
- CN_S_EXT2 = TaskFlagConstants.DS_BCPKTHK_SUB_1,
- CN_S_EXT3 = ""
- };
-
- UseTransaction(trans =>
- {
- // 鍒涘缓鎴愬瀷鏈哄甫鏉�鍗婃垚鍝�绌烘墭鍥炲簱-瀛愪换鍔′竴
- re = CreateDapperDAL<TN_WM_TASKEntity>().Add(taskEntity1);
- if (!re.Success)
- throw new Exception(re.Msg);
-
- // 涓讳换鍔＄姸鎬佺疆涓烘墽琛屼腑
- re = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing
- }, new { CN_S_TASK_NO = task.CN_S_TASK_NO }, trans);
- if (!re.Success)
- throw new Exception(re.Msg);
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鍒涘缓鎴愬瀷鏈哄甫鏉�鍗婃垚鍝�绌烘墭鍥炲簱瀛愪换鍔′竴澶辫触锛屼换鍔＄紪鍙�" + task.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
-
- return re;
- }
- /// <summary>
- /// 鍒涘缓 鎴愬瀷鏈哄甫鏉�鍗婃垚鍝�绌烘墭鍥炲簱 瀛愪换鍔′簩
- /// </summary>
- public OperateResult ExecDS_BCPKTHK_AddSub2(TN_WM_TASKEntity task, ConnectBitDto bit)
- {
- OperateResult re = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- var connectBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.bit
- });
-
- if (connectBit == null)
- throw new Exception("鏈壘鍒版帴椹充綅璐т綅锛� + bit.bit);
- if (connectBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鎺ラ┏浣嶏細" + bit.bit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- // 鎺ラ┏浣�>绔嬪簱
- TN_WM_TASKEntity taskEntity2 = new TN_WM_TASKEntity()
- {
- CN_S_TASK_NO = task.CN_S_TASK_NO + "_2",
- CN_S_TRAY_CODE = task.CN_S_TRAY_CODE,
- CN_S_STATE = Constants.TaskState_NoExecuted,
- CN_S_BF_TASK_NO = "",
- CN_S_AF_TASK_NO = "",
- CN_S_STOCK_CODE = task.CN_S_STOCK_CODE,
- CN_S_START_AREA = connectBit.CN_S_AREA_CODE,
- CN_S_START_BIT = connectBit.CN_S_LOCATION_CODE,
- CN_S_END_AREA = task.CN_S_END_AREA,
- CN_S_END_BIT = task.CN_S_END_BIT,
- CN_N_PRIORITY = 1,
- CN_S_CREATOR = "sys",
- CN_S_CREATOR_BY = "sys",
- CN_T_CREATE = DateTime.Now,
- CN_T_MODIFY = DateTime.Now,
- CN_S_REMARK = "",
- CN_S_TASK_FLAG = Constants.TaskFlag_ZG,
- CN_S_EXT1 = task.CN_S_TASK_NO,
- CN_S_EXT2 = TaskFlagConstants.DS_BCPKTHK_SUB_2,
- CN_S_EXT3 = ""
- };
-
- UseTransaction(trans =>
- {
- // 鍒涘缓鎴愬瀷鏈哄甫鏉�鍗婃垚鍝�绌烘墭鍥炲簱瀛愪换鍔′簩
- re = CreateDapperDAL<TN_WM_TASKEntity>().Add(taskEntity2);
- if (!re.Success)
- throw new Exception(re.Msg);
-
- // 涓讳换鍔＄姸鎬佺疆涓烘墽琛屼腑
- re = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing
- }, new { CN_S_TASK_NO = task.CN_S_TASK_NO }, trans);
- if (!re.Success)
- throw new Exception(re.Msg);
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鍒涘缓鎴愬瀷鏈哄甫鏉�鍗婃垚鍝�绌烘墭鍥炲簱瀛愪换鍔′簩澶辫触锛屼换鍔＄紪鍙�" + task.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
-
- return re;
- }
-
- /// <summary>
- /// 鎵ц鎴愬瀷鏈哄甫鏉�鍗婃垚鍝�绌烘墭鍥炲簱鐨勭涓�潯瀛愪换鍔�- /// </summary>
- /// <param name="task"></param>
- /// <param name=""></param>
- /// <returns></returns>
- public OperateResult ExecDS_BCPKTHK_Sub1(TN_WM_TASKEntity task1, ConnectBitDto bit)
- {
- OperateResult or = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- // 鎵ц鍓嶆鏌ヨ揣浣嶇姸鎬�- // 鎺ラ┏浣�- var connectBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.bit
- });
-
- if (connectBit == null)
- throw new Exception("鏈壘鍒版帴椹充綅璐т綅锛� + bit.bit);
- if (connectBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鎺ラ┏浣嶏細" + bit.bit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- UseTransaction(trans =>
- {
- // 绾胯竟璐т綅涓嶇鎺�-
- // 鎺ラ┏浣�棰勫叆搴撻攣瀹�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_InLock
- }, new { CN_S_LOCATION_CODE = bit.bit }, trans);
- // 瀛愪换鍔′竴鐘舵�缃负鎵ц涓�- or = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing
- }, new { CN_S_TASK_NO = task1.CN_S_TASK_NO }, trans);
- // 鍙戦�Ams浠诲姟
- Log.Detail(LogType.LogPara("璋冪敤AMS鎺ュ彛鎵ц浠诲姟"), "浠诲姟淇℃伅锛� + JsonConvert.SerializeObject(task1));
- or = BLLCreator.Create<OtherSysApi>().SendAmsTask(task1);
- Log.Detail(LogType.LogPara("璋冪敤AMS鎺ュ彛鎵ц浠诲姟"), "鎵ц缁撴灉锛� + JsonConvert.SerializeObject(or));
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鎵ц鎴愬瀷鏈哄甫鏉�鍗婃垚鍝�绌烘墭鍥炲簱瀛愪换鍔′竴澶辫触锛屼换鍔＄紪鍙�" + task1.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
- return or;
- }
- /// <summary>
- /// 鎵ц鎴愬瀷鏈哄甫鏉�鍗婃垚鍝�绌烘墭鍥炲簱鐨勭浜屾潯瀛愪换鍔�- /// </summary>
- /// <param name="task"></param>
- /// <param name="connectBit"></param>
- /// <returns></returns>
- public OperateResult ExecDS_BCPKTHK_Sub2(TN_WM_TASKEntity task2, ConnectBitDto bit)
- {
- OperateResult or = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- // 鎵ц鍓嶆鏌ヨ揣浣嶇姸鎬�- // 鎺ラ┏浣�- var connectBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.bit
- });
-
- if (connectBit == null)
- throw new Exception("鏈壘鍒版帴椹充綅璐т綅锛� + bit.bit);
- if (connectBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鎺ラ┏浣嶏細" + bit.bit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- UseTransaction(trans =>
- {
- // 鎺ラ┏浣�棰勫嚭搴撻攣瀹�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_OutLock
- }, new { CN_S_LOCATION_CODE = bit.bit }, trans);
- // 绔嬪簱棰勫叆搴撻攣瀹�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_InLock
- }, new { CN_S_LOCATION_CODE = task2.CN_S_END_BIT }, trans);
-
- // 瀛愪换鍔′簩鐘舵�缃负鎵ц涓�- or = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing
- }, new { CN_S_TASK_NO = task2.CN_S_TASK_NO }, trans);
- // 鍙戦�Wcs浠诲姟
- Log.Detail(LogType.LogPara("璋冪敤WCS鎺ュ彛鎵ц浠诲姟"), "浠诲姟淇℃伅锛� + JsonConvert.SerializeObject(task2));
- or = BLLCreator.Create<OtherSysApi>().SendWcsCreateTask(task2);
- Log.Detail(LogType.LogPara("璋冪敤WCS鎺ュ彛鎵ц浠诲姟"), "鎵ц缁撴灉锛� + JsonConvert.SerializeObject(or));
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鎵ц鎴愬瀷鏈哄甫鏉�鍗婃垚鍝�绌烘墭鍥炲簱瀛愪换鍔′簩澶辫触锛屼换鍔＄紪鍙�" + task2.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
- return or;
- }
-
- #endregion
-
- #region 婊℃墭鍑哄簱
-
- /// <summary>
- /// 鍒涘缓婊℃墭鍑哄簱骞惰瀛愪换鍔�- /// </summary>
- public OperateResult ExecDS_MTCK_Add(TN_WM_TASKEntity task, ConnectBitDto bit)
- {
- OperateResult re = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- // 鎺ラ┏浣�- var connectBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.bit
- });
- // 鍑嗗鐐�- var readyBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.readybit
- });
- if (connectBit == null)
- throw new Exception("鏈壘鍒版帴椹充綅璐т綅锛� + bit.bit);
- if (connectBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鎺ラ┏浣嶏細" + bit.bit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- if (readyBit == null)
- throw new Exception("鏈壘鍒板噯澶囩偣璐т綅锛� + bit.readybit);
- if (readyBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鍑嗗鐐硅揣浣嶏細" + bit.readybit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- // 绔嬪簱->鎺ラ┏浣�- TN_WM_TASKEntity taskEntity1 = new TN_WM_TASKEntity()
- {
- CN_S_TASK_NO = task.CN_S_TASK_NO + "_1",
- CN_S_TRAY_CODE = task.CN_S_TRAY_CODE,
- CN_S_STATE = Constants.TaskState_NoExecuted,
- CN_S_BF_TASK_NO = "",
- CN_S_AF_TASK_NO = "",
- CN_S_STOCK_CODE = task.CN_S_STOCK_CODE,
- CN_S_START_AREA = task.CN_S_START_AREA,
- CN_S_START_BIT = task.CN_S_START_BIT,
- CN_S_END_AREA = connectBit.CN_S_AREA_CODE,
- CN_S_END_BIT = connectBit.CN_S_LOCATION_CODE,
- CN_N_PRIORITY = 1,
- CN_S_CREATOR = "sys",
- CN_S_CREATOR_BY = "sys",
- CN_T_CREATE = DateTime.Now,
- CN_T_MODIFY = DateTime.Now,
- CN_S_REMARK = "",
- CN_S_TASK_FLAG = Constants.TaskFlag_ZG,
- CN_S_EXT1 = task.CN_S_TASK_NO,
- CN_S_EXT2 = TaskFlagConstants.DS_MTCK_SUB_1,
- CN_S_EXT3 = ""
- };
- // 鍑嗗鐐�>绾胯竟
- TN_WM_TASKEntity taskEntity2 = new TN_WM_TASKEntity()
- {
- CN_S_TASK_NO = task.CN_S_TASK_NO + "_2",
- CN_S_TRAY_CODE = task.CN_S_TRAY_CODE,
- CN_S_STATE = Constants.TaskState_NoExecuted,
- CN_S_BF_TASK_NO = "",
- CN_S_AF_TASK_NO = "",
- CN_S_STOCK_CODE = task.CN_S_STOCK_CODE,
- CN_S_START_AREA = readyBit.CN_S_AREA_CODE,
- CN_S_START_BIT = readyBit.CN_S_LOCATION_CODE,
- CN_S_END_AREA = task.CN_S_END_AREA,
- CN_S_END_BIT = task.CN_S_END_BIT,
- CN_N_PRIORITY = 1,
- CN_S_CREATOR = "sys",
- CN_S_CREATOR_BY = "sys",
- CN_T_CREATE = DateTime.Now,
- CN_T_MODIFY = DateTime.Now,
- CN_S_REMARK = "",
- CN_S_TASK_FLAG = Constants.TaskFlag_ZG,
- CN_S_EXT1 = task.CN_S_TASK_NO,
- CN_S_EXT2 = TaskFlagConstants.DS_MTCK_SUB_2,
- CN_S_EXT3 = ""
- };
-
- UseTransaction(trans =>
- {
- // 鍒涘缓鎴愬瀷鏈哄甫鏉�婊℃墭鍑哄簱瀛愪换鍔′竴
- re = CreateDapperDAL<TN_WM_TASKEntity>().Add(taskEntity1);
- if (!re.Success)
- throw new Exception(re.Msg);
-
- // 鍒涘缓鎴愬瀷鏈哄甫鏉�婊℃墭鍑哄簱瀛愪换鍔′簩
- re = CreateDapperDAL<TN_WM_TASKEntity>().Add(taskEntity2);
- if (!re.Success)
- throw new Exception(re.Msg);
-
- // 涓讳换鍔＄姸鎬佺疆涓烘墽琛屼腑 璁板綍鎺ラ┏浣�- re = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing,
- CN_S_CONNECT_BIT = bit.bit
- }, new { CN_S_TASK_NO = task.CN_S_TASK_NO }, trans);
- if (!re.Success)
- throw new Exception(re.Msg);
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鍒涘缓鎴愬瀷鏈哄甫鏉�婊℃墭鍑哄簱瀛愪换鍔″け璐ワ紝涓讳换鍔＄紪鍙�" + task.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
-
- return re;
- }
- /// <summary>
- /// 鎵ц婊℃墭鍑哄簱鐨勭涓�潯瀛愪换鍔�- /// </summary>
- /// <param name="task"></param>
- /// <param name=""></param>
- /// <returns></returns>
- public OperateResult ExecDS_MTCK_Sub1(TN_WM_TASKEntity task1, ConnectBitDto bit)
- {
- OperateResult or = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- // 鎵ц鍓嶆鏌ヨ揣浣嶇姸鎬�- // 鎺ラ┏浣�- var connectBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.bit
- });
- if (connectBit == null)
- throw new Exception("鏈壘鍒版帴椹充綅璐т綅锛� + bit.bit);
- if (connectBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鎺ラ┏浣嶏細" + bit.bit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- UseTransaction(trans =>
- {
- // 绔嬪簱 棰勫嚭搴撻攣瀹�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_OutLock
- }, new { CN_S_LOCATION_CODE = task1.CN_S_START_BIT }, trans);
- // 鎺ラ┏浣�棰勫叆搴撻攣瀹�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_InLock
- }, new { CN_S_LOCATION_CODE = bit.bit }, trans);
- // 瀛愪换鍔�鐘舵�缃负鎵ц涓�- or = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing
- }, new { CN_S_TASK_NO = task1.CN_S_TASK_NO }, trans);
- // 鍙戦�Wcs浠诲姟
- Log.Detail(LogType.LogPara("璋冪敤WCS鎺ュ彛鎵ц浠诲姟"), "浠诲姟淇℃伅锛� + JsonConvert.SerializeObject(task1));
- or = BLLCreator.Create<OtherSysApi>().SendWcsCreateTask(task1);
- Log.Detail(LogType.LogPara("璋冪敤WCS鎺ュ彛鎵ц浠诲姟"), "鎵ц缁撴灉锛� + JsonConvert.SerializeObject(or));
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鎵ц鎴愬瀷鏈哄甫鏉�婊℃墭鍑哄簱瀛愪换鍔′竴澶辫触锛屼换鍔＄紪鍙�" + task1.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
- return or;
- }
- /// <summary>
- /// 鎵ц婊℃墭鍑哄簱鐨勭浜屾潯瀛愪换鍔�- /// </summary>
- /// <param name="task"></param>
- /// <param name="connectBit"></param>
- /// <returns></returns>
- public OperateResult ExecDS_MTCK_Sub2(TN_WM_TASKEntity task2, ConnectBitDto bit)
- {
- OperateResult or = OperateResult.Error("鏈煡閿欒");
-
- try
- {
- // 鎵ц鍓嶆鏌ヨ揣浣嶇姸鎬�- // 鎺ラ┏浣嶇殑鍑嗗鐐硅揣浣�- var readyBit = BLLCreator.CreateDapper<TN_WM_LOCATION_EXTEntity>().GetSingleEntity(new
- {
- CN_S_LOCATION_CODE = bit.readybit
- });
- if (readyBit == null)
- throw new Exception("鏈壘鍒板噯澶囩偣璐т綅锛� + bit.readybit);
- if (readyBit.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
- throw new Exception("鍑嗗鐐硅揣浣嶏細" + bit.readybit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�);
-
- UseTransaction(trans =>
- {
- // 鍑嗗鐐�棰勫嚭搴撻攣瀹�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_OutLock
- }, new { CN_S_LOCATION_CODE = bit.readybit }, trans);
- // 绾胯竟璐т綅涓嶇鎺�-
- // 瀛愪换鍔�鐘舵�缃负鎵ц涓�- or = CreateDapperDAL<TN_WM_TASKEntity>().Update(new
- {
- CN_S_STATE = Constants.TaskState_Executing
- }, new { CN_S_TASK_NO = task2.CN_S_TASK_NO }, trans);
- // 鍙戦�Ams浠诲姟
- Log.Detail(LogType.LogPara("璋冪敤AMS鎺ュ彛鎵ц浠诲姟"), "浠诲姟淇℃伅锛� + JsonConvert.SerializeObject(task2));
- or = BLLCreator.Create<OtherSysApi>().SendAmsTask(task2);
- Log.Detail(LogType.LogPara("璋冪敤AMS鎺ュ彛鎵ц浠诲姟"), "鎵ц缁撴灉锛� + JsonConvert.SerializeObject(or));
- });
- }
- catch (Exception ex)
- {
- OperateResult.Error("鎵ц鎴愬瀷鏈哄甫鏉�婊℃墭鍑哄簱瀛愪换鍔′簩澶辫触锛屼换鍔＄紪鍙�" + task2.CN_S_TASK_NO + "锛岄敊璇俊鎭細" + ex.Message);
- }
- return or;
- }
-
- #endregion
-
- #endregion
}
/// <summary>
@@ -2871,37 +1200,6 @@
/// 绌烘墭鍏ュ簱
/// </summary>
public static string KTRK = "绌烘墭鍏ュ簱";
- }
-
- /// <summary>
- /// 鎺ュ彛鍚屾鐨勪笟鍔＄被鍨嬪畾涔�- /// </summary>
- public class BusinessTypeConstants
- {
- /// <summary>
- /// 鍗婃垚鍝佹弧鎵樺叆搴�- /// </summary>
- public static string BCP_MTRK = "1";
- /// <summary>
- /// 鎴愬瀷鏈哄崐鎴愬搧鍥炲簱
- /// </summary>
- public static string CXJ_BCPHK = "2";
- /// <summary>
- /// 鎴愬瀷鏈虹┖妗跺洖搴�- /// </summary>
- public static string CXJ_KTHK = "3";
- /// <summary>
- /// 鎴愬瀷鏈烘弧鎵樺嚭搴�- /// </summary>
- public static string CXJ_MTCK = "4";
- /// <summary>
- /// 鎴愬瀷鏈哄甫鏉熷洖搴�- /// </summary>
- public static string CXJ_DSHK = "5";
- /// <summary>
- /// 鎴愬瀷鏈哄甫鏉熸弧鎵樺嚭搴�- /// </summary>
- public static string CXJ_DSMTCK = "6";
}
/// <summary>
@@ -2959,92 +1257,6 @@
/// 甯︽潫-婊℃墭鍑哄簱
/// </summary>
public static string DS_MTCK = "鎴愬瀷鏈哄甫鏉�婊℃墭鍑哄簱";
-
- #endregion
- }
-
- /// <summary>
- /// 浠诲姟鏍囪瘑甯搁噺
- /// </summary>
- public class TaskFlagConstants
- {
- /// <summary>
- /// 涓讳换鍔�- /// </summary>
- public static string ROOT = "涓讳换鍔�;
-
- #region 鍗婃垚鍝�-
- /// <summary>
- /// 鍗婃垚鍝�绌烘墭鍑哄簱瀛愪换鍔′竴
- /// </summary>
- public static string BCP_KTCK_SUB_1 = "鍗婃垚鍝�绌烘墭鍑哄簱-瀛愪换鍔′竴";
- /// <summary>
- /// 鍗婃垚鍝�绌烘墭鍑哄簱瀛愪换鍔′簩
- /// </summary>
- public static string BCP_KTCK_SUB_2 = "鍗婃垚鍝�绌烘墭鍑哄簱-瀛愪换鍔′簩";
- /// <summary>
- /// 鍗婃垚鍝�婊℃墭鍏ュ簱瀛愪换鍔′竴
- /// </summary>
- public static string BCP_MTRK_SUB_1 = "鍗婃垚鍝�婊℃墭鍏ュ簱-瀛愪换鍔′竴";
- /// <summary>
- /// 鍗婃垚鍝�婊℃墭鍏ュ簱瀛愪换鍔′簩
- /// </summary>
- public static string BCP_MTRK_SUB_2 = "鍗婃垚鍝�婊℃墭鍏ュ簱-瀛愪换鍔′簩";
-
- #endregion
-
- #region 鎴愬瀷鏈�-
- /// <summary>
- /// 鎴愬瀷鏈�鍗婃垚鍝佸洖搴�瀛愪换鍔′竴
- /// </summary>
- public static string CXJ_BCPHK_SUB_1 = "鎴愬瀷鏈�鍗婃垚鍝佸洖搴�瀛愪换鍔′竴";
- /// <summary>
- /// 鎴愬瀷鏈�鍗婃垚鍝佸洖搴�瀛愪换鍔′簩
- /// </summary>
- public static string CXJ_BCPHK_SUB_2 = "鎴愬瀷鏈�鍗婃垚鍝佸洖搴�瀛愪换鍔′竴";
- /// <summary>
- /// 鎴愬瀷鏈�绌烘墭鍥炲簱-璁板綍浠诲姟
- /// </summary>
- public static string CXJ_KTHK_RECORD = "鎴愬瀷鏈�绌烘墭鍥炲簱-璁板綍浠诲姟";
- /// <summary>
- /// 鎴愬瀷鏈�绌烘墭鍥炲簱-鍏ュ簱闃舵-瀛愪换鍔′竴
- /// </summary>
- public static string CXJ_KTHK_KTRK_SUB_1 = "鎴愬瀷鏈�绌烘墭鍥炲簱-鍏ュ簱闃舵-瀛愪换鍔′竴";
- /// <summary>
- /// 鎴愬瀷鏈�绌烘墭鍥炲簱-鍏ュ簱闃舵-瀛愪换鍔′簩
- /// </summary>
- public static string CXJ_KTHK_KTRK_SUB_2 = "鎴愬瀷鏈�绌烘墭鍥炲簱-鍏ュ簱闃舵-瀛愪换鍔′簩";
- /// <summary>
- /// 鎴愬瀷鏈�婊℃墭鍑哄簱-瀛愪换鍔′竴
- /// </summary>
- public static string CXJ_MTCK_SUB_1 = "鎴愬瀷鏈�婊℃墭鍑哄簱-瀛愪换鍔′竴";
- /// <summary>
- /// 鎴愬瀷鏈�婊℃墭鍑哄簱-瀛愪换鍔′簩
- /// </summary>
- public static string CXJ_MTCK_SUB_2 = "鎴愬瀷鏈�婊℃墭鍑哄簱-瀛愪换鍔′簩";
-
- #endregion
-
- #region 甯︽潫
-
- /// <summary>
- /// 鎴愬瀷鏈哄甫鏉�鍗婃垚鍝�绌烘墭鍥炲簱-瀛愪换鍔′竴
- /// </summary>
- public static string DS_BCPKTHK_SUB_1 = "鎴愬瀷鏈哄甫鏉�鍗婃垚鍝�绌烘墭鍥炲簱-瀛愪换鍔′竴";
- /// <summary>
- /// 鎴愬瀷鏈哄甫鏉�鍗婃垚鍝�绌烘墭鍥炲簱-瀛愪换鍔′簩
- /// </summary>
- public static string DS_BCPKTHK_SUB_2 = "鎴愬瀷鏈哄甫鏉�鍗婃垚鍝�绌烘墭鍥炲簱-瀛愪换鍔′簩";
- /// <summary>
- /// 鎴愬瀷鏈哄甫鏉�婊℃墭鍑哄簱-瀛愪换鍔′竴
- /// </summary>
- public static string DS_MTCK_SUB_1 = "鎴愬瀷鏈哄甫鏉�婊℃墭鍑哄簱-瀛愪换鍔′竴";
- /// <summary>
- /// 鎴愬瀷鏈哄甫鏉�婊℃墭鍑哄簱-瀛愪换鍔′簩
- /// </summary>
- public static string DS_MTCK_SUB_2 = "鎴愬瀷鏈哄甫鏉�婊℃墭鍑哄簱-瀛愪换鍔′簩";
#endregion
}
diff --git a/HH.WMS.BLL/SysMgr/TN_WM_TASKBLL.cs b/HH.WMS.BLL/SysMgr/TN_WM_TASKBLL.cs
index 767e90f..0230bf1 100644
--- a/HH.WMS.BLL/SysMgr/TN_WM_TASKBLL.cs
+++ b/HH.WMS.BLL/SysMgr/TN_WM_TASKBLL.cs
@@ -175,6 +175,48 @@
});
}
+ public OperateResult ChangeWay(TN_WM_TASKEntity task, AutoBomLocationEntity locationModel, AutoBomStockAreaEntity locationArea, string type)
+ {
+ var oldLocationCode = type.Equals("start") ? task.CN_S_START_BIT : task.CN_S_END_BIT;
+ return UseTransaction(trans =>
+ {
+ //閿佸畾鏀归亾鍚庣殑璐т綅浣跨敤鐘舵�鍜岄攣瀹氱姸鎬�+ if (locationArea.CN_C_IS_CONTROL_QTY.Equals("Y"))
+ CreateDAL<TN_WM_LOCATION_EXTDAL>().UpdateStateAndTaskNo(task.CN_S_TASK_NO, locationModel.CN_S_LOCATION_CODE, Constants.Location_State_OutLock, "", null, "");
+ if (type.Equals("start"))
+ {
+ //淇敼浠诲姟搴撳尯鍜岃揣浣�+ CreateDAL<DapperDAL<TN_WM_TASKEntity>>().Update(new
+ {
+ CN_S_START_BIT = locationModel.CN_S_LOCATION_CODE,
+ CN_S_START_AREA = locationModel.CN_S_AREA_CODE,
+ CN_C_START_IS_CONTROL_QTY = locationArea.CN_C_IS_CONTROL_QTY,
+ CN_S_START_CONTROL_INV = locationArea.CN_C_IS_INVENTORY,
+ CN_S_TASK_TYPE = "鏀归亾"
+ },
+ new { CN_S_TASK_NO = task.CN_S_TASK_NO });
+ }
+ else
+ {
+ CreateDAL<DapperDAL<TN_WM_TASKEntity>>().Update(new
+ {
+ CN_S_END_BIT = locationModel.CN_S_LOCATION_CODE,
+ CN_S_END_AREA = locationModel.CN_S_AREA_CODE,
+ CN_C_END_IS_CONTROL_QTY = locationArea.CN_C_IS_CONTROL_QTY,
+ CN_S_END_CONTROL_INV = locationArea.CN_C_IS_INVENTORY,
+ CN_S_TASK_TYPE = "鏀归亾"
+ },
+ new { CN_S_TASK_NO = task.CN_S_TASK_NO });
+ }
+ //灏嗗師鏉ョ殑璐т綅缃负姝ｅ父
+ CreateDAL<DapperDAL<TN_WM_LOCATION_EXTEntity>>().Update(new { CN_S_LOCATION_STATE = Constants.Location_State_Normal }, new { CN_S_LOCATION_CODE = oldLocationCode }, trans);
+
+ Log.Info("鏀归亾", "ChangeWay鎺ュ彛锛屾洿鏀逛换鍔¤捣鐐癸紝浠诲姟鍙凤細" + task.CN_S_TASK_NO + "锛岃捣鐐规洿鏀逛负锛� + locationModel.CN_S_LOCATION_CODE
+ + "锛岃捣鐐圭姸鎬佹洿鏀逛负锛� + Constants.Location_State_OutLock
+ + "锛屽師璧风偣" + oldLocationCode + "鐨勭姸鎬佹洿鏀逛负锛� + Constants.Location_State_Normal);
+ });
+ }
+
#endregion
#region DELETE
@@ -877,7 +919,7 @@
taskEntity.CN_S_END_BIT = executeStatePara.transportTask.CN_S_START_BIT;
taskEntity.CN_S_STATE = Constants.TaskState_NoExecuted;
- taskEntity.CN_S_STOCK_CODE = executeStatePara.transportTask.CN_S_STOCK_CODE;
+ taskEntity.CN_S_STOCK_CODE = executeStatePara.transportTask.CN_S_STOCK_CODE;
taskEntity.CN_S_START_AREA = ire.areaCode;
taskEntity.CN_S_END_AREA = executeStatePara.transportTask.CN_S_START_AREA;
taskEntity.CN_N_PRIORITY = 1;
diff --git a/HH.WMS.Entitys/External/ChangeWayResult.cs b/HH.WMS.Entitys/External/ChangeWayResult.cs
new file mode 100644
index 0000000..377d05a
--- /dev/null
+++ b/HH.WMS.Entitys/External/ChangeWayResult.cs
@@ -0,0 +1,16 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HH.WMS.Entitys.External
+{
+ public class ChangeWayResult
+ {
+ public bool success { get; set; }
+ public string errCode { get; set; }
+ public string errMsg { get; set; }
+ public string location { get; set; }
+ }
+}
diff --git a/HH.WMS.Entitys/HH.WMS.Entitys.csproj b/HH.WMS.Entitys/HH.WMS.Entitys.csproj
index 127bbd1..d4771d4 100644
--- a/HH.WMS.Entitys/HH.WMS.Entitys.csproj
+++ b/HH.WMS.Entitys/HH.WMS.Entitys.csproj
@@ -68,6 +68,7 @@
<Compile Include="Algorithm\TN_AB_STOCKEntity.cs" />
<Compile Include="Dto\ZCTransferDto.cs" />
<Compile Include="Entitys\Mes\TN_MES_TASK.cs" />
+ <Compile Include="External\ChangeWayResult.cs" />
<Compile Include="External\ZCReceiveTaskEntity.cs" />
<Compile Include="Wcs\WcsResponse.cs" />
<Compile Include="Ams\AmsAddTask.cs" />
diff --git a/HH.WMS.WebApi/Controllers/WmsApiController.cs b/HH.WMS.WebApi/Controllers/WmsApiController.cs
index b1c87ec..9f29ff0 100644
--- a/HH.WMS.WebApi/Controllers/WmsApiController.cs
+++ b/HH.WMS.WebApi/Controllers/WmsApiController.cs
@@ -133,7 +133,7 @@
TN_WM_TASKEntity transportTask = DALCreator.Create<DapperDAL<TN_WM_TASKEntity>>().GetSingleEntity(new { CN_S_TASK_NO = data.taskNo });
WebServiceAgent jxAgent = new WebServiceAgent(jxWebUrl);
- object[] para = { clientKey1, clientKey2, transportTask.CN_S_REMARK, transportTask.CN_S_TRAY_CODE, transportTask.CN_S_END_BIT, "80", "Y", "hh" };
+ object[] para = { clientKey1, clientKey2, transportTask.CN_S_REMARK, transportTask.CN_S_TRAY_CODE, transportTask.CN_S_END_BIT, "80", "Y", "hh" };
object returnObject = jxAgent.Invoke("SetAGVJobStatus", para);
// HH.WMS.JX.JXWMSServices.WebServiceSoapClient jxServices = new JX.JXWMSServices.WebServiceSoapClient();
@@ -372,6 +372,110 @@
}
return JsonConvert.SerializeObject(result);
}
+ #endregion
+
+ #region 涓瓥
+ /// <summary>
+ /// 鏀归亾
+ /// </summary>
+ /// <param name="param"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public string ChangeWay(dynamic param)
+ {
+ var logPara = new TOOLS.LOG.LogPara("鏀归亾");
+ logPara.Push("鎺ュ彛璇锋眰鍙傛暟锛� + JsonConvert.SerializeObject(param));
+
+ var result = new ChangeWayResult() { success = false, errCode = "200", location = "" };
+ try
+ {
+ //浠诲姟鍙�+ string taskNo = param.taskNo;
+ //鏀归亾绫诲瀷锛堣捣鐐�缁堢偣锛�+ string updateType = param.updateType;
+ //鏀归亾绫诲瀷瀵瑰簲鐨勫師鍥�+ string reasonCode = param.reasonCode;
+ if (string.IsNullOrEmpty(taskNo))
+ {
+ result.errMsg = "浠诲姟鍙蜂笉鍙负绌�;
+ result.errCode = "102";
+ }
+ if (string.IsNullOrEmpty(updateType) || !(updateType.Equals("璧风偣") || updateType.Equals("缁堢偣")))
+ {
+ result.errMsg += " 鏀归亾绫诲瀷涓嶆纭�;
+ result.errCode = "102";
+ }
+ if (taskNo.Split('_').Length <= 1)
+ {
+ result.errMsg += " 涓讳换鍔℃棤娉曞彉鏇磋捣鐐�;
+ result.errCode = "102";
+ }
+ string preTaskNo = taskNo.Split('_')[0] + "_1";
+ string navTaskNo = taskNo.Split('_')[1];
+ if (navTaskNo != "2")
+ {
+ result.errMsg += " 褰撳墠浠诲姟鏃犲墠缃换鍔★紝涓嶆敮鎸佸彉鏇磋捣鐐�;
+ result.errCode = "102";
+ }
+ var preTask = BLLCreator.Create<DapperBLL<TN_WM_TASKEntity>>().GetSingleEntity(new { CN_S_TASK_NO = preTaskNo });
+ if (preTask == null)
+ {
+ result.errMsg += "鏈壘鍒版浠诲姟鐨勪富浠诲姟锛屼换鍔″彿锛� + taskNo;
+ result.errCode = "102";
+ }
+ var currentTask = BLLCreator.Create<DapperBLL<TN_WM_TASKEntity>>().GetSingleEntity(new { CN_S_TASK_NO = taskNo });
+ if (currentTask == null)
+ {
+ result.errMsg += "鏈壘鍒版浠诲姟锛屼换鍔″彿锛� + taskNo;
+ result.errCode = "102";
+ }
+ // 涓讳换鍔＄殑绔嬪簱鎺ラ┏浣�+ string connectBit = preTask.CN_S_END_BIT;
+ AutoBomLocationEntity locationModel = DALCreator.Create<TN_WMS_LOCATIONDAL>().GetModel(connectBit);
+ var locationArea = DALCreator.Create<TN_AB_STOCK_LOCATIONDAL>().GetAreaModelByLocation(connectBit);
+ if (locationModel == null)
+ {
+ result.errMsg += "鏈壘鍒版帴椹充綅璐т綅锛� + connectBit;
+ result.errCode = "102";
+ }
+ if (locationModel.CN_S_LOCATION_STATE != Constants.Location_State_Normal)
+ {
+ result.errMsg += "鎺ラ┏浣嶈揣浣嶏細" + connectBit + "瀛樺湪鏈墽琛屽畬鐨勪换鍔�;
+ result.errCode = "102";
+ }
+
+ if (result.errCode == "200")
+ {
+ var sqlResult = BLLCreator.Create<TN_WM_TASKBLL>().ChangeWay(currentTask, locationModel, locationArea,"start");
+
+ if (!sqlResult.Success)
+ result.errMsg = sqlResult.Msg;
+ else
+ {
+ result.success = true;
+ result.errCode = "100";
+ result.location = connectBit;
+ }
+ }
+
+ if (result.success)
+ {
+ logPara.PushAndAdd("鏀归亾鎴愬姛锛�);
+ }
+ else
+ {
+ logPara.PushAndAdd("鏀归亾澶辫触锛屽師鍥狅細" + result.errMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ result.errCode = "200";
+ result.errMsg = "ChangeWay鏂规硶寮傚父" + ex.Message + ex.StackTrace;
+ logPara.PushAndAdd(ex);
+ }
+ return JsonConvert.SerializeObject(result);
+ }
+
#endregion
#region 瀹囧 鍙枡
@@ -1002,7 +1106,7 @@
AutoBomLocationEntity locationEntity = DALCreator.Create<TN_WMS_LOCATIONDAL>().GetModel(entity.CN_S_START_BIT);
entity.CN_S_STOCK_CODE = locationEntity.CN_S_STOCK_CODE;
entity.CN_N_PRIORITY = 1;
- // entity.CN_S_END_BIT = GetEndBit(entity.CN_S_START_BIT);
+ // entity.CN_S_END_BIT = GetEndBit(entity.CN_S_START_BIT);
string postData = "{\"appCode\":\"" + Constants.appCode + "\",\"ruleName\":\"" + Constants.Rule_TransTaskNo + "\",\"orgId\":\"\",\"orgFlag\":\"0\"}";
string taskNo = WebApiManager.HttpAutoBom_Post("api/BillRule/GenBillNo", postData);
if (string.IsNullOrEmpty(taskNo))
@@ -1090,7 +1194,7 @@
ZCReceiveTaskEntity sendTaskEntity = JsonConvert.DeserializeObject<ZCReceiveTaskEntity>(jsonData.ToString());
- if(string.IsNullOrEmpty(sendTaskEntity.BUSI_TYPE))
+ if (string.IsNullOrEmpty(sendTaskEntity.BUSI_TYPE))
{
Log.Detail(logPara, "ZCSendTask浠诲姟涓嬪彂澶辫触锛岀己灏戝弬鏁癇USI_TYPE銆� + jsonData.ToString());
return new
--
Gitblit v1.9.1