JC24WMS.git - Gitblit

			@@ -1699,9 +1699,73 @@
			var data = new { BoxNo = boxNo };
			var jsonData = JsonConvert.SerializeObject(data);

			#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);

			var comTime = DateTime.Now;
			//添加箱码信息表中 //暂时这些写--添加数据，后续需要和赋码系统对接后根据明确返回的数据格式更改
			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();

			#endregion

			#region 正式版本


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

			////解析返回数据
			@@ -1709,55 +1773,13 @@
			//if (fuMaModel.Success == 0)
			//{

			var datas = Assembly.GetExecutingAssembly();
			var s = "0";
			//string filePath = "Assembly.GetExecutingAssembly()";
			//string json = File.ReadAllText(filePath);
			//var person = JsonConvert.DeserializeObject<BllBoxInfo>(json);

			//var comTime = DateTime.Now;
			////添加箱码信息表中 //暂时这些写--添加数据，后续需要和赋码系统对接后根据明确返回的数据格式更改
			//var boxInfo = new BllBoxInfo()
			//{
			// ASNNo = "",
			// //ASNDetailNo = 0,
			// OrderCode = "",
			// //BindNo = 0,
			// BoxNo = person.BoxNo,
			// BoxNo2 = "",
			// BoxNo3 = "",
			// PalletNo = "",
			// Qty = 0,
			// FullQty = 0,
			// Status = "0",
			// SkuNo = "",
			// SkuName = "",
			// LotNo = "",
			// LotText = "",
			// SupplierLot = "",
			// ProductionTime = DateTime.Now,
			// ExpirationTime = DateTime.Now,
			// //CompleteTime = comTime,
			// InspectMark = "0",
			// BitBoxMark = "0",
			// InspectStatus = "0",
			// Origin = "赋码",
			// Standard = "box.Standard",
			// PackageStandard = "box.PackageStandard",
			// StoreTime = DateTime.Now,
			// CreateUser = 0,
			// CreateTime = comTime,
			//};
			//Db.Insertable(boxInfo).ExecuteCommand();

			//}
			//if (fuMaModel.Success == -1)
			//{
			// throw new Exception($"赋码系统返回状态异常：{fuMaModel.Message}");
			//}

			#endregion


			}
			catch (Exception e)
			{
			@@ -1781,7 +1803,7 @@
			var count = Db.Queryable<BllBoxInfo>().Count(m => m.IsDel == "0" && m.Status == "0" && m.BoxNo == model.BoxNo);
			if (count == 0)
			{
			GetBoxInfoByFuMa("",""); //从赋码系统获取箱码信息
			GetBoxInfoByFuMa(model.BoxNo, ""); //从赋码系统获取箱码信息
			}

			string sqlString = $@"SELECT

New file
			@@ -0,0 +1,46 @@
			[
			{
			"OrderCode": "", //明细生产单据号
			"BoxNo": "B2408190001000005", //箱号
			"BoxNo2": "", //盒号
			"BoxNo3": "Z24081900010009", //支号
			"Qty": 1, //数量
			"FullQty": 2, //满箱数量
			"SkuNo": "00001", //物料编码
			"SkuName": "测试物料1", //物料名称
			"LotNo": "CPPC240818001", //批次
			"LotText": "", //批次描述
			"ProductionTime": "2024-08-19T02:16:45.301Z", //生产日期
			"ExpirationTime": "2025-08-19T02:16:45.301Z", //过期日期
			"InspectMark": "0", //检验/抽检标记 0否 1是
			"BitBoxMark": "0", //零箱标记 0否代表整箱 1是代表零箱
			"InspectStatus": "0", //质检状态 0待检验 1合格 2不合格 3放置期
			"Standard": "", //物料规格
			"PackageStandard": "", //包装规格
			"StoreTime": "2025-08-19T02:16:45.301Z", //储存期至
			"QtyOrd": 5, //第几件
			"QtyCount": 5 //总件数
			},
			{
			"OrderCode": "", //明细生产单据号
			"BoxNo": "B2408190001000005", //箱号
			"BoxNo2": "", //盒号
			"BoxNo3": "Z24081900010010", //支号
			"Qty": 1, //数量
			"FullQty": 2, //满箱数量
			"SkuNo": "00001", //物料编码
			"SkuName": "测试物料1", //物料名称
			"LotNo": "CPPC240818001", //批次
			"LotText": "", //批次描述
			"ProductionTime": "2024-08-19T02:16:45.301Z", //生产日期
			"ExpirationTime": "2025-08-19T02:16:45.301Z", //过期日期
			"InspectMark": "0", //检验/抽检标记 0否 1是
			"BitBoxMark": "0", //零箱标记 0否代表整箱 1是代表零箱
			"InspectStatus": "0", //质检状态 0待检验 1合格 2不合格 3放置期
			"Standard": "", //物料规格
			"PackageStandard": "", //包装规格
			"StoreTime": "2025-08-19T02:16:45.301Z", //储存期至
			"QtyOrd": 5, //第几件
			"QtyCount": 5 //总件数
			}
			]

	Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs	112 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/Wms/CreateBoxInfo.json	46 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史