From 318f08db1998f6a9e08f05ec8edc5aec4aad7882 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期一, 21 四月 2025 01:46:34 +0800
Subject: [PATCH] 无来源打印更新
---
Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs | 57 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 17 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 aad7928..4e2370d 100644
--- a/Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs
@@ -44,6 +44,7 @@
private List<BIZ_U9_ASN_SN> CurSn = new();
List<string> SnList = new();
private string rcvDocType = "RCV03"; //榛樿鏃犲崟
+ private string CurReqType = "0";
#endregion
#region Functions
@@ -140,9 +141,9 @@
var action = new ApiAction<ScanOutput>(new ScanOutput());
try
{
- var reqType = input.Options["reqType"].ToString();
+ CurReqType = input.Options["reqType"].ToString();
rcvDocType = "RCV01";
- if (reqType != "1")
+ if (CurReqType != "1")
{
action.IsSuccessed = false;
action.LocaleMsg = Biz.L($"涓嶆槸闅忓崟璧犲搧锛屼笉鐢ㄦ壂鎻忔潯鐮�");
@@ -166,17 +167,17 @@
if (CurSn.Count > 0 && _sns.Any())
{
action.LocaleMsg = Biz.L($"鎵规[{AsnSn.LOTNO}]宸茬粡鎻愪氦锛岃缁х画涓嬩竴姝ユ搷浣�");
- var _Order = 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 (_Order == null)
+ 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)
{
action.IsSuccessed = false;
- action.LocaleMsg = Biz.L($"鏌ヤ笉鍒癆SN鍗昜{_Order.ORDER_NO}]鐨勬暟鎹�");
+ action.LocaleMsg = Biz.L($"鏌ヤ笉鍒癆SN鍗昜{CurOrder.ORDER_NO}]鐨勬暟鎹�");
return action;
}
- _Order.Details = _Order.Details.Where(q => _sns[0].LINE_NO == q.LINE_NO).ToList();
+ CurOrder.Details = CurOrder.Details.Where(q => _sns[0].LINE_NO == q.LINE_NO).ToList();
SnList.AddRange(_sns.Select(q => q.SN).ToList());
- _Order.BarcodeList = SnList;
- action.Data.Data = _Order;
+ CurOrder.BarcodeList = SnList;
+ action.Data.Data = CurOrder;
return action;
}
if (CurSn.Any(q=> q.ORDER_NO == AsnSn.ORDER_NO && q.LINE_NO == AsnSn.LINE_NO))
@@ -186,11 +187,14 @@
return action;
}
CurSn.Add(AsnSn);
- var _order = CurOrder.Clone();
- CurOrder.ORDER_NO = $"WASN{DateTime.Now.ToString("yyyyMMddHHmmss")}";
- _order.Details = _order.Details.Where(q => CurSn.Any(s => s.LINE_NO == q.LINE_NO)).ToList();
+ 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 = _order;
+ action.Data.Data = CurOrder;
}
catch (Exception ex)
{
@@ -212,14 +216,26 @@
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>();
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,
};
- CurOrder.ORDER_NO = $"WASN{DateTime.Now.ToString("yyyyMMddHHmmss")}";
+ 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;
+ }
+
dtl.UPDATE_USER = $"GenerateASN_{UserCode}";
dtl.REMARK = CurSn.Where(q => q.ORDER_NO == dtl.ORDER_NO && q.LINE_NO == dtl.LINE_NO).FirstOrDefault()?.SN;
dtl.ORDER_NO = CurOrder.ORDER_NO;
@@ -244,6 +260,7 @@
_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 ?? "10";
input.Options["record"] = _dtl.ToJson();
var _Asn = Asn.Clone();
AddCommitAction("GenerateASN", () =>
@@ -282,10 +299,12 @@
var dtl = input.Options["record"].ToString().JsonToObject<BIZ_U9_ASN_DTL>();
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)
+ 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();
@@ -296,7 +315,8 @@
SnList.Clear();
foreach (var sn in snlist)
{
- var metaSn = DI.Resolve<ICodeRuleCache>()["NoSourceBarcode"]?.Generate($"{sn.SN}").Data.ToString() ?? "";
+ 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()
@@ -364,6 +384,7 @@
{
sn.STATUS = WMS_ITEM.STATUSs.Counted.GetValue();
}
+ CurOrder.STATUS = BIZ_U9_ASN.STATUSs.Counting.GetValue();
AddCommitAction("CountedAndPrint", () =>
{
@@ -404,7 +425,7 @@
public async Task<ApiAction> GenerateReceipt(BaseInput input)
{
var action = new ApiAction();
- var orderNo = input.Data;
+ var orderNo = CurOrder.ORDER_NO;
try
{
var reqType = input.Options["reqType"].ToString();
@@ -614,6 +635,8 @@
order.STATUS = BIZ_U9_ASN.STATUSs.Finished.GetValue();
order.RECEIVER = UserCode;
order.RECEIVE_DATE = DateTime.Now;
+ order.UPDATE_USER = UserCode;
+ order.REMARK = "";
}
//浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
@@ -665,7 +688,7 @@
doAfterSave?.Invoke();
// 杩斿洖鏁版嵁
- action.Data.Data = SnList;
+ 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));
--
Gitblit v1.9.3