新增吉克云销售数据推送到金蝶云星空
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>Fleck</RootNamespace>
|
||||
<AssemblyName>Fleck</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>SqlSugar</RootNamespace>
|
||||
<AssemblyName>SqlSugar</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
|
||||
@@ -9,8 +9,9 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>Swashbuckle</RootNamespace>
|
||||
<AssemblyName>Swashbuckle.Core</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
@@ -8,4 +8,4 @@
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
</configuration>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
|
||||
|
||||
@@ -9,8 +9,9 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>Swashbuckle.WebHost</RootNamespace>
|
||||
<AssemblyName>Swashbuckle.WebHost</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
|
||||
<runtime>
|
||||
@@ -30,4 +30,4 @@
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
|
||||
|
||||
@@ -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
|
||||
{
|
||||
/// <summary>
|
||||
/// 更新字段
|
||||
/// 需要更新的字段,数组类型,格式:[key1,key2,...] (非必录)
|
||||
/// 注(更新字段时Model数据包中必须设置内码,若更新单据体字段还需设置分录内码)
|
||||
/// </summary>
|
||||
public List<string> NeedUpDateFields { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 返回字段
|
||||
/// 需返回结果的字段集合,数组类型,格式:[key,entitykey.key,...](非必录)
|
||||
/// 注(返回单据体字段格式:entitykey.key)
|
||||
/// </summary>
|
||||
public List<string> NeedReturnFields { get; set; }
|
||||
|
||||
public bool IsDeleteEntry { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 是否删除已存在的分录,布尔类型,默认true(非必录)
|
||||
/// </summary>
|
||||
public string IsDeleteEntry { get; set; }
|
||||
/// <summary>
|
||||
/// 表单所在的子系统内码,字符串类型(非必录)
|
||||
/// </summary>
|
||||
public string SubSystemId { get; set; }
|
||||
/// <summary>
|
||||
/// 是否验证所有的基础资料有效性,布尔类,默认false(非必录)
|
||||
/// </summary>
|
||||
public bool IsVerifyBaseDataField { get; set; }
|
||||
/// <summary>
|
||||
/// 是否批量填充分录,默认true(非必录)
|
||||
/// </summary>
|
||||
public string IsEntryBatchFill { get; set; }
|
||||
/// <summary>
|
||||
/// 是否验证数据合法性标志,布尔类型,默认true(非必录)
|
||||
/// 注(设为false时不对数据合法性进行校验)
|
||||
/// </summary>
|
||||
public string ValidateFlag { get; set; }
|
||||
/// <summary>
|
||||
/// 是否用编码搜索基础资料,布尔类型,默认true(非必录)
|
||||
/// </summary>
|
||||
public string NumberSearch { get; set; }
|
||||
/// <summary>
|
||||
/// 是否自动调整JSON字段顺序,布尔类型,默认false(非必录)
|
||||
/// </summary>
|
||||
public string IsAutoAdjustField { get; set; }
|
||||
/// <summary>
|
||||
///交互标志集合,字符串类型,分号分隔,格式:"flag1;flag2;..."(非必录)
|
||||
///例如(允许负库存标识:STK_InvCheckResult)
|
||||
/// </summary>
|
||||
public string InterationFlags { get; set; }
|
||||
/// <summary>
|
||||
/// 是否允许忽略交互,布尔类型,默认true(非必录)
|
||||
/// </summary>
|
||||
public string IgnoreInterationFlag { get; set; }
|
||||
/// <summary>
|
||||
/// 是否控制精度,为true时对金额、单价和数量字段进行精度验证,默认false(非必录)
|
||||
/// </summary>
|
||||
public string IsControlPrecision { get; set; }
|
||||
/// <summary>
|
||||
/// 表单数据包,JSON类型(必录)
|
||||
/// </summary>
|
||||
public object Model { get; set; }
|
||||
public BaseModel Model { get; set; }
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -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 "";
|
||||
}
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -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
|
||||
{
|
||||
/// <summary>
|
||||
/// 需要更新的字段,数组类型,格式:[key1,key2,...] (非必录)
|
||||
/// 注(更新字段时Model数据包中必须设置内码,若更新单据体字段还需设置分录内码)
|
||||
///
|
||||
/// </summary>
|
||||
public List<string> NeedUpDateFields { get; set; }
|
||||
public int FID { get; set; }
|
||||
/// <summary>
|
||||
/// 需返回结果的字段集合,数组类型,格式:[key,entitykey.key,...](非必录)
|
||||
/// 注(返回单据体字段格式:entitykey.key)
|
||||
/// 单据类型
|
||||
/// </summary>
|
||||
public List<string> NeedReturnFields { get; set; }
|
||||
public FBillTypeID FBillTypeID { get; set; }
|
||||
/// <summary>
|
||||
/// 是否删除已存在的分录,布尔类型,默认true(非必录)
|
||||
/// 单据编号
|
||||
/// </summary>
|
||||
public string IsDeleteEntry { get; set; }
|
||||
public string FBillNo { get; set; }
|
||||
/// <summary>
|
||||
/// 表单所在的子系统内码,字符串类型(非必录)
|
||||
/// 日期
|
||||
/// </summary>
|
||||
public string SubSystemId { get; set; }
|
||||
public string FDate { get; set; }
|
||||
/// <summary>
|
||||
/// 是否验证所有的基础资料有效性,布尔类,默认false(非必录)
|
||||
/// 销售组织
|
||||
/// </summary>
|
||||
public bool IsVerifyBaseDataField { get; set; }
|
||||
public FSaleOrgId FSaleOrgId { get; set; }
|
||||
/// <summary>
|
||||
/// 是否批量填充分录,默认true(非必录)
|
||||
/// 客户
|
||||
/// </summary>
|
||||
public string IsEntryBatchFill { get; set; }
|
||||
public FCustId FCustId { get; set; }
|
||||
/// <summary>
|
||||
/// 是否验证数据合法性标志,布尔类型,默认true(非必录)
|
||||
/// 注(设为false时不对数据合法性进行校验)
|
||||
/// 交货方式
|
||||
/// </summary>
|
||||
public string ValidateFlag { get; set; }
|
||||
public FHeadDeliveryWay FHeadDeliveryWay { get; set; }
|
||||
/// <summary>
|
||||
/// 是否用编码搜索基础资料,布尔类型,默认true(非必录)
|
||||
/// 收货方
|
||||
/// </summary>
|
||||
public string NumberSearch { get; set; }
|
||||
public FReceiveId FReceiveId { get; set; }
|
||||
/// <summary>
|
||||
/// 是否自动调整JSON字段顺序,布尔类型,默认false(非必录)
|
||||
/// 交货地点
|
||||
/// </summary>
|
||||
public string IsAutoAdjustField { get; set; }
|
||||
public FHEADLOCID FHEADLOCID { get; set; }
|
||||
/// <summary>
|
||||
///交互标志集合,字符串类型,分号分隔,格式:"flag1;flag2;..."(非必录)
|
||||
///例如(允许负库存标识:STK_InvCheckResult)
|
||||
/// 对应组织
|
||||
/// </summary>
|
||||
public string InterationFlags { get; set; }
|
||||
public FCorrespondOrgId FCorrespondOrgId { get; set; }
|
||||
/// <summary>
|
||||
/// 是否允许忽略交互,布尔类型,默认true(非必录)
|
||||
/// 销售部门
|
||||
/// </summary>
|
||||
public string IgnoreInterationFlag { get; set; }
|
||||
public FSaleDeptId FSaleDeptId { get; set; }
|
||||
/// <summary>
|
||||
/// 是否控制精度,为true时对金额、单价和数量字段进行精度验证,默认false(非必录)
|
||||
/// 销售组
|
||||
/// </summary>
|
||||
public string IsControlPrecision { get; set; }
|
||||
public FSaleGroupId FSaleGroupId { get; set; }
|
||||
/// <summary>
|
||||
/// 表单数据包,JSON类型(必录)
|
||||
/// 销售员
|
||||
/// </summary>
|
||||
public Model Model { get; set; }
|
||||
public FSalerId FSalerId { get; set; }
|
||||
/// <summary>
|
||||
/// 收货方地址
|
||||
/// </summary>
|
||||
public string FReceiveAddress { get; set; }
|
||||
/// <summary>
|
||||
/// 结算方
|
||||
/// </summary>
|
||||
public FSettleId FSettleId { get; set; }
|
||||
/// <summary>
|
||||
/// 收货方联系人
|
||||
/// </summary>
|
||||
public FReceiveContact FReceiveContact { get; set; }
|
||||
/// <summary>
|
||||
/// 付款方
|
||||
/// </summary>
|
||||
public FChargeId FChargeId { get; set; }
|
||||
/// <summary>
|
||||
/// 移动销售订单编号
|
||||
/// </summary>
|
||||
public string FNetOrderBillNo { get; set; }
|
||||
/// <summary>
|
||||
/// 移动销售订单ID
|
||||
/// </summary>
|
||||
public int FNetOrderBillId { get; set; }
|
||||
/// <summary>
|
||||
/// 商机内码
|
||||
/// </summary>
|
||||
public int FOppID { get; set; }
|
||||
/// <summary>
|
||||
/// 销售阶段
|
||||
/// </summary>
|
||||
public FSalePhaseID FSalePhaseID { get; set; }
|
||||
/// <summary>
|
||||
/// 是否期初单据
|
||||
/// </summary>
|
||||
public string FISINIT { get; set; }
|
||||
/// <summary>
|
||||
/// 备注
|
||||
/// </summary>
|
||||
public string FNote { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string FIsMobile { get; set; }
|
||||
/// <summary>
|
||||
/// 订单来源
|
||||
/// </summary>
|
||||
public string FSOFrom { get; set; }
|
||||
/// <summary>
|
||||
/// 合同类型
|
||||
/// </summary>
|
||||
public string FContractType { get; set; }
|
||||
/// <summary>
|
||||
/// 销售合同内码
|
||||
/// </summary>
|
||||
public int FContractId { get; set; }
|
||||
/// <summary>
|
||||
/// 生成受托加工材料清单
|
||||
/// </summary>
|
||||
public string FIsUseOEMBomPush { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public FWarehouse FWarehouse { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public Foutlets Foutlets { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string FOrdertype { get; set; }
|
||||
/// <summary>
|
||||
/// 变更单主键
|
||||
/// </summary>
|
||||
public int FXPKID_H { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string FPushType { get; set; }
|
||||
/// <summary>
|
||||
/// 关闭原因
|
||||
/// </summary>
|
||||
public string FCloseReason { get; set; }
|
||||
/// <summary>
|
||||
/// 生成分销采购订单
|
||||
/// </summary>
|
||||
public string FIsUseDrpSalePOPush { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string FAutoShip { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string FIsOutStock { get; set; }
|
||||
/// <summary>
|
||||
/// 财务信息
|
||||
/// </summary>
|
||||
public FSaleOrderFinance FSaleOrderFinance { get; set; }
|
||||
/// <summary>
|
||||
/// 订单条款
|
||||
/// </summary>
|
||||
public List<FSaleOrderClauseItem> FSaleOrderClause { get; set; }
|
||||
/// <summary>
|
||||
/// 订单明细
|
||||
/// </summary>
|
||||
public List<FSaleOrderEntryItem> FSaleOrderEntry { get; set; }
|
||||
/// <summary>
|
||||
/// 收款计划
|
||||
/// </summary>
|
||||
public List<FSaleOrderPlanItem> FSaleOrderPlan { get; set; }
|
||||
/// <summary>
|
||||
/// 物流跟踪明细
|
||||
/// </summary>
|
||||
public List<FSalOrderTraceItem> FSalOrderTrace { get; set; }
|
||||
}
|
||||
|
||||
|
||||
public class FBillTypeID
|
||||
{
|
||||
/// <summary>
|
||||
@@ -1055,178 +1167,4 @@ namespace MyCode.Project.Domain.Message.Request.KingDee
|
||||
/// </summary>
|
||||
public List<FSalOrderTraceDetailItem> FSalOrderTraceDetail { get; set; }
|
||||
}
|
||||
|
||||
public class Model
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public int FID { get; set; }
|
||||
/// <summary>
|
||||
/// 单据类型
|
||||
/// </summary>
|
||||
public FBillTypeID FBillTypeID { get; set; }
|
||||
/// <summary>
|
||||
/// 单据编号
|
||||
/// </summary>
|
||||
public string FBillNo { get; set; }
|
||||
/// <summary>
|
||||
/// 日期
|
||||
/// </summary>
|
||||
public string FDate { get; set; }
|
||||
/// <summary>
|
||||
/// 销售组织
|
||||
/// </summary>
|
||||
public FSaleOrgId FSaleOrgId { get; set; }
|
||||
/// <summary>
|
||||
/// 客户
|
||||
/// </summary>
|
||||
public FCustId FCustId { get; set; }
|
||||
/// <summary>
|
||||
/// 交货方式
|
||||
/// </summary>
|
||||
public FHeadDeliveryWay FHeadDeliveryWay { get; set; }
|
||||
/// <summary>
|
||||
/// 收货方
|
||||
/// </summary>
|
||||
public FReceiveId FReceiveId { get; set; }
|
||||
/// <summary>
|
||||
/// 交货地点
|
||||
/// </summary>
|
||||
public FHEADLOCID FHEADLOCID { get; set; }
|
||||
/// <summary>
|
||||
/// 对应组织
|
||||
/// </summary>
|
||||
public FCorrespondOrgId FCorrespondOrgId { get; set; }
|
||||
/// <summary>
|
||||
/// 销售部门
|
||||
/// </summary>
|
||||
public FSaleDeptId FSaleDeptId { get; set; }
|
||||
/// <summary>
|
||||
/// 销售组
|
||||
/// </summary>
|
||||
public FSaleGroupId FSaleGroupId { get; set; }
|
||||
/// <summary>
|
||||
/// 销售员
|
||||
/// </summary>
|
||||
public FSalerId FSalerId { get; set; }
|
||||
/// <summary>
|
||||
/// 收货方地址
|
||||
/// </summary>
|
||||
public string FReceiveAddress { get; set; }
|
||||
/// <summary>
|
||||
/// 结算方
|
||||
/// </summary>
|
||||
public FSettleId FSettleId { get; set; }
|
||||
/// <summary>
|
||||
/// 收货方联系人
|
||||
/// </summary>
|
||||
public FReceiveContact FReceiveContact { get; set; }
|
||||
/// <summary>
|
||||
/// 付款方
|
||||
/// </summary>
|
||||
public FChargeId FChargeId { get; set; }
|
||||
/// <summary>
|
||||
/// 移动销售订单编号
|
||||
/// </summary>
|
||||
public string FNetOrderBillNo { get; set; }
|
||||
/// <summary>
|
||||
/// 移动销售订单ID
|
||||
/// </summary>
|
||||
public int FNetOrderBillId { get; set; }
|
||||
/// <summary>
|
||||
/// 商机内码
|
||||
/// </summary>
|
||||
public int FOppID { get; set; }
|
||||
/// <summary>
|
||||
/// 销售阶段
|
||||
/// </summary>
|
||||
public FSalePhaseID FSalePhaseID { get; set; }
|
||||
/// <summary>
|
||||
/// 是否期初单据
|
||||
/// </summary>
|
||||
public string FISINIT { get; set; }
|
||||
/// <summary>
|
||||
/// 备注
|
||||
/// </summary>
|
||||
public string FNote { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string FIsMobile { get; set; }
|
||||
/// <summary>
|
||||
/// 订单来源
|
||||
/// </summary>
|
||||
public string FSOFrom { get; set; }
|
||||
/// <summary>
|
||||
/// 合同类型
|
||||
/// </summary>
|
||||
public string FContractType { get; set; }
|
||||
/// <summary>
|
||||
/// 销售合同内码
|
||||
/// </summary>
|
||||
public int FContractId { get; set; }
|
||||
/// <summary>
|
||||
/// 生成受托加工材料清单
|
||||
/// </summary>
|
||||
public string FIsUseOEMBomPush { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public FWarehouse FWarehouse { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public Foutlets Foutlets { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string FOrdertype { get; set; }
|
||||
/// <summary>
|
||||
/// 变更单主键
|
||||
/// </summary>
|
||||
public int FXPKID_H { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string FPushType { get; set; }
|
||||
/// <summary>
|
||||
/// 关闭原因
|
||||
/// </summary>
|
||||
public string FCloseReason { get; set; }
|
||||
/// <summary>
|
||||
/// 生成分销采购订单
|
||||
/// </summary>
|
||||
public string FIsUseDrpSalePOPush { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string FAutoShip { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string FIsOutStock { get; set; }
|
||||
/// <summary>
|
||||
/// 财务信息
|
||||
/// </summary>
|
||||
public FSaleOrderFinance FSaleOrderFinance { get; set; }
|
||||
/// <summary>
|
||||
/// 订单条款
|
||||
/// </summary>
|
||||
public List<FSaleOrderClauseItem> FSaleOrderClause { get; set; }
|
||||
/// <summary>
|
||||
/// 订单明细
|
||||
/// </summary>
|
||||
public List<FSaleOrderEntryItem> FSaleOrderEntry { get; set; }
|
||||
/// <summary>
|
||||
/// 收款计划
|
||||
/// </summary>
|
||||
public List<FSaleOrderPlanItem> FSaleOrderPlan { get; set; }
|
||||
/// <summary>
|
||||
/// 物流跟踪明细
|
||||
/// </summary>
|
||||
public List<FSalOrderTraceItem> FSalOrderTrace { get; set; }
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -9,7 +9,7 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>MyCode.Project.Domain</RootNamespace>
|
||||
<AssemblyName>MyCode.Project.Domain</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
|
||||
<RestorePackages>true</RestorePackages>
|
||||
@@ -67,7 +67,9 @@
|
||||
<Compile Include="Message\Request\JackYun\OrderTradeFullInfoGetRequestBizData.cs" />
|
||||
<Compile Include="Message\Request\KingDee\BillDelete.cs" />
|
||||
<Compile Include="Message\Request\KingDee\BillSave.cs" />
|
||||
<Compile Include="Message\Request\KingDee\FSaleOrderEntry.cs" />
|
||||
<Compile Include="Message\Request\KingDee\SaveModel\BaseModel.cs" />
|
||||
<Compile Include="Message\Request\KingDee\SaveModel\SaleOrderModel - 复制.cs" />
|
||||
<Compile Include="Message\Request\KingDee\SaveModel\SaleOrderModel.cs" />
|
||||
<Compile Include="Message\Request\TimeRange.cs" />
|
||||
<Compile Include="Message\Response\Common\HeadFieldItem.cs" />
|
||||
<Compile Include="Message\Response\Common\IdName.cs" />
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
For more information on how to configure your ASP.NET application, please visit
|
||||
https://go.microsoft.com/fwlink/?LinkId=301879
|
||||
@@ -10,8 +10,8 @@
|
||||
|
||||
<connectionStrings>
|
||||
|
||||
<add name="WMSConn" connectionString="Data Source=127.0.0.1; Initial Catalog=YunTong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient" />
|
||||
<add name="YunTongConn" connectionString="Data Source=127.0.0.1; Initial Catalog=YunTong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" />
|
||||
<add name="WMSConn" connectionString="Data Source=127.0.0.1; Initial Catalog=xietong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient"/>
|
||||
<add name="YunTongConn" connectionString="Data Source=127.0.0.1; Initial Catalog=xietong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient"/>
|
||||
|
||||
|
||||
</connectionStrings>
|
||||
@@ -163,4 +163,4 @@
|
||||
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\"Web\" /optionInfer+"/>
|
||||
</compilers>
|
||||
</system.codedom>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<OutputType>Exe</OutputType>
|
||||
<RootNamespace>MyCode.Project.GenerateCode</RootNamespace>
|
||||
<AssemblyName>MyCode.Project.GenerateCode</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||
<TargetFrameworkProfile />
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>MyCode.Project.Infrastructure</RootNamespace>
|
||||
<AssemblyName>MyCode.Project.Infrastructure</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
|
||||
<RestorePackages>true</RestorePackages>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
@@ -29,4 +29,4 @@
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
|
||||
|
||||
17
Reportapi/MyCode.Project.OutSideService/IKingDeeService.cs
Normal file
17
Reportapi/MyCode.Project.OutSideService/IKingDeeService.cs
Normal file
@@ -0,0 +1,17 @@
|
||||
using MyCode.Project.Domain.Message.Request.KingDee;
|
||||
|
||||
namespace MyCode.Project.OutSideService
|
||||
{
|
||||
public interface IKingDeeService
|
||||
{
|
||||
/// <summary>
|
||||
/// 保存一个订单对象
|
||||
/// </summary>
|
||||
/// <param name="formId"></param>
|
||||
/// <param name="billSave"></param>
|
||||
/// <returns></returns>
|
||||
string Save(string formId, BillSave billSave);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -9,7 +9,7 @@ using System.Linq;
|
||||
|
||||
namespace MyCode.Project.OutSideService.Implementation
|
||||
{
|
||||
public class KingDeeService //: IKingDeeService
|
||||
public class KingDeeService : IKingDeeService
|
||||
{
|
||||
public KingDeeService()
|
||||
{
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>MyCode.Project.OutSideService</RootNamespace>
|
||||
<AssemblyName>MyCode.Project.OutSideService</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
@@ -109,6 +109,7 @@
|
||||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="IKingDeeService.cs" />
|
||||
<Compile Include="IBfyService.cs" />
|
||||
<Compile Include="Implementation\BfyService.cs" />
|
||||
<Compile Include="Implementation\KingDeeService.cs" />
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
@@ -25,4 +25,4 @@
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
@@ -29,4 +29,4 @@
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>MyCode.Project.Repositories</RootNamespace>
|
||||
<AssemblyName>MyCode.Project.Repositories</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
|
||||
<RestorePackages>true</RestorePackages>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
For more information on how to configure your ASP.NET application, please visit
|
||||
https://go.microsoft.com/fwlink/?LinkId=301879
|
||||
@@ -14,10 +14,8 @@
|
||||
|
||||
<connectionStrings>
|
||||
|
||||
<add name="WMSConn" connectionString="Data Source=192.168.221.155; Initial Catalog=ESB_DTC; User ID=app_k3;Password=Postman2025k3; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient" />
|
||||
<add name="YunTongConn" connectionString="Data Source=192.168.116.209; Initial Catalog=K3ZMFS_0905; User ID=app_jindie;Password=Ac661978!; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" />
|
||||
<!--<add name="WMSConn" connectionString="Data Source=127.0.0.1; Initial Catalog=sdf; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=WMS" providerName="System.Data.SqlClient" />
|
||||
<add name="YunTongConn" connectionString="Data Source=127.0.0.1; Initial Catalog=YunTong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" />-->
|
||||
<add name="WMSConn" connectionString="Data Source=127.0.0.1; Initial Catalog=xietong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient"/>
|
||||
<add name="YunTongConn" connectionString="Data Source=127.0.0.1; Initial Catalog=xietong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient"/>
|
||||
|
||||
</connectionStrings>
|
||||
<appSettings>
|
||||
@@ -26,7 +24,7 @@
|
||||
<!--当前环境,1:生产环境 0:开发环境-->
|
||||
<add key="Env" value="0"/>
|
||||
<!--因公司IP时常变化,先用13跳转-->
|
||||
<add key="RedisAddress" value="" />
|
||||
<add key="RedisAddress" value="19VhOco9ayRaH41syZnWYn2S46x3FcKIjYKgr6K3L/tu7vmlJvhB0CKrIBfMVl1Y"/>
|
||||
<!--缓存前缀-->
|
||||
<add key="CachePrefix" value="lxm-report:dev:"/>
|
||||
<!--jwtkey-->
|
||||
@@ -47,7 +45,7 @@
|
||||
|
||||
<!--生产环境D:\publish\lxm-report-api\App_File\-->
|
||||
<!--服务器文件保存的路径,这里调度用,如果是webapi则不需要用这个-->
|
||||
<add key="AppFilePath" value="D:\publish\api\App_File\" />
|
||||
<add key="AppFilePath" value="D:\publish\LxmReportApi\api\App_File\"/>
|
||||
<!--<add key="AppFilePath" value="D:\App_File\" />-->
|
||||
|
||||
<!--Socket的URL,13生产服务器配置:ws://172.18.166.162:8282/-->
|
||||
@@ -210,4 +208,4 @@
|
||||
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\"Web\" /optionInfer+"/>
|
||||
</compilers>
|
||||
</system.codedom>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>MyCode.Project.ScheduleTask</RootNamespace>
|
||||
<AssemblyName>MyCode.Project.ScheduleTask</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
@@ -29,4 +29,4 @@
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
@@ -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(把吉客云订单存进本地数据库)
|
||||
/// <summary>
|
||||
/// 把吉客云订单存进本地数据库
|
||||
/// </summary>
|
||||
/// <param name="trades"></param>
|
||||
[TransactionCallHandler]
|
||||
public void SetOrder(List<TradesItem> 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<JackOrders> jackOrdersList = new List<JackOrders>();
|
||||
List<JackOrdersItem> ordersItemList = new List<JackOrdersItem>();
|
||||
trades.ForEach(t =>
|
||||
{
|
||||
JackOrders jackOrders = new JackOrders();
|
||||
jackOrders = AutoMapperHelper.AutoMappToSingle<JackOrders, TradesItem>(t);
|
||||
jackOrders.Id = Guid.NewGuid();
|
||||
jackOrders.Status = 0;
|
||||
jackOrders.UpdateTime = DateTime.Now;
|
||||
jackOrders.CreateTime = DateTime.Now;
|
||||
if (t.goodsDetail != null)
|
||||
{
|
||||
var items = AutoMapperHelper.AutoMappToList<JackOrdersItem, GoodsDetailItem>(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(合并吉客云订单到新表)
|
||||
/// <summary>
|
||||
/// 合并吉客云订单到新表
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[TransactionCallHandler]
|
||||
public string GetAndMergeJackYunOrder(string now)
|
||||
{
|
||||
var list = _jackOrdersItemRepository.GetPushOrder();
|
||||
List<string> mesg = new List<string>();
|
||||
|
||||
var shopParemList = _yTKJTShopParameterRepository.Queryable().Where(t => t.FDOCUMENTSTATUS == "C").ToList();
|
||||
List<PushKingDeeOrderItem> pushKingDeeOrderItems = new List<PushKingDeeOrderItem>();
|
||||
List<PushKingDeeOrder> pushKingDeeOrders = new List<PushKingDeeOrder>();
|
||||
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<PushKingDeeOrder, PushOrderListResp>(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<PushKingDeeOrderItem, PushOrderListResp>(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
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -12,7 +12,7 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>MyCode.Project.Services</RootNamespace>
|
||||
<AssemblyName>MyCode.Project.Services</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
@@ -116,6 +116,7 @@
|
||||
<Compile Include="Implementation\AnsyDataProcessService.cs" />
|
||||
<Compile Include="Implementation\ApiLogService.cs" />
|
||||
<Compile Include="Implementation\JackYunStockinService.cs" />
|
||||
<Compile Include="Implementation\OrderPushService.cs" />
|
||||
<Compile Include="Implementation\WMSService.cs" />
|
||||
<Compile Include="Implementation\JackYunService.cs" />
|
||||
<Compile Include="Implementation\JackYunTaskService.cs" />
|
||||
@@ -125,6 +126,7 @@
|
||||
<Compile Include="Implementation\WorkProcessService.cs" />
|
||||
<Compile Include="IServices\IAnsyDataProcessService.cs" />
|
||||
<Compile Include="IServices\IJackYunStockinService.cs" />
|
||||
<Compile Include="IServices\IOrderPushService.cs" />
|
||||
<Compile Include="IServices\IWMSService.cs" />
|
||||
<Compile Include="IServices\IJackYunTaskService.cs" />
|
||||
<Compile Include="IServices\IJackYunService.cs" />
|
||||
|
||||
@@ -17,6 +17,7 @@ namespace MyCode.Project.WebApi.Controllers
|
||||
private IJackYunTaskService _jackYunTaskService;
|
||||
private IWMSService _wMSService;
|
||||
private IJackYunStockinService _jackYunStockinService;
|
||||
private IOrderPushService _orderPushService;
|
||||
|
||||
public TestController(IJackYunTaskService jackYunTaskService, IWMSService wMSService, IJackYunStockinService jackYunStockinService)
|
||||
{
|
||||
@@ -25,6 +26,19 @@ namespace MyCode.Project.WebApi.Controllers
|
||||
_jackYunStockinService = jackYunStockinService;
|
||||
}
|
||||
|
||||
#region 调度运行抓吉客云销售订单
|
||||
|
||||
/// <summary>
|
||||
/// 调度运行抓吉客云销售订单
|
||||
/// </summary>
|
||||
[HttpGet]
|
||||
[AllowAnonymous]
|
||||
public void TaskSendKingdeeSaleOrderById(string now)
|
||||
{
|
||||
_jackYunTaskService.TaskGetJackYunOrder(now);
|
||||
}
|
||||
#endregion
|
||||
|
||||
//#region 调度运行抓吉客云销售订单
|
||||
|
||||
///// <summary>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>MyCode.Project.WebApi</RootNamespace>
|
||||
<AssemblyName>MyCode.Project.WebApi</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||
<MvcBuildViews>false</MvcBuildViews>
|
||||
<UseIISExpress>false</UseIISExpress>
|
||||
<IISExpressSSLPort />
|
||||
@@ -112,7 +112,6 @@
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Runtime">
|
||||
<HintPath>..\Lib\System.Runtime.dll</HintPath>
|
||||
@@ -123,7 +122,6 @@
|
||||
<Reference Include="System.ComponentModel.DataAnnotations" />
|
||||
<Reference Include="System.Web" />
|
||||
<Reference Include="System.Web.Abstractions" />
|
||||
<Reference Include="System.Web.Extensions" />
|
||||
<Reference Include="System.Web.Routing" />
|
||||
<Reference Include="System.Web.Services" />
|
||||
<Reference Include="System.Xml" />
|
||||
@@ -173,7 +171,6 @@
|
||||
<Private>True</Private>
|
||||
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="Unity.WebApi">
|
||||
<HintPath>..\Lib\Unity.WebApi.dll</HintPath>
|
||||
</Reference>
|
||||
|
||||
@@ -1,14 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0"?>
|
||||
<!--
|
||||
For more information on how to configure your ASP.NET application, please visit
|
||||
https://go.microsoft.com/fwlink/?LinkId=301879
|
||||
-->
|
||||
<configuration>
|
||||
|
||||
<configSections>
|
||||
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
|
||||
</configSections>
|
||||
|
||||
<system.webServer>
|
||||
<httpProtocol>
|
||||
<customHeaders>
|
||||
@@ -23,15 +21,11 @@
|
||||
</httpProtocol>
|
||||
</system.webServer>
|
||||
<connectionStrings>
|
||||
|
||||
<!-- 数据库测试-->
|
||||
<add name="WMSConn" connectionString="Data Source=127.0.0.1; Initial Catalog=sdf; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=WMS" providerName="System.Data.SqlClient" />
|
||||
<add name="YunTongConn" connectionString="Data Source=127.0.0.1; Initial Catalog=YunTong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" />
|
||||
|
||||
<add name="WMSConn" connectionString="Data Source=127.0.0.1; Initial Catalog=xietong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient"/>
|
||||
<add name="YunTongConn" connectionString="Data Source=127.0.0.1; Initial Catalog=xietong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient"/>
|
||||
<!--测试MYSQL内网-->
|
||||
|
||||
<!--<add name="MasterConn" connectionString="" providerName="MySql.Data.MySqlClient" />-->
|
||||
|
||||
</connectionStrings>
|
||||
<appSettings>
|
||||
<!--解决swagger出错问题-->
|
||||
@@ -54,54 +48,13 @@
|
||||
<add key="owin:AutomaticAppStartup" value="false"/>
|
||||
<!--钉钉通知机器人-->
|
||||
<add key="DingDingApiUrl" value=""/>
|
||||
|
||||
<!--区域层增加的前缀路径-->
|
||||
<add key="AreaUrlPrePath" value=""/>
|
||||
|
||||
<!--生产环境D:\publish\lxm-report-api\App_File\-->
|
||||
<!--服务器文件保存的路径,这里调度用,如果是webapi则不需要用这个-->
|
||||
<add key="AppFilePath" value="D:\publish\LxmReportApi\api\App_File\"/>
|
||||
<!--<add key="AppFilePath" value="D:\App_File\" />-->
|
||||
<add key="WebSocketUrl" value="ws://127.0.0.1:9798/"/>
|
||||
|
||||
<!-- 当前使用的 账套ID(即数据中心id) -->
|
||||
|
||||
<!-- 第三方系统登录授权的账套ID(即open.kingdee.com网站的第三方系统登录授权中的数据中心标识)-->
|
||||
|
||||
<!-- 在第三方系统登录授权页面点击“生成测试链接”按钮后即可查看 -->
|
||||
|
||||
<add key="X-KDApi-AcctID" value="66d918bdc00906"/>
|
||||
|
||||
<!-- 第三方系统登录授权的 集成用户名称 -->
|
||||
|
||||
<!-- 补丁版本为PT-146894 [7.7.0.202111]及后续的版本,则为指定用户登录列表中任一用户 -->
|
||||
|
||||
<!-- 若第三方系统登录授权已勾选“允许全部用户登录”,则无以上限制 -->
|
||||
|
||||
<add key="X-KDApi-UserName" value="吉客云" />
|
||||
|
||||
<!-- 第三方系统登录授权的 应用ID -->
|
||||
|
||||
<add key="X-KDApi-AppID" value="400925_wYdO4+jLQMDf091IQYTB48WNRjSaXKLu"/>
|
||||
|
||||
<!-- 第三方系统登录授权的 应用密钥 -->
|
||||
|
||||
<add key="X-KDApi-AppSec" value="41dfa53b0e634b72b01e303d14fa6e35"/>
|
||||
|
||||
<!-- 账套语系,默认2052 -->
|
||||
|
||||
<add key="X-KDApi-LCID" value="2052"/>
|
||||
|
||||
<!-- 组织编码,启用多组织时配置对应的组织编码才有效 -->
|
||||
|
||||
<!--<add key="X-KDApi-OrgNum" value="*****"/>-->
|
||||
|
||||
|
||||
|
||||
<!-- 服务Url地址(私有云和公有云都须配置金蝶云星空产品地址,K3Cloud/结尾)-->
|
||||
|
||||
<add key="X-KDApi-ServerUrl" value="http://localhost/k3cloud/"/>
|
||||
|
||||
</appSettings>
|
||||
<!--
|
||||
有关 web.config 更改的说明,请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
|
||||
@@ -113,7 +66,7 @@
|
||||
-->
|
||||
<system.web>
|
||||
<authentication mode="None"/>
|
||||
<compilation debug="true" targetFramework="4.6.1" />
|
||||
<compilation debug="true" targetFramework="4.8"/>
|
||||
<httpRuntime targetFramework="4.6.1"/>
|
||||
<customErrors mode="Off"/>
|
||||
</system.web>
|
||||
@@ -140,7 +93,6 @@
|
||||
<filter type="log4net.Filter.DenyAllFilter"/>
|
||||
</filter>
|
||||
</appender>
|
||||
|
||||
<appender name="InfoLogFileAppender" type="log4net.Appender.RollingFileAppender">
|
||||
<!--日志路径-->
|
||||
<param name="File" value="App_Log\Info\"/>
|
||||
@@ -163,7 +115,6 @@
|
||||
<filter type="log4net.Filter.DenyAllFilter"/>
|
||||
</filter>
|
||||
</appender>
|
||||
|
||||
<!-- MySQL Appender -->
|
||||
<!--<appender name="AdoNetAppender" type="log4net.Appender.AdoNetAppender">
|
||||
<bufferSize value="1" />
|
||||
@@ -199,8 +150,6 @@
|
||||
</filter>
|
||||
<filter type="log4net.Filter.DenyAllFilter" />
|
||||
</appender>-->
|
||||
|
||||
|
||||
<root>
|
||||
<!--(高) OFF > FATAL > ERROR > WARN > INFO > DEBUG > ALL (低)-->
|
||||
<level value="ALL"/>
|
||||
@@ -239,7 +188,6 @@
|
||||
<assemblyIdentity name="Common.Logging.Core" publicKeyToken="af08829b84f0328e" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0"/>
|
||||
</dependentAssembly>
|
||||
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0"/>
|
||||
@@ -248,7 +196,6 @@
|
||||
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
|
||||
</dependentAssembly>
|
||||
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
|
||||
@@ -265,7 +212,6 @@
|
||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0"/>
|
||||
</dependentAssembly>
|
||||
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
For more information on how to configure your ASP.NET application, please visit
|
||||
https://go.microsoft.com/fwlink/?LinkId=301879
|
||||
@@ -10,8 +10,8 @@
|
||||
|
||||
<connectionStrings>
|
||||
|
||||
<add name="WMSConn" connectionString="Data Source=127.0.0.1; Initial Catalog=YunTong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient" />
|
||||
<add name="YunTongConn" connectionString="Data Source=127.0.0.1; Initial Catalog=YunTong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" />
|
||||
<add name="WMSConn" connectionString="Data Source=127.0.0.1; Initial Catalog=xietong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient"/>
|
||||
<add name="YunTongConn" connectionString="Data Source=127.0.0.1; Initial Catalog=xietong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient"/>
|
||||
|
||||
|
||||
</connectionStrings>
|
||||
@@ -163,4 +163,4 @@
|
||||
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\"Web\" /optionInfer+"/>
|
||||
</compilers>
|
||||
</system.codedom>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<OutputType>Exe</OutputType>
|
||||
<RootNamespace>MyCode.Project.GenerateCode</RootNamespace>
|
||||
<AssemblyName>MyCode.Project.GenerateCode</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||
<TargetFrameworkProfile />
|
||||
|
||||
Reference in New Issue
Block a user