抛光管理，完成抛光仓库入库，盘点，生成日志 条件查询功能

ZR.Model/MES/wms/Dto/WmMaterialDto.cs

@@ -168,6 +168,14 @@ namespace ZR.Model.MES.wms.Dto
 
     }
 
-
+    /// <summary>
+    /// 物料下拉查询表
+    /// </summary>
+    public class WmMaterialSelectOptions
+    {
+        public string Key  { get; set; }
+        public string Label { get; set; }
+        public string Value { get; set; }
+    }
 
 }

ZR.Model/MES/wms/Dto/WmPolishInventoryDto.cs

@@ -0,0 +1,66 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace ZR.Model.MES.wms.Dto
+{
+    /// <summary>
+    /// 工艺路线-抛光 库存表查询对象
+    /// </summary>
+    public class WmPolishInventoryQueryDto : PagerInfo 
+    {
+        public string BlankNum { get; set; }
+
+        public string Partnumber { get; set; }
+
+        public string Description { get; set; }
+
+        public int? Type { get; set; }
+
+        public int? Status { get; set; }
+
+    }
+
+    /// <summary>
+    /// 工艺路线-抛光 库存表输入输出对象
+    /// </summary>
+    public class WmPolishInventoryDto
+    {
+        public string Id { get; set; }
+
+        public string BlankNum { get; set; }
+
+        public string Partnumber { get; set; }
+
+        public string Color { get; set; }
+
+        public string Specification { get; set; }
+
+        public string Description { get; set; }
+
+        public int? Quantity { get; set; }
+
+        public int? MaxNum { get; set; }
+
+        public int? MinNum { get; set; }
+
+        public int? WarnNum { get; set; }
+
+        public int? Type { get; set; }
+
+        public int? Status { get; set; }
+
+        public string Remark { get; set; }
+
+        public DateTime? ActionTime { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+}

ZR.Model/MES/wms/Dto/WmPolishRecordDto.cs

@@ -0,0 +1,50 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace ZR.Model.MES.wms.Dto
+{
+    /// <summary>
+    /// 工艺路线-抛光 库存变动表查询对象
+    /// </summary>
+    public class WmPolishRecordQueryDto : PagerInfo 
+    {
+    }
+
+    /// <summary>
+    /// 工艺路线-抛光 库存变动表输入输出对象
+    /// </summary>
+    public class WmPolishRecordDto
+    {
+        [Required(ErrorMessage = "主键不能为空")]
+        public string Id { get; set; }
+
+        [Required(ErrorMessage = "库存主键不能为空")]
+        public string FkInventoryId { get; set; }
+
+        public string Code { get; set; }
+
+        public string Partnumber { get; set; }
+
+        public string BlankNum { get; set; }
+
+        public int? ChangeType { get; set; }
+
+        public int? ChangeQuantity { get; set; }
+
+        public DateTime? ActionTime { get; set; }
+
+        public int? Status { get; set; }
+
+        public string Remark { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+}

ZR.Model/MES/wms/WmPolishInventory.cs

@@ -0,0 +1,96 @@
+
+namespace ZR.Model.MES.wms
+{
+    /// <summary>
+    /// 工艺路线-抛光 库存表
+    /// </summary>
+    [SugarTable("wm_polish_inventory")]
+    public class WmPolishInventory
+    {
+        /// <summary>
+        /// 主键 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 毛坯号 
+        /// </summary>
+        [SugarColumn(ColumnName = "blank_num")]
+        public string BlankNum { get; set; }
+
+        /// <summary>
+        /// 零件号 
+        /// </summary>
+        public string Partnumber { get; set; }
+
+        /// <summary>
+        /// 库存数量 
+        /// </summary>
+        public int? Quantity { get; set; }
+
+        /// <summary>
+        /// 最大库存 
+        /// </summary>
+        [SugarColumn(ColumnName = "max_num")]
+        public int? MaxNum { get; set; }
+
+        /// <summary>
+        /// 最小库存 
+        /// </summary>
+        [SugarColumn(ColumnName = "min_num")]
+        public int? MinNum { get; set; }
+
+        /// <summary>
+        /// 预警库存 
+        /// </summary>
+        [SugarColumn(ColumnName = "warn_num")]
+        public int? WarnNum { get; set; }
+
+        /// <summary>
+        /// 类别(1-正常 2-返工件) 
+        /// </summary>
+        public int? Type { get; set; }
+
+        /// <summary>
+        /// 状态（0-停用1-启用） 
+        /// </summary>
+        public int? Status { get; set; }
+
+        /// <summary>
+        /// 备注 
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 操作时间 
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public DateTime? ActionTime { get; set; }
+
+        /// <summary>
+        /// 创建人 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_BY")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_BY")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+
+    }
+}

ZR.Model/MES/wms/WmPolishRecord.cs

@@ -0,0 +1,91 @@
+
+namespace ZR.Model.MES.wms
+{
+    /// <summary>
+    /// 工艺路线-抛光 库存变动表
+    /// </summary>
+    [SugarTable("wm_polish_record")]
+    public class WmPolishRecord
+    {
+        /// <summary>
+        /// 主键 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 库存主键 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_inventory_id")]
+        public string FkInventoryId { get; set; }
+
+        /// <summary>
+        /// 关联记录字段(4-检验时使用 group by字段) 
+        /// </summary>
+        public string Code { get; set; }
+
+        /// <summary>
+        /// 零件号 
+        /// </summary>
+        public string Partnumber { get; set; }
+
+        /// <summary>
+        /// 毛坯号 
+        /// </summary>
+        [SugarColumn(ColumnName = "blank_num")]
+        public string BlankNum { get; set; }
+
+        /// <summary>
+        /// 变动类别 1-入库 2-出库 3-盘点 4-检验 
+        /// </summary>
+        [SugarColumn(ColumnName = "change_type")]
+        public int? ChangeType { get; set; }
+
+        /// <summary>
+        /// 变动数量 
+        /// </summary>
+        [SugarColumn(ColumnName = "change_quantity")]
+        public int? ChangeQuantity { get; set; }
+
+        /// <summary>
+        /// 时间（操作时间） 
+        /// </summary>
+        [SugarColumn(ColumnName = "action_time")]
+        public DateTime? ActionTime { get; set; }
+
+        /// <summary>
+        /// 状态（暂定） 
+        /// </summary>
+        public int? Status { get; set; }
+
+        /// <summary>
+        /// 备注 
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 创建人 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_BY")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_BY")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+
+    }
+}