新增质量模块(工艺执行书 / 样茧试缫)与报表中心
质量模块: - 11 张工艺执行书表:封面、试产、选剥茧(含混茧明细)、试缫与大样、煮茧(含分车间配温、副煮车间)、自动缫(含大样)、后缫 - 10 张样茧试缫表:原料小样/综合样主表 + 选茧、解舒、茧幅、切剖、清洁洁净、茧丝百回纤度 - 服务与接口、主控指针回写(列表 √ 标记)、封面编号自增、报表数据包 - 前端 8 张报表打印版式、7 类工艺单据与 6 类调查录入弹窗、字段驱动表单/表格组件 - 菜单种子新增「质量」目录,样茧子表增加 YjssType 判别列,避免原料小样与综合样自增 Id 重号串数据 报表中心: - 报表模板管理、锐浪 grhtml5 加载与预览、全屏设计面板、数据源 Provider(落丝记录、职工花名册) 其他:同步工作进度 1-11 文档、开发数据库快照、.gitignore 忽略运行日志目录
This commit is contained in:
@@ -0,0 +1,62 @@
|
||||
using F9WebAiTest.Domain.Entities.QC.Gyzxs;
|
||||
|
||||
namespace F9WebAiTest.Application.Dtos.QC;
|
||||
|
||||
/// <summary>工艺执行书主列表行(庄口 + 各子单据完成标记)</summary>
|
||||
public class GyzxsDocVersionDto
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public long GyzkId { get; set; }
|
||||
public string ZhuangKouName { get; set; } = "";
|
||||
public string ZhuangKouCode { get; set; } = "";
|
||||
public int Year { get; set; }
|
||||
public int Sort { get; set; }
|
||||
|
||||
public long ShichanId { get; set; }
|
||||
public long FengMianId { get; set; }
|
||||
public long XbjId { get; set; }
|
||||
public long XbjSsdyId { get; set; }
|
||||
public long ZhuJianId { get; set; }
|
||||
public long ZdsId { get; set; }
|
||||
public long ZdsDyId { get; set; }
|
||||
public long HsId { get; set; }
|
||||
|
||||
/// <summary>该庄口已录入的规格(自动缫 / 后缫 / 试产 / 试缫大样 均按 庄口+规格 唯一)</summary>
|
||||
public List<string> Guiges { get; set; } = new();
|
||||
}
|
||||
|
||||
/// <summary>选剥茧(含混茧比例明细)</summary>
|
||||
public class GyzxsXbjDto
|
||||
{
|
||||
public GyzxsXbj Xbj { get; set; } = new();
|
||||
public List<GyzxsXbjHunJian> HunJian { get; set; } = new();
|
||||
}
|
||||
|
||||
/// <summary>煮茧(含分车间指标、副煮车间结果)</summary>
|
||||
public class GyzxsZhuJianDto
|
||||
{
|
||||
public GyzxsZhuJian ZhuJian { get; set; } = new();
|
||||
public List<GyzxsZhuJianCheJian> CheJian { get; set; } = new();
|
||||
public List<GyzxsZhuJianFuZhu> FuZhu { get; set; } = new();
|
||||
}
|
||||
|
||||
/// <summary>自动缫(含大样资料)</summary>
|
||||
public class GyzxsZdsDto
|
||||
{
|
||||
public GyzxsZds Zds { get; set; } = new();
|
||||
public GyzxsZdsDyzl? Dyzl { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 报表数据包:Parameters=报表参数区,Main/Sub1/Sub2=结果集。
|
||||
/// 结构与 Grid++Report 的 Report_Data 对齐,便于日后直接对接报表中心。
|
||||
/// </summary>
|
||||
public class GyzxsPrintDto
|
||||
{
|
||||
public string ReportName { get; set; } = "";
|
||||
public string Title { get; set; } = "";
|
||||
public Dictionary<string, object?> Parameters { get; set; } = new();
|
||||
public List<Dictionary<string, object?>> Main { get; set; } = new();
|
||||
public List<Dictionary<string, object?>> Sub1 { get; set; } = new();
|
||||
public List<Dictionary<string, object?>> Sub2 { get; set; } = new();
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
using F9WebAiTest.Domain.Entities.QC.Yjss;
|
||||
|
||||
namespace F9WebAiTest.Application.Dtos.QC;
|
||||
|
||||
/// <summary>样茧试缫主列表行(原料小样 / 综合样共用)</summary>
|
||||
public class YjssListItemDto
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public int Type { get; set; } // 1=原料小样 2=综合样
|
||||
public long ZhuangKouId { get; set; } // 原料庄口 / 工艺庄口
|
||||
public string ZhuangKouName { get; set; } = "";
|
||||
public DateTime Date { get; set; }
|
||||
public int SampleType { get; set; } // 原料小样抽样类型:1定价 2入库 3鲜茧
|
||||
public string SampleTypeName { get; set; } = "";
|
||||
public decimal ZhongLiang { get; set; }
|
||||
public decimal HuiChaoLv { get; set; }
|
||||
public long XjdcId { get; set; }
|
||||
public int JsdcCt { get; set; }
|
||||
public long JfdcId { get; set; }
|
||||
public long QpdcId { get; set; }
|
||||
public long QjjjId { get; set; }
|
||||
public int JsbhxdCt { get; set; }
|
||||
public string Memo { get; set; } = "";
|
||||
}
|
||||
|
||||
/// <summary>茧幅调查(主表 + 明细)</summary>
|
||||
public class YjssJfdcDto
|
||||
{
|
||||
public YjssDcJfdcMain Main { get; set; } = new();
|
||||
public List<YjssDcJfdcItem> Items { get; set; } = new();
|
||||
}
|
||||
|
||||
/// <summary>茧丝百回纤度(汇总 + 明细)</summary>
|
||||
public class YjssJsbhxdDto
|
||||
{
|
||||
public YjssDcJsbhxdMain Main { get; set; } = new();
|
||||
public List<YjssDcJsbhxd> Items { get; set; } = new();
|
||||
}
|
||||
|
||||
/// <summary>样茧试缫整页数据(用于报表 / 打印)</summary>
|
||||
public class YjssFullDto
|
||||
{
|
||||
public int Type { get; set; }
|
||||
public string ZhuangKouName { get; set; } = "";
|
||||
public DateTime Date { get; set; }
|
||||
public decimal ZhongLiang { get; set; }
|
||||
public decimal HuiChaoLv { get; set; }
|
||||
public string SampleTypeName { get; set; } = "";
|
||||
public string Memo { get; set; } = "";
|
||||
|
||||
public YjssDcXjdc? Xjdc { get; set; }
|
||||
public List<YjssDcJsdc> Jsdc { get; set; } = new();
|
||||
public YjssJfdcDto? Jfdc { get; set; }
|
||||
public YjssDcQpdc? Qpdc { get; set; }
|
||||
public YjssDcQjjj? Qjjj { get; set; }
|
||||
public YjssJsbhxdDto? Jsbhxd { get; set; }
|
||||
|
||||
/// <summary>报表参数区(中文键,与 F9 RepDt_Qc_Yjss_* 对齐)</summary>
|
||||
public Dictionary<string, object?> Parameters { get; set; } = new();
|
||||
}
|
||||
Reference in New Issue
Block a user