From 77da8b9247b9df926678cfb7e4af0f0900f3a084 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 13 五月 2025 18:32:52 +0800
Subject: [PATCH] 修复了一些已知问题
---
Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs b/Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs
index d13fe63..39c1534 100644
--- a/Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs
@@ -21,7 +21,6 @@
/// </summary>
public class In_BIZ_U9_RECEIPT : WmsTask, IIn_BIZ_U9_RECEIPT
{
-
public IIn_BIZ_U9_RECEIPT Init(string id, string userCode, string apiHost, string orgCode)
{
base.Init(id, userCode, apiHost, orgCode);
@@ -71,7 +70,7 @@
action.LocaleMsg = Biz.L("WMS.Default.ScanItem.SnEmptyFailure");
return SetOutPutMqttMsg(action, input.Locale);
}
- //鍒ゆ柇鎵弿鐨勬槸鍚﹁揣鏋�
+ //鍒ゆ柇鎵弿鐨勬槸鍚﹁揣鏋�/鍌ㄤ綅
var whUnit = await MainDB.Queryable<V_WH_UNIT>().Where(t => (t.SHELF_CODE.ToUpper() == input.SN || t.LOCATION_CODE.ToUpper() == input.SN) && t.AUTH_ORG == OrgCode).IncludesAllFirstLayer().FirstAsync();
//if (string.IsNullOrEmpty(CurScanShelf?.ShelfCode))
if (!whUnit.IsNullOrEmpty() || string.IsNullOrEmpty(CurScanShelf?.ShelfCode))
@@ -308,6 +307,11 @@
sn.STATUS = WMS_ITEM.STATUSs.InStore.GetValue();
sn.IS_IN = "Y";
}
+ //璁剧疆褰撳墠鐗╂枡鐨勯粯璁ゅ偍浣�
+ if (CurInvItem.ItemInfo.DEFAULT_LOCATION.IsNullOrEmpty())
+ {
+ SetDefaultLocation(MainDB, CurInvItem.ItemInfo, nLocation, receiptDtl.ID.ToInt64());
+ }
//濡傛灉褰撳墠琛屼笂鏋跺畬鎴愭爣璁颁负寰呭鏍�
receiptDtl.QTY_IN = receipt.SnList.Where(q => q.LINE_NO == receiptDtl.LINE_NO && q.STATUS == WMS_ITEM.STATUSs.InStore.GetValue()).Sum(q => q.QTY);
if (receiptDtl.QTY_IN == receiptDtl.QTY_OK)
@@ -369,14 +373,16 @@
});
//瀹屾垚鎵�鏈夊鐞嗗悗浣跨敤浜嬪姟淇濆瓨鏁版嵁
- action = DoIfFinish(action, input.Locale, () =>
- {
- //璁剧疆褰撳墠鐗╂枡鐨勯粯璁ゅ偍浣�
- if (CurInvItem.ItemInfo.DEFAULT_LOCATION.IsNullOrEmpty())
- {
- SetDefaultLocation(MainDB, CurInvItem.ItemInfo, nLocation);
- }
- });
+ action = DoIfFinish(action, input.Locale
+ //, () =>
+ //{
+ // //璁剧疆褰撳墠鐗╂枡鐨勯粯璁ゅ偍浣�
+ // if (CurInvItem.ItemInfo.DEFAULT_LOCATION.IsNullOrEmpty())
+ // {
+ // SetDefaultLocation(MainDB, CurInvItem.ItemInfo, nLocation, receiptDtl.ID.ToInt64());
+ // }
+ //}
+ );
//if (!action.Data.Data.IsNullOrEmpty() && action.Data.Data is DefaultInStoreOutput)
//{
// (action.Data.Data as DefaultInStoreOutput).OrderInfo = receipt;
@@ -535,15 +541,18 @@
public async Task<ApiAction<PageAble<BIZ_U9_RECEIPT>>> GetOrderList(BaseInputWithPage input)
{
var action = new ApiAction<PageAble<BIZ_U9_RECEIPT>>();
- var query = Biz.DataSource["YadaU9C"].Client.Queryable<mes_ReturnedDocInfo>().Where(q => q.Status == 3)
- .WhereIF(!input.OrderNo.IsNullOrEmpty(), q => q.DocNo.Contains(input.OrderNo) || SqlFunc.Subqueryable<mes_AsnDocInfo>().Where(a => a.AsnId == q.SrcASNDocId && q.DocNo.Contains(input.OrderNo)).Any())
+ var asns = MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO.Contains(input.OrderNo.IsNullOrEmpty("娌℃湁鍗曞彿涓嶆煡璇SN鍗�"))).Select(q => q.ID).ToList().IsNullOrEmpty(new() { "鏌ヨ涓嶅埌ASN鍗�" });
+ var query = Biz.DataSource["YadaU9C"].Client.Queryable<mes_ReturnedDocInfo>().Where(q => q.Status == 3)//鏌ヨ鐘舵�佹槸瀹℃牳涓緱鏀惰揣鍗�
+ //.WhereIF(!input.OrderNo.IsNullOrEmpty(), q => q.DocNo.Contains(input.OrderNo) || SqlFunc.Subqueryable<mes_AsnDocInfo>().Where(a => a.AsnId == q.SrcASNDocId && q.DocNo.Contains(input.OrderNo)).Any())
+ .WhereIF(!input.OrderNo.IsNullOrEmpty(), q => q.DocNo.Contains(input.OrderNo) || asns.Contains(q.SrcASNDocId.ToString()))
.OrderBy(q => q.DocNo).Select(q => new { q.DocNo, q.Status, q.StatusName }).Distinct().ToList();
action.Data = await MainDB.Queryable<BIZ_U9_RECEIPT>().Where(q => query.Select(o => o.DocNo).Contains(q.ORDER_NO)).ToPageAsync(input.pageIndex, input.pageSize);
foreach (var order in action.Data.data)
{
- order.ERP_STATUS_CODE = query.FirstOrDefault(q => q.DocNo == order.ORDER_NO)?.Status.ToString();
- order.ERP_STATUS_NAME = query.FirstOrDefault(q => q.DocNo == order.ORDER_NO)?.StatusName;
+ var u9Order = query.FirstOrDefault(q => q.DocNo == order.ORDER_NO);
+ order.ERP_STATUS_CODE = u9Order?.Status.ToString();
+ order.ERP_STATUS_NAME = u9Order?.StatusName;
}
MainDB.Updateable(action.Data.data, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME }).ExecuteCommand();
return action;
--
Gitblit v1.9.3