PLC配方表，增加是否配盘字段；

SIMDP/SIMDP.DAL/DALSQL/DalPlcFormula.cs

@@ -48,6 +48,7 @@ namespace SIMDP.DAL.DALSQL
 			info.ProductType = reader.GetString("PRODUCT_TYPE");
 			info.Color = reader.GetString("COLOR");
 			info.PlcProgramCode = reader.GetInt32("PLC_PROGRAM_CODE");
+			info.NeedShelf = reader.GetBoolean("NEED_SHELF");
 
 			return info;
 		}
@@ -66,27 +67,11 @@ namespace SIMDP.DAL.DALSQL
 			hash.Add("PRODUCT_TYPE", info.ProductType);
 			hash.Add("COLOR", info.Color);
 			hash.Add("PLC_PROGRAM_CODE", info.PlcProgramCode);
+			hash.Add("NEED_SHELF", info.NeedShelf);
 
 			return hash;
 		}
 
-		/// <summary>
-		/// 获取字段中文别名（用于界面显示）的字典集合
-		/// </summary>
-		/// <returns></returns>
-		public override Dictionary<string, string> GetColumnNameAlias()
-		{
-			Dictionary<string, string> dict = new Dictionary<string, string>();
-			#region 添加别名解析
-			//dict.Add("ID", "编号");
-			dict.Add("ProjectCode", "项目号");
-			dict.Add("ProductType", "图号");
-			dict.Add("Color", "颜色");
-			dict.Add("PlcProgramCode", "PLC程序号");
-			#endregion
-
-			return dict;
-		}
 
 	}
 }

SIMDP/SIMDP.Model/MoPlcFormula.cs

