From bdc8b254881714e9f3caee40666ffa7318dfd9ff Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期二, 20 八月 2024 16:47:16 +0800
Subject: [PATCH] 修改pda获取箱码信息接口
---
Wms/Wms/CreateBoxInfo.json | 46 +++++++++++++++
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 112 ++++++++++++++++++++++---------------
2 files changed, 113 insertions(+), 45 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index fdbe63d..71607ea 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -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
diff --git a/Wms/Wms/CreateBoxInfo.json b/Wms/Wms/CreateBoxInfo.json
new file mode 100644
index 0000000..fd5eb8f
--- /dev/null
+++ b/Wms/Wms/CreateBoxInfo.json
@@ -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 //总件数
+ }
+]
--
Gitblit v1.8.0