JC24WMS.git - Gitblit

			@@ -44,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贴标
			{
			@@ -257,6 +257,42 @@
			else
			{
			sqlMsg = "-1:托盘号不存在!";
			}

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



			/// <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;
			@@ -1762,8 +1798,8 @@
			SupplierLot = "",
			InspectMark = "0",
			BitPalletMark = "1",
			IsBale = "0",
			IsBelt = "0",
			IsBale = arrivalnotice.IsBale,
			IsBelt = arrivalnotice.IsBelt,
			CreateUser = userId
			};
			// 插入托盘绑定表
			@@ -1836,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
			};
			@@ -1921,62 +1957,62 @@

			#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

			@@ -1989,7 +2025,7 @@
			{ "Token", token }, //分配的令牌（变量）
			{ "Barcode", boxNo },//要查询的条码
			{ "getParent", getParentVal },//是否查询父码
			{ "getChildren", getChildrenVal } //是否查询子码
			{ "getChildren", getChildrenVal } //是否查询子码 aaa
			};

			//程序正式发布后放开
			@@ -2014,10 +2050,10 @@
			throw new Exception("获取信息不一致");
			}

			var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == fuMaModel.Product.ProductCode);
			var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == fuMaModel.MaterialNum);
			if (sku == null)
			{
			throw new Exception("未查询到箱码中的物料信息");
			throw new Exception("未查询到箱码中和赋码提供的物料信息一致的数据");
			}
			var boxInfo = new BllBoxInfo()
			{
			@@ -2546,6 +2582,7 @@

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

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