@@ -7,12 +7,13 @@ namespace SIMDP.Model
     [DataContract]
     public class MoPlcFormula : BaseEntity
     {
-
-
         public MoPlcFormula()
         {
             this.ID = 0;
-
+            this.ProjectCode = "";
+            this.ProductType = "";
+            this.PlcProgramCode = 0;
+            this.NeedShelf = false;
         }
 
         #region Property Members
@@ -47,6 +48,8 @@ namespace SIMDP.Model
         [DataMember]
         public virtual int PlcProgramCode { get; set; }
 
+        [DataMember]
+        public virtual bool NeedShelf { get; set; }
 
         #endregion
 

SIMDP/SIMDP.Project/RWS/PLC1.cs

@@ -485,6 +485,7 @@ namespace SIMDP.Project
 
         public void 大托盘到位请求(object value)
         {
+            
             bool signal = Convert.ToBoolean(value);
             LogHelper.log.Info($"PLC1 : signal = {signal}");
             if (!signal)
@@ -496,17 +497,28 @@ namespace SIMDP.Project
             //redis.SetString(redis_largeLoading, "");
             LargeArriveWrite(null, false);
             Write("大托盘到位处理结果", 0);
+
             //2 到位扫码  
-            string sbarcode = Scanner.Scan(fixedScannerIp, Convert.ToInt32(fixedScannerPort));
-            if (sbarcode == "")
+            string sbarcode = "";
+            try
             {
-                Write("大托盘到位处理结果", 2);
-                Write("大托盘到位请求处理完成", true);
-                LogHelper.log.Error($"PLC1 : 扫码失败，返回结果2");
+                sbarcode = Scanner.Scan(fixedScannerIp, Convert.ToInt32(fixedScannerPort));
+                if (sbarcode == "")
+                {
+                    Write("大托盘到位处理结果", 2);
+                    Write("大托盘到位请求处理完成", true);
+                    LogHelper.log.Error($"PLC1 : 扫码失败，返回结果2");
 
+                    Write("上位机报警", 11);
+                    return;
+                }
+            }
+            catch (Exception ex)
+            {
                 Write("上位机报警", 11);
                 return;
             }
+          
             //3 解析托盘号
             MoProductTask model = BLLFactory<BlProductTask>.Instance.LargeTrayArrive(sbarcode, line);
             if (model == null)

SIMDP/SIMDP.Project/RWS/PLC3.cs

@@ -320,14 +320,24 @@ namespace SIMDP.Project
             LargeArriveWrite(null, false);
             Write("大托盘到位处理结果", 0);
             //2 到位扫码 
-            string sbarcode = Scanner.Scan(fixedScannerIp, Convert.ToInt32(fixedScannerPort));
-            if (sbarcode == "")
+            string sbarcode = "";
+            try
             {
-                Write("大托盘到位处理结果", 2);
-                Write("大托盘到位请求处理完成", true);
-                LogHelper.log.Error($"PLC3 : 扫码失败，返回结果2");
+                 sbarcode = Scanner.Scan(fixedScannerIp, Convert.ToInt32(fixedScannerPort));
+                if (sbarcode == "")
+                {
+                    Write("大托盘到位处理结果", 2);
+                    Write("大托盘到位请求处理完成", true);
+                    LogHelper.log.Error($"PLC3 : 扫码失败，返回结果2");
+                    return;
+                }
+            }
+            catch (Exception)
+            {
+                Write("上位机报警", 11);
                 return;
             }
+          
             //3 解析托盘号
             MoProductTask model = BLLFactory<BlProductTask>.Instance.LargeTrayArrive(sbarcode, line);
             if (model == null)

SIMDP/SIMDP.Project/RWS/PLC4.cs

@@ -596,14 +596,24 @@ namespace SIMDP.Project
             LargeArriveWrite(null, false);
             Write("大托盘到位处理结果", 0);
             //2 到位扫码 
-            string sbarcode = Scanner.Scan(fixedScannerIp, Convert.ToInt32(fixedScannerPort));
-            if (sbarcode == "")
+            string sbarcode = "";
+            try
             {
-                Write("大托盘到位处理结果", 2);
-                Write("大托盘到位请求处理完成", true);
-                LogHelper.log.Error($"PLC4 : 扫码失败，返回结果2");
+                sbarcode = Scanner.Scan(fixedScannerIp, Convert.ToInt32(fixedScannerPort));
+                if (sbarcode == "")
+                {
+                    Write("大托盘到位处理结果", 2);
+                    Write("大托盘到位请求处理完成", true);
+                    LogHelper.log.Error($"PLC4 : 扫码失败，返回结果2");
+                    return;
+                }
+            }
+            catch (Exception)
+            {
+                Write("上位机报警", 11);
                 return;
             }
+         
             //3 解析托盘号
             MoProductTask model = BLLFactory<BlProductTask>.Instance.LargeTrayArrive(sbarcode, line);
             if (model == null)

SIMDP/SIMDP.View/FormEditPlcFormula.Designer.cs

@@ -29,7 +29,6 @@
         private void InitializeComponent()
         {
             this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
-            this.label1 = new System.Windows.Forms.Label();
             this.txt_PLCCode = new DevExpress.XtraEditors.TextEdit();
             this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
             this.txt_Color = new DevExpress.XtraEditors.TextEdit();
@@ -41,12 +40,15 @@
             this.btn_getRecentRemark = new DevExpress.XtraEditors.SimpleButton();
             this.btn_Add = new DevExpress.XtraEditors.SimpleButton();
             this.btn_Save = new DevExpress.XtraEditors.SimpleButton();
+            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
+            this.chk_NeedShelf = new DevExpress.XtraEditors.CheckEdit();
             ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
             this.panelControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_PLCCode.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_Color.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_ProType.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_Remark.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.chk_NeedShelf.Properties)).BeginInit();
             this.SuspendLayout();
             // 
             // panelControl1
@@ -54,7 +56,8 @@
             this.panelControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.panelControl1.Controls.Add(this.label1);
+            this.panelControl1.Controls.Add(this.chk_NeedShelf);
+            this.panelControl1.Controls.Add(this.labelControl1);
             this.panelControl1.Controls.Add(this.txt_PLCCode);
             this.panelControl1.Controls.Add(this.labelControl4);
             this.panelControl1.Controls.Add(this.txt_Color);
@@ -67,138 +70,130 @@
             this.panelControl1.Controls.Add(this.btn_Add);
             this.panelControl1.Controls.Add(this.btn_Save);
             this.panelControl1.Location = new System.Drawing.Point(0, 0);
-            this.panelControl1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.panelControl1.Name = "panelControl1";
-            this.panelControl1.Size = new System.Drawing.Size(526, 402);
+            this.panelControl1.Size = new System.Drawing.Size(368, 256);
             this.panelControl1.TabIndex = 0;
             // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.ForeColor = System.Drawing.Color.Red;
-            this.label1.Location = new System.Drawing.Point(61, 342);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(244, 22);
-            this.label1.TabIndex = 31;
-            this.label1.Text = "注：备注可简化、最少三个字";
-            // 
             // txt_PLCCode
             // 
-            this.txt_PLCCode.Location = new System.Drawing.Point(224, 213);
-            this.txt_PLCCode.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_PLCCode.Location = new System.Drawing.Point(157, 136);
             this.txt_PLCCode.Name = "txt_PLCCode";
             this.txt_PLCCode.Properties.Mask.AutoComplete = DevExpress.XtraEditors.Mask.AutoCompleteType.None;
             this.txt_PLCCode.Properties.Mask.EditMask = "d";
             this.txt_PLCCode.Properties.Mask.MaskType = DevExpress.XtraEditors.Mask.MaskType.Numeric;
             this.txt_PLCCode.Properties.Mask.ShowPlaceHolders = false;
-            this.txt_PLCCode.Size = new System.Drawing.Size(234, 28);
+            this.txt_PLCCode.Size = new System.Drawing.Size(164, 20);
             this.txt_PLCCode.TabIndex = 6;
             // 
             // labelControl4
             // 
-            this.labelControl4.Location = new System.Drawing.Point(71, 216);
-            this.labelControl4.Margin = new System.Windows.Forms.Padding(4);
+            this.labelControl4.Location = new System.Drawing.Point(50, 137);
             this.labelControl4.Name = "labelControl4";
-            this.labelControl4.Size = new System.Drawing.Size(102, 22);
+            this.labelControl4.Size = new System.Drawing.Size(68, 14);
             this.labelControl4.TabIndex = 27;
             this.labelControl4.Text = "PLC程序号：";
             // 
             // txt_Color
             // 
-            this.txt_Color.Location = new System.Drawing.Point(224, 158);
-            this.txt_Color.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_Color.Location = new System.Drawing.Point(157, 101);
             this.txt_Color.Name = "txt_Color";
-            this.txt_Color.Size = new System.Drawing.Size(234, 28);
+            this.txt_Color.Size = new System.Drawing.Size(164, 20);
             this.txt_Color.TabIndex = 30;
             // 
             // labelControl3
             // 
             this.labelControl3.Appearance.ForeColor = System.Drawing.Color.Silver;
             this.labelControl3.Appearance.Options.UseForeColor = true;
-            this.labelControl3.Location = new System.Drawing.Point(71, 161);
-            this.labelControl3.Margin = new System.Windows.Forms.Padding(4);
+            this.labelControl3.Location = new System.Drawing.Point(50, 102);
             this.labelControl3.Name = "labelControl3";
-            this.labelControl3.Size = new System.Drawing.Size(54, 22);
+            this.labelControl3.Size = new System.Drawing.Size(36, 14);
             this.labelControl3.TabIndex = 27;
             this.labelControl3.Text = "颜色：";
             // 
             // txt_ProType
             // 
-            this.txt_ProType.Location = new System.Drawing.Point(224, 104);
-            this.txt_ProType.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_ProType.Location = new System.Drawing.Point(157, 66);
             this.txt_ProType.Name = "txt_ProType";
-            this.txt_ProType.Size = new System.Drawing.Size(234, 28);
+            this.txt_ProType.Size = new System.Drawing.Size(164, 20);
             this.txt_ProType.TabIndex = 29;
             // 
             // txt_Remark
             // 
             this.txt_Remark.EditValue = "";
-            this.txt_Remark.Location = new System.Drawing.Point(224, 51);
-            this.txt_Remark.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_Remark.Location = new System.Drawing.Point(157, 32);
             this.txt_Remark.Name = "txt_Remark";
-            this.txt_Remark.Size = new System.Drawing.Size(234, 28);
+            this.txt_Remark.Size = new System.Drawing.Size(164, 20);
             this.txt_Remark.TabIndex = 28;
             // 
             // btn_Cancel
             // 
-            this.btn_Cancel.Location = new System.Drawing.Point(385, 285);
-            this.btn_Cancel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.btn_Cancel.Location = new System.Drawing.Point(271, 213);
             this.btn_Cancel.Name = "btn_Cancel";
-            this.btn_Cancel.Size = new System.Drawing.Size(72, 37);
+            this.btn_Cancel.Size = new System.Drawing.Size(50, 24);
             this.btn_Cancel.TabIndex = 12;
             this.btn_Cancel.Text = "取消";
             this.btn_Cancel.Click += new System.EventHandler(this.btn_Cancel_Click);
             // 
             // btn_getRecentSRIT
             // 
-            this.btn_getRecentSRIT.Location = new System.Drawing.Point(65, 100);
-            this.btn_getRecentSRIT.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.btn_getRecentSRIT.Location = new System.Drawing.Point(45, 64);
             this.btn_getRecentSRIT.Name = "btn_getRecentSRIT";
-            this.btn_getRecentSRIT.Size = new System.Drawing.Size(111, 37);
+            this.btn_getRecentSRIT.Size = new System.Drawing.Size(78, 24);
             this.btn_getRecentSRIT.TabIndex = 4;
             this.btn_getRecentSRIT.Text = "图号/获取：";
             this.btn_getRecentSRIT.Click += new System.EventHandler(this.btn_getRecentSRIT_Click);
             // 
             // btn_getRecentRemark
             // 
-            this.btn_getRecentRemark.Location = new System.Drawing.Point(65, 48);
-            this.btn_getRecentRemark.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.btn_getRecentRemark.Location = new System.Drawing.Point(45, 31);
             this.btn_getRecentRemark.Name = "btn_getRecentRemark";
-            this.btn_getRecentRemark.Size = new System.Drawing.Size(111, 37);
+            this.btn_getRecentRemark.Size = new System.Drawing.Size(78, 24);
             this.btn_getRecentRemark.TabIndex = 2;
             this.btn_getRecentRemark.Text = "备注/获取：";
             this.btn_getRecentRemark.Click += new System.EventHandler(this.btn_getRecentRemark_Click);
             // 
             // btn_Add
             // 
-            this.btn_Add.Location = new System.Drawing.Point(65, 285);
-            this.btn_Add.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.btn_Add.Location = new System.Drawing.Point(47, 213);
             this.btn_Add.Name = "btn_Add";
-            this.btn_Add.Size = new System.Drawing.Size(72, 37);
+            this.btn_Add.Size = new System.Drawing.Size(50, 24);
             this.btn_Add.TabIndex = 8;
             this.btn_Add.Text = "添加";
             this.btn_Add.Click += new System.EventHandler(this.btn_Add_Click);
             // 
             // btn_Save
             // 
-            this.btn_Save.Location = new System.Drawing.Point(225, 285);
-            this.btn_Save.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.btn_Save.Location = new System.Drawing.Point(159, 213);
             this.btn_Save.Name = "btn_Save";
-            this.btn_Save.Size = new System.Drawing.Size(72, 37);
+            this.btn_Save.Size = new System.Drawing.Size(50, 24);
             this.btn_Save.TabIndex = 10;
             this.btn_Save.Text = "保存";
             this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click);
             // 
