From 286db121ac6b7e56b1b579ebcdd191526890f4af Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 02 一月 2025 13:22:07 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index 62822c6..b4bb031 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -1358,6 +1358,8 @@
try
{
#region 鍒ゆ柇淇℃伅
+ //寮�鍚簨鍔�
+ Db.BeginTran();
var stockDetail = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.PalletNo == palletNo).ToList();
if (stockDetail.Count == 0)
@@ -1374,6 +1376,8 @@
throw new Exception("璇ユ墭鐩樻湭鍦ㄥ钩搴撳唴,璇锋鏌�!");
}
+
+
//璧峰鍌ㄤ綅淇℃伅
var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == locatNo);
if (storageLocat == null)
@@ -1389,8 +1393,7 @@
#endregion
- //寮�鍚簨鍔�
- Db.BeginTran();
+
//闇�鍏堝垽鏂洰鏍囧湴鍧�鍓嶆柟鏄惁鏈夌┖鍌ㄤ綅
@@ -1422,8 +1425,18 @@
{
throw new Exception("鎵樼洏涓婄墿鏂欑鐮佷俊鎭笉瀛樺湪,璇锋鏌�!");
}
+ //var boxno = boxInfo.GroupBy(w => w.BoxNo).ToList();
+ var boxno = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.StockDetailId == item.Id).GroupBy(m => new
+ {
+ m.BoxNo
+ }).Select(it => new DataBoxInfo()
+ {
+ BoxNo = it.BoxNo
+ }).ToList();
+
//璁板綍鎵樼洏涓婁俊鎭粰MES
- foreach (var item2 in boxInfo) {
+ foreach (var item2 in boxno) {
+ var a = item.ProductionTime.ToString();
data.Add(new RequertBeiliaoInfoModel()
{
no = item2.BoxNo,
@@ -1431,8 +1444,8 @@
materiel_name = item.SkuName,
qty = item.Qty,
batch = item.LotNo,
- producttime = item.ProductionTime,
- expiry = item.ExpirationTime
+ producttime = item.ProductionTime.ToString().Substring(0,10),
+ expiry = item.ExpirationTime.ToString().Substring(0, 10)
});
}
@@ -1459,14 +1472,16 @@
if (EndLocat != null && EndLocat.AreaNo == "B12")
{
//鑾峰彇浠ょ墝
- var token = new Token().GetMesToken(mesTokenUrl);
+ //var token = new Token().GetMesToken(mesTokenUrl);
+ var token = "";
Dictionary<string, string> mesDic = new Dictionary<string, string>()
{
{"Authorization",token }
};
+ var mescode = Db.Queryable<BllExportNotice>().Where(w => w.SONo == stockDetail.First().SONo).First();
var mesData = new RequertBeiliaoModel()
{
- morder_no = stockDetail.First().SONo,
+ morder_no = mescode.OrderCode,
pallet = stockDetail.First().PalletNo,
layer_no = EndLocat.LocatNo,
items = data
@@ -1476,7 +1491,7 @@
var response = HttpHelper.DoPost(mesUrl, jsonData, "澶囨枡瀹屾垚杩愯嚦缂撳瓨鍖哄弽棣堣嚦MES", "MES", mesDic);
var obj = JsonConvert.DeserializeObject<MesModel>(response);//瑙ｆ瀽杩斿洖鏁版嵁
- if (obj.status != "0")
+ if (obj.status != "success")
{
throw new Exception("澶囨枡鍚屾MES澶辫触锛�" + obj.message);
}
@@ -1501,7 +1516,6 @@
}
-
#endregion
#region 绠辩爜鏌ヨ
--
Gitblit v1.8.0