IQC开始

ZR.Model/MES/qc/QuRough.cs

@@ -6,61 +6,63 @@ using System.Threading.Tasks;
 
 namespace ZR.Model.MES.qu
 {
+
     /// <summary>
     /// 毛坯统计表
     ///</summary>
-    [SugarTable("qu_rough")]
-    public class QuRough
+    [SugarTable("qc_rough")]
+    public class QcRough
     {
         /// <summary>
         /// 流水号 
         ///</summary>
         [SugarColumn(ColumnName = "id", IsPrimaryKey = true)]
         public string Id { get; set; }
-
         /// <summary>
-        /// 生产工单id 
+        /// 领料单id 
         ///</summary>
-        [SugarColumn(ColumnName = "fk_pro_order_id")]
-        public string FkProOrderId { get; set; }
-
+        [SugarColumn(ColumnName = "fk_materialRequisition_id")]
+        public string FkMaterialrequisitionId { get; set; }
         /// <summary>
-        /// 需要数量
+        /// 应到数量 
         ///</summary>
         [SugarColumn(ColumnName = "require_num")]
         public int? RequireNum { get; set; }
-
         /// <summary>
-        /// 实际数量
+        /// 实际到达数量 
         ///</summary>
         [SugarColumn(ColumnName = "actual_number")]
         public int? ActualNumber { get; set; }
-
         /// <summary>
-        /// 合格数
+        /// 抽检比例% 
+        ///</summary>
+        [SugarColumn(ColumnName = "randomRate")]
+        public int? RandomRate { get; set; }
+        /// <summary>
+        /// 合格数 
         ///</summary>
         [SugarColumn(ColumnName = "oks")]
         public int? Oks { get; set; }
-
         /// <summary>
-        /// 不合格数
+        /// 不合格数 
         ///</summary>
         [SugarColumn(ColumnName = "ngs")]
-        public string Ngs { get; set; }
-
+        public int? Ngs { get; set; }
         /// <summary>
         /// 合格率 
         ///</summary>
         [SugarColumn(ColumnName = "oks_ratio")]
-        public string OksRatio { get; set; }
-
-
+        public decimal? OksRatio { get; set; }
         /// <summary>
-        /// 是否上料
+        /// 是否可以上料 
         ///</summary>
         [SugarColumn(ColumnName = "isFeeding")]
-        public int IsFeeding { get; set; }
-
+        public string IsFeeding { get; set; }
+        /// <summary>
+        /// 乐观锁 
+        ///</summary>
+        [SugarColumn(ColumnName = "REVISION")]
+        public int? Revision { get; set; }
         /// <summary>
         /// 创建人 
         ///</summary>
@@ -82,4 +84,6 @@ namespace ZR.Model.MES.qu
         [SugarColumn(ColumnName = "UPDATED_TIME")]
         public DateTime? UpdatedTime { get; set; }
     }
+
+
 }

ZR.Model/MES/wm/WmMaterialreturn.cs

@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ZR.Model.MES.wm
+{
+    /// <summary>
+    /// 生产退料
+    ///</summary>
+    [SugarTable("wm_materialreturn")]
+    public class WmMaterialreturn
+    {
+        /// <summary>
+        /// 流水号 
+        ///</summary>
+        [SugarColumn(ColumnName = "id", IsPrimaryKey = true)]
+        public string Id { get; set; }
+        /// <summary>
+        /// 领料单id 
+        ///</summary>
+        [SugarColumn(ColumnName = "fk_mrqr_id")]
+        public string FkMrqrId { get; set; }
+        /// <summary>
+        /// 年 
+        ///</summary>
+        [SugarColumn(ColumnName = "year")]
+        public int? Year { get; set; }
+        /// <summary>
+        /// 周 
+        ///</summary>
+        [SugarColumn(ColumnName = "week")]
+        public int? Week { get; set; }
+        /// <summary>
+        /// 日 
+        ///</summary>
+        [SugarColumn(ColumnName = "date")]
+        public int? Date { get; set; }
+        /// <summary>
+        /// 毛坯零件号 
+        ///</summary>
+        [SugarColumn(ColumnName = "workblankpartnumber")]
+        public string Workblankpartnumber { get; set; }
+        /// <summary>
+        /// 退料数量 
+        ///</summary>
+        [SugarColumn(ColumnName = "requirenum")]
+        public int? Requirenum { get; set; }
+        /// <summary>
+        /// 租户号 
+        ///</summary>
+        [SugarColumn(ColumnName = "TENANT_ID")]
+        public string TenantId { get; set; }
+        /// <summary>
+        /// 乐观锁 
+        ///</summary>
+        [SugarColumn(ColumnName = "REVISION")]
+        public int? Revision { 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/ZR.Model.csproj

@@ -26,6 +26,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <Folder Include="MES\qu\DTO\" />
+	  <Folder Include="MES\qc\DTO\" />
 	</ItemGroup>
 </Project>