diff --git a/Reportapi/MyCode.Project.Domain/Message/Request/JackYun/BusiOrderGoodsDocInRequest.cs b/Reportapi/MyCode.Project.Domain/Message/Request/JackYun/BusiOrderGoodsDocInRequest.cs
index 649c882..530a57d 100644
--- a/Reportapi/MyCode.Project.Domain/Message/Request/JackYun/BusiOrderGoodsDocInRequest.cs
+++ b/Reportapi/MyCode.Project.Domain/Message/Request/JackYun/BusiOrderGoodsDocInRequest.cs
@@ -6,115 +6,195 @@ using System.Text;
using System.Threading.Tasks;
namespace MyCode.Project.Domain.Message.Request.JackYun
-{
+{
///
- /// 入库查询（规格模式）请求参数
- ///
- public class BusiOrderGoodsDocInRequest : BaseRequestBizData
+ /// 出入库查询参数类
+ /// 用于封装出入库记录查询的各项筛选条件
+ ///
+ public class BusiOrderGoodsDocInRequest: BaseRequestBizData
{
///
- /// 需要查询的字段
+ /// 需要查询的字段列表，多个字段用逗号分隔
+ /// 例如："goodsNo,goodsName,skuName"
///
public string Cols { get; set; }
///
- /// 关联单号
+ /// 页码，从1开始计数
+ ///
+ public int? PageIndex { get; set; }
+
+ ///
+ /// 每页显示的数据条数，用于分页查询
+ ///
+ public int? PageSize { get; set; }
+
+ ///
+ /// 关联的业务单号，如订单号、采购单号等
///
public string BillNo { get; set; }
///
- /// 出入库时间（起）
+ /// 出入库时间的开始范围，格式为字符串（如：yyyy-MM-dd）
///
public string InOutDateStart { get; set; }
///
- /// 出入库时间（止）
+ /// 出入库时间的结束范围，格式为字符串（如：yyyy-MM-dd）
///
public string InOutDateEnd { get; set; }
///
- /// 正次品 （1-正品， 0-次品）
+ /// 主表数据修改时间的开始范围
///
- public byte? IsCertified { get; set; }
+ public string GmtModifiedDateStart { get; set; }
///
- /// 出入库单号
+ /// 主表数据修改时间的结束范围
+ ///
+ public string GmtModifiedDateEnd { get; set; }
+
+ ///
+ /// 明细表数据修改时间的开始范围
+ ///
+ public string GmtModifiedDetailDateStart { get; set; }
+
+ ///
+ /// 明细表数据修改时间的结束范围
+ ///
+ public string GmtModifiedDetailDateEnd { get; set; }
+
+ ///
+ /// 货品质量标识
+ /// 1：正品
+ /// 0：次品
+ /// null：不区分正次品
+ ///
+ public int? IsCertified { get; set; }
+
+ ///
+ /// 出入库单号（单个）
///
public string GoodsDocNo { get; set; }
///
- /// 出入库单号（多个逗号隔开）
+ /// 出入库单号（多个），用逗号隔开
+ /// 例如："GD001,GD002,GD003"
///
public string GoodsDocNos { get; set; }
///
- /// 出入库单备注
+ /// 出入库单表头的备注信息
///
public string GoodsdocRemark { get; set; }
///
- /// 出入库单明细行备注
+ /// 出入库单明细行的备注信息
///
public string GoodsDetailRemark { get; set; }
///
- /// 操作人
+ /// 创建该出入库记录的操作人姓名
///
public string CreateUserName { get; set; }
///
- /// 收发货单号
+ /// 收发货单号
///
public string DeliveryNo { get; set; }
///
- /// 货品编号
+ /// 货品编号/代码
///
public string GoodsNo { get; set; }
///
- /// 货品名称
+ /// 货品名称
///
public string GoodsName { get; set; }
///
- /// 条码
+ /// SKU条码/商品条码
///
public string SkuBarcode { get; set; }
///
- /// 规格
+ /// 规格型号
///
public string SkuName { get; set; }
///
- /// 批次
+ /// 批次号
///
public string BatchNo { get; set; }
///
- /// 唯一码
+ /// 唯一序列号，用于标识单个商品
///
public string SerialNo { get; set; }
///
- /// 回传状态：0未回传；1回传失败；10不回传；11已回传
+ /// 系统回传状态标识
+ /// 0：未回传
+ /// 1：回传失败
+ /// 10：不回传（无需回传）
+ /// 11：已回传成功
///
public string CallbackStatus { get; set; }
///
- /// 往来单位code
+ /// 往来单位编码（供应商/客户编码）
///
public string VendCode { get; set; }
///
- /// 仓库code
+ /// 仓库编码
///
public string WarehouseCode { get; set; }
///
- /// 渠道code
+ /// 渠道编码
///
public string ChannelCode { get; set; }
+
+ ///
+ /// 入库类型代码，支持多个值，用逗号隔开
+ /// 100：期初库存
+ /// 101：采购入库
+ /// 102：调拨入库
+ /// 103：盘盈入库
+ /// 104：其他入库
+ /// 105：销售退货
+ /// 106：完工入库
+ /// 107：组装拆卸入库
+ /// 108：翻新入库
+ /// 109：报废入库
+ /// 110：残次品入库
+ /// 111：成本调整
+ /// 112：即采即入
+ /// 113：退料入库
+ /// 114：调拨退回
+ /// 115：维修返厂返还
+ /// 116：资产入库
+ /// 117：借用入库
+ /// 118：归还入库
+ /// 119：生产委外入库
+ /// 120：生产其他入库
+ /// 122：调拨退货入库
+ /// 123：生产余料入库
+ /// 131：成本调价入库
+ /// 132：结算补差
+ /// 133：成本补差
+ ///
+ public string Inouttypes { get; set; }
+
+ ///
+ /// 数据归档状态标识
+ /// null 或 0：查询未归档的数据
+ /// 1：查询已归档的数据
+ ///
+ public int? Archived { get; set; }
}
-}
\ No newline at end of file
+
+
+}
diff --git a/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs b/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs
index 856449d..a9efdf4 100644
--- a/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs
+++ b/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs
@@ -205,5 +205,45 @@ namespace MyCode.Project.Domain.Model
[SugarColumn(ColumnName="F_SALE_ORGID")]
public int? FSALEORGID {get;set;}
+ ///
+ /// Desc:是否同步采购入库单
+ /// Default:1
+ /// Nullable:False
+ ///
+ [SugarColumn(ColumnName="F_PURCHASE_RECEIVING")]
+ public string FPURCHASERECEIVING {get;set;}
+
+ ///
+ /// Desc:是否同步采购退货单
+ /// Default:1
+ /// Nullable:False
+ ///
+ [SugarColumn(ColumnName="F_PURCHASE_RETURNORDER")]
+ public string FPURCHASERETURNORDER {get;set;}
+
+ ///
+ /// Desc:采购仓库ID
+ /// Default:0
+ /// Nullable:False
+ ///
+ [SugarColumn(ColumnName="F_PURCHASINGWAREHOUSE")]
+ public int FPURCHASINGWAREHOUSE {get;set;}
+
+ ///
+ /// Desc:采购员ID
+ /// Default:0
+ /// Nullable:False
+ ///
+ [SugarColumn(ColumnName="F_PURCHASER")]
+ public int FPURCHASER {get;set;}
+
+ ///
+ /// Desc:采购仓库编码
+ /// Default:
+ /// Nullable:False
+ ///
+ [SugarColumn(ColumnName="F_PURCHASINGWAREHOUSECODE")]
+ public string FPURCHASINGWAREHOUSECODE {get;set;}
+
}
}
diff --git a/Reportapi/MyCode.Project.Infrastructure/Enumeration/ApiEnum.cs b/Reportapi/MyCode.Project.Infrastructure/Enumeration/ApiEnum.cs
index aaca28d..79817e1 100644
--- a/Reportapi/MyCode.Project.Infrastructure/Enumeration/ApiEnum.cs
+++ b/Reportapi/MyCode.Project.Infrastructure/Enumeration/ApiEnum.cs
@@ -295,5 +295,17 @@ namespace MyCode.Project.Infrastructure.Enumeration
[Enum("分页查询退换补发单（新）", "ass-business.returnchange.fullinfoget")]
RETURNCHANGE,
+ ///
+ /// 采购入库：入库单查询单据
+ ///
+ [Enum("入库单查询单据", "erp-busiorder.goodsdocin.search")]
+ STORAGEGOODSDOCINCOUNTS,
+
+ ///
+ /// 采购退货：分页查询出库单
+ ///
+ [Enum("分页查询出库单", "erp.storage.goodsdocout.v2")]
+ ERPSTORAGEGOODSDOCOUTV2,
+
}
}
diff --git a/Reportapi/MyCode.Project.Infrastructure/JackYun/BusiOrderGoodsDocInResponse.cs b/Reportapi/MyCode.Project.Infrastructure/JackYun/BusiOrderGoodsDocInResponse.cs
index 5dc249c..c7c38a7 100644
--- a/Reportapi/MyCode.Project.Infrastructure/JackYun/BusiOrderGoodsDocInResponse.cs
+++ b/Reportapi/MyCode.Project.Infrastructure/JackYun/BusiOrderGoodsDocInResponse.cs
@@ -6,244 +6,503 @@ using System.Threading.Tasks;
namespace MyCode.Project.Infrastructure.JackYun
{
- ///
- /// 入库查询（规格模式）返回参数
- ///
+ /////
+ ///// 入库查询（规格模式）返回参数
+ /////
+ //public class BusiOrderGoodsDocInResponse
+ //{
+ // ///
+ // /// 出入库单号
+ // ///
+ // public string GoodsdocNo { get; set; }
+
+ // ///
+ // /// 出入库日期
+ // ///
+ // public DateTime? InOutDate { get; set; }
+
+ // ///
+ // /// 系统出入库日期
+ // ///
+ // public DateTime? GmtCreate { get; set; }
+
+ // ///
+ // /// 入库类型(100-期初库存101-采购入库102-调拨入库103-盘盈入库104-其他入库105-销售退货106-完工入库107-组装拆卸入库108-翻新入库109-报废入库110-残次品入库111-成本调整112-即采即入113-退料入库114-调拨退回115-维修返厂返还116-资产入库117-借用入库118-归还入库119-生产委外入库120-生产其他入库122-调拨退货入库123- 生产余料入库131-成本调价入库132-结算补差133-成本补差)
+ // ///
+ // public string InouttypeName { get; set; }
+
+ // ///
+ // /// 仓库名称
+ // ///
+ // public string WarehouseName { get; set; }
+
+ // ///
+ // /// 关联单号
+ // ///
+ // public string BillNo { get; set; }
+
+ // ///
+ // /// 来源单号
+ // ///
+ // public string SourceBillNo { get; set; }
+
+ // ///
+ // /// 收发货单号
+ // ///
+ // public string DeliveryNo { get; set; }
+
+ // ///
+ // /// 币种
+ // ///
+ // public string CurrencyCode { get; set; }
+
+ // ///
+ // /// 币种名称
+ // ///
+ // public string CurrencyCodeName { get; set; }
+
+ // ///
+ // /// 汇率
+ // ///
+ // public decimal? CurrencyRate { get; set; }
+
+ // ///
+ // /// 操作人
+ // ///
+ // public string CreateUserName { get; set; }
+
+ // ///
+ // /// 公司
+ // ///
+ // public string CompanyName { get; set; }
+
+ // ///
+ // /// 往来单位
+ // ///
+ // public string VendCustomerName { get; set; }
+
+ // ///
+ // /// 备注
+ // ///
+ // public string GoodsdocRemark { get; set; }
+
+ // ///
+ // /// 收发货备注
+ // ///
+ // public string ReceiveGoodsRemark { get; set; }
+
+ // ///
+ // /// 回传状态：0未回传；1回传失败；10不回传；11已回传；
+ // ///
+ // public string CallbackStatus { get; set; }
+
+ // ///
+ // /// 申请公司
+ // ///
+ // public string ApplyCompanyName { get; set; }
+
+ // ///
+ // /// 申请部门
+ // ///
+ // public string ApplyDepartName { get; set; }
+
+ // ///
+ // /// 申请人
+ // ///
+ // public string ApplyUserName { get; set; }
+
+ // ///
+ // /// 渠道
+ // ///
+ // public string ChannelName { get; set; }
+
+ // ///
+ // /// 货品编号
+ // ///
+ // public string GoodsNo { get; set; }
+
+ // ///
+ // /// 货品名称
+ // ///
+ // public string GoodsName { get; set; }
+
+ // ///
+ // /// 规格
+ // ///
+ // public string SkuName { get; set; }
+
+ // ///
+ // /// 条码
+ // ///
+ // public string SkuBarcode { get; set; }
+
+ // ///
+ // /// 单位
+ // ///
+ // public string UnitName { get; set; }
+
+ // ///
+ // /// 数量
+ // ///
+ // public decimal? Quantity { get; set; }
+
+ // ///
+ // /// 入库价
+ // ///
+ // public decimal? BaceCurrencyCostPrice { get; set; }
+
+ // ///
+ // /// 入库金额
+ // ///
+ // public decimal? BaceCurrencyCostAmount { get; set; }
+
+ // ///
+ // /// 本币无税单价
+ // ///
+ // public decimal? BaceCurrencyNoTaxPrice { get; set; }
+
+ // ///
+ // /// 本币无税金额
+ // ///
+ // public decimal? BaceCurrencyNoTaxAmount { get; set; }
+
+ // ///
+ // /// 本币含税单价
+ // ///
+ // public decimal? BaceCurrencyWithTaxPrice { get; set; }
+
+ // ///
+ // /// 本币含税金额
+ // ///
+ // public decimal? BaceCurrencyWithTaxAmount { get; set; }
+
+ // ///
+ // /// baceCurrencyTaxAmount
+ // ///
+ // public decimal? BaceCurrencyTaxAmount { get; set; }
+
+ // ///
+ // /// 税率
+ // ///
+ // public decimal? TaxRate { get; set; }
+
+ // ///
+ // /// 原币无税单价
+ // ///
+ // public decimal? TransNoTaxPrice { get; set; }
+
+ // ///
+ // /// 原币无税金额
+ // ///
+ // public decimal? TransNoTaxAmount { get; set; }
+
+ // ///
+ // /// 原币含税单价
+ // ///
+ // public decimal? TransHasTaxPrice { get; set; }
+
+ // ///
+ // /// 原币含税金额
+ // ///
+ // public decimal? TransHasTaxAmount { get; set; }
+
+ // ///
+ // /// 原币税额
+ // ///
+ // public decimal? TransTaxAmount { get; set; }
+
+ // ///
+ // /// 正次品 1-正品 0-次品
+ // ///
+ // public byte? IsCertified { get; set; }
+
+ // ///
+ // /// 出入库明细行备注
+ // ///
+ // public string GoodsDetailRemark { get; set; }
+
+ // ///
+ // /// 批次
+ // ///
+ // public string BatchNo { get; set; }
+
+ // ///
+ // /// 唯一码
+ // ///
+ // public string SerialNo { get; set; }
+
+ // ///
+ // /// 往来单位code
+ // ///
+ // public string VendCode { get; set; }
+
+ // ///
+ // /// 仓库code
+ // ///
+ // public string WarehouseCode { get; set; }
+
+ // ///
+ // /// 渠道编码
+ // ///
+ // public string ChannelCode { get; set; }
+ //}
+
public class BusiOrderGoodsDocInResponse
{
///
- /// 出入库单号
+ /// 出入库单号（表头数据）
///
- public string GoodsdocNo { get; set; }
+ public string goodsdocNo { get; set; }
///
- /// 出入库日期
+ /// 出入库日期（表头数据）
///
- public DateTime? InOutDate { get; set; }
+ public DateTime? inOutDate { get; set; }
///
- /// 系统出入库日期
+ /// 系统出入库日期（表头数据）
///
- public DateTime? GmtCreate { get; set; }
+ public DateTime? gmtCreate { get; set; }
///
- /// 入库类型
+ /// 入库类型（表头数据）(100-期初库存101-采购入库102-调拨入库103-盘盈入库104-其他入库105-销售退货106-完工入库107-组装拆卸入库108-翻新入库109-报废入库110-残次品入库111-成本调整112-即采即入113-退料入库114-调拨退回115-维修返厂返还116-资产入库117-借用入库118-归还入库119-生产委外入库120-生产其他入库122-调拨退货入库123- 生产余料入库131-成本调价入库132-结算补差133-成本补差)
///
- public string InouttypeName { get; set; }
+ public string inouttypeName { get; set; }
///
- /// 仓库名称
+ /// 仓库名称（表头数据）
///
- public string WarehouseName { get; set; }
+ public string warehouseName { get; set; }
///
- /// 关联单号
+ /// 关联单号（表头数据）
///
- public string BillNo { get; set; }
+ public string billNo { get; set; }
///
- /// 来源单号
+ /// 来源单号（表头数据）
///
- public string SourceBillNo { get; set; }
+ public string sourceBillNo { get; set; }
///
- /// 收发货单号
+ /// 收发货单号（表头数据）
///
- public string DeliveryNo { get; set; }
+ public string deliveryNo { get; set; }
///
- /// 币种
+ /// 币种（表头数据）
///
- public string CurrencyCode { get; set; }
+ public string currencyCode { get; set; }
///
- /// 币种名称
+ /// 币种名称（表头数据）
///
- public string CurrencyCodeName { get; set; }
+ public string currencyCodeName { get; set; }
///
- /// 汇率
+ /// 汇率（表头数据）
///
- public decimal? CurrencyRate { get; set; }
+ public decimal? currencyRate { get; set; }
///
- /// 操作人
+ /// 操作人（表头数据）
///
- public string CreateUserName { get; set; }
+ public string createUserName { get; set; }
///
- /// 公司
+ /// 公司（表头数据）
///
- public string CompanyName { get; set; }
+ public string companyName { get; set; }
///
- /// 往来单位
+ /// 往来单位（表头数据）
///
- public string VendCustomerName { get; set; }
+ public string vendCustomerName { get; set; }
///
- /// 备注
+ /// 备注（表头数据）
///
- public string GoodsdocRemark { get; set; }
+ public string goodsdocRemark { get; set; }
///
- /// 收发货备注
+ /// 收发货备注（表头数据）
///
- public string ReceiveGoodsRemark { get; set; }
+ public string receiveGoodsRemark { get; set; }
///
- /// 回传状态：0未回传；1回传失败；10不回传；11已回传；
+ /// 回传状态（表头数据）：0未回传；1回传失败；10不回传；11已回传；
///
- public string CallbackStatus { get; set; }
+ public string callbackStatus { get; set; }
///
- /// 申请公司
+ /// 申请公司（表头数据）
///
- public string ApplyCompanyName { get; set; }
+ public string applyCompanyName { get; set; }
///
- /// 申请部门
+ /// 申请部门（表头数据）
///
- public string ApplyDepartName { get; set; }
+ public string applyDepartName { get; set; }
///
- /// 申请人
+ /// 申请人（表头数据）
///
- public string ApplyUserName { get; set; }
+ public string applyUserName { get; set; }
///
- /// 渠道
+ /// 货品编号（货品行数据）
///
- public string ChannelName { get; set; }
+ public string goodsNo { get; set; }
///
- /// 货品编号
+ /// 货品名称（货品行数据）
///
- public string GoodsNo { get; set; }
+ public string goodsName { get; set; }
///
- /// 货品名称
+ /// 规格（货品行数据）
///
- public string GoodsName { get; set; }
+ public string skuName { get; set; }
///
- /// 规格
+ /// 条码（货品行数据）
///
- public string SkuName { get; set; }
+ public string skuBarcode { get; set; }
///
- /// 条码
+ /// 单位（货品行数据）
///
- public string SkuBarcode { get; set; }
+ public string unitName { get; set; }
///
- /// 单位
+ /// 数量（货品行数据）
///
- public string UnitName { get; set; }
+ public decimal? quantity { get; set; }
///
- /// 数量
+ /// 入库价（货品行数据）
///
- public decimal? Quantity { get; set; }
+ public decimal? baceCurrencyCostPrice { get; set; }
///
- /// 入库价
+ /// 入库金额（货品行数据）
///
- public decimal? BaceCurrencyCostPrice { get; set; }
+ public decimal? baceCurrencyCostAmount { get; set; }
///
- /// 入库金额
+ /// 本币无税单价（货品行数据）
///
- public decimal? BaceCurrencyCostAmount { get; set; }
+ public decimal? baceCurrencyNoTaxPrice { get; set; }
///
- /// 本币无税单价
+ /// 本币无税金额（货品行数据）
///
- public decimal? BaceCurrencyNoTaxPrice { get; set; }
+ public decimal? baceCurrencyNoTaxAmount { get; set; }
///
- /// 本币无税金额
+ /// 本币含税单价（货品行数据）
///
- public decimal? BaceCurrencyNoTaxAmount { get; set; }
+ public decimal? baceCurrencyWithTaxPrice { get; set; }
///
- /// 本币含税单价
+ /// 本币含税金额（货品行数据）
///
- public decimal? BaceCurrencyWithTaxPrice { get; set; }
+ public decimal? baceCurrencyWithTaxAmount { get; set; }
///
- /// 本币含税金额
+ /// 本币税额（货品行数据）
///
- public decimal? BaceCurrencyWithTaxAmount { get; set; }
+ public decimal? baceCurrencyTaxAmount { get; set; }
///
- /// baceCurrencyTaxAmount
+ /// 税率（货品行数据）
///
- public decimal? BaceCurrencyTaxAmount { get; set; }
+ public decimal? taxRate { get; set; }
///
- /// 税率
+ /// 原币无税单价（货品行数据）
///
- public decimal? TaxRate { get; set; }
+ public decimal? transNoTaxPrice { get; set; }
///
- /// 原币无税单价
+ /// 原币无税金额（货品行数据）
///
- public decimal? TransNoTaxPrice { get; set; }
+ public decimal? transNoTaxAmount { get; set; }
///
- /// 原币无税金额
+ /// 原币含税单价（货品行数据）
///
- public decimal? TransNoTaxAmount { get; set; }
+ public decimal? transHasTaxPrice { get; set; }
///
- /// 原币含税单价
+ /// 原币含税金额（货品行数据）
///
- public decimal? TransHasTaxPrice { get; set; }
+ public decimal? transHasTaxAmount { get; set; }
///
- /// 原币含税金额
+ /// 原币税额（货品行数据）
///
- public decimal? TransHasTaxAmount { get; set; }
+ public decimal? transTaxAmount { get; set; }
///
- /// 原币税额
+ /// 正次品（货品行数据）1-正品0-次品
///
- public decimal? TransTaxAmount { get; set; }
+ public int? isCertified { get; set; }
///
- /// 正次品 1-正品 0-次品
+ /// 出入库明细行备注（货品行数据）
///
- public byte? IsCertified { get; set; }
+ public string goodsDetailRemark { get; set; }
///
- /// 出入库明细行备注
+ /// 批次（货品行数据）
///
- public string GoodsDetailRemark { get; set; }
+ public string batchNo { get; set; }
///
- /// 批次
+ /// 唯一码（货品行数据）
///
- public string BatchNo { get; set; }
+ public string serialNo { get; set; }
///
- /// 唯一码
+ /// 往来单位编码（表头数据）
///
- public string SerialNo { get; set; }
+ public string vendCode { get; set; }
///
- /// 往来单位code
+ /// 仓库编码（表头数据）
///
- public string VendCode { get; set; }
+ public string warehouseCode { get; set; }
///
- /// 仓库code
+ /// 渠道编码（表头数据）
///
- public string WarehouseCode { get; set; }
+ public string channelCode { get; set; }
///
- /// 渠道编码
+ /// 出库唯一码关联字段（货品行数据），此值不为空时，需要查询接口获取唯一码信息:erp.storage.goodsdocserial
///
- public string ChannelCode { get; set; }
+ public string serialSourceId { get; set; }
+
+ ///
+ /// 外部单号（表头数据）
+ ///
+ public string outBillNo { get; set; }
+
+ ///
+ /// 来源跟踪单号（表头数据）
+ ///
+ public string trackInOutNo { get; set; }
+
+ ///
+ /// 物流公司（表头数据）
+ ///
+ public string logisticName { get; set; }
+
+ ///
+ /// 物流单号（表头数据）
+ ///
+ public string logisticNo { get; set; }
+
}
}
diff --git a/Reportapi/MyCode.Project.Services/IServices/IJackYunService.cs b/Reportapi/MyCode.Project.Services/IServices/IJackYunService.cs
index f325ae9..7bfdd6a 100644
--- a/Reportapi/MyCode.Project.Services/IServices/IJackYunService.cs
+++ b/Reportapi/MyCode.Project.Services/IServices/IJackYunService.cs
@@ -30,5 +30,13 @@ namespace MyCode.Project.Services
///
///
List GetReturnChangeList(DateTime now);
+
+ ///
+ /// 获取吉客云采购入库
+ ///
+ /// 截止日期
+ ///
+ ///
+ List GetPurchaseInboundData(DateTime now);
}
}
diff --git a/Reportapi/MyCode.Project.Services/IServices/IJackYunTaskService.cs b/Reportapi/MyCode.Project.Services/IServices/IJackYunTaskService.cs
index bcfc2c7..47b0005 100644
--- a/Reportapi/MyCode.Project.Services/IServices/IJackYunTaskService.cs
+++ b/Reportapi/MyCode.Project.Services/IServices/IJackYunTaskService.cs
@@ -39,5 +39,11 @@ namespace MyCode.Project.Services
///
string GetAndMergeJackReturnYunOrder(string now);
+
+ ///
+ /// 调度运行获取吉客云采购入库
+ ///
+ ///
+ void GetPurchaseInboundData(string now);
}
}
diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs
index 4210e4d..6a7773f 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs
@@ -6,6 +6,7 @@ using MyCode.Project.Infrastructure.Exceptions;
using MyCode.Project.Infrastructure.JackYun;
using System;
using System.Collections.Generic;
+using System.Diagnostics;
using System.Linq;
using System.Threading;
@@ -264,6 +265,129 @@ namespace MyCode.Project.Services.Implementation
return reslut;
}
#endregion
+
+
+ #region 获取吉客云采购入库
+ ///
+ /// 获取吉客云采购入库
+ ///
+ /// 截止日期
+ ///
+ ///
+ public List GetPurchaseInboundData(DateTime now)
+ {
+
+ int total = 1;
+ var shopConfigs = _yTKJTShopParameterRepository.Queryable().Where(t => t.FDOCUMENTSTATUS == "C" && t.FPURCHASERECEIVING == "1").ToList();
+
+ BusiOrderGoodsDocInRequest requestBizData = new BusiOrderGoodsDocInRequest();
+ //string value = "2025-06-15 00:00:00";// DateTime.Now.Date.AddDays(-5).ToString("yyyy-MM-dd HH:mm:ss") ;
+ //string value1 = "2025-06-20 00:00:00";//DateTime.Now.Date.ToString("yyyy-MM-dd HH:mm:ss");
+ string value = now.Date.AddDays(-7).ToString("yyyy-MM-dd");
+ string value1 = now.Date.ToString("yyyy-MM-dd");
+ if (now.Date.AddDays(-7) < startTime)
+ {
+ value = startTime.ToString("yyyy-MM-dd");
+ }
+ //101-采购入库
+ requestBizData.Inouttypes = "101";
+ requestBizData.InOutDateStart = value;
+ requestBizData.InOutDateEnd = value1;
+
+ requestBizData.PageSize = 200;
+ requestBizData.PageIndex = 0;
+ requestBizData.Cols = "goodsdocNo,inOutDate,gmtCreate,inouttypeName,warehouseName,billNo,sourceBillNo,deliveryNo,currencyCode,currencyCodeName,currencyRate,createUserName,companyName,vendCustomerName,goodsdocRemark,receiveGoodsRemark,callbackStatus,applyCompanyName,applyDepartName,applyUserName,goodsNo,goodsName,skuName,skuBarcode,unitName,quantity,baceCurrencyCostPrice,baceCurrencyCostAmount,baceCurrencyNoTaxPrice,baceCurrencyNoTaxAmount,baceCurrencyWithTaxPrice,baceCurrencyWithTaxAmount,baceCurrencyTaxAmount,taxRate,transNoTaxPrice,transNoTaxAmount,transHasTaxPrice,transHasTaxAmount,transTaxAmount,isCertified,goodsDetailRemark,batchNo,serialNo,vendCode,warehouseCode,channelCode,serialSourceId,outBillNo,trackInOutNo,logisticName,logisticNo";
+
+
+ List TradeTypeList = new List();
+ TradeTypeList.Add(1005);
+ List reslut = new List();
+ List trades = new List();
+ TradeTypeList.ForEach(ty =>
+ {
+
+ string lggl = JsonHelper.ToJson(requestBizData);
+ LogHelper.Info(lggl);
+ JackyunResponse response = Call(EnumAttribute.GetAttribute(ApiEnum.STORAGEGOODSDOCINCOUNTS).Value, "1.0", requestBizData);
+ string ll = JsonHelper.ToJson(response);
+ LogHelper.Info(ll);
+
+ if (response.code == "200")
+ {
+ var orderjson = JsonHelper.ToJson(response.result);
+ var list1 = JsonHelper.ToObject>(orderjson);
+
+
+ //int pageIndex = 1;
+ //int TotalResults =;
+ //while (requestBizData.PageIndex * requestBizData.PageSize < TotalResults)
+ //{
+ // //list1.data.returnChangeList.ForEach(h => h.TradeType = ty);
+
+ // trades.AddRange(list1.data);
+ // requestBizData.PageIndex = pageIndex;
+ // pageIndex++;
+ // Thread.Sleep(100);
+ // response = Call(EnumAttribute.GetAttribute(ApiEnum.STORAGEGOODSDOCINCOUNTS).Value, "1.0", requestBizData);
+ // if (response.code == "200")
+ // {
+ // orderjson = JsonHelper.ToJson(response.result);
+ // list1 = JsonHelper.ToObject>(orderjson);
+
+ // }
+ //}
+ }
+ else
+ {
+ string msg = response.msg;
+ throw new BaseException(msg);
+ }
+ });
+ //var shocodes = shopConfigs.Select(t => t.FSHOPCODE).ToList();
+ //trades = trades.Where(t => shocodes.Contains(t.ShopCode)).ToList();
+ ////reslut = trades.Select(t => new TradesItem { tradeId = t.TradeId, couponFee = 0, realFee = 0, shopCode = t.ShopCode ,orderNo=t.ReturnChangeNo, tradeNo =t.TradeNo
+ ////,isDelete=0, mainPostid=t.MainPostid,
+ //// companyName=t.CompanyName,
+ //// flagNames=t.FlagNames,
+ //// shopName=t.ShopName,
+ //// warehouseName=t.WarehouseName
+ ////}).ToList();
+
+
+
+ //reslut = trades.Select(rc => new TradesItem
+ //{
+ // tradeId = rc.TradeAfterId.ToString(),
+ // couponFee = 0,
+ // realFee = 0,
+ // shopCode = rc.ShopCode,
+ // orderNo = rc.ReturnChangeNo,
+ // tradeNo = rc.TradeNo,
+ // isDelete = 0,
+ // mainPostid = rc.MainPostid,
+ // companyName = rc.CompanyName,
+ // flagNames = rc.FlagNames,
+ // shopName = rc.ShopName,
+ // warehouseName = rc.WarehouseName,
+ // warehouseCode = rc.WarehouseCode,
+ // logisticName = rc.LogisticName,
+ // shopId = rc.ShopId.ToString(),
+ // TradeType = 8, // 假设这是售后退货类型
+ // consignTime = !string.IsNullOrWhiteSpace(rc.DeliveryTime) ? (DateTime?)DateTime.Parse(rc.DeliveryTime) : null,
+ // payTime = null, // 可根据需要设置
+ // tradeStatus = int.Parse(rc.TradeAfterStatus), // 注意类型转换
+ // warehouseId = rc.WarehouseId.ToString(),
+ // shopTypeCode = "",
+ // apiType = -114, // 默认值
+ // ReturnChangeGoodsDetail = rc.ReturnChangeGoodsDetail
+ //}).ToList();
+
+
+ //return reslut;
+
+ return new List();
+ }
+ #endregion
}
diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs
index d9033c0..f725958 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs
@@ -319,5 +319,21 @@ namespace MyCode.Project.Services.Implementation
return JsonHelper.ToJson(list);
}
#endregion
+
+ #region GetPurchaseInboundData(调度运行获取吉客云采购入库)
+ ///
+ /// 调度运行获取吉客云采购入库
+ ///
+ ///
+ public void GetPurchaseInboundData(string now)
+ {
+ DateTime runTime = DateTime.Parse(now);
+ var list = _jackYunService.GetPurchaseInboundData(runTime);
+ //SetReturnOrder(list);
+ //_workProcessService.Add(this.MerchantId, "GetAndMergeJackReturnYunOrder", "合并吉客云退货订单到新表", now, 1);
+ }
+ #endregion
+
+
}
}
diff --git a/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs b/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs
index 2910ea3..8a84207 100644
--- a/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs
+++ b/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs
@@ -218,9 +218,6 @@ namespace MyCode.Project.WebApi.Controllers
//}
//#endregion
-
-
-
#region GenerateHS256Key(JWTKEY)
///
/// GenerateHS256Key
@@ -235,7 +232,6 @@ namespace MyCode.Project.WebApi.Controllers
}
#endregion
-
#region 调度运行上传申请出入库申请单
///
@@ -248,6 +244,22 @@ namespace MyCode.Project.WebApi.Controllers
_jackYunStockinService.TaskSendInventoryMovement( sheet);
}
#endregion
+
+
+ #region 调度运行获取吉客云采购入库
+
+ ///
+ /// 调度运行获取吉客云采购入库
+ ///
+ [HttpGet]
+ [AllowAnonymous]
+ public void GetPurchaseInboundData(string now)
+ {
+ _jackYunTaskService.GetPurchaseInboundData(now);
+ }
+ #endregion
+
+
}
}