From c6342a8eb6d2c40e9a21deab63b5babb3def3025 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期日, 13 四月 2025 17:14:50 +0800
Subject: [PATCH] 物料扩展表增加字段 上架需要按物料的默认储位进行限制，不允许上架到其他储位 没有默认储位则不限制，需要记录并调用接口反写到U9
---
Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs | 599 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 393 insertions(+), 206 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 77f2bf3..e4abf00 100644
--- a/Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs
@@ -41,7 +41,6 @@
private BIZ_U9_ASN order = new();
private List<BIZ_U9_ASN_SN> CurSn = new();
List<string> SnList = new();
- private List<BIZ_U9_ASN_SN> ScanList = new();
#endregion
#region Functions
@@ -61,24 +60,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 if (input.Data == "Submit")
+ //濡傛灉鏄湭涓婇棬鎴锋彁浜�
+ else if (input.Command == "Submit")
{
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));
}
@@ -95,19 +100,126 @@
var action = new ApiAction<ScanOutput>($"鎴愬姛鑾峰彇ASN鍗昜{input.SN}]淇℃伅", new ScanOutput());
try
{
- order = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == input.SN).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
+ order = 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 (order == null)
{
action.IsSuccessed = false;
action.LocaleMsg = Biz.L($"鏌ヤ笉鍒癆SN鍗昜{input.SN}]鐨勬暟鎹�");
return action;
}
+ action.LocaleMsg = order.STATUS == BIZ_U9_ASN.STATUSs.Counting.GetValue() ? Biz.L($"ASN鍗昜{input.SN}]鐘舵�佷负[{BIZ_U9_ASN.STATUSs.Counting.GetDesc()}]锛岃缁х画鏈畬鎴愮殑鎿嶄綔") : action.LocaleMsg;
action.Data.Data = order;
}
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>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ private async Task<ApiAction<ScanOutput>> GetAsnInfoBySn(BaseInput input)
+ {
+ var action = new ApiAction<ScanOutput>(new ScanOutput());
+ try
+ {
+ var AsnSn = await MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.SN == input.SN).FirstAsync();
+ if (AsnSn == null)
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = Biz.L($"鏌ヤ笉鍒版潯鐮乕{input.SN}]鐨勬暟鎹�");
+ return action;
+ }
+ if (CurSn.Count > 0 && CurSn.Any(q => q.LOTNO == AsnSn.LOTNO && q.STATUS <= WMS_ITEM.STATUSs.Counted.GetValue()))
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = Biz.L($"宸茬粡瀛樺湪鐨勬壒娆{AsnSn.LOTNO}]鏈畬鎴愭搷浣滐紝璇峰厛瀹屾垚姝ゆ壒娆�");
+ return action;
+ }
+ order = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == AsnSn.ORDER_NO).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
+ if (order == null)
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = Biz.L($"鏌ヤ笉鍒癆SN鍗昜{input.SN}]鐨勬暟鎹�");
+ return action;
+ }
+ //濡傛灉鏄涓�娆℃壂鎻忥紝鐢熸垚鍗曞彿
+ if (CurSn.Count == 0)
+ {
+ action.Data.Command = $"WASN{DateTime.Now.ToString("yyyyMMddHHmmss")}";
+ }
+ CurSn.Add(AsnSn);
+ var _order = order.Clone();
+ _order.Details = _order.Details.Where(q => CurSn.Any(s => s.LINE_NO == q.LINE_NO)).ToList();
+ action.LocaleMsg = Biz.L($"鎴愬姛鑾峰彇ASN鍗昜{AsnSn.ORDER_NO}]鐨勪俊鎭�");
+ action.Data.Data = _order;
+ }
+ 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();
+ var dtl = input.Options["record"].ToString().JsonToObject<BIZ_U9_ASN_DTL>();
+ BIZ_U9_ASN Asn = new()
+ {
+ ID = Guid.NewGuid().ToString("N"),
+ ORDER_NO = dtl.ORDER_NO,
+ STATUS = BIZ_U9_ASN.STATUSs.Counting.GetValue(),
+ SUPP_CODE = order.SUPP_CODE,
+ SUPP_NAME = order.SUPP_NAME,
+ DELIVERY_DATE = order.DELIVERY_DATE,
+ PLANARRIVED_DATE = order.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 = order.AUTH_ORG,
+ };
+ //鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
+ var _dtl = dtl.Clone();
+ _dtl.ID = Guid.NewGuid().ToString("N");
+ _dtl.IS_GIFT = reqType == "1" ? "Y" : "N";
+ _dtl.AUTH_ORG = order.AUTH_ORG;
+ input.Options["record"] = _dtl.ToJson();
+ var _Asn = Asn.Clone();
+ AddCommitAction("GenerateASN", () =>
+ {
+ //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
+ var db = GetCommitDB();
+ //鏁版嵁淇濆瓨閫昏緫
+ db.Insertable(_Asn, UserCode).ExecuteCommand();
+ var y = db.Storageable(_dtl, UserCode).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();
+ });
+ action = await Submit(input);
+ }
+ catch (Exception ex)
+ {
+ //鍙栨秷褰撳墠鎿嶄綔
+ ResetTrans();
action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
}
return SetOutPutMqttMsg(action, input.Locale);
@@ -126,12 +238,12 @@
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}]琛屾暟鎹紝骞跺畬鎴愭竻鐐癸紝璇风偣鍑绘墦鍗版寜閽墦鍗版爣绛�");
+ action.LocaleMsg = Biz.L($"鎴愬姛鎻愪氦ASN鍗昜{dtl.ORDER_NO}]琛屾暟鎹紝璇风偣鍑绘墦鍗版寜閽墦鍗版爣绛�");
if (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())).Sum(q => q.QTY) == dtl.QTY)
{
action.IsSuccessed = false;
- action.LocaleMsg = Biz.L($"ASN鍗昜{dtl.ORDER_NO}]琛孾{dtl.LINE_NO}]鏁版嵁宸插叏閮ㄦ竻鐐瑰畬鎴愶紝濡傛灉鏈墦鍗版爣绛捐鐐瑰嚮鎵撳嵃鎸夐挳鎵撳嵃鏍囩");
+ action.LocaleMsg = dtl.ORDER_NO.IsNullOrEmpty() ? Biz.L($"鏁版嵁涓嶅瓨鍦紒") : Biz.L($"ASN鍗昜{dtl.ORDER_NO}]琛孾{dtl.LINE_NO}]鏁版嵁宸插叏閮ㄦ彁浜ゅ畬鎴愶紝濡傛灉鏈墦鍗版爣绛捐鐐瑰嚮鎵撳嵃鎸夐挳鎵撳嵃鏍囩");
return action;
}
List<BIZ_U9_ASN_SN> sns = new();
@@ -139,10 +251,10 @@
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 _sn = DI.Resolve<ICodeRuleCache>()["NoSourceBarcode"]?.Generate($"/NoSourceBarcode/").Data.ToString() ?? "";
- var metaSn = _sn.replace("/NoSourceBarcode/", sn.SN);
+ var metaSn = DI.Resolve<ICodeRuleCache>()["NoSourceBarcode"]?.Generate($"{sn.SN}").Data.ToString() ?? "";
SnList.Add(metaSn);
var barcode = new Barcode(metaSn);
BIZ_U9_ASN_SN info = new()
@@ -165,6 +277,7 @@
RECEIVE_DATE = DateTime.Now,
};
sns.Add(info);
+
var item = new WMS_ITEM()
{
SN = barcode.SN,
@@ -204,6 +317,11 @@
};
pkgs.Add(pkg);
}
+ //鏇存柊褰撳墠娓呯偣鐨勬潯鐮佺姸鎬�
+ foreach (var sn in CurSn)
+ {
+ sn.STATUS = WMS_ITEM.STATUSs.Counted.GetValue();
+ }
AddCommitAction("CountedAndPrint", () =>
{
@@ -223,205 +341,273 @@
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();
});
- //娓呯偣瀹屾垚璋冪敤鎺ュ彛鐢熸垚鏃犳潵婧愭敹璐у崟
- Action generatedAction = () =>
- {
- ApiAction<List<U9CReturnData2>> result = new ApiAction<List<U9CReturnData2>>();
- //濡傛灉鏄殢鍗曡禒鍝佹垨鑰呮牱鍝�
- if (reqType == "1")
- {
- var iInput = new CreateReceivementInput
- {
- userId = UserCode,
- IsLogin = true,
- Supplier = "",
- RcvDocType = "",
- RcvLines = new()
- {
- new(){
- ItemInfo = new(){m_itemCode="" },
- Wh= new(){ m_code=""},
- RcvLineLocations = new(){
- new(){
- Location = new(){ m_code="" },
- LocationQtyTU = 0,
- }
- },
- ArriveQtyTU = 0,
- ArriveQtyPU = 0,
- RcvQtyTU= 0,
- RcvQtyPU= 0,
- EyeballingQtyTU = 0,
- RcvProcedure = 0,
- StorageType = 0,
- RcvLotCode = "",
- InvLotCode = "",
- },
- }
- };
- result = DI.Resolve<IWMS_U9C>().CreateReceivement(iInput).Result;
- if (!result.IsSuccessed)
- {
- throw new Exception(Biz.T(result.LocaleMsg, input.Locale));
- }
- }
- //濡傛灉鏄湭涓婇棬鎴�
- else if (reqType == "0")
- {
- 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 } }).ToList(),
- }
- };
- result = DI.Resolve<IWMS_U9C>().CreateRcvBySrcASN(iInput).Result;
- if (!result.IsSuccessed)
- {
- throw new Exception(Biz.T(result.LocaleMsg, input.Locale));
- }
- }
-
- //鏍规嵁鎺ュ彛杩斿洖鏀惰揣鍗曞崟鍙锋煡璇㈠崟鎹槑缁嗭紝骞跺垱寤烘潯鐮佹槑缁�
- 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();
-
- 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;
-
- foreach (var item in list)
- {
- var asnDtl = order.Details.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閫�琛ユ暟閲�
- 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,
- ERP_CODE = item.ItemCode1,
- };
- receipt.Details.Add(receiptDt);
- }
-
- foreach (var sn in order.SnList)
- {
- var dtl = receipt.Details.First(q => q.ASN_LINE == sn.LINE_NO);
- BIZ_U9_RECEIPT_SN receiptSn = new()
- {
- AUTH_ORG = dtl.AUTH_ORG,
- ORDER_NO = dtl.ORDER_NO,
- LINE_NO = dtl.LINE_NO,
- SN = sn.SN,
- META_SN = sn.META_SN,
- ITEM_CODE = sn.ITEM_CODE,
- STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue(),
- QTY = sn.QTY,
- UNIT = sn.UNIT,
- IS_OK = sn.IS_OK,
- IS_IN = sn.IS_IN,
- LOTNO = sn.LOTNO,
- CARTON_NO = sn.CARTON_NO,
- PALLET_NO = sn.PALLET_NO,
- };
- 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 historys = new List<WMS_ITEM_HIS>();
- 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();
- foreach (var item in pkgs)
- {
- item.AUTH_ORG = receipt.AUTH_ORG;
- 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;
- }
- 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;
-
- //浣跨敤缁熶竴鐨勪簨鍔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();
- 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.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.Print_BIZ_U9_ASN.GenerateReceipt.Success", order.ORDER_NO, receipt.ORDER_NO);
- }
- else
- {
- Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
- //鎶涘嚭寮傚父
- throw dbTran.ErrorException;
- }
- };
//瀹屾垚鎵�鏈夊鐞嗗悗浣跨敤浜嬪姟淇濆瓨鏁版嵁
- action = DoIfFinish(action, input.Locale, generatedAction);
+ action = DoIfFinish(action, input.Locale);
}
catch (Exception ex)
{
//鍙栨秷褰撳墠鎿嶄綔
- ResetScan();
+ ResetTrans();
action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
}
return SetOutPutMqttMsg(action, input.Locale);
}
+ /// <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 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.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 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;
+ }
+ ApiAction<List<U9CReturnData2>> result = new();
+ //濡傛灉鏄殢鍗曡禒鍝佹垨鑰呮牱鍝�
+ if (reqType.ToInt32() > 0)
+ {
+ var rcvDocType = reqType == "1" ? "RCV01" : "RCV03";
+ var iInput = new CreateReceivementInput
+ {
+ 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 = rcvDocType == "RCV03" ? $"{DateTime.Now.ToString("yyyyMMdd")}" : "",
+ InvLotCode = rcvDocType == "RCV03"? $"{DateTime.Now.ToString("yyyyMMdd")}": q.LOTNO,
+ }).ToList(),
+ }
+ },
+ };
+ result = await DI.Resolve<IWMS_U9C>().CreateReceivement(iInput);
+ if (!result.IsSuccessed)
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = result.LocaleMsg;
+ return action;
+ }
+ }
+ //濡傛灉鏄湭涓婇棬鎴�
+ else
+ {
+ var iInput = new CreateRcvBySrcASNInput
+ {
+ userId = UserCode,
+ IsLogin = false, // 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;
+ }
+ }
+
+ //鏍规嵁鎺ュ彛杩斿洖鏀惰揣鍗曞崟鍙锋煡璇㈠崟鎹槑缁嗭紝骞跺垱寤烘潯鐮佹槑缁�
+ 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 && x.SplitFlag != 1).ToList();
+
+ 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;
+
+ 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閫�琛ユ暟閲�
+ 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,
+ 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.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()
+ {
+ AUTH_ORG = dtl.AUTH_ORG,
+ ORDER_NO = dtl.ORDER_NO,
+ LINE_NO = dtl.LINE_NO,
+ SN = sn.SN,
+ META_SN = sn.META_SN,
+ ITEM_CODE = sn.ITEM_CODE,
+ STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue(),
+ QTY = sn.QTY,
+ UNIT = sn.UNIT,
+ IS_OK = sn.IS_OK,
+ IS_IN = sn.IS_IN,
+ LOTNO = sn.LOTNO,
+ CARTON_NO = sn.CARTON_NO,
+ PALLET_NO = sn.PALLET_NO,
+ };
+ 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 && finishNotSubmit.Select(d => d.LINE_NO).Contains(s.LINE_NO)).Any()).ToList();
+ var historys = new List<WMS_ITEM_HIS>();
+ 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 && finishNotSubmit.Select(d => d.LINE_NO).Contains(s.LINE_NO)).Any()).ToList();
+ foreach (var item in pkgs)
+ {
+ item.AUTH_ORG = receipt.AUTH_ORG;
+ 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;
+ }
+
+ 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();
+ 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 }).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();
+ });
+ 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);
+ CurSn.Clear();
+ }
+ 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;
+ }
/// <summary>
/// 瀹屾垚鎵�鏈夊鐞嗗悗浣跨敤浜嬪姟淇濆瓨鏁版嵁
/// </summary>
@@ -441,25 +627,26 @@
action.Data.Data = SnList;
//action.LocaleMsg = Biz.L($"鏉＄爜[{0}]娓呯偣鎴愬姛锛�");
- action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.CountSuccess", string.Join(",", SnList));
+ //action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.CountSuccess", string.Join(",", SnList));
//閲嶇疆宸ュ簭
- ResetScan();
+ 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