From ce097c93db27e8b7093d9b17b465cf3159249d8d Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 30 四月 2025 17:20:34 +0800
Subject: [PATCH] 来料打印增加导航
---
Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs | 35 +++++++++++++++++++++--------------
1 files changed, 21 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 f9d0006..3974b58 100644
--- a/Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs
@@ -163,12 +163,12 @@
if (!inv.ItemInfo.DEFAULT_LOCATION.IsNullOrEmpty() && inv.ItemInfo.DEFAULT_LOCATION != CurScanShelf.LocationCode)
{
action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("鐗╂枡[{0}]鍙厑璁镐笂鏋跺埌鍌ㄤ綅[{0}]锛岃閲嶆柊鎵弿鍌ㄤ綅");
+ //action.LocaleMsg = Biz.L("鐗╂枡[{0}]鍙厑璁镐笂鏋跺埌鍌ㄤ綅[{1}]锛岃閲嶆柊鎵弿鍌ㄤ綅");
action.LocaleMsg = Biz.L("WMS.Default.ScanItem.DefaultLocationError", inv.ItemInfo.ITEM_CODE, inv.ItemInfo.DEFAULT_LOCATION);
return SetOutPutMqttMsg(action, input.Locale);
}
//鍒ゆ柇褰撳墠鏉＄爜鏄惁灞炰簬褰撳墠鏀惰揣鍗�
- if (CurInvItem.Items.First().TRANS_NO != CurOrder.ORDER_NO)
+ if (inv.Items.First().TRANS_NO != CurOrder.ORDER_NO)
{
action.IsSuccessed = false;
//action.LocaleMsg = Biz.L("鏉＄爜鎵�灞炵殑鍗曟嵁[{0}]涓嶆槸閫夋嫨鐨勬敹璐у崟[{1}]锛岃閲嶆柊鎵弿姝ｇ‘鐨勬潯鐮佹垨閫夋嫨鍏朵粬鏀惰揣鍗�");
@@ -308,6 +308,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 +374,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;
@@ -537,13 +544,13 @@
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())
- .OrderBy(q => q.DocNo).ToPage(input.pageIndex, input.pageSize);
+ .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.data.Select(o => o.DocNo).Contains(q.ORDER_NO)).ToPageAsync(input.pageIndex, input.pageSize);
+ 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.data.FirstOrDefault(q => q.DocNo == order.ORDER_NO)?.Status.ToString();
- order.ERP_STATUS_NAME = query.data.FirstOrDefault(q => q.DocNo == order.ORDER_NO)?.StatusName;
+ 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;
}
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