+            // labelControl1
+            // 
+            this.labelControl1.Location = new System.Drawing.Point(50, 174);
+            this.labelControl1.Name = "labelControl1";
+            this.labelControl1.Size = new System.Drawing.Size(60, 14);
+            this.labelControl1.TabIndex = 27;
+            this.labelControl1.Text = "是否配盘：";
+            // 
+            // chk_NeedShelf
+            // 
+            this.chk_NeedShelf.Location = new System.Drawing.Point(157, 171);
+            this.chk_NeedShelf.Name = "chk_NeedShelf";
+            this.chk_NeedShelf.Properties.Caption = "";
+            this.chk_NeedShelf.Size = new System.Drawing.Size(75, 20);
+            this.chk_NeedShelf.TabIndex = 31;
+            // 
             // FormEditPlcFormula
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(528, 402);
+            this.ClientSize = new System.Drawing.Size(372, 258);
             this.ControlBox = false;
             this.Controls.Add(this.panelControl1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
-            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "FormEditPlcFormula";
@@ -211,6 +206,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_Color.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_ProType.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_Remark.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.chk_NeedShelf.Properties)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -229,6 +225,7 @@
         private DevExpress.XtraEditors.TextEdit txt_Remark;
         private DevExpress.XtraEditors.SimpleButton btn_getRecentRemark;
         private DevExpress.XtraEditors.SimpleButton btn_getRecentSRIT;
