JC34WMS.git - Gitblit

			@@ -22,6 +22,9 @@
			using System.Xml.Schema;
			using ZXing.OneD;
			using System.Threading.Tasks;
			using System.Security.Policy;
			using Newtonsoft.Json;
			using Utility.Tools;

			namespace WMS.BLL.BllPdaServer
			{
			@@ -1720,7 +1723,7 @@
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			public List<BoxInfoDto> GetBindBoxInfos(BoxInfoVm model)
			public List<BoxInfoDto> GetBindBoxInfos(BoxInfoVm model,string url)
			{
			try
			{
			@@ -1728,27 +1731,307 @@
			{
			throw new Exception("请扫描外箱条码!");
			}
			string sqlString = $@"SELECT
			ASNNo,
			BoxNo,
			SkuNo,
			SkuName,
			LotNo,
			BitBoxMark,
			SUM(Qty) as Qty
			FROM BllBoxInfo
			WHERE IsDel = '0'
			AND Status='0'
			AND BoxNo = '{model.BoxNo}'
			GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
			var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);

			if (models.Count == 0)
			if (string.IsNullOrWhiteSpace(model.ASNNo))
			{
			throw new Exception("箱码信息不存在!");
			throw new Exception("请选择入库单号!");
			}
			var noticeList = Db.Queryable<BllArrivalNotice>().Where(m => m.IsDel == "0" && m.ASNNo == model.ASNNo).ToList();
			if (noticeList.Count != 1)
			{
			throw new Exception("入库单号重复!");
			}
			var notice = noticeList.First();
			if (notice.Type == "0") //成品入库
			{
			string sqlString = $@"SELECT
			ASNNo,
			BoxNo,
			SkuNo,
			SkuName,
			LotNo,
			BitBoxMark,
			SUM(Qty) as Qty
			FROM BllBoxInfo
			WHERE IsDel = '0'
			AND Status='0'
			AND BoxNo = '{model.BoxNo}'
			GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
			var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);

			return models;
			if (models.Count != 0)
			{
			return models;
			}
			else
			{
			var boxInfo = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == model.BoxNo).ToList();

			if (boxInfo.Count == 0)
			{
			models = GetFMBindBoxInfos(model.BoxNo, url);
			return models;
			}
			else
			{
			if (boxInfo.Count(m => m.Status != "0") > 0)
			{
			throw new Exception("箱码信息状态不是等待执行");
			}
			return models;
			}



			}
			}
			else if (notice.Type == "1" \|\| notice.Type == "4") //采购入库
			{
			string sqlString = $@"SELECT
			ASNNo,
			BoxNo,
			SkuNo,
			SkuName,
			LotNo,
			BitBoxMark,
			SUM(Qty) as Qty
			FROM BllBoxInfo
			WHERE IsDel = '0'
			AND Status='0'
			AND BoxNo = '{model.BoxNo}'
			GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
			var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);

			if (models.Count != 0)
			{
			return models;
			}
			else
			{
			throw new Exception("没有查询到箱码信息");
			}
			}
			else if (notice.Type == "3") //退货入库
			{
			string sqlString = $@"SELECT
			ASNNo,
			BoxNo,
			SkuNo,
			SkuName,
			LotNo,
			BitBoxMark,
			SUM(Qty) as Qty
			FROM BllBoxInfo
			WHERE IsDel = '0'
			AND Status='0'
			AND BoxNo = '{model.BoxNo}'
			GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
			var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);

			if (models.Count != 0)
			{
			return models;
			}
			else
			{
			sqlString = $@"SELECT
			ASNNo,
			BoxNo,
			SkuNo,
			SkuName,
			LotNo,
			BitBoxMark,
			SUM(Qty) as Qty
			FROM BllBoxInfo
			WHERE IsDel = '0'
			AND Status='0'
			AND BoxNo2 = '{model.BoxNo}'
			GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
			models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);
			if (models.Count != 0)
			{
			return models;
			}
			else
			{
			sqlString = $@"SELECT
			ASNNo,
			BoxNo,
			SkuNo,
			SkuName,
			LotNo,
			BitBoxMark,
			SUM(Qty) as Qty
			FROM BllBoxInfo
			WHERE IsDel = '0'
			AND Status='0'
			AND BoxNo3 = '{model.BoxNo}'
			GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
			models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);
			if (models.Count != 0)
			{
			return models;
			}
			}
			}

			#region 获取最后一次出库拣货中的箱码信息

			var comBox = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.BoxNo == model.BoxNo).GroupBy(m => m.ExportAllotId).Select(m => m.ExportAllotId).ToList();
			if (comBox.Count == 0)
			{
			comBox = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.BoxNo2 == model.BoxNo).GroupBy(m => m.ExportAllotId).Select(m => m.ExportAllotId).ToList();
			if (comBox.Count == 0)
			{
			comBox = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.BoxNo3 == model.BoxNo).GroupBy(m => m.ExportAllotId).Select(m => m.ExportAllotId).ToList();
			}
			}
			var i = 0;//循环次数
			DateTime time = DateTime.Now;
			var allotId = 0;
			foreach (var item in comBox)
			{
			var comBoxList = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == item).OrderByDescending(m => m.CreateTime).First();
			if (i == 0)
			{
			time = comBoxList.CreateTime;
			allotId = comBoxList.ExportAllotId;
			}
			else if (comBoxList.CreateTime > time)
			{
			time = comBoxList.CreateTime;
			allotId = comBoxList.ExportAllotId;
			}
			i++;
			}
			if (allotId != 0)
			{
			var addComBox = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allotId).ToList();
			var addComList = addComBox.GroupBy(m => m.BoxNo).ToList();
			var sku = Db.Queryable<SysMaterials>().First(m => m.SkuNo == addComBox.First().SkuNo);
			var pNum = 0;
			var bNum = 0;
			new Common().GetPackQtyInfo(sku.PackagNo, ref pNum, ref bNum);
			var boxList = new List<BllBoxInfo>();
			foreach (var com in addComList)
			{
			//箱内总数和
			var qtySum = addComBox.Where(m => m.BoxNo == com.Key).Sum(m => m.CompleteQty);
			var bitBox = "1";
			if (qtySum == bNum)
			{
			bitBox = "0";
			}
			foreach (var item in com)
			{
			if (item.BoxNo != model.BoxNo)
			{
			if (item.BoxNo2 != model.BoxNo)
			{
			if (item.BoxNo3 != model.BoxNo)
			{
			continue;
			}
			}
			}
			var boxInfo = new BllBoxInfo()
			{
			BoxNo = item.BoxNo,
			BoxNo2 = item.BoxNo2,
			BoxNo3 = item.BoxNo3,
			SkuNo = item.SkuNo,
			SkuName = item.SkuName,
			LotNo = item.LotNo,
			LotText = item.LotText,
			Qty = (decimal)item.CompleteQty,
			FullQty = bNum,
			//ProductionTime = ,
			//ExpirationTime = ,
			InspectMark = "0",
			InspectStatus = "0",
			BitBoxMark = bitBox,
			Origin = "WMS",
			Status = "0",
			CreateUser = 0
			};
			boxList.Add(boxInfo);
			}

			}
			Db.Insertable(boxList).ExecuteCommand();

			string sqlString2 = $@"SELECT
			ASNNo,
			BoxNo,
			SkuNo,
			SkuName,
			LotNo,
			BitBoxMark,
			SUM(Qty) as Qty
			FROM BllBoxInfo
			WHERE IsDel = '0'
			AND Status='0'
			AND BoxNo = '{model.BoxNo}'
			GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
			var models2 = Db.Ado.SqlQuery<BoxInfoDto>(sqlString2);

			if (models2.Count != 0)
			{
			return models2;
			}
			else
			{
			sqlString2 = $@"SELECT
			ASNNo,
			BoxNo,
			SkuNo,
			SkuName,
			LotNo,
			BitBoxMark,
			SUM(Qty) as Qty
			FROM BllBoxInfo
			WHERE IsDel = '0'
			AND Status='0'
			AND BoxNo2 = '{model.BoxNo}'
			GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
			models2 = Db.Ado.SqlQuery<BoxInfoDto>(sqlString2);
			if (models2.Count != 0)
			{
			return models2;
			}
			else
			{
			sqlString2 = $@"SELECT
			ASNNo,
			BoxNo,
			SkuNo,
			SkuName,
			LotNo,
			BitBoxMark,
			SUM(Qty) as Qty
			FROM BllBoxInfo
			WHERE IsDel = '0'
			AND Status='0'
			AND BoxNo3 = '{model.BoxNo}'
			GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
			models2 = Db.Ado.SqlQuery<BoxInfoDto>(sqlString2);
			if (models2.Count != 0)
			{
			return models2;
			}
			}
			}


			}

			throw new Exception("箱码信息不存在!");
			#endregion

			}
			else
			{
			throw new Exception("单据类型错误");
			}
			}
			catch (Exception ex)
			{
			@@ -1761,21 +2044,83 @@
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			public List<BoxInfoDto> GetFMBindBoxInfos(string boxno)
			public List<BoxInfoDto> GetFMBindBoxInfos(string boxno,string url)
			{
			try
			{
			#region 箱码请求接口，正式系统放开
			/*var jsonData = JsonConvert.SerializeObject(boxno);
			var data = new
			{
			BoxCode = boxno
			};
			var jsonData = JsonConvert.SerializeObject(data);

			var response = HttpHelper.DoPost(url, jsonData, "箱码信息请求", "FM");

			var obj = JsonConvert.DeserializeObject<ErpModel>(response);//解析返回数据
			if (obj.Success != 0)
			var obj = JsonConvert.DeserializeObject<FumaGetBoxModel>(response);//解析返回数据
			if (obj.Success != "0")
			{
			throw new Exception("请求失败" + obj.Message);
			}*/
			}
			#endregion
			var sku = Db.Queryable<SysMaterials>().First(m => m.SkuNo == obj.Product.SkuNo);
			var pNum = 0;//托盘物品数量
			var bNum = 0;//箱码物品数量
			if (sku == null)
			{
			throw new Exception($"未查询到物料{obj.Product.SkuNo}信息");
			}
			new Common().GetPackQtyInfo(sku.PackagNo, ref pNum, ref bNum);
			if (pNum == 0 \|\| bNum == 0)
			{
			throw new Exception($"{sku.SkuNo}物品包装未找到！");
			}

			var boxList = new List<BllBoxInfo>();
			var comTime = DateTime.Now;
			//添加箱码信息
			foreach (var box in obj.Product.BoxInfoList)
			{
			foreach (var box2 in box.BoxInfo2List)
			{
			foreach (var box3 in box2.BoxInfo3List)
			{
			var boxInfo = new BllBoxInfo()
			{
			BoxNo = box.BoxNo,
			BoxNo2 = box2.BoxNo2,
			BoxNo3 = box3.BoxNo3,
			Qty = box3.Qty,
			BitBoxMark = box.BitBoxMark,

			ASNNo = "",
			//ASNDetailNo = noticeDetail.Id,
			OrderCode = "",//notice.OrderCode
			//BindNo = bindId,
			//PalletNo = model.PallNo,
			FullQty = bNum,
			Status = "2",
			SkuNo = sku.SkuNo,
			SkuName = sku.SkuName,
			LotNo = obj.Product.LotNo,
			LotText = obj.Product.LotText,
			ProductionTime = DateTime.Parse(obj.Product.ProductionTime),
			ExpirationTime = DateTime.Parse(obj.Product.ExpirationTime),
			//CompleteTime = "",
			InspectMark = "0",
			InspectStatus = "0",
			Origin = "赋码",
			CreateTime = comTime,
			CreateUser = 0
			};
			boxList.Add(boxInfo);
			}

			}
			}
			Db.Fastest<BllBoxInfo>().BulkCopy(boxList);


			string sqlString = $@"SELECT
			ASNNo,
			BoxNo,
			@@ -2064,6 +2409,464 @@
			}
			}

			/// <summary>
			/// 根据箱码获取标签箱码信息（车间入库-获取WMS生成的箱信息）
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			public List<BoxInfoDto> GetWmsBoxInfos(string boxNo)
			{
			try
			{
			if (string.IsNullOrEmpty(boxNo))
			{
			throw new Exception("请扫描外箱条码!");
			}

			string sqlString = $@"SELECT BoxNo, SkuNo, SkuName, LotNo, BitBoxMark, SUM(Qty) as Qty FROM BllBoxInfo
			WHERE IsDel = '0' and Status='0' and BoxNo = '{boxNo}'
			GROUP BY BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
			var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);

			if (models.Count != 0)
			{
			return models;
			}
			else
			{
			throw new Exception("没有查询到箱码信息");
			}

			}
			catch (Exception ex)
			{
			throw ex;
			}
			}


			public void ChejianIn(string palletNo,string boxNo,decimal qty,string areaNo,int userId)
			{
			try
			{
			#region MyRegion

			if (string.IsNullOrWhiteSpace(palletNo))
			{
			throw new Exception("托盘号不能为空");
			}
			if (string.IsNullOrWhiteSpace(boxNo))
			{
			throw new Exception("箱号不能为空");
			}
			if (qty<=0)
			{
			throw new Exception("数量不能小等0");
			}
			var boxInfo = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo).ToList();
			if (boxInfo.Count == 0)
			{
			throw new Exception("未查询到当前箱号信息");
			}
			var boxInfoOne = boxInfo.First();
			var pall = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNo);
			if (pall == null)
			{
			throw new Exception("未查询到当前托盘信息");
			}
			#endregion

			//开启事务
			Db.BeginTran();
			//当前时间
			var comTime = DateTime.Now;

			#region 包装

			var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == boxInfoOne.SkuNo);
			var pack = Db.Queryable<SysPackag>().First(m => m.IsDel == "0" && m.PackagNo == sku.PackagNo);

			var pNum = 0;//托盘物品数量
			var bNum = 0;//箱码物品数量

			//公共方法获取包装数量
			new Common().GetPackQtyInfo(pack.PackagNo, ref pNum, ref bNum);

			#endregion

			var msgStr = $"箱号为{boxNo}";
			var boxInfoList = new List<BllBoxInfo>();


			boxInfoList.AddRange(boxInfo);

			#region 库存明细

			var area = Db.Queryable<SysStorageArea>().First(m => m.IsDel == "0" && m.AreaNo == areaNo);
			if (area == null)
			{
			throw new Exception("入库区域不能为空");
			}

			var tags = "0";

			// 判断库存明细是否已有此托盘信息
			var sd1 = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.SkuNo== boxInfoOne.SkuNo && m.LotNo == boxInfoOne.LotNo && m.PalletNo == palletNo);
			var sdId1 = 0;
			if (sd1 != null)
			{
			if (sd1.AreaNo!= areaNo)
			{
			throw new Exception("选择的区域与库存不同");
			}
			sdId1 = sd1.Id;
			// 库存已存在更新数据
			sd1.Qty += qty;
			sd1.CompleteTime = comTime;
			sd1.UpdateUser = userId;
			sd1.UpdateTime = comTime;

			Db.Updateable(sd1).ExecuteCommand();
			}
			else
			{
			var sd2 = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo && m.IsDel == "0" && !string.IsNullOrWhiteSpace(m.AreaNo));
			if (sd2.Count(m=>m.AreaNo!= areaNo) > 0)
			{
			throw new Exception("当前托盘位置与选择的不同，请核实");
			}
			// 库存不存在插入数据
			sd1 = new DataStockDetail()
			{
			ASNNo = "",
			LotNo = boxInfoOne.LotNo,
			LotText = boxInfoOne.LotText,
			SupplierLot = boxInfoOne.SupplierLot,
			SkuNo = sku.SkuNo,
			SkuName = sku.SkuName,
			Standard = sku.Standard,
			Qty = qty,
			LockQty = 0,
			FrozenQty = 0,
			InspectQty = 0,
			WareHouseNo = area.WareHouseNo,//所属仓库
			RoadwayNo = "",//所属巷道
			AreaNo = area.AreaNo,//所属区域
			LocatNo = "",//储位地址
			PalletNo = palletNo,
			PalletTags = tags,
			CompleteTime = comTime,
			ProductionTime = boxInfoOne.ProductionTime,
			ExpirationTime = boxInfoOne.ExpirationTime,
			Status = "0",
			InspectMark = boxInfoOne.InspectMark,
			InspectStatus = sku.IsInspect,
			BitPalletMark = "1",
			PackagNo = sku.PackagNo,

			IsDel = "0",
			CreateUser = 0,
			CreateTime = comTime
			};

			//添加库存明细
			sdId1 = Db.Insertable(sd1).ExecuteReturnIdentity();
			}
			#endregion

			// 更改箱支关系表
			decimal factQty = 0.00m;//托盘总数量


			//标签组托
			var boxGroup = boxInfo.GroupBy(m => m.BoxNo).ToList();
			foreach (var g in boxGroup)
			{
			decimal boxFullQty = 0;//箱内总数量
			foreach (var box in g)
			{
			if (box.BindNo != null && box.BindNo != 0)
			{
			continue;
			}


			box.PalletNo = palletNo;
			box.Status = "2";

			box.CompleteTime = comTime;
			box.UpdateTime = comTime;
			box.UpdateUser = userId;

			//box.Qty = box.Qty;
			//box.BitBoxMark = box.Qty == box.FullQty ? "0" : "1";

			factQty += box.Qty;
			boxFullQty += box.Qty;

			#region 库存箱码明细
			var box2 = new DataBoxInfo()
			{
			StockDetailId = sdId1,
			BoxNo = box.BoxNo,
			BoxNo2 = box.BoxNo2,
			BoxNo3 = box.BoxNo3,
			PalletNo = box.PalletNo,
			PalletNo2 = box.PalletNo2,
			PalletNo3 = box.PalletNo3,
			Qty = box.Qty,
			FullQty = box.FullQty,
			Status = "2",//0：未组托 1：已组托 2：已入库 3：已出库 4:已分配 5：已拣货
			LotNo = box.LotNo,
			LotText = box.LotText,
			SkuNo = box.SkuNo,
			SkuName = box.SkuName,
			Standard = sku.Standard,
			ProductionTime = box.ProductionTime,
			SupplierLot = box.SupplierLot,
			InspectStatus = sku.IsInspect,
			InspectMark = box.InspectMark,
			BitBoxMark = box.BitBoxMark,
			ExpirationTime = box.ExpirationTime,

			CreateUser = 0,
			CreateTime = comTime
			};
			//添加库存箱码明细
			Db.Insertable(box2).ExecuteCommand();
			#endregion
			}
			if (boxFullQty > bNum)
			{
			throw new Exception($"绑定失败，{g.Key}箱码绑定数量大于该物品包装数量！");
			}
			}
			//更改箱支关系表信息
			Db.Updateable(boxInfoList).ExecuteCommand();


			#region 库存
			var dataStock = Db.Queryable<DataStock>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == boxInfoOne.LotNo);
			if (dataStock != null)
			{
			dataStock.Qty += factQty;
			Db.Updateable(dataStock).ExecuteCommand();
			}
			else
			{
			var stock = new DataStock()
			{
			SkuNo = sku.SkuNo,
			SkuName = sku.SkuName,
			Standard = sku.Standard,
			LotNo = boxInfoOne.LotNo,
			LotText = boxInfoOne.LotText,
			Qty = qty,
			LockQty = 0,
			FrozenQty = 0,
			IsSampling = "0",
			IsDel = "0",
			CreateUser = userId,
			CreateTime = comTime
			};
			Db.Insertable(stock).ExecuteCommand();
			}
			#endregion

			// 更改托盘使用状态
			var sqlStr = $"update SysPallets set Status = '1' where PalletNo = '{palletNo}';";
			////添加托盘记录表数据
			//sqlStr += $"insert into LogPalletTrack values('{palletNo}','{boxNo}','组盘','0',getDate(),{userId},NULL,NULL);";
			//Db.Ado.ExecuteCommand(sqlStr);
			new OperationASNServer().AddLogOperationAsn("PDA模块", "车间入库", boxNo, "添加", $"添加了托盘码为：{palletNo}、{msgStr}的入库信息", userId);

			//提交事务
			Db.CommitTran();

			}
			catch (Exception e)
			{
			Db.RollbackTran();
			throw new Exception(e.Message);
			}
			}

			/// <summary>
			/// 车间绑定托盘不贴标物料
			/// </summary>
			/// <param name="model"></param>
			/// <param name="userId"></param>
			/// <exception cref="Exception"></exception>
			public void ChejianQtyIn(string palletNo, string skuNo, string lotNo, decimal qty, string areaNo, int userId)
			{
			try
			{
			#region MyRegion

			if (string.IsNullOrWhiteSpace(palletNo))
			{
			throw new Exception("托盘号不能为空");
			}
			if (string.IsNullOrWhiteSpace(skuNo))
			{
			throw new Exception("物料不能为空");
			}
			if (qty <= 0)
			{
			throw new Exception("数量不能小等0");
			}
			var skuInfo = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == skuNo);
			if (skuInfo == null)
			{
			throw new Exception("未查询到物料信息");
			}
			var pall = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNo);
			if (pall == null)
			{
			throw new Exception("未查询到当前托盘信息");
			}
			#endregion

			//开启事务
			Db.BeginTran();
			//当前时间
			var comTime = DateTime.Now;

			#region 包装

			var pack = Db.Queryable<SysPackag>().First(m => m.IsDel == "0" && m.PackagNo == skuInfo.PackagNo);

			var pNum = 0;//托盘物品数量
			var bNum = 0;//箱码物品数量

			//公共方法获取包装数量
			new Common().GetPackQtyInfo(pack.PackagNo, ref pNum, ref bNum);

			#endregion



			#region 库存明细

			var area = Db.Queryable<SysStorageArea>().First(m => m.IsDel == "0" && m.AreaNo == areaNo);
			if (area == null)
			{
			throw new Exception("入库区域不能为空");
			}

			var tags = "0";

			// 判断库存明细是否已有此托盘信息
			var sd1 = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.SkuNo == skuNo && m.LotNo == lotNo && m.PalletNo == palletNo);
			var sdId1 = 0;
			if (sd1 != null)
			{
			if (sd1.AreaNo != areaNo)
			{
			throw new Exception("选择的区域与库存不同");
			}
			sdId1 = sd1.Id;
			// 库存已存在更新数据
			sd1.Qty += qty;
			sd1.CompleteTime = comTime;
			sd1.UpdateUser = userId;
			sd1.UpdateTime = comTime;
			if (sd1.Qty >= pNum)
			{
			sd1.BitPalletMark = "0";
			}
			Db.Updateable(sd1).ExecuteCommand();
			}
			else
			{
			// 库存不存在插入数据
			sd1 = new DataStockDetail()
			{
			LotNo = lotNo,
			SupplierLot = "",
			SkuNo = skuInfo.SkuNo,
			SkuName = skuInfo.SkuName,
			Standard = skuInfo.Standard,
			Qty = qty,
			LockQty = 0,
			FrozenQty = 0,
			InspectQty = 0,
			WareHouseNo = area.WareHouseNo,//所属仓库
			RoadwayNo = "",//所属巷道
			AreaNo = area.AreaNo,//所属区域
			LocatNo = "",//储位地址
			PalletNo = palletNo,
			PalletTags = tags,
			CompleteTime = comTime,
			//ProductionTime = boxInfoOne.ProductionTime,
			//ExpirationTime = boxInfoOne.ExpirationTime,
			Status = "0",
			InspectMark = "0",
			InspectStatus = "1",
			BitPalletMark = qty >= pNum ?"0" :"1",
			PackagNo = skuInfo.PackagNo,

			IsDel = "0",
			CreateUser = 0,
			CreateTime = comTime
			};

			//添加库存明细
			sdId1 = Db.Insertable(sd1).ExecuteReturnIdentity();
			}
			#endregion

			// 更改箱支关系表
			decimal factQty = 0.00m;//托盘总数量


			#region 库存
			var dataStock = Db.Queryable<DataStock>().First(m => m.IsDel == "0" && m.SkuNo == skuInfo.SkuNo && m.LotNo == lotNo);
			if (dataStock != null)
			{
			dataStock.Qty += factQty;
			Db.Updateable(dataStock).ExecuteCommand();
			}
			else
			{
			var stock = new DataStock()
			{
			SkuNo = skuInfo.SkuNo,
			SkuName = skuInfo.SkuName,
			Standard = skuInfo.Standard,
			LotNo = lotNo,
			LotText = "",
			Qty = qty,
			LockQty = 0,
			FrozenQty = 0,
			IsSampling = "0",
			IsDel = "0",
			CreateUser = userId,
			CreateTime = comTime
			};
			Db.Insertable(stock).ExecuteCommand();
			}
			#endregion

			// 更改托盘使用状态
			var sqlStr = $"update SysPallets set Status = '1' where PalletNo = '{palletNo}';";
			////添加托盘记录表数据
			//sqlStr += $"insert into LogPalletTrack values('{palletNo}','{boxNo}','组盘','0',getDate(),{userId},NULL,NULL);";
			Db.Ado.ExecuteCommand(sqlStr);
			new OperationASNServer().AddLogOperationAsn("PDA模块", "车间入库", skuNo, "添加", $"添加了托盘码为：{palletNo}的入库信息", userId);

			//提交事务
			Db.CommitTran();

			}
			catch (Exception e)
			{
			Db.RollbackTran();
			throw new Exception(e.Message);
			}

			}

			#endregion


			@@ -2313,35 +3116,35 @@
			};
			var id = Db.Insertable(modelpb).ExecuteReturnIdentity();

			var modelbb = new BllBoxInfo
			{
			ASNNo = "",
			ASNDetailNo = null,
			BindNo = id,
			PalletNo = model.PalletNo,
			PalletNo2 = model.PalletNo2,
			PalletNo3 = model.PalletNo3,
			Status = "2",
			CompleteTime = DateTime.Now,
			Qty = (int)model.Qty,
			FullQty = pNum,
			SkuNo = sku.SkuNo,
			SkuName = sku.PackagNo,
			LotNo = "",
			LotText = "",
			SupplierLot = "",
			InspectStatus = sku.IsInspect,
			Origin = "PDA",
			BoxNo = "",
			BoxNo2 = "",
			BoxNo3 = "",
			InspectMark = "",
			BitBoxMark = "0",
			//var modelbb = new BllBoxInfo
			//{
			// ASNNo = "",
			// ASNDetailNo = null,
			// BindNo = id,
			// PalletNo = model.PalletNo,
			// PalletNo2 = model.PalletNo2,
			// PalletNo3 = model.PalletNo3,
			// Status = "2",
			// CompleteTime = DateTime.Now,
			// Qty = (int)model.Qty,
			// FullQty = pNum,
			// SkuNo = sku.SkuNo,
			// SkuName = sku.SkuName,
			// LotNo = "",
			// LotText = "",
			// SupplierLot = "",
			// InspectStatus = sku.IsInspect,
			// Origin = "PDA",
			// BoxNo = "",
			// BoxNo2 = "",
			// BoxNo3 = "",
			// InspectMark = "",
			// BitBoxMark = "0",

			CreateUser = (int)model.CreateUser,
			CreateTime = datetime
			};
			Db.Insertable(modelbb).ExecuteCommand();
			// CreateUser = (int)model.CreateUser,
			// CreateTime = datetime
			//};
			//Db.Insertable(modelbb).ExecuteCommand();

			//添加库存

			@@ -2389,35 +3192,35 @@

			#region 库存箱码明细

			var box2 = new DataBoxInfo()
			{
			StockDetailId = sdId1,
			BindNo = modelpb.Id,
			BoxNo = modelbb.BoxNo,
			BoxNo2 = modelbb.BoxNo2,
			BoxNo3 = modelbb.BoxNo3,
			PalletNo = modelbb.PalletNo,
			PalletNo2 = modelbb.PalletNo2,
			PalletNo3 = modelbb.PalletNo3,
			Qty = modelbb.Qty,
			FullQty = modelbb.FullQty,
			Status = "2",
			LotNo = modelbb.LotNo,
			LotText = modelbb.LotText,
			SkuNo = modelbb.SkuNo,
			SkuName = modelbb.SkuName,
			Standard = sku.Standard,
			ProductionTime = modelbb.ProductionTime,
			SupplierLot = modelbb.SupplierLot,
			InspectStatus = sku.IsInspect,
			InspectMark = modelbb.InspectMark,
			BitBoxMark = modelbb.BitBoxMark,
			ExpirationTime = modelbb.ExpirationTime,
			//var box2 = new DataBoxInfo()
			//{
			// StockDetailId = sdId1,
			// BindNo = modelpb.Id,
			// BoxNo = modelbb.BoxNo,
			// BoxNo2 = modelbb.BoxNo2,
			// BoxNo3 = modelbb.BoxNo3,
			// PalletNo = modelbb.PalletNo,
			// PalletNo2 = modelbb.PalletNo2,
			// PalletNo3 = modelbb.PalletNo3,
			// Qty = modelbb.Qty,
			// FullQty = modelbb.FullQty,
			// Status = "2",
			// LotNo = modelbb.LotNo,
			// LotText = modelbb.LotText,
			// SkuNo = modelbb.SkuNo,
			// SkuName = modelbb.SkuName,
			// Standard = sku.Standard,
			// ProductionTime = modelbb.ProductionTime,
			// SupplierLot = modelbb.SupplierLot,
			// InspectStatus = sku.IsInspect,
			// InspectMark = modelbb.InspectMark,
			// BitBoxMark = modelbb.BitBoxMark,
			// ExpirationTime = modelbb.ExpirationTime,

			CreateUser = 0,
			CreateTime = datetime
			};
			Db.Insertable(box2).ExecuteCommand();
			// CreateUser = 0,
			// CreateTime = datetime
			//};
			//Db.Insertable(box2).ExecuteCommand();
			#endregion

			#region 库存
			@@ -5606,16 +6409,7 @@
			//修改库存明细信息
			Db.Updateable(item).ExecuteCommand();
			}
			//获取拣货信息
			var alotr = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.PalletNo == model.PalletNo && a.Status == "4");
			if (alotr != null)
			{
			alotr.Status = "5"; //5 已完成
			alotr.UpdateUser = model.CreateUser; //修改人
			alotr.UpdateTime = serverTime; //修改时间
			//修改拣货信息
			Db.Updateable(alotr).ExecuteCommand();
			}

			#region 任务及组托信息
			//创建任务信息
			var taskNo = new Common().GetMaxNo("TK");
			@@ -5660,15 +6454,15 @@
			var upShelf = new BllPalletUpShelf()
			{
			TaskNo = exTask.TaskNo,
			TraceNo = bindInfo.ASNNo,
			PalletNo = bindInfo.PalletNo,
			TraceNo = bindInfo== null? "": bindInfo.ASNNo,
			PalletNo = model.PalletNo,
			SkuNo = palletupinfo.SkuNo,
			SkuName = palletupinfo.SkuName,
			LotNo = palletupinfo.LotNo,
			Status = "2",
			LocatNo = model.LocatNo,
			WareHouseNo = bindInfo.WareHouseNo,
			RoadwayNo = bindInfo.RoadwayNo,
			WareHouseNo = storageLocat.WareHouseNo,
			RoadwayNo = storageLocat.RoadwayNo,
			AreaNo = storageLocat.AreaNo,

			CreateUser = 0,