11

Reportapi/MyCode.Project.Domain/Model/JackOrdersItem.cs

@@ -202,5 +202,13 @@ namespace MyCode.Project.Domain.Model
            /// </summary>           
            public string Unit {get;set;}
 
+           /// <summary>
+           /// Desc:分摊后金额
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="shareFavourableAfterFee")]
+           public decimal? ShareFavourableAfterFee {get;set;}
+
     }
 }

Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs

@@ -99,6 +99,14 @@ namespace MyCode.Project.Infrastructure.JackYun
         /// </summary>           
         public string unit { get; set; }
 
+        /// <summary>
+        /// Desc:分摊后金额
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        [SugarColumn(ColumnName = "shareFavourableAfterFee")]
+        public decimal? ShareFavourableAfterFee { get; set; }
+
     }
 
     public class TradesItem
@@ -212,6 +220,14 @@ namespace MyCode.Project.Infrastructure.JackYun
         /// </summary>           
 
         public DateTime? consignTime { get; set; }
+
+        /// <summary>
+        /// Desc:分摊后金额
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        [SugarColumn(ColumnName = "shareFavourableAfterFee")]
+        public decimal? ShareFavourableAfterFee { get; set; }
     }
 
     public class TradeFullinfogetData

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)

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);

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
             };

Reportapi/MyCode.Project.WebApi/Web.config

@@ -22,9 +22,9 @@
   </system.webServer>
   <connectionStrings>
     <!-- 数据库测试-->
-    <add name="WMSConn" connectionString="Data Source=172.16.18.87; Initial Catalog=ESB_DTC; User ID=app_k3;Password=Postman2025k3; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient" />
+	  <add name="WMSConn" connectionString="Data Source=127.0.0.1; Initial Catalog=yuntong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient" />
-    <add name="YunTongConn" connectionString="Data Source=172.100.1.148; Initial Catalog=AIS20221018145647; User ID=sa;Password=YT3059**!@#; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" />
+	  <add name="YunTongConn" connectionString="Data Source=127.0.0.1; Initial Catalog=yuntong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" />
-    <!--测试MYSQL内网-->
+	  <!--测试MYSQL内网-->
     <!--<add name="MasterConn" connectionString="" providerName="MySql.Data.MySqlClient" />-->
   </connectionStrings>
   <appSettings>