From 0c0309afae85b72746bd2431c10c7f5982e210e3 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 30 四月 2025 17:46:44 +0800
Subject: [PATCH] 一些更改
---
Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs | 216 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 173 insertions(+), 43 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 e4abf00..c5a923d 100644
--- a/Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs
@@ -20,6 +20,7 @@
using Tiger.Model.Minsun;
using static IronPython.Runtime.Profiler;
using static Microsoft.CodeAnalysis.CSharp.SyntaxTokenParser;
+using Microsoft.Scripting.Utils;
namespace Tiger.Business.WMS.Transaction
{
@@ -32,18 +33,54 @@
{
base.Init(id, userCode, apiHost, orgCode);
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 order = new();
+ private BIZ_U9_ASN CurOrder = new();
private List<BIZ_U9_ASN_SN> CurSn = new();
List<string> SnList = new();
+ private string rcvDocType = "RCV03"; //榛樿鏃犲崟
+ private string CurReqType = "0";
#endregion
#region Functions
+ /// <summary>
+ /// 鍒濆鍖栨竻鐐规暟鎹�
+ /// </summary>
+ private void LoadData()
+ {
+ 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>
@@ -100,15 +137,15 @@
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 && q.STATUS < BIZ_U9_ASN.STATUSs.Finished.GetValue()).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
- if (order == null)
+ 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 = 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;
+ 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)
{
@@ -129,6 +166,14 @@
var action = new ApiAction<ScanOutput>(new ScanOutput());
try
{
+ CurReqType = input.Options["reqType"].ToString();
+ rcvDocType = "RCV01";
+ if (CurReqType != "1")
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = Biz.L($"涓嶆槸闅忓崟璧犲搧锛屼笉鐢ㄦ壂鎻忔潯鐮�");
+ return action;
+ }
var AsnSn = await MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.SN == input.SN).FirstAsync();
if (AsnSn == null)
{
@@ -136,29 +181,48 @@
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)
+ 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)
{
action.IsSuccessed = false;
action.LocaleMsg = Biz.L($"鏌ヤ笉鍒癆SN鍗昜{input.SN}]鐨勬暟鎹�");
return action;
}
- //濡傛灉鏄涓�娆℃壂鎻忥紝鐢熸垚鍗曞彿
- if (CurSn.Count == 0)
+ var _sns = CurSn.Where(q => q.LOTNO == AsnSn.LOTNO && q.STATUS <= WMS_ITEM.STATUSs.Counted.GetValue()).ToList();
+ if (CurSn.Count > 0 && _sns.Any())
{
- action.Data.Command = $"WASN{DateTime.Now.ToString("yyyyMMddHHmmss")}";
+ 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)
+ {
+ 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;
}
- CurSn.Add(AsnSn);
- var _order = order.Clone();
- _order.Details = _order.Details.Where(q => CurSn.Any(s => s.LINE_NO == q.LINE_NO)).ToList();
+ if (CurSn.Any(q=> q.ORDER_NO == AsnSn.ORDER_NO && q.LINE_NO == AsnSn.LINE_NO))
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = Biz.L($"鎵弿鐨勬潯鐮佺殑ASN鍗昜{AsnSn.ORDER_NO}]鐨勮鍙穂{AsnSn.LINE_NO}]宸茬粡瀛樺湪锛岃鍏堝畬鎴愭湭瀹屾垚鐨勬搷浣�");
+ return action;
+ }
+ 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 = _order;
+ action.Data.Data = CurOrder;
}
catch (Exception ex)
{
@@ -180,28 +244,65 @@
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($"鎵綋鍓嶇敓鎴愮殑鍗曞彿[{CurOrder.ORDER_NO}]鍙婄墿鏂欑紪鐮乕{dtl.ITEM_CODE}]宸茬粡瀛樺湪锛岃鍏堝畬鎴愭湭瀹屾垚鐨勬搷浣�");
+ return action;
+ }
+ //濡傛灉娌℃湁渚涘簲鍟嗗悕绉帮紝鍒欎粠渚涘簲鍟嗚〃涓幏鍙�
+ 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;
+ //}
+
+ 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()
{
ID = Guid.NewGuid().ToString("N"),
- ORDER_NO = dtl.ORDER_NO,
+ ORDER_NO = CurOrder.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,
+ 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 = order.AUTH_ORG,
+ AUTH_ORG = CurOrder.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;
+ _dtl.AUTH_ORG = CurOrder.AUTH_ORG;
+ _dtl.LINE_NO = _dtl.LINE_NO ?? "0";
input.Options["record"] = _dtl.ToJson();
var _Asn = Asn.Clone();
AddCommitAction("GenerateASN", () =>
@@ -209,10 +310,26 @@
//浣跨敤缁熶竴鐨勪簨鍔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();
+ 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();
+ 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);
}
@@ -240,10 +357,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();
@@ -254,7 +373,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()
@@ -273,7 +393,7 @@
QTY = sn.QTY,
LOTNO = barcode.LotNo,
CARTON_NO = barcode.SN,
- RECEIVER = UserCode,
+ RECEIVER = $"{UserCode}_NoSource",
RECEIVE_DATE = DateTime.Now,
};
sns.Add(info);
@@ -322,6 +442,7 @@
{
sn.STATUS = WMS_ITEM.STATUSs.Counted.GetValue();
}
+ CurOrder.STATUS = BIZ_U9_ASN.STATUSs.Counting.GetValue();
AddCommitAction("CountedAndPrint", () =>
{
@@ -330,6 +451,14 @@
//鏁版嵁淇濆瓨閫昏緫
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();
@@ -362,11 +491,11 @@
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();
- var order = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == orderNo).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
+ var order = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == orderNo).Includes(q => q.Details, d => d._ItemInfos, e=> e.ExtInfo).IncludesAllFirstLayer().FirstAsync();
if (order.IsNullOrEmpty())
{
action.IsSuccessed = false;
@@ -397,7 +526,6 @@
//濡傛灉鏄殢鍗曡禒鍝佹垨鑰呮牱鍝�
if (reqType.ToInt32() > 0)
{
- var rcvDocType = reqType == "1" ? "RCV01" : "RCV03";
var iInput = new CreateReceivementInput
{
userId = UserCode,
@@ -412,9 +540,9 @@
{
ItemInfo = new() { m_itemCode = q.ITEM_CODE},
Wh = new() { m_code = "10101" },
- RcvLineLocations = new(){
+ RcvLineLocations = new(){
new(){
- Location = new(){ m_code= q.ItemInfo.DEFAULT_LOCATION},
+ Location = new(){ m_code= q.ItemInfo.DEFAULT_LOCATION??""},
LocationQtyTU = q.QTY,
}
},
@@ -423,9 +551,9 @@
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,
+ RcvProcedure = q.ItemInfo.ExtInfo.ReceiptMode,
+ RcvLotCode = q.SUPP_LOTNO,
+ InvLotCode = q.LOTNO,
}).ToList(),
}
},
@@ -444,7 +572,7 @@
var iInput = new CreateRcvBySrcASNInput
{
userId = UserCode,
- IsLogin = false, // true,
+ IsLogin = true,
CreateRcvBySrcASNParam = new()
{
aSNToRcvTransDTOs = finishNotSubmit.Select(q => new ASNToRcvTransDTO
@@ -573,6 +701,8 @@
order.STATUS = BIZ_U9_ASN.STATUSs.Finished.GetValue();
order.RECEIVER = UserCode;
order.RECEIVE_DATE = DateTime.Now;
+ order.UPDATE_USER = UserCode;
+ order.REMARK = "";
}
//浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
@@ -624,7 +754,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