From 20dda69cad210c3b40d643e52ba1cbccec24b392 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 14 七月 2025 15:23:32 +0800
Subject: [PATCH] 1.携客云获取送货单默认组织写死 2.采购入库优化
---
entity/DeliveryNotice.cs | 6 ++++++
service/Warehouse/MesXkyShdManager.cs | 14 ++++++++------
service/Warehouse/MesInvItemInCDetailsManager.cs | 4 +---
service/Warehouse/MesXkyService.cs | 3 ++-
4 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/entity/DeliveryNotice.cs b/entity/DeliveryNotice.cs
index 78a9e4e..e738109 100644
--- a/entity/DeliveryNotice.cs
+++ b/entity/DeliveryNotice.cs
@@ -278,4 +278,10 @@
/// </summary>
[SugarColumn(ColumnName = "last_operate_time")]
public string LastOperateTime { get; set; }
+
+ /// <summary>
+ /// 鏈�鍚庢搷浣滄椂闂达紙鏃堕棿鎴筹級
+ /// </summary>
+ [SugarColumn(ColumnName = "org_id")]
+ public string orgId { get; set; }
}
\ No newline at end of file
diff --git a/service/Warehouse/MesInvItemInCDetailsManager.cs b/service/Warehouse/MesInvItemInCDetailsManager.cs
index 339dc2f..3ecf875 100644
--- a/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ b/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -245,9 +245,7 @@
CreateDate = DateTime.Now,
LastupdateBy = user,
LastupdateDate = DateTime.Now,
- UrgentFlag = itemBarcodeDetails.UrgentFlag.Value
- ? "1"
- : "0",
+ UrgentFlag = itemBarcodeDetails.UrgentFlag.GetValueOrDefault() ? "1" : "0",
CbillNo = itemBarcodeDetails.BillNo,
Fstatus = 0,
Status = 0,
diff --git a/service/Warehouse/MesXkyService.cs b/service/Warehouse/MesXkyService.cs
index 45ad039..158649e 100644
--- a/service/Warehouse/MesXkyService.cs
+++ b/service/Warehouse/MesXkyService.cs
@@ -163,7 +163,8 @@
noticeList.ForEach(n => n.Id = Guid.NewGuid());
-
+ noticeList.ForEach(n => n.orgId = "104554");
+
var deliveryNos = noticeList.Select(n => n.DeliveryNo).Distinct().ToList();
//var noticeIds = noticeList.Select(n => n.Id).ToList(); // 淇濇寔GUID绫诲瀷
diff --git a/service/Warehouse/MesXkyShdManager.cs b/service/Warehouse/MesXkyShdManager.cs
index 4a6c7e4..cdb3113 100644
--- a/service/Warehouse/MesXkyShdManager.cs
+++ b/service/Warehouse/MesXkyShdManager.cs
@@ -31,20 +31,22 @@
// if (diffNum.Diffnum != 0)
// throw new Exception($"閫佽揣鍗曞彿銆恵unity.shdh}銆戞潯鐮佹湭鍏ㄩ儴鎵撳嵃鎴栨湭鍚屾锛屾棤娉曟敹璐э紒");
- var sql2 = @"select D.item_no,
+ var sql2 = @"WITH dhmx AS(
+ SELECT E.line_k3id,B.paper_bill_no,B.guid,E.quantity FROM dbo.MES_INV_ITEM_ARN B LEFT JOIN MES_INV_ITEM_ARN_DETAIL E ON B.guid = E.parent_Guid
+)
+select DISTINCT D.item_no,
D.item_name,
D.item_model,
A.delivery_qty AS shsl,
- ISNULL(E.quantity, 0) as ysl,
- A.delivery_qty - ISNULL(E.quantity, 0) as dssl,
+ ISNULL(dhmx.quantity, 0) as ysl,
+ A.delivery_qty - ISNULL(dhmx.quantity, 0) as dssl,
A.po_erp_no,
C.PURCHASE_ORDER_LINE_NUMBER,
- B.GUID AS DDHID
+ dhmx.GUID AS DDHID
from DELIVERY_NOTICE_DETAIL A
- LEFT JOIN dbo.MES_INV_ITEM_ARN B on B.paper_bill_no = A.delivery_no
LEFT JOIN MES_ROH_IN_DATA C ON A.po_line_no = C.EBELN_K3ID
LEFT JOIN MES_ITEMS D ON C.ITEM_ID = D.item_id
- RIGHT JOIN dbo.MES_INV_ITEM_ARN_DETAIL E on E.parent_Guid = B.guid AND E.line_k3id = A.po_line_no
+ LEFT JOIN dhmx ON dhmx.line_k3id = A.po_line_no AND dhmx.paper_bill_no = A.delivery_no
WHERE A.delivery_no = @shdh";
var XcslItem = Db.Ado.SqlQuery<dynamic>(sql2, sqlParams);
--
Gitblit v1.9.3