diff --git a/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/BillSave.cs b/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/BillSave.cs index ff1a1d1..8e17133 100644 --- a/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/BillSave.cs +++ b/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/BillSave.cs @@ -1,4 +1,4 @@ -using MyCode.Project.Domain.Message.Request.KingDee.SaveModel; + using System; using System.Collections.Generic; using System.Linq; @@ -64,7 +64,7 @@ namespace MyCode.Project.Domain.Message.Request.KingDee /// /// 表单数据包,JSON类型(必录) /// - public BaseModel Model { get; set; } + public object 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 deleted file mode 100644 index 7d7ac58..0000000 --- a/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/BaseModel.cs +++ /dev/null @@ -1,16 +0,0 @@ -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 deleted file mode 100644 index e539239..0000000 --- a/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/SaleOrderModel - 复制.cs +++ /dev/null @@ -1,1232 +0,0 @@ -//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/SaveModel/SaleOrderModel.cs b/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/SaleOrderModel.cs index 96ba1a0..cd7e567 100644 --- a/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/SaleOrderModel.cs +++ b/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/SaleOrderModel.cs @@ -1,13 +1,12 @@ -using MyCode.Project.Domain.Message.Request.KingDee.SaveModel; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace MyCode.Project.Domain.Message.Request.KingDee +namespace MyCode.Project.Domain.Message.Request.KingDee.SaveModel { - public class SaleOrderModel : BaseModel + public class SaleOrderModel { /// /// @@ -753,7 +752,7 @@ namespace MyCode.Project.Domain.Message.Request.KingDee /// /// 含税单价 /// - public int FTaxPrice { get; set; } + public decimal FTaxPrice { get; set; } /// /// 是否赠品 /// diff --git a/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj b/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj index cbffc45..02119f4 100644 --- a/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj +++ b/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj @@ -67,8 +67,6 @@ - - diff --git a/Reportapi/MyCode.Project.Services/IServices/IOrderPushService.cs b/Reportapi/MyCode.Project.Services/IServices/IOrderPushService.cs index 37ca835..f3c275b 100644 --- a/Reportapi/MyCode.Project.Services/IServices/IOrderPushService.cs +++ b/Reportapi/MyCode.Project.Services/IServices/IOrderPushService.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace MyCode.Project.Services.IServices { - internal interface IOrderPushService + public interface IOrderPushService { void PushOrderToKingDee(PushKingDeeOrder pushKingDeeOrder1); } diff --git a/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs b/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs index 6b37355..2903fb8 100644 --- a/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs +++ b/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs @@ -1,4 +1,5 @@ using MyCode.Project.Domain.Message.Request.KingDee; +using MyCode.Project.Domain.Message.Request.KingDee.SaveModel; using MyCode.Project.Domain.Message.Response.JackYun; using MyCode.Project.Domain.Model; using MyCode.Project.Domain.Repositories; @@ -157,68 +158,86 @@ namespace MyCode.Project.Services.Implementation var orderSHeet = _pushKingDeeOrderRepository.Queryable().Where(t => pushKingDeeOrder1.Id == t.Id).First(); if (orderSHeet.Status != 0) { - throw new BaseException(""); + 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); + PushKingdeeSaleOrder(orderSHeet); } // 如果为True则同步到WMS else { //wms - + PushWMSSaleOrder(orderSHeet); } } + + private string PushWMSSaleOrder(PushKingDeeOrder pushKingdeeOrder) + { + + return string.Empty; + } + + private string PushKingdeeSaleOrder(PushKingDeeOrder pushKingdeeOrder) + { + var itemList = _pushKingDeeOrderItemRepository.Queryable().Where(t => pushKingdeeOrder.Id == t.PushKingDeeOrderId).ToList(); + // 遍历单体,构造单据体实体 + var entryList = itemList.Select(n => new FSaleOrderEntryItem() + { + Fcode = n.Barcode, // 条码带出物料 、物料带出税额 + FQty = n.SellCount, // 销售数量 + FTaxPrice = Math.Round(n.DivideSellTotal / n.SellCount, 10), // 含税单价等于 金额/总数 + // 仓库必填 + FSOStockId = new FSOStockId() + { + FNUMBER = pushKingdeeOrder.WarehouseCode + }, + }).ToList(); + // 构建单据数据包 + var model = new SaleOrderModel() + { + FID = 0, // 新增 + FBillTypeID = new FBillTypeID() + { + // 1:零售业务7:售后发货;8:售后退货 + FNUMBER = pushKingdeeOrder.TradeType == 8 ? "XSDD05_SYS" : "XSDD01_SYS" + }, + FOrdertype = pushKingdeeOrder.TradeType == 8 ? "8" : "4", + FDate = pushKingdeeOrder.CreateTime?.ToString("yyyy/MM/dd"), + FSaleOrgId = new FSaleOrgId() + { + FNumber = "" // 固定组织 + }, + FCustId = new FCustId() + { + FNumber = "", // 客户? + }, + FSalerId = new FSalerId() + { + FNumber = "", // 销售员 + }, + Foutlets = new Foutlets() + { + FNUMBER = pushKingdeeOrder.ShopCode, // 门店编码 + }, + FWarehouse = new FWarehouse() + { + FNUMBER = pushKingdeeOrder.WarehouseCode, // 仓库编码 + }, + FSaleOrderEntry = entryList + }; + BillSave billSave = new BillSave() + { + Model = model + }; + SaleOrderModel fSaleOrderEntry = new SaleOrderModel(); + + var resultString = _kingDeeService.Save("SAL_SaleOrder", billSave); + LogHelper.Info(resultString); + return resultString; + } } } diff --git a/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs b/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs index e5cb9ca..d00a9b9 100644 --- a/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs +++ b/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs @@ -2,6 +2,7 @@ using MyCode.Project.Infrastructure.Common; using MyCode.Project.Services; using MyCode.Project.Services.Implementation; +using MyCode.Project.Services.IServices; using System; using System.Collections.Generic; using System.Web.Http;