From 5c92c27c13725ef3a6aa1e359ac316d4c8aa106d Mon Sep 17 00:00:00 2001
From: "32581956@qq.com" <32581956@qq.com>
Date: Mon, 19 Dec 2022 21:30:46 +0800
Subject: [PATCH 1/3] 2
---
fefe.txt | 0
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 fefe.txt
diff --git a/fefe.txt b/fefe.txt
new file mode 100644
index 00000000..e69de29b
--
Gitee
From 06ef83e0b773b588d46947fdaebe88d7467ea43a Mon Sep 17 00:00:00 2001
From: "32581956@qq.com" <32581956@qq.com>
Date: Mon, 19 Dec 2022 21:33:10 +0800
Subject: [PATCH 2/3] 2
---
.../Project/AutoCodePartController.cs | 125 ++++++++++++++
.../Project/AutoCodeResultController.cs | 78 +++++++++
.../Project/AutoCodeRuleController.cs | 125 ++++++++++++++
.../Controllers/Project/MdItemController.cs | 143 ++++++++++++++++
.../Project/MdItemTypeController.cs | 155 ++++++++++++++++++
5 files changed, 626 insertions(+)
create mode 100644 ZR.Admin.WebApi/Controllers/Project/AutoCodePartController.cs
create mode 100644 ZR.Admin.WebApi/Controllers/Project/AutoCodeResultController.cs
create mode 100644 ZR.Admin.WebApi/Controllers/Project/AutoCodeRuleController.cs
create mode 100644 ZR.Admin.WebApi/Controllers/Project/MdItemController.cs
create mode 100644 ZR.Admin.WebApi/Controllers/Project/MdItemTypeController.cs
diff --git a/ZR.Admin.WebApi/Controllers/Project/AutoCodePartController.cs b/ZR.Admin.WebApi/Controllers/Project/AutoCodePartController.cs
new file mode 100644
index 00000000..dd7984a6
--- /dev/null
+++ b/ZR.Admin.WebApi/Controllers/Project/AutoCodePartController.cs
@@ -0,0 +1,125 @@
+using Infrastructure;
+using Infrastructure.Attribute;
+using Infrastructure.Enums;
+using Infrastructure.Model;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using ZR.Model.Dto;
+using ZR.Model.Models;
+using ZR.Service.Project.IProjectService;
+using ZR.Admin.WebApi.Extensions;
+using ZR.Admin.WebApi.Filters;
+using ZR.Common;
+
+namespace ZR.Admin.WebApi.Controllers
+{
+ ///
+ /// 编码生成规则组成表Controller
+ ///
+ /// @tableName SYS_AUTO_CODE_PART
+ /// @author admin
+ /// @date 2022-12-19
+ ///
+ [Verify]
+ [Route("project/AutoCodePart")]
+ public class AutoCodePartController : BaseController
+ {
+ ///
+ /// 编码生成规则组成表接口
+ ///
+ private readonly IAutoCodePartService _AutoCodePartService;
+
+ public AutoCodePartController(IAutoCodePartService AutoCodePartService)
+ {
+ _AutoCodePartService = AutoCodePartService;
+ }
+
+ ///
+ /// 查询编码生成规则组成表列表
+ ///
+ ///
+ ///
+ [HttpGet("list")]
+ [ActionPermissionFilter(Permission = "project:autocodepart:list")]
+ public IActionResult QueryAutoCodePart([FromQuery] AutoCodePartQueryDto parm)
+ {
+ var response = _AutoCodePartService.GetList(parm);
+ return SUCCESS(response);
+ }
+
+
+ ///
+ /// 查询编码生成规则组成表详情
+ ///
+ ///
+ ///
+ [HttpGet("{Id}")]
+ [ActionPermissionFilter(Permission = "project:autocodepart:query")]
+ public IActionResult GetAutoCodePart(int Id)
+ {
+ var response = _AutoCodePartService.GetFirst(x => x.Id == Id);
+
+ return SUCCESS(response);
+ }
+
+ ///
+ /// 添加编码生成规则组成表
+ ///
+ ///
+ [HttpPost]
+ [ActionPermissionFilter(Permission = "project:autocodepart:add")]
+ [Log(Title = "编码生成规则组成表", BusinessType = BusinessType.INSERT)]
+ public IActionResult AddAutoCodePart([FromBody] AutoCodePartDto parm)
+ {
+ if (parm == null)
+ {
+ throw new CustomException("请求参数错误");
+ }
+ var modal = parm.Adapt().ToCreate(HttpContext);
+
+ var response = _AutoCodePartService.AddAutoCodePart(modal);
+
+ return ToResponse(response);
+ }
+
+ ///
+ /// 更新编码生成规则组成表
+ ///
+ ///
+ [HttpPut]
+ [ActionPermissionFilter(Permission = "project:autocodepart:edit")]
+ [Log(Title = "编码生成规则组成表", BusinessType = BusinessType.UPDATE)]
+ public IActionResult UpdateAutoCodePart([FromBody] AutoCodePartDto parm)
+ {
+ if (parm == null)
+ {
+ throw new CustomException("请求实体不能为空");
+ }
+ var modal = parm.Adapt().ToUpdate(HttpContext);
+
+ var response = _AutoCodePartService.UpdateAutoCodePart(modal);
+
+ return ToResponse(response);
+ }
+
+ ///
+ /// 删除编码生成规则组成表
+ ///
+ ///
+ [HttpDelete("{ids}")]
+ [ActionPermissionFilter(Permission = "project:autocodepart:delete")]
+ [Log(Title = "编码生成规则组成表", BusinessType = BusinessType.DELETE)]
+ public IActionResult DeleteAutoCodePart(string ids)
+ {
+ int[] idsArr = Tools.SpitIntArrary(ids);
+ if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
+
+ var response = _AutoCodePartService.Delete(idsArr);
+
+ return ToResponse(response);
+ }
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/ZR.Admin.WebApi/Controllers/Project/AutoCodeResultController.cs b/ZR.Admin.WebApi/Controllers/Project/AutoCodeResultController.cs
new file mode 100644
index 00000000..d5e9f5dc
--- /dev/null
+++ b/ZR.Admin.WebApi/Controllers/Project/AutoCodeResultController.cs
@@ -0,0 +1,78 @@
+using Infrastructure;
+using Infrastructure.Attribute;
+using Infrastructure.Enums;
+using Infrastructure.Model;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using ZR.Model.Dto;
+using ZR.Model.Models;
+using ZR.Service.Project.IProjectService;
+using ZR.Admin.WebApi.Extensions;
+using ZR.Admin.WebApi.Filters;
+using ZR.Common;
+
+namespace ZR.Admin.WebApi.Controllers
+{
+ ///
+ /// 编码生成记录表Controller
+ ///
+ /// @tableName SYS_AUTO_CODE_RESULT
+ /// @author admin
+ /// @date 2022-12-19
+ ///
+ [Verify]
+ [Route("project/AutoCodeResult")]
+ public class AutoCodeResultController : BaseController
+ {
+ ///
+ /// 编码生成记录表接口
+ ///
+ private readonly IAutoCodeResultService _AutoCodeResultService;
+
+ public AutoCodeResultController(IAutoCodeResultService AutoCodeResultService)
+ {
+ _AutoCodeResultService = AutoCodeResultService;
+ }
+ [HttpGet("getCode")]
+ [ActionPermissionFilter(Permission = "system:autocoderesult:list")]
+ public IActionResult GetCode([FromQuery] string ruleCode)
+ {
+ var response = _AutoCodeResultService.GetCode(ruleCode, HttpContext.GetName());
+ return SUCCESS(response);
+ }
+
+ ///
+ /// 查询编码生成记录表列表
+ ///
+ ///
+ ///
+ [HttpGet("list")]
+ [ActionPermissionFilter(Permission = "project:autocoderesult:list")]
+ public IActionResult QueryAutoCodeResult([FromQuery] AutoCodeResultQueryDto parm)
+ {
+ var response = _AutoCodeResultService.GetList(parm);
+ return SUCCESS(response);
+ }
+
+
+ ///
+ /// 查询编码生成记录表详情
+ ///
+ ///
+ ///
+ [HttpGet("{Id}")]
+ [ActionPermissionFilter(Permission = "project:autocoderesult:query")]
+ public IActionResult GetAutoCodeResult(int Id)
+ {
+ var response = _AutoCodeResultService.GetFirst(x => x.Id == Id);
+
+ return SUCCESS(response);
+ }
+
+
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/ZR.Admin.WebApi/Controllers/Project/AutoCodeRuleController.cs b/ZR.Admin.WebApi/Controllers/Project/AutoCodeRuleController.cs
new file mode 100644
index 00000000..ea8d44fc
--- /dev/null
+++ b/ZR.Admin.WebApi/Controllers/Project/AutoCodeRuleController.cs
@@ -0,0 +1,125 @@
+using Infrastructure;
+using Infrastructure.Attribute;
+using Infrastructure.Enums;
+using Infrastructure.Model;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using ZR.Model.Dto;
+using ZR.Model.Models;
+using ZR.Service.Project.IProjectService;
+using ZR.Admin.WebApi.Extensions;
+using ZR.Admin.WebApi.Filters;
+using ZR.Common;
+
+namespace ZR.Admin.WebApi.Controllers
+{
+ ///
+ /// 编码生成规则表Controller
+ ///
+ /// @tableName SYS_AUTO_CODE_RULE
+ /// @author admin
+ /// @date 2022-12-19
+ ///
+ [Verify]
+ [Route("project/AutoCodeRule")]
+ public class AutoCodeRuleController : BaseController
+ {
+ ///
+ /// 编码生成规则表接口
+ ///
+ private readonly IAutoCodeRuleService _AutoCodeRuleService;
+
+ public AutoCodeRuleController(IAutoCodeRuleService AutoCodeRuleService)
+ {
+ _AutoCodeRuleService = AutoCodeRuleService;
+ }
+
+ ///
+ /// 查询编码生成规则表列表
+ ///
+ ///
+ ///
+ [HttpGet("list")]
+ [ActionPermissionFilter(Permission = "project:autocoderule:list")]
+ public IActionResult QueryAutoCodeRule([FromQuery] AutoCodeRuleQueryDto parm)
+ {
+ var response = _AutoCodeRuleService.GetList(parm);
+ return SUCCESS(response);
+ }
+
+
+ ///
+ /// 查询编码生成规则表详情
+ ///
+ ///
+ ///
+ [HttpGet("{Id}")]
+ [ActionPermissionFilter(Permission = "project:autocoderule:query")]
+ public IActionResult GetAutoCodeRule(long Id)
+ {
+ var response = _AutoCodeRuleService.GetFirst(x => x.Id == Id);
+
+ return SUCCESS(response);
+ }
+
+ ///
+ /// 添加编码生成规则表
+ ///
+ ///
+ [HttpPost]
+ [ActionPermissionFilter(Permission = "project:autocoderule:add")]
+ [Log(Title = "编码生成规则表", BusinessType = BusinessType.INSERT)]
+ public IActionResult AddAutoCodeRule([FromBody] AutoCodeRuleDto parm)
+ {
+ if (parm == null)
+ {
+ throw new CustomException("请求参数错误");
+ }
+ var modal = parm.Adapt().ToCreate(HttpContext);
+
+ var response = _AutoCodeRuleService.AddAutoCodeRule(modal);
+
+ return ToResponse(response);
+ }
+
+ ///
+ /// 更新编码生成规则表
+ ///
+ ///
+ [HttpPut]
+ [ActionPermissionFilter(Permission = "project:autocoderule:edit")]
+ [Log(Title = "编码生成规则表", BusinessType = BusinessType.UPDATE)]
+ public IActionResult UpdateAutoCodeRule([FromBody] AutoCodeRuleDto parm)
+ {
+ if (parm == null)
+ {
+ throw new CustomException("请求实体不能为空");
+ }
+ var modal = parm.Adapt().ToUpdate(HttpContext);
+
+ var response = _AutoCodeRuleService.UpdateAutoCodeRule(modal);
+
+ return ToResponse(response);
+ }
+
+ ///
+ /// 删除编码生成规则表
+ ///
+ ///
+ [HttpDelete("{ids}")]
+ [ActionPermissionFilter(Permission = "project:autocoderule:delete")]
+ [Log(Title = "编码生成规则表", BusinessType = BusinessType.DELETE)]
+ public IActionResult DeleteAutoCodeRule(string ids)
+ {
+ int[] idsArr = Tools.SpitIntArrary(ids);
+ if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
+
+ var response = _AutoCodeRuleService.Delete(idsArr);
+
+ return ToResponse(response);
+ }
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/ZR.Admin.WebApi/Controllers/Project/MdItemController.cs b/ZR.Admin.WebApi/Controllers/Project/MdItemController.cs
new file mode 100644
index 00000000..a6a761cd
--- /dev/null
+++ b/ZR.Admin.WebApi/Controllers/Project/MdItemController.cs
@@ -0,0 +1,143 @@
+using Infrastructure;
+using Infrastructure.Attribute;
+using Infrastructure.Enums;
+using Infrastructure.Model;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using ZR.Model.Dto;
+using ZR.Model.Models;
+using ZR.Service.Project.IProjectService;
+using ZR.Admin.WebApi.Extensions;
+using ZR.Admin.WebApi.Filters;
+using ZR.Common;
+
+namespace ZR.Admin.WebApi.Controllers
+{
+ ///
+ /// 物料产品表Controller
+ ///
+ /// @tableName MD_ITEM
+ /// @author admin
+ /// @date 2022-12-18
+ ///
+ [Verify]
+ [Route("project/MdItem")]
+ public class MdItemController : BaseController
+ {
+ ///
+ /// 物料产品表接口
+ ///
+ private readonly IMdItemService _MdItemService;
+
+ public MdItemController(IMdItemService MdItemService)
+ {
+ _MdItemService = MdItemService;
+ }
+
+ ///
+ /// 查询物料产品表列表
+ ///
+ ///
+ ///
+ [HttpGet("list")]
+ [ActionPermissionFilter(Permission = "project:mditem:list")]
+ public IActionResult QueryMdItem([FromQuery] MdItemQueryDto parm)
+ {
+ var response = _MdItemService.GetList(parm);
+ return SUCCESS(response);
+ }
+
+
+ ///
+ /// 查询物料产品表详情
+ ///
+ ///
+ ///
+ [HttpGet("{Id}")]
+ [ActionPermissionFilter(Permission = "project:mditem:query")]
+ public IActionResult GetMdItem(long Id)
+ {
+ var response = _MdItemService.GetFirst(x => x.Id == Id);
+
+ return SUCCESS(response);
+ }
+
+ ///
+ /// 添加物料产品表
+ ///
+ ///
+ [HttpPost]
+ [ActionPermissionFilter(Permission = "project:mditem:add")]
+ [Log(Title = "物料产品表", BusinessType = BusinessType.INSERT)]
+ public IActionResult AddMdItem([FromBody] MdItemDto parm)
+ {
+ if (parm == null)
+ {
+ throw new CustomException("请求参数错误");
+ }
+ var modal = parm.Adapt().ToCreate(HttpContext);
+
+ var response = _MdItemService.AddMdItem(modal);
+
+ return ToResponse(response);
+ }
+
+ ///
+ /// 更新物料产品表
+ ///
+ ///
+ [HttpPut]
+ [ActionPermissionFilter(Permission = "project:mditem:edit")]
+ [Log(Title = "物料产品表", BusinessType = BusinessType.UPDATE)]
+ public IActionResult UpdateMdItem([FromBody] MdItemDto parm)
+ {
+ if (parm == null)
+ {
+ throw new CustomException("请求实体不能为空");
+ }
+ var modal = parm.Adapt().ToUpdate(HttpContext);
+
+ var response = _MdItemService.UpdateMdItem(modal);
+
+ return ToResponse(response);
+ }
+
+ ///
+ /// 删除物料产品表
+ ///
+ ///
+ [HttpDelete("{ids}")]
+ [ActionPermissionFilter(Permission = "project:mditem:delete")]
+ [Log(Title = "物料产品表", BusinessType = BusinessType.DELETE)]
+ public IActionResult DeleteMdItem(string ids)
+ {
+ int[] idsArr = Tools.SpitIntArrary(ids);
+ if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
+
+ var response = _MdItemService.Delete(idsArr);
+
+ return ToResponse(response);
+ }
+
+ ///
+ /// 导出物料产品表
+ ///
+ ///
+ [Log(Title = "物料产品表", BusinessType = BusinessType.EXPORT, IsSaveResponseData = false)]
+ [HttpGet("export")]
+ [ActionPermissionFilter(Permission = "project:mditem:export")]
+ public IActionResult Export([FromQuery] MdItemQueryDto parm)
+ {
+ parm.PageSize = 100000;
+ var list = _MdItemService.GetList(parm).Result;
+ if (list == null || list.Count <= 0)
+ {
+ return ToResponse(ResultCode.FAIL, "没有要导出的数据");
+ }
+ var result = ExportExcelMini(list, "物料产品表", "物料产品表");
+ return ExportExcel(result.Item2, result.Item1);
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/ZR.Admin.WebApi/Controllers/Project/MdItemTypeController.cs b/ZR.Admin.WebApi/Controllers/Project/MdItemTypeController.cs
new file mode 100644
index 00000000..2866b1ee
--- /dev/null
+++ b/ZR.Admin.WebApi/Controllers/Project/MdItemTypeController.cs
@@ -0,0 +1,155 @@
+using Infrastructure;
+using Infrastructure.Attribute;
+using Infrastructure.Enums;
+using Infrastructure.Model;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using ZR.Model.Dto;
+using ZR.Model.Models;
+using ZR.Service.Project.IProjectService;
+using ZR.Admin.WebApi.Extensions;
+using ZR.Admin.WebApi.Filters;
+using ZR.Common;
+
+namespace ZR.Admin.WebApi.Controllers
+{
+ ///
+ /// 物料产品分类表Controller
+ ///
+ /// @tableName MD_ITEM_TYPE
+ /// @author admin
+ /// @date 2022-12-18
+ ///
+ [Verify]
+ [Route("project/MdItemType")]
+ public class MdItemTypeController : BaseController
+ {
+ ///
+ /// 物料产品分类表接口
+ ///
+ private readonly IMdItemTypeService _MdItemTypeService;
+
+ public MdItemTypeController(IMdItemTypeService MdItemTypeService)
+ {
+ _MdItemTypeService = MdItemTypeService;
+ }
+
+ ///
+ /// 查询物料产品分类表列表
+ ///
+ ///
+ ///
+ [HttpGet("list")]
+ [ActionPermissionFilter(Permission = "project:mditemtype:list")]
+ public IActionResult QueryMdItemType([FromQuery] MdItemTypeQueryDto parm)
+ {
+ var response = _MdItemTypeService.GetList(parm);
+ return SUCCESS(response);
+ }
+
+ ///
+ /// 查询物料产品分类表列表树
+ ///
+ ///
+ ///
+ [HttpGet("treeList")]
+ [ActionPermissionFilter(Permission = "project:mditemtype:list")]
+ public IActionResult QueryTreeMdItemType([FromQuery] MdItemTypeQueryDto parm)
+ {
+ var response = _MdItemTypeService.GetTreeList(parm);
+ return SUCCESS(response);
+ }
+
+ ///
+ /// 查询物料产品分类表详情
+ ///
+ ///
+ ///
+ [HttpGet("{Id}")]
+ [ActionPermissionFilter(Permission = "project:mditemtype:query")]
+ public IActionResult GetMdItemType(long Id)
+ {
+ var response = _MdItemTypeService.GetFirst(x => x.Id == Id);
+
+ return SUCCESS(response);
+ }
+
+ ///
+ /// 添加物料产品分类表
+ ///
+ ///
+ [HttpPost]
+ [ActionPermissionFilter(Permission = "project:mditemtype:add")]
+ [Log(Title = "物料产品分类表", BusinessType = BusinessType.INSERT)]
+ public IActionResult AddMdItemType([FromBody] MdItemTypeDto parm)
+ {
+ if (parm == null)
+ {
+ throw new CustomException("请求参数错误");
+ }
+ var modal = parm.Adapt().ToCreate(HttpContext);
+
+ var response = _MdItemTypeService.AddMdItemType(modal);
+
+ return ToResponse(response);
+ }
+
+ ///
+ /// 更新物料产品分类表
+ ///
+ ///
+ [HttpPut]
+ [ActionPermissionFilter(Permission = "project:mditemtype:edit")]
+ [Log(Title = "物料产品分类表", BusinessType = BusinessType.UPDATE)]
+ public IActionResult UpdateMdItemType([FromBody] MdItemTypeDto parm)
+ {
+ if (parm == null)
+ {
+ throw new CustomException("请求实体不能为空");
+ }
+ var modal = parm.Adapt().ToUpdate(HttpContext);
+
+ var response = _MdItemTypeService.UpdateMdItemType(modal);
+
+ return ToResponse(response);
+ }
+
+ ///
+ /// 删除物料产品分类表
+ ///
+ ///
+ [HttpDelete("{ids}")]
+ [ActionPermissionFilter(Permission = "project:mditemtype:delete")]
+ [Log(Title = "物料产品分类表", BusinessType = BusinessType.DELETE)]
+ public IActionResult DeleteMdItemType(string ids)
+ {
+ int[] idsArr = Tools.SpitIntArrary(ids);
+ if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
+
+ var response = _MdItemTypeService.Delete(idsArr);
+
+ return ToResponse(response);
+ }
+
+ ///
+ /// 导出物料产品分类表
+ ///
+ ///
+ [Log(Title = "物料产品分类表", BusinessType = BusinessType.EXPORT, IsSaveResponseData = false)]
+ [HttpGet("export")]
+ [ActionPermissionFilter(Permission = "project:mditemtype:export")]
+ public IActionResult Export([FromQuery] MdItemTypeQueryDto parm)
+ {
+ parm.PageSize = 100000;
+ var list = _MdItemTypeService.GetList(parm).Result;
+ if (list == null || list.Count <= 0)
+ {
+ return ToResponse(ResultCode.FAIL, "没有要导出的数据");
+ }
+ var result = ExportExcelMini(list, "物料产品分类表", "物料产品分类表");
+ return ExportExcel(result.Item2, result.Item1);
+ }
+
+
+ }
+}
\ No newline at end of file
--
Gitee
From 4a51ab20364ff9c94957276e70b56f0562d1eb4a Mon Sep 17 00:00:00 2001
From: "32581956@qq.com" <32581956@qq.com>
Date: Mon, 19 Dec 2022 21:37:40 +0800
Subject: [PATCH 3/3] 2
---
ZR.Model/Models/Project/AutoCodePart.cs | 183 ++++++++++++++++
ZR.Model/Models/Project/AutoCodeResult.cs | 130 ++++++++++++
ZR.Model/Models/Project/AutoCodeRule.cs | 142 +++++++++++++
.../Models/Project/Dto/AutoCodePartDto.cs | 79 +++++++
.../Models/Project/Dto/AutoCodeResultDto.cs | 58 +++++
.../Models/Project/Dto/AutoCodeRuleDto.cs | 64 ++++++
ZR.Model/Models/Project/Dto/MdItemDto.cs | 116 ++++++++++
ZR.Model/Models/Project/Dto/MdItemTypeDto.cs | 86 ++++++++
ZR.Model/Models/Project/MdItem.cs | 199 ++++++++++++++++++
ZR.Model/Models/Project/MdItemType.cs | 141 +++++++++++++
10 files changed, 1198 insertions(+)
create mode 100644 ZR.Model/Models/Project/AutoCodePart.cs
create mode 100644 ZR.Model/Models/Project/AutoCodeResult.cs
create mode 100644 ZR.Model/Models/Project/AutoCodeRule.cs
create mode 100644 ZR.Model/Models/Project/Dto/AutoCodePartDto.cs
create mode 100644 ZR.Model/Models/Project/Dto/AutoCodeResultDto.cs
create mode 100644 ZR.Model/Models/Project/Dto/AutoCodeRuleDto.cs
create mode 100644 ZR.Model/Models/Project/Dto/MdItemDto.cs
create mode 100644 ZR.Model/Models/Project/Dto/MdItemTypeDto.cs
create mode 100644 ZR.Model/Models/Project/MdItem.cs
create mode 100644 ZR.Model/Models/Project/MdItemType.cs
diff --git a/ZR.Model/Models/Project/AutoCodePart.cs b/ZR.Model/Models/Project/AutoCodePart.cs
new file mode 100644
index 00000000..bc8a7c70
--- /dev/null
+++ b/ZR.Model/Models/Project/AutoCodePart.cs
@@ -0,0 +1,183 @@
+using System;
+using SqlSugar;
+using System.Collections.Generic;
+
+namespace ZR.Model.Models
+{
+ ///
+ /// 编码生成规则组成表,数据实体对象
+ ///
+ /// @author admin
+ /// @date 2022-12-19
+ ///
+ [SugarTable("SYS_AUTO_CODE_PART")]
+ public class AutoCodePart
+ {
+ ///
+ /// 描述 :分段ID
+ /// 空值 :true
+ ///
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+ public long? Id { get; set; }
+
+ ///
+ /// 描述 :编码规则ID
+ /// 空值 :false
+ ///
+ [SugarColumn(ColumnName = "rule_id")]
+ public long RuleId { get; set; }
+
+ ///
+ /// 描述 :分段序号
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "part_index")]
+ public int? PartIndex { get; set; }
+
+ ///
+ /// 描述 :分段类型
+ /// 空值 :false
+ ///
+ [SugarColumn(ColumnName = "part_type")]
+ public string PartType { get; set; }
+
+ ///
+ /// 描述 :分段编码
+ /// 空值 :false
+ ///
+ [SugarColumn(ColumnName = "part_code")]
+ public string PartCode { get; set; }
+
+ ///
+ /// 描述 :分段名称
+ /// 空值 :false
+ ///
+ [SugarColumn(ColumnName = "part_name")]
+ public string PartName { get; set; }
+
+ ///
+ /// 描述 :分段长度
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "part_lelngth")]
+ public int? PartLelngth { get; set; }
+
+ ///
+ /// 描述 :日期时间格式
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "date_formart")]
+ public string DateFormart { get; set; }
+
+ ///
+ /// 描述 :输入字符
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "input_character")]
+ public string InputCharacter { get; set; }
+
+ ///
+ /// 描述 :固定字符
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "fix_character")]
+ public string FixCharacter { get; set; }
+
+ ///
+ /// 描述 :流水号起始值
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "seria_start_no")]
+ public int? SeriaStartNo { get; set; }
+
+ ///
+ /// 描述 :流水号步长
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "seria_step")]
+ public int? SeriaStep { get; set; }
+
+ ///
+ /// 描述 :流水号当前值
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "seria_now_no")]
+ public int? SeriaNowNo { get; set; }
+
+ ///
+ /// 描述 :流水号是否循环
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "cycle_flag")]
+ public string CycleFlag { get; set; }
+
+ ///
+ /// 描述 :循环方式
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "cycle_method")]
+ public string CycleMethod { get; set; }
+
+ ///
+ /// 描述 :备注
+ /// 空值 :true
+ ///
+ public string Remark { get; set; }
+
+ ///
+ /// 描述 :预留字段1
+ /// 空值 :true
+ ///
+ public string Attr1 { get; set; }
+
+ ///
+ /// 描述 :预留字段2
+ /// 空值 :true
+ ///
+ public string Attr2 { get; set; }
+
+ ///
+ /// 描述 :预留字段3
+ /// 空值 :true
+ ///
+ public int? Attr3 { get; set; }
+
+ ///
+ /// 描述 :预留字段4
+ /// 空值 :true
+ ///
+ public int? Attr4 { get; set; }
+
+ ///
+ /// 描述 :创建人
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "create_by")]
+ public string CreateBy { get; set; }
+
+ ///
+ /// 描述 :创建时间
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "create_time")]
+ public DateTime? CreateTime { get; set; }
+
+ ///
+ /// 描述 :更新人
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "update_by")]
+ public string UpdateBy { get; set; }
+
+ ///
+ /// 描述 :更新时间
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "update_time")]
+ public DateTime? UpdateTime { get; set; }
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/ZR.Model/Models/Project/AutoCodeResult.cs b/ZR.Model/Models/Project/AutoCodeResult.cs
new file mode 100644
index 00000000..75dbb224
--- /dev/null
+++ b/ZR.Model/Models/Project/AutoCodeResult.cs
@@ -0,0 +1,130 @@
+using System;
+using SqlSugar;
+using System.Collections.Generic;
+
+namespace ZR.Model.Models
+{
+ ///
+ /// 编码生成记录表,数据实体对象
+ ///
+ /// @author admin
+ /// @date 2022-12-19
+ ///
+ [SugarTable("SYS_AUTO_CODE_RESULT")]
+ public class AutoCodeResult
+ {
+ public string RuleCode { get; set; }
+ public string RuleName { get; set; }
+
+ ///
+ /// 描述 :记录ID
+ /// 空值 :true
+ ///
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+ public long? Id { get; set; }
+
+ ///
+ /// 描述 :规则ID
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "rule_id")]
+ public long? RuleId { get; set; }
+
+ ///
+ /// 描述 :生成日期时间
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "gen_date")]
+ public string GenDate { get; set; }
+
+ ///
+ /// 描述 :最后产生的序号
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "gen_index")]
+ public int? GenIndex { get; set; }
+
+ ///
+ /// 描述 :最后产生的值
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "last_result")]
+ public string LastResult { get; set; }
+
+ ///
+ /// 描述 :最后产生的流水号
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "last_serial_no")]
+ public int? LastSerialNo { get; set; }
+
+ ///
+ /// 描述 :最后传入的参数
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "last_input_char")]
+ public string LastInputChar { get; set; }
+
+ ///
+ /// 描述 :备注
+ /// 空值 :true
+ ///
+ public string Remark { get; set; }
+
+ ///
+ /// 描述 :预留字段1
+ /// 空值 :true
+ ///
+ public string Attr1 { get; set; }
+
+ ///
+ /// 描述 :预留字段2
+ /// 空值 :true
+ ///
+ public string Attr2 { get; set; }
+
+ ///
+ /// 描述 :预留字段3
+ /// 空值 :true
+ ///
+ public int? Attr3 { get; set; }
+
+ ///
+ /// 描述 :预留字段4
+ /// 空值 :true
+ ///
+ public int? Attr4 { get; set; }
+
+ ///
+ /// 描述 :创建人
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "create_by")]
+ public string CreateBy { get; set; }
+
+ ///
+ /// 描述 :创建时间
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "create_time")]
+ public DateTime? CreateTime { get; set; }
+
+ ///
+ /// 描述 :更新人
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "update_by")]
+ public string UpdateBy { get; set; }
+
+ ///
+ /// 描述 :更新时间
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "update_time")]
+ public DateTime? UpdateTime { get; set; }
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/ZR.Model/Models/Project/AutoCodeRule.cs b/ZR.Model/Models/Project/AutoCodeRule.cs
new file mode 100644
index 00000000..925946ce
--- /dev/null
+++ b/ZR.Model/Models/Project/AutoCodeRule.cs
@@ -0,0 +1,142 @@
+using System;
+using SqlSugar;
+using System.Collections.Generic;
+
+namespace ZR.Model.Models
+{
+ ///
+ /// 编码生成规则表,数据实体对象
+ ///
+ /// @author admin
+ /// @date 2022-12-19
+ ///
+ [SugarTable("SYS_AUTO_CODE_RULE")]
+ public class AutoCodeRule
+ {
+
+ ///
+ /// 描述 :规则ID
+ /// 空值 :true
+ ///
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+ public long? Id { get; set; }
+
+ ///
+ /// 描述 :规则编码
+ /// 空值 :false
+ ///
+ [SugarColumn(ColumnName = "rule_code")]
+ public string RuleCode { get; set; }
+
+ ///
+ /// 描述 :规则名称
+ /// 空值 :false
+ ///
+ [SugarColumn(ColumnName = "rule_name")]
+ public string RuleName { get; set; }
+
+ ///
+ /// 描述 :描述
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "rule_desc")]
+ public string RuleDesc { get; set; }
+
+ ///
+ /// 描述 :最大长度
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "max_length")]
+ public int? MaxLength { get; set; }
+
+ ///
+ /// 描述 :是否补齐
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "is_padded")]
+ public string IsPadded { get; set; }
+
+ ///
+ /// 描述 :补齐字符
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "padded_char")]
+ public string PaddedChar { get; set; }
+
+ ///
+ /// 描述 :补齐方式
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "padded_method")]
+ public string PaddedMethod { get; set; }
+
+ ///
+ /// 描述 :是否启用
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "enable_flag")]
+ public int? EnableFlag { get; set; }
+
+ ///
+ /// 描述 :备注
+ /// 空值 :true
+ ///
+ public string Remark { get; set; }
+
+ ///
+ /// 描述 :预留字段1
+ /// 空值 :true
+ ///
+ public string Attr1 { get; set; }
+
+ ///
+ /// 描述 :预留字段2
+ /// 空值 :true
+ ///
+ public string Attr2 { get; set; }
+
+ ///
+ /// 描述 :预留字段3
+ /// 空值 :true
+ ///
+ public int? Attr3 { get; set; }
+
+ ///
+ /// 描述 :预留字段4
+ /// 空值 :true
+ ///
+ public int? Attr4 { get; set; }
+
+ ///
+ /// 描述 :创建人
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "create_by")]
+ public string CreateBy { get; set; }
+
+ ///
+ /// 描述 :创建时间
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "create_time")]
+ public DateTime? CreateTime { get; set; }
+
+ ///
+ /// 描述 :更新时间
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "update_time")]
+ public DateTime? UpdateTime { get; set; }
+
+ ///
+ /// 描述 :更新人
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "update_by")]
+ public string UpdateBy { get; set; }
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/ZR.Model/Models/Project/Dto/AutoCodePartDto.cs b/ZR.Model/Models/Project/Dto/AutoCodePartDto.cs
new file mode 100644
index 00000000..29dcadae
--- /dev/null
+++ b/ZR.Model/Models/Project/Dto/AutoCodePartDto.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using ZR.Model.Dto;
+using ZR.Model.Models;
+
+namespace ZR.Model.Dto
+{
+ ///
+ /// 编码生成规则组成表查询对象
+ ///
+ public class AutoCodePartQueryDto : PagerInfo
+ {
+ public string PartCode { get; set; }
+ public string PartName { get; set; }
+ public long? RuleId { get; set; }
+ }
+
+ ///
+ /// 编码生成规则组成表输入输出对象
+ ///
+ public class AutoCodePartDto
+ {
+ public long? Id { get; set; }
+
+ [Required(ErrorMessage = "编码规则ID不能为空")]
+ public long RuleId { get; set; }
+
+ public int? PartIndex { get; set; }
+
+ [Required(ErrorMessage = "分段类型不能为空")]
+ public string PartType { get; set; }
+
+ [Required(ErrorMessage = "分段编码不能为空")]
+ public string PartCode { get; set; }
+
+ [Required(ErrorMessage = "分段名称不能为空")]
+ public string PartName { get; set; }
+
+ public int? PartLelngth { get; set; }
+
+ public string DateFormart { get; set; }
+
+ public string InputCharacter { get; set; }
+
+ public string FixCharacter { get; set; }
+
+ public int? SeriaStartNo { get; set; }
+
+ public int? SeriaStep { get; set; }
+
+ public int? SeriaNowNo { get; set; }
+
+ public string CycleFlag { get; set; }
+
+ public string CycleMethod { get; set; }
+
+ public string Remark { get; set; }
+
+ public string Attr1 { get; set; }
+
+ public string Attr2 { get; set; }
+
+ public int? Attr3 { get; set; }
+
+ public int? Attr4 { get; set; }
+
+ public string CreateBy { get; set; }
+
+ public DateTime? CreateTime { get; set; }
+
+ public string UpdateBy { get; set; }
+
+ public DateTime? UpdateTime { get; set; }
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/ZR.Model/Models/Project/Dto/AutoCodeResultDto.cs b/ZR.Model/Models/Project/Dto/AutoCodeResultDto.cs
new file mode 100644
index 00000000..91dd1593
--- /dev/null
+++ b/ZR.Model/Models/Project/Dto/AutoCodeResultDto.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using ZR.Model.Dto;
+using ZR.Model.Models;
+
+namespace ZR.Model.Dto
+{
+ ///
+ /// 编码生成记录表查询对象
+ ///
+ public class AutoCodeResultQueryDto : PagerInfo
+ {
+ public DateTime? BeginCreateTime { get; set; }
+ public DateTime? EndCreateTime { get; set; }
+ }
+
+ ///
+ /// 编码生成记录表输入输出对象
+ ///
+ public class AutoCodeResultDto
+ {
+ public long? Id { get; set; }
+
+ public long? RuleId { get; set; }
+
+ public string GenDate { get; set; }
+
+ public int? GenIndex { get; set; }
+
+ public string LastResult { get; set; }
+
+ public int? LastSerialNo { get; set; }
+
+ public string LastInputChar { get; set; }
+
+ public string Remark { get; set; }
+
+ public string Attr1 { get; set; }
+
+ public string Attr2 { get; set; }
+
+ public int? Attr3 { get; set; }
+
+ public int? Attr4 { get; set; }
+
+ public string CreateBy { get; set; }
+
+ public DateTime? CreateTime { get; set; }
+
+ public string UpdateBy { get; set; }
+
+ public DateTime? UpdateTime { get; set; }
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/ZR.Model/Models/Project/Dto/AutoCodeRuleDto.cs b/ZR.Model/Models/Project/Dto/AutoCodeRuleDto.cs
new file mode 100644
index 00000000..814e5354
--- /dev/null
+++ b/ZR.Model/Models/Project/Dto/AutoCodeRuleDto.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using ZR.Model.Dto;
+using ZR.Model.Models;
+
+namespace ZR.Model.Dto
+{
+ ///
+ /// 编码生成规则表查询对象
+ ///
+ public class AutoCodeRuleQueryDto : PagerInfo
+ {
+ public string RuleCode { get; set; }
+ public string RuleName { get; set; }
+ }
+
+ ///
+ /// 编码生成规则表输入输出对象
+ ///
+ public class AutoCodeRuleDto
+ {
+ public long? Id { get; set; }
+
+ [Required(ErrorMessage = "规则编码不能为空")]
+ public string RuleCode { get; set; }
+
+ [Required(ErrorMessage = "规则名称不能为空")]
+ public string RuleName { get; set; }
+
+ public string RuleDesc { get; set; }
+
+ public int? MaxLength { get; set; }
+
+ public string IsPadded { get; set; }
+
+ public string PaddedChar { get; set; }
+
+ public string PaddedMethod { get; set; }
+
+ public int? EnableFlag { get; set; }
+
+ public string Remark { get; set; }
+
+ public string Attr1 { get; set; }
+
+ public string Attr2 { get; set; }
+
+ public int? Attr3 { get; set; }
+
+ public int? Attr4 { get; set; }
+
+ public string CreateBy { get; set; }
+
+ public DateTime? CreateTime { get; set; }
+
+ public DateTime? UpdateTime { get; set; }
+
+ public string UpdateBy { get; set; }
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/ZR.Model/Models/Project/Dto/MdItemDto.cs b/ZR.Model/Models/Project/Dto/MdItemDto.cs
new file mode 100644
index 00000000..804b15ba
--- /dev/null
+++ b/ZR.Model/Models/Project/Dto/MdItemDto.cs
@@ -0,0 +1,116 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using ZR.Model.Dto;
+using ZR.Model.Models;
+using MiniExcelLibs.Attributes;
+
+namespace ZR.Model.Dto
+{
+ ///
+ /// 物料产品表查询对象
+ ///
+ public class MdItemQueryDto : PagerInfo
+ {
+ public long? ItemTypeId { get; set; }
+ public string ItemCode { get; set; }
+ public string ItemName { get; set; }
+ public string Specification { get; set; }
+ public long? ParentId { get; set; }
+ }
+
+ ///
+ /// 物料产品表输入输出对象
+ ///
+ public class MdItemDto
+ {
+ [Required(ErrorMessage = "物料ID不能为空")]
+ [ExcelColumn(Name = "物料ID")]
+ public long Id { get; set; }
+
+ [Required(ErrorMessage = "物料编码不能为空")]
+ [ExcelColumn(Name = "物料编码")]
+ public string ItemCode { get; set; }
+
+ [Required(ErrorMessage = "物料名称不能为空")]
+ [ExcelColumn(Name = "物料名称")]
+ public string ItemName { get; set; }
+
+ [ExcelColumn(Name = "规格型号")]
+ public string Specification { get; set; }
+
+ [ExcelColumn(Name = "单位")]
+ public string UnitOfMeasure { get; set; }
+
+ [Required(ErrorMessage = "物料产品标识不能为空")]
+ [ExcelColumn(Name = "物料产品标识")]
+ public string ItemOrProduct { get; set; }
+
+ [Required(ErrorMessage = "物料类型ID不能为空")]
+ [ExcelColumn(Name = "物料类型ID")]
+ public long ItemTypeId { get; set; }
+
+ [ExcelColumn(Name = "物料类型编码")]
+ public string ItemTypeCode { get; set; }
+
+ [ExcelColumn(Name = "物料类型名称")]
+ public string ItemTypeName { get; set; }
+
+ [ExcelColumn(Name = "是否启用")]
+ public int? EnableFlag { get; set; }
+
+ [ExcelColumn(Name = "是否设置安全库存")]
+ public string SafeStockFlag { get; set; }
+
+ [ExcelColumn(Name = "ProductType")]
+ public string ProductType { get; set; }
+
+ [ExcelColumn(Name = "最低库存数量")]
+ public decimal MinStock { get; set; }
+
+ [ExcelColumn(Name = "最高库存数量")]
+ public decimal MaxStock { get; set; }
+
+ [ExcelColumn(Name = "封装尺寸")]
+ public string Package { get; set; }
+
+ [ExcelColumn(Name = "最小包装")]
+ public decimal Mpq { get; set; }
+
+ [ExcelColumn(Name = "最小订购量")]
+ public decimal Moq { get; set; }
+
+ [ExcelColumn(Name = "备注")]
+ public string Remark { get; set; }
+
+ [ExcelColumn(Name = "预留字段1")]
+ public string Attr1 { get; set; }
+
+ [ExcelColumn(Name = "预留字段2")]
+ public string Attr2 { get; set; }
+
+ [ExcelColumn(Name = "预留字段3")]
+ public int? Attr3 { get; set; }
+
+ [ExcelColumn(Name = "预留字段4")]
+ public int? Attr4 { get; set; }
+
+ [ExcelColumn(Name = "删除标记")]
+ public int? Isdeleted { get; set; }
+
+ [ExcelColumn(Name = "创建人")]
+ public string CreateBy { get; set; }
+
+ [ExcelColumn(Name = "创建时间", Format = "yyyy-MM-dd HH:mm:ss")]
+ public DateTime? CreateTime { get; set; }
+
+ [ExcelColumn(Name = "更新人")]
+ public string UpdateBy { get; set; }
+
+ [ExcelColumn(Name = "更新时间", Format = "yyyy-MM-dd HH:mm:ss")]
+ public DateTime? UpdateTime { get; set; }
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/ZR.Model/Models/Project/Dto/MdItemTypeDto.cs b/ZR.Model/Models/Project/Dto/MdItemTypeDto.cs
new file mode 100644
index 00000000..5b88f84d
--- /dev/null
+++ b/ZR.Model/Models/Project/Dto/MdItemTypeDto.cs
@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using ZR.Model.Dto;
+using ZR.Model.Models;
+using MiniExcelLibs.Attributes;
+
+namespace ZR.Model.Dto
+{
+ ///
+ /// 物料产品分类表查询对象
+ ///
+ public class MdItemTypeQueryDto : PagerInfo
+ {
+ public string ItemTypeCode { get; set; }
+ public string ItemTypeName { get; set; }
+ }
+
+ ///
+ /// 物料产品分类表输入输出对象
+ ///
+ public class MdItemTypeDto
+ {
+ [Required(ErrorMessage = "物料类型ID不能为空")]
+ [ExcelColumn(Name = "物料类型ID")]
+ public long Id { get; set; }
+
+ [Required(ErrorMessage = "物料类型编码不能为空")]
+ [ExcelColumn(Name = "物料类型编码")]
+ public string ItemTypeCode { get; set; }
+
+ [Required(ErrorMessage = "物料类型名称不能为空")]
+ [ExcelColumn(Name = "物料类型名称")]
+ public string ItemTypeName { get; set; }
+
+ [Required(ErrorMessage = "父类型ID不能为空")]
+ [ExcelColumn(Name = "父类型ID")]
+ public long ParentId { get; set; }
+
+ [ExcelIgnore]
+ public string Ancestors { get; set; }
+
+ [Required(ErrorMessage = "物料产品标识不能为空")]
+ [ExcelColumn(Name = "物料产品标识")]
+ public string ItemOrProduct { get; set; }
+
+ [ExcelColumn(Name = "排序顺序")]
+ public int? OrderNum { get; set; }
+
+ [ExcelColumn(Name = "是否启用")]
+ public int? EnableFlag { get; set; }
+
+ [ExcelIgnore]
+ public int? Isdeleted { get; set; }
+
+ [ExcelColumn(Name = "备注")]
+ public string Remark { get; set; }
+
+ [ExcelColumn(Name = "预留字段1")]
+ public string Attr1 { get; set; }
+
+ [ExcelColumn(Name = "预留字段2")]
+ public string Attr2 { get; set; }
+
+ [ExcelColumn(Name = "预留字段3")]
+ public int? Attr3 { get; set; }
+
+ [ExcelColumn(Name = "预留字段4")]
+ public int? Attr4 { get; set; }
+
+ [ExcelColumn(Name = "创建人")]
+ public string CreateBy { get; set; }
+
+ [ExcelColumn(Name = "创建时间", Format = "yyyy-MM-dd HH:mm:ss")]
+ public DateTime? CreateTime { get; set; }
+
+ [ExcelColumn(Name = "更新人")]
+ public string UpdateBy { get; set; }
+
+ [ExcelColumn(Name = "更新时间", Format = "yyyy-MM-dd HH:mm:ss")]
+ public DateTime? UpdateTime { get; set; }
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/ZR.Model/Models/Project/MdItem.cs b/ZR.Model/Models/Project/MdItem.cs
new file mode 100644
index 00000000..d02b9c93
--- /dev/null
+++ b/ZR.Model/Models/Project/MdItem.cs
@@ -0,0 +1,199 @@
+using System;
+using SqlSugar;
+using System.Collections.Generic;
+
+namespace ZR.Model.Models
+{
+ ///
+ /// 物料产品表,数据实体对象
+ ///
+ /// @author admin
+ /// @date 2022-12-18
+ ///
+ [SugarTable("MD_ITEM")]
+ public class MdItem
+ {
+ ///
+ /// 描述 :物料ID
+ /// 空值 :false
+ ///
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+ public long Id { get; set; }
+
+ ///
+ /// 描述 :物料编码
+ /// 空值 :false
+ ///
+ [SugarColumn(ColumnName = "item_code")]
+ public string ItemCode { get; set; }
+
+ ///
+ /// 描述 :物料名称
+ /// 空值 :false
+ ///
+ [SugarColumn(ColumnName = "item_name")]
+ public string ItemName { get; set; }
+
+ ///
+ /// 描述 :规格型号
+ /// 空值 :true
+ ///
+ public string Specification { get; set; }
+
+ ///
+ /// 描述 :单位
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "unit_of_measure")]
+ public string UnitOfMeasure { get; set; }
+
+ ///
+ /// 描述 :物料产品标识
+ /// 空值 :false
+ ///
+ [SugarColumn(ColumnName = "item_or_product")]
+ public string ItemOrProduct { get; set; }
+
+ ///
+ /// 描述 :物料类型ID
+ /// 空值 :false
+ ///
+ [SugarColumn(ColumnName = "item_type_id")]
+ public long ItemTypeId { get; set; }
+
+ ///
+ /// 描述 :物料类型编码
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "item_type_code")]
+ public string ItemTypeCode { get; set; }
+
+ ///
+ /// 描述 :物料类型名称
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "item_type_name")]
+ public string ItemTypeName { get; set; }
+
+ ///
+ /// 描述 :是否启用
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "enable_flag")]
+ public int? EnableFlag { get; set; }
+
+ ///
+ /// 描述 :是否设置安全库存
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "safe_stock_flag")]
+ public string SafeStockFlag { get; set; }
+
+ ///
+ /// 描述 :
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "product_type")]
+ public string ProductType { get; set; }
+
+ ///
+ /// 描述 :最低库存数量
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "min_stock")]
+ public decimal MinStock { get; set; }
+
+ ///
+ /// 描述 :最高库存数量
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "max_stock")]
+ public decimal MaxStock { get; set; }
+
+ ///
+ /// 描述 :封装尺寸
+ /// 空值 :true
+ ///
+ public string Package { get; set; }
+
+ ///
+ /// 描述 :最小包装
+ /// 空值 :true
+ ///
+ public decimal Mpq { get; set; }
+
+ ///
+ /// 描述 :最小订购量
+ /// 空值 :true
+ ///
+ public decimal Moq { get; set; }
+
+ ///
+ /// 描述 :备注
+ /// 空值 :true
+ ///
+ public string Remark { get; set; }
+
+ ///
+ /// 描述 :预留字段1
+ /// 空值 :true
+ ///
+ public string Attr1 { get; set; }
+
+ ///
+ /// 描述 :预留字段2
+ /// 空值 :true
+ ///
+ public string Attr2 { get; set; }
+
+ ///
+ /// 描述 :预留字段3
+ /// 空值 :true
+ ///
+ public int? Attr3 { get; set; }
+
+ ///
+ /// 描述 :预留字段4
+ /// 空值 :true
+ ///
+ public int? Attr4 { get; set; }
+
+ ///
+ /// 描述 :删除标记
+ /// 空值 :true
+ ///
+ public int? Isdeleted { get; set; }
+
+ ///
+ /// 描述 :创建人
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "create_by")]
+ public string CreateBy { get; set; }
+
+ ///
+ /// 描述 :创建时间
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "create_time")]
+ public DateTime? CreateTime { get; set; }
+
+ ///
+ /// 描述 :更新人
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "update_by")]
+ public string UpdateBy { get; set; }
+
+ ///
+ /// 描述 :更新时间
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "update_time")]
+ public DateTime? UpdateTime { get; set; }
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/ZR.Model/Models/Project/MdItemType.cs b/ZR.Model/Models/Project/MdItemType.cs
new file mode 100644
index 00000000..0f636985
--- /dev/null
+++ b/ZR.Model/Models/Project/MdItemType.cs
@@ -0,0 +1,141 @@
+using System;
+using SqlSugar;
+using System.Collections.Generic;
+
+namespace ZR.Model.Models
+{
+ ///
+ /// 物料产品分类表,数据实体对象
+ ///
+ /// @author admin
+ /// @date 2022-12-18
+ ///
+ [SugarTable("MD_ITEM_TYPE")]
+ public class MdItemType
+ {
+ ///
+ /// 描述 :物料类型ID
+ /// 空值 :false
+ ///
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+ public long Id { get; set; }
+
+ ///
+ /// 描述 :物料类型编码
+ /// 空值 :false
+ ///
+ [SugarColumn(ColumnName = "item_type_code")]
+ public string ItemTypeCode { get; set; }
+
+ ///
+ /// 描述 :物料类型名称
+ /// 空值 :false
+ ///
+ [SugarColumn(ColumnName = "item_type_name")]
+ public string ItemTypeName { get; set; }
+
+ ///
+ /// 描述 :父类型ID
+ /// 空值 :false
+ ///
+ [SugarColumn(ColumnName = "parent_id")]
+ public long ParentId { get; set; }
+
+ ///
+ /// 描述 :所有父节点ID
+ /// 空值 :true
+ ///
+ public string Ancestors { get; set; }
+
+ ///
+ /// 描述 :物料产品标识
+ /// 空值 :false
+ ///
+ [SugarColumn(ColumnName = "item_or_product")]
+ public string ItemOrProduct { get; set; }
+
+ ///
+ /// 描述 :排序顺序
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "order_num")]
+ public int? OrderNum { get; set; }
+
+ ///
+ /// 描述 :是否启用
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "enable_flag")]
+ public int? EnableFlag { get; set; }
+
+ ///
+ /// 描述 :删除标记
+ /// 空值 :true
+ ///
+ public int? Isdeleted { get; set; }
+
+ ///
+ /// 描述 :备注
+ /// 空值 :true
+ ///
+ public string Remark { get; set; }
+
+ ///
+ /// 描述 :预留字段1
+ /// 空值 :true
+ ///
+ public string Attr1 { get; set; }
+
+ ///
+ /// 描述 :预留字段2
+ /// 空值 :true
+ ///
+ public string Attr2 { get; set; }
+
+ ///
+ /// 描述 :预留字段3
+ /// 空值 :true
+ ///
+ public int? Attr3 { get; set; }
+
+ ///
+ /// 描述 :预留字段4
+ /// 空值 :true
+ ///
+ public int? Attr4 { get; set; }
+
+ ///
+ /// 描述 :创建人
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "create_by")]
+ public string CreateBy { get; set; }
+
+ ///
+ /// 描述 :创建时间
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "create_time")]
+ public DateTime? CreateTime { get; set; }
+
+ ///
+ /// 描述 :更新人
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "update_by")]
+ public string UpdateBy { get; set; }
+
+ ///
+ /// 描述 :更新时间
+ /// 空值 :true
+ ///
+ [SugarColumn(ColumnName = "update_time")]
+ public DateTime? UpdateTime { get; set; }
+
+
+ [SugarColumn(IsIgnore = true)]
+ public List Children { get; set; }
+
+
+ }
+}
\ No newline at end of file
--
Gitee