From a7180aca2e4768d335ab7e11cf682dcb1b10dfc8 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 19 六月 2025 10:28:09 +0800
Subject: [PATCH] 修改pda打印标签日期格式
---
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 68 ++++++++++++++++++---------------
1 files changed, 37 insertions(+), 31 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index ba7f4bd..fc62305 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -1321,15 +1321,15 @@
{
throw new Exception("鎵樼洏娌℃湁鍑哄簱鍗曚俊鎭�");
}
- var task = Db.Queryable<LogTask>().First(m => m.PalletNo == palletNo && m.IsDel == "0" && m.Status == "5");
- if (task == null)
- {
- throw new Exception("娌℃湁鏌ヨ鍒版墭鐩樹换鍔′俊鎭�");
- }
- if (task.Status != "5")
- {
- throw new Exception("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
- }
+ //var task = Db.Queryable<LogTask>().First(m => m.PalletNo == palletNo && m.IsDel == "0" && m.Status == "5");
+ //if (task == null)
+ //{
+ // throw new Exception("娌℃湁鏌ヨ鍒版墭鐩樹换鍔′俊鎭�");
+ //}
+ //if (task.Status != "5")
+ //{
+ // throw new Exception("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
+ //}
return detail;
}
catch (Exception e)
@@ -1349,20 +1349,26 @@
try
{
Db.BeginTran();
- var task = Db.Queryable<LogTask>().First(m => m.PalletNo == palletNo && m.IsDel == "0" && m.Status == "5");
- if (task == null)
+ //var task = Db.Queryable<LogTask>().First(m => m.PalletNo == palletNo && m.IsDel == "0" && m.Status == "5");
+ //if (task == null)
+ //{
+ // throw new Exception("娌℃湁鏌ヨ鍒版墭鐩樹换鍔′俊鎭�");
+ //}
+ //if (task.Status != "5")
+ //{
+ // throw new Exception("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
+ //}
+ ////浠诲姟鐘舵�佸彉鏇翠负鎵ц瀹屾垚
+ //task.Status = "2";
+ //Db.Updateable(task).ExecuteCommand();
+ var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo).ToList();
+ if (stockDetail.Count == 0)
{
- throw new Exception("娌℃湁鏌ヨ鍒版墭鐩樹换鍔′俊鎭�");
+ throw new Exception("搴撳瓨鎵樼洏娌℃湁淇℃伅");
}
- if (task.Status != "5")
- {
- throw new Exception("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
- }
- //浠诲姟鐘舵�佸彉鏇翠负鎵ц瀹屾垚
- task.Status = "2";
- Db.Updateable(task).ExecuteCommand();
- var locatList = Db.Queryable<SysStorageLocat>().Where(m=>m.WareHouseNo == "W04" && (m.AreaNo == "B06" || m.AreaNo == "B07") && m.IsDel == "0").ToList();
- var locat = locatList.FirstOrDefault(m => m.LocatNo == task.EndLocat);
+ var locate = stockDetail.First().LocatNo;
+ var locatList = Db.Queryable<SysStorageLocat>().Where(m=>m.WareHouseNo == "W04" && (m.AreaNo == "B06" || m.AreaNo == "B07" || m.AreaNo == "B09") && m.IsDel == "0").ToList();
+ var locat = locatList.FirstOrDefault(m => m.LocatNo == locate);
//鍒ゆ柇鎵樼洏鍌ㄤ綅鏄惁鍦ㄨ溅闂�
if (locat == null)
{
@@ -1371,7 +1377,7 @@
locat.Status = "0";
Db.Updateable(locat).ExecuteCommand();
//鍒ゆ柇鎵樼洏淇℃伅
- var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo).ToList();
+
foreach (var item in stockDetail)
{
if (item.UDF5 != "1" || string.IsNullOrWhiteSpace(item.SONo))
@@ -1383,7 +1389,7 @@
//item.RoadwayNo = "";
//item.AreaNo = "";
item.LocatNo = "";
- item.PalletNo = "";
+ //item.PalletNo = "";
item.LockQty = 0; // 閿佸畾鏁伴噺鏇翠负0
item.Status = "0"; // 鐘舵�佸彉涓哄緟鍒嗛厤
var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.StockDetailId == item.Id).ToList();
@@ -1396,15 +1402,15 @@
}
Db.Updateable(stockDetail).ExecuteCommand();
//鎵樼洏鍙樻洿鐘舵��
- var pallet = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNo);
- if (pallet == null)
- {
- throw new Exception("娌℃湁鏌ヨ鍒版墭鐩樹俊鎭�");
- }
- pallet.Status = "0";
- Db.Updateable(pallet).ExecuteCommand();
+ //var pallet = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNo);
+ //if (pallet == null)
+ //{
+ // throw new Exception("娌℃湁鏌ヨ鍒版墭鐩樹俊鎭�");
+ //}
+ //pallet.Status = "0";
+ //Db.Updateable(pallet).ExecuteCommand();
//娣诲姞鎿嶄綔鏃ュ織
- new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "鎿嶄綔鏃ュ織", palletNo, "缂栬緫", $"杞﹂棿鏀惰揣锛歿palletNo}鎵樼洏鏀惰揣", userId);
+ new OperationCrServer().AddLogOperationCr("PDA妯″潡", "杞﹂棿鏀惰揣", palletNo, "瀹屾垚", $"杞﹂棿鏀惰揣锛歿palletNo}鎵樼洏鏀惰揣", userId);
Db.CommitTran();
}
catch (Exception e)
--
Gitblit v1.8.0