From b57fb8b61bd053601035694470ac4e79fbf99bf8 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期六, 12 四月 2025 17:52:56 +0800
Subject: [PATCH] 雅达-优化收货单处理逻辑及参数结构
---
Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs | 235 +++++++++++++++++++++++++++++++++++++---------
Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs | 30 ++---
Tiger.Business.WMS/ERP/WMS_U9C.cs | 22 +---
3 files changed, 205 insertions(+), 82 deletions(-)
diff --git a/Tiger.Business.WMS/ERP/WMS_U9C.cs b/Tiger.Business.WMS/ERP/WMS_U9C.cs
index 5cbd7b3..cb5c19d 100644
--- a/Tiger.Business.WMS/ERP/WMS_U9C.cs
+++ b/Tiger.Business.WMS/ERP/WMS_U9C.cs
@@ -85,7 +85,7 @@
{
action.IsSuccessed = false;
action.LocaleMsg = new($"{action.Message}; {result.Data[0].ErrorMsg}");
- Logger.Interface.Info($"鏂板鏀惰揣鍗�-鏉ユ簮ASN鍗曞け璐�:{result.Data[0].ErrorMsg}");
+ Logger.Interface.Info($"鏂板鏀惰揣鍗�-鏉ユ簮ASN鍗曞け璐ワ紝鎻愪氦Json: {JsonConvert.SerializeObject(param)}锛岄敊璇俊鎭�:{result.Data[0].ErrorMsg}");
}
}
}
@@ -118,37 +118,27 @@
Logger.Interface.Info($"U9C鐧诲綍token: {input.token}");
}
}
- CreateReceivementParam param = new()
- {
- rcvDTO = new()
- {
- BusinessDate = DateTime.Now,
- Supplier = new() { m_code = input.Supplier },
- RcvDocType = new() { m_code = input.RcvDocType },
- RcvLines= input.RcvLines,
- },
- OtherID = "WMS"
- };
- var response = await HttpHelper.PostAsync(CreateReceivementUrl, JsonConvert.SerializeObject(param), new Dictionary<string, string>() { { "token", input.token } });
+
+ var response = await HttpHelper.PostAsync(CreateReceivementUrl, JsonConvert.SerializeObject(input.CreateReceivementParam), new Dictionary<string, string>() { { "token", input.token } });
var result = JsonConvert.DeserializeObject<U9CResult2>(response.Message);
if (result != null)
{
if (result.Success && result.Data[0].IsSucess)
{
action.Data = result.Data;
- Logger.Interface.Info($"鏂板鏀惰揣鍗�-鏃犳潵婧愭帴鍙ｆ彁浜son: {JsonConvert.SerializeObject(param)}锛岃繑鍥濲son: {response.Message}");
+ Logger.Interface.Info($"鏂板鏀惰揣鍗�-鏃犳潵婧愭帴鍙ｆ彁浜son: {JsonConvert.SerializeObject(input.CreateReceivementParam)}锛岃繑鍥濲son: {response.Message}");
}
else
{
action.IsSuccessed = false;
action.LocaleMsg = new($"{action.Message}; {result.Data[0].ErrorMsg}");
- Logger.Interface.Info($"鏂板鏀惰揣-鍗曟棤鏉ユ簮澶辫触:{result.Data[0].ErrorMsg}");
+ Logger.Interface.Info($"鏂板鏀惰揣-鍗曟棤鏉ユ簮澶辫触锛屾彁浜son: {JsonConvert.SerializeObject(input.CreateReceivementParam)}锛岄敊璇俊鎭�:{result.Data[0].ErrorMsg}");
}
}
}
catch (System.Exception ex)
{
- action.CatchExceptionWithLog(ex, "鏂板鏀惰揣鍗�-鏃犳潵婧愬紓甯�");
+ action.CatchExceptionWithLog(ex, $"鏂板鏀惰揣鍗�-鏃犳潵婧愬紓甯革紝鎻愪氦Json: {JsonConvert.SerializeObject(input.CreateReceivementParam)}");
}
Logger.Interface.Info($"/* 鏂板鏀惰揣鍗�-鏃犳潵婧愭帴鍙ｇ粨鏉� */\r\n"); //鍥哄畾鍐欐硶
return action;
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 9ba2272..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,18 +60,24 @@
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)
@@ -95,14 +100,121 @@
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)
+ {
+ //鍙栨秷褰撳墠鎿嶄綔
+ 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)
{
@@ -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,6 +251,7 @@
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 metaSn = DI.Resolve<ICodeRuleCache>()["NoSourceBarcode"]?.Generate($"{sn.SN}").Data.ToString() ?? "";
@@ -164,6 +277,7 @@
RECEIVE_DATE = DateTime.Now,
};
sns.Add(info);
+
var item = new WMS_ITEM()
{
SN = barcode.SN,
@@ -202,6 +316,11 @@
SUPP_LOTNO = dtl.SUPP_LOTNO,
};
pkgs.Add(pkg);
+ }
+ //鏇存柊褰撳墠娓呯偣鐨勬潯鐮佺姸鎬�
+ foreach (var sn in CurSn)
+ {
+ sn.STATUS = WMS_ITEM.STATUSs.Counted.GetValue();
}
AddCommitAction("CountedAndPrint", () =>
@@ -264,52 +383,59 @@
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("閫佽揣鍗昜{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 == "1")
+ if (reqType.ToInt32() > 0)
{
+ var rcvDocType = reqType == "1" ? "RCV01" : "RCV03";
var iInput = new CreateReceivementInput
{
userId = UserCode,
IsLogin = true,
- Supplier = "",
- RcvDocType = "",
- RcvLines = new()
+ CreateReceivementParam = new()
+ {
+ rcvDTO = new()
{
- new(){
- ItemInfo = new(){m_itemCode="" },
- Wh= new(){ m_code=""},
+ 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="" },
- LocationQtyTU = 0,
- }
- },
- ArriveQtyTU = 0,
- ArriveQtyPU = 0,
- RcvQtyTU= 0,
- RcvQtyPU= 0,
- EyeballingQtyTU = 0,
+ 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,
- StorageType = 0,
- RcvLotCode = "",
- InvLotCode = "",
- },
+ 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)
{
- throw new Exception(Biz.T(result.LocaleMsg, input.Locale));
+ action.IsSuccessed = false;
+ action.LocaleMsg = result.LocaleMsg;
+ return action;
}
}
//濡傛灉鏄湭涓婇棬鎴�
@@ -318,10 +444,10 @@
var iInput = new CreateRcvBySrcASNInput
{
userId = UserCode,
- IsLogin = true,
+ IsLogin = false, // true,
CreateRcvBySrcASNParam = new()
{
- aSNToRcvTransDTOs = order.Details.Select(q => new ASNToRcvTransDTO
+ aSNToRcvTransDTOs = finishNotSubmit.Select(q => new ASNToRcvTransDTO
{
ASNLineKey = q.ID,
TransQty = new() { m_amount1 = q.QTY },
@@ -332,7 +458,9 @@
result = await DI.Resolve<IWMS_U9C>().CreateRcvBySrcASN(iInput);
if (!result.IsSuccessed)
{
- throw new Exception(Biz.T(result.LocaleMsg, input.Locale));
+ action.IsSuccessed = false;
+ action.LocaleMsg = result.LocaleMsg;
+ return action;
}
}
@@ -361,7 +489,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(),
@@ -381,9 +509,15 @@
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()
@@ -408,7 +542,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)
{
@@ -422,7 +556,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;
@@ -433,11 +567,13 @@
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();
@@ -446,7 +582,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();
@@ -455,6 +592,7 @@
{
//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
{
@@ -489,7 +627,7 @@
action.Data.Data = SnList;
//action.LocaleMsg = Biz.L($"鏉＄爜[{0}]娓呯偣鎴愬姛锛�");
- action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.CountSuccess", string.Join(",", SnList));
+ //action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.CountSuccess", string.Join(",", SnList));
//閲嶇疆宸ュ簭
ResetTrans();
@@ -507,7 +645,8 @@
Command = null;
CurInvItem = null;
CurScanShelf = null;
- CurSn = null;
+ //CurSn = null;
+ SnList = new();
}
public override bool Close(bool needSaveHistoryLog = false)
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs
index 3fec36c..512992f 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs
@@ -54,6 +54,11 @@
public bool IsLogin { get; set; }
}
+ public class Mcode
+ {
+ public string m_code { get; set; }
+ }
+
public class IssueUOM : BaseCode { }
public class POLine : BaseCode
@@ -295,11 +300,9 @@
public class CreateReceivementInput : U9CBaseInput
{
/// <summary>
- /// 渚涘簲鍟�
+ /// 鏃犳潵婧愬弬鏁�
/// </summary>
- public string Supplier { get; set; }
- public string RcvDocType { get; set; }
- public List<RcvLine> RcvLines { get; set; }
+ public CreateReceivementParam CreateReceivementParam { get; set; }
}
public class RcvDTO
@@ -311,11 +314,11 @@
/// <summary>
/// 渚涘簲鍟�
/// </summary>
- public Supplier Supplier { get; set; }
+ public Mcode Supplier { get; set; }
/// <summary>
/// 鍗曟嵁绫诲瀷锛氭湁ASN鍗曚紶RCV01锛屾病鏈堿SN鍗曡禒鍝佷紶RCV03
/// </summary>
- public RcvDocType RcvDocType { get; set; }
+ public Mcode RcvDocType { get; set; }
public List<RcvLine> RcvLines { get; set; }
public bool IsRcvByChangeable { get; set; } = true;
public bool IsPriceListChangeable { get; set; } = true;
@@ -323,14 +326,7 @@
public bool IsPaymentTermChangeable { get; set; } = true;
public bool IsLineApprove { get; set; } = true;
}
- public class Supplier
- {
- public string m_code { get; set; }
- }
- public class RcvDocType
- {
- public string m_code { get; set; }
- }
+
public class RcvLine
{
/// <summary>
@@ -382,13 +378,11 @@
{
public string m_itemCode { get; set; }
}
- public class Wh2
+ public class Wh2: Mcode
{
- public string m_code { get; set; }
}
- public class Location
+ public class Location : Mcode
{
- public string m_code { get; set; }
}
public class RcvLineLocation
--
Gitblit v1.9.3