From 09318297f1a2b732d343ccebce4a514dffc4d495 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 26 十二月 2024 16:13:40 +0800
Subject: [PATCH] 基础上架更新
---
Tiger.Business.MES/iERP/U9C_MES.cs | 50 ++++++++--------
Tiger.Business.WMS/Transaction/In_Default.cs | 75 +++++++++++++------------
2 files changed, 64 insertions(+), 61 deletions(-)
diff --git a/Tiger.Business.MES/iERP/U9C_MES.cs b/Tiger.Business.MES/iERP/U9C_MES.cs
index 7c8579c..be930b5 100644
--- a/Tiger.Business.MES/iERP/U9C_MES.cs
+++ b/Tiger.Business.MES/iERP/U9C_MES.cs
@@ -86,8 +86,8 @@
}
Logger.Scheduler.Info($"鐗╂枡淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{items.Count}]");
db = Biz.Db;
- var dbTran = db.UseTran(() =>
- {
+ //var dbTran = db.UseTran(() =>
+ //{
if (items.Any())
{
if (items.Count > 100)
@@ -131,12 +131,12 @@
s.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
}
}
- });
- if (!dbTran.IsSuccess)
- {
- action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
- Logger.Scheduler.Error(action.Message);
- }
+ //});
+ //if (!dbTran.IsSuccess)
+ //{
+ // action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
+ // Logger.Scheduler.Error(action.Message);
+ //}
Logger.Scheduler.Info($"鐗╂枡淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]");
action.Message = $"鐗╂枡淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]";
return action;
@@ -340,8 +340,8 @@
}
Logger.Scheduler.Info($"瀹㈡埛淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{items.Count}]");
db = Biz.Db;
- var dbTran = db.UseTran(() =>
- {
+ //var dbTran = db.UseTran(() =>
+ // {
if (items.Any())
{
if (items.Count > 100)
@@ -365,12 +365,12 @@
}
}
- });
- if (!dbTran.IsSuccess)
- {
- action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
- Logger.Scheduler.Error(action.Message);
- }
+ // });
+ //if (!dbTran.IsSuccess)
+ //{
+ // action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
+ // Logger.Scheduler.Error(action.Message);
+ //}
Logger.Scheduler.Info($"瀹㈡埛淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]");
action.Message = $"瀹㈡埛淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]";
return action;
@@ -414,9 +414,9 @@
}
Logger.Scheduler.Info($"渚涘簲鍟嗕俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{items.Count}]");
db = Biz.Db;
- var dbTran = db.UseTran(() =>
- {
- if (items.Any())
+ //var dbTran = db.UseTran(() =>
+ // {
+ if (items.Any())
{
if (items.Count > 100)
{
@@ -439,12 +439,12 @@
}
}
- });
- if (!dbTran.IsSuccess)
- {
- action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
- Logger.Scheduler.Error(action.Message);
- }
+ //});
+ //if (!dbTran.IsSuccess)
+ //{
+ // action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
+ // Logger.Scheduler.Error(action.Message);
+ //}
Logger.Scheduler.Info($"渚涘簲鍟嗕俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{items.Count}]");
action.Message = $"渚涘簲鍟嗕俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{items.Count}]";
return action;
diff --git a/Tiger.Business.WMS/Transaction/In_Default.cs b/Tiger.Business.WMS/Transaction/In_Default.cs
index dbcca40..75371a2 100644
--- a/Tiger.Business.WMS/Transaction/In_Default.cs
+++ b/Tiger.Business.WMS/Transaction/In_Default.cs
@@ -97,26 +97,26 @@
action.LocaleMsg = result.LocaleMsg;
return action;
}
- CurInvItem = result.Data as Inventory;
+ var inv = result.Data as Inventory;
//楠岃瘉鏉＄爜鏄惁姝ｇ‘
- if (new[] { WMS_ITEM.STATUSs.InStore, WMS_ITEM.STATUSs.Loaded, WMS_ITEM.STATUSs.UseUp }.Contains(CurInvItem.Status))
+ if (new[] { WMS_ITEM.STATUSs.InStore, WMS_ITEM.STATUSs.Loaded, WMS_ITEM.STATUSs.UseUp }.Contains(inv.Status))
{
action.IsSuccessed = false;
//action.LocaleMsg = Biz.L("鐘舵�乕{0}]寮傚父锛岃閲嶆柊鎵弿");
- action.LocaleMsg = Biz.L("WMS.Default.ScanItem.StatusException", string.Join(',', CurInvItem.StatusList.Select(q => q.GetDesc())));
+ action.LocaleMsg = Biz.L("WMS.Default.ScanItem.StatusException", string.Join(',', inv.StatusList.Select(q => q.GetDesc())));
return action;
}
//鐗╂枡楠岃瘉
- if (CurInvItem.ItemInfo.IsNullOrEmpty() || CurInvItem.ItemInfo.IS_ACTIVE == "N")
+ if (inv.ItemInfo.IsNullOrEmpty() || inv.ItemInfo.IS_ACTIVE == "N")
{
action.IsSuccessed = false;
//action.LocaleMsg = Biz.L("鐗╂枡缂栫爜[{0}]涓嶅瓨鍦ㄦ垨鑰呰鐗╂枡鏈惎鐢�");
- action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemCodeNotExistsOrNotActive", CurInvItem.ItemInfo.ITEM_CODE.IsNullOrEmpty(CurInvItem.Barcode.ItemCode));
+ action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemCodeNotExistsOrNotActive", inv.ItemInfo.ITEM_CODE.IsNullOrEmpty(inv.Barcode.ItemCode));
return action;
}
- if (CurInvItem.Items.Count == 0)
+ if (inv.Items.Count == 0)
{
List<WMS_ITEM_HIS> ItemHistorys = new List<WMS_ITEM_HIS>();
WMS_ITEM Item;
@@ -124,63 +124,63 @@
Item = new()
{
- SN = CurInvItem.Barcode.SN,
- ITEM_CODE = CurInvItem.Barcode.ItemCode,
+ SN = inv.Barcode.SN,
+ ITEM_CODE = inv.Barcode.ItemCode,
AUTH_ORG = input.AuthOption.CurOrg,
STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue(),
- QTY = CurInvItem.Barcode.Qty.ToDecimal(),
- PROD_DATE = CurInvItem.Barcode.DateCode.ToDateTime(),
+ QTY = inv.Barcode.Qty.ToDecimal(),
+ PROD_DATE = inv.Barcode.DateCode.ToDateTime(),
ERP_WH = CurScanShelf.WarehouseCode,
- UNIT = CurInvItem.Barcode.Unit,
+ UNIT = inv.Barcode.Unit,
};
WMS_ITEM_HIS his = new(Item, $"鏍囧噯涓婃灦鍏ュ簱");
ItemHistorys.Add(his);
ItemPkgs = new()
{
- SN = CurInvItem.Barcode.SN,
+ SN = inv.Barcode.SN,
AUTH_ORG = input.AuthOption.CurOrg,
- ITEM_CODE = CurInvItem.Barcode.ItemCode,
- QTY = CurInvItem.Barcode.Qty.ToDecimal(),
+ ITEM_CODE = inv.Barcode.ItemCode,
+ QTY = inv.Barcode.Qty.ToDecimal(),
ERP_WH = CurScanShelf.WarehouseCode,
- UNIT = CurInvItem.Barcode.Unit,
+ UNIT = inv.Barcode.Unit,
};
- var noExt = CurInvItem.Items.Where(q => !CurInvItem.ItemsExt.Any(s => s.SN == q.SN)).ToList();
+ var noExt = inv.Items.Where(q => !inv.ItemsExt.Any(s => s.SN == q.SN)).ToList();
//鎵╁睍琛ㄤ笉瀛樺湪鏃舵柊寤�
foreach (var item in noExt)
{
- CurInvItem.ItemsExt.Add(new()
+ inv.ItemsExt.Add(new()
{
SN = item.SN,
- META_SN = CurInvItem.Barcode.MetaSn,
- QR_CODE = CurInvItem.Barcode.MetaSn
+ META_SN = inv.Barcode.MetaSn,
+ QR_CODE = inv.Barcode.MetaSn
});
}
- CurInvItem.Items.Add(Item);
- CurInvItem.History.Add(his);
- CurInvItem.Packages.Add(ItemPkgs);
+ inv.Items.Add(Item);
+ inv.History.Add(his);
+ inv.Packages.Add(ItemPkgs);
}
- else if (CurInvItem.Items.Count == 1)
+ else if (inv.Items.Count == 1)
{
- CurInvItem.Items.First().QTY = CurInvItem.Barcode.Qty.ToDecimal();
- CurInvItem.Items.First().ERP_WH = CurScanShelf.WarehouseCode;
- CurInvItem.Items.First().AUTH_ORG = input.AuthOption.CurOrg;
+ inv.Items.First().QTY = inv.Barcode.Qty.ToDecimal();
+ inv.Items.First().ERP_WH = CurScanShelf.WarehouseCode;
+ inv.Items.First().AUTH_ORG = input.AuthOption.CurOrg;
- CurInvItem.Packages.First().QTY = CurInvItem.Barcode.Qty.ToDecimal();
- CurInvItem.Packages.First().ERP_WH = CurScanShelf.WarehouseCode;
- CurInvItem.Packages.First().AUTH_ORG = input.AuthOption.CurOrg;
+ inv.Packages.First().QTY = inv.Barcode.Qty.ToDecimal();
+ inv.Packages.First().ERP_WH = CurScanShelf.WarehouseCode;
+ inv.Packages.First().AUTH_ORG = input.AuthOption.CurOrg;
}
//濡傛灉鎵弿澶栫鐨勪笉鑳芥洿鏂版暟閲�
else
{
- foreach (var item in CurInvItem.Items)
+ foreach (var item in inv.Items)
{
item.ERP_WH = CurScanShelf.WarehouseCode;
item.AUTH_ORG = input.AuthOption.CurOrg;
}
- foreach (var item in CurInvItem.Packages)
+ foreach (var item in inv.Packages)
{
item.ERP_WH = CurScanShelf.WarehouseCode;
item.AUTH_ORG = input.AuthOption.CurOrg;
@@ -188,27 +188,28 @@
}
//妫�鏌ョ墿鏂欐暟閲忥紝濡傛灉娌℃湁鍒欐煡璇㈤泤杈炬潯鐮佷富妗ｏ紝鎶婃暟閲忚繑鍥炲墠绔‘璁�
- if (CurInvItem.Items.Any(q => q.QTY <= 0))
+ if (inv.Items.Any(q => q.QTY <= 0))
{
- var qtyList = Biz.DataSource["YadaU9C"].Client.Queryable<mes_MaterialBarCode>().Where(q => CurInvItem.Items.Select(q => q.SN).Contains(q.Code)).ToList();
+ var qtyList = Biz.DataSource["YadaU9C"].Client.Queryable<mes_MaterialBarCode>().Where(q => inv.Items.Select(q => q.SN).Contains(q.Code)).ToList();
foreach (var qty in qtyList)
{
- var item = CurInvItem.Items.First(q => q.SN == qty.Code);
+ var item = inv.Items.First(q => q.SN == qty.Code);
item.QTY = qty.WhQty;
}
- action.Data.Data = CurInvItem.Items.Select(q => new { q.SN, q.QTY });
+ action.Data.Data = inv.Items.Select(q => new { q.SN, q.QTY });
action.Data.Command = Command = "ComfirmQty";
//action.LocaleMsg = Biz.L("璇风‘璁ゆ潯鐮乕{0}]鐨勬暟閲忔槸鍚︽纭�");
action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ComfirmQty", input.SN);
return action;
}
+ CurInvItem = inv;
}
//鏇存柊宸茬‘璁ょ墿鏂欐暟閲�
if (Command == "ComfirmQty")
{
var qtyList = (input.Data ?? "").JsonToObject<List<WMS_ITEM>>() ?? new List<WMS_ITEM>();
- if (qtyList.Any(q => q.QTY <= 0))
+ if (!qtyList.Any() || qtyList.Any(q => q.QTY <= 0))
{
action.IsSuccessed = false;
action.Data.Data = CurInvItem.Items.Select(q => new { q.SN, q.QTY });
@@ -278,6 +279,7 @@
action.IsSuccessed = false;
//action.LocaleMsg = Biz.L("鍌ㄤ綅[{0}]鍙兘瀛樻斁涓�涓墿鏂�");
action.LocaleMsg = Biz.L("WMS.Default.ScanItem.LocationSingleFailure", nLocation.LOCATION_CODE);
+ CurInvItem = null;
return action;
}
@@ -292,6 +294,7 @@
{
action.IsSuccessed = false;
action.LocaleMsg = putonResult.LocaleMsg;
+ CurInvItem = null;
return action;
}
PutOnInfo putOnInfo = putonResult.Data;
--
Gitblit v1.9.3