From 4d16a7cedbbf2d9d7ebc392ee3774df108b4026e Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 10 四月 2025 10:16:43 +0800
Subject: [PATCH] 优化了一些已知问题
---
Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs | 627 +++++++++++++++++++++++++++++---------------------------
1 files changed, 326 insertions(+), 301 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 6c9b337..b93c50f 100644
--- a/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
@@ -11,8 +11,7 @@
using Tiger.IBusiness;
using Tiger.Model.MES.Yada;
using Tiger.Model.Entitys.MES.U9C;
-using System.Security.Policy;
-using Tiger.Model.Entitys.MES.Position;
+using Microsoft.Scripting.Utils;
namespace Tiger.Business.WMS.Transaction
{
@@ -34,14 +33,14 @@
//private List<WmsOrder<BIZ_U9_ASN>> _OrderList { get; set; } = new();
private List<string> OrderList = new();
private List<BIZ_U9_ASN_SN> CurSn = new();
- private List<BIZ_U9_ASN_SN> ScanList = new();
- #endregion
+ private List<BIZ_U9_ASN_SN> ScanList = new();
+ #endregion
- #region Functions
- /// <summary>
- /// 鍒濆鍖栨竻鐐规暟鎹�
- /// </summary>
- private void LoadData()
+ #region Functions
+ /// <summary>
+ /// 鍒濆鍖栨竻鐐规暟鎹�
+ /// </summary>
+ private void LoadData()
{
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();
}
@@ -69,7 +68,7 @@
catch (Exception ex)
{
//鍙栨秷褰撳墠鎿嶄綔
- ResetScan();
+ ResetTrans();
//action.CatchExceptionWithLog(ex, $"鎵弿[{input.SN}]寮傚父");
action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
}
@@ -145,168 +144,174 @@
//鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
var _CurSn = CurSn.Clone();
- AddCommitAction("Counted", () =>
+ AddCommitAction("Counted", () =>
{
//浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
var db = GetCommitDB();
//鏁版嵁淇濆瓨閫昏緫
- db.Updateable<BIZ_U9_ASN>(UserCode).SetColumns(q => q.STATUS == BIZ_U9_ASN.STATUSs.Counting.GetValue()).Where(q => q.ORDER_NO == _CurSn.First().ORDER_NO).ExecuteCommand();
- db.Storageable(_CurSn, UserCode).ExecuteCommand();
+ db.Updateable<BIZ_U9_ASN>(UserCode).SetColumns(q => q.STATUS == BIZ_U9_ASN.STATUSs.Counting.GetValue()).Where(q => q.ORDER_NO == _CurSn.First().ORDER_NO).ExecuteCommand();
+ db.Storageable(_CurSn, UserCode).ExecuteCommand();
});
//瀹屾垚鎵�鏈夊鐞嗗悗浣跨敤浜嬪姟淇濆瓨鏁版嵁
- action = DoIfFinish(action, input.Locale);
+ action = DoIfFinish(action, input.Locale, () =>
+ {
+ if (!OrderList.Contains(CurSn.First().ORDER_NO))
+ {
+ OrderList.Add(CurSn.First().ORDER_NO);
+ }
+ ScanList.AddRange(CurSn);
+ });
}
catch (Exception ex)
{
//鍙栨秷褰撳墠鎿嶄綔
- ResetScan();
+ ResetTrans();
//action.CatchExceptionWithLog(ex, $"鎵弿鏉＄爜[{0}]澶嶆牳寮傚父");
action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.ScanItem.ScanException", input.SN));
}
- return SetOutPutMqttMsg(action, input.Locale);
+ return SetOutPutMqttMsg(action, input.Locale);
}
/// <summary>
/// 瀹屾垚鎵�鏈夊鐞嗗悗浣跨敤浜嬪姟淇濆瓨鏁版嵁
/// </summary>
/// <param name="action"></param>
+ /// <param name="locale"></param>
+ /// <param name="doAfterSave"></param>
/// <returns></returns>
- public ApiAction<ScanOutput> DoIfFinish(ApiAction<ScanOutput> action, string locale)
+ public ApiAction<ScanOutput> DoIfFinish(ApiAction<ScanOutput> action, string locale, Action doAfterSave = null)
{
//淇濆瓨鏁版嵁搴�
SaveCommitListToDB();
- if (!OrderList.Contains(CurSn.First().ORDER_NO))
- {
- OrderList.Add(CurSn.First().ORDER_NO);
- }
- ScanList.AddRange(CurSn);
+ //淇濆瓨鏁版嵁鎴愬姛鍚庢墽琛�
+ doAfterSave?.Invoke();
- // 杩斿洖鏁版嵁
- action.Data.Data = ScanList;
+ // 杩斿洖鏁版嵁
+ action.Data.Data = ScanList;
- //action.LocaleMsg = Biz.L($"鏉＄爜[{0}]娓呯偣鎴愬姛锛�");
- action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.CountSuccess", CurSn.First().SN);
+ //action.LocaleMsg = Biz.L($"鏉＄爜[{0}]娓呯偣鎴愬姛锛�");
+ action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.CountSuccess", CurSn.First().SN);
//閲嶇疆宸ュ簭
- ResetScan();
+ ResetTrans();
return SetOutPutMqttMsg(action, locale); ;
}
- /// <summary>
- /// 鍒犻櫎褰撳墠鎵�鏈夊凡娓呯偣璁板綍
- /// </summary>
- /// <returns></returns>
- public async Task<ApiAction> DeleteScannedList()
- {
+ /// <summary>
+ /// 鍒犻櫎褰撳墠鎵�鏈夊凡娓呯偣璁板綍
+ /// </summary>
+ /// <returns></returns>
+ public async Task<ApiAction> DeleteScannedList()
+ {
var action = new ApiAction();
try
{
- foreach (var sn in ScanList)
- {
- sn.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
+ foreach (var sn in ScanList)
+ {
+ sn.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
sn.RECEIVER = null;
sn.RECEIVE_DATE = DateTime.MinValue;
- }
+ }
- //var historys = new List<WMS_ITEM_HIS>();
- //var items = await Biz.Db.Queryable<WMS_ITEM>().Where(q => ScanList.Select(s => s.SN).Contains(q.SN)).ToListAsync();
- //foreach (var item in items)
- //{
- // var order = item.TRANS_CODE;
- // item.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
- // item.SOURCE_CODE = "";
- // item.SOURCE_ORDER = "";
- // item.SOURCE_LINE = "";
- // item.TRANS_CODE = item.SOURCE_CODE;
- // item.TRANS_NO = item.SOURCE_ORDER;
- // item.TRANS_LINE = item.SOURCE_LINE;
- // historys.Add(new WMS_ITEM_HIS(item, $"鏉＄爜[{item.SN}]鍙栨秷娓呯偣锛屾搷浣滃崟鎹甗{order}]"));
- //}
-
- //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
- var db = GetCommitDB();
- var dbTran = db.UseTran(() =>
- {
- db.Updateable(ScanList, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS }).ExecuteCommandAsync();
- //db.Updateable(items, UserCode).ExecuteCommand();
- //db.Insertable(historys, UserCode).ExecuteCommand();
- });
- if (dbTran.IsSuccess)
- {
- ScanList.Clear();
- }
- else
- {
- Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
- //鎶涘嚭寮傚父
- throw dbTran.ErrorException;
- }
- }
+ //var historys = new List<WMS_ITEM_HIS>();
+ //var items = await Biz.Db.Queryable<WMS_ITEM>().Where(q => ScanList.Select(s => s.SN).Contains(q.SN)).ToListAsync();
+ //foreach (var item in items)
+ //{
+ // var order = item.TRANS_CODE;
+ // item.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
+ // item.SOURCE_CODE = "";
+ // item.SOURCE_ORDER = "";
+ // item.SOURCE_LINE = "";
+ // item.TRANS_CODE = item.SOURCE_CODE;
+ // item.TRANS_NO = item.SOURCE_ORDER;
+ // item.TRANS_LINE = item.SOURCE_LINE;
+ // historys.Add(new WMS_ITEM_HIS(item, $"鏉＄爜[{item.SN}]鍙栨秷娓呯偣锛屾搷浣滃崟鎹甗{order}]"));
+ //}
+
+ //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
+ var db = GetCommitDB();
+ var dbTran = db.UseTran(() =>
+ {
+ db.Updateable(ScanList, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS }).ExecuteCommandAsync();
+ //db.Updateable(items, UserCode).ExecuteCommand();
+ //db.Insertable(historys, UserCode).ExecuteCommand();
+ });
+ if (dbTran.IsSuccess)
+ {
+ ScanList.Clear();
+ }
+ else
+ {
+ Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
+ //鎶涘嚭寮傚父
+ throw dbTran.ErrorException;
+ }
+ }
catch (System.Exception ex)
{
- //return action.CatchExceptionWithLog(ex, Biz.L("鍒犻櫎褰撳墠鎵�鏈夊凡娓呯偣璁板綍寮傚父"));
- return action.CatchExceptionWithLog(ex, Biz.L("WMS.Count_BIZ_U9_ASN.DeleteScanListException"));
- }
- return action;
- }
+ //return action.CatchExceptionWithLog(ex, Biz.L("鍒犻櫎褰撳墠鎵�鏈夊凡娓呯偣璁板綍寮傚父"));
+ return action.CatchExceptionWithLog(ex, Biz.L("WMS.Count_BIZ_U9_ASN.DeleteScanListException"));
+ }
+ return action;
+ }
- /// <summary>
- /// 鍒犻櫎褰撳墠鐢ㄦ埛鐨勫凡鎵崟涓褰�
- /// </summary>
- /// <returns></returns>
- public async Task<ApiAction> DeleteScannedSn(BaseInput input)
- {
- var action = new ApiAction();
- try
- {
- //var item = await Biz.Db.Queryable<WMS_ITEM>().Where(q => q.SN == input.SN).FirstAsync();
- //var order = item.TRANS_CODE;
- //item.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
- //item.SOURCE_CODE = "";
- //item.SOURCE_ORDER = "";
- //item.SOURCE_LINE = "";
- //item.TRANS_CODE = item.SOURCE_CODE;
- //item.TRANS_NO = item.SOURCE_ORDER;
- //item.TRANS_LINE = item.SOURCE_LINE;
-
- //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
- var db = GetCommitDB();
- var dbTran = db.UseTran(() =>
- {
- db.Updateable<BIZ_U9_ASN_SN>(UserCode).SetColumns(q => q.STATUS == WMS_ITEM.STATUSs.Incoming.GetValue())
+ /// <summary>
+ /// 鍒犻櫎褰撳墠鐢ㄦ埛鐨勫凡鎵崟涓褰�
+ /// </summary>
+ /// <returns></returns>
+ public async Task<ApiAction> DeleteScannedSn(BaseInput input)
+ {
+ var action = new ApiAction();
+ try
+ {
+ //var item = await Biz.Db.Queryable<WMS_ITEM>().Where(q => q.SN == input.SN).FirstAsync();
+ //var order = item.TRANS_CODE;
+ //item.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
+ //item.SOURCE_CODE = "";
+ //item.SOURCE_ORDER = "";
+ //item.SOURCE_LINE = "";
+ //item.TRANS_CODE = item.SOURCE_CODE;
+ //item.TRANS_NO = item.SOURCE_ORDER;
+ //item.TRANS_LINE = item.SOURCE_LINE;
+
+ //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
+ var db = GetCommitDB();
+ var dbTran = db.UseTran(() =>
+ {
+ db.Updateable<BIZ_U9_ASN_SN>(UserCode).SetColumns(q => q.STATUS == WMS_ITEM.STATUSs.Incoming.GetValue())
.SetColumns(q => q.RECEIVER == null)
.SetColumns(q => q.RECEIVE_DATE == DateTime.MinValue)
.Where(q => q.SN == input.SN).ExecuteCommand();
- //db.Updateable(item, UserCode).ExecuteCommand();
- //db.Insertable(new WMS_ITEM_HIS(item, $"鏉＄爜[{item.SN}]鍙栨秷娓呯偣锛屾搷浣滃崟鎹甗{order}]"), UserCode).ExecuteCommand();
- });
- if (dbTran.IsSuccess)
- {
- ScanList.RemoveAll(q => q.SN == input.SN);
- }
- else
- {
- Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
- //鎶涘嚭寮傚父
- throw dbTran.ErrorException;
- }
- }
- catch (System.Exception ex)
- {
- //return action.CatchExceptionWithLog(ex, Biz.L("鍒犻櫎宸叉竻鐐规潯鐮乕{0}]寮傚父"));
- return action.CatchExceptionWithLog(ex, Biz.L("WMS.Count_BIZ_U9_ASN.DeleteScannedSnException", input.SN));
- }
- return action;
- }
+ //db.Updateable(item, UserCode).ExecuteCommand();
+ //db.Insertable(new WMS_ITEM_HIS(item, $"鏉＄爜[{item.SN}]鍙栨秷娓呯偣锛屾搷浣滃崟鎹甗{order}]"), UserCode).ExecuteCommand();
+ });
+ if (dbTran.IsSuccess)
+ {
+ ScanList.RemoveAll(q => q.SN == input.SN);
+ }
+ else
+ {
+ Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
+ //鎶涘嚭寮傚父
+ throw dbTran.ErrorException;
+ }
+ }
+ catch (System.Exception ex)
+ {
+ //return action.CatchExceptionWithLog(ex, Biz.L("鍒犻櫎宸叉竻鐐规潯鐮乕{0}]寮傚父"));
+ return action.CatchExceptionWithLog(ex, Biz.L("WMS.Count_BIZ_U9_ASN.DeleteScannedSnException", input.SN));
+ }
+ return action;
+ }
- /// <summary>
- /// 鑾峰彇鏈宸叉竻鐐圭殑鐗╂枡鍒楄〃锛堝甫鍒嗛〉锛�
- /// </summary>
- /// <returns></returns>
- public async Task<ApiAction<PageAble<BIZ_U9_ASN_SN>>> GetScannedList(BaseInputWithPage input)
- {
+ /// <summary>
+ /// 鑾峰彇鏈宸叉竻鐐圭殑鐗╂枡鍒楄〃锛堝甫鍒嗛〉锛�
+ /// </summary>
+ /// <returns></returns>
+ public async Task<ApiAction<PageAble<BIZ_U9_ASN_SN>>> GetScannedList(BaseInputWithPage input)
+ {
var action = new ApiAction<PageAble<BIZ_U9_ASN_SN>>();
action.Data = new PageAble<BIZ_U9_ASN_SN>();
action.Data.pageSize = input.pageSize;
@@ -325,158 +330,167 @@
{
var action = new ApiAction<List<BIZ_U9_ASN>>();
action.Data = await Biz.Db.Queryable<BIZ_U9_ASN>().Where(q => OrderList.Contains(q.ORDER_NO)).IncludesAllFirstLayer().ToListAsync();
- if (!action.Data.IsNullOrEmpty())
- {
- foreach (var order in action.Data)
- {
- foreach (var dtl in order.Details)
- {
- dtl.SnList = order.SnList.Where(q => q.LINE_NO == dtl.LINE_NO).OrderByDescending(q => q.STATUS).ToList();
- dtl.QTY_COUNTED = dtl.SnList.Where(q => q.STATUS == WMS_ITEM.STATUSs.Counted.GetValue() || q.STATUS == WMS_ITEM.STATUSs.Rejected.GetValue()).Sum(q => q.QTY);
- }
+ if (!action.Data.IsNullOrEmpty())
+ {
+ foreach (var order in action.Data)
+ {
+ foreach (var dtl in order.Details)
+ {
+ dtl.SnList = order.SnList.Where(q => q.LINE_NO == dtl.LINE_NO).OrderByDescending(q => q.STATUS).ToList();
+ dtl.QTY_COUNTED = dtl.SnList.Where(q => q.STATUS == WMS_ITEM.STATUSs.Counted.GetValue() || q.STATUS == WMS_ITEM.STATUSs.Rejected.GetValue()).Sum(q => q.QTY);
+ }
order.IsFinished = !order.Details.Where(q => q.QTY != q.QTY_COUNTED).Any();
}
- }
- return action;
- }
+ }
+ return action;
+ }
/// <summary>
/// 鐢熸垚鏀惰揣鍗曪細璋冪敤U9鏂板鏀惰揣鍗曟帴鍙�
/// </summary>
/// <returns></returns>
public async Task<ApiAction> SetGiftQty(BaseInput input)
- {
- var action = new ApiAction();
- try
- {
- var dtl = input?.Data?.JsonToObject<BIZ_U9_ASN_DTL>();
- if ((dtl?.ID ?? "").IsNullOrEmpty())
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L($"鎻愪氦鐨勬敹璐у崟鏄庣粏ID涓嶈兘涓虹┖");
- action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.SetGiftQty.DetailIDIsNull");
- return action;
- }
+ {
+ var action = new ApiAction();
+ try
+ {
+ var dtl = input?.Data?.JsonToObject<BIZ_U9_ASN_DTL>();
+ if ((dtl?.ID ?? "").IsNullOrEmpty())
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L($"鎻愪氦鐨勬敹璐у崟鏄庣粏ID涓嶈兘涓虹┖");
+ action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.SetGiftQty.DetailIDIsNull");
+ return action;
+ }
- //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
- var db = GetCommitDB();
- await db.Updateable(dtl, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.QTY_GIFT }).ExecuteCommandAsync();
- }
- catch (System.Exception ex)
- {
+ //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
+ var db = GetCommitDB();
+ await db.Updateable(dtl, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.QTY_GIFT }).ExecuteCommandAsync();
+ }
+ catch (System.Exception ex)
+ {
//return action.CatchExceptionWithLog(ex, Biz.L("璁剧疆鏀惰揣鍗曟槑缁嗚禒鍝佹暟閲忎负寮傚父"));
- return action.CatchExceptionWithLog(ex, Biz.L("WMS.Count_BIZ_U9_ASN.SetGiftQtyException"));
- }
- return action;
- }
+ return action.CatchExceptionWithLog(ex, Biz.L("WMS.Count_BIZ_U9_ASN.SetGiftQtyException"));
+ }
+ return action;
+ }
- /// <summary>
- /// 鐢熸垚鏀惰揣鍗曪細璋冪敤U9鏂板鏀惰揣鍗曟帴鍙�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- public async Task<ApiAction> GenerateReceipt(BaseInput input)
- {
- var action = new ApiAction();
- var orderNo = input.Data;
- try
- {
- var order = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == orderNo).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
- if (order.IsNullOrEmpty())
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L($"鎵句笉鍒伴�佽揣鍗昜{0}]鐨勫崟鎹俊鎭紝璇锋彁浜ゆ纭殑鍗曞彿");
- action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceipt.ASNNotExists", orderNo);
- return action;
- }
- //楠岃瘉鏉＄爜鏄惁姝ｇ‘
- if (order.STATUS != BIZ_U9_ASN.STATUSs.Counting.GetValue())
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("鐢熸垚鏀惰揣鍗曪細閫佽揣鍗曠姸鎬乕{0}]寮傚父");
- action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceipt.StatusException", order.STATUS.GetEnumDesc<BIZ_U9_ASN.STATUSs>());
- return action;
- }
+ /// <summary>
+ /// 鐢熸垚鏀惰揣鍗曪細璋冪敤U9鏂板鏀惰揣鍗曟帴鍙�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<ApiAction> GenerateReceipt(BaseInput input)
+ {
+ var action = new ApiAction();
+ var orderNo = input.Data;
+ try
+ {
+ var order = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == orderNo).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
+ if (order.IsNullOrEmpty())
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L($"鎵句笉鍒伴�佽揣鍗昜{0}]鐨勫崟鎹俊鎭紝璇锋彁浜ゆ纭殑鍗曞彿");
+ action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceipt.ASNNotExists", orderNo);
+ return action;
+ }
+ //楠岃瘉鏉＄爜鏄惁姝ｇ‘
+ if (order.STATUS != BIZ_U9_ASN.STATUSs.Counting.GetValue())
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("鐢熸垚鏀惰揣鍗曪細閫佽揣鍗曠姸鎬乕{0}]寮傚父");
+ action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceipt.StatusException", order.STATUS.GetEnumDesc<BIZ_U9_ASN.STATUSs>());
+ return action;
+ }
- //鏌ヨ鏄惁娓呯偣瀹屾垚
- var noFinish = order.Details.Where(q => q.QTY != order.SnList.Where(s => s.LINE_NO == q.LINE_NO && (s.STATUS == WMS_ITEM.STATUSs.Counted.GetValue() || q.STATUS == WMS_ITEM.STATUSs.Rejected.GetValue())).Sum(s => s.QTY));
- if (noFinish.Any())
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("閫佽揣鍗昜{0}]鏈竻鐐瑰畬鎴愶紝璇峰厛娓呯偣瀹屾垚锛屾湭瀹屾垚娓呯偣鐨勮鍙峰涓嬶細{1}");
+ //鏌ヨ鏄惁瀛樺湪娓呯偣瀹屾垚鐨勮鏄庣粏锛屽鏋滄湁鍒欏厛鎻愪氦瀹屾垚鐨勮锛屽鏋滄病鏈夊垯鎶ラ敊
+ var finishNotSubmit = order.Details.Where(q => SqlFunc.IsNullOrEmpty(q.RECEIVER_NO) && q.QTY == order.SnList.Where(s => s.LINE_NO == q.LINE_NO && (s.STATUS == WMS_ITEM.STATUSs.Counted.GetValue() || q.STATUS == WMS_ITEM.STATUSs.Rejected.GetValue())).Sum(s => s.QTY)).ToList();
+ var noFinish = order.Details.Where(q => q.QTY != order.SnList.Where(s => s.LINE_NO == q.LINE_NO && (s.STATUS == WMS_ITEM.STATUSs.Counted.GetValue() || q.STATUS == WMS_ITEM.STATUSs.Rejected.GetValue())).Sum(s => s.QTY));
+ if (!finishNotSubmit.Any())
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("閫佽揣鍗昜{0}]娌℃湁娓呯偣瀹屾垚鍙互鎻愪氦鐨勮锛屾湭瀹屾垚娓呯偣鐨勮鍙峰涓嬶細{1}");
action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceipt.NoFinishCounting", orderNo, string.Join("锛�", noFinish.Select(q => q.LINE_NO)));
- return action;
- }
+ return action;
+ }
- var iInput = new CreateRcvBySrcASNInput
- {
- userId = UserCode,
- IsLogin = true,
- CreateRcvBySrcASNParam = new ()
- {
- aSNToRcvTransDTOs = order.Details.Select(q => new ASNToRcvTransDTO
- {
- ASNLineKey = q.ID,
- TransQty = new() { m_amount1 = q.QTY },
- BinInfoList = new() { new() { Bin = new () { m_code = q.ItemInfo.DEFAULT_WH }, LocationQtySU = q.QTY, LocationQtyTU = q.QTY } },
+ var iInput = new CreateRcvBySrcASNInput
+ {
+ userId = UserCode,
+ IsLogin = true,
+ CreateRcvBySrcASNParam = new()
+ {
+ aSNToRcvTransDTOs = finishNotSubmit.Select(q => new ASNToRcvTransDTO
+ {
+ ASNLineKey = q.ID,
+ TransQty = new() { m_amount1 = q.QTY },
+ BinInfoList = new() { new() { Bin = new() { m_code = q.ItemInfo.DEFAULT_LOCATION }, LocationQtySU = q.QTY, LocationQtyTU = q.QTY } },
}).ToList(),
- }
- };
- var result = await DI.Resolve<IWMS_U9C>().CreateRcvBySrcASN(iInput);
- if (!result.IsSuccessed)
- {
- action.IsSuccessed = false;
- action.LocaleMsg = result.LocaleMsg;
- return action;
- }
+ }
+ };
+ var result = await DI.Resolve<IWMS_U9C>().CreateRcvBySrcASN(iInput);
+ if (!result.IsSuccessed)
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = result.LocaleMsg;
+ return action;
+ }
- //鏍规嵁鎺ュ彛杩斿洖鏀惰揣鍗曞崟鍙锋煡璇㈠崟鎹槑缁嗭紝骞跺垱寤烘潯鐮佹槑缁�
- var receipt = new BIZ_U9_RECEIPT();
- receipt.Details = new();
- receipt.SnList = new();
+ //鏍规嵁鎺ュ彛杩斿洖鏀惰揣鍗曞崟鍙锋煡璇㈠崟鎹槑缁嗭紝骞跺垱寤烘潯鐮佹槑缁�
+ var receipt = new BIZ_U9_RECEIPT();
+ receipt.Details = new();
+ receipt.SnList = new();
DbClient U9Cdb = Biz.DataSource["YadaU9C"].Client;
- var list = U9Cdb.Queryable<mes_ReturnedDocInfo>().Where(x => x.RcvId == result.Data[0].ID.ToDouble() && x.DocNo == result.Data[0].Code).ToList();
+ var list = U9Cdb.Queryable<mes_ReturnedDocInfo>().Where(x => x.RcvId == result.Data[0].ID.ToDouble() && x.DocNo == result.Data[0].Code && x.SplitFlag != 1).ToList();
- if (list != null && list.Count > 0)
- {
+ if (list != null && list.Count > 0)
+ {
receipt.ID = list.First().RcvId.ToString();
receipt.AUTH_ORG = order.AUTH_ORG;
- receipt.STATUS = BIZ_U9_RECEIPT.STATUSs.InQC.GetValue();
- receipt.ORDER_NO = list.First().DocNo;
- receipt.SUPP_CODE = list.First().SupplierCode;
- receipt.SUPP_NAME = list.First().SupplierName;
- receipt.RECEIVER = UserCode;
- receipt.RECEIVE_DATE = DateTime.Now;
- receipt.ASN_ID = order.ID;
- receipt.ASN_NO = order.ORDER_NO;
- receipt.ORDER_DATE = list.First().ModifiedOn;
- receipt.HANDLED = 0;
- receipt.HANDLED_DATE = DateTime.Now;
+ receipt.STATUS = BIZ_U9_RECEIPT.STATUSs.InQC.GetValue();
+ receipt.ORDER_NO = list.First().DocNo;
+ receipt.SUPP_CODE = list.First().SupplierCode;
+ receipt.SUPP_NAME = list.First().SupplierName;
+ receipt.RECEIVER = UserCode;
+ receipt.RECEIVE_DATE = DateTime.Now;
+ receipt.ASN_ID = order.ID;
+ receipt.ASN_NO = order.ORDER_NO;
+ receipt.ORDER_DATE = list.First().ModifiedOn;
+ receipt.HANDLED = 0;
+ receipt.HANDLED_DATE = DateTime.Now;
- foreach (var item in list)
- {
- var asnDtl = order.Details.First(q => q.ID == item.SrcASNDocLineId.ToString());
- BIZ_U9_RECEIPT_DTL receiptDt = new()
- {
+ foreach (var item in list)
+ {
+ var asnDtl = finishNotSubmit.First(q => q.ID == item.SrcASNDocLineId.ToString());
+ BIZ_U9_RECEIPT_DTL receiptDt = new()
+ {
ID = item.RcvLineId.ToString(),
AUTH_ORG = receipt.AUTH_ORG,
STATUS = BIZ_U9_RECEIPT.STATUSs.InQC.GetValue(),
- ORDER_NO = item.DocNo,
- LINE_NO = item.DocLineNo.ToString(),
- ITEM_CODE = item.ItemCode,
- QTY = item.EyeballingQtyTU.ToDouble(), // mes鍗曟嵁鏁伴噺 --U9閫�琛ユ暟閲�
+ ORDER_NO = item.DocNo,
+ LINE_NO = item.DocLineNo.ToString(),
+ ITEM_CODE = item.ItemCode,
+ QTY = item.EyeballingQtyTU.ToDouble(), // mes鍗曟嵁鏁伴噺 --U9閫�琛ユ暟閲�
QTY_GIFT = asnDtl.QTY_GIFT,
ASN_ID = item.SrcASNDocId.ToString(),
- ASN_NO =asnDtl.ORDER_NO,
- ASN_LINE_ID = item.SrcASNDocLineId.ToString(),
- ASN_LINE = asnDtl.LINE_NO,
+ ASN_NO = asnDtl.ORDER_NO,
+ ASN_LINE_ID = item.SrcASNDocLineId.ToString(),
+ ASN_LINE = asnDtl.LINE_NO,
ERP_CODE = item.ItemCode1,
- };
+ ERP_STATUS_CODE = item.Status.ToString(),
+ ERP_STATUS_NAME = item.StatusName,
+ };
receipt.Details.Add(receiptDt);
+ asnDtl.STATUS = BIZ_U9_ASN.STATUSs.Finished.GetValue();
+ asnDtl.RECEIVER_ID = item.RcvId.ToString();
+ asnDtl.RECEIVER_NO = item.DocNo;
+ asnDtl.RECEIVER_LINE = item.DocLineNo.ToString();
+ asnDtl.RECEIVER = UserCode;
+ asnDtl.RECEIVE_DATE = DateTime.Now;
}
- foreach (var sn in order.SnList)
- {
+ foreach (var sn in order.SnList.Where(q=> finishNotSubmit.Any(s => s.LINE_NO == q.LINE_NO)))
+ {
var dtl = receipt.Details.First(q => q.ASN_LINE == sn.LINE_NO);
BIZ_U9_RECEIPT_SN receiptSn = new()
{
@@ -497,24 +511,24 @@
};
receipt.SnList.Add(receiptSn);
}
- }
+ }
- //鏇存柊搴撳瓨琛ㄤ俊鎭�
- var items = MainDB.Queryable<WMS_ITEM>().Where(q => SqlFunc.Subqueryable<BIZ_U9_ASN_SN>().Where(s => s.SN == q.SN && s.ORDER_NO == order.ORDER_NO).Any()).ToList();
+ //鏇存柊搴撳瓨琛ㄤ俊鎭�
+ var items = MainDB.Queryable<WMS_ITEM>().Where(q => SqlFunc.Subqueryable<BIZ_U9_ASN_SN>().Where(s => s.SN == q.SN && s.ORDER_NO == order.ORDER_NO && finishNotSubmit.Select(d => d.LINE_NO).Contains(s.LINE_NO)).Any()).ToList();
var historys = new List<WMS_ITEM_HIS>();
- foreach (var item in items)
- {
+ foreach (var item in items)
+ {
item.AUTH_ORG = receipt.AUTH_ORG;
item.STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue();
- item.SOURCE_CODE = item.TRANS_CODE;
- item.SOURCE_ORDER = item.TRANS_NO;
- item.SOURCE_LINE = item.TRANS_LINE;
- item.TRANS_CODE = nameof(BIZ_U9_RECEIPT);
- item.TRANS_NO = receipt.ORDER_NO;
- item.TRANS_LINE = receipt.SnList.First(q => q.SN == item.SN).LINE_NO;
- historys.Add(new WMS_ITEM_HIS(item, $"閫佽揣鍗昜{order.ORDER_NO}]鐨勬潯鐮乕{item.SN}]鐢熸垚鏀惰揣鍗昜{receipt.ORDER_NO}]锛屽緟妫�楠屽畬鎴愬悗鍙叆搴�"));
- }
- var pkgs = MainDB.Queryable<WMS_ITEM_PKG>().Where(q => SqlFunc.Subqueryable<BIZ_U9_ASN_SN>().Where(s => s.SN == q.SN && s.ORDER_NO == order.ORDER_NO).Any()).ToList();
+ item.SOURCE_CODE = item.TRANS_CODE;
+ item.SOURCE_ORDER = item.TRANS_NO;
+ item.SOURCE_LINE = item.TRANS_LINE;
+ item.TRANS_CODE = nameof(BIZ_U9_RECEIPT);
+ item.TRANS_NO = receipt.ORDER_NO;
+ item.TRANS_LINE = receipt.SnList.First(q => q.SN == item.SN).LINE_NO;
+ historys.Add(new WMS_ITEM_HIS(item, @$"閫佽揣鍗昜{order.ORDER_NO}]鐨勬潯鐮乕{item.SN}]鐢熸垚鏀惰揣鍗昜{receipt.ORDER_NO}]锛屽緟妫�楠屽畬鎴愬悗鍙叆搴�"));
+ }
+ var pkgs = MainDB.Queryable<WMS_ITEM_PKG>().Where(q => SqlFunc.Subqueryable<BIZ_U9_ASN_SN>().Where(s => s.SN == q.SN && s.ORDER_NO == order.ORDER_NO && finishNotSubmit.Select(d => d.LINE_NO).Contains(s.LINE_NO)).Any()).ToList();
foreach (var item in pkgs)
{
item.AUTH_ORG = receipt.AUTH_ORG;
@@ -525,56 +539,67 @@
item.TRANS_NO = receipt.ORDER_NO;
item.TRANS_LINE = receipt.SnList.First(q => q.SN == item.SN).LINE_NO;
}
- order.STATUS = BIZ_U9_ASN.STATUSs.Finished.GetValue();
- order.RECEIVER_ID = receipt.ID;
- order.RECEIVER_NO = receipt.ORDER_NO;
- order.RECEIVER = UserCode;
- order.RECEIVE_DATE = DateTime.Now;
+ if (!noFinish.Any())
+ {
+ order.STATUS = BIZ_U9_ASN.STATUSs.Finished.GetValue();
+ order.RECEIVER = UserCode;
+ order.RECEIVE_DATE = DateTime.Now;
+ }
//浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
var db = GetCommitDB();
- var dbTran = db.UseTran(() =>
- {
- db.Updateable(items, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.AUTH_ORG, q.STATUS, q.TRANS_CODE, q.TRANS_NO, q.TRANS_LINE, q.SOURCE_CODE, q.SOURCE_ORDER, q.SOURCE_LINE }).ExecuteCommand();
+ var dbTran = db.UseTran(() =>
+ {
+ db.Updateable(items, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.AUTH_ORG, q.STATUS, q.TRANS_CODE, q.TRANS_NO, q.TRANS_LINE, q.SOURCE_CODE, q.SOURCE_ORDER, q.SOURCE_LINE }).ExecuteCommand();
db.Updateable(pkgs, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.AUTH_ORG, q.TRANS_CODE, q.TRANS_NO, q.TRANS_LINE, q.SOURCE_CODE, q.SOURCE_ORDER, q.SOURCE_LINE }).ExecuteCommand();
db.Insertable(historys, UserCode).ExecuteCommand();
db.Updateable(order, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.RECEIVER, q.RECEIVE_DATE, q.RECEIVER_ID, q.RECEIVER_NO }).ExecuteCommand();
+ db.Updateable(finishNotSubmit, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.RECEIVER, q.RECEIVE_DATE, q.RECEIVER_ID, q.RECEIVER_NO }).ExecuteCommand();
db.Insertable(receipt, UserCode).ExecuteCommand();
- db.Insertable(receipt.Details, UserCode).ExecuteCommand();
- db.Insertable(receipt.SnList, UserCode).ExecuteCommand();
- });
- if (dbTran.IsSuccess)
- {
- //action.LocaleMsg = Biz.L($"閫佽揣鍗昜{0}]鐢熸垚鏀惰揣鍗昜{1}]鎴愬姛");
- action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceipt.Success", order.ORDER_NO, receipt.ORDER_NO);
- }
- else
- {
- Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
- //鎶涘嚭寮傚父
- throw dbTran.ErrorException;
- }
- }
- catch (System.Exception ex)
- {
- //return action.CatchExceptionWithLog(ex, Biz.L("閫佽揣鍗昜{0}]鐢熸垚鏀惰揣鍗曞紓甯�"));
- return action.CatchExceptionWithLog(ex, Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceiptException", orderNo));
- }
- return action;
- }
+ db.Insertable(receipt.Details, UserCode).ExecuteCommand();
+ db.Insertable(receipt.SnList, UserCode).ExecuteCommand();
+ });
+ if (dbTran.IsSuccess)
+ {
+ //action.LocaleMsg = Biz.L($"閫佽揣鍗昜{0}]鐢熸垚鏀惰揣鍗昜{1}]鎴愬姛");
+ action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceipt.Success", order.ORDER_NO, receipt.ORDER_NO);
+ }
+ else
+ {
+ Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
+ //鎶涘嚭寮傚父
+ throw dbTran.ErrorException;
+ }
+ }
+ catch (System.Exception ex)
+ {
+ //return action.CatchExceptionWithLog(ex, Biz.L("閫佽揣鍗昜{0}]鐢熸垚鏀惰揣鍗曞紓甯�"));
+ return action.CatchExceptionWithLog(ex, Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceiptException", orderNo));
+ }
+ return action;
+ }
- #endregion
+ #endregion
- /// <summary>
- /// 閲嶇疆褰撳墠鎿嶄綔锛屾湁闇�瑕佸垯閲嶅啓姝ゆ柟娉�
- /// </summary>
- public override void ResetScan()
+ /// <summary>
+ /// 閲嶇疆浜嬪姟鏁版嵁锛屾湁闇�瑕佸垯閲嶅啓姝ゆ柟娉�
+ /// </summary>
+ public override void ResetTrans()
{
- base.ResetScan();
- Command = null;
- CurInvItem = null;
+ ResetScan();
CurScanShelf = null;
+ base.ResetTrans();
+ }
+
+ /// <summary>
+ /// 閲嶇疆鏈鎵爜淇℃伅
+ /// </summary>
+ public override void ResetScan()
+ {
+ Command = "Normal";
+ CurInvItem = null;
CurSn = null;
+ base.ResetScan();
}
public override bool Close(bool needSaveHistoryLog = false)
--
Gitblit v1.9.3