From 3691cda997586a99440ed75fc858f86697752edc Mon Sep 17 00:00:00 2001
From: 18923810322 <1666941798@qq.com>
Date: Wed, 2 Jul 2025 14:28:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=90=8C=E6=AD=A5?=
=?UTF-8?q?=E9=A2=86=E6=96=99=E5=87=BA=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 9 ++++++++
.../Services/OutStockTaskService.cs | 16 +++++++------
.../Services/Public/ErpService.cs | 23 ++++++++++++-------
3 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 805ad1da..6e62a9f3 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -6542,6 +6542,15 @@
+
+
+ 领料出库单
+
+
+
+
+
+
直接调拨出库
diff --git a/src/WMS.Web.Domain/Services/OutStockTaskService.cs b/src/WMS.Web.Domain/Services/OutStockTaskService.cs
index 8a863574..7b9d1c38 100644
--- a/src/WMS.Web.Domain/Services/OutStockTaskService.cs
+++ b/src/WMS.Web.Domain/Services/OutStockTaskService.cs
@@ -450,10 +450,14 @@ namespace WMS.Web.Domain.Services
//DateTime begin = await _erpOpsSyncDateRepositories.Get(ErpOpsSyncType.OutStock);
if (begin == null)
begin = DateTime.Now.AddHours(-8);//默认拉去8小时以内的数据，ALTER BY YZH
- // begin = DateTime.Now.AddDays(-200);//默认拉去8小时以内的数据，ALTER BY YZH
- //更新时间范围内所有
- //result = await BillQueryForTransferOutOutStock(false, null, begin);
- //if (!result.IsSuccess) isRollback = true;
+ // begin = DateTime.Now.AddDays(-200);//默认拉去8小时以内的数据，ALTER BY YZH
+ //更新时间范围内所有
+ //result = await BillQueryForTransferOutOutStock(false, null, begin);
+ //if (!result.IsSuccess) isRollback = true;
+
+ result = await BillQueryForPickingOutStock(false, null, begin);
+ if (!result.IsSuccess) isRollback = true;
+
result = await BillQueryForSalOutStock(false, null, begin);
if (!result.IsSuccess) isRollback = true;
@@ -466,8 +470,6 @@ namespace WMS.Web.Domain.Services
result = await BillQueryForMisDeliveryOutStock(false, null, begin);
if (!result.IsSuccess) isRollback = true;
- result = await BillQueryForPickingOutStock(false, null, begin);
- if (!result.IsSuccess) isRollback = true;
//更新时间管理
@@ -538,7 +540,7 @@ namespace WMS.Web.Domain.Services
}
if (PickingOut_Nos.Count() > 0)
{
- result = await BillQueryForPickingOutStock(false, MisDeliveryOut_Nos);
+ result = await BillQueryForPickingOutStock(false, PickingOut_Nos);
if (!result.IsSuccess) isRollback = true;
}
diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs
index 9ee716b0..da2a0903 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs
@@ -2103,7 +2103,13 @@ namespace WMS.Web.Domain.Services.Public
}
}
-
+ ///
+ /// 领料出库单
+ ///
+ ///
+ ///
+ ///
+ ///
public async Task> BillQueryForPickingOutStock(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true)
{
string result_json = "";
@@ -2130,7 +2136,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.PRD_PickMtrl.ToString());
- param.FieldKeys = "FBillNo,FOrderNo,FDeliveryOrgID,FCustomerID,FMaterialID.FNumber,FStockID.FNumber,FStockLocID,FQty,F_ENTRYREMARKS,FCreateDate,FEntity_FEntryID,FDeliveryOrgID.FNumber";//FEntryID
+ param.FieldKeys = "FBillNo,FUnitID,FStockOrgId,FUnitID.FName,FMaterialID.FNumber,FStockID.FNumber,FStockLocID,FActualQty,FEntrtyMemo,FCreateDate,FEntity_FEntryID,FStockOrgId.FNumber";//FEntryID
param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间
@@ -2141,8 +2147,9 @@ namespace WMS.Web.Domain.Services.Public
//6.物料 物料属性=费用或资产或服务的排除 不拉取
param.FilterString = " 1=1";
if (isCheck) param.FilterString += " and FDocumentStatus='C'";
- param.FilterString += " and FRemainOutQty>=0";
+ param.FilterString += " and FActualQty>=0";
param.FilterString += " and FMaterialID.FERPCLSID not in (10,11,6)";
+ param.FilterString += "and FBillType='f4f46eb78a7149b1b7e4de98586acb67'";
//param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")";
//param.FilterString += " and FDeliveryOrgID.FNumber in (" + stocks_orgs + ")";
for (int i = 0; i < stocks.Count(); i++)
@@ -2150,10 +2157,10 @@ namespace WMS.Web.Domain.Services.Public
if (i == 0)
{
param.FilterString += " and (";
- param.FilterString += $"(FStockID.FNumber='{stocks[i].Code}' and FDeliveryOrgID.FNumber='{stocks[i].ErpOrgCode}')";
+ param.FilterString += $"(FStockID.FNumber='{stocks[i].Code}' and FStockOrgId.FNumber='{stocks[i].ErpOrgCode}')";
}
else
- param.FilterString += $" or (FStockID.FNumber='{stocks[i].Code}' and FDeliveryOrgID.FNumber='{stocks[i].ErpOrgCode}')";
+ param.FilterString += $" or (FStockID.FNumber='{stocks[i].Code}' and FStockOrgId.FNumber='{stocks[i].ErpOrgCode}')";
if (i == stocks.Count() - 1) param.FilterString += ")";
}
@@ -2180,16 +2187,16 @@ namespace WMS.Web.Domain.Services.Public
{
var lis = new ErpDeliveryNoticeOutStockResultDto();
lis.SourceBillNo = item[0];
- lis.SaleBillNo = item[1];
+ //lis.SaleBillNo = item[1];
lis.DeliveryOrgId = Convert.ToInt32(item[2]);
- lis.ReceiptCustomerId = Convert.ToInt32(item[3]);
+ //lis.ReceiptCustomerId = Convert.ToInt32(item[3]);
lis.MaterialNumber = item[4];
lis.StockCode = item[5];
lis.SubStockId = Convert.ToInt32(item[6]);
lis.AccruedQty = Convert.ToDecimal(item[7]);
lis.Remark = item[8];
lis.CreateTime = Convert.ToDateTime(item[9]);
- lis.Type = (int)OutStockType.Sal;
+ lis.Type = (int)OutStockType.PickingOut;
lis.Erp_DetailId = Convert.ToInt32(item[10]);
lis.OrgCode = item[11];
erp_list.Add(lis);