From 0ba210b62ab4ee89f1b78e3c21fe721189554bb8 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Wed, 20 Dec 2023 16:58:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=88=97=E8=A1=A8=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E5=90=8C=E6=AD=A5=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 5 +++++
.../Dto/TakeStock/TakeStockQueryRequest.cs | 4 ++++
src/WMS.Web.Repositories/TakeStockRepositories.cs | 11 +++++++++++
3 files changed, 20 insertions(+)
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index 076fcf85..f69e1fe0 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -4817,6 +4817,11 @@
单据编号
+
+
+ 同步成功或者失败 null 就是未同步
+
+
盘点日期-开始
diff --git a/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryRequest.cs b/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryRequest.cs
index 5626eea9..973d2371 100644
--- a/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryRequest.cs
+++ b/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryRequest.cs
@@ -22,6 +22,10 @@ namespace WMS.Web.Core.Dto.TakeStock
///
public string BillNo { get; set; }
///
+ /// 同步成功或者失败 null 就是未同步
+ ///
+ public int? SuccessSync { get; set; }
+ ///
/// 盘点日期-开始
///
public DateTime? DateBeginDate { get; set; } = null;
diff --git a/src/WMS.Web.Repositories/TakeStockRepositories.cs b/src/WMS.Web.Repositories/TakeStockRepositories.cs
index 8ed5beac..d1478da0 100644
--- a/src/WMS.Web.Repositories/TakeStockRepositories.cs
+++ b/src/WMS.Web.Repositories/TakeStockRepositories.cs
@@ -188,6 +188,17 @@ namespace WMS.Web.Repositories
var split = dto.StockCode.Split("_$");
query = query.Where(w => w.detail.StockCode == split[0] && w.detail.OrgCode == split[1]);
}
+ if (dto.SuccessSync != null)
+ {
+ if ((SyncStatus)dto.SuccessSync == SyncStatus.Success)
+ query = query.Where(w => w.order.SuccessSync == SyncStatus.Success);
+ else if ((SyncStatus)dto.SuccessSync == SyncStatus.SyncIng)
+ query = query.Where(w => w.order.SuccessSync == SyncStatus.SyncIng);
+ else if ((SyncStatus)dto.SuccessSync == SyncStatus.Fail)
+ query = query.Where(w => w.order.SuccessSync == SyncStatus.Fail
+ || w.order.SuccessSync == SyncStatus.SubmitFail
+ || w.order.SuccessSync == SyncStatus.CheckFail);
+ }
if (dto.DateBeginDate != null)
query = query.Where(w => w.order.Date >= dto.DateBeginDate);
if (dto.DateEndDate != null)