From a960900364d19bbf0ad7923a57989609e7fce798 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 29 四月 2025 11:15:16 +0800
Subject: [PATCH] 设置当前物料的默认储位
---
Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs | 760 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 481 insertions(+), 279 deletions(-)
diff --git a/Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs b/Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs
index 51013d3..8563ffa 100644
--- a/Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs
@@ -13,6 +13,14 @@
using Tiger.Model.Entitys.MES.U9C;
using System.Security.Policy;
using Tiger.Model.Entitys.MES.Position;
+using MailKit.Search;
+using IronPython.Runtime.Operations;
+using static IronPython.Modules._ast;
+using System.Diagnostics;
+using Tiger.Model.Minsun;
+using static IronPython.Runtime.Profiler;
+using static Microsoft.CodeAnalysis.CSharp.SyntaxTokenParser;
+using Microsoft.Scripting.Utils;
namespace Tiger.Business.WMS.Transaction
{
@@ -24,17 +32,19 @@
public IPrint_BIZ_U9_ASN Init(string id, string userCode, string apiHost, string orgCode)
{
base.Init(id, userCode, apiHost, orgCode);
- //鍔犺浇宸茬粡娓呯偣鏁版嵁
- LoadData();
Logger.Console.Info($"Start {this.GetType().Name} Transaction[ID: {TransID}]");
+ LoadData();
return this;
}
#region Propertys & Variables
//private List<WmsOrder<BIZ_U9_ASN>> _OrderList { get; set; } = new();
private List<string> OrderList = new();
+ private BIZ_U9_ASN CurOrder = new();
private List<BIZ_U9_ASN_SN> CurSn = new();
- private List<BIZ_U9_ASN_SN> ScanList = new();
+ List<string> SnList = new();
+ private string rcvDocType = "RCV03"; //榛樿鏃犲崟
+ private string CurReqType = "0";
#endregion
#region Functions
@@ -43,8 +53,34 @@
/// </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();
+ var _Sns = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.ORDER_NO == SqlFunc.Subqueryable<BIZ_U9_ASN_DTL>().Where(s => SqlFunc.StartsWith(s.UPDATE_USER, $"GenerateASN_{UserCode}")).Select(s => s.ORDER_NO)).ToList();
+ CurSn.AddRange(_Sns);
+ OrderList = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.RECEIVER == $"{UserCode}_NoSource" && 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>
+ /// 鑾峰彇褰撳墠鎵�鏈夊崟鎹俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ public async Task<ApiAction<List<BIZ_U9_ASN>>> GetOrderList()
+ {
+ var action = new ApiAction<List<BIZ_U9_ASN>>();
+ action.Data = await Biz.Db.Queryable<BIZ_U9_ASN>().Where(q => OrderList.Contains(q.ORDER_NO)).Includes(q => q.Details, d => d._ItemInfos).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);
+ }
+ order.IsFinished = !order.Details.Where(q => q.STATUS != BIZ_U9_ASN.STATUSs.Finished.GetValue()).Any();
+ }
+ }
+ return action;
}
+
/// <summary>
/// 鎵弿鍏ュ彛
/// </summary>
@@ -61,24 +97,30 @@
return SetOutPutMqttMsg(action, input.Locale);
}
//濡傛灉鏄湭涓婇棬鎴�
- else if (input.Data == "0")
+ else if (input.Command == "NotOn")
{
action = await GetAsnInfoForPrint(input);
}
//濡傛灉鏄殢鍗曡禒鍝佹垨鑰呮牱鍝�
- else if (input.Data == "1")
+ else if (input.Command == "IsGift")
{
-
+ action = await GetAsnInfoBySn(input);
}
- else
+ //濡傛灉鏄湭涓婇棬鎴锋彁浜�
+ else if (input.Command == "Submit")
{
- action = await ScanItem(input);
+ action = await Submit(input);
+ }
+ //濡傛灉鏄殢鍗曡禒鍝佹垨鑰呮牱鍝佹彁浜�
+ else if (input.Command == "GenerateASN")
+ {
+ action = await GenerateASN(input);
}
}
catch (Exception ex)
{
//鍙栨秷褰撳墠鎿嶄綔
- ResetScan();
+ ResetTrans();
//action.CatchExceptionWithLog(ex, $"鎵弿[{input.SN}]寮傚父");
action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
}
@@ -92,96 +134,341 @@
/// <returns></returns>
public async Task<ApiAction<ScanOutput>> GetAsnInfoForPrint(BaseInput input)
{
- var action = new ApiAction<ScanOutput>(new ScanOutput() );
+ var action = new ApiAction<ScanOutput>($"鎴愬姛鑾峰彇ASN鍗昜{input.SN}]淇℃伅", new ScanOutput());
try
{
-
+ CurOrder = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == input.SN && q.STATUS < BIZ_U9_ASN.STATUSs.Finished.GetValue()).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
+ if (CurOrder == null)
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = Biz.L($"鏌ヤ笉鍒癆SN鍗昜{input.SN}]鐨勬暟鎹�");
+ return action;
+ }
+ action.LocaleMsg = CurOrder.STATUS == BIZ_U9_ASN.STATUSs.Counting.GetValue() ? Biz.L($"ASN鍗昜{input.SN}]鐘舵�佷负[{BIZ_U9_ASN.STATUSs.Counting.GetDesc()}]锛岃缁х画鏈畬鎴愮殑鎿嶄綔") : action.LocaleMsg;
+ action.Data.Data = CurOrder;
}
catch (Exception ex)
{
//鍙栨秷褰撳墠鎿嶄綔
- ResetScan();
+ ResetTrans();
action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
}
return SetOutPutMqttMsg(action, input.Locale);
}
/// <summary>
- /// 鎵弿鏉＄爜鍒嗘瀽绫诲瀷
+ /// 闅忓崟璧犲搧鎵玈N鑾峰彇ASN鍗曚俊鎭�
/// </summary>
- public async Task<ApiAction<ScanOutput>> ScanItem(BaseInput input)
+ /// <param name="input"></param>
+ /// <returns></returns>
+ private async Task<ApiAction<ScanOutput>> GetAsnInfoBySn(BaseInput input)
{
- var action = new ApiAction<ScanOutput>(new ScanOutput() { Command = Command });
+ var action = new ApiAction<ScanOutput>(new ScanOutput());
try
{
- //瑙ｆ瀽鏉＄爜
- Barcode barcode = new Barcode(input.SN);
- if (barcode.IsException)
- {
- throw barcode.AnalyseException;
- }
- //闈炴硶鏉＄爜
- else if (!barcode.IsRegular)
+ CurReqType = input.Options["reqType"].ToString();
+ rcvDocType = "RCV01";
+ if (CurReqType != "1")
{
action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("鏉＄爜涓洪潪娉曟潯鐮�");
- action.LocaleMsg = Biz.L("WMS.WmsItem.Barcode.IllegalFailure", input.SN);
- return SetOutPutMqttMsg(action, input.Locale); ;
+ action.LocaleMsg = Biz.L($"涓嶆槸闅忓崟璧犲搧锛屼笉鐢ㄦ壂鎻忔潯鐮�");
+ return action;
}
-
- if (barcode.Type == Barcode.Types.OuterPackage)
+ var AsnSn = await MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.SN == input.SN).FirstAsync();
+ if (AsnSn == null)
{
- CurSn = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.CARTON_NO == barcode.SN).ToList();
+ action.IsSuccessed = false;
+ action.LocaleMsg = Biz.L($"鏌ヤ笉鍒版潯鐮乕{input.SN}]鐨勬暟鎹�");
+ return action;
}
- else
+ CurOrder = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == AsnSn.ORDER_NO).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
+ if (CurOrder == null)
{
- CurSn = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.SN == barcode.SN).ToList();
- foreach (var sn in CurSn)
+ action.IsSuccessed = false;
+ action.LocaleMsg = Biz.L($"鏌ヤ笉鍒癆SN鍗昜{input.SN}]鐨勬暟鎹�");
+ return action;
+ }
+ var _sns = CurSn.Where(q => q.LOTNO == AsnSn.LOTNO && q.STATUS <= WMS_ITEM.STATUSs.Counted.GetValue()).ToList();
+ if (CurSn.Count > 0 && _sns.Any())
+ {
+ action.LocaleMsg = Biz.L($"鎵规[{AsnSn.LOTNO}]宸茬粡鎻愪氦锛岃缁х画涓嬩竴姝ユ搷浣�");
+ CurOrder = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == _sns[0].ORDER_NO).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
+ if (CurOrder == null)
{
- sn.META_SN = input.SN;
+ action.IsSuccessed = false;
+ action.LocaleMsg = Biz.L($"鏌ヤ笉鍒癆SN鍗昜{CurOrder.ORDER_NO}]鐨勬暟鎹�");
+ return action;
}
+ CurOrder.Details = CurOrder.Details.Where(q => _sns[0].LINE_NO == q.LINE_NO).ToList();
+ SnList.AddRange(_sns.Select(q => q.SN).ToList());
+ CurOrder.BarcodeList = SnList;
+ action.Data.Data = CurOrder;
+ return action;
}
-
- if (CurSn.IsNullOrEmpty())
+ if (CurSn.Any(q=> q.ORDER_NO == AsnSn.ORDER_NO && q.LINE_NO == AsnSn.LINE_NO))
{
action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("ASN鍗曚腑涓嶅瓨鍦ㄦ潯鐮乕{0}]");
- action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.SnNotExists", input.SN);
- return SetOutPutMqttMsg(action, input.Locale); ;
+ action.LocaleMsg = Biz.L($"鎵弿鐨勬潯鐮佺殑ASN鍗昜{AsnSn.ORDER_NO}]鐨勮鍙穂{AsnSn.LINE_NO}]宸茬粡瀛樺湪锛岃鍏堝畬鎴愭湭瀹屾垚鐨勬搷浣�");
+ return action;
}
- if (CurSn.First().AUTH_ORG != input.AuthOption.CurOrg)
+ if (!CurSn.Any(q=>q.SN == AsnSn.SN))
+ {
+ CurSn.Add(AsnSn);
+ }
+ if (!CurOrder.ORDER_NO.StartsWith("WASN"))
+ {
+ CurOrder.ORDER_NO = $"WASN{DateTime.Now.ToString("yyyyMMddHHmmss")}";
+ CurOrder.STATUS = BIZ_U9_ASN.STATUSs.Arrived.GetValue();
+ }
+ CurOrder.Details = CurOrder.Details.Where(q => CurSn.Any(s => s.LINE_NO == q.LINE_NO)).ToList();
+ action.LocaleMsg = Biz.L($"鎴愬姛鑾峰彇ASN鍗昜{AsnSn.ORDER_NO}]鐨勪俊鎭�");
+ action.Data.Data = CurOrder;
+ }
+ catch (Exception ex)
+ {
+ //鍙栨秷褰撳墠鎿嶄綔
+ ResetTrans();
+ action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
+ }
+ return SetOutPutMqttMsg(action, input.Locale);
+ }
+
+ /// <summary>
+ /// 璧犲搧/鏍峰搧鎻愪氦锛岄渶瑕佺敓鎴怶MS鐨凙SN鍗�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<ApiAction<ScanOutput>> GenerateASN(BaseInput input)
+ {
+ var action = new ApiAction<ScanOutput>(new ScanOutput());
+ try
+ {
+ var reqType = input.Options["reqType"].ToString();
+ //濡傛灉绫诲瀷涓嶄竴鏍凤紝鍒欐竻闄urOrder
+ if (CurReqType != reqType) {
+ CurOrder = null;
+ CurReqType = reqType;
+ }
+ var dtl = input.Options["record"].ToString().JsonToObject<BIZ_U9_ASN_DTL>();
+ if (CurReqType == "2")
+ {
+ CurOrder = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == SqlFunc.Subqueryable<BIZ_U9_ASN_DTL>().Where(s => SqlFunc.StartsWith(s.UPDATE_USER, $"GenerateASN_{UserCode}_Sample")).Select(s => s.ORDER_NO)).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
+ }
+ CurOrder = CurOrder??new() {
+ ORDER_NO= $"WASN{DateTime.Now.ToString("yyyyMMddHHmmss")}",
+ SUPP_CODE = dtl.SUPP_CODE,
+ DELIVERY_DATE = DateTime.Now,
+ PLANARRIVED_DATE = DateTime.Now,
+ AUTH_ORG = OrgCode,
+ };
+ if (MainDB.Queryable<BIZ_U9_ASN_DTL>().Any(q => q.ORDER_NO == CurOrder.ORDER_NO && q.ITEM_CODE == dtl.ITEM_CODE))
{
action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L($"鏉＄爜鎵�灞炵粍缁嘯{0}]涓庡綋鍓嶇櫥褰曠粍缁嘯{1}]涓嶄竴鑷达紝璇烽噸鏂伴�夋嫨缁勭粐");
- action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.OrgNotCorrect", CurSn.First().AUTH_ORG, input.AuthOption.CurOrg);
- return SetOutPutMqttMsg(action, input.Locale); ;
+ action.LocaleMsg = Biz.L($"鎵綋鍓嶇敓鎴愮殑鍗曞彿[{CurOrder.ORDER_NO}]鍙婄墿鏂欑紪鐮乕{dtl.ITEM_CODE}]宸茬粡瀛樺湪锛岃鍏堝畬鎴愭湭瀹屾垚鐨勬搷浣�");
+ return action;
}
- //楠岃瘉鏉＄爜鏄惁姝ｇ‘
- if (CurSn.First().STATUS > WMS_ITEM.STATUSs.Incoming.GetValue())
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("鐘舵�乕{0}]寮傚父锛岃閲嶆柊鎵弿");
- action.LocaleMsg = Biz.L("WMS.Default.ScanItem.StatusException", CurSn.First().STATUS.GetEnumDesc<WMS_ITEM.STATUSs>());
- return SetOutPutMqttMsg(action, input.Locale); ;
+ //濡傛灉娌℃湁渚涘簲鍟嗗悕绉帮紝鍒欎粠渚涘簲鍟嗚〃涓幏鍙�
+ if (CurOrder.SUPP_NAME.IsNullOrEmpty()) {
+ CurOrder.SUPP_NAME = MainDB.Queryable<BAS_SUPPLIER>().Where(q => q.SUPP_CODE == CurOrder.SUPP_CODE).First()?.SUPP_NAME_CN;
}
+ //if (!CurOrder.ORDER_NO.IsNullOrEmpty() && CurOrder.ORDER_NO.StartsWith("WASN") && CurOrder.STATUS == BIZ_U9_ASN.STATUSs.Counting.GetValue())
+ //{
+ // action.IsSuccessed = false;
+ // action.LocaleMsg = Biz.L($"宸茬粡鐢熸垚ASN鍗昜{CurOrder.ORDER_NO}]锛岃缁х画涓嬩竴姝ユ搷浣�");
+ // return action;
+ //}
- //鎵ц娓呯偣鏁版嵁澶勭悊
- foreach (var sn in CurSn)
+ dtl.UPDATE_USER = CurReqType == "2" ? $"GenerateASN_{UserCode}_Sample": $"GenerateASN_{UserCode}";
+ dtl.REMARK = CurReqType == "1"? CurSn.Where(q => q.ORDER_NO == dtl.ORDER_NO && q.LINE_NO == dtl.LINE_NO).FirstOrDefault()?.SN: dtl.REMARK;
+ dtl.ORDER_NO = CurOrder.ORDER_NO;
+ BIZ_U9_ASN Asn = new()
{
- sn.STATUS = WMS_ITEM.STATUSs.Counted.GetValue();
- sn.RECEIVER = UserCode;
- sn.RECEIVE_DATE = DateTime.Now;
- }
-
+ ID = Guid.NewGuid().ToString("N"),
+ ORDER_NO = CurOrder.ORDER_NO,
+ STATUS = BIZ_U9_ASN.STATUSs.Counting.GetValue(),
+ SUPP_CODE = CurOrder.SUPP_CODE,
+ SUPP_NAME = CurOrder.SUPP_NAME,
+ DELIVERY_DATE = CurOrder.DELIVERY_DATE,
+ PLANARRIVED_DATE = CurOrder.PLANARRIVED_DATE,
+ ORDER_DATE = DateTime.Now,
+ CREATE_TIME = DateTime.Now,
+ CREATE_USER = $"Print_BIZ_U9_ASN_{UserCode}",
+ UPDATE_TIME = DateTime.Now,
+ UPDATE_USER = $"Print_BIZ_U9_ASN_{UserCode}",
+ AUTH_ORG = CurOrder.AUTH_ORG,
+ };
//鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
- var _CurSn = CurSn.Clone();
- AddCommitAction("Counted", () =>
+ var _dtl = dtl.Clone();
+ _dtl.ID = Guid.NewGuid().ToString("N");
+ _dtl.IS_GIFT = reqType == "1" ? "Y" : "N";
+ _dtl.AUTH_ORG = CurOrder.AUTH_ORG;
+ _dtl.LINE_NO = _dtl.LINE_NO ?? "0";
+ input.Options["record"] = _dtl.ToJson();
+ var _Asn = Asn.Clone();
+ AddCommitAction("GenerateASN", () =>
{
//浣跨敤缁熶竴鐨勪簨鍔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();
+ var x = db.Storageable(_Asn).WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW }).ToStorage();
+ x.AsInsertable.ExecuteCommand();
+ x.AsUpdateable
+ .IgnoreColumns(x => x.ID)
+ .UpdateColumns(q => new { q.ORDER_NO, q.AUTH_ORG, q.DELIVERY_DATE, q.STATUS, q.SUPP_CODE, q.SUPP_NAME, q.PLANARRIVED_DATE, q.ORDER_DATE, q.UPDATE_TIME, q.UPDATE_USER })
+ .ExecuteCommand();
+
+ var y = db.Storageable(_dtl).WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.GHOST_ROW }).ToStorage();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable
+ .IgnoreColumns(x => x.ID)
+ .UpdateColumns(q => new { q.ITEM_CODE, q.AUTH_ORG, q.QTY, q.STATUS, q.SUPP_CODE, q.SUPP_LOTNO, q.QTY_PACKING, q.QTY_GIFT, q.IS_GIFT, q.UPDATE_TIME, q.UPDATE_USER })
+ .ExecuteCommand();
+ if (reqType == "2")
+ {
+ db.Updateable<BIZ_U9_ASN_DTL>()
+ .SetColumns( it => it.LINE_NO == SqlFunc.Subqueryable<BIZ_U9_ASN_DTL>().Where(q=>q.ORDER_NO == _dtl.ORDER_NO).Select(q => (SqlFunc.AggregateMax(SqlFunc.ToInt32(q.LINE_NO)) + 10).ToString()))
+ .Where(q=>q.ORDER_NO == _dtl.ORDER_NO && q.LINE_NO == _dtl.LINE_NO)
+ .ExecuteCommand();
+ }
+ });
+ action = await Submit(input);
+ }
+ catch (Exception ex)
+ {
+ //鍙栨秷褰撳墠鎿嶄綔
+ ResetTrans();
+ action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
+ }
+ return SetOutPutMqttMsg(action, input.Locale);
+ }
+
+ /// <summary>
+ /// 鎻愪氦鏁版嵁鐢熸垚SN骞舵竻鐐�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<ApiAction<ScanOutput>> Submit(BaseInput input)
+ {
+ var action = new ApiAction<ScanOutput>(new ScanOutput());
+ try
+ {
+ var snlist = input.Options["Snlist"].ToString().JsonToObject<List<BIZ_U9_ASN_SN>>();
+ var reqType = input.Options["reqType"].ToString();
+ var dtl = input.Options["record"].ToString().JsonToObject<BIZ_U9_ASN_DTL>();
+ action.LocaleMsg = Biz.L($"鎴愬姛鎻愪氦ASN鍗昜{dtl.ORDER_NO}]琛屾暟鎹紝璇风偣鍑绘墦鍗版寜閽墦鍗版爣绛�");
+
+ var asnSn = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.ORDER_NO == dtl.ORDER_NO && q.LINE_NO == dtl.LINE_NO && (q.STATUS == WMS_ITEM.STATUSs.Counted.GetValue() || q.STATUS == WMS_ITEM.STATUSs.Rejected.GetValue())).ToList();
+ if (asnSn.Count>0 && asnSn.Sum(q => q.QTY) == dtl.QTY)
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = dtl.ORDER_NO.IsNullOrEmpty() ? Biz.L($"鏁版嵁涓嶅瓨鍦紒") : Biz.L($"ASN鍗昜{dtl.ORDER_NO}]琛孾{dtl.LINE_NO}]鏁版嵁宸插叏閮ㄦ彁浜ゅ畬鎴愶紝濡傛灉鏈墦鍗版爣绛捐鐐瑰嚮鎵撳嵃鎸夐挳鎵撳嵃鏍囩");
+ SnList.AddRange(asnSn.Select(q=>q.SN));
+ return action;
+ }
+ List<BIZ_U9_ASN_SN> sns = new();
+ List<WMS_ITEM> items = new();
+ List<WMS_ITEM_HIS> hiss = new();
+ List<WMS_ITEM_EXT> itemExts = new();
+ List<WMS_ITEM_PKG> pkgs = new();
+ SnList.Clear();
+ foreach (var sn in snlist)
+ {
+ var strs = sn.SN.Split('/');
+ var metaSn = reqType == "2" ? $"{DI.Resolve<ICodeRuleCache>()["SampleBarcode"]?.Generate(strs[0],"/", strs[1], "/").Data.ToString() ?? ""}" : DI.Resolve<ICodeRuleCache>()["NoSourceBarcode"]?.Generate($"{sn.SN}").Data.ToString() ?? "";
+ SnList.Add(metaSn);
+ var barcode = new Barcode(metaSn);
+ BIZ_U9_ASN_SN info = new()
+ {
+ AUTH_ORG = dtl.AUTH_ORG,
+ CREATE_TIME = DateTime.Now,
+ CREATE_USER = UserCode,
+ UPDATE_TIME = DateTime.Now,
+ UPDATE_USER = UserCode,
+ STATUS = WMS_ITEM.STATUSs.Counted.GetValue(),
+ ORDER_NO = dtl.ORDER_NO,
+ LINE_NO = dtl.LINE_NO,
+ SN = barcode.SN,
+ META_SN = metaSn,
+ ITEM_CODE = barcode.ItemCode,
+ QTY = sn.QTY,
+ LOTNO = barcode.LotNo,
+ CARTON_NO = barcode.SN,
+ RECEIVER = $"{UserCode}_NoSource",
+ RECEIVE_DATE = DateTime.Now,
+ };
+ sns.Add(info);
+
+ var item = new WMS_ITEM()
+ {
+ SN = barcode.SN,
+ ITEM_CODE = barcode.ItemCode,
+ AUTH_ORG = dtl.AUTH_ORG,
+ STATUS = WMS_ITEM.STATUSs.Counted.GetValue(),
+ QTY = sn.QTY,
+ PROD_DATE = barcode.ProdDate ?? BarcodeAnalysis.GetDateTime(dtl.SUPP_LOTNO) ?? DateTime.Now,
+ UNIT = barcode.Unit,
+ TRANS_CODE = nameof(BIZ_U9_ASN),
+ TRANS_NO = info.ORDER_NO,
+ TRANS_LINE = info.LINE_NO,
+ SUPP_CODE = dtl.SUPP_CODE,
+ SUPP_LOTNO = dtl.SUPP_LOTNO,
+ };
+ items.Add(item);
+ hiss.Add(new WMS_ITEM_HIS(item, $"鏉＄爜[{barcode.SN}]瀵煎叆锛屾搷浣滃崟鎹甗{item.TRANS_NO}]"));
+ var ext = new WMS_ITEM_EXT()
+ {
+ SN = barcode.SN,
+ META_SN = metaSn,
+ QR_CODE = metaSn,
+ };
+ itemExts.Add(ext);
+ var pkg = new WMS_ITEM_PKG()
+ {
+ SN = barcode.SN,
+ ITEM_CODE = barcode.ItemCode,
+ AUTH_ORG = dtl.AUTH_ORG,
+ QTY = sn.QTY,
+ UNIT = barcode.Unit,
+ TRANS_CODE = nameof(BIZ_U9_ASN),
+ TRANS_NO = info.ORDER_NO,
+ TRANS_LINE = info.LINE_NO,
+ SUPP_CODE = dtl.SUPP_CODE,
+ SUPP_LOTNO = dtl.SUPP_LOTNO,
+ };
+ pkgs.Add(pkg);
+ }
+ //鏇存柊褰撳墠娓呯偣鐨勬潯鐮佺姸鎬�
+ foreach (var sn in CurSn)
+ {
+ sn.STATUS = WMS_ITEM.STATUSs.Counted.GetValue();
+ }
+ CurOrder.STATUS = BIZ_U9_ASN.STATUSs.Counting.GetValue();
+
+ AddCommitAction("CountedAndPrint", () =>
+ {
+ //浣跨敤缁熶竴鐨勪簨鍔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 == dtl.ORDER_NO).ExecuteCommand();
+ db.Storageable(sns, UserCode).ExecuteCommand();
+ if (reqType == "2")
+ {
+ db.Updateable<BIZ_U9_ASN_SN>()
+ .SetColumns(q => q.LINE_NO == SqlFunc.Subqueryable<BIZ_U9_ASN_DTL>().Where(t1 => t1.ID == dtl.ID).Select(t1 => t1.LINE_NO))
+ .Where(q=>sns.Select(s=>s.ID).Contains(q.ID))
+ .ExecuteCommand();
+ }
+
+ var s = db.Storageable(items, UserCode).WhereColumns(t => new { t.SN, t.GHOST_ROW }).ToStorage();
+ s.AsInsertable.ExecuteCommand();
+ s.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ITEM_CODE, q.AUTH_ORG, q.STATUS, q.QTY, q.PROD_DATE, q.UNIT, q.TRANS_CODE, q.TRANS_NO, q.TRANS_LINE, q.SUPP_CODE, q.SUPP_LOTNO, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
+ db.Insertable(hiss, UserCode).ExecuteCommand();
+ var o = db.Storageable(itemExts, UserCode).WhereColumns(t => new { t.SN, t.GHOST_ROW }).ToStorage();
+ o.AsInsertable.ExecuteCommand();
+ o.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.META_SN, q.QR_CODE, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
+ var y = db.Storageable(pkgs, UserCode).WhereColumns(t => new { t.SN, t.GHOST_ROW }).ToStorage();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ITEM_CODE, q.AUTH_ORG, q.QTY, q.UNIT, q.TRANS_CODE, q.TRANS_NO, q.TRANS_LINE, q.SUPP_CODE, q.SUPP_LOTNO, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
});
//瀹屾垚鎵�鏈夊鐞嗗悗浣跨敤浜嬪姟淇濆瓨鏁版嵁
@@ -190,189 +477,10 @@
catch (Exception ex)
{
//鍙栨秷褰撳墠鎿嶄綔
- ResetScan();
- //action.CatchExceptionWithLog(ex, $"鎵弿鏉＄爜[{0}]澶嶆牳寮傚父");
- action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.ScanItem.ScanException", input.SN));
+ ResetTrans();
+ action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
}
return SetOutPutMqttMsg(action, input.Locale);
- }
-
- /// <summary>
- /// 瀹屾垚鎵�鏈夊鐞嗗悗浣跨敤浜嬪姟淇濆瓨鏁版嵁
- /// </summary>
- /// <param name="action"></param>
- /// <returns></returns>
- public ApiAction<ScanOutput> DoIfFinish(ApiAction<ScanOutput> action, string locale)
- {
- //淇濆瓨鏁版嵁搴�
- SaveCommitListToDB();
-
- if (!OrderList.Contains(CurSn.First().ORDER_NO))
- {
- OrderList.Add(CurSn.First().ORDER_NO);
- }
- ScanList.AddRange(CurSn);
-
- // 杩斿洖鏁版嵁
- action.Data.Data = ScanList;
-
- //action.LocaleMsg = Biz.L($"鏉＄爜[{0}]娓呯偣鎴愬姛锛�");
- action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.CountSuccess", CurSn.First().SN);
-
- //閲嶇疆宸ュ簭
- ResetScan();
- return SetOutPutMqttMsg(action, locale); ;
- }
-
- /// <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();
- sn.RECEIVER = null;
- sn.RECEIVE_DATE = DateTime.MinValue;
- }
-
- //浣跨敤缁熶竴鐨勪簨鍔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.Print_BIZ_U9_ASN.DeleteScanListException"));
- }
- return action;
- }
-
- /// <summary>
- /// 鍒犻櫎褰撳墠鐢ㄦ埛鐨勫凡鎵崟涓褰�
- /// </summary>
- /// <returns></returns>
- public async Task<ApiAction> DeleteScannedSn(BaseInput input)
- {
- var action = new ApiAction();
- try
- {
- //浣跨敤缁熶竴鐨勪簨鍔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.Print_BIZ_U9_ASN.DeleteScannedSnException", input.SN));
- }
- return action;
- }
-
- /// <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;
- action.Data.pageIndex = input.pageIndex;
- action.Data.totals = ScanList.Count;
- action.Data.data = ScanList.Skip((input.pageIndex - 1) * input.pageSize).Take(input.pageSize).ToList();
- //action.Data = query;
- return action;
- }
-
- /// <summary>
- /// 鑾峰彇褰撳墠鎵�鏈夊崟鎹俊鎭�
- /// </summary>
- /// <returns></returns>
- public async Task<ApiAction<List<BIZ_U9_ASN>>> GetOrderList()
- {
- 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);
- }
- order.IsFinished = !order.Details.Where(q => q.QTY != q.QTY_COUNTED).Any();
- }
- }
- 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.Print_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)
- {
- //return action.CatchExceptionWithLog(ex, Biz.L("璁剧疆鏀惰揣鍗曟槑缁嗚禒鍝佹暟閲忎负寮傚父"));
- return action.CatchExceptionWithLog(ex, Biz.L("WMS.Print_BIZ_U9_ASN.SetGiftQtyException"));
- }
- return action;
}
/// <summary>
@@ -383,15 +491,16 @@
public async Task<ApiAction> GenerateReceipt(BaseInput input)
{
var action = new ApiAction();
- var orderNo = input.Data;
+ var orderNo = CurOrder.ORDER_NO;
try
{
- var order = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == orderNo).IncludesAllFirstLayer().FirstAsync();
+ var reqType = input.Options["reqType"].ToString();
+ 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.Print_BIZ_U9_ASN.GenerateReceipt.ASNNotExists", orderNo);
+ action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceipt.ASNNotExists", orderNo);
return action;
}
//楠岃瘉鏉＄爜鏄惁姝ｇ‘
@@ -399,35 +508,88 @@
{
action.IsSuccessed = false;
//action.LocaleMsg = Biz.L("鐢熸垚鏀惰揣鍗曪細閫佽揣鍗曠姸鎬乕{0}]寮傚父");
- action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.GenerateReceipt.StatusException", order.STATUS.GetEnumDesc<BIZ_U9_ASN.STATUSs>());
+ action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceipt.StatusException", order.STATUS.GetEnumDesc<BIZ_U9_ASN.STATUSs>());
return action;
}
- //鏌ヨ鏄惁娓呯偣瀹屾垚
+ //鏌ヨ鏄惁瀛樺湪娓呯偣瀹屾垚鐨勮鏄庣粏锛屽鏋滄湁鍒欏厛鎻愪氦瀹屾垚鐨勮锛屽鏋滄病鏈夊垯鎶ラ敊
+ 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 (noFinish.Any())
+ if (!finishNotSubmit.Any())
{
action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("閫佽揣鍗昜{0}]鏈竻鐐瑰畬鎴愶紝璇峰厛娓呯偣瀹屾垚锛屾湭瀹屾垚娓呯偣鐨勮鍙峰涓嬶細{1}");
- action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.GenerateReceipt.NoFinishCounting", orderNo, string.Join("锛�", noFinish.Select(q => q.LINE_NO)));
+ //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;
}
-
- var iInput = new CreateRcvBySrcASNInput
+ ApiAction<List<U9CReturnData2>> result = new();
+ //濡傛灉鏄殢鍗曡禒鍝佹垨鑰呮牱鍝�
+ if (reqType.ToInt32() > 0)
{
- userId = UserCode,
- IsLogin = true,
- CreateRcvBySrcASNParam = new()
+ var iInput = new CreateReceivementInput
{
- aSNToRcvTransDTOs = order.Details.Select(q => new ASNToRcvTransDTO { ASNLineKey = q.ID, TransQty = new() { m_amount1 = q.QTY } }).ToList(),
+ userId = UserCode,
+ IsLogin = true,
+ CreateReceivementParam = new()
+ {
+ rcvDTO = new()
+ {
+ Supplier = new() { m_code = order.SUPP_CODE },
+ RcvDocType = new() { m_code = rcvDocType },
+ RcvLines = finishNotSubmit.Select(q=> new RcvLine
+ {
+ ItemInfo = new() { m_itemCode = q.ITEM_CODE},
+ Wh = new() { m_code = "10101" },
+ RcvLineLocations = new(){
+ new(){
+ Location = new(){ m_code= q.ItemInfo.DEFAULT_LOCATION},
+ LocationQtyTU = q.QTY,
+ }
+ },
+ ArriveQtyTU = q.QTY,
+ ArriveQtyPU = q.QTY,
+ RcvQtyTU = 0,
+ RcvQtyPU = 0,
+ EyeballingQtyTU = q.QTY,
+ RcvProcedure = 0,
+ RcvLotCode = q.SUPP_LOTNO,
+ InvLotCode = q.LOTNO,
+ }).ToList(),
+ }
+ },
+ };
+ result = await DI.Resolve<IWMS_U9C>().CreateReceivement(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)
+ }
+ //濡傛灉鏄湭涓婇棬鎴�
+ else
{
- action.IsSuccessed = false;
- action.LocaleMsg = result.LocaleMsg;
- return action;
+ 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(),
+ }
+ };
+ result = await DI.Resolve<IWMS_U9C>().CreateRcvBySrcASN(iInput);
+ if (!result.IsSuccessed)
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = result.LocaleMsg;
+ return action;
+ }
}
//鏍规嵁鎺ュ彛杩斿洖鏀惰揣鍗曞崟鍙锋煡璇㈠崟鎹槑缁嗭紝骞跺垱寤烘潯鐮佹槑缁�
@@ -435,7 +597,7 @@
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)
{
@@ -455,7 +617,7 @@
foreach (var item in list)
{
- var asnDtl = order.Details.First(q => q.ID == item.SrcASNDocLineId.ToString());
+ var asnDtl = finishNotSubmit.First(q => q.ID == item.SrcASNDocLineId.ToString());
BIZ_U9_RECEIPT_DTL receiptDt = new()
{
ID = item.RcvLineId.ToString(),
@@ -471,11 +633,19 @@
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()
@@ -500,7 +670,7 @@
}
//鏇存柊搴撳瓨琛ㄤ俊鎭�
- 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)
{
@@ -514,7 +684,7 @@
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();
+ 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,11 +695,15 @@
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;
+ order.UPDATE_USER = UserCode;
+ order.REMARK = "";
+ }
//浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
var db = GetCommitDB();
@@ -538,7 +712,8 @@
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(order, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.RECEIVER, q.RECEIVE_DATE }).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, q.RECEIVER_LINE }).ExecuteCommand();
db.Insertable(receipt, UserCode).ExecuteCommand();
db.Insertable(receipt.Details, UserCode).ExecuteCommand();
db.Insertable(receipt.SnList, UserCode).ExecuteCommand();
@@ -546,7 +721,8 @@
if (dbTran.IsSuccess)
{
//action.LocaleMsg = Biz.L($"閫佽揣鍗昜{0}]鐢熸垚鏀惰揣鍗昜{1}]鎴愬姛");
- action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.GenerateReceipt.Success", order.ORDER_NO, receipt.ORDER_NO);
+ action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceipt.Success", order.ORDER_NO, receipt.ORDER_NO);
+ CurSn.Clear();
}
else
{
@@ -558,23 +734,49 @@
catch (System.Exception ex)
{
//return action.CatchExceptionWithLog(ex, Biz.L("閫佽揣鍗昜{0}]鐢熸垚鏀惰揣鍗曞紓甯�"));
- return action.CatchExceptionWithLog(ex, Biz.L("WMS.Print_BIZ_U9_ASN.GenerateReceiptException", orderNo));
+ return action.CatchExceptionWithLog(ex, Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceiptException", orderNo));
}
return action;
+ }
+ /// <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, Action doAfterSave = null)
+ {
+ //淇濆瓨鏁版嵁搴�
+ SaveCommitListToDB();
+
+ //淇濆瓨鏁版嵁鎴愬姛鍚庢墽琛�
+ doAfterSave?.Invoke();
+
+ // 杩斿洖鏁版嵁
+ action.Data.Data = new { OrderNo = CurOrder.ORDER_NO, Sns = SnList };
+
+ //action.LocaleMsg = Biz.L($"鏉＄爜[{0}]娓呯偣鎴愬姛锛�");
+ //action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.CountSuccess", string.Join(",", SnList));
+
+ //閲嶇疆宸ュ簭
+ ResetTrans();
+ return SetOutPutMqttMsg(action, locale); ;
}
#endregion
/// <summary>
- /// 閲嶇疆褰撳墠鎿嶄綔锛屾湁闇�瑕佸垯閲嶅啓姝ゆ柟娉�
+ /// 閲嶇疆浜嬪姟鏁版嵁锛屾湁闇�瑕佸垯閲嶅啓姝ゆ柟娉�
/// </summary>
- public override void ResetScan()
+ public override void ResetTrans()
{
- base.ResetScan();
+ base.ResetTrans();
Command = null;
CurInvItem = null;
CurScanShelf = null;
- CurSn = null;
+ //CurSn = null;
+ SnList = new();
}
public override bool Close(bool needSaveHistoryLog = false)
--
Gitblit v1.9.3