WMSPrjInstance/HH-0121_DuShanZiShiHua.git

			@@ -166,64 +166,6 @@
			//typeof(TN_Container_Item),
			};

			//var areaNameList = new List<string>();
			//foreach (var area in Settings.Areas) {
			// areaNameList.AddRange(area.Codes);
			//}

			//var locationList = new List<TN_Location>();
			//foreach (var area in areaNameList) {
			// int i = 0;
			// int j = 0;
			// int k = 0;

			// if (area == "KXHJQ" \|\| area == "MTHJQ" \|\| area == "MXHJQ") {
			// for (i = 1; i <= 4; i++) {
			// for (j = 1; j <= 5; j++) {
			// for (k = 1; k <= 3; k++) {
			// locationList.Add(new TN_Location() {
			// N_ROW = i,
			// N_COL = j,
			// N_LAYER = k,
			// S_AREA_CODE = area,
			// S_CODE = $"{area}-{i.ToString().PadLeft(2, '0')}-{j.ToString().PadLeft(2, '0')}" +
			// $"-{k.ToString().PadLeft(2, '0')}"
			// });
			// }
			// }
			// }
			// continue;
			// }

			// if (area == "BZQ") {
			// for (i = 1; i <= 2; i++) {
			// for (j = 1; j <= 2; j++) {
			// locationList.Add(new TN_Location() {
			// N_ROW = i,
			// N_COL = j,
			// S_AREA_CODE = area,
			// S_CODE = $"{area}-{i.ToString().PadLeft(2, '0')}-{j.ToString().PadLeft(2, '0')}"
			// });
			// }
			// }
			// continue;
			// }

			// i = 1;
			// for (j = 1; j <= 5; j++) {
			// locationList.Add(new TN_Location() {
			// N_ROW = i,
			// N_COL = j,
			// S_AREA_CODE = area,
			// S_CODE = $"{area}-{i.ToString().PadLeft(2, '0')}-{j.ToString().PadLeft(2, '0')}"
			// });
			// }


			//}



			//using (var tran = db.Ado.UseTran()) {
			// //db.CodeFirst.InitTables(entityTypes);
			// if (db.Insertable<TN_Location>(locationList).ExecuteCommand() <= 0) {
			@@ -245,89 +187,6 @@
			}

			/// <summary>
			/// DEBUG：插入货位、容器、货品信息
			/// </summary>
			/// <returns></returns>
			[HttpPost]
			[Route("InsertLocCntrCg")]
			public string InsertLocCntrCg(LocCntrCg locCntrCg) {
			var db = new SqlHelper<object>().GetInstance();

			try {

			using (var tran = db.UseTran()) {
			LogHelper.Info("LogCntrCg：" + JsonConvert.SerializeObject(locCntrCg));
			if (string.IsNullOrEmpty(locCntrCg.LocCode)) return "";

			var loc = db.Queryable<TN_Location>().First(a => a.S_CODE == locCntrCg.LocCode);
			if (loc == null) {
			var newLoc = new TN_Location {
			S_CODE = locCntrCg.LocCode,
			S_AREA_CODE = locCntrCg.LocArea ?? ""
			};

			if (db.Insertable<TN_Location>(newLoc).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			LogHelper.Info($"插入位置{locCntrCg.LocCode}失败");
			return "插入失败";
			}

			loc = newLoc;
			}

			if (string.IsNullOrEmpty(locCntrCg.CntrCode)) {
			LogHelper.Info("容器号为空，不再读取后面的数据");
			return "";
			}

			var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == locCntrCg.LocCode
			&& a.S_CNTR_CODE == locCntrCg.CntrCode);

			if (locCntrRel == null) {
			var newLocCntrRel = new TN_Loc_Container {
			S_LOC_CODE = locCntrCg.LocCode,
			S_CNTR_CODE = locCntrCg.CntrCode,
			S_CNTR_TYPE = locCntrCg.CntrType ?? ""
			};

			loc.N_CURRENT_NUM = 1;

			if (db.Insertable<TN_Loc_Container>(newLocCntrRel).ExecuteCommand() <= 0
			&& db.Updateable<TN_Location>(loc).UpdateColumns(c => c.N_CURRENT_NUM).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			LogHelper.Info($"插入位置托盘关系{locCntrCg.LocCode}-{locCntrCg.CntrCode}失败");
			return "插入失败";
			}
			}

			if (string.IsNullOrEmpty(locCntrCg.ItemCode)) {
			LogHelper.Info("物料号为空，不再读取后面的数据");
			return "";
			}

			var cgDetail = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == locCntrCg.CntrCode
			&& a.S_ITEM_CODE == locCntrCg.ItemCode);
			if (cgDetail == null) {
			var locList = new List<TN_CG_Detail>();
			locList.Add(new TN_CG_Detail { S_CNTR_CODE = locCntrCg.CntrCode, S_ITEM_CODE = locCntrCg.ItemCode, S_BATCH_NO = locCntrCg.BatchNo ?? "" });
			if (db.Insertable<TN_CG_Detail>(locList).ExecuteCommand() <= 0) {
			tran.RollbackTran();
			LogHelper.Info($"插入托盘物料关系{locCntrCg.CntrCode}-{locCntrCg}失败");
			return "插入失败";
			}
			}
			tran.CommitTran();
			}

			return "插入数据成功";

			}
			catch (Exception ex) {
			return $"Error reading CSV file: {ex.Message}";
			}
			}

			/// <summary>
			/// DEBUG：模拟输送线产线满托盘下线流程
			/// </summary>
			/// <param name="model"></param>
			@@ -338,11 +197,11 @@
			var db = new SqlHelper<object>().GetInstance();
			var info = "";

			var taskName = TaskName.T托盘_满托下线入库;
			var startAreaName = AreaName.B包装区;
			const string taskName = TaskName.T托盘_满托下线入库;
			const string startAreaName = AreaName.B包装区;
			const string endAreaName = AreaName.M满托货架区;

			try {

			var itemCode = model.ItemCode;
			var batchNo = model.BatchNo;
			var cntrCode = model.CntrCode;
			@@ -384,14 +243,14 @@
			}

			var startLoc = db.Queryable<TN_Location>()
			.Where(l => l.S_CODE == startLocCode) // 指定：起点货位号
			.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 == startLocCode)
			.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 = $"起点位置 '{startLocCode}' 不存在或不具备取货要求";
			info = $"在'{startAreaName}'中没有找到起点货位'{startLocCode}'，或不满足要求：未上锁、当前容器数量=0";
			LogHelper.Info(info);
			return info;
			}
			@@ -404,14 +263,14 @@
			};

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

			if (endLoc == null) {
			info = "空托入库暂时没有合适的货位可以入库";
			info = $"在终点货区'{endAreaName}'中，没有找到合适的【终点货位】，需要满足要求：未上锁、当前容器数量=0";
			LogHelper.Info(info);
			return info;
			}