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' ";
			@@ -1888,16 +1902,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 +1924,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)
			{