WMSPrjInstance/HH-0126_HeNanPingGao.git

			@@ -1895,11 +1895,16 @@
			}
			else if (!string.IsNullOrEmpty(model.item_code))
			{
			var starts = db.Queryable<CntrItemRel>().Where(cir => cir.S_CNTR_TYPE == "半托" && cir.S_ITEM_CODE == model.item_code).OrderBy(cir => cir.T_CREATE).ToList().FirstOrDefault();
			if (starts!=null)
			var khsta= db.Queryable<CGRels>().Where(cir => cir.S_CNTR_TYPE == "半托" && cir.S_ITEM_CODE == model.item_code).OrderBy(cir => cir.T_CREATE).ToList().FirstOrDefault();





			if (khsta != null)
			{
			LogHelper.Info($"starts{starts}");
			var starts12 = db.Queryable<LocCntrRel>().Where(lcr => lcr.S_CNTR_CODE == starts.S_CNTR_CODE).ToList().FirstOrDefault();
			LogHelper.Info($"starts{khsta}");
			var starts12 = db.Queryable<LocCntrRel>().Where(lcr => lcr.S_CNTR_CODE == khsta.S_CNTR_CODE).ToList().FirstOrDefault();
			LogHelper.Info($"starts1{starts12}");
			start = db.Queryable<Location>().Where(loc => loc.S_AREA_CODE == "HJQ" && loc.S_CODE == starts12.S_LOC_CODE).ToList().FirstOrDefault();
			LogHelper.Info($"starts2{start}");
			@@ -1908,17 +1913,27 @@
			}
			else
			{
			var list = db.Queryable<CntrItemRel>().Select(s => s.S_CNTR_CODE).ToArray();
			var S_LOC_CODElist = db.Queryable<LocCntrRel>().Where(s => !list.Contains(s.S_CNTR_CODE)).Select(s => s.S_LOC_CODE).ToArray();
			start = db.Queryable<Location>().Where(it => S_LOC_CODElist.Contains(it.S_CODE)).ToList().FirstOrDefault();
			var starts = db.Queryable<CntrItemRel>().Where(cir => cir.S_CNTR_TYPE == "半托" && cir.S_ITEM_CODE == model.item_code).OrderBy(cir => cir.T_CREATE).ToList().FirstOrDefault();

			if (starts!=null)
			{
			LogHelper.Info($"{model.cntr_code}容器货品存在该物料，请配置物料容器");
			result.resultMsg = $"容器货品存在该物料，请配置物料容器";
			result.resultCode = 1;
			return result;

			}
			else
			{
			var list = db.Queryable<CntrItemRel>().Select(s => s.S_CNTR_CODE).ToArray();
			var S_LOC_CODElist = db.Queryable<LocCntrRel>().Where(s => !list.Contains(s.S_CNTR_CODE)).Select(s => s.S_LOC_CODE).ToArray();
			start = db.Queryable<Location>().Where(it => S_LOC_CODElist.Contains(it.S_CODE)).ToList().FirstOrDefault();
			var starts12 = db.Queryable<LocCntrRel>().Where(lcr => lcr.S_CNTR_CODE == start.S_CODE).ToList().FirstOrDefault();




			var starts12 = db.Queryable<LocCntrRel>().Where(lcr => lcr.S_CNTR_CODE == start.S_CODE).ToList().FirstOrDefault();


			model.cntr_code = starts12?.S_CNTR_CODE;
			model.cntr_code = starts12?.S_CNTR_CODE;
			}

			}

			}
			@@ -3143,6 +3158,23 @@
			#endregion
			if (cntr != null)
			{
			#region 客户指定容器表
			var cir2 = db.Queryable<CGRels>().Where(a => a.S_CNTR_CODE == cntr.S_CODE && a.S_ITEM_CODE == item.item_code && a.N_BS_ROW_NO == item.N_ROW_NO ).First();

			if (cir2 != null)
			{
			cir2.S_CNTR_TYPE = S_CNTR_TYPE;
			db.Updateable(cir2).UpdateColumns(it => new { it.S_CNTR_TYPE }).ExecuteCommand();
			}
			else
			{
			//2.插入新的容器物料信息（容器号不变S_SERIAL_NO = item.S_SERIAL_NO,）
			cir2 = new CGRels { S_CNTR_TYPE = S_CNTR_TYPE, S_CNTR_CODE = cntr.S_CODE.Trim(), N_BS_ROW_NO = item.N_ROW_NO, S_ITEM_CODE = item.item_code };
			db.Insertable<CGRels>(cir2).ExecuteCommand();
			}
			#endregion


			#region 1.查看是否有相同物料批次的信息，如果有要累加，不同批次的可以分开
			var cir = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == cntr.S_CODE && a.S_ITEM_CODE == item.item_code && a.S_BATCH_NO == item.S_BATCH_NO && a.N_BS_ROW_NO == item.N_ROW_NO && a.S_BS_NO == item.arrival_no).First();
			if (cir != null)
			@@ -3252,7 +3284,7 @@
			S_DO_NO = itemscddll.LLDH,
			S_AREA_CODE = "HJQ",
			N_ROW_NO = "",
			S_ITEM_CODE = a.WLBM,
			S_ITEM_CODE = a.ZJBM,
			S_ITEM_NAME = "",
			F_QTY = a.XQSL,
			S_ZJBM = a.ZJBM,
			@@ -3354,7 +3386,7 @@
			db.BeginTran();
			foreach (var itemscddll in model.ROOT.SCDDLL)
			{
			var wlbmList = itemscddll.ITEM.Select(x => x.WLBM).Distinct().ToList();
			var wlbmList = itemscddll.ITEM.Select(x => x.ZJBM).Distinct().ToList();
			var itemlist = db.Queryable<TN_Material>()
			.Where(it => wlbmList.Contains(it.S_ITEM_CODE)) // 使用 IN 查询
			.ToList();
			@@ -3377,13 +3409,13 @@
			{
			foreach (var a in itemscddll.ITEM)
			{
			var item = itemlist.Where(it => it.S_ITEM_CODE == a.WLBM).FirstOrDefault();
			var item = itemlist.Where(it => it.S_ITEM_CODE == a.ZJBM).FirstOrDefault();
			if (item == null)
			{
			lLDReturnRoots.GC = itemscddll.GC;
			lLDReturnRoots.LLDH = itemscddll.LLDH;
			lLDReturnRoots.MSGCODE = 1;
			lLDReturnRoots.MSGDESP = $"物料{a.WLBM}物料主数据不存在该物料";
			lLDReturnRoots.MSGDESP = $"物料{a.ZJBM}物料主数据不存在该物料";
			iTEMs.Add(lLDReturnRoots);

			continue;
			@@ -3393,7 +3425,7 @@
			S_DO_NO = itemscddll.LLDH,
			S_AREA_CODE = "HJQ",
			N_ROW_NO = "",
			S_ITEM_CODE = a.WLBM,
			S_ITEM_CODE = a.ZJBM,
			S_ITEM_NAME = item?.S_ITEM_NAME,
			F_QTY = a.XQSL,
			S_ZJBM = a.ZJBM,
			@@ -3468,21 +3500,21 @@
			lLDReturnRoots.GC = itemscddll.GC;
			lLDReturnRoots.LLDH = itemscddll.LLDH;
			lLDReturnRoots.MSGCODE = 1;
			lLDReturnRoots.MSGDESP = $"执行中领料单，物料{a.WLBM}物料不允许删除";
			lLDReturnRoots.MSGDESP = $"执行中领料单，物料{a.ZJBM}物料不允许删除";
			iTEMs.Add(lLDReturnRoots);
			continue;
			}
			var po1 = po.Details.Where(s => a.WLBM == s.S_ITEM_CODE).ToList();
			var po1 = po.Details.Where(s => a.ZJBM == s.S_ITEM_CODE).ToList();
			if (po1.Count() == 0) //无则新增物料明细
			{
			var item = itemlist.Where(it => it.S_ITEM_CODE == a.WLBM).FirstOrDefault();
			var item = itemlist.Where(it => it.S_ITEM_CODE == a.ZJBM).FirstOrDefault();
			if (item == null)
			{
			;
			lLDReturnRoots.GC = itemscddll.GC;
			lLDReturnRoots.LLDH = itemscddll.LLDH;
			lLDReturnRoots.MSGCODE = 1;
			lLDReturnRoots.MSGDESP = $"物料{a.WLBM}物料主数据不存在该物料";
			lLDReturnRoots.MSGDESP = $"物料{a.ZJBM}物料主数据不存在该物料";
			iTEMs.Add(lLDReturnRoots);
			continue;
			}
			@@ -3491,7 +3523,7 @@
			S_DO_NO = itemscddll.LLDH,
			S_AREA_CODE = "HJQ",
			N_ROW_NO = "",
			S_ITEM_CODE = a.WLBM,
			S_ITEM_CODE = a.ZJBM,
			S_ITEM_NAME = item.S_ITEM_NAME,
			F_QTY = a.XQSL,
			S_ZJBM = a.ZJBM,
			@@ -3524,7 +3556,7 @@
			lLDReturnRoots.GC = itemscddll.GC;
			lLDReturnRoots.LLDH = itemscddll.LLDH;
			lLDReturnRoots.MSGCODE = 1;
			lLDReturnRoots.MSGDESP = $"更新失败，更新数量必须大于当前物料数量{a.WLBM}";
			lLDReturnRoots.MSGDESP = $"更新失败，更新数量必须大于当前物料数量{a.ZJBM}";
			iTEMs.Add(lLDReturnRoots);
			continue;
			}
			@@ -3538,40 +3570,40 @@
			{
			if (a.LLDSCBS == "Y")//如果是删除标识则删除当前所属出库单明细不是删除标记则进行增改判断
			{
			var po1 = po.Details.Where(s => a.WLBM == s.S_ITEM_CODE).FirstOrDefault();
			var po1 = po.Details.Where(s => a.ZJBM == s.S_ITEM_CODE).FirstOrDefault();
			if (po1 != null) //无则新增物料明细
			{
			tN_Ll_Details.Add(po1);
			// db.Deleteable<TN_Ll_detail>().Where(it => it.S_ITEM_CODE == a.WLBM && it.S_DO_NO == po1.First().S_DO_NO).ExecuteCommand();
			// db.Deleteable<TN_Ll_detail>().Where(it => it.S_ITEM_CODE == a.ZJBM && it.S_DO_NO == po1.First().S_DO_NO).ExecuteCommand();
			}
			else
			{
			//result.code = 1;
			//result.msg = $"物料{a.WLBM}物料数据不存在无法删除";
			//throw new Exception($"物料{a.WLBM}物料数据不存在无法删除");
			//result.msg = $"物料{a.ZJBM}物料数据不存在无法删除";
			//throw new Exception($"物料{a.ZJBM}物料数据不存在无法删除");
			lLDReturnRoots.GC = itemscddll.GC;
			lLDReturnRoots.LLDH = itemscddll.LLDH;
			lLDReturnRoots.MSGCODE = 1;
			lLDReturnRoots.MSGDESP = $"删除的物料{a.WLBM}物料数据不存在无法删除";
			lLDReturnRoots.MSGDESP = $"删除的物料{a.ZJBM}物料数据不存在无法删除";
			iTEMs.Add(lLDReturnRoots);
			continue;
			}
			}
			else
			{
			var po1 = po.Details.Where(s => a.WLBM == s.S_ITEM_CODE).ToList();
			var po1 = po.Details.Where(s => a.ZJBM == s.S_ITEM_CODE).ToList();
			if (po1.Count() == 0) //无则新增物料明细
			{
			var item = itemlist.Where(it => it.S_ITEM_CODE == a.WLBM).FirstOrDefault();
			var item = itemlist.Where(it => it.S_ITEM_CODE == a.ZJBM).FirstOrDefault();
			if (item == null)
			{
			//result.code = 1;
			//result.msg = $"物料{a.WLBM}物料主数据不存在该物料";
			//throw new Exception($"物料{a.WLBM}物料主数据不存在该物料");
			//result.msg = $"物料{a.ZJBM}物料主数据不存在该物料";
			//throw new Exception($"物料{a.ZJBM}物料主数据不存在该物料");
			lLDReturnRoots.GC = itemscddll.GC;
			lLDReturnRoots.LLDH = itemscddll.LLDH;
			lLDReturnRoots.MSGCODE = 1;
			lLDReturnRoots.MSGDESP = $"物料{a.WLBM}物料主数据不存在该物料";
			lLDReturnRoots.MSGDESP = $"物料{a.ZJBM}物料主数据不存在该物料";
			iTEMs.Add(lLDReturnRoots);
			continue;
			}
			@@ -3580,7 +3612,7 @@
			S_DO_NO = itemscddll.LLDH,
			S_AREA_CODE = "HJQ",
			N_ROW_NO = "",
			S_ITEM_CODE = a.WLBM,
			S_ITEM_CODE = a.ZJBM,
			S_ITEM_NAME = item.S_ITEM_NAME,
			F_QTY = a.XQSL,
			S_ZJBM = a.ZJBM,