-        private System.Windows.Forms.Label label1;
+        private DevExpress.XtraEditors.LabelControl labelControl1;
+        private DevExpress.XtraEditors.CheckEdit chk_NeedShelf;
     }
 }

SIMDP/SIMDP.View/FormEditPlcFormula.cs

@@ -40,6 +40,7 @@ namespace SIMDP
             txt_ProType.Text = modelFormula.ProductType;
             txt_Color.Text = modelFormula.Color;
             txt_PLCCode.Text = modelFormula.PlcProgramCode.ToString();
+            chk_NeedShelf.Checked = modelFormula.NeedShelf ? true : false;
 
             this.btn_Add.Enabled = false;
             this.btn_Save.Enabled = true;
@@ -61,7 +62,7 @@ namespace SIMDP
                 }
                 if (sRemark.Length < 3)
                 {
-                    XtraMessageBox.Show("项目备注名长度不得小于3。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    XtraMessageBox.Show("项目备注名长度不能小于3。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
                     return;
                 }
                 int iPLCCode = Convert.ToInt32(txt_PLCCode.Text);
@@ -76,6 +77,7 @@ namespace SIMDP
                 model.ProductType = sProtype;
                 model.Color = sColor;
                 model.PlcProgramCode = iPLCCode;
+                model.NeedShelf = chk_NeedShelf.Checked ? true : false;
 
                 List<MoPlcFormula> list = BLLFactory<BlPlcFormula>.Instance.CheckLikelyFormula(model.ProductType, model.ProjectCode);
                 if (list != null)
@@ -121,6 +123,7 @@ namespace SIMDP
                 string sProtype = SysEnvironment.TackleProType(txt_ProType.Text).Trim();
                 string sColor = txt_Color.Text.Trim();
                 string sPLCCode = txt_PLCCode.Text.Trim();
+
                 if (string.IsNullOrEmpty(sRemark) || string.IsNullOrEmpty(sProtype) || string.IsNullOrEmpty(sPLCCode))
                 {
                     XtraMessageBox.Show("请将关键字段填写完整", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
@@ -142,6 +145,7 @@ namespace SIMDP
                 modelFormula.ProductType = sProtype;
                 modelFormula.Color = sColor;
                 modelFormula.PlcProgramCode = iPLCCode;
+                modelFormula.NeedShelf = chk_NeedShelf.Checked ? true : false;
 
                 List<MoPlcFormula> list = BLLFactory<BlPlcFormula>.Instance.CheckLikelyFormula(modelFormula.ProductType, modelFormula.ProjectCode);
                 if (list != null)

SIMDP/SIMDP.View/FormPlcFormula.Designer.cs

@@ -35,7 +35,7 @@ namespace SIMDP
             this.btn_Delete = new DevExpress.XtraEditors.SimpleButton();
             this.btn_Edit = new DevExpress.XtraEditors.SimpleButton();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.coTableLayoutPanel1 = new CoTableLayoutPanel();
+            this.coTableLayoutPanel1 = new ProjectBase.Controls.CoTableLayoutPanel();
             this.btn_ExportData = new DevExpress.XtraEditors.SimpleButton();
             this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
             this.txt_remark = new DevExpress.XtraEditors.TextEdit();
@@ -46,6 +46,7 @@ namespace SIMDP
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.panel1.SuspendLayout();
             this.coTableLayoutPanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
@@ -58,14 +59,14 @@ namespace SIMDP
             this.label_PageInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label_PageInfo.Location = new System.Drawing.Point(6, 295);
             this.label_PageInfo.Name = "label_PageInfo";
-            this.label_PageInfo.Size = new System.Drawing.Size(92, 18);
+            this.label_PageInfo.Size = new System.Drawing.Size(75, 14);
             this.label_PageInfo.TabIndex = 8;
             this.label_PageInfo.Text = "共 {0} 条记录";
             // 
             // btn_Delete
             // 
             this.btn_Delete.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.btn_Delete.Image = ((System.Drawing.Image)(resources.GetObject("btn_Delete.Image")));
+            this.btn_Delete.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btn_Delete.ImageOptions.Image")));
             this.btn_Delete.Location = new System.Drawing.Point(970, 3);
             this.btn_Delete.Name = "btn_Delete";
             this.btn_Delete.Size = new System.Drawing.Size(100, 22);
@@ -76,7 +77,7 @@ namespace SIMDP
             // btn_Edit
             // 
             this.btn_Edit.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.btn_Edit.Image = ((System.Drawing.Image)(resources.GetObject("btn_Edit.Image")));
+            this.btn_Edit.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btn_Edit.ImageOptions.Image")));
             this.btn_Edit.Location = new System.Drawing.Point(834, 3);
             this.btn_Edit.Name = "btn_Edit";
             this.btn_Edit.Size = new System.Drawing.Size(100, 22);
@@ -125,7 +126,7 @@ namespace SIMDP
             // btn_ExportData
             // 
             this.btn_ExportData.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.btn_ExportData.Image = ((System.Drawing.Image)(resources.GetObject("btn_ExportData.Image")));
+            this.btn_ExportData.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btn_ExportData.ImageOptions.Image")));
             this.btn_ExportData.Location = new System.Drawing.Point(1106, 3);
             this.btn_ExportData.Margin = new System.Windows.Forms.Padding(10, 3, 10, 3);
             this.btn_ExportData.Name = "btn_ExportData";
@@ -137,25 +138,25 @@ namespace SIMDP
             // labelControl1
             // 
             this.labelControl1.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.labelControl1.Location = new System.Drawing.Point(481, 5);
+            this.labelControl1.Location = new System.Drawing.Point(493, 7);
             this.labelControl1.Name = "labelControl1";
-            this.labelControl1.Size = new System.Drawing.Size(60, 18);
+            this.labelControl1.Size = new System.Drawing.Size(48, 14);
             this.labelControl1.TabIndex = 8;
             this.labelControl1.Text = "备注名：";
             // 
             // txt_remark
             // 
             this.txt_remark.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.txt_remark.Location = new System.Drawing.Point(550, 3);
+            this.txt_remark.Location = new System.Drawing.Point(550, 4);
             this.txt_remark.Name = "txt_remark";
-            this.txt_remark.Size = new System.Drawing.Size(124, 24);
+            this.txt_remark.Size = new System.Drawing.Size(124, 20);
             this.txt_remark.TabIndex = 9;
             this.txt_remark.EditValueChanged += new System.EventHandler(this.txt_remark_EditValueChanged);
             // 
             // btn_Add
             // 
             this.btn_Add.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.btn_Add.Image = ((System.Drawing.Image)(resources.GetObject("btn_Add.Image")));
+            this.btn_Add.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btn_Add.ImageOptions.Image")));
             this.btn_Add.Location = new System.Drawing.Point(698, 3);
             this.btn_Add.Name = "btn_Add";
             this.btn_Add.Size = new System.Drawing.Size(100, 22);
@@ -184,7 +185,8 @@ namespace SIMDP
             this.gridColumn1,
             this.gridColumn2,
             this.gridColumn3,
-            this.gridColumn4});
+            this.gridColumn4,
+            this.gridColumn5});
             this.gridView.GridControl = this.gridControl;
             this.gridView.IndicatorWidth = 30;
             this.gridView.Name = "gridView";
