11

Reportapi/Documents/生产环境.config

@@ -143,7 +143,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />

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

@@ -195,5 +195,12 @@ namespace MyCode.Project.Domain.Model
            /// </summary>           
            public Guid? JackOrdersId {get;set;}
 
+           /// <summary>
+           /// Desc:计量单位
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string Unit {get;set;}
+
     }
 }

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

@@ -78,5 +78,12 @@ namespace MyCode.Project.Domain.Model
            /// </summary>           
            public Guid? PushKingDeeOrderId {get;set;}
 
+           /// <summary>
+           /// Desc:计量单位
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string Unit {get;set;}
+
     }
 }

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

@@ -11,8 +11,7 @@ namespace MyCode.Project.Domain.Model
     [SugarTable("YTKJ_t_ShopParameter")]
     public partial class YTKJTShopParameter
     {
-        public YTKJTShopParameter()
+           public YTKJTShopParameter(){
-        {
 
 
            }
@@ -198,14 +197,6 @@ namespace MyCode.Project.Domain.Model
            [SugarColumn(ColumnName="F_SALER")]
            public long? FSALER {get;set;}
 
-        /// <summary>
-        /// Desc:销售员ID
-        /// Default:
-        /// Nullable:True
-        /// </summary>           
-        [SugarColumn(ColumnName = "F_SALE_ORGID")]
-        public long? FSaleOrgId { get; set; }
-
            /// <summary>
            /// Desc:销售组织ID
            /// Default:

Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs

@@ -287,7 +287,7 @@ namespace MyCode.Project.Services.Implementation
                 FDate = pushKingdeeOrder.ConsignTime?.ToString("yyyy/MM/dd"),
                 FSaleOrgId = new FSaleOrgId()
                 {
-                    FOrgId = param.FSaleOrgId.ToString() // 销售组织
+                    FOrgId = param.FSALEORGID.ToString() // 销售组织
                 },
                 FCustId = new FCustomerId()
                 {