From 05fdade2564f0880fcba935aadf12e79a467764b Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 18 三月 2025 00:15:47 +0800
Subject: [PATCH] 优化清点逻辑
---
Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs b/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
index 69f11c8..f00575a 100644
--- a/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
@@ -21,7 +21,7 @@
{
public ICount_BIZ_U9_ASN Init(string id, string userCode, string apiHost, string orgCode)
{
- base.Init(id, apiHost, userCode, orgCode);
+ base.Init(id, userCode, apiHost, orgCode);
//鍔犺浇宸茬粡娓呯偣鏁版嵁
LoadData();
Logger.Console.Info($"Start {this.GetType().Name} Transaction[ID: {TransID}]");
@@ -41,8 +41,7 @@
/// </summary>
private void LoadData()
{
- var orders = MainDB.Queryable<BIZ_U9_ASN>().Where(q => ("," + q.RECEIVER + ",").Contains("," + UserCode + ",")).ToList();
- OrderList = orders.Select(q => q.ORDER_NO).ToList();
+ OrderList = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.RECEIVER == UserCode && SqlFunc.Subqueryable<BIZ_U9_ASN>().Where(s => s.ORDER_NO == q.ORDER_NO && s.STATUS == BIZ_U9_ASN.STATUSs.Counting.GetValue()).Any()).Select(q => q.ORDER_NO).ToList();
}
/// <summary>
/// 鎵弿鍏ュ彛
@@ -139,7 +138,7 @@
{
action.IsSuccessed = false;
//action.LocaleMsg = Biz.L("鐗╂枡缂栫爜[{0}]涓嶅瓨鍦ㄦ垨鑰呰鐗╂枡鏈惎鐢�");
- action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemCodeNotExistsOrNotActive", inv.ItemInfo.ITEM_CODE.IsNullOrEmpty(inv.Barcode.ItemCode));
+ action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemCodeNotExistsOrNotActive", (inv.ItemInfo?.ITEM_CODE).IsNullOrEmpty(inv.Barcode.ItemCode));
return action;
}
@@ -155,8 +154,7 @@
AUTH_ORG = input.AuthOption.CurOrg,
STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue(),
QTY = inv.Barcode.Qty.ToDouble(),
- PROD_DATE = inv.Barcode.DateCode.ToDateTime(),
- ERP_WH = CurScanShelf.WarehouseCode,
+ PROD_DATE = (inv.Barcode.DateCode?? DateTime.Now.ToString("yyyy-MM-dd")).ToDateTime(),
UNIT = inv.Barcode.Unit,
};
@@ -166,7 +164,6 @@
AUTH_ORG = input.AuthOption.CurOrg,
ITEM_CODE = inv.Barcode.ItemCode,
QTY = inv.Barcode.Qty.ToDouble(),
- ERP_WH = CurScanShelf.WarehouseCode,
UNIT = inv.Barcode.Unit,
};
@@ -201,12 +198,12 @@
{
foreach (var item in inv.Items)
{
- item.ERP_WH = CurScanShelf.WarehouseCode;
+ item.ERP_WH = "";
item.AUTH_ORG = input.AuthOption.CurOrg;
}
foreach (var item in inv.Packages)
{
- item.ERP_WH = CurScanShelf.WarehouseCode;
+ item.ERP_WH = "";
item.AUTH_ORG = input.AuthOption.CurOrg;
}
}
@@ -475,11 +472,11 @@
return Orders;
}
- /// <summary>
- /// 璁剧疆鏀惰揣鍗曟槑缁嗚禒鍝佹暟閲�
- /// </summary>
- /// <returns></returns>
- public async Task<ApiAction> SetGiftQty(BaseInput input)
+ /// <summary>
+ /// 鐢熸垚鏀惰揣鍗曪細璋冪敤U9鏂板鏀惰揣鍗曟帴鍙�
+ /// </summary>
+ /// <returns></returns>
+ public async Task<ApiAction> SetGiftQty(BaseInput input)
{
var action = new ApiAction();
try
--
Gitblit v1.9.3