@@ -202,7 +204,7 @@ namespace SIMDP
             // 
             // gridColumn1
             // 
-            this.gridColumn1.Caption = "备注名";
+            this.gridColumn1.Caption = "项目名称(流转卡备注)";
             this.gridColumn1.FieldName = "ProjectCode";
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
@@ -212,7 +214,7 @@ namespace SIMDP
             // 
             this.gridColumn2.AppearanceCell.Options.UseTextOptions = true;
             this.gridColumn2.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
-            this.gridColumn2.Caption = "图号";
+            this.gridColumn2.Caption = "图号(截去SRIT)";
             this.gridColumn2.FieldName = "ProductType";
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
@@ -232,15 +234,25 @@ namespace SIMDP
             // 
             this.gridColumn4.AppearanceCell.Options.UseTextOptions = true;
             this.gridColumn4.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
-            this.gridColumn4.Caption = "PLC程序配方号";
+            this.gridColumn4.Caption = "PLC程序号";
             this.gridColumn4.FieldName = "PlcProgramCode";
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
             this.gridColumn4.VisibleIndex = 3;
             // 
+            // gridColumn5
+            // 
+            this.gridColumn5.AppearanceCell.Options.UseTextOptions = true;
+            this.gridColumn5.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+            this.gridColumn5.Caption = "是否配盘";
+            this.gridColumn5.FieldName = "NeedShelf";
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 4;
+            // 
             // FormPlcFormula
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1231, 322);
             this.Controls.Add(this.panel1);
