PBL 1-15 审核修改

DOAN.Model/PBL/PlcAddress.cs

@@ -0,0 +1,93 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DOAN.Model.PBL
+{
+    /// <summary>
+    /// PLC地址
+    /// </summary>
+    [SugarTable("plc_address_table")]
+    public  class PlcAddressTable
+    {
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
+        public  int Id {  get; set; }
+
+
+        /// <summary>
+        ///  料架层fk_id
+        /// </summary>
+        [SugarColumn(ColumnName = "fk_storage_id")]
+        public  int   FkStorageId { get; set; }
+
+
+
+        /// <summary>
+        /// 料架号
+        /// </summary>
+        [SugarColumn(ColumnName = "rock_code")]
+        public  string RockCode { get; set; }
+
+
+        /// <summary>
+        /// 层号
+        /// </summary>
+        [SugarColumn(ColumnName = "layer")]
+        public  int   Layer { get; set; }
+
+
+        /// <summary>
+        /// 方向 左/右
+        /// </summary>
+        [SugarColumn(ColumnName = "direction")]
+        public string Direction { get; set; }
+
+
+        /// <summary>
+        /// 序号（123）其中合并料架为（123456）
+        /// </summary>
+        [SugarColumn(ColumnName = "index")]
+        public int  Index { get; set; }
+
+
+        /// <summary>
+        /// plc地址
+        /// </summary>
+        [SugarColumn(ColumnName = "plc_address")]
+        public string  PlcAddress { get; set; }
+
+
+        /// <summary>
+        /// plc地址  （第几字节）
+        /// </summary>
+        [SugarColumn(ColumnName = "byte_num")]
+        public  int  ByteNum { get; set; }
+
+
+
+        /// <summary>
+        /// plc地址  （第几位）
+        /// </summary>
+        [SugarColumn(ColumnName = "bit_num")]
+        public int  BitNum { get; set; }
+
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [SugarColumn(ColumnName = "remark")]
+        public string Remark { get; set; }
+
+
+
+
+        
+
+    }
+}

DOAN.Model/PBL/Storagelocation.cs

@@ -52,14 +52,14 @@ namespace DOAN.Model.PBL
         /// <summary>
         ///PLC地址(亮灯拣货)
         /// </summary>
-        [SugarColumn(ColumnName = "plc_address")]
+        [SugarColumn(ColumnName = "plc_light_address")]
         public string PlcAddress { get; set; }
 
-        /// <summary>
-        /// PLC地址(空箱补料) 
-        /// </summary>
-        [SugarColumn(ColumnName = "plc_address_2")]
-        public string PlcAddress2 { get; set; }
+        ///// <summary>
+        ///// PLC地址(空箱补料) 
+        ///// </summary>
+        //[SugarColumn(ColumnName = "plc_address_2")]
+        //public string PlcAddress2 { get; set; }
 
         /// <summary>
         /// 创建人 
@@ -84,5 +84,8 @@ namespace DOAN.Model.PBL
         /// </summary>
         [SugarColumn(ColumnName = "uPDATED_TIME")]
         public DateTime? UpdatedTime { get; set; }
+
+        [SugarColumn(ColumnName = "remark")]
+        public string  Remark { get; set; }
     }
 }