diff --git a/src/WMS.Web.Core/Dto/Erp/OutStock/ErpDeliveryNoticeOutStockResultDto.cs b/src/WMS.Web.Core/Dto/Erp/OutStock/ErpDeliveryNoticeOutStockResultDto.cs index 9ea3dfe9..6821cd2a 100644 --- a/src/WMS.Web.Core/Dto/Erp/OutStock/ErpDeliveryNoticeOutStockResultDto.cs +++ b/src/WMS.Web.Core/Dto/Erp/OutStock/ErpDeliveryNoticeOutStockResultDto.cs @@ -36,7 +36,7 @@ namespace WMS.Web.Core.Dto.Erp.OutStock /// /// 仓库ID /// - public int StockId { get; set; } + public string StockCode { get; set; } /// /// 仓位ID /// diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index dd1e05d6..2202964c 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -1385,7 +1385,7 @@ namespace WMS.Web.Domain.Services.Public //3.获取金蝶采购订单:拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); var param = new ErpBillQueryParamDto(FormIdParam.SAL_DELIVERYNOTICE.ToString()); - param.FieldKeys = "FBillNo,FOrderNo,FDeliveryOrgID,FCustomerID,FMaterialID,FStockID,FStockLocID,FQty,FNoteEntry,FCreateDate,FEntity_FEntryID";//FEntryID + param.FieldKeys = "FBillNo,FOrderNo,FDeliveryOrgID,FCustomerID,FMaterialID,FStockID.FNumber,FStockLocID,FQty,FNoteEntry,FCreateDate,FEntity_FEntryID";//FEntryID param.Limit = 10; //查询条件:备注其中的条件值以金蝶的值为准!!! //1.创建时间在两天前和当天时间之间 @@ -1422,7 +1422,7 @@ namespace WMS.Web.Domain.Services.Public lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]); lis.MaterialId = Convert.ToInt32(item[4]); - lis.StockId = Convert.ToInt32(item[5]); + lis.StockCode = item[5]; lis.SubStockId = Convert.ToInt32(item[6]); lis.AccruedQty = Convert.ToDecimal(item[7]); lis.Remark = item[8]; @@ -1465,7 +1465,7 @@ namespace WMS.Web.Domain.Services.Public //3.获取金蝶采购订单:拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); var param = new ErpBillQueryParamDto(FormIdParam.STK_TransferDirect.ToString()); - param.FieldKeys = "FBillNo,'',FStockOutOrgId,FStockOrgId,FMaterialID,FSrcStockId,FSrcStockLocId,FQty,FNoteEntry,FCreateDate"; + param.FieldKeys = "FBillNo,'',FStockOutOrgId,FStockOrgId,FMaterialID,FSrcStockId.FNumber,FSrcStockLocId,FQty,FNoteEntry,FCreateDate"; param.Limit = 10; //查询条件:备注其中的条件值以金蝶的值为准!!! //1.创建时间在两天前和当天时间之间 @@ -1501,7 +1501,7 @@ namespace WMS.Web.Domain.Services.Public lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]); lis.MaterialId = Convert.ToInt32(item[4]); - lis.StockId = Convert.ToInt32(item[5]); + lis.StockCode = item[5]; lis.SubStockId = Convert.ToInt32(item[6]); lis.AccruedQty = Convert.ToDecimal(item[7]); lis.Remark = item[8]; @@ -1543,7 +1543,7 @@ namespace WMS.Web.Domain.Services.Public //3.获取金蝶采购订单:拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); var param = new ErpBillQueryParamDto(FormIdParam.STK_TRANSFEROUT.ToString()); - param.FieldKeys = "FBillNo,'',FStockOrgID,FStockInOrgID,FMaterialID,FSrcStockID,FSrcStockLocId,FQty,FEntryNote,FCreateDate"; + param.FieldKeys = "FBillNo,'',FStockOrgID,FStockInOrgID,FMaterialID,FSrcStockID.FNumber,FSrcStockLocId,FQty,FEntryNote,FCreateDate"; param.Limit = 10; //查询条件:备注其中的条件值以金蝶的值为准!!! //1.创建时间在两天前和当天时间之间 @@ -1579,7 +1579,7 @@ namespace WMS.Web.Domain.Services.Public lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]); lis.MaterialId = Convert.ToInt32(item[4]); - lis.StockId = Convert.ToInt32(item[5]); + lis.StockCode = item[5]; lis.SubStockId = Convert.ToInt32(item[6]); lis.AccruedQty = Convert.ToDecimal(item[7]); lis.Remark = item[8]; @@ -1621,7 +1621,7 @@ namespace WMS.Web.Domain.Services.Public //3.获取金蝶采购订单:拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); var param = new ErpBillQueryParamDto(FormIdParam.STK_AssembledApp.ToString()); - param.FieldKeys = "FBillNo,'','0','0',FMaterialID,FStockID,FStockLocId,FQty,FDescription,FCreateDate"; + param.FieldKeys = "FBillNo,'','0','0',FMaterialID,FStockID.FNumber,FStockLocId,FQty,FDescription,FCreateDate"; param.Limit = 10; //查询条件:备注其中的条件值以金蝶的值为准!!! //1.创建时间在两天前和当天时间之间 @@ -1657,7 +1657,7 @@ namespace WMS.Web.Domain.Services.Public lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]); lis.MaterialId = Convert.ToInt32(item[4]); - lis.StockId = Convert.ToInt32(item[5]); + lis.StockCode = item[5]; lis.SubStockId = Convert.ToInt32(item[6]); lis.AccruedQty = Convert.ToDecimal(item[7]); lis.Remark = item[8]; @@ -1699,7 +1699,7 @@ namespace WMS.Web.Domain.Services.Public //3.获取金蝶采购订单:拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); var param = new ErpBillQueryParamDto(FormIdParam.STK_MisDelivery.ToString()); - param.FieldKeys = "FBillNo,'',FStockOrgId,FPickOrgId,FMaterialId,FStockId,FStockLocId ,FQty,FEntryNote,FCreateDate"; + param.FieldKeys = "FBillNo,'',FStockOrgId,FPickOrgId,FMaterialId,FStockId.FNumber,FStockLocId ,FQty,FEntryNote,FCreateDate"; param.Limit = 10; //查询条件:备注其中的条件值以金蝶的值为准!!! //1.创建时间在两天前和当天时间之间 @@ -1735,7 +1735,7 @@ namespace WMS.Web.Domain.Services.Public lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]); lis.MaterialId = Convert.ToInt32(item[4]); - lis.StockId = Convert.ToInt32(item[5]); + lis.StockCode = item[5]; lis.SubStockId = Convert.ToInt32(item[6]); lis.AccruedQty = Convert.ToDecimal(item[7]); lis.Remark = item[8]; @@ -1777,7 +1777,7 @@ namespace WMS.Web.Domain.Services.Public //3.获取金蝶采购订单:拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); var param = new ErpBillQueryParamDto(FormIdParam.STK_AssembledApp.ToString()); - param.FieldKeys = "FBillNo,'',FSubProOwnerIdH,FOwnerIdHead,FMaterialIDSETY,FStockIDSETY,FStockLocIdSETY,FQtySETY,FDescriptionSETY,FCreateDate"; + param.FieldKeys = "FBillNo,'',FSubProOwnerIdH,FOwnerIdHead,FMaterialIDSETY,FStockIDSETY.FNumber,FStockLocIdSETY,FQtySETY,FDescriptionSETY,FCreateDate"; param.Limit = 10; //查询条件:备注其中的条件值以金蝶的值为准!!! //1.创建时间在两天前和当天时间之间 @@ -1813,7 +1813,7 @@ namespace WMS.Web.Domain.Services.Public lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]); lis.MaterialId = Convert.ToInt32(item[4]); - lis.StockId = Convert.ToInt32(item[5]); + lis.StockCode = item[5]; lis.SubStockId = Convert.ToInt32(item[6]); lis.AccruedQty = Convert.ToDecimal(item[7]); lis.Remark = item[8];