Develop/YunTongJackYunTask
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
余宇波
2025-07-21 17:53:44 +08:00
parent b10f8e2020
commit af2f97c508
5 changed files with 177 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Reportapi/Documents/生产环境.config
View File

@@ -143,7 +143,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> <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>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />

7
Reportapi/MyCode.Project.Domain/Model/JackOrdersItem.cs
View File

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

7
Reportapi/MyCode.Project.Domain/Model/PushKingDeeOrderItem.cs
View File

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

331
Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs
View File

@@ -11,200 +11,191 @@ namespace MyCode.Project.Domain.Model
[SugarTable("YTKJ_t_ShopParameter")] [SugarTable("YTKJ_t_ShopParameter")]
public partial class YTKJTShopParameter public partial class YTKJTShopParameter
{ {
public YTKJTShopParameter() public YTKJTShopParameter(){
{
} }
/// <summary> /// <summary>
/// Desc: /// Desc:
/// Default: /// Default:
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(IsPrimaryKey = true)] [SugarColumn(IsPrimaryKey=true)]
public long FID { get; set; } public long FID {get;set;}
/// <summary> /// <summary>
/// Desc: /// Desc:
/// Default: /// Default:
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
public string FBILLNO { get; set; } public string FBILLNO {get;set;}
/// <summary> /// <summary>
/// Desc:审核状态 C=已审核 /// Desc:审核状态 C=已审核
/// Default: /// Default:
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
public string FDOCUMENTSTATUS { get; set; } public string FDOCUMENTSTATUS {get;set;}
/// <summary> /// <summary>
/// Desc:门店编码 /// Desc:门店编码
/// Default: /// Default:
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(ColumnName = "F_SHOPCODE")] [SugarColumn(ColumnName="F_SHOPCODE")]
public string FSHOPCODE { get; set; } public string FSHOPCODE {get;set;}
/// <summary> /// <summary>
/// Desc:门店名称 /// Desc:门店名称
/// Default: /// Default:
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(ColumnName = "F_SHOPNAME")] [SugarColumn(ColumnName="F_SHOPNAME")]
public string FSHOPNAME { get; set; } public string FSHOPNAME {get;set;}
/// <summary> /// <summary>
/// Desc: /// Desc:
/// Default: /// Default:
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(ColumnName = "F_YTKJ_TEXT2")] [SugarColumn(ColumnName="F_YTKJ_TEXT2")]
public string FYTKJTEXT2 { get; set; } public string FYTKJTEXT2 {get;set;}
/// <summary> /// <summary>
/// Desc:是否同步金蝶 /// Desc:是否同步金蝶
/// Default:1 /// Default:1
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(ColumnName = "F_SYNCHRONIZEKINGDEE")] [SugarColumn(ColumnName="F_SYNCHRONIZEKINGDEE")]
public string FSYNCHRONIZEKINGDEE { get; set; } public string FSYNCHRONIZEKINGDEE {get;set;}
/// <summary> /// <summary>
/// Desc:是否同步WMS /// Desc:是否同步WMS
/// Default:1 /// Default:1
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(ColumnName = "F_SYNCHRONIZEWMS")] [SugarColumn(ColumnName="F_SYNCHRONIZEWMS")]
public string FSYNCHRONIZEWMS { get; set; } public string FSYNCHRONIZEWMS {get;set;}
/// <summary> /// <summary>
/// Desc:销售客户 /// Desc:销售客户
/// Default:0 /// Default:0
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(ColumnName = "F_SALESCUSTOMERS")] [SugarColumn(ColumnName="F_SALESCUSTOMERS")]
public int FSALESCUSTOMERS { get; set; } public int FSALESCUSTOMERS {get;set;}
/// <summary> /// <summary>
/// Desc:发货仓库ID /// Desc:发货仓库ID
/// Default:0 /// Default:0
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(ColumnName = "F_WAREHOUSE")] [SugarColumn(ColumnName="F_WAREHOUSE")]
public int FWAREHOUSE { get; set; } public int FWAREHOUSE {get;set;}
/// <summary> /// <summary>
/// Desc:仓库货主 /// Desc:仓库货主
/// Default: /// Default:
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(ColumnName = "F_CANGKUHUOZHU")] [SugarColumn(ColumnName="F_CANGKUHUOZHU")]
public string FCANGKUHUOZHU { get; set; } public string FCANGKUHUOZHU {get;set;}
/// <summary> /// <summary>
/// Desc:公司ID /// Desc:公司ID
/// Default: /// Default:
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(ColumnName = "F_COMPANYID")] [SugarColumn(ColumnName="F_COMPANYID")]
public string FCOMPANYID { get; set; } public string FCOMPANYID {get;set;}
/// <summary> /// <summary>
/// Desc:发货大仓 /// Desc:发货大仓
/// Default: /// Default:
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(ColumnName = "F_DACANG")] [SugarColumn(ColumnName="F_DACANG")]
public string FDACANG { get; set; } public string FDACANG {get;set;}
/// <summary> /// <summary>
/// Desc:税率 /// Desc:税率
/// Default:0 /// Default:0
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(ColumnName = "F_TAXRATE")] [SugarColumn(ColumnName="F_TAXRATE")]
public decimal FTAXRATE { get; set; } public decimal FTAXRATE {get;set;}
/// <summary> /// <summary>
/// Desc:创建日期 /// Desc:创建日期
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName = "F_YTKJ_CREATEDATE")] [SugarColumn(ColumnName="F_YTKJ_CREATEDATE")]
public DateTime? FYTKJCREATEDATE { get; set; } public DateTime? FYTKJCREATEDATE {get;set;}
/// <summary> /// <summary>
/// Desc:修改日期 /// Desc:修改日期
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName = "F_YTKJ_MODIFYDATE")] [SugarColumn(ColumnName="F_YTKJ_MODIFYDATE")]
public DateTime? FYTKJMODIFYDATE { get; set; } public DateTime? FYTKJMODIFYDATE {get;set;}
/// <summary> /// <summary>
/// Desc:审核日期 /// Desc:审核日期
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName = "F_AUDITDATE")] [SugarColumn(ColumnName="F_AUDITDATE")]
public DateTime? FAUDITDATE { get; set; } public DateTime? FAUDITDATE {get;set;}
/// <summary> /// <summary>
/// Desc:创建人 /// Desc:创建人
/// Default:0 /// Default:0
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(ColumnName = "F_YTKJ_CREATORID")] [SugarColumn(ColumnName="F_YTKJ_CREATORID")]
public int FYTKJCREATORID { get; set; } public int FYTKJCREATORID {get;set;}
/// <summary> /// <summary>
/// Desc:修改人 /// Desc:修改人
/// Default:0 /// Default:0
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(ColumnName = "F_YTKJ_MODIFIERID")] [SugarColumn(ColumnName="F_YTKJ_MODIFIERID")]
public int FYTKJMODIFIERID { get; set; } public int FYTKJMODIFIERID {get;set;}
/// <summary> /// <summary>
/// Desc:审核人 /// Desc:审核人
/// Default:0 /// Default:0
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(ColumnName = "F_AUDITOR")] [SugarColumn(ColumnName="F_AUDITOR")]
public int FAUDITOR { get; set; } public int FAUDITOR {get;set;}
/// <summary> /// <summary>
/// Desc:仓库编码 /// Desc:仓库编码
/// Default: /// Default:
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(ColumnName = "F_WAREHOUSE_CODE")] [SugarColumn(ColumnName="F_WAREHOUSE_CODE")]
public string FWAREHOUSECODE { get; set; } public string FWAREHOUSECODE {get;set;}
/// <summary> /// <summary>
/// Desc:仓库名称 /// Desc:仓库名称
/// Default: /// Default:
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(ColumnName = "F_WAREHOUSE_NAME")] [SugarColumn(ColumnName="F_WAREHOUSE_NAME")]
public string FWAREHOUSENAME { get; set; } public string FWAREHOUSENAME {get;set;}
/// <summary> /// <summary>
/// Desc:销售员ID /// Desc:销售员ID
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName = "F_SALER")] [SugarColumn(ColumnName="F_SALER")]
public long? FSALER { get; set; } public long? FSALER {get;set;}
/// <summary>
/// Desc:销售员ID
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "F_SALE_ORGID")]
public long? FSaleOrgId { get; set; }
/// <summary> /// <summary>
/// Desc:销售组织ID /// Desc:销售组织ID

2
Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs
View File

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