From 080741e0b917dc382ecba31c4b19fca1aa772bfd Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 15 四月 2025 17:43:13 +0800
Subject: [PATCH] 增加上架单据信息
---
Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 4bc19d0..1947400 100644
--- a/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
@@ -440,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)
{
@@ -455,6 +454,8 @@
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;
@@ -514,7 +515,7 @@
}
//鏇存柊搴撳瓨琛ㄤ俊鎭�
- var items = MainDB.Queryable<WMS_ITEM>().Where(q => SqlFunc.Subqueryable<BIZ_U9_ASN_SN>().Where(s => s.SN == q.SN && receipt.SnList.Select(sn => sn.SN).Contains(s.SN)).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)
{
@@ -528,7 +529,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 && receipt.SnList.Select(sn => sn.SN).Contains(s.SN)).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;
@@ -553,8 +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(finishNotSubmit, 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