From af2f97c50894882dafa9445b8c96143267734c2d Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Mon, 21 Jul 2025 17:53:44 +0800
Subject: [PATCH] 11

---
 Reportapi/Documents/生产环境.config           |   2 +-
 .../Model/JackOrdersItem.cs                   |   7 +
 .../Model/PushKingDeeOrderItem.cs             |   7 +
 .../Model/YTKJTShopParameter.cs               | 331 +++++++++---------
 .../Implementation/OrderPushService.cs        |   2 +-
 5 files changed, 177 insertions(+), 172 deletions(-)

diff --git a/Reportapi/Documents/生产环境.config b/Reportapi/Documents/生产环境.config
index 0cf37cd..fe74e87 100644
--- a/Reportapi/Documents/生产环境.config
+++ b/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" />
diff --git a/Reportapi/MyCode.Project.Domain/Model/JackOrdersItem.cs b/Reportapi/MyCode.Project.Domain/Model/JackOrdersItem.cs
index 5b9cde2..22217fe 100644
--- a/Reportapi/MyCode.Project.Domain/Model/JackOrdersItem.cs
+++ b/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;}
+
     }
 }
diff --git a/Reportapi/MyCode.Project.Domain/Model/PushKingDeeOrderItem.cs b/Reportapi/MyCode.Project.Domain/Model/PushKingDeeOrderItem.cs
index 201dd9d..45a5110 100644
--- a/Reportapi/MyCode.Project.Domain/Model/PushKingDeeOrderItem.cs
+++ b/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;}
+
     }
 }
diff --git a/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs b/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs
index 680ec84..856449d 100644
--- a/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs
+++ b/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs
@@ -11,200 +11,191 @@ namespace MyCode.Project.Domain.Model
     [SugarTable("YTKJ_t_ShopParameter")]
     public partial class YTKJTShopParameter
     {
-        public YTKJTShopParameter()
-        {
+           public YTKJTShopParameter(){
 
 
-        }
-        /// <summary>
-        /// Desc:
-        /// Default:
-        /// Nullable:False
-        /// </summary>           
-        [SugarColumn(IsPrimaryKey = true)]
-        public long FID { get; set; }
+           }
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(IsPrimaryKey=true)]
+           public long FID {get;set;}
 
-        /// <summary>
-        /// Desc:
-        /// Default:
-        /// Nullable:False
-        /// </summary>           
-        public string FBILLNO { get; set; }
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           public string FBILLNO {get;set;}
 
-        /// <summary>
-        /// Desc:审核状态 C=已审核
-        /// Default:
-        /// Nullable:False
-        /// </summary>           
-        public string FDOCUMENTSTATUS { get; set; }
+           /// <summary>
+           /// Desc:审核状态 C=已审核
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           public string FDOCUMENTSTATUS {get;set;}
 
-        /// <summary>
-        /// Desc:门店编码
-        /// Default:
-        /// Nullable:False
-        /// </summary>           
-        [SugarColumn(ColumnName = "F_SHOPCODE")]
-        public string FSHOPCODE { get; set; }
+           /// <summary>
+           /// Desc:门店编码
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(ColumnName="F_SHOPCODE")]
+           public string FSHOPCODE {get;set;}
 
-        /// <summary>
-        /// Desc:门店名称
-        /// Default:
-        /// Nullable:False
-        /// </summary>           
-        [SugarColumn(ColumnName = "F_SHOPNAME")]
-        public string FSHOPNAME { get; set; }
+           /// <summary>
+           /// Desc:门店名称
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(ColumnName="F_SHOPNAME")]
+           public string FSHOPNAME {get;set;}
 
-        /// <summary>
-        /// Desc:
-        /// Default:
-        /// Nullable:False
-        /// </summary>           
-        [SugarColumn(ColumnName = "F_YTKJ_TEXT2")]
-        public string FYTKJTEXT2 { get; set; }
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(ColumnName="F_YTKJ_TEXT2")]
+           public string FYTKJTEXT2 {get;set;}
 
-        /// <summary>
-        /// Desc:是否同步金蝶
-        /// Default:1
-        /// Nullable:False
-        /// </summary>           
-        [SugarColumn(ColumnName = "F_SYNCHRONIZEKINGDEE")]
-        public string FSYNCHRONIZEKINGDEE { get; set; }
+           /// <summary>
+           /// Desc:是否同步金蝶
+           /// Default:1
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(ColumnName="F_SYNCHRONIZEKINGDEE")]
+           public string FSYNCHRONIZEKINGDEE {get;set;}
 
-        /// <summary>
-        /// Desc:是否同步WMS
-        /// Default:1
-        /// Nullable:False
-        /// </summary>           
-        [SugarColumn(ColumnName = "F_SYNCHRONIZEWMS")]
-        public string FSYNCHRONIZEWMS { get; set; }
+           /// <summary>
+           /// Desc:是否同步WMS
+           /// Default:1
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(ColumnName="F_SYNCHRONIZEWMS")]
+           public string FSYNCHRONIZEWMS {get;set;}
 
-        /// <summary>
-        /// Desc:销售客户
-        /// Default:0
-        /// Nullable:False
-        /// </summary>           
-        [SugarColumn(ColumnName = "F_SALESCUSTOMERS")]
-        public int FSALESCUSTOMERS { get; set; }
+           /// <summary>
+           /// Desc:销售客户
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(ColumnName="F_SALESCUSTOMERS")]
+           public int FSALESCUSTOMERS {get;set;}
 
-        /// <summary>
-        /// Desc:发货仓库ID
-        /// Default:0
-        /// Nullable:False
-        /// </summary>           
-        [SugarColumn(ColumnName = "F_WAREHOUSE")]
-        public int FWAREHOUSE { get; set; }
+           /// <summary>
+           /// Desc:发货仓库ID
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(ColumnName="F_WAREHOUSE")]
+           public int FWAREHOUSE {get;set;}
 
