From fe4a8ec610b23d33c697dbb76c298ff3b2e31ef1 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 29 四月 2025 01:14:39 +0800
Subject: [PATCH] 来料打印更新
---
Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs b/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
index 8fbcc2c..1947400 100644
--- a/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
@@ -11,6 +11,7 @@
using Tiger.IBusiness;
using Tiger.Model.MES.Yada;
using Tiger.Model.Entitys.MES.U9C;
+using Microsoft.Scripting.Utils;
namespace Tiger.Business.WMS.Transaction
{
@@ -402,12 +403,13 @@
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;
}
@@ -418,7 +420,7 @@
IsLogin = 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 },
@@ -438,8 +440,7 @@
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();
+ var list = Biz.DataSource["YadaU9C"].Client.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)
{
@@ -453,13 +454,15 @@
receipt.RECEIVE_DATE = DateTime.Now;
receipt.ASN_ID = order.ID;
receipt.ASN_NO = order.ORDER_NO;
+ receipt.ERP_STATUS_CODE = list.First().Status.ToString();
+ receipt.ERP_STATUS_NAME = list.First().StatusName;
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());
+ var asnDtl = finishNotSubmit.First(q => q.ID == item.SrcASNDocLineId.ToString());
BIZ_U9_RECEIPT_DTL receiptDt = new()
{
ID = item.RcvLineId.ToString(),
@@ -475,11 +478,19 @@
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)
+ 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()
@@ -504,7 +515,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)
{
@@ -516,9 +527,9 @@
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}]锛屽緟妫�楠屽畬鎴愬悗鍙叆搴�"));
+ 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;
@@ -529,11 +540,12 @@
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();
@@ -542,7 +554,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();
--
Gitblit v1.9.3