diff --git a/Reportapi/MyCode.Project.Domain/Model/JackOrdersItem.cs b/Reportapi/MyCode.Project.Domain/Model/JackOrdersItem.cs
index 22217fe..4191055 100644
--- a/Reportapi/MyCode.Project.Domain/Model/JackOrdersItem.cs
+++ b/Reportapi/MyCode.Project.Domain/Model/JackOrdersItem.cs
@@ -202,5 +202,13 @@ namespace MyCode.Project.Domain.Model
///
public string Unit {get;set;}
+ ///
+ /// Desc:分摊后金额
+ /// Default:
+ /// Nullable:True
+ ///
+ [SugarColumn(ColumnName="shareFavourableAfterFee")]
+ public decimal? ShareFavourableAfterFee {get;set;}
+
}
}
diff --git a/Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs b/Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs
index c47fa92..304bafd 100644
--- a/Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs
+++ b/Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs
@@ -99,6 +99,14 @@ namespace MyCode.Project.Infrastructure.JackYun
///
public string unit { get; set; }
+ ///
+ /// Desc:分摊后金额
+ /// Default:
+ /// Nullable:True
+ ///
+ [SugarColumn(ColumnName = "shareFavourableAfterFee")]
+ public decimal? ShareFavourableAfterFee { get; set; }
+
}
public class TradesItem
@@ -212,6 +220,14 @@ namespace MyCode.Project.Infrastructure.JackYun
///
public DateTime? consignTime { get; set; }
+
+ ///
+ /// Desc:分摊后金额
+ /// Default:
+ /// Nullable:True
+ ///
+ [SugarColumn(ColumnName = "shareFavourableAfterFee")]
+ public decimal? ShareFavourableAfterFee { get; set; }
}
public class TradeFullinfogetData
diff --git a/Reportapi/MyCode.Project.Repositories/JackOrdersItemRepository.cs b/Reportapi/MyCode.Project.Repositories/JackOrdersItemRepository.cs
index fe26caf..7e6fef7 100644
--- a/Reportapi/MyCode.Project.Repositories/JackOrdersItemRepository.cs
+++ b/Reportapi/MyCode.Project.Repositories/JackOrdersItemRepository.cs
@@ -30,7 +30,7 @@ namespace MyCode.Project.Repositories
SELECT [shopCode], [shopName], [shopId], [warehouseName], [warehouseCode],
[status], CONVERT(NVARCHAR(30),[consignTime],23) [consignTime],
[goodsNo], [goodsId],SUM([sellTotal]) [sellTotal],
- SUM([sellCount]) [sellCount], SUM([divideSellTotal]) AS [divideSellTotal],
+ SUM([sellCount]) [sellCount], SUM([shareFavourableAfterFee]) AS [divideSellTotal],
[barcode], [TradeType] ,[warehouseId],Unit
FROM [JackOrders] a WITH (NOLOCK)
LEFT JOIN [dbo].[JackOrdersItem] b WITH (NOLOCK)
diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs
index 9ab9f4d..d800d9a 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs
@@ -78,7 +78,7 @@ namespace MyCode.Project.Services.Implementation
requestBizData.HasTotal = total;
requestBizData.PageSize = 200;
requestBizData.PageIndex = 0;
- requestBizData.Fields = "TradeType,tradeStatus,consignTime,payTime,goodsDetail.barcode,tradeNo,orderNo,shopName,companyName,warehouseName,logisticName,mainPostid,goodsDetail.goodsNo,flagNames,columnExt,sourceAfterNo,goodsDetail.outerId,pickUpCode,expense.expenseFee,expense.expenseItemName,billDate,goodsPlatDiscountFee,goodsDetail.shareOrderDiscountFee,goodsDetail.shareOrderPlatDiscountFee,customizeGoodsColumn9,goodsDetail.goodsId,goodsDetail.sellCount,goodsDetail.needProcessCount,goodsDetail.baseUnitSellCount,goodsDetail.assessmentCost,goodsDetail.compassSourceContentTypem,sourceTradeNo,shopId,warehouseId,scrollId,goodsDetail.unit";
+ requestBizData.Fields = "TradeType,tradeStatus,consignTime,payTime,goodsDetail.barcode,tradeNo,orderNo,shopName,companyName,warehouseName,logisticName,mainPostid,goodsDetail.goodsNo,flagNames,columnExt,sourceAfterNo,goodsDetail.outerId,pickUpCode,expense.expenseFee,expense.expenseItemName,billDate,goodsPlatDiscountFee,goodsDetail.shareOrderDiscountFee,goodsDetail.shareFavourableAfterFee,goodsDetail.shareOrderPlatDiscountFee,customizeGoodsColumn9,goodsDetail.goodsId,goodsDetail.sellCount,goodsDetail.needProcessCount,goodsDetail.baseUnitSellCount,goodsDetail.assessmentCost,goodsDetail.compassSourceContentTypem,sourceTradeNo,shopId,warehouseId,scrollId,goodsDetail.unit";
requestBizData.StartCreated = "";// DateTime.ParseExact(value, "yyyy -MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None);
requestBizData.EndCreated = "";// DateTime.ParseExact(value1, "yyyy -MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None);
requestBizData.StartAuditTime = "";// DateTime.ParseExact(value, "yyyy-MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None);
diff --git a/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs b/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs
index 89fdd2c..ad8475b 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs
@@ -225,7 +225,7 @@ namespace MyCode.Project.Services.Implementation
},
FWarehouse = new FWarehouse()
{
- FNUMBER = pushKingdeeOrder.WarehouseCode, // 仓库编码
+ FNUMBER = param.FWAREHOUSECODE, // 仓库编码
},
FSaleOrderEntry = entryList
};
diff --git a/Reportapi/MyCode.Project.WebApi/Web.config b/Reportapi/MyCode.Project.WebApi/Web.config
index 44ed88f..e7cdc6b 100644
--- a/Reportapi/MyCode.Project.WebApi/Web.config
+++ b/Reportapi/MyCode.Project.WebApi/Web.config
@@ -22,9 +22,9 @@
-
-
-
+
+
+