JC24WMS.git - Gitblit

			@@ -24,6 +24,7 @@
			using System.IO;
			using System.Security.Cryptography.X509Certificates;
			using System.Net.WebSockets;
			using WMS.BLL.SysServer;

			namespace WMS.BLL.BllPdaServer
			{
			@@ -43,7 +44,7 @@
			try
			{
			//model.Type：单据类型在这里代表前端页签类型：即标签页签：贴标物料；数量页签：不贴表物料，原因：懒得加参数
			var data = Db.Queryable<BllArrivalNotice>().Where(m => m.IsDel == "0" && m.Status != "3" && m.Status != "4").Select(m => m.ASNNo).ToList();
			var data = Db.Queryable<BllArrivalNotice>().Where(m => m.IsDel == "0" && m.Status !="2" && m.Status != "3" && m.Status != "4").Select(m => m.ASNNo).ToList();
			var list = new List<ArrivalNoticeDetailDto>();
			if (model.Type.Contains("0"))//0贴标
			{
			@@ -266,6 +267,42 @@
			}
			}



			/// <summary>
			/// 验证地码是否存在
			/// </summary>
			/// <param name="locatNo">地码</param>
			/// <returns>"":可使用 -1:不可使用（原因)</returns>
			public string IsEnableLocatNo(string locatNo)
			{
			string sqlMsg = "";
			string sqlString = string.Empty;
			try
			{
			sqlString = $"select * from SysStorageLocat where LocatNo = '{locatNo}' and WareHouseNo = 'W02' and isdel = '0';";
			var models = Db.Ado.SqlQuery<PalletBindVm>(sqlString);

			if (models.Count > 0)
			{
			if (models[0].Status != "0")
			{
			sqlMsg = "-1:此库位使用中，请在库内请核实!";
			}
			}
			else
			{
			sqlMsg = "-1:库位不存在!";
			}

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

			// 根据箱码或托盘号获取箱支信息 liudl
			public List<BoxInfoDto> GetBoxInfos(BoxInfoVm model)
			{
			@@ -333,6 +370,7 @@
			public string BindNullPallet(PalletBindVm model)
			{
			string strMsg = "";
			string type = model.BindType == "0" ? "PDA" : "叠托机";
			try
			{
			var datetime = Db.GetDate();
			@@ -440,7 +478,7 @@
			LotText = "",
			SupplierLot = "",
			InspectStatus = "1",
			Origin = "PDA",
			Origin = type,
			BoxNo = "",
			BoxNo2 = "",
			BoxNo3 = "",
			@@ -461,6 +499,120 @@

			// 插入操作日志
			new OperationASNServer().AddLogOperationAsn("PDA模块", "空托入库", model.PalletNo, "添加", $"在PDA上添加了空托盘跺", (int)model.CreateUser);

			return strMsg;
			}
			catch (Exception ex)
			{
			Db.Ado.RollbackTran();
			throw ex;
			}
			}

			// 叠托机绑定空托盘
			public string BindNullPallets(PalletsBind model)
			{
			string strMsg = "";
			string type = model.BindType == "0" ? "PDA" : "叠托机";
			try
			{
			var datetime = Db.GetDate();

			//获取托盘绑定信息
			string str = "select * from BllPalletBind where IsDel = '0' and PalletNo = @palletno and Status = '0' ";
			List<PalletBindVm> list = Db.Ado.SqlQuery<PalletBindVm>(str, new
			{
			palletno = model.PalletNo //托盘号
			});
			//判断是否已绑定该托盘
			if (list.Count > 0)
			{
			strMsg = "-1:该托盘已被绑定!";
			return strMsg;
			}
			if (string.IsNullOrEmpty(model.PalletNo))
			{
			strMsg = "-1:托盘号不可为空!";
			return strMsg;
			}
			if (model.Qty == null \|\| model.Qty == 0)
			{
			strMsg = "-1:空托盘数量不可为空!";
			return strMsg;
			}
			//获取托盘信息
			var pallet = Db.Queryable<SysPallets>().First(a => a.IsDel == "0" && a.PalletNo == model.PalletNo);

			if (pallet == null)
			{
			strMsg = "-1:托盘信息为空!";
			return strMsg;
			}
			if (pallet.Status != "0")
			{
			strMsg = "-1:该托盘正在使用!";
			return strMsg;
			}

			Db.BeginTran();

			// 插入托盘绑定表
			var modelpb = new BllPalletBind
			{
			ASNNo = "",
			ASNDetailNo = 0,
			TaskNo = "", //任务号
			PalletNo = model.PalletNo,
			Qty = (int)model.Qty,
			Status = "0", //等待执行
			Type = "1", //0 物料托 1 空托
			LotNo = "",
			LotText = "",
			SupplierLot = "",
			InspectMark = "0", //0 否 1 是
			BitPalletMark = "0",
			IsBale = "0",
			IsBelt = "0",
			CreateTime = Db.GetDate()
			};
			var id = Db.Insertable(modelpb).ExecuteReturnIdentity();

			var modelbb = new BllBoxInfo
			{
			ASNNo = "",
			ASNDetailNo = null,
			BindNo = id,
			PalletNo = model.PalletNo,
			Status = "1",
			CompleteTime = DateTime.Now,
			Qty = (int)model.Qty,
			FullQty = null,
			SkuNo = "100099",
			SkuName = "托盘",
			LotNo = "",
			LotText = "",
			SupplierLot = "",
			InspectStatus = "1",
			Origin = type,
			BoxNo = "",
			BoxNo2 = "",
			BoxNo3 = "",
			InspectMark = "",
			BitBoxMark = "0",

			CreateTime = datetime
			};
			Db.Insertable(modelbb).ExecuteCommand();


			// 更改托盘使用状态
			string sqlStr = string.Empty;
			sqlStr = $"update SysPallets set Status = '1' where PalletNo = '{model.PalletNo}';";
			Db.Ado.ExecuteCommand(sqlStr);
			Db.CommitTran();

			// 插入操作日志
			new OperationASNServer().AddLogOperationAsn("PDA模块", "空托入库", model.PalletNo, "添加", $"在PDA上添加了空托盘跺", 1);

			return strMsg;
			}
			@@ -1646,8 +1798,8 @@
			SupplierLot = "",
			InspectMark = "0",
			BitPalletMark = "1",
			IsBale = "0",
			IsBelt = "0",
			IsBale = arrivalnotice.IsBale,
			IsBelt = arrivalnotice.IsBelt,
			CreateUser = userId
			};
			// 插入托盘绑定表
			@@ -1720,8 +1872,8 @@
			BitPalletMark = "1",
			InspectStatus = sku.IsInspect,// 组盘的时候就要默认设定好是否合格
			PackagNo = sku.PackagNo,
			IsBale = null,
			IsBelt = null,
			IsBale = arrivalnotice.IsBale,
			IsBelt = arrivalnotice.IsBelt,
			CreateUser = userId,
			CreateTime = serverTime
			};
			@@ -1794,10 +1946,18 @@

			#region 产品组托

			public void GetBoxInfoByFuMa(string boxNo,string url)
			public void GetBoxInfoByFuMa(string boxNo,string url,string fuMaTokenUrl,string levelType)
			{
			try
			{
			if (levelType == "0")
			{
			throw new Exception("未找到该物料的箱包装级别");
			}
			if (levelType == "3")
			{
			throw new Exception("未调试该级别包装！");
			}
			var list = new List<BllBoxInfo>();

			var data = new { BoxNo = boxNo };
			@@ -1805,137 +1965,194 @@

			#region 测试版本

			//读取json文件，添加数据
			var ss = AppDomain.CurrentDomain.BaseDirectory;
			string filePath = Path.Combine(ss, "CreateBoxInfo.json");
			string json = File.ReadAllText(filePath);
			var person = JsonConvert.DeserializeObject<List<BllBoxInfo>>(json);
			////读取json文件，添加数据
			//var ss = AppDomain.CurrentDomain.BaseDirectory;
			//string filePath = Path.Combine(ss, "CreateBoxInfo.json");
			//string json = File.ReadAllText(filePath);
			//var person = JsonConvert.DeserializeObject<List<BllBoxInfo>>(json);

			var comTime = DateTime.Now;
			//添加箱码信息表中 //暂时这些写--添加数据，后续需要和赋码系统对接后根据明确返回的数据格式更改
			foreach (var item in person)
			{
			if (item.BoxNo!= boxNo)
			{
			continue;
			}
			////添加箱码信息表中 //暂时这些写--添加数据，后续需要和赋码系统对接后根据明确返回的数据格式更改
			//foreach (var item in person)
			//{
			// if (item.BoxNo!= boxNo)
			// {
			// continue;
			// }

			var sku = Db.Queryable<SysMaterials>().First(m=>m.IsDel =="0" && m.SkuNo == item.SkuNo);
			if (sku == null)
			{
			continue;
			}
			var boxInfo = new BllBoxInfo()
			{
			ASNNo = "",
			//ASNDetailNo = 0,
			OrderCode = "",
			//BindNo = 0,
			BoxNo = item.BoxNo,
			BoxNo2 = item.BoxNo2,
			BoxNo3 = item.BoxNo3,
			PalletNo = "",
			Qty = item.Qty,
			FullQty = item.FullQty,
			Status = "0",
			SkuNo = item.SkuNo,
			SkuName = sku.SkuName,
			LotNo = item.LotNo,
			LotText = item.LotText,
			SupplierLot = item.SupplierLot,
			ProductionTime = item.ProductionTime,
			ExpirationTime = item.ExpirationTime,
			//CompleteTime = comTime,
			InspectMark = item.InspectMark,
			BitBoxMark = item.BitBoxMark,
			InspectStatus = item.InspectStatus,
			Origin = "赋码",
			Standard = item.Standard,
			PackageStandard = item.PackageStandard,
			StoreTime = item.StoreTime,
			QtyOrd = item.QtyOrd,
			QtyCount = item.QtyCount,
			CreateUser = 0,
			CreateTime = comTime,
			};
			list.Add(boxInfo);
			}
			Db.Insertable(list).ExecuteCommand();
			// var sku = Db.Queryable<SysMaterials>().First(m=>m.IsDel =="0" && m.SkuNo == item.SkuNo);
			// if (sku == null)
			// {
			// continue;
			// }
			// var boxInfo = new BllBoxInfo()
			// {
			// ASNNo = "",
			// //ASNDetailNo = 0,
			// OrderCode = "",
			// //BindNo = 0,
			// BoxNo = item.BoxNo,
			// BoxNo2 = item.BoxNo2,
			// BoxNo3 = item.BoxNo3,
			// PalletNo = "",
			// Qty = item.Qty,
			// FullQty = item.FullQty,
			// Status = "0",
			// SkuNo = item.SkuNo,
			// SkuName = sku.SkuName,
			// LotNo = item.LotNo,
			// LotText = item.LotText,
			// SupplierLot = item.SupplierLot,
			// ProductionTime = item.ProductionTime,
			// ExpirationTime = item.ExpirationTime,
			// //CompleteTime = comTime,
			// InspectMark = item.InspectMark,
			// BitBoxMark = item.BitBoxMark,
			// InspectStatus = item.InspectStatus,
			// Origin = "赋码",
			// Standard = item.Standard,
			// PackageStandard = item.PackageStandard,
			// StoreTime = item.StoreTime,
			// QtyOrd = item.QtyOrd,
			// QtyCount = item.QtyCount,
			// CreateUser = 0,
			// CreateTime = comTime,
			// };
			// list.Add(boxInfo);
			//}
			//Db.Insertable(list).ExecuteCommand();

			#endregion

			#region 正式版本
			var token = new Token().GetFuMaToken(fuMaTokenUrl);
			var getParentVal = levelType == "1" ? "true" : "false";
			var getChildrenVal = levelType == "2" ? "true" : "false";
			Dictionary<string, string> paramDic = new Dictionary<string, string>
			{
			{ "Token", token }, //分配的令牌（变量）
			{ "Barcode", boxNo },//要查询的条码
			{ "getParent", getParentVal },//是否查询父码
			{ "getChildren", getChildrenVal } //是否查询子码 aaa
			};

			//程序正式发布后放开
			var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")
			var response = HttpHelper.DoGet(url, "赋码", "获取箱码信息", paramDic);
			var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss")

			////程序正式发布后放开
			//var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")
			////var response = HttpHelper.DoGet(url, jsonData, "获取箱码信息", "赋码");
			//var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss")
			//解析返回数据
			var fuMaModel = JsonConvert.DeserializeObject<FuMaGetBoxModel>(response);
			if (fuMaModel.IsSuccess)
			{
			//赋码返回信息成功状态
			if (fuMaModel.Product == null \|\| fuMaModel.Barcodes.Count == 0)
			{
			throw new Exception("产品信息或箱支信息为空");
			}

			////解析返回数据
			//var fuMaModel = JsonConvert.DeserializeObject<FuMaGetBoxModel>(response);
			//if (fuMaModel.IsSuccess)
			//{
			// //赋码返回信息成功状态
			// if (fuMaModel.Product == null \|\| fuMaModel.Barcodes.Count == 0)
			// {
			// throw new Exception("产品信息或箱支信息为空");
			// }
			if (levelType == "1")
			{
			if (fuMaModel.Barcodes.First().Barcode != boxNo)
			{
			throw new Exception("获取信息不一致");
			}

			// foreach (var item in fuMaModel.Barcodes)
			// {
			// if (item.Barcode != boxNo)
			// {
			// throw new Exception("获取信息不一致");
			// }
			var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == fuMaModel.MaterialNum);
			if (sku == null)
			{
			throw new Exception("未查询到箱码中和赋码提供的物料信息一致的数据");
			}
			var boxInfo = new BllBoxInfo()
			{
			ASNNo = "",
			//ASNDetailNo = 0,
			OrderCode = "",
			//BindNo = 0,
			BoxNo = fuMaModel.Barcodes.First().Barcode,
			PalletNo = "",
			Qty = fuMaModel.Barcodes.First().BoxItemQty,
			FullQty = fuMaModel.BoxItemQty,
			Status = "0",
			SkuNo = sku.SkuNo,
			SkuName = sku.SkuName,
			LotNo = fuMaModel.Barcodes.First().BatchNo,
			//LotText = "",
			//SupplierLot = item.SupplierLot,
			ProductionTime = DateTime.Parse(fuMaModel.Barcodes.First().ProductionDate),
			ExpirationTime = DateTime.Parse(fuMaModel.Barcodes.First().ExpirationDate),
			//CompleteTime = comTime,
			InspectMark = "0",
			BitBoxMark = fuMaModel.Barcodes.First().Status == "零箱" ? "1" : "0",
			InspectStatus = "0",
			Origin = "赋码",
			Standard = fuMaModel.Product.Spec,
			PackageStandard = fuMaModel.Product.PackageSpec,
			//StoreTime = item.StoreTime,
			//QtyOrd = item.QtyOrd,
			//QtyCount = item.QtyCount,
			CreateUser = 0,
			CreateTime = comTime,
			};
			list.Add(boxInfo);
			}
			else
			{
			foreach (var item in fuMaModel.Barcodes)
			{
			if (item.Barcode == boxNo)
			{
			continue; //获取支码时第一个码为父码
			}

			// var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == fuMaModel.Product.ProductCode);
			// if (sku == null)
			// {
			// throw new Exception("未查询到箱码中的物料信息");
			// }
			// //var boxInfo = new BllBoxInfo()
			// //{
			// // ASNNo = "",
			// // //ASNDetailNo = 0,
			// // OrderCode = "",
			// // //BindNo = 0,
			// // BoxNo = item.BoxNo,
			// // BoxNo2 = item.BoxNo2,
			// // BoxNo3 = item.Barcode,
			// // PalletNo = "",
			// // Qty = item.Qty,
			// // FullQty = item.FullQty,
			// // Status = "0",
			// // SkuNo = item.SkuNo,
			// // SkuName = sku.SkuName,
			// // LotNo = item.LotNo,
			// // LotText = item.LotText,
			// // SupplierLot = item.SupplierLot,
			// // ProductionTime = item.ProductionTime,
			// // ExpirationTime = item.ExpirationTime,
			// // //CompleteTime = comTime,
			// // InspectMark = item.InspectMark,
			// // BitBoxMark = item.BitBoxMark,
			// // InspectStatus = item.InspectStatus,
			// // Origin = "赋码",
			// // Standard = item.Standard,
			// // PackageStandard = item.PackageStandard,
			// // StoreTime = item.StoreTime,
			// // QtyOrd = item.QtyOrd,
			// // QtyCount = item.QtyCount,
			// // CreateUser = 0,
			// // CreateTime = comTime,
			// //};
			// //list.Add(boxInfo);
			// }
			// Db.Insertable(list).ExecuteCommand();
			//}
			//else
			//{
			// //赋码返回信息失败状态
			// throw new Exception($"赋码系统返回状态异常：{fuMaModel.Message}");
			//}
			var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == fuMaModel.MaterialNum);
			if (sku == null)
			{
			throw new Exception("未查询到箱码中和赋码提供的物料信息一致的数据");
			}
			var boxInfo = new BllBoxInfo()
			{
			ASNNo = "",
			//ASNDetailNo = 0,
			OrderCode = "",
			//BindNo = 0,
			BoxNo = item.ParentBarcode,
			BoxNo3 = item.Barcode,
			PalletNo = "",
			Qty = item.MinLevelCount,
			FullQty = fuMaModel.BoxItemQty,
			Status = "0",
			SkuNo = sku.SkuNo,
			SkuName = sku.SkuName,
			LotNo = item.BatchNo,
			//LotText = "",
			//SupplierLot = item.SupplierLot,
			ProductionTime = DateTime.Parse(item.ProductionDate),
			ExpirationTime = DateTime.Parse(item.ExpirationDate),
			//CompleteTime = comTime,
			InspectMark = "0",
			BitBoxMark = item.Status == "零箱" ? "1" : "0",
			InspectStatus = "0",
			Origin = "赋码",
			Standard = fuMaModel.Product.AuthorizedNo,
			PackageStandard = fuMaModel.Product.PackageSpec,
			//StoreTime = item.StoreTime,
			//QtyOrd = item.QtyOrd,
			QtyCount = (int)fuMaModel.BoxItemQty,
			CreateUser = 0,
			CreateTime = comTime,
			};
			list.Add(boxInfo);
			}
			}

			Db.Insertable(list).ExecuteCommand();
			}
			else
			{
			//赋码返回信息失败状态
			throw new Exception($"赋码系统返回状态异常：{fuMaModel.Message}");
			}
			#endregion

			}
			@@ -1950,7 +2167,7 @@
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			public List<BoxInfoDto> GetBindBoxInfos(BoxInfoVm model, string url)
			public List<BoxInfoDto> GetBindBoxInfos(BoxInfoVm model, string url, string fuMaTokenUrl)
			{
			try
			{
			@@ -1970,7 +2187,22 @@
			var count = Db.Queryable<BllBoxInfo>().Count(m => m.IsDel == "0" && m.Status == "0" && m.BoxNo == model.BoxNo);
			if (count == 0)
			{
			GetBoxInfoByFuMa(model.BoxNo, url); //从赋码系统获取箱码信息
			//获取物料包装级别
			string level = "0";
			var levelType = Db.Queryable<SysPackag>().First(w => w.IsDel == "0" && w.PackagNo == detail.SkuNo);
			if (levelType.L1Name == "箱")
			{
			level = "1";
			}
			if (levelType.L2Name == "箱")
			{
			level = "2";
			}
			if (levelType.L3Name == "箱")
			{
			level = "3";
			}
			GetBoxInfoByFuMa(model.BoxNo, url, fuMaTokenUrl, level); //从赋码系统获取箱码信息
			}
			}
			}
			@@ -2007,7 +2239,7 @@
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			public List<BoxInfoDto> GetBindBoxInfo2s(BoxInfoVm model, string url)
			public List<BoxInfoDto> GetBindBoxInfo2s(BoxInfoVm model, string url, string fuMaTokenUrl)
			{
			try
			{
			@@ -2073,7 +2305,7 @@
			}
			else
			{
			GetBoxInfoByFuMa(model.BoxNo3, url); //从赋码系统获取箱码信息
			GetBoxInfoByFuMa(model.BoxNo3, url, fuMaTokenUrl,"3"); //从赋码系统获取箱码信息
			}
			}
			}
			@@ -2421,6 +2653,7 @@

			DateTime proTime;
			DateTime expTime;
			DateTime sortTime;
			var bl1 = DateTime.TryParse(detail.Lot1, out proTime);
			var bl2 = DateTime.TryParse(detail.Lot2, out expTime);

			@@ -2449,8 +2682,8 @@
			SupplierLot = detail.SupplierLot,
			InspectMark = "0",
			BitPalletMark = "1",
			IsBale = "0",
			IsBelt = "0",
			IsBale = detail.IsBale,
			IsBelt = detail.IsBelt,
			CreateUser = userId,
			Demo = model.Demo,