JC26WMS.git - Gitblit

			@@ -106,6 +106,19 @@

			if (modelList.Count > 0)
			{
			if (!string.IsNullOrWhiteSpace(modelList[0].PackagNo))
			{
			// 查询整托数量此处UDF1用来存储整托数量。
			var packagModel = Db.Queryable<SysPackag>().Where(m => m.PackagNo == modelList[0].PackagNo && m.IsDel == "0").First();
			switch (packagModel.Level.ToString())
			{
			case "1": modelList[0].UDF1 = packagModel.L1Num.ToString(); break;
			case "2": modelList[0].UDF1 = packagModel.L2Num.ToString(); break;
			case "3": modelList[0].UDF1 = packagModel.L3Num.ToString(); break;
			case "4": modelList[0].UDF1 = packagModel.L4Num.ToString(); break;
			default: modelList[0].UDF1 = packagModel.L5Num.ToString(); break;
			}
			}
			return modelList[0];
			}

			@@ -277,7 +290,8 @@
			try
			{
			string sqlString = string.Empty;
			sqlString = "select b.SkuNo,b.SkuName,a.LotNo,a.Qty,a.PalletNo,a.Id from BllPalletBind a left join BllArrivalNoticeDetail b on a.ASNDetailNo = b.Id where a.IsDel = '0' and b.IsDel = '0' ";
			sqlString = "select b.SkuNo,b.SkuName,a.LotNo,a.Qty,a.PalletNo,a.Id from BllPalletBind a " +
			"left join BllArrivalNoticeDetail b on a.ASNDetailNo = b.Id where a.IsDel = '0' and b.IsDel = '0' ";
			if (!string.IsNullOrEmpty(model.PalletNo))
			{
			sqlString += $"and PalletNo = '{model.PalletNo}' and a.Status = '0' ";
			@@ -892,7 +906,7 @@
			#endregion

			#region 地码信息(储位信息)
			var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.LocatNo && w.Status == "0" && w.WareHouseNo == "W02");
			var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.LocatNo && w.Status == "0");
			if (storageLocat == null)
			{
			strMsg = "-1:储位信息不存在或非空闲状态，请核查!";
			@@ -4632,6 +4646,18 @@
			var bindId = 0;
			if (bind == null)
			{
			DateTime? pTime = null;
			DateTime? eTime = null;
			if (!string.IsNullOrWhiteSpace(detail.Lot1))
			{
			pTime = DateTime.Parse(detail.Lot1);
			}
			if (!string.IsNullOrWhiteSpace(detail.Lot2))
			{
			eTime = DateTime.Parse(detail.Lot2);
			}


			bind = new BllPalletBind
			{
			ASNNo = model.AsnNo,
			@@ -4647,6 +4673,8 @@
			SupplierLot = detail.SupplierLot,
			//InspectMark = model.IsSample, //是否取样托盘后期业务开发时接口传值需添加对应字段判断
			//SamplingQty = 0, //取样数量后期业务开发时接口传值需添加对应字段判断
			ProductionTime = pTime,
			ExpirationTime = eTime,
			BitPalletMark = "1",
			IsBale = "0",
			IsBelt = "0",
			@@ -4702,6 +4730,12 @@
			}
			else
			{
			string inspectStatusStr = "0";
			if (sku.IsInspect == "1")
			{
			inspectStatusStr = "1";
			}

			// 库存不存在插入数据
			sd1 = new DataStockDetail()
			{
			@@ -4730,7 +4764,7 @@
			ExpirationTime = bind.ExpirationTime,
			Status = "0",
			InspectMark = bind.InspectMark,
			InspectStatus = sku.IsInspect,
			InspectStatus = inspectStatusStr,
			BitPalletMark = bind.BitPalletMark,
			PackagNo = detail.PackagNo, //liudl 由sku的包装编号变为入库单明细的包装编码
			IsBale = bind.IsBale,
			@@ -4920,9 +4954,6 @@
			sqlStr += $"insert into LogPalletTrack values('{model.PalletNo}','{model.AsnNo}','组盘','0',getDate(),{userId},NULL,NULL);";
			Db.Ado.ExecuteCommand(sqlStr);
			new OperationASNServer().AddLogOperationAsn("PDA模块", "托盘绑定", model.AsnNo, "添加", $"添加了托盘码为：{model.PalletNo}的组盘信息", userId);



			}

			#endregion
			@@ -4972,7 +5003,7 @@
			#endregion

			#region 地码信息(储位信息)
			var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.LocatNo && w.Status == "0" && w.WareHouseNo == "W02");
			var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.LocatNo && w.Status == "0");
			if (storageLocat == null)
			{
			throw new Exception("储位信息不存在或非空闲状态，请核查!");
			@@ -5312,11 +5343,13 @@
			//修改库存明细信息
			foreach (var item in stockDetail)
			{
			item.Status = "0"; //状态更改为待分配
			item.WareHouseNo = "W02"; //所属仓库
			item.LocatNo = model.LocatNo;//储位地址
			item.UpdateTime = serverTime; //修改时间
			item.UpdateUser = model.CreateUser; //修改人
			item.Status = "0"; // 状态更改为待分配
			item.WareHouseNo = storageLocat.WareHouseNo; // 所属仓库
			item.RoadwayNo = storageLocat.RoadwayNo; // 所属巷道
			item.AreaNo = storageLocat.AreaNo; // 所属区域
			item.LocatNo = model.LocatNo; // 储位地址
			item.UpdateTime = serverTime; // 修改时间
			item.UpdateUser = model.CreateUser; // 修改人
			//修改库存明细信息
			Db.Updateable(item).ExecuteCommand();
			}
			@@ -5354,15 +5387,17 @@
			};
			Db.Insertable(exTask).ExecuteCommand();
			//托盘绑定信息
			var bindInfo = Db.Queryable<BllPalletBind>().First(w => w.IsDel == "0" && w.PalletNo == model.PalletNo && w.Status == "2" && string.IsNullOrEmpty(w.LocatNo));
			var bindInfo = Db.Queryable<BllPalletBind>().First(w => w.IsDel == "0" && w.PalletNo == model.PalletNo
			&& w.Status == "2" && string.IsNullOrEmpty(w.LocatNo));
			if (bindInfo != null)
			{
			bindInfo.WareHouseNo = "W02";//所属仓库
			bindInfo.LocatNo = model.LocatNo;//储位地址
			bindInfo.WareHouseNo = storageLocat.WareHouseNo; // 所属仓库
			bindInfo.RoadwayNo = storageLocat.RoadwayNo; // 所属巷道
			bindInfo.LocatNo = model.LocatNo; // 储位地址
			bindInfo.UpdateTime = serverTime;
			bindInfo.UpdateUser = model.CreateUser;
			bindInfo.CompleteTime = serverTime; //完成时间
			bindInfo.TaskNo = taskNo; //任务号
			bindInfo.CompleteTime = serverTime; // 完成时间
			bindInfo.TaskNo = taskNo; // 任务号
			Db.Updateable(bindInfo).ExecuteCommand();
			}
			#endregion
			@@ -5394,7 +5429,8 @@
			//修改储位信息
			Db.Updateable(storageLocat).ExecuteCommand();

			new OperationASNServer().AddLogOperationAsn("PDA模块", "平库入库", model.PalletNo, "完成", $"在PDA上完成单据号为：{model.ASNNo}的托盘码为：{model.PalletNo}的平库入库操作", (int)model.CreateUser);
			new OperationASNServer().AddLogOperationAsn("PDA模块", "平库入库", model.PalletNo, "完成",
			$"在PDA上完成单据号为：{model.ASNNo}的托盘码为：{model.PalletNo}的平库入库操作", (int)model.CreateUser);
			Db.CommitTran();
			}
			catch (Exception ex)