From a931f74f5a94542c2ee284cec7e9c6d5fb5cdd26 Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Thu, 9 Nov 2023 16:17:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=962?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/WMS.Web.Api/Controllers/TestController.cs | 2 +-
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 31 ++++++++++++++++---
.../QuartzJob/InStockOrderQuartzJob.cs | 2 +-
.../Services/InStockTaskService.cs | 4 +--
.../Services/Public/ErpService.cs | 8 +----
5 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index 150961d2..729d875a 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -76,7 +76,7 @@ namespace WMS.Web.Api.Controllers
bool isTransaction = false;
//3.同步数据
- var result = await _inStockTaskService.SsynPurchaseInStock(isTransaction);
+ var result = await _inStockTaskService.SsynPurchaseInStock(null,isTransaction);
if (!result.IsSuccess) isRollback = true;
//4.提交事务
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index cf9938ee..85f5413d 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -1358,7 +1358,14 @@
-
+
+
+ 列表-根据来源单号模糊搜索
+
+
+
+
+
列表-根据来源单号模糊
@@ -1604,7 +1611,14 @@
入库任务单-服务接口
-
+
+
+ 来源单-编号模糊查询-pad
+
+
+
+
+
同步：采购入库类型单据
@@ -1705,7 +1719,7 @@
-
+
erp:单据查询-采购入库单
@@ -2443,7 +2457,14 @@
入库任务单-服务
-
+
+
+ 来源单-编号模糊查询-pad
+
+
+
+
+
同步：采购入库类型单据
@@ -2639,7 +2660,7 @@
-
+
erp:单据查询-采购入库单
diff --git a/src/WMS.Web.Domain/QuartzJob/InStockOrderQuartzJob.cs b/src/WMS.Web.Domain/QuartzJob/InStockOrderQuartzJob.cs
index 5b7ccfd6..33cccdc7 100644
--- a/src/WMS.Web.Domain/QuartzJob/InStockOrderQuartzJob.cs
+++ b/src/WMS.Web.Domain/QuartzJob/InStockOrderQuartzJob.cs
@@ -55,7 +55,7 @@ namespace WMS.Web.Domain.QuartzJob
var begindatetime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
_logger.LogInformation($"同步金蝶入库单数据：执行开始时间->{begindatetime}");
//3.同步数据
- var result = await _inStockTaskService.SsynPurchaseInStock(isTransaction);
+ var result = await _inStockTaskService.SsynPurchaseInStock(null,isTransaction);
if (!result.IsSuccess) isRollback = true;
//4.提交事务
diff --git a/src/WMS.Web.Domain/Services/InStockTaskService.cs b/src/WMS.Web.Domain/Services/InStockTaskService.cs
index f3c94058..4abfdbfd 100644
--- a/src/WMS.Web.Domain/Services/InStockTaskService.cs
+++ b/src/WMS.Web.Domain/Services/InStockTaskService.cs
@@ -125,8 +125,8 @@ namespace WMS.Web.Domain.Services
if (erp_list.Count != 0)
{
var add_entitys = new List();
- var billNos = erp_list.GroupBy(x => x.FBillNo).Select(x => x.Key).ToList();
- foreach (var item in billNos)
+ var current_billNos = erp_list.GroupBy(x => x.FBillNo).Select(x => x.Key).ToList();
+ foreach (var item in current_billNos)
{
var dto = new InStockTask();
dto.SourceBillNo = item;
diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs
index 922a55e5..0858c4ed 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs
@@ -92,7 +92,7 @@ namespace WMS.Web.Domain.Services.Public
/// 模糊搜索
/// 单据编号集合精确查找
///
- public async Task> BillQueryForPurchaseInStock(string billNo = "", List sourceBillNos = null)
+ public async Task> BillQueryForPurchaseInStock(List sourceBillNos = null)
{
try
{
@@ -137,12 +137,6 @@ namespace WMS.Web.Domain.Services.Public
}
param.FilterString = param.FilterString + str + ")";
- //单据编号模糊查询
- if (!string.IsNullOrEmpty(billNo))
- {
- param.FilterString = param.FilterString + " and FBillNo like '%" + billNo + "%'";
- }
-
//根据原订单号查询
if (sourceBillNos != null && sourceBillNos.Count() > 0)
{