From 21cce90e8d660954f0b89bfe25b9f5218dcbaacd Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期一, 12 五月 2025 00:32:34 +0800
Subject: [PATCH] 退料单(U9)上架事务
---
Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 678579d..c8baa4d 100644
--- a/Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs
@@ -55,8 +55,7 @@
{
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>
/// 鑾峰彇褰撳墠鎵�鏈夊崟鎹俊鎭�
@@ -65,6 +64,7 @@
public async Task<ApiAction<List<BIZ_U9_ASN>>> GetOrderList()
{
var action = new ApiAction<List<BIZ_U9_ASN>>();
+ 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();
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())
{
@@ -359,7 +359,18 @@
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}]琛屾暟鎹紝璇风偣鍑绘墦鍗版寜閽墦鍗版爣绛�");
-
+ if (snlist.Count == 0)
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = Biz.L($"鏁版嵁涓嶅瓨鍦紒");
+ return action;
+ }
+ if (CurOrder.IsNullOrEmpty())
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = Biz.L($"鏁版嵁涓嶅瓨鍦紒");
+ return action;
+ }
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)
{
@@ -494,7 +505,7 @@
public async Task<ApiAction> GenerateReceipt(BaseInput input)
{
var action = new ApiAction();
- var orderNo = CurOrder.ORDER_NO;
+ var orderNo = input.Data.ToString(); //CurOrder.ORDER_NO;
try
{
var reqType = input.Options["reqType"].ToString();
--
Gitblit v1.9.3