@@ -274,5 +286,6 @@ namespace SIMDP
         private DevExpress.XtraEditors.LabelControl labelControl1;
         private DevExpress.XtraEditors.TextEdit txt_remark;
         private DevExpress.XtraEditors.SimpleButton btn_ExportData;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
     }
 }

SIMDP/SIMDP.View/FormPlcFormula.resx

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="btn_Delete.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btn_Delete.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0VGl0
         bGUARGVsZXRlO1JlbW92ZTtNaW51c+upj0EAAANRSURBVDhPfZJdTFN3GMYPkPiBF2NeejEXkyVubtXg
@@ -138,7 +138,7 @@
         9voPd5ZfEGWq+0VijZ/wfvJttXVl+tnzy1L3rKHMYiKByd45cC8B0oKaPyRsCA8AAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="btn_Edit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btn_Edit.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACB0RVh0VGl0
         bGUARWRpdDtCYXJzO1JpYmJvbjtTdGFuZGFyZDswE8PbAAACtUlEQVQ4T2WSW0hUQRjHT97Xy1oIJilt
@@ -156,7 +156,7 @@
         RmqYj5AS5iP8AQSCmu1rvrSCAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="btn_ExportData.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btn_ExportData.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAB10RVh0VGl0
         bGUATG9hZDtTZWxlY3Q7Rm9sZGVyO09wZW6WMz54AAADHklEQVQ4T42TfUyTVxSHX4ebLsZl+ocxcTpl
@@ -176,7 +176,7 @@
         AAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="btn_Add.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btn_Add.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABt0RVh0VGl0
         bGUAQWRkO1BsdXM7QmFycztSaWJib247lQYzLwAAA3VJREFUOE9VkmtMU2cYxw+Q6GQfxvZxH3RZYqK7

SIMDP/SIMDP.View/Properties/licenses.licx

@@ -1,8 +1,9 @@
-DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v19.2, Version=19.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v19.2, Version=19.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v19.2, Version=19.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a