diff --git a/Reportapi/FrameWork/Fleck/Fleck.csproj b/Reportapi/FrameWork/Fleck/Fleck.csproj index 068f235..7be24ea 100644 --- a/Reportapi/FrameWork/Fleck/Fleck.csproj +++ b/Reportapi/FrameWork/Fleck/Fleck.csproj @@ -9,7 +9,7 @@ Properties Fleck Fleck - v4.5 + v4.8 512 diff --git a/Reportapi/FrameWork/SqlSugar/SqlSugar.csproj b/Reportapi/FrameWork/SqlSugar/SqlSugar.csproj index bc1cd8c..7efafd9 100644 --- a/Reportapi/FrameWork/SqlSugar/SqlSugar.csproj +++ b/Reportapi/FrameWork/SqlSugar/SqlSugar.csproj @@ -9,7 +9,7 @@ Properties SqlSugar SqlSugar - v4.6.1 + v4.8 512 diff --git a/Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.Core/Swashbuckle.Core.csproj b/Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.Core/Swashbuckle.Core.csproj index 95928d6..54e4438 100644 --- a/Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.Core/Swashbuckle.Core.csproj +++ b/Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.Core/Swashbuckle.Core.csproj @@ -9,8 +9,9 @@ Properties Swashbuckle Swashbuckle.Core - v4.5 + v4.8 512 + true diff --git a/Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.Core/app.config b/Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.Core/app.config index e936cc1..c764f53 100644 --- a/Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.Core/app.config +++ b/Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.Core/app.config @@ -1,11 +1,11 @@ - + - - + + - \ No newline at end of file + diff --git a/Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.WebHost/Swashbuckle.WebHost.csproj b/Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.WebHost/Swashbuckle.WebHost.csproj index 0be46db..3ddde11 100644 --- a/Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.WebHost/Swashbuckle.WebHost.csproj +++ b/Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.WebHost/Swashbuckle.WebHost.csproj @@ -9,8 +9,9 @@ Properties Swashbuckle.WebHost Swashbuckle.WebHost - v4.5 + v4.8 512 + true diff --git a/Reportapi/MyCode.Project.Domain/App.config b/Reportapi/MyCode.Project.Domain/App.config index 9472fee..a3d2107 100644 --- a/Reportapi/MyCode.Project.Domain/App.config +++ b/Reportapi/MyCode.Project.Domain/App.config @@ -1,33 +1,33 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/BillSave.cs b/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/BillSave.cs index a2aac56..ff1a1d1 100644 --- a/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/BillSave.cs +++ b/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/BillSave.cs @@ -1,4 +1,5 @@ -using System; +using MyCode.Project.Domain.Message.Request.KingDee.SaveModel; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -9,22 +10,61 @@ namespace MyCode.Project.Domain.Message.Request.KingDee public class BillSave { /// - /// 更新字段 + /// 需要更新的字段，数组类型，格式：[key1,key2,...] （非必录） + /// 注（更新字段时Model数据包中必须设置内码，若更新单据体字段还需设置分录内码） /// public List NeedUpDateFields { get; set; } - /// - /// 返回字段 + /// 需返回结果的字段集合，数组类型，格式：[key,entitykey.key,...]（非必录） + /// 注（返回单据体字段格式：entitykey.key） /// public List NeedReturnFields { get; set; } - - public bool IsDeleteEntry { get; set; } - - + /// + /// 是否删除已存在的分录，布尔类型，默认true（非必录） + /// + public string IsDeleteEntry { get; set; } + /// + /// 表单所在的子系统内码，字符串类型（非必录） + /// + public string SubSystemId { get; set; } + /// + /// 是否验证所有的基础资料有效性，布尔类，默认false（非必录） + /// + public bool IsVerifyBaseDataField { get; set; } + /// + /// 是否批量填充分录，默认true（非必录） + /// + public string IsEntryBatchFill { get; set; } + /// + /// 是否验证数据合法性标志，布尔类型，默认true（非必录） + /// 注（设为false时不对数据合法性进行校验） + /// + public string ValidateFlag { get; set; } + /// + /// 是否用编码搜索基础资料，布尔类型，默认true（非必录） + /// + public string NumberSearch { get; set; } + /// + /// 是否自动调整JSON字段顺序，布尔类型，默认false（非必录） + /// + public string IsAutoAdjustField { get; set; } + /// + ///交互标志集合，字符串类型，分号分隔，格式："flag1;flag2;..."（非必录） + ///例如（允许负库存标识：STK_InvCheckResult） + /// + public string InterationFlags { get; set; } + /// + /// 是否允许忽略交互，布尔类型，默认true（非必录） + /// + public string IgnoreInterationFlag { get; set; } + /// + /// 是否控制精度，为true时对金额、单价和数量字段进行精度验证，默认false（非必录） + /// + public string IsControlPrecision { get; set; } /// /// 表单数据包，JSON类型（必录） /// - public object Model { get; set; } + public BaseModel Model { get; set; } } diff --git a/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/BaseModel.cs b/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/BaseModel.cs new file mode 100644 index 0000000..7d7ac58 --- /dev/null +++ b/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/BaseModel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MyCode.Project.Domain.Message.Request.KingDee.SaveModel +{ + public class BaseModel + { + public string GetRequestString() + { + return ""; + } + } +} diff --git a/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/SaleOrderModel - 复制.cs b/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/SaleOrderModel - 复制.cs new file mode 100644 index 0000000..e539239 --- /dev/null +++ b/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/SaleOrderModel - 复制.cs @@ -0,0 +1,1232 @@ +//using System; +//using System.Collections.Generic; +//using System.Linq; +//using System.Text; +//using System.Threading.Tasks; + +//namespace MyCode.Project.Domain.Message.Request.KingDee +//{ + + +// public class FSaleOrderEntry +// { +// /// +// /// 需要更新的字段，数组类型，格式：[key1,key2,...] （非必录） +// /// 注（更新字段时Model数据包中必须设置内码，若更新单据体字段还需设置分录内码） +// /// +// public List NeedUpDateFields { get; set; } +// /// +// /// 需返回结果的字段集合，数组类型，格式：[key,entitykey.key,...]（非必录） +// /// 注（返回单据体字段格式：entitykey.key） +// /// +// public List NeedReturnFields { get; set; } +// /// +// /// 是否删除已存在的分录，布尔类型，默认true（非必录） +// /// +// public string IsDeleteEntry { get; set; } +// /// +// /// 表单所在的子系统内码，字符串类型（非必录） +// /// +// public string SubSystemId { get; set; } +// /// +// /// 是否验证所有的基础资料有效性，布尔类，默认false（非必录） +// /// +// public bool IsVerifyBaseDataField { get; set; } +// /// +// /// 是否批量填充分录，默认true（非必录） +// /// +// public string IsEntryBatchFill { get; set; } +// /// +// /// 是否验证数据合法性标志，布尔类型，默认true（非必录） +// /// 注（设为false时不对数据合法性进行校验） +// /// +// public string ValidateFlag { get; set; } +// /// +// /// 是否用编码搜索基础资料，布尔类型，默认true（非必录） +// /// +// public string NumberSearch { get; set; } +// /// +// /// 是否自动调整JSON字段顺序，布尔类型，默认false（非必录） +// /// +// public string IsAutoAdjustField { get; set; } +// /// +// ///交互标志集合，字符串类型，分号分隔，格式："flag1;flag2;..."（非必录） +// ///例如（允许负库存标识：STK_InvCheckResult） +// /// +// public string InterationFlags { get; set; } +// /// +// /// 是否允许忽略交互，布尔类型，默认true（非必录） +// /// +// public string IgnoreInterationFlag { get; set; } +// /// +// /// 是否控制精度，为true时对金额、单价和数量字段进行精度验证，默认false（非必录） +// /// +// public string IsControlPrecision { get; set; } +// /// +// /// 表单数据包，JSON类型（必录） +// /// +// public Model Model { get; set; } +// } + +// public class FBillTypeID +// { +// /// +// /// +// /// +// public string FNUMBER { get; set; } +// } + +// public class FSaleOrgId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FCustId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FHeadDeliveryWay +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FReceiveId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FHEADLOCID +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FCorrespondOrgId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FSaleDeptId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FSaleGroupId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FSalerId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FSettleId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FReceiveContact +// { +// /// +// /// +// /// +// public string FNAME { get; set; } +// } + +// public class FChargeId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FSalePhaseID +// { +// /// +// /// +// /// +// public string FNUMBER { get; set; } +// } + +// public class FWarehouse +// { +// /// +// /// +// /// +// public string FNUMBER { get; set; } +// } + +// public class Foutlets +// { +// /// +// /// +// /// +// public string FNUMBER { get; set; } +// } + +// public class FSettleCurrId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FRecConditionId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FSettleModeId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FPriceListId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FDiscountListId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FExchangeTypeId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FSaleOrderFinance +// { +// /// +// /// +// /// +// public int FEntryId { get; set; } +// /// +// /// +// /// +// public FSettleCurrId FSettleCurrId { get; set; } +// /// +// /// +// /// +// public FRecConditionId FRecConditionId { get; set; } +// /// +// /// +// /// +// public string FIsPriceExcludeTax { get; set; } +// /// +// /// +// /// +// public FSettleModeId FSettleModeId { get; set; } +// /// +// /// +// /// +// public string FIsIncludedTax { get; set; } +// /// +// /// +// /// +// public FPriceListId FPriceListId { get; set; } +// /// +// /// +// /// +// public FDiscountListId FDiscountListId { get; set; } +// /// +// /// +// /// +// public FExchangeTypeId FExchangeTypeId { get; set; } +// /// +// /// +// /// +// public int FMarginLevel { get; set; } +// /// +// /// +// /// +// public int FMargin { get; set; } +// /// +// /// +// /// +// public string FOverOrgTransDirect { get; set; } +// /// +// /// +// /// +// public int FAllDisCount { get; set; } +// /// +// /// +// /// +// public string FRecBarcodeLink { get; set; } +// /// +// /// +// /// +// public int FXPKID_F { get; set; } +// } + +// public class FClauseId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FSaleOrderClauseItem +// { +// /// +// /// +// /// +// public int FEntryID { get; set; } +// /// +// /// +// /// +// public FClauseId FClauseId { get; set; } +// /// +// /// +// /// +// public string FClauseDesc { get; set; } +// /// +// /// +// /// +// public int FXPKID_C { get; set; } +// } + +// public class FMaterialGroup +// { +// /// +// /// +// /// +// public string FNUMBER { get; set; } +// } + +// public class FMaterialGroupByMat +// { +// /// +// /// +// /// +// public string FNUMBER { get; set; } +// } + +// public class FMapId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FMaterialId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FAUXPROPID__FF100001 +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FAuxPropId +// { +// /// +// /// +// /// +// public FAUXPROPID__FF100001 FAUXPROPID__FF100001 { get; set; } +// } + +// public class FParentMatId +// { +// /// +// /// +// /// +// public string FNUMBER { get; set; } +// } + +// public class FUnitID +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FPriceUnitId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FPurPriceUnitId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FTaxCombination +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FLot +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FStockOrgId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FSettleOrgIds +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FSupplyOrgId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FBomId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FOwnerId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FSOStockId +// { +// /// +// /// +// /// +// public string FNUMBER { get; set; } +// } + +// public class FSOStockLocalId +// { +// } + +// public class FStockUnitID +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FOutLmtUnitID +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FDetailLocId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FOrderEntryPlanItem +// { +// /// +// /// +// /// +// public int FDetailID { get; set; } +// /// +// /// +// /// +// public FDetailLocId FDetailLocId { get; set; } +// /// +// /// +// /// +// public string FDetailLocAddress { get; set; } +// /// +// /// +// /// +// public string FPlanDate { get; set; } +// /// +// /// +// /// +// public int FTransportLeadTime { get; set; } +// /// +// /// +// /// +// public int FPlanQty { get; set; } +// /// +// /// +// /// +// public int FXPKID_D { get; set; } +// } + +// public class FTaxDetailSubEntityItem +// { +// /// +// /// +// /// +// public int FDetailID { get; set; } +// /// +// /// +// /// +// public int FTaxRate { get; set; } +// /// +// /// +// /// +// public string FSellerWithholding { get; set; } +// /// +// /// +// /// +// public string FBuyerWithholding { get; set; } +// } + +// public class FSaleOrderEntryItem +// { +// /// +// /// +// /// +// public int FEntryID { get; set; } +// /// +// /// 退补类型 +// /// +// public string FReturnType { get; set; } +// /// +// /// 产品类型 +// /// +// public string FRowType { get; set; } +// /// +// /// 上级物料分组编码 +// /// +// public FMaterialGroup FMaterialGroup { get; set; } +// /// +// /// 物料分组编码 +// /// +// public FMaterialGroupByMat FMaterialGroupByMat { get; set; } +// /// +// /// +// /// +// public FMapId FMapId { get; set; } +// /// +// /// 物料编码 +// /// +// public FMaterialId FMaterialId { get; set; } +// /// +// /// 辅助属性 +// /// +// public FAuxPropId FAuxPropId { get; set; } +// /// +// /// 父项产品 +// /// +// public FParentMatId FParentMatId { get; set; } +// /// +// /// 销售单位 +// /// +// public FUnitID FUnitID { get; set; } +// /// +// /// 当前库存 +// /// +// public int FInventoryQty { get; set; } +// /// +// /// 可用库存 +// /// +// public int FCurrentInventory { get; set; } +// /// +// /// 待发数量 +// /// +// public int FAwaitQty { get; set; } +// /// +// /// 可发库存 +// /// +// public int FAvailableQty { get; set; } +// /// +// /// 销售数量 +// /// +// public int FQty { get; set; } +// /// +// /// 计价单位 +// /// +// public FPriceUnitId FPriceUnitId { get; set; } +// /// +// /// 原数量 +// /// +// public int FOldQty { get; set; } +// /// +// /// 采购计价单位 +// /// +// public FPurPriceUnitId FPurPriceUnitId { get; set; } +// /// +// /// 单价 +// /// +// public int FPrice { get; set; } +// /// +// /// 含税单价 +// /// +// public int FTaxPrice { get; set; } +// /// +// /// 是否赠品 +// /// +// public string FIsFree { get; set; } +// /// +// /// 税组合 +// /// +// public FTaxCombination FTaxCombination { get; set; } +// /// +// /// 税率% +// /// +// public int FEntryTaxRate { get; set; } +// /// +// /// 批号 +// /// +// public FLot FLot { get; set; } +// /// +// /// 生产日期 +// /// +// public string FProduceDate { get; set; } +// /// +// /// 保质期 +// /// +// public int FExpPeriod { get; set; } +// /// +// /// 保质期单位 +// /// +// public string FExpUnit { get; set; } +// /// +// /// 有效期至 +// /// +// public string FExpiryDate { get; set; } +// /// +// /// 折扣率% +// /// +// public int FDiscountRate { get; set; } +// /// +// /// 单价折扣 +// /// +// public int FPriceDiscount { get; set; } +// /// +// /// 最新采购入库价 +// /// +// public int FInStockPrice { get; set; } +// /// +// /// 要货日期 +// /// +// public string FDeliveryDate { get; set; } +// /// +// /// 库存组织 +// /// +// public FStockOrgId FStockOrgId { get; set; } +// /// +// /// 结算组织 +// /// +// public FSettleOrgIds FSettleOrgIds { get; set; } +// /// +// /// 供应组织 +// /// +// public FSupplyOrgId FSupplyOrgId { get; set; } +// /// +// /// BOM版本 +// /// +// public FBomId FBomId { get; set; } +// /// +// /// 货主类型 +// /// +// public string FOwnerTypeId { get; set; } +// /// +// /// 货主 +// /// +// public FOwnerId FOwnerId { get; set; } +// /// +// /// 仓库 +// /// +// public FSOStockId FSOStockId { get; set; } +// /// +// /// 仓位 +// /// +// public FSOStockLocalId FSOStockLocalId { get; set; } +// /// +// /// 备注 +// /// +// public string FEntryNote { get; set; } +// /// +// /// 预留类型 +// /// +// public string FReserveType { get; set; } +// /// +// /// 需求优先级 +// /// +// public int FPriority { get; set; } +// /// +// /// 计划跟踪号 +// /// +// public string FMtoNo { get; set; } +// /// +// /// 促销匹配类型 +// /// +// public string FPromotionMatchType { get; set; } +// /// +// /// 供应商协同平台订单分录ID +// /// +// public int FNetOrderEntryId { get; set; } +// /// +// /// 计价基本数量 +// /// +// public int FPriceBaseQty { get; set; } +// /// +// /// 库存单位 +// /// +// public FStockUnitID FStockUnitID { get; set; } +// /// +// /// 库存数量 +// /// +// public int FStockQty { get; set; } +// /// +// /// 库存基本数量 +// /// +// public int FStockBaseQty { get; set; } +// /// +// /// 服务上下文 +// /// +// public string FServiceContext { get; set; } +// /// +// /// 超发控制单位类型 +// /// +// public string FOUTLMTUNIT { get; set; } +// /// +// /// 超发控制单位 +// /// +// public FOutLmtUnitID FOutLmtUnitID { get; set; } +// /// +// /// 返利前价格 +// /// +// public int FOldTaxPrice { get; set; } +// /// +// /// 返利前金额 +// /// +// public int FOldAmount { get; set; } +// /// +// /// 返利前价税合计 +// /// +// public int FOldAllAmount { get; set; } +// /// +// /// 已预留 +// /// +// public string FISMRP { get; set; } +// /// +// /// 返利前折扣率 +// /// +// public int FOldDiscountRate { get; set; } +// /// +// /// 返利前折扣额 +// /// +// public int FOldDiscount { get; set; } +// /// +// /// 返利折扣率 +// /// +// public int FRPDiscountRate { get; set; } +// /// +// /// 促销政策ID +// /// +// public string FSPMENTRYID { get; set; } +// /// +// /// FSPMANDRPMCONTENT +// /// +// public string FSPMANDRPMCONTENT { get; set; } +// /// +// /// 促销内容 +// /// +// public string FSKU { get; set; } +// /// +// /// +// /// +// public string Fcode { get; set; } +// /// +// /// +// /// +// public int FSixundiscount { get; set; } +// /// +// /// +// /// +// public string Fcolour { get; set; } +// /// +// /// +// /// +// public int FBOMEntryId { get; set; } +// /// +// /// +// /// +// public int FAllAmountExceptDisCount { get; set; } +// /// +// /// 变更单主键 +// /// +// public int FXPKID { get; set; } +// /// +// /// 交货明细 +// /// +// public List FOrderEntryPlan { get; set; } +// /// +// /// 税务明细 +// /// +// public List FTaxDetailSubEntity { get; set; } +// } + +// public class FReceiveType +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FPlanMaterialId +// { +// /// +// /// +// /// +// public string FNUMBER { get; set; } +// } + +// public class FMaterialPriceUnitID +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FPESettleOrgId +// { +// /// +// /// +// /// +// public string FNumber { get; set; } +// } + +// public class FSaleOrderPlanEntryItem +// { +// /// +// /// +// /// +// public int FDETAILID { get; set; } +// /// +// /// +// /// +// public int FOverRecAmount_D { get; set; } +// /// +// /// +// /// +// public FPESettleOrgId FPESettleOrgId { get; set; } +// /// +// /// +// /// +// public int FXPKID_RE { get; set; } +// } + +// public class FSaleOrderPlanItem +// { +// /// +// /// +// /// +// public int FEntryID { get; set; } +// /// +// /// +// /// +// public string FNeedRecAdvance { get; set; } +// /// +// /// +// /// +// public FReceiveType FReceiveType { get; set; } +// /// +// /// +// /// +// public int FRecAdvanceRate { get; set; } +// /// +// /// +// /// +// public int FRecAdvanceAmount { get; set; } +// /// +// /// +// /// +// public string FMustDate { get; set; } +// /// +// /// +// /// +// public string FRelBillNo { get; set; } +// /// +// /// +// /// +// public int FRecAmount { get; set; } +// /// +// /// +// /// +// public string FControlSend { get; set; } +// /// +// /// +// /// +// public string FIsOutStockByRecamount { get; set; } +// /// +// /// +// /// +// public int FOverRecAmount { get; set; } +// /// +// /// +// /// +// public string FReMark { get; set; } +// /// +// /// +// /// +// public FPlanMaterialId FPlanMaterialId { get; set; } +// /// +// /// +// /// +// public int FMaterialSeq { get; set; } +// /// +// /// +// /// +// public string FMaterialRowID { get; set; } +// /// +// /// +// /// +// public int FOrderEntryId { get; set; } +// /// +// /// +// /// +// public int FMaterialTaxPrice { get; set; } +// /// +// /// +// /// +// public int FMaterialPriceUnitQty { get; set; } +// /// +// /// +// /// +// public FMaterialPriceUnitID FMaterialPriceUnitID { get; set; } +// /// +// /// +// /// +// public int FXPKID_R { get; set; } +// /// +// /// +// /// +// public List FSaleOrderPlanEntry { get; set; } +// } + +// public class FLogComId +// { +// /// +// /// +// /// +// public string FCODE { get; set; } +// } + +// public class FSalOrderTraceDetailItem +// { +// /// +// /// +// /// +// public int FDetailID { get; set; } +// /// +// /// +// /// +// public string FTraceTime { get; set; } +// /// +// /// +// /// +// public string FTraceDetail { get; set; } +// } + +// public class FSalOrderTraceItem +// { +// /// +// /// +// /// +// public int FEntryID { get; set; } +// /// +// /// +// /// +// public FLogComId FLogComId { get; set; } +// /// +// /// +// /// +// public string FCarryBillNo { get; set; } +// /// +// /// +// /// +// public string FPhoneNumber { get; set; } +// /// +// /// +// /// +// public string FFrom { get; set; } +// /// +// /// +// /// +// public string FTo { get; set; } +// /// +// /// +// /// +// public string FDelTime { get; set; } +// /// +// /// +// /// +// public string FTraceStatus { get; set; } +// /// +// /// +// /// +// public string FReceiptTime { get; set; } +// /// +// /// +// /// +// public List FSalOrderTraceDetail { get; set; } +// } + +// public class Model +// { +// /// +// /// +// /// +// public int FID { get; set; } +// /// +// /// 单据类型 +// /// +// public FBillTypeID FBillTypeID { get; set; } +// /// +// /// 单据编号 +// /// +// public string FBillNo { get; set; } +// /// +// /// 日期 +// /// +// public string FDate { get; set; } +// /// +// /// 销售组织 +// /// +// public FSaleOrgId FSaleOrgId { get; set; } +// /// +// /// 客户 +// /// +// public FCustId FCustId { get; set; } +// /// +// /// 交货方式 +// /// +// public FHeadDeliveryWay FHeadDeliveryWay { get; set; } +// /// +// /// 收货方 +// /// +// public FReceiveId FReceiveId { get; set; } +// /// +// /// 交货地点 +// /// +// public FHEADLOCID FHEADLOCID { get; set; } +// /// +// /// 对应组织 +// /// +// public FCorrespondOrgId FCorrespondOrgId { get; set; } +// /// +// /// 销售部门 +// /// +// public FSaleDeptId FSaleDeptId { get; set; } +// /// +// /// 销售组 +// /// +// public FSaleGroupId FSaleGroupId { get; set; } +// /// +// /// 销售员 +// /// +// public FSalerId FSalerId { get; set; } +// /// +// /// 收货方地址 +// /// +// public string FReceiveAddress { get; set; } +// /// +// /// 结算方 +// /// +// public FSettleId FSettleId { get; set; } +// /// +// /// 收货方联系人 +// /// +// public FReceiveContact FReceiveContact { get; set; } +// /// +// /// 付款方 +// /// +// public FChargeId FChargeId { get; set; } +// /// +// /// 移动销售订单编号 +// /// +// public string FNetOrderBillNo { get; set; } +// /// +// /// 移动销售订单ID +// /// +// public int FNetOrderBillId { get; set; } +// /// +// /// 商机内码 +// /// +// public int FOppID { get; set; } +// /// +// /// 销售阶段 +// /// +// public FSalePhaseID FSalePhaseID { get; set; } +// /// +// /// 是否期初单据 +// /// +// public string FISINIT { get; set; } +// /// +// /// 备注 +// /// +// public string FNote { get; set; } +// /// +// /// +// /// +// public string FIsMobile { get; set; } +// /// +// /// 订单来源 +// /// +// public string FSOFrom { get; set; } +// /// +// /// 合同类型 +// /// +// public string FContractType { get; set; } +// /// +// /// 销售合同内码 +// /// +// public int FContractId { get; set; } +// /// +// /// 生成受托加工材料清单 +// /// +// public string FIsUseOEMBomPush { get; set; } +// /// +// /// +// /// +// public FWarehouse FWarehouse { get; set; } +// /// +// /// +// /// +// public Foutlets Foutlets { get; set; } +// /// +// /// +// /// +// public string FOrdertype { get; set; } +// /// +// /// 变更单主键 +// /// +// public int FXPKID_H { get; set; } +// /// +// /// +// /// +// public string FPushType { get; set; } +// /// +// /// 关闭原因 +// /// +// public string FCloseReason { get; set; } +// /// +// /// 生成分销采购订单 +// /// +// public string FIsUseDrpSalePOPush { get; set; } +// /// +// /// +// /// +// public string FAutoShip { get; set; } +// /// +// /// +// /// +// public string FIsOutStock { get; set; } +// /// +// /// 财务信息 +// /// +// public FSaleOrderFinance FSaleOrderFinance { get; set; } +// /// +// /// 订单条款 +// /// +// public List FSaleOrderClause { get; set; } +// /// +// /// 订单明细 +// /// +// public List FSaleOrderEntry { get; set; } +// /// +// /// 收款计划 +// /// +// public List FSaleOrderPlan { get; set; } +// /// +// /// 物流跟踪明细 +// /// +// public List FSalOrderTrace { get; set; } +// } + + +//} diff --git a/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/FSaleOrderEntry.cs b/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/SaleOrderModel.cs similarity index 90% rename from Reportapi/MyCode.Project.Domain/Message/Request/KingDee/FSaleOrderEntry.cs rename to Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/SaleOrderModel.cs index 5a545dc..96ba1a0 100644 --- a/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/FSaleOrderEntry.cs +++ b/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/SaleOrderModel.cs @@ -1,4 +1,5 @@ -using System; +using MyCode.Project.Domain.Message.Request.KingDee.SaveModel; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -6,68 +7,179 @@ using System.Threading.Tasks; namespace MyCode.Project.Domain.Message.Request.KingDee { - - - public class FSaleOrderEntry + public class SaleOrderModel : BaseModel { /// - /// 需要更新的字段，数组类型，格式：[key1,key2,...] （非必录） - /// 注（更新字段时Model数据包中必须设置内码，若更新单据体字段还需设置分录内码） + /// /// - public List NeedUpDateFields { get; set; } + public int FID { get; set; } /// - /// 需返回结果的字段集合，数组类型，格式：[key,entitykey.key,...]（非必录） - /// 注（返回单据体字段格式：entitykey.key） + /// 单据类型 /// - public List NeedReturnFields { get; set; } + public FBillTypeID FBillTypeID { get; set; } /// - /// 是否删除已存在的分录，布尔类型，默认true（非必录） + /// 单据编号 /// - public string IsDeleteEntry { get; set; } + public string FBillNo { get; set; } /// - /// 表单所在的子系统内码，字符串类型（非必录） + /// 日期 /// - public string SubSystemId { get; set; } + public string FDate { get; set; } /// - /// 是否验证所有的基础资料有效性，布尔类，默认false（非必录） + /// 销售组织 /// - public bool IsVerifyBaseDataField { get; set; } + public FSaleOrgId FSaleOrgId { get; set; } /// - /// 是否批量填充分录，默认true（非必录） + /// 客户 /// - public string IsEntryBatchFill { get; set; } + public FCustId FCustId { get; set; } /// - /// 是否验证数据合法性标志，布尔类型，默认true（非必录） - /// 注（设为false时不对数据合法性进行校验） + /// 交货方式 /// - public string ValidateFlag { get; set; } + public FHeadDeliveryWay FHeadDeliveryWay { get; set; } /// - /// 是否用编码搜索基础资料，布尔类型，默认true（非必录） + /// 收货方 /// - public string NumberSearch { get; set; } + public FReceiveId FReceiveId { get; set; } /// - /// 是否自动调整JSON字段顺序，布尔类型，默认false（非必录） + /// 交货地点 /// - public string IsAutoAdjustField { get; set; } + public FHEADLOCID FHEADLOCID { get; set; } /// - ///交互标志集合，字符串类型，分号分隔，格式："flag1;flag2;..."（非必录） - ///例如（允许负库存标识：STK_InvCheckResult） + /// 对应组织 /// - public string InterationFlags { get; set; } + public FCorrespondOrgId FCorrespondOrgId { get; set; } /// - /// 是否允许忽略交互，布尔类型，默认true（非必录） + /// 销售部门 /// - public string IgnoreInterationFlag { get; set; } + public FSaleDeptId FSaleDeptId { get; set; } /// - /// 是否控制精度，为true时对金额、单价和数量字段进行精度验证，默认false（非必录） + /// 销售组 /// - public string IsControlPrecision { get; set; } + public FSaleGroupId FSaleGroupId { get; set; } /// - /// 表单数据包，JSON类型（必录） + /// 销售员 /// - public Model Model { get; set; } + public FSalerId FSalerId { get; set; } + /// + /// 收货方地址 + /// + public string FReceiveAddress { get; set; } + /// + /// 结算方 + /// + public FSettleId FSettleId { get; set; } + /// + /// 收货方联系人 + /// + public FReceiveContact FReceiveContact { get; set; } + /// + /// 付款方 + /// + public FChargeId FChargeId { get; set; } + /// + /// 移动销售订单编号 + /// + public string FNetOrderBillNo { get; set; } + /// + /// 移动销售订单ID + /// + public int FNetOrderBillId { get; set; } + /// + /// 商机内码 + /// + public int FOppID { get; set; } + /// + /// 销售阶段 + /// + public FSalePhaseID FSalePhaseID { get; set; } + /// + /// 是否期初单据 + /// + public string FISINIT { get; set; } + /// + /// 备注 + /// + public string FNote { get; set; } + /// + /// + /// + public string FIsMobile { get; set; } + /// + /// 订单来源 + /// + public string FSOFrom { get; set; } + /// + /// 合同类型 + /// + public string FContractType { get; set; } + /// + /// 销售合同内码 + /// + public int FContractId { get; set; } + /// + /// 生成受托加工材料清单 + /// + public string FIsUseOEMBomPush { get; set; } + /// + /// + /// + public FWarehouse FWarehouse { get; set; } + /// + /// + /// + public Foutlets Foutlets { get; set; } + /// + /// + /// + public string FOrdertype { get; set; } + /// + /// 变更单主键 + /// + public int FXPKID_H { get; set; } + /// + /// + /// + public string FPushType { get; set; } + /// + /// 关闭原因 + /// + public string FCloseReason { get; set; } + /// + /// 生成分销采购订单 + /// + public string FIsUseDrpSalePOPush { get; set; } + /// + /// + /// + public string FAutoShip { get; set; } + /// + /// + /// + public string FIsOutStock { get; set; } + /// + /// 财务信息 + /// + public FSaleOrderFinance FSaleOrderFinance { get; set; } + /// + /// 订单条款 + /// + public List FSaleOrderClause { get; set; } + /// + /// 订单明细 + /// + public List FSaleOrderEntry { get; set; } + /// + /// 收款计划 + /// + public List FSaleOrderPlan { get; set; } + /// + /// 物流跟踪明细 + /// + public List FSalOrderTrace { get; set; } } + public class FBillTypeID { /// @@ -1055,178 +1167,4 @@ namespace MyCode.Project.Domain.Message.Request.KingDee /// public List FSalOrderTraceDetail { get; set; } } - - public class Model - { - /// - /// - /// - public int FID { get; set; } - /// - /// 单据类型 - /// - public FBillTypeID FBillTypeID { get; set; } - /// - /// 单据编号 - /// - public string FBillNo { get; set; } - /// - /// 日期 - /// - public string FDate { get; set; } - /// - /// 销售组织 - /// - public FSaleOrgId FSaleOrgId { get; set; } - /// - /// 客户 - /// - public FCustId FCustId { get; set; } - /// - /// 交货方式 - /// - public FHeadDeliveryWay FHeadDeliveryWay { get; set; } - /// - /// 收货方 - /// - public FReceiveId FReceiveId { get; set; } - /// - /// 交货地点 - /// - public FHEADLOCID FHEADLOCID { get; set; } - /// - /// 对应组织 - /// - public FCorrespondOrgId FCorrespondOrgId { get; set; } - /// - /// 销售部门 - /// - public FSaleDeptId FSaleDeptId { get; set; } - /// - /// 销售组 - /// - public FSaleGroupId FSaleGroupId { get; set; } - /// - /// 销售员 - /// - public FSalerId FSalerId { get; set; } - /// - /// 收货方地址 - /// - public string FReceiveAddress { get; set; } - /// - /// 结算方 - /// - public FSettleId FSettleId { get; set; } - /// - /// 收货方联系人 - /// - public FReceiveContact FReceiveContact { get; set; } - /// - /// 付款方 - /// - public FChargeId FChargeId { get; set; } - /// - /// 移动销售订单编号 - /// - public string FNetOrderBillNo { get; set; } - /// - /// 移动销售订单ID - /// - public int FNetOrderBillId { get; set; } - /// - /// 商机内码 - /// - public int FOppID { get; set; } - /// - /// 销售阶段 - /// - public FSalePhaseID FSalePhaseID { get; set; } - /// - /// 是否期初单据 - /// - public string FISINIT { get; set; } - /// - /// 备注 - /// - public string FNote { get; set; } - /// - /// - /// - public string FIsMobile { get; set; } - /// - /// 订单来源 - /// - public string FSOFrom { get; set; } - /// - /// 合同类型 - /// - public string FContractType { get; set; } - /// - /// 销售合同内码 - /// - public int FContractId { get; set; } - /// - /// 生成受托加工材料清单 - /// - public string FIsUseOEMBomPush { get; set; } - /// - /// - /// - public FWarehouse FWarehouse { get; set; } - /// - /// - /// - public Foutlets Foutlets { get; set; } - /// - /// - /// - public string FOrdertype { get; set; } - /// - /// 变更单主键 - /// - public int FXPKID_H { get; set; } - /// - /// - /// - public string FPushType { get; set; } - /// - /// 关闭原因 - /// - public string FCloseReason { get; set; } - /// - /// 生成分销采购订单 - /// - public string FIsUseDrpSalePOPush { get; set; } - /// - /// - /// - public string FAutoShip { get; set; } - /// - /// - /// - public string FIsOutStock { get; set; } - /// - /// 财务信息 - /// - public FSaleOrderFinance FSaleOrderFinance { get; set; } - /// - /// 订单条款 - /// - public List FSaleOrderClause { get; set; } - /// - /// 订单明细 - /// - public List FSaleOrderEntry { get; set; } - /// - /// 收款计划 - /// - public List FSaleOrderPlan { get; set; } - /// - /// 物流跟踪明细 - /// - public List FSalOrderTrace { get; set; } - } - - } diff --git a/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj b/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj index 91b08f7..cbffc45 100644 --- a/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj +++ b/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj @@ -9,7 +9,7 @@ Properties MyCode.Project.Domain MyCode.Project.Domain - v4.6.1 + v4.8 512 ..\ true @@ -67,7 +67,9 @@ - + + + diff --git a/Reportapi/MyCode.Project.GenerateCode/App.config b/Reportapi/MyCode.Project.GenerateCode/App.config index 35fc290..5a956c8 100644 --- a/Reportapi/MyCode.Project.GenerateCode/App.config +++ b/Reportapi/MyCode.Project.GenerateCode/App.config @@ -1,45 +1,45 @@ - + -
+
- - + + - + - + - + - + - + - + - + - + - + - + - + - - - + + + @@ -61,106 +61,106 @@ - + - + - + - + - + - + - + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/Reportapi/MyCode.Project.GenerateCode/MyCode.Project.GenerateCode.csproj b/Reportapi/MyCode.Project.GenerateCode/MyCode.Project.GenerateCode.csproj index ce7184d..6f8f56d 100644 --- a/Reportapi/MyCode.Project.GenerateCode/MyCode.Project.GenerateCode.csproj +++ b/Reportapi/MyCode.Project.GenerateCode/MyCode.Project.GenerateCode.csproj @@ -8,7 +8,7 @@ Exe MyCode.Project.GenerateCode MyCode.Project.GenerateCode - v4.6.1 + v4.8 512 true diff --git a/Reportapi/MyCode.Project.Infrastructure/MyCode.Project.Infrastructure.csproj b/Reportapi/MyCode.Project.Infrastructure/MyCode.Project.Infrastructure.csproj index 14c2761..8a89419 100644 --- a/Reportapi/MyCode.Project.Infrastructure/MyCode.Project.Infrastructure.csproj +++ b/Reportapi/MyCode.Project.Infrastructure/MyCode.Project.Infrastructure.csproj @@ -9,7 +9,7 @@ Properties MyCode.Project.Infrastructure MyCode.Project.Infrastructure - v4.6.1 + v4.8 512 ..\ true diff --git a/Reportapi/MyCode.Project.Infrastructure/app.config b/Reportapi/MyCode.Project.Infrastructure/app.config index e46a897..4769706 100644 --- a/Reportapi/MyCode.Project.Infrastructure/app.config +++ b/Reportapi/MyCode.Project.Infrastructure/app.config @@ -1,32 +1,32 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/Reportapi/MyCode.Project.OutSideService/IKingDeeService.cs b/Reportapi/MyCode.Project.OutSideService/IKingDeeService.cs new file mode 100644 index 0000000..228e03f --- /dev/null +++ b/Reportapi/MyCode.Project.OutSideService/IKingDeeService.cs @@ -0,0 +1,17 @@ +using MyCode.Project.Domain.Message.Request.KingDee; + +namespace MyCode.Project.OutSideService +{ + public interface IKingDeeService + { + /// + /// 保存一个订单对象 + /// + /// + /// + /// + string Save(string formId, BillSave billSave); + + + } +} diff --git a/Reportapi/MyCode.Project.OutSideService/Implementation/KingDeeService.cs b/Reportapi/MyCode.Project.OutSideService/Implementation/KingDeeService.cs index 5c29c57..1dbe892 100644 --- a/Reportapi/MyCode.Project.OutSideService/Implementation/KingDeeService.cs +++ b/Reportapi/MyCode.Project.OutSideService/Implementation/KingDeeService.cs @@ -9,7 +9,7 @@ using System.Linq; namespace MyCode.Project.OutSideService.Implementation { - public class KingDeeService //: IKingDeeService + public class KingDeeService : IKingDeeService { public KingDeeService() { diff --git a/Reportapi/MyCode.Project.OutSideService/MyCode.Project.OutSideService.csproj b/Reportapi/MyCode.Project.OutSideService/MyCode.Project.OutSideService.csproj index 18a91c3..dfb5e77 100644 --- a/Reportapi/MyCode.Project.OutSideService/MyCode.Project.OutSideService.csproj +++ b/Reportapi/MyCode.Project.OutSideService/MyCode.Project.OutSideService.csproj @@ -9,7 +9,7 @@ Properties MyCode.Project.OutSideService MyCode.Project.OutSideService - v4.6.1 + v4.8 512 @@ -109,6 +109,7 @@ + diff --git a/Reportapi/MyCode.Project.OutSideService/app.config b/Reportapi/MyCode.Project.OutSideService/app.config index 62fa261..9e1cbb7 100644 --- a/Reportapi/MyCode.Project.OutSideService/app.config +++ b/Reportapi/MyCode.Project.OutSideService/app.config @@ -1,28 +1,28 @@ - + - - + + - - + + - - + + - - + + - - + + - + diff --git a/Reportapi/MyCode.Project.Repositories/App.config b/Reportapi/MyCode.Project.Repositories/App.config index 5172969..3c691af 100644 --- a/Reportapi/MyCode.Project.Repositories/App.config +++ b/Reportapi/MyCode.Project.Repositories/App.config @@ -1,32 +1,32 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/Reportapi/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj b/Reportapi/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj index 523df13..b05c01a 100644 --- a/Reportapi/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj +++ b/Reportapi/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj @@ -9,7 +9,7 @@ Properties MyCode.Project.Repositories MyCode.Project.Repositories - v4.6.1 + v4.8 512 ..\ true diff --git a/Reportapi/MyCode.Project.ScheduleTask/App.config b/Reportapi/MyCode.Project.ScheduleTask/App.config index 226c3f0..073e12c 100644 --- a/Reportapi/MyCode.Project.ScheduleTask/App.config +++ b/Reportapi/MyCode.Project.ScheduleTask/App.config @@ -1,4 +1,4 @@ - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -72,142 +70,142 @@ --> - - - + + + - + - - - + + + - - - - + + + + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/Reportapi/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj b/Reportapi/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj index 024e308..b092af4 100644 --- a/Reportapi/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj +++ b/Reportapi/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj @@ -9,7 +9,7 @@ Properties MyCode.Project.ScheduleTask MyCode.Project.ScheduleTask - v4.6.1 + v4.8 512 diff --git a/Reportapi/MyCode.Project.Services/App.config b/Reportapi/MyCode.Project.Services/App.config index e46a897..4769706 100644 --- a/Reportapi/MyCode.Project.Services/App.config +++ b/Reportapi/MyCode.Project.Services/App.config @@ -1,32 +1,32 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/Reportapi/MyCode.Project.Services/IServices/IOrderPushService.cs b/Reportapi/MyCode.Project.Services/IServices/IOrderPushService.cs new file mode 100644 index 0000000..37ca835 --- /dev/null +++ b/Reportapi/MyCode.Project.Services/IServices/IOrderPushService.cs @@ -0,0 +1,14 @@ +using MyCode.Project.Domain.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MyCode.Project.Services.IServices +{ + internal interface IOrderPushService + { + void PushOrderToKingDee(PushKingDeeOrder pushKingDeeOrder1); + } +} diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs index 09bf055..ec91370 100644 --- a/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs +++ b/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs @@ -1,4 +1,5 @@ using MyCode.Project.Domain.Message.Response.JackYun; +using MyCode.Project.Domain.Message.Response.JackYun; using MyCode.Project.Domain.Model; using MyCode.Project.Domain.Repositories; using MyCode.Project.Infrastructure.Common; diff --git a/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs b/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs new file mode 100644 index 0000000..6b37355 --- /dev/null +++ b/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs @@ -0,0 +1,224 @@ +using MyCode.Project.Domain.Message.Request.KingDee; +using MyCode.Project.Domain.Message.Response.JackYun; +using MyCode.Project.Domain.Model; +using MyCode.Project.Domain.Repositories; +using MyCode.Project.Infrastructure.Common; +using MyCode.Project.Infrastructure.Exceptions; +using MyCode.Project.Infrastructure.JackYun; +using MyCode.Project.OutSideService; +using MyCode.Project.Repositories; +using MyCode.Project.Repositories.Common; +using MyCode.Project.Services.IServices; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MyCode.Project.Services.Implementation +{ + public class OrderPushService : IOrderPushService //, IOrderPushService + { + private IJackYunService _jackYunService; + private IJackOrdersRepository _jackOrdersRepository; + private IJackOrdersItemRepository _jackOrdersItemRepository; + private IPushKingDeeOrderRepository _pushKingDeeOrderRepository; + private IPushKingDeeOrderItemRepository _pushKingDeeOrderItemRepository; + private IYTKJTShopParameterRepository _yTKJTShopParameterRepository; + private IKingDeeService _kingDeeService; + + public OrderPushService(IJackOrdersRepository jackOrdersRepository + , IJackOrdersItemRepository jackOrdersItemRepository + , IPushKingDeeOrderRepository pushKingDeeOrderRepository + , IPushKingDeeOrderItemRepository pushKingDeeOrderItemRepository + , IYTKJTShopParameterRepository yTKJTShopParameterRepository + , IJackYunService jackYunService + , IKingDeeService kingDeeService) + { + _yTKJTShopParameterRepository = yTKJTShopParameterRepository; + _pushKingDeeOrderRepository = pushKingDeeOrderRepository; + _pushKingDeeOrderItemRepository = pushKingDeeOrderItemRepository; + _jackOrdersRepository = jackOrdersRepository; + _jackOrdersItemRepository = jackOrdersItemRepository; + _jackYunService = jackYunService; + _kingDeeService = kingDeeService; + } + + + #region SetOrder(把吉客云订单存进本地数据库) + /// + /// 把吉客云订单存进本地数据库 + /// + /// + [TransactionCallHandler] + public void SetOrder(List trades) + { + var ids = trades.Select(t => t.tradeId).Distinct().ToList(); + ids = _jackOrdersRepository.Queryable().Where(t => ids.Contains(t.TradeId)).Select(t => t.TradeId).Distinct().ToList(); + if (ids.Count > 0) + trades = trades.Where(t => !ids.Contains(t.tradeId)).ToList(); + List jackOrdersList = new List(); + List ordersItemList = new List(); + trades.ForEach(t => + { + JackOrders jackOrders = new JackOrders(); + jackOrders = AutoMapperHelper.AutoMappToSingle(t); + jackOrders.Id = Guid.NewGuid(); + jackOrders.Status = 0; + jackOrders.UpdateTime = DateTime.Now; + jackOrders.CreateTime = DateTime.Now; + if (t.goodsDetail != null) + { + var items = AutoMapperHelper.AutoMappToList(t.goodsDetail); + items.ForEach(k => + { + k.JackOrdersId = jackOrders.Id; + }); + jackOrdersList.Add(jackOrders); + ordersItemList.AddRange(items); + } + + }); + + if (jackOrdersList.Count > 0) + { + _jackOrdersRepository.Add(jackOrdersList); + _jackOrdersItemRepository.Add(ordersItemList); + } + } + #endregion + + #region GetAndMergeJackYunOrder(合并吉客云订单到新表) + /// + /// 合并吉客云订单到新表 + /// + /// + [TransactionCallHandler] + public string GetAndMergeJackYunOrder(string now) + { + var list = _jackOrdersItemRepository.GetPushOrder(); + List mesg = new List(); + + var shopParemList = _yTKJTShopParameterRepository.Queryable().Where(t => t.FDOCUMENTSTATUS == "C").ToList(); + List pushKingDeeOrderItems = new List(); + List pushKingDeeOrders = new List(); + list.ForEach(sheet => + { + if (pushKingDeeOrders.Where(t => t.ShopId == sheet.ShopId && t.WarehouseId == sheet.WarehouseId).Count() > 0) + { + return; + } + PushKingDeeOrder pushKingDeeOrder = new PushKingDeeOrder(); + pushKingDeeOrder = AutoMapperHelper.AutoMappToSingle(sheet); + pushKingDeeOrder.Id = Guid.NewGuid(); + pushKingDeeOrders.Add(pushKingDeeOrder); + + var tempList = list.Where(t => t.ShopId == sheet.ShopId && t.WarehouseId == sheet.WarehouseId).ToList(); + tempList.ForEach(item => + { + PushKingDeeOrderItem pushKingDeeOrderItem = new PushKingDeeOrderItem(); + pushKingDeeOrderItem = AutoMapperHelper.AutoMappToSingle(item); + pushKingDeeOrderItem.PushKingDeeOrderId = pushKingDeeOrder.Id; + pushKingDeeOrderItem.Id = Guid.NewGuid(); + pushKingDeeOrderItems.Add(pushKingDeeOrderItem); + }); + //var shopParem = shopParemList.Where(h => h.FSHOPCODE == sheet.ShopId.Value.ToString()&& h.FWAREHOUSE.Value.ToString()==sheet.WarehouseId ).FirstOrDefault(); + //if (shopParem != null) + //{ + //} + //else + //{ + // mesg.Add($@"店铺{sheet.ShopName}没有配置店铺参数或者配置的仓库不是 {sheet.WarehouseCode}"); + //} + }); + if (pushKingDeeOrders.Count > 0) + { + var oldList = _jackOrdersRepository.Queryable().Where(t => t.Status == 0).ToList(); + oldList.ForEach(t => + { + if (pushKingDeeOrders.Count(h => h.ShopId == t.ShopId && t.WarehouseId == h.WarehouseId) > 0) + { + t.Status = 1; + t.UpdateTime = DateTime.Now; + } + }); + oldList = oldList.Where(t => t.Status == 1).ToList(); + _jackOrdersRepository.Update(oldList); + _pushKingDeeOrderRepository.Add(pushKingDeeOrders); + _pushKingDeeOrderItemRepository.Add(pushKingDeeOrderItems); + } + + return JsonHelper.ToJson(list); + } + #endregion + + public void PushOrderToKingDee(PushKingDeeOrder pushKingDeeOrder1) + { + var orderSHeet = _pushKingDeeOrderRepository.Queryable().Where(t => pushKingDeeOrder1.Id == t.Id).First(); + if (orderSHeet.Status != 0) + { + throw new BaseException(""); + } + var itemList = _pushKingDeeOrderItemRepository.Queryable().Where(t => pushKingDeeOrder1.Id == t.PushKingDeeOrderId).ToList(); + var one = _yTKJTShopParameterRepository.Queryable().Where(t => t.FSHOPCODE == orderSHeet.ShopCode).First(); + // TODO 如果是False则同步到云星空销售订单 + if (one.FSYNCHRONIZEWMS == "0") + { + // 遍历单体，构造单据体实体 + var entryList = itemList.Select(n => new FSaleOrderEntryItem() + { + Fcode = n.Barcode, // 条码带出物料 、物料带出税额 + FQty = n.SellCount, // 销售数量 + + }).ToList(); + // 构建单据数据包 + var model = new SaleOrderModel() + { + FID = 0, // 新增 + FBillTypeID = new FBillTypeID() + { + // 1：零售业务7：售后发货；8：售后退货 + FNUMBER = orderSHeet.TradeType == 8 ? "XSDD05_SYS" : "XSDD01_SYS" + }, + FOrdertype = orderSHeet.TradeType == 8 ? "8" : "4", + FDate = orderSHeet.CreateTime?.ToString("yyyy/MM/dd"), + FSaleOrgId = new FSaleOrgId() + { + FNumber = "" // 固定组织 + }, + FCustId = new FCustId() + { + FNumber = "", // 客户？ + }, + FSalerId = new FSalerId() + { + FNumber = "", // 销售员 + }, + Foutlets = new Foutlets() + { + FNUMBER = orderSHeet.ShopCode, // 门店编码 + }, + FWarehouse = new FWarehouse() + { + FNUMBER = orderSHeet.WarehouseCode, // 仓库编码 + }, + FSaleOrderEntry = entryList + }; + BillSave billSave = new BillSave() + { + Model = model + }; + SaleOrderModel fSaleOrderEntry = new SaleOrderModel(); + + var resultString = _kingDeeService.Save("SAL_SaleOrder", billSave); + LogHelper.Info(resultString); + } + // 如果为True则同步到WMS + else + { + //wms + + } + } + } +} diff --git a/Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj b/Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj index 2a4bfd9..108c7be 100644 --- a/Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj +++ b/Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj @@ -12,7 +12,7 @@ Properties MyCode.Project.Services MyCode.Project.Services - v4.6.1 + v4.8 @@ -116,6 +116,7 @@ + @@ -125,6 +126,7 @@ + diff --git a/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs b/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs index 3df8529..e5cb9ca 100644 --- a/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs +++ b/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs @@ -13,18 +13,32 @@ namespace MyCode.Project.WebApi.Controllers /// public class TestController : BaseAPIController { - + private IJackYunTaskService _jackYunTaskService; private IWMSService _wMSService; private IJackYunStockinService _jackYunStockinService; + private IOrderPushService _orderPushService; - public TestController(IJackYunTaskService jackYunTaskService, IWMSService wMSService , IJackYunStockinService jackYunStockinService) + public TestController(IJackYunTaskService jackYunTaskService, IWMSService wMSService, IJackYunStockinService jackYunStockinService) { _jackYunTaskService = jackYunTaskService; _wMSService = wMSService; _jackYunStockinService = jackYunStockinService; } + #region 调度运行抓吉客云销售订单 + + /// + /// 调度运行抓吉客云销售订单 + /// + [HttpGet] + [AllowAnonymous] + public void TaskSendKingdeeSaleOrderById(string now) + { + _jackYunTaskService.TaskGetJackYunOrder(now); + } + #endregion + //#region 调度运行抓吉客云销售订单 ///// @@ -45,9 +59,9 @@ namespace MyCode.Project.WebApi.Controllers /// [HttpGet] [AllowAnonymous] - public List GetList(DateTime now) + public List GetList(DateTime now) { - return _wMSService.GetList(now); + return _wMSService.GetList(now); } #endregion @@ -59,7 +73,7 @@ namespace MyCode.Project.WebApi.Controllers [AllowAnonymous] public string GetAndMergeJackYunOrder(string now) { - return _jackYunTaskService.GetAndMergeJackYunOrder(now); + return _jackYunTaskService.GetAndMergeJackYunOrder(now); } #endregion diff --git a/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj b/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj index 7e0b55c..62db77f 100644 --- a/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj +++ b/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj @@ -15,7 +15,7 @@ Properties MyCode.Project.WebApi MyCode.Project.WebApi - v4.6.1 + v4.8 false false @@ -112,7 +112,6 @@ - ..\Lib\System.Runtime.dll @@ -123,7 +122,6 @@ - @@ -173,7 +171,6 @@ True ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - ..\Lib\Unity.WebApi.dll diff --git a/Reportapi/MyCode.Project.WebApi/Web.config b/Reportapi/MyCode.Project.WebApi/Web.config index 03b64d9..61860f3 100644 --- a/Reportapi/MyCode.Project.WebApi/Web.config +++ b/Reportapi/MyCode.Project.WebApi/Web.config @@ -1,107 +1,60 @@ - + - -
+
- - - - - - - - + + + + + + + - - - - - - + + + - - + - + - + - + - + - + - + - + - + - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - + + + + - + - + - + - + - + - + - + - - - + + + - - + - + - + - + - + - + - + - - - + + + - - - - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - + + - - - - - - - + + - - + + - - + + - - - - - - - + + - - + + - - + + + + + + + + + + + + + + - - + + \ No newline at end of file diff --git a/Reportapi/MyCode.Project.ZHMDGenerateCode/App.config b/Reportapi/MyCode.Project.ZHMDGenerateCode/App.config index 8ad43d7..2f36935 100644 --- a/Reportapi/MyCode.Project.ZHMDGenerateCode/App.config +++ b/Reportapi/MyCode.Project.ZHMDGenerateCode/App.config @@ -1,45 +1,45 @@ - + -
+
- - + + - + - + - + - + - + - + - + - + - + - + - + - - - + + + @@ -61,106 +61,106 @@ - + - + - + - + - + - + - + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/Reportapi/MyCode.Project.ZHMDGenerateCode/MyCode.Project.ZHMDGenerateCode.csproj b/Reportapi/MyCode.Project.ZHMDGenerateCode/MyCode.Project.ZHMDGenerateCode.csproj index 573a7c5..0b8deef 100644 --- a/Reportapi/MyCode.Project.ZHMDGenerateCode/MyCode.Project.ZHMDGenerateCode.csproj +++ b/Reportapi/MyCode.Project.ZHMDGenerateCode/MyCode.Project.ZHMDGenerateCode.csproj @@ -8,7 +8,7 @@ Exe MyCode.Project.GenerateCode MyCode.Project.GenerateCode - v4.6.1 + v4.8 512 true