18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
18942506660
2024-03-18 09:40:02 +08:00
parent 92d19e6a21
commit b9862b9a20
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -1217,9 +1217,9 @@
对应金蝶单据明细id(销售出库同步金蝶下推使用) 对应金蝶单据明细id(销售出库同步金蝶下推使用)
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Core.Dto.Erp.OutStock.ErpDeliveryNoticeOutStockResultDto.MaterialId"> <member name="P:WMS.Web.Core.Dto.Erp.OutStock.ErpDeliveryNoticeOutStockResultDto.MaterialNumber">
<summary> <summary>
物料Id 物料编码
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Core.Dto.Erp.OutStock.ErpDeliveryNoticeOutStockResultDto.StockCode"> <member name="P:WMS.Web.Core.Dto.Erp.OutStock.ErpDeliveryNoticeOutStockResultDto.StockCode">

28
src/WMS.Web.Domain/Services/Public/ErpService.cs
View File

@@ -1698,7 +1698,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶采购订单：拼接参数和条件 //3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data); var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.SAL_DELIVERYNOTICE.ToString()); var param = new ErpBillQueryParamDto(FormIdParam.SAL_DELIVERYNOTICE.ToString());
param.FieldKeys = "FBillNo,FOrderNo,FDeliveryOrgID,FCustomerID,FMaterialID,FStockID.FNumber,FStockLocID,FQty,F_ENTRYREMARKS,FCreateDate,FEntity_FEntryID,FDeliveryOrgID.FNumber";//FEntryID param.FieldKeys = "FBillNo,FOrderNo,FDeliveryOrgID,FCustomerID,FMaterialID.FNumber,FStockID.FNumber,FStockLocID,FQty,F_ENTRYREMARKS,FCreateDate,FEntity_FEntryID,FDeliveryOrgID.FNumber";//FEntryID
param.Limit = 10000; param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！ //查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间 //1.创建时间在两天前和当天时间之间
@@ -1749,7 +1749,7 @@ namespace WMS.Web.Domain.Services.Public
lis.SaleBillNo = item[1]; lis.SaleBillNo = item[1];
lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.DeliveryOrgId = Convert.ToInt32(item[2]);
lis.ReceiptCustomerId = Convert.ToInt32(item[3]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]);
lis.MaterialId = Convert.ToInt32(item[4]); lis.MaterialNumber = item[4];
lis.StockCode = item[5]; lis.StockCode = item[5];
lis.SubStockId = Convert.ToInt32(item[6]); lis.SubStockId = Convert.ToInt32(item[6]);
lis.AccruedQty = Convert.ToDecimal(item[7]); lis.AccruedQty = Convert.ToDecimal(item[7]);
@@ -1794,7 +1794,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶采购订单：拼接参数和条件 //3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data); var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.STK_TransferDirect.ToString()); var param = new ErpBillQueryParamDto(FormIdParam.STK_TransferDirect.ToString());
param.FieldKeys = "FBillNo,'',FStockOutOrgId,FStockOrgId,FMaterialID,FSrcStockId.FNumber,FSrcStockLocId,FQty,FNoteEntry,FCreateDate,FBillEntry_FEntryID,FStockOutOrgId.FNumber"; param.FieldKeys = "FBillNo,'',FStockOutOrgId,FStockOrgId,FMaterialID.FNumber,FSrcStockId.FNumber,FSrcStockLocId,FQty,FNoteEntry,FCreateDate,FBillEntry_FEntryID,FStockOutOrgId.FNumber";
param.Limit = 10000; param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！ //查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间 //1.创建时间在两天前和当天时间之间
@@ -1843,7 +1843,7 @@ namespace WMS.Web.Domain.Services.Public
lis.SaleBillNo = item[1]; lis.SaleBillNo = item[1];
lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.DeliveryOrgId = Convert.ToInt32(item[2]);
lis.ReceiptCustomerId = Convert.ToInt32(item[3]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]);
lis.MaterialId = Convert.ToInt32(item[4]); lis.MaterialNumber = item[4];
lis.StockCode = item[5]; lis.StockCode = item[5];
lis.SubStockId = Convert.ToInt32(item[6]); lis.SubStockId = Convert.ToInt32(item[6]);
lis.AccruedQty = Convert.ToDecimal(item[7]); lis.AccruedQty = Convert.ToDecimal(item[7]);
@@ -1888,7 +1888,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶采购订单：拼接参数和条件 //3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data); var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.STK_TRANSFEROUT.ToString()); var param = new ErpBillQueryParamDto(FormIdParam.STK_TRANSFEROUT.ToString());
param.FieldKeys = "FBillNo,'',FStockOrgID,FStockInOrgID,FMaterialID,FSrcStockID.FNumber,FSrcStockLocId,FQty,FEntryNote,FCreateDate,FSTKTRSOUTENTRY_FEntryID,FStockOrgID.FNumber"; param.FieldKeys = "FBillNo,'',FStockOrgID,FStockInOrgID,FMaterialID.FNumber,FSrcStockID.FNumber,FSrcStockLocId,FQty,FEntryNote,FCreateDate,FSTKTRSOUTENTRY_FEntryID,FStockOrgID.FNumber";
param.Limit = 10000; param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！ //查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间 //1.创建时间在两天前和当天时间之间
@@ -1937,7 +1937,7 @@ namespace WMS.Web.Domain.Services.Public
lis.SaleBillNo = item[1]; lis.SaleBillNo = item[1];
lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.DeliveryOrgId = Convert.ToInt32(item[2]);
lis.ReceiptCustomerId = Convert.ToInt32(item[3]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]);
lis.MaterialId = Convert.ToInt32(item[4]); lis.MaterialNumber = item[4];
lis.StockCode = item[5]; lis.StockCode = item[5];
lis.SubStockId = Convert.ToInt32(item[6]); lis.SubStockId = Convert.ToInt32(item[6]);
lis.AccruedQty = Convert.ToDecimal(item[7]); lis.AccruedQty = Convert.ToDecimal(item[7]);
@@ -1982,7 +1982,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶采购订单：拼接参数和条件 //3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data); var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.STK_AssembledApp.ToString()); var param = new ErpBillQueryParamDto(FormIdParam.STK_AssembledApp.ToString());
param.FieldKeys = "FBillNo,'',FOwnerIdHead,FSubProOwnerIdH,FMaterialID,FStockID.FNumber,FStockLocId,FQty,FDescription,FCreateDate,FEntity_FEntryID,FStockOrgId.FNumber"; param.FieldKeys = "FBillNo,'',FOwnerIdHead,FSubProOwnerIdH,FMaterialID.FNumber,FStockID.FNumber,FStockLocId,FQty,FDescription,FCreateDate,FEntity_FEntryID,FStockOrgId.FNumber";
param.Limit = 10000; param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！ //查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间 //1.创建时间在两天前和当天时间之间
@@ -2031,7 +2031,7 @@ namespace WMS.Web.Domain.Services.Public
lis.SaleBillNo = item[1]; lis.SaleBillNo = item[1];
lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.DeliveryOrgId = Convert.ToInt32(item[2]);
lis.ReceiptCustomerId = Convert.ToInt32(item[3]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]);
lis.MaterialId = Convert.ToInt32(item[4]); lis.MaterialNumber = item[4];
lis.StockCode = item[5]; lis.StockCode = item[5];
lis.SubStockId = Convert.ToInt32(item[6]); lis.SubStockId = Convert.ToInt32(item[6]);
lis.AccruedQty = Convert.ToDecimal(item[7]); lis.AccruedQty = Convert.ToDecimal(item[7]);
@@ -2076,7 +2076,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶采购订单：拼接参数和条件 //3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data); var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.STK_MisDelivery.ToString()); var param = new ErpBillQueryParamDto(FormIdParam.STK_MisDelivery.ToString());
param.FieldKeys = "FBillNo,'',FStockOrgId,FPickOrgId,FMaterialId,FStockId.FNumber,FStockLocId ,FQty,FEntryNote,FCreateDate,FEntity_FEntryID,FStockOrgId.FNumber"; param.FieldKeys = "FBillNo,'',FStockOrgId,FPickOrgId,FMaterialId.FNumber,FStockId.FNumber,FStockLocId ,FQty,FEntryNote,FCreateDate,FEntity_FEntryID,FStockOrgId.FNumber";
param.Limit = 10000; param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！ //查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间 //1.创建时间在两天前和当天时间之间
@@ -2125,7 +2125,7 @@ namespace WMS.Web.Domain.Services.Public
lis.SaleBillNo = item[1]; lis.SaleBillNo = item[1];
lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.DeliveryOrgId = Convert.ToInt32(item[2]);
lis.ReceiptCustomerId = Convert.ToInt32(item[3]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]);
lis.MaterialId = Convert.ToInt32(item[4]); lis.MaterialNumber = item[4];
lis.StockCode = item[5]; lis.StockCode = item[5];
lis.SubStockId = Convert.ToInt32(item[6]); lis.SubStockId = Convert.ToInt32(item[6]);
lis.AccruedQty = Convert.ToDecimal(item[7]); lis.AccruedQty = Convert.ToDecimal(item[7]);
@@ -2170,7 +2170,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶采购订单：拼接参数和条件 //3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data); var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.STK_AssembledApp.ToString()); var param = new ErpBillQueryParamDto(FormIdParam.STK_AssembledApp.ToString());
param.FieldKeys = "FBillNo,'',FSubProOwnerIdH,FOwnerIdHead,FMaterialIDSETY,FStockIDSETY.FNumber,FStockLocIdSETY,FQtySETY,FDescriptionSETY,FCreateDate,FSubEntity_FDetailID,FStockOrgId.FNumber"; param.FieldKeys = "FBillNo,'',FSubProOwnerIdH,FOwnerIdHead,FMaterialIDSETY.FNumber,FStockIDSETY.FNumber,FStockLocIdSETY,FQtySETY,FDescriptionSETY,FCreateDate,FSubEntity_FDetailID,FStockOrgId.FNumber";
param.Limit = 10000; param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！ //查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间 //1.创建时间在两天前和当天时间之间
@@ -2221,7 +2221,7 @@ namespace WMS.Web.Domain.Services.Public
lis.SaleBillNo = item[1]; lis.SaleBillNo = item[1];
lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.DeliveryOrgId = Convert.ToInt32(item[2]);
lis.ReceiptCustomerId = Convert.ToInt32(item[3]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]);
lis.MaterialId = Convert.ToInt32(item[4]); lis.MaterialNumber = item[4];
lis.StockCode = item[5]; lis.StockCode = item[5];
lis.SubStockId = Convert.ToInt32(item[6]); lis.SubStockId = Convert.ToInt32(item[6]);
lis.AccruedQty = Convert.ToDecimal(item[7]); lis.AccruedQty = Convert.ToDecimal(item[7]);
@@ -2270,7 +2270,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶采购订单：拼接参数和条件 //3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data); var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.SAL_OUTSTOCK.ToString()); var param = new ErpBillQueryParamDto(FormIdParam.SAL_OUTSTOCK.ToString());
param.FieldKeys = "FBillNo,FSoorDerno,FStockOrgId,FCustomerID,FMaterialID,FStockID.FNumber,FStockLocID,FSALUNITQTY,F_ENTRYREMARKS,FCreateDate,FEntity_FENTRYID,FStockOrgId.FNumber";//FEntryID param.FieldKeys = "FBillNo,FSoorDerno,FStockOrgId,FCustomerID,FMaterialID.FNumber,FStockID.FNumber,FStockLocID,FSALUNITQTY,F_ENTRYREMARKS,FCreateDate,FEntity_FENTRYID,FStockOrgId.FNumber";//FEntryID
param.Limit = 10000; param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！ //查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间 //1.创建时间在两天前和当天时间之间
@@ -2320,7 +2320,7 @@ namespace WMS.Web.Domain.Services.Public
lis.SaleBillNo = item[1]; lis.SaleBillNo = item[1];
lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.DeliveryOrgId = Convert.ToInt32(item[2]);
lis.ReceiptCustomerId = Convert.ToInt32(item[3]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]);
lis.MaterialId = Convert.ToInt32(item[4]); lis.MaterialNumber = item[4];
lis.StockCode = item[5]; lis.StockCode = item[5];
lis.SubStockId = Convert.ToInt32(item[6]); lis.SubStockId = Convert.ToInt32(item[6]);
lis.AccruedQty = Convert.ToDecimal(item[7]); lis.AccruedQty = Convert.ToDecimal(item[7]);