Commit 4b1207bb by Neo Turing

优化

parent babb4f2a
...@@ -8,8 +8,19 @@ namespace Kivii.Third.Scjgj ...@@ -8,8 +8,19 @@ namespace Kivii.Third.Scjgj
{ {
internal class Configs internal class Configs
{ {
public const string TableNamePlan = "PM_PLAN"; public const string TableNamePlan = "PM_PLAN";
public const string TableNamePlanDetail = "PM_PLAN_SUB"; public const string TableNamePlanDetail = "PM_PLAN_SUB";
public const string TableNameCary = "PM_CARY";
public const string TableNameProduceUnit = "PM_PRODUCE_UNIT";
public const string TableNameExecUint = "PM_EXEC_UINT";
public const string TableNameEcPlatform = "PM_EC_PLATFORM";
public const string TableNameOther = "PM_OTHER";
public const string TableNameLive = "PM_LIVE";
public const string TableNameBigData = "CORE_BIG_DATA";
public const string TableNamePlanUp = "PM_PLAN_UP";
public const string TableNameTaskSource = "PM_TASK_SOURCE";
public const string ConnectionString = "Data Source=218.94.159.228:8083/sjdb;User Id=sjqzsfzydbl;Password=admin;";
public const string ConnectionProviderName = "Oracle";
} }
} }
using Kivii.DataAnnotations;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Kivii.Third.Scjgj.Entities
{
[Api(Description = "受检单位信息")]
[Alias(Configs.TableNameCary)]
public class Cary : Entity, IEntityIgnoreCreateTable, IEntityInAssemblyDb
{
#region IEntity Ignore
[PrimaryKey]
[Ignore]
[IgnoreUpdate]
[Alias("UUID")]
public new Guid Kvid { get; set; }
[Ignore]
[Alias("CREATEDATE")]
public new DateTime CreateTime { get; set; }
/// <summary>
///// 结果通知日期
/// </summary>
[Ignore]
[Alias("NOTICE_TIME")]
public new DateTime UpdateTime { get; set; }
[Ignore]
/// <summary>
///// 任务状态(1.未下达 2.已下达 3.已领取 4.已完成 0.已撤回 5.已上传)
/// </summary>
[Alias("PLAN_STATE")]
public new int Status { get; set; }
#endregion
/// <summary>
/// 自增编号
/// </summary>
[PrimaryKey]
public int ID { get; set; }
/// <summary>
/// 受检单位编码
/// </summary>
[StringLength(30)]
public string CARY_CODE { get; set; }
/// <summary>
/// 受检单位名称
/// </summary>
[StringLength(200)]
public string CARY_NAME { get; set; }
/// <summary>
/// 受检单位法人代表
/// </summary>
[StringLength(200)]
public string CARY_PRESENT { get; set; }
/// <summary>
/// 受检单位通讯地址
/// </summary>
[StringLength(2000)]
public string CARY_ADDR { get; set; }
/// <summary>
/// 受检单位邮编
/// </summary>
[StringLength(10)]
public string CARY_ZIP_CODE { get; set; }
/// <summary>
/// 受检单位联系人
/// </summary>
[StringLength(200)]
public string CARY_LINKMAN { get; set; }
/// <summary>
/// 受检单位联系电话
/// </summary>
[StringLength(200)]
public string CARY_TEL { get; set; }
/// <summary>
/// 受检单位管理生产企业
/// </summary>
public int? CARY_RELATED_PRO_ID { get; set; }
/// <summary>
/// 受检单位所属地
/// </summary>
[StringLength(200)]
public string CARY_OWNERSHIP { get; set; }
/// <summary>
/// 统一社会信用代码(营业执照注册号)
/// </summary>
[StringLength(200)]
public string UNIFIED_SOCIAL_CREDIT_CODE { get; set; }
/// <summary>
/// 受检单位所属地(省编码)
/// </summary>
[StringLength(200)]
public string CARY_PROVINCE { get; set; }
/// <summary>
/// 受检单位所属地(市编码)
/// </summary>
[StringLength(200)]
public string CARY_CITY { get; set; }
/// <summary>
/// 受检单位所属地(区/县编码)
/// </summary>
[StringLength(200)]
public string CARY_COUNTY { get; set; }
/// <summary>
/// 经营者所在地(1:城区,2:城郊结合部,3:乡镇)
/// </summary>
[StringLength(1)]
public string OPERATOR_LOCATION { get; set; }
}
[Api(Description = "生产单位信息")]
[Alias(Configs.TableNameProduceUnit)]
public class ProduceUnit : Entity, IEntityIgnoreCreateTable, IEntityInAssemblyDb
{
#region IEntity Ignore
[Ignore]
[PrimaryKey]
[IgnoreUpdate]
[Alias("UUID")]
public new Guid Kvid { get; set; }
[Ignore]
[Alias("CREATEDATE")]
public new DateTime CreateTime { get; set; }
/// <summary>
///// 结果通知日期
/// </summary>
[Ignore]
[Alias("NOTICE_TIME")]
public new DateTime UpdateTime { get; set; }
[Ignore]
/// <summary>
///// 任务状态(1.未下达 2.已下达 3.已领取 4.已完成 0.已撤回 5.已上传)
/// </summary>
[Alias("PLAN_STATE")]
public new int Status { get; set; }
#endregion
/// <summary>
/// 自增编号
/// </summary>
[PrimaryKey]
public int ID { get; set; }
/// <summary>
/// 生产单位编码
/// </summary>
[StringLength(30)]
public string PRO_CODE { get; set; }
/// <summary>
/// 生产单位名称
/// </summary>
[StringLength(200)]
public string PRO_NAME { get; set; }
/// <summary>
/// 生产单位所属地
/// </summary>
[StringLength(200)]
public string PRO_OWNERSHIP { get; set; }
/// <summary>
/// 生产单位地址
/// </summary>
[StringLength(2000)]
public string PRO_ADDR { get; set; }
/// <summary>
/// 生产单位邮编
/// </summary>
[StringLength(10)]
public string PRO_ZIP_CODE { get; set; }
/// <summary>
/// 生产单位法人代表
/// </summary>
[StringLength(200)]
public string PRO_PRESENT { get; set; }
/// <summary>
/// 生产单位联系人
/// </summary>
[StringLength(200)]
public string PRO_LINKMAN { get; set; }
/// <summary>
/// 生产单位联系电话
/// </summary>
[StringLength(200)]
public string PRO_TEL { get; set; }
/// <summary>
/// 生产单位手机
/// </summary>
[StringLength(50)]
public string PRO_PHONE { get; set; }
/// <summary>
/// 生产单位营业执照(统一社会信用代码)
/// </summary>
[StringLength(500)]
public string PRO_BUS_LICENCE { get; set; }
/// <summary>
/// 生产单位机构代码
/// </summary>
[StringLength(200)]
public string PRO_ORGAN_CODE { get; set; }
/// <summary>
/// 生产单位企业规模
/// 1:大, 2:中, 3:小
/// </summary>
[StringLength(50)]
public string PRO_SACLE { get; set; }
/// <summary>
/// 经济类型内资
/// 1:国有,2:集体,3:股份合作,4:联营,5:有限责任公司,6:股份有限公司,7:私营,8:其他企业
/// </summary>
public char? ECO_INSIDE { get; set; }
/// <summary>
/// 生产单位质量认证体系
/// 1:工业产品生产许可证,3:CCC,4:其他,5:强制性产品认证,6:特种设备制造许可
/// </summary>
public char? PRO_QUALITY_PASS { get; set; }
/// <summary>
/// 经济类型港澳台
/// 1:合资经营,2:合作经营,3:港澳台独资经营,4:澳台投资股份有限公司
/// </summary>
public char? ECO_HMT { get; set; }
/// <summary>
/// 经济类型外资
/// 1:中外合资,2:中外合作,3:外资企业,4:外商投资股份有限公司,5:有限责任公司
/// </summary>
public char? ECO_OUTSIDE { get; set; }
/// <summary>
/// 经济类型个体
/// 1:个体户,2:个人合作,3:个人独资
/// </summary>
public char? ECO_SINGLE { get; set; }
/// <summary>
/// 生产单位证书编码
/// </summary>
[StringLength(500)]
public string PRO_CERT_CODE { get; set; }
/// <summary>
/// 生产单位企业规模类型
/// </summary>
public char? PRO_SACLE_TYPE { get; set; }
/// <summary>
/// 组织机构代码
/// </summary>
[StringLength(100)]
public string PRO_ORG_CODE { get; set; }
/// <summary>
/// 机构名称
/// </summary>
[StringLength(200)]
public string PRO_ORG_NAME { get; set; }
/// <summary>
/// 企业信用代码
/// </summary>
[StringLength(100)]
public string PRO_CREDIT_CODE { get; set; }
/// <summary>
/// 是否为规模以上企业
/// </summary>
[StringLength(10)]
public string PRO_IS_SCALE { get; set; }
/// <summary>
/// 品牌建设
/// 1:江苏名称,2:江苏质量奖,3:中国质量奖,4:著名商标,5:知名商标,6:无
/// </summary>
public char? PRO_BRAND_BUILDING { get; set; }
/// <summary>
/// 产品分类代码
/// </summary>
[StringLength(100)]
public string PRO_CLASS_CODE { get; set; }
/// <summary>
/// 生产单位所属地(省编码)
/// </summary>
[StringLength(200)]
public string PRO_PROVINCE { get; set; }
/// <summary>
/// 生产单位所属地(市编码)
/// </summary>
[StringLength(200)]
public string PRO_CITY { get; set; }
/// <summary>
/// 生产单位所属地(区/县编码)
/// </summary>
[StringLength(200)]
public string PRO_COUNTY { get; set; }
/// <summary>
/// 产品分类名称
/// </summary>
[StringLength(100)]
public string PRO_CPMC_NAME { get; set; }
}
[Api(Description = "抽样机构信息")]
[Alias(Configs.TableNameExecUint)]
public class ExecUint : Entity, IEntityIgnoreCreateTable, IEntityInAssemblyDb
{
#region IEntity Ignore
[Ignore]
[PrimaryKey]
[IgnoreUpdate]
[Alias("UUID")]
public new Guid Kvid { get; set; }
[Ignore]
[Alias("CREATEDATE")]
public new DateTime CreateTime { get; set; }
/// <summary>
///// 结果通知日期
/// </summary>
[Ignore]
[Alias("NOTICE_TIME")]
public new DateTime UpdateTime { get; set; }
[Ignore]
/// <summary>
///// 任务状态(1.未下达 2.已下达 3.已领取 4.已完成 0.已撤回 5.已上传)
/// </summary>
[Alias("PLAN_STATE")]
public new int Status { get; set; }
#endregion
/// <summary>
/// 自增编号
/// </summary>
[PrimaryKey]
public int ID { get; set; }
/// <summary>
/// 抽样单位编码
/// </summary>
[StringLength(30)]
public string EXEC_CODE { get; set; }
/// <summary>
/// 抽样单位名称
/// </summary>
[StringLength(200)]
public string EXEC_NAME { get; set; }
/// <summary>
/// 抽样单位地址
/// </summary>
[StringLength(2000)]
public string EXEC_ADDR { get; set; }
/// <summary>
/// 抽样单位邮编
/// </summary>
[StringLength(10)]
public string EXEC_ZIP_CODE { get; set; }
/// <summary>
/// 抽样单位联系人
/// </summary>
[StringLength(200)]
public string EXEC_LINKMAN { get; set; }
/// <summary>
/// 抽样单位联系电话
/// </summary>
[StringLength(200)]
public string EXEC_TEL { get; set; }
/// <summary>
/// 抽样单位传真
/// </summary>
[StringLength(200)]
public string EXEC_FAX { get; set; }
}
[Api(Description = "电商单位信息")]
[Alias(Configs.TableNameEcPlatform)]
public class EcPlatform : Entity, IEntityIgnoreCreateTable, IEntityInAssemblyDb
{
#region IEntity Ignore
[Ignore]
[PrimaryKey]
[IgnoreUpdate]
[Alias("UUID")]
public new Guid Kvid { get; set; }
[Ignore]
[Alias("CREATEDATE")]
public new DateTime CreateTime { get; set; }
/// <summary>
///// 结果通知日期
/// </summary>
[Ignore]
[Alias("NOTICE_TIME")]
public new DateTime UpdateTime { get; set; }
[Ignore]
/// <summary>
///// 任务状态(1.未下达 2.已下达 3.已领取 4.已完成 0.已撤回 5.已上传)
/// </summary>
[Alias("PLAN_STATE")]
public new int Status { get; set; }
#endregion
/// <summary>
/// 自增id
/// </summary>
[PrimaryKey]
public int EC_ID { get; set; }
/// <summary>
/// 网店名称
/// </summary>
[StringLength(200)]
public string ONLINE_STORE_NAME { get; set; }
/// <summary>
/// 网店通讯地址
/// </summary>
[StringLength(2000)]
public string ONLINE_STORE_ADDR { get; set; }
/// <summary>
/// 网店营业注册码
/// </summary>
[StringLength(200)]
public string ONLINE_STORE_POLL_CODE { get; set; }
/// <summary>
/// 网店联系方式
/// </summary>
[StringLength(200)]
public string ONLINE_STORE_CONTACT { get; set; }
/// <summary>
/// 网店网址链接
/// </summary>
[StringLength(500)]
public string ONLINE_STORE_LINK { get; set; }
/// <summary>
/// 电商平台名称
/// </summary>
[StringLength(200)]
public string EC_PLATFORM_NAME { get; set; }
/// <summary>
/// 电商平台链接
/// </summary>
[StringLength(200)]
public string EC_PLATFORM_LINK { get; set; }
/// <summary>
/// 网店订单编号
/// </summary>
[StringLength(200)]
public string ONLINE_ORDER_CODE { get; set; }
/// <summary>
/// 商品网址链接(含商品唯一识别号)
/// </summary>
[StringLength(500)]
public string LINKS_WEB_SITES { get; set; }
/// <summary>
/// 网店所属地
/// </summary>
[StringLength(200)]
public string ONLINE_OWNERSHIP { get; set; }
/// <summary>
/// 平台所属地
/// </summary>
[StringLength(200)]
public string EC_PLATFORM_OWNERSHIP { get; set; }
/// <summary>
/// 平台所属地(省编码)
/// </summary>
[StringLength(200)]
public string EC_PLATFORM_PROVINCE { get; set; }
/// <summary>
/// 平台所属地(市编码)
/// </summary>
[StringLength(200)]
public string EC_PLATFORM_CITY { get; set; }
/// <summary>
/// 平台所属地(区/县编码)
/// </summary>
[StringLength(200)]
public string EC_PLATFORM_COUNTY { get; set; }
/// <summary>
/// 网店所属地(省编码)
/// </summary>
[StringLength(200)]
public string ONLINE_PROVINCE { get; set; }
/// <summary>
/// 网店所属地(市编码)
/// </summary>
[StringLength(200)]
public string ONLINE_CITY { get; set; }
/// <summary>
/// 网店所属地(区/县编码)
/// </summary>
[StringLength(200)]
public string ONLINE_COUNTY { get; set; }
/// <summary>
/// 电商类型,1:企业店铺,2:自然人店铺
/// </summary>
public char? ONLINE_TYPE { get; set; }
}
[Api(Description = "其他来源单位信息")]
[Alias(Configs.TableNameOther)]
public class Other : Entity, IEntityIgnoreCreateTable, IEntityInAssemblyDb
{
#region IEntity Ignore
[Ignore]
[PrimaryKey]
[IgnoreUpdate]
[Alias("UUID")]
public new Guid Kvid { get; set; }
[Ignore]
[Alias("CREATEDATE")]
public new DateTime CreateTime { get; set; }
/// <summary>
///// 结果通知日期
/// </summary>
[Ignore]
[Alias("NOTICE_TIME")]
public new DateTime UpdateTime { get; set; }
[Ignore]
/// <summary>
///// 任务状态(1.未下达 2.已下达 3.已领取 4.已完成 0.已撤回 5.已上传)
/// </summary>
[Alias("PLAN_STATE")]
public new int Status { get; set; }
#endregion
/// <summary>
/// 自增编号
/// </summary>
[PrimaryKey]
public int ID { get; set; }
/// <summary>
/// 其他来源单位编码
/// </summary>
[StringLength(30)]
public string OTHER_CODE { get; set; }
/// <summary>
/// 其他来源单位名称
/// </summary>
[StringLength(200)]
public string OTHER_NAME { get; set; }
/// <summary>
/// 其他来源单位法人代表
/// </summary>
[StringLength(200)]
public string OTHER_PRESENT { get; set; }
/// <summary>
/// 其他来源单位通信地址
/// </summary>
[StringLength(2000)]
public string OTHER_ADDR { get; set; }
/// <summary>
/// 其他来源单位邮编
/// </summary>
[StringLength(10)]
public string OTHER_ZIP_CODE { get; set; }
/// <summary>
/// 其他来源单位联系人
/// </summary>
[StringLength(200)]
public string OTHER_LINKMAN { get; set; }
/// <summary>
/// 其他来源单位联系电话
/// </summary>
[StringLength(20)]
public string OTHER_TEL { get; set; }
/// <summary>
/// 统一社会信用代码(营业执照注册号)
/// </summary>
[StringLength(200)]
public string OTHER_UNIFIED_SOCIAL_CREDIT { get; set; }
}
[Api(Description = "直播平台信息")]
[Alias(Configs.TableNameLive)]
public class Live : Entity, IEntityIgnoreCreateTable, IEntityInAssemblyDb
{
#region IEntity Ignore
[Ignore]
[PrimaryKey]
[IgnoreUpdate]
[Alias("UUID")]
public new Guid Kvid { get; set; }
[Ignore]
[Alias("CREATEDATE")]
public new DateTime CreateTime { get; set; }
/// <summary>
///// 结果通知日期
/// </summary>
[Ignore]
[Alias("NOTICE_TIME")]
public new DateTime UpdateTime { get; set; }
[Ignore]
/// <summary>
///// 任务状态(1.未下达 2.已下达 3.已领取 4.已完成 0.已撤回 5.已上传)
/// </summary>
[Alias("PLAN_STATE")]
public new int Status { get; set; }
#endregion
/// <summary>
/// 直播平台ID
/// </summary>
[PrimaryKey]
public int LIVE_ID { get; set; }
/// <summary>
/// 直播平台名称
/// 1-淘宝, 2-苏宁易购, 3-天猫, 4-京东, 5-1号店, 6-唯品会, 7-亚马逊, 8-当当网, 9-国美在线, 10-3D打印在线,
/// 11-三迪时空, 12-飞牛网, 13-其他, 14-阿里巴巴, 15-拼多多, 16-聚美优品, 17-孩子王, 18-邮储食堂, 19-小米有品,
/// 20-1688, 21-抖音, 22-快手小店, 23-快手, 24-食行生鲜
/// </summary>
[StringLength(200)]
public string LIVE_NAME { get; set; }
/// <summary>
/// 直播平台所属地
/// </summary>
[StringLength(200)]
public string LIVE_OWNERSHIP { get; set; }
/// <summary>
/// 直播平台所属地(省编码)
/// </summary>
[StringLength(200)]
public string LIVE_PROVINCE { get; set; }
/// <summary>
/// 直播平台所属地(市编码)
/// </summary>
[StringLength(200)]
public string LIVE_CITY { get; set; }
/// <summary>
/// 直播平台所属地(区/县编码)
/// </summary>
[StringLength(200)]
public string LIVE_COUNTY { get; set; }
/// <summary>
/// 直播间ID
/// </summary>
[StringLength(200)]
public string LIVE_ROOM_CODE { get; set; }
/// <summary>
/// 直播间昵称
/// </summary>
[StringLength(200)]
public string LIVE_ROOM_NAME { get; set; }
/// <summary>
/// 是否本平台直接销售
/// </summary>
public char? IF_SALES { get; set; }
}
[Api(Description = "抽样照片信息")]
[Alias(Configs.TableNameBigData)]
public class BigData : Entity, IEntityIgnoreCreateTable, IEntityInAssemblyDb
{
#region IEntity Ignore
[PrimaryKey]
[IgnoreUpdate]
[Alias("UUID")]
public new Guid Kvid { get; set; }
[Alias("CREATEDATE")]
public new DateTime CreateTime { get; set; }
/// <summary>
///// 结果通知日期
/// </summary>
//[Ignore]
[Alias("NOTICE_TIME")]
public new DateTime UpdateTime { get; set; }
//[Ignore]
/// <summary>
///// 任务状态(1.未下达 2.已下达 3.已领取 4.已完成 0.已撤回 5.已上传)
/// </summary>
[Alias("PLAN_STATE")]
public new int Status { get; set; }
#endregion
[PrimaryKey]
public long DATA_ID { get; set; }
public byte[] CONTENT { get; set; }
[StringLength(100)]
public string DATA_TYPE { get; set; }
[StringLength(100)]
public string FILE_NAME { get; set; }
public DateTime? SAVE_TIME { get; set; }
public int DATA_BYTES { get; set; }
/// <summary>
/// 关联PM_PLAN_SUB表的照片ID
/// IMG_GROUP_ID,IMG_DELIVERY_GROUP_ID,IMG_101_GROUP_ID,IMG_102_GROUP_ID,IMG_103_GROUP_ID,IMG_104_GROUP_ID,IMG_105_GROUP_ID,IMG_106_GROUP_ID,IMG_107_GROUP_ID,IMG_108_GROUP_ID,IMG_109_GROUP_ID,IMG_110_GROUP_ID,IMG_111_GROUP_ID,IMG_DELIVERY_GROUP_ID,IMG_101_GROUP_ID,IMG_102_GROUP_ID,IMG_103_GROUP_ID,IMG_104_GROUP_ID,IMG_105_GROUP_ID,IMG_106_GROUP_ID,IMG_107_GROUP_ID,IMG_108_GROUP_ID,IMG_109_GROUP_ID,IMG_110_GROUP_ID,IMG_111_GROUP_ID
/// </summary>
public long? GROUP_ID { get; set; }
/// <summary>
/// 如果数据保存在文件系统,则记录保存的文件路径
/// </summary>
[StringLength(1000)]
public string SAVE_FILE_PATH { get; set; }
/// <summary>
/// 关联数据ID
/// </summary>
public long? REF_DATA_ID { get; set; }
}
[Api(Description = "批次采集更新表")]
[Alias(Configs.TableNamePlanUp)]
public class PlanUp : Entity, IEntityIgnoreCreateTable, IEntityInAssemblyDb
{
#region IEntity Ignore
[PrimaryKey]
[IgnoreUpdate]
[Alias("UUID")]
public new Guid Kvid { get; set; }
[Alias("CREATEDATE")]
public new DateTime CreateTime { get; set; }
/// <summary>
///// 结果通知日期
/// </summary>
//[Ignore]
[Alias("NOTICE_TIME")]
public new DateTime UpdateTime { get; set; }
//[Ignore]
/// <summary>
///// 任务状态(1.未下达 2.已下达 3.已领取 4.已完成 0.已撤回 5.已上传)
/// </summary>
[Alias("PLAN_STATE")]
public new int Status { get; set; }
#endregion
/// <summary>
/// 批次ID
/// </summary>
[PrimaryKey]
public int ID { get; set; }
/// <summary>
/// 任务下载 0:未下载 1:已下载
/// </summary>
public char? RWXZ { get; set; }
/// <summary>
/// 任务编号
/// </summary>
[StringLength(30)]
public string PLAN_CODE { get; set; }
}
[Api(Description = "任务来源对照表")]
[Alias(Configs.TableNameTaskSource)]
public class TaskSource : Entity, IEntityIgnoreCreateTable, IEntityInAssemblyDb
{
#region IEntity Ignore
[PrimaryKey]
[IgnoreUpdate]
[Alias("UUID")]
public new Guid Kvid { get; set; }
[Alias("CREATEDATE")]
public new DateTime CreateTime { get; set; }
/// <summary>
///// 结果通知日期
/// </summary>
//[Ignore]
[Alias("NOTICE_TIME")]
public new DateTime UpdateTime { get; set; }
//[Ignore]
/// <summary>
///// 任务状态(1.未下达 2.已下达 3.已领取 4.已完成 0.已撤回 5.已上传)
/// </summary>
[Alias("PLAN_STATE")]
public new int Status { get; set; }
#endregion
/// <summary>
/// 行政区划 省局为3200 南京3201 无锡3202 其他市类推,各市行政区划前4位
/// </summary>
[StringLength(4)]
public string AREA_NO { get; set; }
/// <summary>
/// 任务来源代码
/// </summary>
[StringLength(10)]
public string TASK_SOURCE { get; set; }
/// <summary>
/// 任务来源名称
/// </summary>
[StringLength(100)]
public string PM_CITY { get; set; }
}
}
using Kivii.DataAnnotations; using Kivii.DataAnnotations;
using Kivii.Funq;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
...@@ -32,7 +33,7 @@ namespace Kivii.Third.Scjgj.Entities ...@@ -32,7 +33,7 @@ namespace Kivii.Third.Scjgj.Entities
///// 任务状态(1.未下达 2.已下达 3.已领取 4.已完成 0.已撤回 5.已上传) ///// 任务状态(1.未下达 2.已下达 3.已领取 4.已完成 0.已撤回 5.已上传)
/// </summary> /// </summary>
[Alias("PLAN_STATE")] [Alias("PLAN_STATE")]
public new int Status { get; set; } public new int Status { get; set; }
#endregion #endregion
/// <summary> /// <summary>
...@@ -320,11 +321,11 @@ namespace Kivii.Third.Scjgj.Entities ...@@ -320,11 +321,11 @@ namespace Kivii.Third.Scjgj.Entities
[Alias("CREATEDATE")] [Alias("CREATEDATE")]
public new DateTime CreateTime { get; set; } public new DateTime CreateTime { get; set; }
[Ignore] [Ignore]
public new DateTime UpdateTime { get; set; } public new DateTime UpdateTime { get; set; }
//[Ignore] //[Ignore]
/// 抽检任务状态 0:抽样人员待上传 1:抽样人员已上传 2:抽样信息上传照片未上传 3:抽样信息上传照片已上传 4:已提交(提交省公司) 5:提交审批 6:审批通过 7:驳回 8:无效 9:删除 /// 抽检任务状态 0:抽样人员待上传 1:抽样人员已上传 2:抽样信息上传照片未上传 3:抽样信息上传照片已上传 4:已提交(提交省公司) 5:提交审批 6:审批通过 7:驳回 8:无效 9:删除
[Alias("STATE")] [Alias("STATE")]
public new int Status { get; set; } public new int Status { get; set; }
#endregion #endregion
/// <summary> /// <summary>
...@@ -371,13 +372,18 @@ namespace Kivii.Third.Scjgj.Entities ...@@ -371,13 +372,18 @@ namespace Kivii.Third.Scjgj.Entities
/// <summary> /// <summary>
/// 受检单位编号 /// 受检单位编号
/// </summary> /// </summary>
public int CARY_ID { get; set; } public int? CARY_ID { get; set; }
[Ignore]
public Cary Cary { get; set; }
/// <summary> /// <summary>
/// 生产单位编号 /// 生产单位编号
/// </summary> /// </summary>
public int PRO_ID { get; set; } public int? PRO_ID { get; set; }
[Ignore]
public ProduceUnit ProduceUnit { get; set; }
/// <summary> /// <summary>
/// 受检产品编号 /// 受检产品编号
/// </summary> /// </summary>
...@@ -458,7 +464,10 @@ namespace Kivii.Third.Scjgj.Entities ...@@ -458,7 +464,10 @@ namespace Kivii.Third.Scjgj.Entities
/// <summary> /// <summary>
/// 抽样单位编号 /// 抽样单位编号
/// </summary> /// </summary>
public int EXEC_ID { get; set; } public int? EXEC_ID { get; set; }
[Ignore]
public ExecUint ExecUint { get; set; }
/// <summary> /// <summary>
/// 备注 /// 备注
...@@ -570,7 +579,10 @@ namespace Kivii.Third.Scjgj.Entities ...@@ -570,7 +579,10 @@ namespace Kivii.Third.Scjgj.Entities
/// <summary> /// <summary>
/// 电商平台编号 /// 电商平台编号
/// </summary> /// </summary>
public int EC_ID { get; set; } public int? EC_ID { get; set; }
[Ignore]
public EcPlatform EcPlatform { get; set; }
/// <summary> /// <summary>
/// 发票号 /// 发票号
...@@ -928,7 +940,10 @@ namespace Kivii.Third.Scjgj.Entities ...@@ -928,7 +940,10 @@ namespace Kivii.Third.Scjgj.Entities
/// <summary> /// <summary>
/// 其他来源单位编码 /// 其他来源单位编码
/// </summary> /// </summary>
public int OTHER_ID { get; set; } public int? OTHER_ID { get; set; }
[Ignore]
public Other Other { get; set; }
/// <summary> /// <summary>
/// 批次数据同步状态 /// 批次数据同步状态
...@@ -989,5 +1004,4 @@ namespace Kivii.Third.Scjgj.Entities ...@@ -989,5 +1004,4 @@ namespace Kivii.Third.Scjgj.Entities
[StringLength(30)] [StringLength(30)]
public string IMG_111_GROUP_ID { get; set; } public string IMG_111_GROUP_ID { get; set; }
} }
} }
using Kivii.Lims.Entities; using Kivii.Funq;
using Kivii.Lims.Entities;
using Kivii.Linq;
using Kivii.Third.Scjgj.Entities; using Kivii.Third.Scjgj.Entities;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
...@@ -10,14 +13,247 @@ namespace Kivii.Third.Scjgj ...@@ -10,14 +13,247 @@ namespace Kivii.Third.Scjgj
{ {
internal static class Extensions internal static class Extensions
{ {
internal static Report ConvertTo(this PlanDetail item) internal static PlanDetail ConvertTo(this PlanDetail item, IDbConnection conn = null)
{ {
Report rtns = new Report(); PlanDetail rtns = new PlanDetail();
rtns.Metadata = new Dictionary<string, string>(); bool connDispose = false;
rtns.Metadata["SamplingOrderID"] = $"{item.PLAN_CODE}{item.LOT_NUM}"; if (conn == null)
rtns.SampleSourceBatchNumber = item.PLAN_CODE; {
connDispose = true;
var factory = Kivii.Linq.LinqUtils.GetLinqConnectionFactory("Data Source=218.94.159.228:8083/sjdb;User Id=sjqzsfzydbl;Password=admin;", "Oracle");
conn = factory.OpenDbConnection();
}
switch (item.CHECK_STATE)
{
case "1":
rtns = item.ConvertToNormal(conn);
break;
case "2":
rtns = item.ConvertToReject(conn);
break;
case "3":
rtns = item.ConvertToUnable(conn);
break;
case "4":
rtns = item.ConvertToFinished(conn);
break;
case "5":
rtns = item.ConvertToMarket(conn);
break;
case "6":
rtns = item.ConvertToOther(conn);
break;
case null:
rtns = item.ConvertToCommerce(conn);
break;
default:
break;
}
if (connDispose) { conn.Dispose(); }
return rtns; return rtns;
} }
/// <summary>
/// 正常抽样
/// </summary>
/// <param name="item"></param>
/// <param name="conn"></param>
/// <returns></returns>
internal static PlanDetail ConvertToNormal(this PlanDetail item, IDbConnection conn)
{
if (item.CARY_ID != null)
{
item.Cary = GetCaryById(conn, item.CARY_ID);
}
if (item.PRO_ID != null)
{
item.ProduceUnit = GetProduceUnitById(conn, item.PRO_ID);
}
if (item.EXEC_ID != null)
{
item.ExecUint = GetExecUintById(conn, item.EXEC_ID);
}
return item;
}
/// <summary>
/// 拒绝采样
/// </summary>
/// <param name="item"></param>
/// <param name="conn"></param>
/// <returns></returns>
internal static PlanDetail ConvertToReject(this PlanDetail item, IDbConnection conn)
{
return item;
}
/// <summary>
/// 无法抽样
/// </summary>
/// <param name="item"></param>
/// <param name="conn"></param>
/// <returns></returns>
internal static PlanDetail ConvertToUnable(this PlanDetail item, IDbConnection conn)
{
return item;
}
/// <summary>
/// 成品油抽样
/// </summary>
/// <param name="item"></param>
/// <param name="conn"></param>
/// <returns></returns>
internal static PlanDetail ConvertToFinished(this PlanDetail item, IDbConnection conn)
{
return item;
}
/// <summary>
/// 市场抽样
/// </summary>
/// <param name="item"></param>
/// <param name="conn"></param>
/// <returns></returns>
internal static PlanDetail ConvertToMarket(this PlanDetail item, IDbConnection conn)
{
if (item.CARY_ID != null)
{
item.Cary = GetCaryById(conn, item.CARY_ID);
}
if (item.EXEC_ID != null)
{
item.ExecUint = GetExecUintById(conn, item.EXEC_ID);
}
if (item.PRO_ID != null)
{
item.ProduceUnit = GetProduceUnitById(conn, item.PRO_ID);
}
return item;
}
/// <summary>
/// 其他抽样
/// </summary>
/// <param name="item"></param>
/// <param name="conn"></param>
/// <returns></returns>
internal static PlanDetail ConvertToOther(this PlanDetail item, IDbConnection conn)
{
if (item.CARY_ID != null)
{
item.Cary = GetCaryById(conn, item.CARY_ID);
}
if (item.EXEC_ID != null)
{
item.ExecUint = GetExecUintById(conn, item.EXEC_ID);
}
if (item.OTHER_ID != null)
{
item.Other = GetOtherById(conn, item.OTHER_ID);
}
return item;
}
/// <summary>
/// 电商买样
/// </summary>
/// <param name="item"></param>
/// <param name="conn"></param>
/// <returns></returns>
internal static PlanDetail ConvertToCommerce(this PlanDetail item, IDbConnection conn)
{
if (item.CARY_ID != null)
{
item.Cary = GetCaryById(conn, item.CARY_ID);
}
if (item.EXEC_ID != null)
{
item.ExecUint = GetExecUintById(conn, item.EXEC_ID);
}
if (item.EC_ID != null)
{
item.EcPlatform = GetEcPlatformById(conn, item.EC_ID);
}
if (item.PRO_ID != null)
{
item.ProduceUnit = GetProduceUnitById(conn, item.PRO_ID);
}
return item;
}
/// <summary>
/// 受检单位信息
/// </summary>
/// <param name="conn"></param>
/// <param name="caryId"></param>
/// <returns></returns>
internal static Cary GetCaryById(IDbConnection conn, int? caryId)
{
if (caryId == null) return null;
var query = conn.From<Cary>();
query.Where(o => o.ID == caryId);
return conn.Single(query);
}
/// <summary>
/// 生产单位信息
/// </summary>
/// <param name="conn"></param>
/// <param name="proId"></param>
/// <returns></returns>
internal static ProduceUnit GetProduceUnitById(IDbConnection conn, int? proId)
{
if (proId == null) return null;
var query = conn.From<ProduceUnit>();
query.Where(o => o.ID == proId);
return conn.Single(query);
}
/// <summary>
/// 抽样机构信息
/// </summary>
/// <param name="conn"></param>
/// <param name="execId"></param>
/// <returns></returns>
internal static ExecUint GetExecUintById(IDbConnection conn, int? execId)
{
if (execId == null) return null;
var query = conn.From<ExecUint>();
query.Where(o => o.ID == execId);
return conn.Single(query);
}
/// <summary>
/// 电商单位信息
/// </summary>
/// <param name="conn"></param>
/// <param name="ecId"></param>
/// <returns></returns>
internal static EcPlatform GetEcPlatformById(IDbConnection conn, int? ecId)
{
if (ecId == null) return null;
var query = conn.From<EcPlatform>();
query.Where(o => o.EC_ID == ecId);
return conn.Single(query);
}
/// <summary>
/// 其他来源单位信息
/// </summary>
/// <param name="conn"></param>
/// <param name="otherId"></param>
/// <returns></returns>
internal static Other GetOtherById(IDbConnection conn, int? otherId)
{
if (otherId == null) return null;
var query = conn.From<Other>();
query.Where(o => o.ID == otherId);
return conn.Single(query);
}
} }
} }
...@@ -54,8 +54,9 @@ ...@@ -54,8 +54,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Configs.cs" /> <Compile Include="Configs.cs" />
<Compile Include="Entities\OtherEntity.cs" />
<Compile Include="Extensions.cs" /> <Compile Include="Extensions.cs" />
<Compile Include="Plan.cs" /> <Compile Include="Entities\Plan.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RestfulPlan.cs" /> <Compile Include="RestfulPlan.cs" />
</ItemGroup> </ItemGroup>
......
...@@ -26,7 +26,7 @@ namespace Kivii.Third.Scjgj ...@@ -26,7 +26,7 @@ namespace Kivii.Third.Scjgj
{ {
var rtns = new RestfulQueryResponse<Plan>(); var rtns = new RestfulQueryResponse<Plan>();
rtns.Results = new List<Plan>(); rtns.Results = new List<Plan>();
var factory = Kivii.Linq.LinqUtils.GetLinqConnectionFactory("Data Source=218.94.159.228:8083/sjdb;User Id=sjqzsfzydbl;Password=admin;", "Oracle"); var factory = Kivii.Linq.LinqUtils.GetLinqConnectionFactory(Configs.ConnectionString, Configs.ConnectionProviderName);
using (var conn = factory.OpenDbConnection()) using (var conn = factory.OpenDbConnection())
{ {
try try
...@@ -86,7 +86,7 @@ namespace Kivii.Third.Scjgj ...@@ -86,7 +86,7 @@ namespace Kivii.Third.Scjgj
{ {
var rtns = new RestfulQueryResponse<PlanDetail>(); var rtns = new RestfulQueryResponse<PlanDetail>();
rtns.Results = new List<PlanDetail>(); rtns.Results = new List<PlanDetail>();
var factory = Kivii.Linq.LinqUtils.GetLinqConnectionFactory("Data Source=218.94.159.228:8083/sjdb;User Id=sjqzsfzydbl;Password=admin;", "Oracle"); var factory = Kivii.Linq.LinqUtils.GetLinqConnectionFactory(Configs.ConnectionString, Configs.ConnectionProviderName);
using (var conn = factory.OpenDbConnection()) using (var conn = factory.OpenDbConnection())
{ {
try try
...@@ -134,7 +134,26 @@ namespace Kivii.Third.Scjgj ...@@ -134,7 +134,26 @@ namespace Kivii.Third.Scjgj
{ {
BatchNumber.ThrowIfNullOrEmpty("请传入计划编号"); BatchNumber.ThrowIfNullOrEmpty("请传入计划编号");
PlanNumber.ThrowIfNullOrEmpty("请传入批次号"); PlanNumber.ThrowIfNullOrEmpty("请传入批次号");
return base.OnExecution(req, res); var rtns = new RestfulQueryResponse<PlanDetail>();
rtns.Results = new List<PlanDetail>();
var factory = Kivii.Linq.LinqUtils.GetLinqConnectionFactory(Configs.ConnectionString, Configs.ConnectionProviderName);
using (var conn = factory.OpenDbConnection())
{
try
{
var query = conn.From<PlanDetail>();
query.Where(o => o.PLAN_CODE == BatchNumber && o.LOT_NUM == PlanNumber);
var planDetail = conn.Single(query);
var result = planDetail.ConvertTo(conn);
rtns.Results.Add(result);
}
catch (Exception ex)
{
throw ex;
}
}
return rtns;
} }
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment