WMSPrjInstance/HH-0121_DuShanZiShiHua.git

			@@ -1,136 +1,137 @@
			using System;
			using System.Collections.Generic;
			using System.Linq;
			using System.Text;
			using System.Threading.Tasks;

			using HH.WCS.Mobox3.DSZSH.models;
			using HH.WCS.Mobox3.DSZSH.util;
			using HH.WCS.Mobox3.DSZSH.wms;

			using Newtonsoft.Json;
			using Org.BouncyCastle.Asn1.Tsp;

			using SqlSugar;

			using Swashbuckle.Swagger;

			using static HH.WCS.Mobox3.DSZSH.api.ApiModel;
			using static HH.WCS.Mobox3.DSZSH.api.OtherModel;
			using static HH.WCS.Mobox3.DSZSH.Config;

			namespace HH.WCS.Mobox3.DSZSH.api {
			public class ApiHelper {
			/// <summary>
			/// 好运箱-满箱下线入库(PDA)
			/// </summary>
			/// <param name="model"></param>
			/// <remarks>
			/// 人工：产线==>满箱操作区<br/>
			/// PDA：调用接口，呼叫AGV<br/>
			/// AGV：满箱操作区==搬运==>货架区（不指定终点货区）
			/// </remarks>
			/// <param name="model">包含：物料信息、起点货位</param>
			/// <returns></returns>
			public static SimpleResult GoodpackOffline(GoodpackOfflineInfo model) {
			var db = new SqlHelper<object>().GetInstance();
			var info = "";

			var taskName = TaskName.H好运箱_满箱下线入库; // 用于生成任务类型、打印日志信息
			var startAreaName = AreaName.M满箱操作区;
			var endAreaName = AreaName.M满箱货架区;
			const string taskName = TaskName.H好运箱_满箱下线入库;
			const string startAreaName = AreaName.M满箱操作区;
			const string endAreaName = AreaName.M满箱货架区;

			try {
			// 将PDA提供的物料编码与贴标机的信息比对
			if (model.Num <= 0) {
			info = $"物料数量'{model.Num}'不合法：物料数量应该大于0";
			LogHelper.Info(info);
			return NewSimpleResult(400, info);
			}

			var cgDetail = db.Queryable<TN_CG_Detail>()
			.Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo) // 指定：物料编码、批次号
			.Where(d => d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "待检") // 新增物料，故物料状态应该为 1待检
			// TODO model 中数量、规格是否也参与比对待后续要求
			.First();
			.Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo)
			.Where(d => d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "待检")
			.First(); // TODO model 中数量、规格是否也参与比对待后续要求

			if (cgDetail == null) {
			info = $"PDA扫码物料信息与贴标机传递的信息不一致：" + JsonConvert.SerializeObject(model);
			LogHelper.Info(info);
			return NewSimpleResult(2, info);
			return NewSimpleResult(1, info);
			}

			// 起点货位绑定后，可以不立即设置N_CURRENT_NUM为1
			// 因为AGV取货后就会恢复0，而且货位上锁后不会被访问到
			var startLoc = db.Queryable<TN_Location>()
			.Where(l => l.S_CODE == model.StartLoc) // 指定：起点货位号
			.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
			.Where(l => l.N_CURRENT_NUM == 0) // 起点绑定前没有容器
			.Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 起点货区符合任务要求
			.Where(l => l.S_CODE == model.StartLoc)
			.Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
			.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
			.Where(l => l.N_CURRENT_NUM == 0) // 绑定前
			.First();

			if (startLoc == null) {
			info = $"在'{startAreaName}'中没有找到起点货位{model.StartLoc}，或不具备取货要求：未上锁、绑定前无货物";
			info = $"在'{startAreaName}'中没有找到起点货位'{model.StartLoc}'，或不满足要求：未上锁、当前容器数量=0";
			LogHelper.Info(info);
			return NewSimpleResult(3, info);
			}
			return NewSimpleResult(2, info);
			}

			// 绑定货位和容器号
			startLoc.N_CURRENT_NUM = 1; // 绑定后

			var locCntrRel = new TN_Loc_Container {
			S_LOC_CODE = model.StartLoc,
			S_LOC_CODE = startLoc.S_CODE,
			S_CNTR_CODE = cgDetail.S_CNTR_CODE,
			S_CNTR_TYPE = "好运箱",
			};

			// TODO 满箱入库算法待优化
			var endLoc = db.Queryable<TN_Location>()
			.Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) // 终点货区符合任务要求
			.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
			.Where(l => l.N_CURRENT_NUM == 0) // 筛选：空货位
			.Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
			.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
			.Where(l => l.N_CURRENT_NUM == 0)
			.OrderBy(l => l.N_LAYER) // 按货架最低排序
			.First();
			.First();// TODO 满箱入库算法待优化

			if (endLoc == null) {
			info = $"在'{endAreaName}'中没有找到合适的终点货位，需要满足：未上锁、无货物";
			info = $"在'{endAreaName}'中没有找到合适的终点货位，需要满足：未上锁、当前容器数量=0";
			LogHelper.Info(info);
			return NewSimpleResult(4, info);
			}
			return NewSimpleResult(3, info);
			}

			var cntId = locCntrRel.S_CNTR_CODE;
			LocationHelper.LockStartLoc(ref startLoc);
			LocationHelper.LockEndLoc(ref endLoc);
			var cntId = locCntrRel.S_CNTR_CODE; // 容器号
			var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

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

			using (var tran = db.Ado.UseTran()) {
			if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
			info = $"插入货位容器关系失败：" + JsonConvert.SerializeObject(locCntrRel);
			info = $"插入【货位容器绑定】表失败：" + JsonConvert.SerializeObject(locCntrRel);
			tran.RollbackTran();
			LogHelper.Info(info);
			return NewSimpleResult(5, info);
			return NewSimpleResult(500, info);
			}

			if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
			it.N_LOCK_STATE,
			it.S_LOCK_STATE,
			it.S_LOCK_OP,
			it.T_MODIFY
			it.T_MODIFY,
			it.N_CURRENT_NUM, // 起点货位绑定后，将货位状态更新
			}).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
			LogHelper.Info(info);
			return NewSimpleResult(5, info);
			return NewSimpleResult(500, info);
			}

			if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
			it.N_LOCK_STATE,
			it.S_LOCK_STATE,
			it.S_LOCK_OP,
			it.T_MODIFY
			it.T_MODIFY,
			}).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info = $"生成任务'{taskName}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
			LogHelper.Info(info);
			return NewSimpleResult(5, info);
			return NewSimpleResult(500, info);
			}

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

			tran.CommitTran();
			info = $"生成任务'{taskName}'成功，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
			info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
			LogHelper.Info(info);
			return NewSimpleResult(0, info);
			}
			@@ -138,83 +139,151 @@
			catch (Exception ex) {
			info = $"发生了异常：{ex.Message}";
			LogHelper.InfoEx(ex);
			return NewSimpleResult(1, info);
			return NewSimpleResult(-1, info);
			}
			}

			/// <summary>
			/// 托盘-空托入库(PDA)
			/// </summary>
			/// <param name="model"></param>
			/// <remarks>
			/// 人工将空托盘通过接驳位入库，需要新绑定容器货位<br/>
			/// 由于空托盘一般是出库卸货后获得，而出库时没有手动卸货的逻辑，所以需要在入库的时候再删除旧绑定信息
			/// </remarks>
			/// <param name="model">包含：起点货位、容器号、容器类型、终点货区</param>
			/// <returns></returns>
			public static SimpleResult EmptyInboundPallet(EmptyInboundInfo model) {
			var db = new SqlHelper<object>().GetInstance();
			var info = "";

			var taskName = TaskName.T托盘_空托入库;
			var startAreaName = AreaName.K空托入库接驳区;
			var endAreaName = AreaName.K空托存放区;
			const string taskName = TaskName.T托盘_空托入库;
			const string startAreaName = AreaName.K空托入库接驳区;
			const string endAreaName = AreaName.K空托存放区;
			const string cntrType = "托盘";

			try {
			// 现在PDA没有单独的绑定流程，绑定在入库时完成
			var startLoc = db.Queryable<TN_Location>()
			.Where(l => l.S_CODE == model.StartLoc) // 指定：起点货位
			.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
			.Where(l => l.N_CURRENT_NUM == 0) // 绑定前货位为空
			.Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 起点货区符合任务要求
			.Where(l => l.S_CODE == model.StartLoc)
			.Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
			.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
			.Where(l => l.N_CURRENT_NUM == 0)
			.First();

			if (startLoc == null) {
			info = $"起点位置{model.StartLoc}不存在或不具备取货要求";
			info = $"在'{startAreaName}'中没有找到起点货位'{model.StartLoc}'，或不具备起点取货要求：未上锁、绑定前无货物";
			LogHelper.Info(info);
			return NewSimpleResult(1, info);
			}

			var cntr = db.Queryable<TN_Container>()
			.Where(c => c.S_CODE == model.CntrCode) // 对于前台程序而言，S_CODE就是主键，维护时必定唯一
			.First();

			if (cntr == null) {
			info = $"容器'{model.CntrCode}'在【容器表】中不存在，请在前台页面中维护！";
			LogHelper.Info(info);
			return NewSimpleResult(2, info);
			}
			if (cntr.S_TYPE != cntrType) { // 空托入库
			info = $"容器'{model.CntrCode}'在【容器表】中的类型为'{cntr.S_TYPE}'，与输入的容器类型'{cntrType}'不同！";
			LogHelper.Info(info);
			return NewSimpleResult(3, info);
			}

			// 绑定货位和容器号
			// 假定人工不会将有物料的箱子放在空箱入库接驳位，没有必要检查
			// 如果人工将出库后的托盘入库，这时物料信息并没有删除，需要将托盘物料的关系解除
			var cgDetailOld = db.Queryable<TN_CG_Detail>()
			.Where(d => d.S_CNTR_CODE == model.CntrCode)
			.First();

			// 如果人工将出库后的托盘入库，此时容器仍然与旧的出库货位绑定，需要检查
			var locCntrRelOld = db.Queryable<TN_Loc_Container>()
			.Where(c => c.S_CNTR_CODE == model.CntrCode)
			.First();

			TN_Location locOld = null;
			if (locCntrRelOld != null) { // 如果需要解绑容器货位，也需要修改货位信息
			locOld = db.Queryable<TN_Location>()
			.Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).First();
			if (locOld != null) {
			locOld.N_CURRENT_NUM = 0; // 如果旧货位存在，将旧货位的数量设置为 0
			locOld.T_MODIFY = DateTime.Now;
			}
			}

			// 绑定货位和容器号（PDA在接驳位绑定）
			var locCntrRel = new TN_Loc_Container {
			S_LOC_CODE = model.StartLoc,
			S_CNTR_CODE = model.CntrCode,
			S_CNTR_TYPE = "托盘",
			S_LOC_CODE = startLoc.S_CODE,
			S_CNTR_CODE = cntr.S_CODE,
			S_CNTR_TYPE = cntrType, // 空托入库
			};

			// TODO 暂定选择最低层按区位顺序入库，后面待修改
			startLoc.N_CURRENT_NUM = 1; // 绑定后

			var endLoc = db.Queryable<TN_Location>()
			.Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) // 终点货区符合任务要求
			.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
			.Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
			.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
			.Where(l => l.N_CURRENT_NUM == 0)
			.OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL })
			.OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }) // TODO 暂定选择最低层按区位顺序入库，后面待修改
			.First();

			if (endLoc == null) {
			info = $"在'{endAreaName}'中没有找到合适的终点货位，需要满足：未上锁、无货物";
			info = $"在【{endAreaName}】中没有找到合适的【终点货位】，需要满足：未上锁、无货物";
			LogHelper.Info(info);
			return NewSimpleResult(4, info);
			}

			var cntId = locCntrRel.S_CNTR_CODE;
			LocationHelper.LockStartLoc(ref startLoc);
			LocationHelper.LockEndLoc(ref endLoc);
			var cntId = locCntrRel.S_CNTR_CODE; // 容器号
			var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

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

			using (var tran = db.Ado.UseTran()) {
			if (cgDetailOld != null) {
			if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
			info = $"删除【旧物料信息】失败：" + JsonConvert.SerializeObject(cgDetailOld);
			tran.RollbackTran();
			LogHelper.Info(info);
			return NewSimpleResult(500, info);
			}
			}

			if (locCntrRelOld != null) {
			if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
			info = $"删除【旧货位容器关系】失败：" + JsonConvert.SerializeObject(locCntrRelOld);
			tran.RollbackTran();
			LogHelper.Info(info);
			return NewSimpleResult(500, info);
			}
			}

			if (locOld != null) {
			if (db.Updateable<TN_Location>(locOld).UpdateColumns(l => new { l.N_CURRENT_NUM, l.T_MODIFY }).ExecuteCommand() <= 0) {
			info = $"更新旧货位【容器数量】失败：" + JsonConvert.SerializeObject(locOld);
			tran.RollbackTran();
			LogHelper.Info(info);
			return NewSimpleResult(500, info);
			}
			}

			if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
			info = $"插入货位容器关系失败：" + JsonConvert.SerializeObject(locCntrRel);
			info = $"插入【货位容器关系】失败：" + JsonConvert.SerializeObject(locCntrRel);
			tran.RollbackTran();
			LogHelper.Info(info);
			return NewSimpleResult(4, info);
			return NewSimpleResult(500, info);
			}

			if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
			it.N_LOCK_STATE,
			it.S_LOCK_STATE,
			it.S_LOCK_OP,
			it.T_MODIFY
			it.T_MODIFY,
			it.N_CURRENT_NUM
			}).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
			info = $"生成任务'{taskName}'失败：更新起点货位'{startLoc.S_CODE}'锁状态失败";
			LogHelper.Info(info);
			return NewSimpleResult(4, info);
			return NewSimpleResult(500, info);
			}

			if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
			@@ -224,70 +293,109 @@
			it.T_MODIFY
			}).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info = $"生成任务'{taskName}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
			info = $"生成任务'{taskName}'失败：更新终点货位'{endLoc.S_CODE}'锁状态失败";
			LogHelper.Info(info);
			return NewSimpleResult(4, info);
			return NewSimpleResult(500, info);
			}

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

			tran.CommitTran();
			info = $"生成任务'{taskName}'成功，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
			info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
			LogHelper.Info(info);
			return NewSimpleResult(0, info);
			return NewSimpleResult(0, info);
			}
			}
			catch (Exception ex) {
			info = $"发生了异常：{ex.Message}";
			LogHelper.InfoEx(ex);
			return NewSimpleResult(1, info);
			return NewSimpleResult(-1, info);
			}
			}

			/// <summary>
			/// 好运箱-空箱入库(PDA)
			/// </summary>
			/// <remarks>
			/// 人工：空箱==搬运==>入库接驳位，需要新绑定容器货位<br/>
			/// 由于空箱一般是出库卸货后获得，而出库时没有手动卸货的逻辑，所以需要在入库的时候再删除旧绑定信息
			/// </remarks>
			/// <returns></returns>
			public static SimpleResult EmptyInboundGoodpack(EmptyInboundInfo model) {
			var db = new SqlHelper<object>().GetInstance();
			var info = "";

			var taskName = TaskName.H好运箱_空箱入库;
			var startAreaName = AreaName.K空箱入库接驳区;
			var endAreaName = AreaName.K空箱货架区;
			const string taskName = TaskName.H好运箱_空箱入库;
			const string startAreaName = AreaName.K空箱入库接驳区;
			const string endAreaName = AreaName.K空箱货架区;
			const string cntrType = "好运箱";

			try {
			var startLoc = db.Queryable<TN_Location>()
			.Where(l => l.S_CODE == model.StartLoc)
			.Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
			.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
			.Where(l => l.N_CURRENT_NUM == 0) // 绑定前货位为空
			.Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 起点货区符合任务要求
			.Where(l => l.N_CURRENT_NUM == 0) // 绑定前
			.First();

			if (startLoc == null) {
			info = $"起点位置{model.StartLoc}不存在或不具备取货要求";
			info = $"在'{startAreaName}'中没有找到起点货位'{model.StartLoc}'，或不满足要求：未上锁、当前容器数量=0";
			LogHelper.Info(info);
			return NewSimpleResult(2, info);
			}

			var cntr = db.Queryable<TN_Container>()
			.Where(c => c.S_CODE == model.CntrCode) // 对于前台程序而言，S_CODE就是主键，维护时必定唯一
			.First();

			if (cntr == null) {
			info = $"容器'{model.CntrCode}'在容器表中不存在，请在前台页面中维护！";
			LogHelper.Info(info);
			return NewSimpleResult(2, info);
			}
			if (cntr.S_TYPE != cntrType) {
			info = $"容器'{model.CntrCode}'在容器表中的类型为'{cntr.S_TYPE}'，与输入的容器类型'{cntrType}'不同！";
			LogHelper.Info(info);
			return NewSimpleResult(2, info);
			}

			// 假定人工不会将有物料的箱子放在空箱入库接驳位，没有必要检查
			// 如果人工将出库后的托盘入库，这时物料信息并没有删除，需要将托盘物料的关系解除
			var cgDetailOld = db.Queryable<TN_CG_Detail>()
			.Where(d => d.S_CNTR_CODE == model.CntrCode).First();

			// 如果人工将出库后的托盘入库，此时容器仍然与旧的出库货位绑定，需要检查
			var locCntrRelOld = db.Queryable<TN_Loc_Container>()
			.Where(c => c.S_CNTR_CODE == model.CntrCode).First();

			TN_Location locOld = null;
			if (locCntrRelOld != null) { // 如果需要解绑容器货位，也需要修改货位信息
			locOld = db.Queryable<TN_Location>()
			.Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).First();
			if (locOld != null) {
			locOld.N_CURRENT_NUM = 0; // 如果旧货位存在，将旧货位的数量设置为 0
			}
			}

			// 绑定货位和容器号
			var locCntrRel = new TN_Loc_Container {
			S_LOC_CODE = model.StartLoc,
			S_CNTR_CODE = model.CntrCode,
			S_CNTR_TYPE = "好运箱",
			S_LOC_CODE = startLoc.S_CODE,
			S_CNTR_CODE = cntr.S_CODE,
			S_CNTR_TYPE = cntrType,
			};

			// TODO 暂定选择最低层顺序入库，后面待修改
			startLoc.N_CURRENT_NUM = 1; // 绑定后

			var endLoc = db.Queryable<TN_Location>()
			.Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
			.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
			.Where(l => l.N_CURRENT_NUM == 0)
			.OrderBy(l => new { l.N_LAYER })
			.OrderBy(l => new { l.N_LAYER }) // TODO 暂定选择最低层顺序入库，后面待修改
			.First();

			if (endLoc == null) {
			@@ -297,29 +405,58 @@
			}

			var cntId = locCntrRel.S_CNTR_CODE;

			LocationHelper.LockStartLoc(ref startLoc);
			LocationHelper.LockEndLoc(ref endLoc);
			var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

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

			using (var tran = db.Ado.UseTran()) {
			// 存在旧【物料明细】表时，删除旧表
			if (cgDetailOld != null) {
			if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
			info = $"删除【旧物料信息】失败：" + JsonConvert.SerializeObject(cgDetailOld);
			tran.RollbackTran();
			LogHelper.Info(info);
			return NewSimpleResult(500, info);
			}
			}
			// 存在旧【货位容器绑定】表时，删除旧表
			if (locCntrRelOld != null) {
			if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
			info = $"删除【旧货位容器关系】失败：" + JsonConvert.SerializeObject(locCntrRelOld);
			tran.RollbackTran();
			LogHelper.Info(info);
			return NewSimpleResult(500, info);
			}
			}

			if (locOld != null) {
			if (db.Updateable<TN_Location>(locOld).UpdateColumns(l => l.N_CURRENT_NUM).ExecuteCommand() <= 0) {
			info = $"更新旧货位【容器数量】失败：" + JsonConvert.SerializeObject(locOld);
			tran.RollbackTran();
			LogHelper.Info(info);
			return NewSimpleResult(500, info);
			}
			}

			if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
			info = $"插入货位容器关系失败：" + JsonConvert.SerializeObject(locCntrRel);
			info = $"插入【货位容器关系】失败：" + JsonConvert.SerializeObject(locCntrRel);
			tran.RollbackTran();
			LogHelper.Info(info);
			return NewSimpleResult(4, info);
			return NewSimpleResult(500, info);
			}

			if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
			it.N_LOCK_STATE,
			it.S_LOCK_STATE,
			it.S_LOCK_OP,
			it.T_MODIFY
			it.T_MODIFY,
			it.N_CURRENT_NUM
			}).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
			info = $"生成任务'{taskName}'失败：更新起点货位'{startLoc.S_CODE}'锁状态失败";
			LogHelper.Info(info);
			return NewSimpleResult(4, info);
			return NewSimpleResult(500, info);
			}

			if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
			@@ -329,20 +466,20 @@
			it.T_MODIFY
			}).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info = $"生成任务'{taskName}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
			info = $"生成任务'{taskName}'失败：更新终点货位'{endLoc.S_CODE}'锁状态失败";
			LogHelper.Info(info);
			return NewSimpleResult(4, info);
			return NewSimpleResult(500, info);
			}

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

			tran.CommitTran();
			info = $"生成任务'{taskName}'成功，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
			info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
			LogHelper.Info(info);
			return NewSimpleResult(0, info);
			}
			@@ -350,68 +487,106 @@
			catch (Exception ex) {
			info = $"发生了异常：{ex.Message}";
			LogHelper.InfoEx(ex);
			return NewSimpleResult(1, info);
			return NewSimpleResult(-1, info);
			}
			}

			/// <summary>
			/// 托盘-空托上线(PDA)
			/// </summary>
			/// <param name="model"></param>
			/// <remarks>
			/// 人工根据当前生产物料所需的容器类型，呼叫AGV从空容器货架中叫一个符合要求的托盘
			/// </remarks>
			/// <param name="model">包含：容器号、物料编码</param>
			/// <returns></returns>
			public static SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) {
			var db = new SqlHelper<object>().GetInstance();
			var info = "";

			var taskName = TaskName.T托盘_空托上线;
			var startAreaName = AreaName.K空托存放区;
			const string taskName = TaskName.T托盘_空托上线;
			const string startAreaName = AreaName.K空托存放区;
			const string endAreaName = AreaName.B包装区;
			const string cntrType = "托盘";

			try {
			// 查容器-物料类型表
			var cntrItemRel = db.Queryable<TN_Container_ItemType>()
			.Where(i => i.S_CNTR_CODE == model.CntId && i.S_CNTR_TYPE == "托盘")
			var cntr = db.Queryable<TN_Container>()
			.Where(c => c.S_CODE == model.CntId)
			.First();
			// 如果表中存在这个托盘信息，且物料类型与上线所需物料不符，报错
			// 如果不存在，不作限制（视作第一次上线）
			if (cntrItemRel != null && cntrItemRel.S_ITEM_CODE != model.ItemCode) {
			info = $"容器{model.CntId}已经与物料类型{cntrItemRel.S_ITEM_CODE}绑定，无法用于装载物料{model.ItemCode}";

			if (cntr == null) {
			info = $"容器'{model.CntId}'在容器表中不存在，请在前台页面中维护！";
			LogHelper.Info(info);
			return NewSimpleResult(1, info);
			}
			if (cntr.S_TYPE != cntrType) { // 容器类型默认不会为空
			info = $"容器'{model.CntId}'在容器表中的类型是'{cntr.S_TYPE}，不是'{cntrType}'！";
			LogHelper.Info(info);
			return NewSimpleResult(2, info);
			}

			var needUpdateContainer = false;
			if (string.IsNullOrEmpty(cntr.S_SPEC)) {
			// TEMP 目前流程：如果容器表中规格（物料编码）为空，根据流程的物料信息写入
			// 待定：后面可能会更改流程，或者用其他信息（如物料类型/规格）作为容器的规格

			needUpdateContainer = true;
			info = $"容器'{model.CntId}'在容器表中规格（物料编码）为空，将物料编码'{model.ItemCode}'写入容器的规格";
			LogHelper.Info(info);

			cntr.S_SPEC = model.ItemCode;
			}
			else if (cntr.S_SPEC != model.ItemCode) {
			info = $"容器'{model.CntId}'已经与物料类型'{cntr.S_SPEC}'绑定，无法用于装载物料'{model.ItemCode}'";
			LogHelper.Info(info);
			return NewSimpleResult(3, info);
			}

			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 == model.CntId) // 找指定容器号
			.Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 限定在空托存放区中找容器货位
			.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：没有锁状态
			.Where(l => l.N_CURRENT_NUM == 1) // 筛选：有货货位
			.LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
			.Where((l, c) => c.S_CNTR_CODE == model.CntId)
			.Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_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) {
			info = $"在空托存放区中，找不到符合{model.ItemCode}物料，且编码为{model.CntId}的空托盘";
			info = $"在'{startAreaName}'中，找不到适用于{model.ItemCode}物料、且编码为{model.CntId}的空托盘";
			LogHelper.Info(info);
			return NewSimpleResult(3, info);
			}

			var endLoc = db.Queryable<TN_Location>()
			//.Where(l => Settings.AreaMap[AreaName.B包装区].Contains(l.S_AREA_CODE))
			.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
			.Where(l => l.N_CURRENT_NUM == 0) // 筛选：空货位
			.Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
			.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
			.Where(l => l.N_CURRENT_NUM == 0)
			.First();

			if (endLoc == null) {
			info = $"终点位置不存在或不具备放货要求";
			info = $"在'{endAreaName}'中，找不到合适的【终点货位】，需要满足：未上锁、当前容器数量=0";
			LogHelper.Info(info);
			return NewSimpleResult(4, info);
			}

			var cntId = model.CntId;

			LocationHelper.LockStartLoc(ref startLoc); // 起点出库锁
			LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁
			var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

			LocationHelper.LockLoc(ref startLoc, 2); // 起点出库锁
			LocationHelper.LockLoc(ref endLoc, 1); // 终点入库锁
			cntr.S_SOURCE = task.S_CODE; // 用任务号作为容器更新的依据
			cntr.T_MODIFY = DateTime.Now;

			using (var tran = db.Ado.UseTran()) {
			if (needUpdateContainer) {
			if (db.Updateable<TN_Container>(cntr)
			.UpdateColumns(c => new { c.S_SPEC, c.S_SOURCE, c.T_MODIFY }).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info = $"更新表容器表失败：" + JsonConvert.SerializeObject(cntr);
			LogHelper.Info(info);
			return NewSimpleResult(500, info);
			}
			}

			if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
			it.N_LOCK_STATE,
			it.S_LOCK_STATE,
			@@ -419,9 +594,9 @@
			it.T_MODIFY
			}).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
			info = $"生成任务'{taskName}'失败：更新起点货位'{startLoc.S_CODE}'锁状态失败";
			LogHelper.Info(info);
			return NewSimpleResult(4, info);
			return NewSimpleResult(500, info);
			}

			if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
			@@ -431,20 +606,20 @@
			it.T_MODIFY
			}).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info = $"生成任务'{taskName}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
			info = $"生成任务'{taskName}'失败：更新终点货位'{endLoc.S_CODE}'锁状态失败";
			LogHelper.Info(info);
			return NewSimpleResult(4, info);
			return NewSimpleResult(500, info);
			}

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

			tran.CommitTran();
			info = $"生成任务'{taskName}'成功，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
			info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
			LogHelper.Info(info);
			return NewSimpleResult(0, info);
			}
			@@ -452,7 +627,7 @@
			catch (Exception ex) {
			info = $"发生了异常：{ex.Message}";
			LogHelper.InfoEx(ex);
			return NewSimpleResult(1, info);
			return NewSimpleResult(-1, info);
			}
			}

			@@ -465,32 +640,49 @@
			var db = new SqlHelper<object>().GetInstance();
			var info = "";

			var taskName = TaskName.H好运箱_空箱上线;
			var startAreaName = AreaName.K空托存放区;
			const string taskName = TaskName.H好运箱_空箱上线;
			const string startAreaName = AreaName.K空箱货架区;
			const string endAreaName = AreaName.K空箱操作区;
			const string cntrType = "好运箱";

			try {
			var cntr = db.Queryable<TN_Container>()
			.Where(c => c.S_CODE == model.CntId)
			.First();

			if (cntr == null) {
			info = $"容器'{model.CntId}'在【容器表】中不存在，请在前台页面中维护！";
			LogHelper.Info(info);
			return NewSimpleResult(1, info);
			}
			if (cntr.S_TYPE != cntrType) {
			info = $"容器'{model.CntId}'在【容器表】中的类型={cntr.S_TYPE}，不是'{cntrType}'！";
			LogHelper.Info(info);
			return NewSimpleResult(2, info);
			}

			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 == model.CntId)
			.Where((l, c) => c.S_CNTR_CODE == model.CntId && c.S_CNTR_TYPE == "好运箱")
			.Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_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) {
			info = $"在'{startAreaName}'中，找不到编码为{model.CntId}的空好运箱";
			info = $"在'{startAreaName}'中，找不到存放容器编码={model.CntId}的空好运箱的【起点货位】，或不满足：未上锁、当前数量=1";
			LogHelper.Info(info);
			return NewSimpleResult(2, info);
			}

			var endLoc = db.Queryable<TN_Location>()
			//.Where(l => Settings.AreaMap[AreaName.B包装区].Contains(l.S_AREA_CODE))
			.Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
			.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
			.Where(l => l.N_CURRENT_NUM == 0)
			.First();

			if (endLoc == null) {
			info = $"终点位置不存在或不具备放货要求";
			info = $"在'{endAreaName}'中，找不到合适的【终点货位】，需要满足：未上锁、当前数量=0";
			LogHelper.Info(info);
			return NewSimpleResult(4, info);
			}
			@@ -498,8 +690,8 @@
			var cntId = model.CntId;
			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_Location>(startLoc).UpdateColumns(it => new {
			@@ -509,9 +701,9 @@
			it.T_MODIFY
			}).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
			info = $"生成任务'{taskName}'失败：更新起点货位'{startLoc.S_CODE}'锁状态失败";
			LogHelper.Info(info);
			return NewSimpleResult(4, info);
			return NewSimpleResult(500, info);
			}

			if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
			@@ -521,20 +713,20 @@
			it.T_MODIFY
			}).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info = $"生成任务'{taskName}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
			info = $"生成任务'{taskName}'失败：更新终点货位'{endLoc.S_CODE}'锁状态失败";
			LogHelper.Info(info);
			return NewSimpleResult(4, info);
			return NewSimpleResult(500, info);
			}

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

			tran.CommitTran();
			info = $"生成任务'{taskName}'成功，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
			info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
			LogHelper.Info(info);
			return NewSimpleResult(0, info);
			}
			@@ -542,7 +734,7 @@
			catch (Exception ex) {
			info = $"发生了异常：{ex.Message}";
			LogHelper.InfoEx(ex);
			return NewSimpleResult(1, info);
			return NewSimpleResult(-1, info);
			}
			}

			@@ -556,8 +748,9 @@
			var db = new SqlHelper<object>().GetInstance();
			var info = "";

			var taskName = TaskName.C抽检_合格回库;
			var startAreaName = AreaName.C抽检区;
			const string taskName = TaskName.C抽检_合格回库;
			const string startAreaName = AreaName.C抽检区;
			var endAreaName = "";

			try {
			var cgDetail = db.Queryable<TN_CG_Detail>()
			@@ -565,12 +758,20 @@
			.First();

			if (cgDetail == null) {
			return NewSimpleResult(2, "没有找到待回库的抽检物料：" + JsonConvert.SerializeObject(model));
			info = "没有找到待回库的抽检物料：" + JsonConvert.SerializeObject(model);
			LogHelper.Info(info);
			return NewSimpleResult(2, info);
			}

			var locCntrRel = db.Queryable<TN_Loc_Container>()
			.Where(c => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE)
			.First();

			if (locCntrRel == null) {
			info = $"容器{model.CntrCode}在货位容器关系表中不存在";
			LogHelper.Info(info);
			return NewSimpleResult(3, info);
			}

			var startLoc = db.Queryable<TN_Location>()
			.Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
			@@ -582,50 +783,53 @@
			if (startLoc == null) {
			info = $"在'{startAreaName}'中没有找到容器{model.CntrCode}的起点货位，或不具备取货要求：未上锁、有货物";
			LogHelper.Info(info);
			return NewSimpleResult(0, info);
			return NewSimpleResult(4, info);
			}

			var endLoc = new TN_Location();
			TN_Location endLoc = null;
			if (locCntrRel.S_CNTR_TYPE == "托盘") {
			endAreaName = AreaName.M满托货架区;
			endLoc = db.Queryable<TN_Location>()
			.Where(l => Settings.AreaMap[AreaName.M满托货架区].Contains(l.S_AREA_CODE))
			.Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
			.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
			.Where(l => l.N_CURRENT_NUM == 0) // 筛选：空货位
			.First();
			}
			else if (locCntrRel.S_CNTR_TYPE == "好运箱") {
			endAreaName = AreaName.M满箱货架区;
			endLoc = db.Queryable<TN_Location>()
			.Where(l => Settings.AreaMap[AreaName.M满箱货架区].Contains(l.S_AREA_CODE))
			.Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
			.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
			.Where(l => l.N_CURRENT_NUM == 0)
			.First();
			}
			else {
			return NewSimpleResult(2, $"托盘类型{locCntrRel.S_CNTR_TYPE}不合法：托盘号{locCntrRel.S_CNTR_CODE}");
			return NewSimpleResult(-1, $"托盘类型{locCntrRel.S_CNTR_TYPE}不合法：托盘号{locCntrRel.S_CNTR_CODE}");
			}

			if (endLoc == null) {
			info = "查询：没有找到合适的终点货位";
			info = $"在【{endAreaName}】中没有找到合适的【终点货位】，或不满足要求：未上锁、当前容器数量为 0";
			LogHelper.Info(info);
			return NewSimpleResult(3, info);
			}

			cgDetail.N_ITEM_STATE = 0;
			cgDetail.S_ITEM_STATE = "合格";
			cgDetail.T_MODIFY = DateTime.Now;

			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.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it =>
			new { it.N_ITEM_STATE, it.S_ITEM_STATE }).ExecuteCommand() <= 0) {
			new { it.N_ITEM_STATE, it.S_ITEM_STATE, it.T_MODIFY }).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info = "修改物料状态为合格失败";
			info = $"生成'{taskName}'失败：修改物料状态为'合格'失败";
			LogHelper.Info(info);
			return NewSimpleResult(4, info);
			return NewSimpleResult(500, info);
			}

			if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
			@@ -635,9 +839,9 @@
			it.T_MODIFY
			}).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info = $"生成 {taskName} 失败，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货位 {endLoc.S_CODE}";
			info = $"生成任务'{taskName}'失败：更新起点货位'{startLoc.S_CODE}'锁状态失败";
			LogHelper.Info(info);
			return NewSimpleResult(4, info);
			return NewSimpleResult(500, info);
			}

			if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
			@@ -646,39 +850,49 @@
			it.S_LOCK_OP,
			it.T_MODIFY
			}).ExecuteCommand() <= 0) {

			tran.RollbackTran();
			info = $"生成 {taskName} 失败，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货架 {endLoc.S_CODE}";
			info = $"生成任务'{taskName}'失败：更新终点货位'{endLoc.S_CODE}'锁状态失败";
			LogHelper.Info(info);
			return NewSimpleResult(4, info);
			return NewSimpleResult(500, info);
			}

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

			tran.CommitTran();
			return NewSimpleResult(0,
			$"生成 {taskName} 成功，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货架 {endLoc.S_CODE}");
			info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
			LogHelper.Info(info);
			return NewSimpleResult(0, info);
			}
			}
			catch (Exception ex) {
			info = $"发生了异常：{ex.Message}";
			LogHelper.InfoEx(ex);
			return NewSimpleResult(1, info);
			return NewSimpleResult(-1, info);
			}
			}

			/// <summary>
			/// 抽检-不合格移库(PDA)
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			public static SimpleResult UnqualifiedShift(UnqualifiedShiftInfo model) {
			var taskName = TaskName.C抽检_不合格移库;
			var db = new SqlHelper<object>().GetInstance();
			var info = "";

			const string taskName = TaskName.C抽检_不合格移库;
			const string startAreaName = AreaName.C抽检区;
			const string endAreaName = AreaName.C抽检异常区;

			try {

			if (!Settings.AreaMap[AreaName.C抽检异常区].Contains(model.EndArea)) {
			info = $"终点库区{model.EndArea}不属于{AreaName.C抽检异常区}";
			if (!Settings.AreaMap[endAreaName].Contains(model.EndArea)) {
			info = $"输入的终点库区'{model.EndArea}'不属于'{endAreaName}'!";
			LogHelper.Info(info);
			return NewSimpleResult(1, info);
			}
			@@ -688,31 +902,32 @@
			.First();

			if (cgDetail == null) {

			return NewSimpleResult(2, "没有找到待回库的抽检物料");
			info = $"没有在物料明细表中，找到物料编码={model.ItemCode}、容器编码={model.CntrCode}的物料";
			LogHelper.Info(info);
			return NewSimpleResult(2, info);
			}

			var locCntrRel = db.Queryable<TN_Loc_Container>()
			.Where(c => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE)
			.First();

			//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 == cgDetail.S_CNTR_CODE) // 指定容器号
			// .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // 筛选：未上锁
			// .First();
			if (locCntrRel == null) {
			info = $"容器'{model.CntrCode}'在货位容器关系表中不存在";
			LogHelper.Info(info);
			return NewSimpleResult(3, info);
			}

			var startLoc = db.Queryable<TN_Location>()
			.Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
			.Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
			.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
			.Where(l => l.N_CURRENT_NUM == 1)
			.Where(l => Settings.AreaMap[AreaName.C抽检区].Contains(l.S_AREA_CODE)) // 起点货区符合任务要求
			.First();

			if (startLoc == null) {
			info = "没有找到合适的起点货位";
			info = $"在'{startAreaName}'中没有找到起点货位'{locCntrRel.S_LOC_CODE}'，或不满足要求：未上锁、当前容器数量=0";
			LogHelper.Info(info);
			return NewSimpleResult(0, info);
			return NewSimpleResult(2, info);
			}

			var endLoc = db.Queryable<TN_Location>()
			@@ -722,7 +937,9 @@
			.First();

			if (endLoc == null) {
			return NewSimpleResult(3, "查询：没有找到合适的终点货位");
			info = $"在终点货区'{model.EndArea}'中，没有找到合适的【终点货位】，需要满足要求：未上锁、当前容器数量=0";
			LogHelper.Info(info);
			return NewSimpleResult(3, info);
			}

			cgDetail.N_ITEM_STATE = 2;
			@@ -731,16 +948,16 @@
			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.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it =>
			new { it.N_ITEM_STATE, it.S_ITEM_STATE }).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info = "修改物料状态为合格失败";
			info = $"生成任务'{taskName}'失败：修改物料状态为'不合格'失败";
			LogHelper.Info(info);
			return NewSimpleResult(4, info);
			return NewSimpleResult(500, info);
			}

			if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
			@@ -750,9 +967,9 @@
			it.T_MODIFY
			}).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info = $"生成 {taskName} 失败，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货位 {endLoc.S_CODE}";
			info = $"生成任务'{taskName}'失败：更新起点货位'{startLoc.S_CODE}'锁状态失败";
			LogHelper.Info(info);
			return NewSimpleResult(4, info);
			return NewSimpleResult(500, info);
			}

			if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
			@@ -761,118 +978,21 @@
			it.S_LOCK_OP,
			it.T_MODIFY
			}).ExecuteCommand() <= 0) {

			tran.RollbackTran();
			info = $"生成 {taskName} 失败，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货架 {endLoc.S_CODE}";
			info = $"生成任务'{taskName}'失败：更新终点货位'{endLoc.S_CODE}'锁状态失败";
			LogHelper.Info(info);
			return NewSimpleResult(4, info);
			return NewSimpleResult(500, info);
			}

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

			tran.CommitTran();
			return NewSimpleResult(0,
			$"生成 {taskName} 成功，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货架 {endLoc.S_CODE}");
			}
			}
			catch (Exception ex) {
			info = $"发生了异常：{ex.Message}";
			LogHelper.InfoEx(ex);
			return NewSimpleResult(1, info);
			}
			}

			public static SimpleResult RestBack(RestBackInfo model) {
			var taskName = TaskName.W尾箱回库;
			var db = new SqlHelper<object>().GetInstance();
			var info = "";
			try {
			var startLoc = db.Queryable<TN_Location>()
			.Where(l => l.S_CODE == model.StartLoc)
			.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
			.Where(l => l.N_CURRENT_NUM == 1)
			.First();

			var locCntrRel = db.Queryable<TN_Loc_Container>()
			.Where(c => c.S_LOC_CODE == model.StartLoc)
			.First();

			if (locCntrRel == null) {
			info = $"没有找到起点货位{model.StartLoc}，或不具备取货要求：未上锁、有货物";
			LogHelper.Info(info);
			return NewSimpleResult(3, info);
			}

			var endLoc = new TN_Location();
			if (locCntrRel.S_CNTR_TYPE == "托盘") {
			endLoc = db.Queryable<TN_Location>()
			.Where(l => Settings.AreaMap[AreaName.M满托货架区].Contains(l.S_AREA_CODE))
			.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
			.Where(l => l.N_CURRENT_NUM == 0) // 起点绑定前没有容器
			.First();
			}
			else if (locCntrRel.S_CNTR_TYPE =="好运箱"){
			endLoc = db.Queryable<TN_Location>()
			.Where(l => Settings.AreaMap[AreaName.M满箱货架区].Contains(l.S_AREA_CODE))
			.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
			.Where(l => l.N_CURRENT_NUM == 0) // 起点绑定前没有容器
			.First();
			}
			else {
			endLoc = null;
			}

			if (endLoc == null) {
			info = "查询：没有找到合适的终点货位";
			LogHelper.Info(info);
			return NewSimpleResult(3, info);
			}
			var cntId = locCntrRel.S_CNTR_CODE;
			var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

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

			using (var tran = db.Ado.UseTran()) {
			if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
			it.N_LOCK_STATE,
			it.S_LOCK_STATE,
			it.S_LOCK_OP,
			it.T_MODIFY
			}).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info = $"生成 {taskName} 失败，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货位 {endLoc.S_CODE}";
			LogHelper.Info(info);
			return NewSimpleResult(4, info);
			}

			if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
			it.N_LOCK_STATE,
			it.S_LOCK_STATE,
			it.S_LOCK_OP,
			it.T_MODIFY
			}).ExecuteCommand() <= 0) {

			tran.RollbackTran();
			info = $"生成 {taskName} 失败，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货架 {endLoc.S_CODE}";
			LogHelper.Info(info);
			return NewSimpleResult(4, info);
			}

			if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info = $"生成 {taskName} 失败，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货架 {endLoc.S_CODE}";
			LogHelper.Info(info);
			return NewSimpleResult(4, info);
			}

			tran.CommitTran();
			info = $"生成 {taskName} 成功，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货架 {endLoc.S_CODE}";
			info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
			LogHelper.Info(info);
			return NewSimpleResult(0, info);
			}
			@@ -880,12 +1000,122 @@
			catch (Exception ex) {
			info = $"发生了异常：{ex.Message}";
			LogHelper.InfoEx(ex);
			return NewSimpleResult(1, info);
			return NewSimpleResult(-1, info);
			}
			}

			/// <summary>
			/// 成品胶出库(WMS)
			/// 余料回库/尾箱回库(PDA)
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			public static SimpleResult RestBack(RestBackInfo model) {
			var db = new SqlHelper<object>().GetInstance();
			var info = "";

			const string taskName = TaskName.W尾箱回库;
			var endAreaName = "";

			try {
			var startLoc = db.Queryable<TN_Location>()
			.Where(l => l.S_CODE == model.StartLoc)
			.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) {
			info = $"没有找到起点货位{model.StartLoc}，或不具备取货要求：未上锁、有货物";
			LogHelper.Info(info);
			return NewSimpleResult(2, info);
			}

			var locCntrRel = db.Queryable<TN_Loc_Container>()
			.Where(c => c.S_LOC_CODE == model.StartLoc)
			.First();

			if (locCntrRel == null) {
			info = $"没有找到起点货位{model.StartLoc}所绑定的容器";
			LogHelper.Info(info);
			return NewSimpleResult(3, info);
			}

			TN_Location endLoc = null;
			if (locCntrRel.S_CNTR_TYPE == "托盘") {
			endAreaName = AreaName.M满托货架区;
			endLoc = db.Queryable<TN_Location>()
			.Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
			.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
			.Where(l => l.N_CURRENT_NUM == 0)
			.First();
			}
			else if (locCntrRel.S_CNTR_TYPE == "好运箱"){
			endAreaName = AreaName.M满箱货架区;
			endLoc = db.Queryable<TN_Location>()
			.Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
			.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
			.Where(l => l.N_CURRENT_NUM == 0)
			.First();
			}

			if (endLoc == null) {
			info = "查询：没有找到合适的终点货位";
			LogHelper.Info(info);
			return NewSimpleResult(3, info);
			}

			var cntId = locCntrRel.S_CNTR_CODE;

			LocationHelper.LockStartLoc(ref startLoc); // 起点出库锁
			LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁
			var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

			using (var tran = db.Ado.UseTran()) {
			if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
			it.N_LOCK_STATE,
			it.S_LOCK_STATE,
			it.S_LOCK_OP,
			it.T_MODIFY
			}).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
			LogHelper.Info(info);
			return NewSimpleResult(500, info);
			}

			if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
			it.N_LOCK_STATE,
			it.S_LOCK_STATE,
			it.S_LOCK_OP,
			it.T_MODIFY
			}).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info = $"生成任务'{taskName}'失败：更新终点货位'{endLoc.S_CODE}'锁状态失败";
			LogHelper.Info(info);
			return NewSimpleResult(500, info);
			}

			if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info = $"生成任务'{taskName}'失败，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
			LogHelper.Info(info);
			return NewSimpleResult(500, info);
			}

			tran.CommitTran();
			info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
			LogHelper.Info(info);
			return NewSimpleResult(0, info);
			}
			}
			catch (Exception ex) {
			info = $"发生了异常：{ex.Message}";
			LogHelper.InfoEx(ex);
			return NewSimpleResult(-1, info);
			}
			}

			/// <summary>
			/// 成品胶出库(PDA) 待定，暂时不需要此功能
			/// </summary>
			/// <remarks>
			/// WMS提供出库的物料类型与数量，调用接口由WCS生成具体的出库任务，然后WCS后台轮询处理
			@@ -894,16 +1124,14 @@
			/// <returns></returns>
			public static SimpleResult FinishedOutbound(FinishedOutboundInfo model) {
			var db = new SqlHelper<object>().GetInstance();
			var orderNo = GenerateOrderNo("出库单号", "ON");
			var info = "";
			try {
			if (string.IsNullOrEmpty(orderNo)) {
			info = "出库单号不能为空";
			LogHelper.Info(info);
			return NewSimpleResult(2, info);
			}

			var cgDetailList = SelectCgByTotalQty(model);
			const string taskName = TaskName.C成品胶出库;

			try {
			var orderNo = GenerateOrderNo("出库单号", "CKD");

			var cgDetailList = SelectCgByTotalQty(model.Qty, model.ItemCode, model.BatchNo, model.CntrType, model.ForcedOut);

			if (cgDetailList.Count == 0) {
			info = "没有合适的物料可以出库";
			@@ -916,7 +1144,6 @@
			S_ITEM_CODE = model.ItemCode,
			S_BATCH = model.BatchNo,
			N_END_NUM = model.Qty,
			//F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
			S_END_AREA = model.EndArea
			};

			@@ -951,7 +1178,9 @@
			tran.CommitTran();
			}

			return NewSimpleResult(0, "生成出库单成功");
			info = "生成出库单成功";
			LogHelper.Info(info);
			return NewSimpleResult(0, info);
			}
			catch (Exception ex) {
			info = $"发生了异常：{ex.Message}";
			@@ -966,54 +1195,63 @@
			/// <returns></returns>
			public static SimpleResult FinishedOutboundForce(FinishedOutboundInfo model) {
			var db = new SqlHelper<object>().GetInstance();
			var orderNo = GenerateOrderNo("出库单号", "ON");
			var info = "";

			const string taskName = TaskName.C成品胶出库;

			try {
			if (string.IsNullOrEmpty(orderNo)) {
			return NewSimpleResult(2, "出库单号不能为空");
			var orderNo = GenerateOrderNo("出库单号", "CKD");

			var cgDetailList = SelectCgByTotalQty(model.Qty, model.ItemCode, model.BatchNo, model.CntrType, model.ForcedOut);

			if (cgDetailList.Count == 0) {
			info = "没有合适的物料可以出库";
			LogHelper.Info(info);
			return NewSimpleResult(3, info);
			}

			var order = new TN_Outbound_Order {
			S_NO = orderNo,
			S_ITEM_CODE = model.ItemCode,
			S_BATCH = model.BatchNo,
			N_END_NUM = model.Qty,
			S_END_AREA = model.EndArea
			};

			var detailList = new List<TN_Outbound_Detail>();
			foreach (var cgDetail in cgDetailList) {
			var detail = new TN_Outbound_Detail {
			S_OO_NO = orderNo,
			S_ITEM_CODE = cgDetail.S_ITEM_CODE,
			S_BATCH_NO = cgDetail.S_BATCH_NO,
			S_CNTR_CODE = cgDetail.S_CNTR_CODE,
			N_COUNT = cgDetail.N_ITEM_NUM,
			S_END_AREA = model.EndArea
			};
			detailList.Add(detail);
			}

			using (var tran = db.Ado.UseTran()) {

			var cgDetailList = SelectCgByTotalQty(model);

			if (cgDetailList.Count == 0) {
			return NewSimpleResult(3, "没有合适的物料可以出库");
			}

			foreach (var cgDetail in cgDetailList) {
			var detail = new TN_Outbound_Detail {
			S_OO_NO = orderNo,
			S_ITEM_CODE = cgDetail.S_ITEM_CODE,
			S_BATCH_NO = cgDetail.S_BATCH_NO,
			S_CNTR_CODE = cgDetail.S_CNTR_CODE,
			S_END_AREA = model.EndArea
			};

			if (db.Insertable<TN_Outbound_Detail>(detail).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			return NewSimpleResult(4, "生成出库单明细失败：" + JsonConvert.SerializeObject(detail));
			}
			}

			var order = new TN_Outbound_Order {
			S_NO = orderNo,
			S_ITEM_CODE = model.ItemCode,
			S_BATCH = model.BatchNo,
			N_END_NUM = model.Qty,
			//F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
			S_END_AREA = model.EndArea
			};

			if (db.Insertable<TN_Outbound_Order>(order).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			return NewSimpleResult(5, "生成出库单失败：" + JsonConvert.SerializeObject(order));
			info = "生成出库单失败：" + JsonConvert.SerializeObject(order);
			LogHelper.Info(info);
			return NewSimpleResult(2, info);
			}

			if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info = "生成出库单明细失败";
			LogHelper.Info(info);
			return NewSimpleResult(4, info);
			}

			tran.CommitTran();
			}

			return NewSimpleResult(0, "生成出库单成功");
			info = "生成出库单成功";
			LogHelper.Info(info);
			return NewSimpleResult(0, info);
			}
			catch (Exception ex) {
			info = $"发生了异常：{ex.Message}";
			@@ -1022,14 +1260,14 @@
			}
			}

			public static List<TN_CG_Detail> SelectCgByTotalQty(FinishedOutboundInfo model) {
			public static List<TN_CG_Detail> SelectCgByTotalQty(int qty, string itemCode, string batchNo, string cntrType = "", bool forcedOut = true) {
			var db = new SqlHelper<object>().GetInstance();
			var result = new List<TN_CG_Detail>();
			var targetNum = model.Qty;
			var targetNum = qty;
			var info = "";
			try {
			var targetCg = db.Queryable<TN_CG_Detail>()
			.Where(a => a.S_ITEM_CODE == model.ItemCode && a.S_BATCH_NO == model.BatchNo)
			.Where(a => a.S_ITEM_CODE == itemCode && a.S_BATCH_NO == batchNo)
			.Where(a => a.N_ITEM_NUM > targetNum)
			.OrderBy(a => a.N_ITEM_NUM, OrderByType.Asc).First();
			if (targetCg != null) //刚好有一行满足条件
			@@ -1042,10 +1280,18 @@

			var sortedMaterials = new List<TN_CG_Detail>();

			if (model.ForcedOut) {
			var cntrTypeList = new List<string>();
			if (cntrType == "") {
			cntrTypeList = new List<string> { "托盘", "好运箱" }; // 不指定托盘类型，二者均可
			}
			else {
			cntrTypeList.Add(cntrType);
			}

			if (forcedOut) {
			sortedMaterials = db.Queryable<TN_CG_Detail, TN_Loc_Container>((d, c) => d.S_CNTR_CODE == c.S_CNTR_CODE)
			.Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo && d.N_ITEM_NUM > 0)
			.Where((d, c) => c.S_CNTR_TYPE == model.CntrType)
			.Where(d => d.S_ITEM_CODE == itemCode && d.S_BATCH_NO == batchNo && d.N_ITEM_NUM > 0)
			.Where((d, c) => cntrTypeList.Contains(c.S_CNTR_TYPE))
			.Where(d => d.N_ITEM_STATE == 0 && d.S_ITEM_STATE == "合格"
			\|\| d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "待检")
			.OrderBy(d => d.N_ITEM_NUM, OrderByType.Desc)
			@@ -1053,13 +1299,12 @@
			}
			else {
			sortedMaterials = db.Queryable<TN_CG_Detail, TN_Loc_Container>((d, c) => d.S_CNTR_CODE == c.S_CNTR_CODE)
			.Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo && d.N_ITEM_NUM > 0)
			.Where((d, c) => c.S_CNTR_TYPE == model.CntrType)
			.Where(d => d.S_ITEM_CODE == itemCode && d.S_BATCH_NO == batchNo && d.N_ITEM_NUM > 0)
			.Where((d, c) => cntrTypeList.Contains(c.S_CNTR_TYPE))
			.Where(d => d.N_ITEM_STATE == 0 && d.S_ITEM_STATE == "合格")
			.OrderBy(d => d.N_ITEM_NUM, OrderByType.Desc)
			.OrderBy(d => d.N_ITEM_STATE, OrderByType.Asc).ToList();
			}


			if (sortedMaterials.Count == 0) //没有满足条件的
			{
			@@ -1096,45 +1341,82 @@
			}

			/// <summary>
			/// 博实物料信息下发同步
			/// 博实物料信息下发同步（只针对好运箱）
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			public static MesResult CgInfoSync(CgInfoSyncInfo model) {
			var db = new SqlHelper<object>().GetInstance();
			var random = new Random();
			var info = "";

			try {
			if (string.IsNullOrEmpty(model.ItemCode)) {
			info = $"博实下发物料信息：参数不合法：物料编码（itemCode）不能为空";
			LogHelper.Info(info);
			return NewMesResult(400, info);
			}
			if (string.IsNullOrEmpty(model.CntrCode)) {
			info = $"博实下发物料信息：参数不合法：容器编码（CntrCode）不能为空";
			LogHelper.Info(info);
			return NewMesResult(400, info);
			}
			if (string.IsNullOrEmpty(model.BatchNo)) {
			info = $"博实下发物料信息：参数不合法：批次号（BatchNo）不能为空";
			LogHelper.Info(info);
			return NewMesResult(400, info);
			}
			if (model.ItemNum <= 0) {
			info = $"博实下发物料信息：参数不合法：货品数量（ItemNum）应该大于 0";
			LogHelper.Info(info);
			return NewMesResult(400, info);
			}

			// TEMP 目前流程：对博实下发的信息也进行检查，未找到就报错，后面有需求再更改
			var cntr = db.Queryable<TN_Container>()
			.Where(c => c.S_CODE == model.CntrCode) // 对于前台程序而言，S_CODE就是主键，维护时必定唯一
			.First();

			if (cntr == null) {
			info = $"容器'{model.CntrCode}'在容器表中不存在，请在前台页面中维护！";
			LogHelper.Info(info);
			return NewMesResult(1, info);
			}
			if (cntr.S_TYPE != "好运箱") {
			info = $"容器'{model.CntrCode}'在容器表中的类型为'{cntr.S_TYPE}'，与当前容器类型'好运箱'不同！";
			LogHelper.Info(info);
			return NewMesResult(2, info);
			}

			// 将下发的信息先存储到CG表中（此时托盘没有与产线处的货位绑定）
			var detail = new TN_CG_Detail {
			S_ITEM_CODE = model.ItemCode,
			S_ITEM_NAME = model.ItemName,
			S_CNTR_CODE = GenerateOrderNo("容器号", "CN"), // NOTE 容器号：目前随机（后期可能会指定，或者PDA绑定时再填入）
			S_BATCH_NO = model.BatchNo,
			S_ITEM_CODE = model.ItemCode, // NOT NULL
			S_ITEM_NAME = model.ItemName,
			S_CNTR_CODE = model.CntrCode, // NOT NULL 料箱编号（待定，现在暂时设定为博实下发）
			S_BATCH_NO = model.BatchNo, // NOT NULL
			S_STANDARD = model.Standard,
			S_NET_WEIGHT = model.NetWeight,
			S_QUALITY_GRADE = model.QualityGrade,
			//N_PRODUCT_LINE = random.Next(0, 3), // NOTE 产线号：目前随机（后期可能会指定，或者PDA绑定时再填入）
			};

			//var locCntrRel = new TN_Loc_Container {
			// //S_LOC_CODE = Settings.Config.ProductionLines[detail.N_PRODUCT_LINE].OffLoc[0], // 好运箱的位置是操作区，不是产线
			// S_CNTR_CODE = detail.S_CNTR_CODE,
			// S_CNTR_TYPE = "好运箱", // 贴标机只针对好运箱
			//};
			// 产线号的逻辑待定，现在设定为博实下发产线号，看后续需求变更
			// 好运箱起点为产线货位，人工将好运箱从产线上取下，搬运到满好运箱操作区
			//var startLocCode = "";
			//if (model.ProdLineId.Trim() == "3") {
			// startLocCode = "";
			//}

			//if (model.ProdLineId.Trim() != "3" \|\| model.ProdLineId.Trim() != "4") {
			// info = $"不合法的产线号{model.ProdLineId}：好运箱产线号必须为 3 或 4";
			// LogHelper.Info(info);
			// return NewMesResult(2, info);
			//}

			using (var tran = db.Ado.UseTran()) {
			if (db.Insertable<TN_CG_Detail>(detail).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info = "插入物料信息失败：" + JsonConvert.SerializeObject(detail);
			return NewMesResult(2, info);
			return NewMesResult(500, info);
			}

			//if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
			// tran.RollbackTran();
			// info = "插入物料信息失败：" + JsonConvert.SerializeObject(detail);
			// return NewWmsResult(2, info);
			//}

			tran.CommitTran();
			}
			@@ -1145,30 +1427,82 @@
			catch (Exception ex) {
			info = $"发生了异常：{ex.Message}";
			LogHelper.InfoEx(ex);
			return NewMesResult(1, info);
			return NewMesResult(-1, info);
			}
			}

			public static ErpResult ErpSendOutboundOrder(ErpSendOutboundOrderInfo model) {
			public static ErpResult ErpSendOutboundPlan(ErpSendOutboundPlanInfo model) {
			var db = new SqlHelper<object>().GetInstance();
			var orderNo = GenerateOrderNo("出库单号", "ON");
			var orderNo = GenerateOrderNo("出库单号", "CKD");
			var info = "";
			try {
			if (string.IsNullOrEmpty(orderNo)) {
			info = "出库单号不能为空";
			// 参数合法性确认部分：错误编码：400
			if (model.pzsl <= 0) {
			info = $"物料数量(pzsl){model.pzsl}不合法：物料数量应该大于 0";
			LogHelper.Info(info);
			return NewErpResult(2, info);
			return NewErpResult(400, info);
			}

			var cgDetailList = SelectCgByTotalQty(new FinishedOutboundInfo {
			BatchNo = model.BatchNo,
			CntrType= model.CntrType,
			ItemCode= model.ItemCode,
			EndArea= model.EndArea,
			ForcedOut= model.ForcedOut,
			Qty= model.Qty,
			Spe = model.Spe
			});
			var outboundPlan = new TN_Outbound_Plan {
			JHDH = model.jhdh, // 计划单号（唯一标识）
			CKZT = model.ckzt, // 出库状态
			JHLB = model.jhlb, // 计划类别
			CKDH = model.ckdh, // 参考单号
			CPH = model.cph, // 车牌号
			YSFS = model.ysfs, // 运输方式
			CPZT = model.cpzt, // 产品状态
			MDDW = model.mddw, // 买断单位
			CPDM = model.cpdm, // 产品代码
			CPLB = model.cplb, // 产品类别
			CPLBMX = model.cplbmx, // 产品类别明细
			PP = model.pp, // 品牌
			DJ = model.dj, // 等级
			GH = model.gh, // 罐号
			PH = model.ph, // 批号
			BZLX = model.bzlx, // 包装类型
			PZDH = model.pzdh, // 派装单号
			PZD_DW = model.pzd_dw, // 派装单单位
			PZD_DYBH = model.pzd_dybh, // 派装单调运编号
			PZJS = model.pzjs, // 派装件数
			PZSL = model.pzsl, // 派装数量
			PZ_RQ = model.pz_rq, // 派装日期(yyyy-mm-dd)
			PZ_CZRQ = model.pz_czrq, // 派装操作日期
			PZ_ZFBJ = model.pz_zfbj, // 派装作废标记
			PZ_ZFRQ = model.pz_zfrq, // 派装作废日期
			PZ_BZ = model.pz_bz, // 派装备注
			CKDBH = model.ckdbh, // 出库单编号
			SFJS = model.sfjs, // 实发件数
			SFSL = model.sfsl, // 实发数量
			SFCS = model.sfcs, // 实发车数
			ZCSJ = model.zcsj, // 装车时间
			JLDW = model.jldw, // 计量单位
			FHRQ = model.fhrq, // 发货日期
			CKDM = model.ckdm, // 仓库代码
			FHR = model.fhr, // 发货人
			CZYDM = model.czydm, // 操作员
			SHR_USERNAME = model.shr_username, // 审核人
			SHRQ = model.shrq, // 审核日期
			ZFBJ = model.zfbj, // 作废标记
			ZFRQ = model.zfrq, // 作废日期
			JSDW = model.jsdw, // 结算单位
			SHDW = model.shdw, // 收货单位
			YSDW = model.ysdw, // 运输单位
			LXR = model.lxr, // 联系人
			RY_ZXG = model.ry_zxg, // 装卸工
			RY_CCSJ = model.ry_ccsj, // 叉车司机
			ERPHX_JHDH = model.erphx_jhdh, // erp交货单号
			ERPHX_WLBM = model.erphx_wlbm, // erp物料编码
			ERPHX_WLMC = model.erphx_wlmc, // erp物料名称
			ERPHX_CJRQ = model.erphx_cjrq, // erp创建日期
			HW = model.hw, // 货位
			HWZT = model.hwzt // 货位状态
			};

			var cgDetailList = SelectCgByTotalQty(
			qty: (int)model.pzsl,
			itemCode: model.cpdm,
			batchNo: model.ph
			);

			if (cgDetailList.Count == 0) {
			info = "没有合适的物料可以出库";
			@@ -1178,12 +1512,12 @@

			var order = new TN_Outbound_Order {
			S_NO = orderNo,
			S_ITEM_CODE = model.ItemCode,
			S_BATCH = model.BatchNo,
			N_END_NUM = model.Qty,
			S_ITEM_CODE = model.cpdm,
			S_BATCH = model.ph,
			N_END_NUM = (int)model.pzsl,
			//F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
			S_END_AREA = model.EndArea,
			S_BS_NO = model.ErpNo,
			S_END_AREA = model.ysfs == "汽车" ? "QCCKQ" : "HCCKQ", // 暂时用运输方式（火车/汽车）来区分终点货区
			S_BS_NO = model.jhdh,
			S_BS_TYPE = "ERP",
			};

			@@ -1195,7 +1529,9 @@
			S_BATCH_NO = cgDetail.S_BATCH_NO,
			S_CNTR_CODE = cgDetail.S_CNTR_CODE,
			N_COUNT = cgDetail.N_ITEM_NUM,
			S_END_AREA = model.EndArea
			S_END_AREA = order.S_END_AREA, // order为detail的每一个货位设置终点值
			S_BS_NO = order.S_BS_NO,
			S_BS_TYPE= order.S_BS_TYPE,
			};
			detailList.Add(detail);
			}
			@@ -1205,20 +1541,29 @@
			tran.RollbackTran();
			info = "生成出库单失败：" + JsonConvert.SerializeObject(order);
			LogHelper.Info(info);
			return NewErpResult(2, info);
			return NewErpResult(500, info);
			}

			if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info = "生成出库单明细失败";
			LogHelper.Info(info);
			return NewErpResult(4, info);
			return NewErpResult(500, info);
			}

			if (db.Insertable<TN_Outbound_Plan>(outboundPlan).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			info = "生成出库单计划记录表失败";
			LogHelper.Info(info);
			return NewErpResult(500, info);
			}

			tran.CommitTran();
			}

			return NewErpResult(0, "生成出库单成功");
			info = $"生成出库单成功";
			LogHelper.Info(info);
			return NewErpResult(0, info);
			}
			catch (Exception ex) {
			info = $"发生了异常：{ex.Message}";