-        /// <summary>
-        /// Desc:仓库货主
-        /// Default:
-        /// Nullable:False
-        /// </summary>           
-        [SugarColumn(ColumnName = "F_CANGKUHUOZHU")]
-        public string FCANGKUHUOZHU { get; set; }
+           /// <summary>
+           /// Desc:仓库货主
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(ColumnName="F_CANGKUHUOZHU")]
+           public string FCANGKUHUOZHU {get;set;}
 
-        /// <summary>
-        /// Desc:公司ID
-        /// Default:
-        /// Nullable:False
-        /// </summary>           
-        [SugarColumn(ColumnName = "F_COMPANYID")]
-        public string FCOMPANYID { get; set; }
+           /// <summary>
+           /// Desc:公司ID
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(ColumnName="F_COMPANYID")]
+           public string FCOMPANYID {get;set;}
 
-        /// <summary>
-        /// Desc:发货大仓
-        /// Default:
-        /// Nullable:False
-        /// </summary>           
-        [SugarColumn(ColumnName = "F_DACANG")]
-        public string FDACANG { get; set; }
+           /// <summary>
+           /// Desc:发货大仓
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(ColumnName="F_DACANG")]
+           public string FDACANG {get;set;}
 
-        /// <summary>
-        /// Desc:税率
-        /// Default:0
-        /// Nullable:False
-        /// </summary>           
-        [SugarColumn(ColumnName = "F_TAXRATE")]
-        public decimal FTAXRATE { get; set; }
+           /// <summary>
+           /// Desc:税率
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(ColumnName="F_TAXRATE")]
+           public decimal FTAXRATE {get;set;}
 
-        /// <summary>
-        /// Desc:创建日期
-        /// Default:
-        /// Nullable:True
-        /// </summary>           
-        [SugarColumn(ColumnName = "F_YTKJ_CREATEDATE")]
-        public DateTime? FYTKJCREATEDATE { get; set; }
+           /// <summary>
+           /// Desc:创建日期
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="F_YTKJ_CREATEDATE")]
+           public DateTime? FYTKJCREATEDATE {get;set;}
 
-        /// <summary>
-        /// Desc:修改日期
-        /// Default:
-        /// Nullable:True
-        /// </summary>           
-        [SugarColumn(ColumnName = "F_YTKJ_MODIFYDATE")]
-        public DateTime? FYTKJMODIFYDATE { get; set; }
+           /// <summary>
+           /// Desc:修改日期
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="F_YTKJ_MODIFYDATE")]
+           public DateTime? FYTKJMODIFYDATE {get;set;}
 
-        /// <summary>
-        /// Desc:审核日期
-        /// Default:
-        /// Nullable:True
-        /// </summary>           
-        [SugarColumn(ColumnName = "F_AUDITDATE")]
-        public DateTime? FAUDITDATE { get; set; }
+           /// <summary>
+           /// Desc:审核日期
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="F_AUDITDATE")]
+           public DateTime? FAUDITDATE {get;set;}
 
-        /// <summary>
-        /// Desc:创建人
-        /// Default:0
-        /// Nullable:False
-        /// </summary>           
-        [SugarColumn(ColumnName = "F_YTKJ_CREATORID")]
-        public int FYTKJCREATORID { get; set; }
+           /// <summary>
+           /// Desc:创建人
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(ColumnName="F_YTKJ_CREATORID")]
+           public int FYTKJCREATORID {get;set;}
 
-        /// <summary>
-        /// Desc:修改人
-        /// Default:0
-        /// Nullable:False
-        /// </summary>           
-        [SugarColumn(ColumnName = "F_YTKJ_MODIFIERID")]
-        public int FYTKJMODIFIERID { get; set; }
+           /// <summary>
+           /// Desc:修改人
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(ColumnName="F_YTKJ_MODIFIERID")]
+           public int FYTKJMODIFIERID {get;set;}
 
-        /// <summary>
-        /// Desc:审核人
-        /// Default:0
-        /// Nullable:False
-        /// </summary>           
-        [SugarColumn(ColumnName = "F_AUDITOR")]
-        public int FAUDITOR { get; set; }
+           /// <summary>
+           /// Desc:审核人
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(ColumnName="F_AUDITOR")]
+           public int FAUDITOR {get;set;}
 
-        /// <summary>
-        /// Desc:仓库编码
-        /// Default:
-        /// Nullable:False
-        /// </summary>           
-        [SugarColumn(ColumnName = "F_WAREHOUSE_CODE")]
-        public string FWAREHOUSECODE { get; set; }
+           /// <summary>
+           /// Desc:仓库编码
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(ColumnName="F_WAREHOUSE_CODE")]
+           public string FWAREHOUSECODE {get;set;}
 
-        /// <summary>
-        /// Desc:仓库名称
-        /// Default:
-        /// Nullable:False
-        /// </summary>           
-        [SugarColumn(ColumnName = "F_WAREHOUSE_NAME")]
-        public string FWAREHOUSENAME { get; set; }
+           /// <summary>
+           /// Desc:仓库名称
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(ColumnName="F_WAREHOUSE_NAME")]
+           public string FWAREHOUSENAME {get;set;}
 
-        /// <summary>
-        /// Desc:销售员ID
-        /// Default:
-        /// Nullable:True
-        /// </summary>           
-        [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:
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="F_SALER")]
+           public long? FSALER {get;set;}
 
            /// <summary>
            /// Desc:销售组织ID
diff --git a/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs b/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs
index cc1cc1e..e810dc2 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs
+++ b/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()
                 {