Merge branch 'jackYun' of http://8.130.121.29:3000/yuyubo/YunTongJackYunTask into jackYun
This commit is contained in:
@@ -31,7 +31,7 @@ namespace MyCode.Project.Domain.Message.Request.KingDee.SaveModel
|
||||
/// <summary>
|
||||
/// 客户
|
||||
/// </summary>
|
||||
public FCustId FCustId { get; set; }
|
||||
public FCustomerId FCustId { get; set; }
|
||||
/// <summary>
|
||||
/// 交货方式
|
||||
/// </summary>
|
||||
@@ -190,13 +190,21 @@ namespace MyCode.Project.Domain.Message.Request.KingDee.SaveModel
|
||||
public class FSaleOrgId
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
/// 编码
|
||||
/// </summary>
|
||||
public string FNumber { get; set; }
|
||||
/// <summary>
|
||||
/// Id
|
||||
/// </summary>
|
||||
public string FOrgId { get; set; }
|
||||
}
|
||||
|
||||
public class FCustId
|
||||
public class FCustomerId
|
||||
{
|
||||
/// <summary>
|
||||
/// 客户ID
|
||||
/// </summary>
|
||||
public string FCustId { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
@@ -253,6 +261,7 @@ namespace MyCode.Project.Domain.Message.Request.KingDee.SaveModel
|
||||
|
||||
public class FSalerId
|
||||
{
|
||||
public long? FId { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
@@ -773,7 +782,7 @@ namespace MyCode.Project.Domain.Message.Request.KingDee.SaveModel
|
||||
/// <summary>
|
||||
/// 税率%
|
||||
/// </summary>
|
||||
public int? FEntryTaxRate { get; set; }
|
||||
public decimal? FEntryTaxRate { get; set; }
|
||||
/// <summary>
|
||||
/// 批号
|
||||
/// </summary>
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
|
||||
|
||||
using MyCode.Project.Domain.Message.Response.KingDee.K3Result.Model;
|
||||
|
||||
namespace MyCode.Project.Domain.Message.Response.KingDee.K3Result
|
||||
{
|
||||
/// <summary>
|
||||
/// 金蝶云星空返回类
|
||||
/// </summary>
|
||||
public class K3ApiResult
|
||||
{
|
||||
/// <summary>
|
||||
/// 返回对象
|
||||
/// </summary>
|
||||
public KingdeeResult Result { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
namespace MyCode.Project.Domain.Message.Response.KingDee.K3Result.Model
|
||||
{
|
||||
/// <summary>
|
||||
/// 返回类
|
||||
/// </summary>
|
||||
public class KingdeeResult
|
||||
{
|
||||
/// <summary>
|
||||
/// 响应对象
|
||||
/// </summary>
|
||||
public ResponseStatus ResponseStatus { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 转换响应对象
|
||||
/// </summary>
|
||||
public ResponseStatus ConvertResponseStatus { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 返回结果,用于查看单据
|
||||
/// </summary>
|
||||
public object Result { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 开始索引
|
||||
/// </summary>
|
||||
public long StartIndex { get; set; }
|
||||
/// <summary>
|
||||
/// 是否最后
|
||||
/// </summary>
|
||||
public bool IsLast { get; set; }
|
||||
/// <summary>
|
||||
/// 文件大小
|
||||
/// </summary>
|
||||
public long FileSize { get; set; }
|
||||
/// <summary>
|
||||
/// 文件名称
|
||||
/// </summary>
|
||||
public string FileName { get; set; }
|
||||
/// <summary>
|
||||
/// 文件内容(Base64)
|
||||
/// </summary>
|
||||
public string FilePart { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace MyCode.Project.Domain.Message.Response.KingDee.K3Result.Model
|
||||
{
|
||||
/// <summary>
|
||||
/// 响应对象
|
||||
/// </summary>
|
||||
public class ResponseStatus
|
||||
{
|
||||
/// <summary>
|
||||
/// 错误代码
|
||||
/// </summary>
|
||||
public int ErrorCode { get; set; }
|
||||
/// <summary>
|
||||
/// 是否成功
|
||||
/// </summary>
|
||||
public bool IsSuccess { get; set; }
|
||||
/// <summary>
|
||||
/// 错误信息列表
|
||||
/// </summary>
|
||||
public List<ResultInfo> Errors { get; set; }
|
||||
/// <summary>
|
||||
/// 成功实体
|
||||
/// </summary>
|
||||
public List<SuccessEntity> SuccessEntitys { get; set; }
|
||||
/// <summary>
|
||||
/// 成功消息
|
||||
/// </summary>
|
||||
public List<ResultInfo> SuccessMessages { get; set; }
|
||||
/// <summary>
|
||||
/// 消息代码
|
||||
/// </summary>
|
||||
public int MsgCode { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
namespace MyCode.Project.Domain.Message.Response.KingDee.K3Result.Model
|
||||
{
|
||||
/// <summary>
|
||||
/// 金蝶云星空查看错误信息类
|
||||
/// </summary>
|
||||
public class ResultInfo
|
||||
{
|
||||
/// <summary>
|
||||
/// 字段名称
|
||||
/// </summary>
|
||||
public string FieldName { get; set; }
|
||||
/// <summary>
|
||||
/// 错误信息
|
||||
/// </summary>
|
||||
public string Message { get; set; }
|
||||
/// <summary>
|
||||
/// 序号
|
||||
/// </summary>
|
||||
public int DIndex { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
namespace MyCode.Project.Domain.Message.Response.KingDee.K3Result.Model
|
||||
{
|
||||
/// <summary>
|
||||
/// 成功实体
|
||||
/// </summary>
|
||||
public class SuccessEntity
|
||||
{
|
||||
/// <summary>
|
||||
/// 单据Id
|
||||
/// </summary>
|
||||
public int Id { get; set; }
|
||||
/// <summary>
|
||||
/// 单据编号
|
||||
/// </summary>
|
||||
public string Number { get; set; }
|
||||
/// <summary>
|
||||
/// 实体索引
|
||||
/// </summary>
|
||||
public int DIndex { get; set; }
|
||||
/// <summary>
|
||||
/// 分录Id
|
||||
/// </summary>
|
||||
public object EntryIds { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
namespace MyCode.Project.Domain.Message.Response.KingDee.K3Result.Model
|
||||
{
|
||||
/// <summary>
|
||||
/// 成功信息
|
||||
/// </summary>
|
||||
public class SuccessMessage
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
@@ -11,191 +11,200 @@ 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_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
|
||||
|
||||
@@ -80,6 +80,12 @@
|
||||
<Compile Include="Message\Response\JackYun\CreateAndStockinResp.cs" />
|
||||
<Compile Include="Message\Response\JackYun\PushOrderListResp.cs" />
|
||||
<Compile Include="Message\Response\KingDee\ErrorResponse.cs" />
|
||||
<Compile Include="Message\Response\KingDee\K3Result\K3ApiResult.cs" />
|
||||
<Compile Include="Message\Response\KingDee\K3Result\Model\KingdeeResult.cs" />
|
||||
<Compile Include="Message\Response\KingDee\K3Result\Model\ResponseStatus.cs" />
|
||||
<Compile Include="Message\Response\KingDee\K3Result\Model\ResultInfo.cs" />
|
||||
<Compile Include="Message\Response\KingDee\K3Result\Model\SuccessEntity.cs" />
|
||||
<Compile Include="Message\Response\KingDee\K3Result\Model\SuccessMessage.cs" />
|
||||
<Compile Include="Message\Response\LxmZHMDReport\ReportCalRateResp.cs" />
|
||||
<Compile Include="Message\Response\Queue\QueueProcess.cs" />
|
||||
<Compile Include="Message\Response\User\AdminLoginInfo.cs" />
|
||||
|
||||
Reference in New Issue
Block a user