WMSPrjInstance/HH-0121_DuShanZiShiHua.git

			@@ -77,6 +77,7 @@
			cntrItemRel = new TN_Container_ItemType {
			S_ITEM_CODE = itemCode,
			S_CNTR_CODE = cntrCode,
			S_CNTR_TYPE = "托盘",
			};
			}
			// END
			@@ -124,8 +125,8 @@
			var cntId = locCntrRel.S_CNTR_CODE;
			var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

			LocationHelper.LockLoc(ref startLoc, 2); // 起点出库锁
			LocationHelper.LockLoc(ref endLoc, 1); // 终点入库锁
			LocationHelper.LockStartLoc(ref startLoc); // 起点出库锁
			LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁

			using (var tran = db.Ado.UseTran()) {
			if (db.Insertable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) {
			@@ -207,9 +208,10 @@
			}

			public static void CheckOutboundOrder() {
			var taskName = TaskName.C成品胶出库;
			var db = new SqlHelper<object>().GetInstance();
			var info = $"轮询--{taskName}--";
			var info = "";

			var taskName = TaskName.C成品胶出库;

			try {
			var orderList = db.Queryable<TN_Outbound_Order>()
			@@ -218,7 +220,7 @@
			.ToList();

			if (orderList.Count == 0) {
			info += $"暂无待执行的{taskName}单";
			info = $"轮询：{taskName}：暂无待执行的{taskName}单";
			LogHelper.Info(info);
			return;
			}
			@@ -229,7 +231,7 @@
			.Count(d => d.S_OO_NO == order.S_NO && d.N_B_STATE >= 2); // 执行中
			var allCount = db.Queryable<TN_Outbound_Detail>()
			.Count(d => d.S_OO_NO == order.S_NO);
			info += $"统计{taskName}单'{order.S_NO}'任务已下发：{doingCount}/{allCount}";
			info = $"轮询：{taskName}：统计{taskName}单'{order.S_NO}'任务已下发：{doingCount}/{allCount}";
			LogHelper.Info(info);

			if (doingCount == allCount) {
			@@ -243,7 +245,7 @@
			.First();

			if (lastDetail != null) {
			info += $"{taskName}单'{order.S_NO}'上一个任务仍在进行中：" + JsonConvert.SerializeObject(lastDetail);
			info = $"轮询：{taskName}：{taskName}单'{order.S_NO}'上一个任务仍在进行中：" + JsonConvert.SerializeObject(lastDetail);
			LogHelper.Info(info);
			continue;
			}
			@@ -253,7 +255,7 @@
			.First();

			if (outboundDetail == null) {
			info += $"仍有任务未执行完成，但当前没有已下发的任务";
			info = $"轮询：{taskName}：仍有任务未执行完成，但当前没有已下发的任务";
			LogHelper.Info(info);
			continue;
			}
			@@ -269,13 +271,14 @@
			foreach (var detail in detailList) {
			var startLoc = db.Queryable<TN_Location>()
			.LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
			.Where((l, c) => c.S_CNTR_CODE == detail.S_CNTR_CODE)
			.Where((l, c) => c.S_CNTR_CODE == detail.S_CNTR_CODE) // 根据容器号搜索起点货位
			.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
			.Where(l => l.N_CURRENT_NUM == 1)
			.First();

			if (startLoc == null) {
			LogHelper.Info($"轮询--{taskName}：没有找到合适的起点货位！");
			info = $"轮询：{taskName}：没有找到合适的起点货位！";
			LogHelper.Info(info);
			continue;
			}

			@@ -285,7 +288,8 @@
			.Where(a => a.N_CURRENT_NUM == 0).First();

			if (endLoc == null) {
			LogHelper.Info($"轮询--{taskName}：没有找到合适的终点货位！单号'{detail.S_OO_NO}'要求终点库区为'{detail.S_END_AREA}'");
			info = $"轮询：{taskName}：没有找到合适的终点货位！单号'{detail.S_OO_NO}'要求终点库区为'{detail.S_END_AREA}'";
			LogHelper.Info(info);
			continue;
			}

			@@ -294,13 +298,13 @@
			var cntId = detail.S_CNTR_CODE;
			var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

			LocationHelper.LockLoc(ref startLoc, 2); // 起点出库锁
			LocationHelper.LockLoc(ref endLoc, 1); // 终点入库锁
			LocationHelper.LockStartLoc(ref startLoc); // 起点出库锁
			LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁

			using (var tran = db.Ado.UseTran()) {
			if (db.Updateable<TN_Outbound_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info += $"修改明细表状态为完成--失败！";
			info = $"轮询：{taskName}：修改明细表状态为完成--失败！";
			LogHelper.Info(info);
			continue;
			}
			@@ -312,7 +316,7 @@
			it.T_MODIFY
			}).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info += $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
			info = $"轮询：{taskName}：生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
			LogHelper.Info(info);
			continue;
			}
			@@ -324,20 +328,20 @@
			it.T_MODIFY
			}).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info += $"生成任务'{taskName}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
			info = $"轮询：{taskName}：生成任务'{taskName}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
			LogHelper.Info(info);
			continue;
			}

			if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info += $"生成任务'{taskName}'失败，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
			info = $"轮询：{taskName}：生成任务'{taskName}'失败，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
			LogHelper.Info(info);
			continue;
			}

			tran.CommitTran();
			info += $"生成任务'{taskName}'成功，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
			info = $"轮询：{taskName}：生成任务'{taskName}'成功，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
			LogHelper.Info(info);
			continue;
			}
			@@ -376,15 +380,16 @@

			}
			catch (Exception ex) {
			info += $"发生了异常：{ex.Message}";
			info = $"轮询：{taskName}：发生了异常：{ex.Message}";
			LogHelper.InfoEx(ex);
			}
			}

			public static void CheckCheckOrder() {
			var taskName = TaskName.C抽检_出库;
			var db = new SqlHelper<object>().GetInstance();
			var info = "";

			var taskName = TaskName.C抽检_出库;

			try {
			var orderList = db.Queryable<TN_Spot_Check>()
			@@ -393,7 +398,7 @@
			.ToList();

			if (orderList.Count == 0) {
			LogHelper.Info($"轮询--{taskName}--暂无待执行的{taskName}单");
			LogHelper.Info($"轮询：{taskName}：暂无待执行的{taskName}单");
			return;
			}

			@@ -451,8 +456,8 @@
			var cntId = detail.S_CNTR_CODE;
			var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

			LocationHelper.LockLoc(ref startLoc, 2); // 起点出库锁
			LocationHelper.LockLoc(ref endLoc, 1); // 终点入库锁
			LocationHelper.LockStartLoc(ref startLoc); // 起点出库锁
			LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁

			using (var tran = db.Ado.UseTran()) {
			if (db.Updateable<TN_SpotCheck_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
			@@ -575,8 +580,8 @@
			var cntId = detail.S_CNTR_CODE;
			var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

			LocationHelper.LockLoc(ref startLoc, 2); // 起点出库锁
			LocationHelper.LockLoc(ref endLoc, 1); // 终点入库锁
			LocationHelper.LockStartLoc(ref startLoc); // 起点出库锁
			LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁

			using (var tran = db.Ado.UseTran()) {
			if (db.Updateable<TN_RelocationList_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {