JC26WMS.git - Gitblit

			@@ -1888,16 +1888,17 @@
			BoxNo,
			SkuNo,
			SkuName,
			LotNo,
			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; ";
			GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
			var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);

			if (models == null)
			if (models.Count == 0 )
			{
			throw new Exception("箱码信息不存在!");
			}
			@@ -1909,6 +1910,55 @@
			throw ex;
			}
			}

			/// <summary>
			/// 根据箱码向追溯系统请求标签箱码信息
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			public List<BoxInfoDto> GetFMBindBoxInfos(string boxno)
			{
			try
			{
			#region 箱码请求接口，正式系统放开
			/*var jsonData = JsonConvert.SerializeObject(boxno);

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

			var obj = JsonConvert.DeserializeObject<ErpModel>(response);//解析返回数据
			if (obj.Success != 0)
			{
			throw new Exception("请求失败" + obj.Message);
			}*/
			#endregion
			string sqlString = $@"SELECT
			ASNNo,
			BoxNo,
			SkuNo,
			SkuName,
			LotNo,
			BitBoxMark,
			SUM(Qty) as Qty
			FROM BllBoxInfo
			WHERE IsDel = '0'
			AND Status='0'
			AND BoxNo = '{boxno}'
			GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
			var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString); // response

			if (models.Count == 0)
			{
			throw new Exception("箱码信息不存在!");
			}

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

			// 根据单据号获取单据明细列表
			public List<ArrivalNoticeDetailDto> GetBindArrivalNoticeDetails(ArrivalNoticeVm model)
			{
			@@ -3530,7 +3580,7 @@
			//绑定箱总数量
			//model.SkuQty = boxInfoList.Sum(s => s.Qty);
			//和选择的批次同批次的箱码信息
			var sameBoxInfoList = boxInfoList.Where(w => w.LotNo == model.LotNo).ToList();
			var sameBoxInfoList = boxInfoList.Where(w => w.LotNo == model.LotNo && w.Status == "0").ToList();
			//和选择的批次不同批次的箱码信息（拼箱批次）
			var notBoxInfoList = boxInfoList.Where(w => w.LotNo != model.LotNo).ToList();
			#endregion
			@@ -5153,7 +5203,7 @@
			SendDate = serverTime, //发送时间
			BackDate = serverTime, //返回时间
			StartLocat = "",//起始位置
			EndLocat = "力诺平库",//目标位置
			EndLocat = "平库",//目标位置
			PalletNo = bindInfo.PalletNo,//托盘码
			IsSend = 0,//是否可再次下发
			IsCancel = 0,//是否可取消
			@@ -5161,7 +5211,7 @@
			Type = "0",//任务类型 0 入库任务 1 出库任务 2 移库任务
			Status = "2",//任务状态0：等待执行1正在执行2执行完成
			OrderType = "0",//0 入库单 1 出库单 2 盘点单 3 移库单
			Msg = "力诺平库的入库任务",
			Msg = "平库的入库任务",
			};
			Db.Insertable(exTask).ExecuteCommand();

			@@ -5175,6 +5225,27 @@
			bindInfo.TaskNo = taskNo; //任务号
			Db.Updateable(bindInfo).ExecuteCommand();
			#endregion

			/* #region 添加托盘上架记录
			var upShelf = new BllPalletUpShelf()
			{
			TaskNo = exTask.TaskNo,
			TraceNo = bindInfo.ASNNo,
			PalletNo = bindInfo.PalletNo,
			SkuNo = stockModel.SkuNo,
			SkuName = stockModel.SkuName,
			LotNo = stockModel.LotNo,
			Status = "1",

			WareHouseNo = bindInfo.WareHouseNo,
			RoadwayNo = bindInfo.RoadwayNo,
			AreaNo = "",
			LocatNo = "",

			CreateUser = 0,
			};
			Db.Insertable(upShelf).ExecuteCommand();
			#endregion*/

			#region 库存箱支明细表
			// 插入新组的箱支信息
			@@ -5271,7 +5342,7 @@
			SendDate = DateTime.Now, //发送时间
			BackDate = DateTime.Now, //返回时间
			StartLocat = "",//起始位置
			EndLocat = "牧原平库",//目标位置
			EndLocat = "平库",//目标位置
			PalletNo = model.PalletNo,//托盘码
			IsSend = 0,//是否可再次下发
			IsCancel = 0,//是否可取消
			@@ -5279,7 +5350,7 @@
			Type = "0",//任务类型 0 入库任务 1 出库任务 2 移库任务
			Status = "2",//任务状态0：等待执行1正在执行2执行完成
			OrderType = "3",//0 入库单 1 出库单 2 盘点单 3 移库单
			Msg = "牧原平库的入库任务",
			Msg = "平库的入库任务",
			};
			Db.Insertable(exTask).ExecuteCommand();
			//托盘绑定信息
			@@ -5295,6 +5366,27 @@
			Db.Updateable(bindInfo).ExecuteCommand();
			}
			#endregion

			#region 添加托盘上架记录
			var palletupinfo = stockDetail.First();
			var upShelf = new BllPalletUpShelf()
			{
			TaskNo = exTask.TaskNo,
			TraceNo = bindInfo.ASNNo,
			PalletNo = bindInfo.PalletNo,
			SkuNo = palletupinfo.SkuNo,
			SkuName = palletupinfo.SkuName,
			LotNo = palletupinfo.LotNo,
			Status = "2",
			LocatNo = model.LocatNo,
			WareHouseNo = bindInfo.WareHouseNo,
			RoadwayNo = bindInfo.RoadwayNo,
			AreaNo = storageLocat.AreaNo,

			CreateUser = 0,
			};
			Db.Insertable(upShelf).ExecuteCommand();
			#endregion
			}
			storageLocat.Status = "1";//状态已使用
			storageLocat.UpdateTime = serverTime; //修改时间