From cbd1f3d097cb7227df4d39c33fe2fff19ee1591b Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期三, 12 十一月 2025 15:13:46 +0800
Subject: [PATCH] 柱状图和饼图样式间距
---
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index ecce9ae..76aa178 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -143,10 +143,14 @@
var newPalletInfo = await Db.Queryable<SysPallets>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Status == "0");
if (newPalletInfo == null)
{
- var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew &&(m.SkuNo != stockDetail.SkuNo || m.LotNo != stockDetail.LotNo)).ToList();
+ throw Oops.Bah("鏂版墭鐩樹俊鎭笉瀛樺湪锛�");
+ }
+ if (newPalletInfo.Status == "0")
+ {
+ var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && (m.SkuNo != stockDetail.SkuNo || m.LotNo != stockDetail.LotNo)).ToList();
if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
{
- throw Oops.Bah("鏂版墭鐩樹俊鎭笉瀛樺湪鎴栧凡琚娇鐢紒");
+ throw Oops.Bah("涓�涓墭鐩樺彧鑳芥帴鍙椾竴涓嚭搴撳崟鎷兼墭锛�");
}
}
else
@@ -442,22 +446,26 @@
var locateStr = stockDetail.LocatNo;
await Db.Deleteable(stockDetail).ExecuteCommandAsync();
- //鏀瑰彉鎵樼洏鐘舵��
- var pallet = await Db.Queryable<SysPallets>().FirstAsync(m => m.PalletNo == palletNo && m.IsDel == "0");
- if (pallet == null)
+ var detailOther = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.PalletNo == stockDetail.PalletNo && w.Id != stockDetail.Id).ToList();
+ if (detailOther.Count <= 0)
{
- throw Oops.Bah("鏈湪鎵樼洏琛ㄤ腑鏌ヨ鍒版墭鐩樹俊鎭�");
- }
- pallet.Status = "0";
- await Db.Updateable(pallet).ExecuteCommandAsync();
+ //鏀瑰彉鎵樼洏鐘舵��
+ var pallet = await Db.Queryable<SysPallets>().FirstAsync(m => m.PalletNo == palletNo && m.IsDel == "0");
+ if (pallet == null)
+ {
+ throw Oops.Bah("鏈湪鎵樼洏琛ㄤ腑鏌ヨ鍒版墭鐩樹俊鎭�");
+ }
+ pallet.Status = "0";
+ await Db.Updateable(pallet).ExecuteCommandAsync();
- //鏇存敼鍌ㄤ綅鐘舵�佷负绌哄偍浣�
- var locate = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.LocatNo == locateStr);
- if (locate != null)
- {
- locate.Status = "0";
- Db.Updateable(locate).ExecuteCommand();
- }
+ //鏇存敼鍌ㄤ綅鐘舵�佷负绌哄偍浣�
+ var locate = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.LocatNo == locateStr);
+ if (locate != null)
+ {
+ locate.Status = "0";
+ Db.Updateable(locate).ExecuteCommand();
+ }
+ }
}
else
{
--
Gitblit v1.8.0