230210修改优化一系列

SIMDP/SIMDP.Project/RWS/PLC1.cs

@@ -20,21 +20,14 @@ namespace SIMDP.Project
     {
         #region 设备空间
 
-        // private string plcname = "小压溃PLC";//PLC1
-        private string plcname = "PLC1";
-
+        private const string plcname = "PLC1";
         private const string lshelfWorkStaion = "YK1001";
-
         private const int line = 3;
+        private readonly string workStaion = "";
+        private readonly string fixedScannerIp = "";
+        private readonly int fixedScannerPort = 0;
 
-        //系统参数、用户参数
-        private string workStaion = "";
-
-        private string fixedScannerIp = "";
-
-        private int fixedScannerPort = 0;
 
-        //当前呼叫状态、L工装盘号和WMS信息状态
         private const string redis_largeLoading = "PLC1LargeLoading";
         private const string redis_largeBlanking = "PLC1LargeBlanking";
         private const string redis_smallLoading = "PLC1SmallLoading";
@@ -45,7 +38,6 @@ namespace SIMDP.Project
         private const string redis_wmsmsg = "lbl_wmsmsg01";//wms信息
         private const string lbl_matchresult = "lbl_matchresult1";//配盘结果
 
-        //传感器plc
         private const string lbl_sensorstate1 = "lbl_sensorstate11";
         private const string lbl_sensorstate2 = "lbl_sensorstate12";
         private const string lbl_sensorstate3 = "lbl_sensorstate13";
@@ -62,17 +54,12 @@ namespace SIMDP.Project
             bool flag = BLLFactory<BlPlcInfo>.Instance.GetScannerParams("Scanner_XYK", out fixedScannerIp, out fixedScannerPort);
             if (!flag) BLLFactory<BlSystemNotice>.Instance.PublishSysMessage("通信配置", 2, "当前扫码枪参数未配置，无法通信");
         }
-       
 
         //记录actionTimer()执行次数，到达阈值后触发一次自动呼叫逻辑
-        private int actionCount = 0;
-
         private const int threshold = 5;
+        private int actionCount = 0;
 
         private bool pcHeartBeat = false;
-
-       
-
         public override void actionTimer()
         {
             try
@@ -131,25 +118,21 @@ namespace SIMDP.Project
             Read("小托盘下料请求", out bool bvalue2); redis.SetString(lbl_sensorstate2, bvalue2);
             Read("L型工装上料请求", out bool bvalue5); redis.SetString(lbl_sensorstateLUP, bvalue5);
 
-            //small and large loading
+            //大小托盘同时上料
             string smallRecord = redis.GetString(redis_smallLoading);
             string largeRecord = redis.GetString(redis_largeLoading);
             bool smallCalled = string.IsNullOrEmpty(smallRecord);
             bool largeCalled = string.IsNullOrEmpty(largeRecord);
+            if (bvalue1 && bvalue3 && largeCalled && smallCalled)
+                大小托盘同时上料();
 
-            if (bvalue1 && bvalue3 && largeCalled && smallCalled) 大小托盘同时上料();
-
-            //large blanking
+            //大托盘下料
             if (!bvalue4)
-            {
                 redis.SetString(redis_largeBlanking, "");
-            }
-            else
-            {
-                if (string.IsNullOrEmpty(redis.GetString(redis_largeBlanking))) 大托盘下料();
-            }
+            else if (string.IsNullOrEmpty(redis.GetString(redis_largeBlanking)))
+                大托盘下料();
 
-            //lshelf loading
+            //L工装上料
             if (bvalue5)
             {
                 //0210 清空WMS发送记录
@@ -157,13 +140,15 @@ namespace SIMDP.Project
                 redis.SetString(redis_lshelfBlanking, "");
             }
 
-            //shelf blanking
+            //L工装下料
             if (bvalue6)
             {
-                if (string.IsNullOrEmpty(redis.GetString(redis_lshelfBlanking))) L型工装下料请求();
+                if (string.IsNullOrEmpty(redis.GetString(redis_lshelfBlanking)))
+                    L型工装下料请求();
             }
         }
 
+        //节约通信时间方法
         private void ReadSensor()
         {
             //actEasyIF.GetDevice2("W600.7", out short svalue1);  
@@ -246,6 +231,11 @@ namespace SIMDP.Project
         {
             string errorMsg = "";
 
+            //230210 截断下料
+            MoUserParameter moUserParameter = BLLFactory<BlUserParameter>.Instance.FindSingle($"user_para_name = '成品L工装自动转运'");
+            if (moUserParameter.UserParaValid == false)
+                return;
+
             try
             {
                 string lShelfBarcode = redis.GetString(lbl_lshelfbarcode);
@@ -299,7 +289,7 @@ namespace SIMDP.Project
                     bool bSendWMS = ExternalInterface.GenWMSStorage(inPara, out string sWMSReturn);
                     while (sWMSReturn.Contains("已经有库存"))
                     {
-                        lShelfBarcode= GenRandomLShelfBarcode();
+                        lShelfBarcode = GenRandomLShelfBarcode();
                         inPara.STOCK_BARCODE = lShelfBarcode;
                         bSendWMS = ExternalInterface.GenWMSStorage(inPara, out sWMSReturn);
                         if (bSendWMS) break;
@@ -650,121 +640,6 @@ namespace SIMDP.Project
             Write("辅助压机右侧读取请求处理完成", true);
         }
 
-        //public void 工艺看板一到位请求(object value)
-        //{
-        //    bool signal = Convert.ToBoolean(value);
-        //    LogHelper.log.Debug($"{plcname} : signal = {signal} ");
-
-        //    if (!signal) return;
-
-        //    //1 读取流水号
-
-        //    //2 根据流水号查找订单 调出M码
-
-        //    //3 给MES写值：看板位置、M码
-
-        //    //4 反馈完成
-        //}
-
-        //public void L型工装上料请求(object value)
-        //{
-        //    bool signal = Convert.ToBoolean(value);
-
-        //    UpdateMES_AGVSign(workCellCode1001Up, workCellTypeL_Up, Convert.ToInt32(signal));
-        //    UpdateMES_AGVSign(workCellCode1002Up, workCellTypeL_Up, Convert.ToInt32(signal));
-        //}
-
-        #endregion
-
-        #region 模拟调试
-        //public class TestRunner
-        //{
-        //    public {plcname} {plcname};
-        //    public TestRunner({plcname} parent)
-        //    {
-        //        {plcname} = parent;
-        //    }
-        //    public PLC5 plc5 = (PLC5)PlcHelper.deviceList.Find(e => ((PlcMXComponent)e).actLogicalStationNumber == 5);//读取小压溃压机实例
-
-        //    CancellationTokenSource ts = new CancellationTokenSource();//线程取消标记
-        //    public void Run()
-        //    {
-        //        Task.Run(() =>
-        //        {
-        //            //上料
-        //            {plcname}.Write("大小托盘扫码请求", true);
-        //            ReadUntil("大托盘扫码结果", true);
-        //            ReadUntil("大托盘扫码完成", true);
-        //            ReadUntil("小托盘扫码结果", true);
-        //            ReadUntil("小托盘扫码完成", true);
-        //            ReadUntil("大小托盘配对结果", true);
-
-        //            {plcname}.Read("产品型号", out string producttype);
-        //            {plcname}.Read("视觉颜色", out string color);
-        //            {plcname}.Read("上料流水号", out string serialnum);
-        //            {plcname}.Write("大小托盘扫码请求", false);
-
-        //            // ts.Cancel();// 如出现此句，则下面抛出异常跳出
-        //            try
-        //            {
-        //                ts.Token.ThrowIfCancellationRequested();
-        //                //辅助压机1次
-        //                {plcname}.Write("辅助压机读取流水号", serialnum);
-        //                {plcname}.Write("辅助压机数值", 50);
-        //                {plcname}.Write("辅助压机读取次数", false);//第一次
-        //                {plcname}.Write("辅助压机读取请求", true);
-        //                ReadUntil("辅助压机读取结果", true);
-        //                ReadUntil("辅助压机读取完成", true);
-        //                {plcname}.Write("辅助压机读取请求", false);
-        //                Thread.Sleep(3000);
-        //                //辅助压机2次
-        //                {plcname}.Write("辅助压机读取流水号", serialnum);
-        //                {plcname}.Write("辅助压机数值", 51);
-        //                {plcname}.Write("辅助压机读取次数", true);//第二次
-        //                {plcname}.Write("辅助压机读取请求", true);
-        //                ReadUntil("辅助压机读取结果", true);
-        //                ReadUntil("辅助压机读取完成", true);
-        //                {plcname}.Write("辅助压机读取请求", false);
-        //                //主压机
-        //                plc5.Write("主压机读取流水号", serialnum);
-        //                plc5.Write("主压机数值", 60);
-        //                plc5.Write("主压机读取请求", true);
-        //                ReadPLC5Until("主压机读取结果", true);
-        //                ReadPLC5Until("主压机读取完成", true);
-        //                plc5.Write("主压机读取请求", false);
-        //                //打标
-        //                {plcname}.Write("打标流水号", serialnum);
-        //                {plcname}.Write("打标请求", true);
-        //                ReadUntil("打标结果", true);
-        //                ReadUntil("打标完成", true);
-        //                {plcname}.Write("打标请求", false);
-
-        //            }
-        //            catch { }
-
-        //        }, ts.Token);
-        //    }
-
-        //    private void ReadUntil(string pointName, bool target)
-        //    {
-        //        while (true)
-        //        {
-        //            {plcname}.Read(pointName, out bool value);
-        //            if (value == target) break;
-        //            else Thread.Sleep(1000);
-        //        }
-        //    }
-
-        //    private void ReadPLC5Until(string pointName, bool target)
-        //    {
-        //        while (true)
-        //        {
-        //            plc5.Read(pointName, out bool value);
-        //            if (value == target) break;
-        //            else Thread.Sleep(1000);
-        //        }
-        //    }
-        //}
         #endregion
     }
 }

SIMDP/SIMDP.View/BasicForms/FormSystemParameter.Designer.cs

@@ -57,13 +57,15 @@
             this.gridControlPara.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.gridControlPara.Location = new System.Drawing.Point(-2, 37);
+            this.gridControlPara.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.gridControlPara.Location = new System.Drawing.Point(-2, 48);
             this.gridControlPara.MainView = this.gridView1;
+            this.gridControlPara.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.gridControlPara.Name = "gridControlPara";
             this.gridControlPara.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemHyperLinkDelete,
             this.repositoryItemHyperLinkAlter_Click});
-            this.gridControlPara.Size = new System.Drawing.Size(825, 308);
+            this.gridControlPara.Size = new System.Drawing.Size(943, 396);
             this.gridControlPara.TabIndex = 0;
             this.gridControlPara.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -84,7 +86,7 @@
             this.gridColumn9,
             this.gridColumn10,
             this.gridColumn11});
-            this.gridView1.DetailHeight = 223;
+            this.gridView1.DetailHeight = 287;
             this.gridView1.FixedLineWidth = 1;
             this.gridView1.GridControl = this.gridControlPara;
             this.gridView1.Name = "gridView1";
@@ -101,11 +103,11 @@
             this.gridColumn1.AppearanceCell.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
             this.gridColumn1.Caption = "参数编码";
             this.gridColumn1.FieldName = "ParameterId";
-            this.gridColumn1.MinWidth = 14;
+            this.gridColumn1.MinWidth = 16;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
             this.gridColumn1.VisibleIndex = 0;
-            this.gridColumn1.Width = 52;
+            this.gridColumn1.Width = 59;
             // 
             // gridColumn2
             // 
@@ -114,11 +116,11 @@
             this.gridColumn2.AppearanceCell.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
             this.gridColumn2.Caption = "参数名称";
             this.gridColumn2.FieldName = "ParameterName";
-            this.gridColumn2.MinWidth = 14;
+            this.gridColumn2.MinWidth = 16;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
             this.gridColumn2.VisibleIndex = 1;
-            this.gridColumn2.Width = 52;
+            this.gridColumn2.Width = 59;
             // 
             // gridColumn3
             // 
@@ -127,11 +129,11 @@
             this.gridColumn3.AppearanceCell.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
             this.gridColumn3.Caption = "参数类型";
             this.gridColumn3.FieldName = "ParameterType";
-            this.gridColumn3.MinWidth = 14;
+            this.gridColumn3.MinWidth = 16;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
             this.gridColumn3.VisibleIndex = 2;
-            this.gridColumn3.Width = 55;
+            this.gridColumn3.Width = 63;
             // 
             // gridColumn5
             // 
@@ -140,11 +142,11 @@
             this.gridColumn5.AppearanceCell.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
             this.gridColumn5.Caption = "参数值";
             this.gridColumn5.FieldName = "ParameterValue";
-            this.gridColumn5.MinWidth = 14;
+            this.gridColumn5.MinWidth = 16;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.Visible = true;
             this.gridColumn5.VisibleIndex = 3;
-            this.gridColumn5.Width = 52;
+            this.gridColumn5.Width = 59;
             // 
             // gridColumn6
             // 
@@ -153,11 +155,11 @@
             this.gridColumn6.AppearanceCell.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
             this.gridColumn6.Caption = "参数单位";
             this.gridColumn6.FieldName = "ParameterUnit";
-            this.gridColumn6.MinWidth = 14;
+            this.gridColumn6.MinWidth = 16;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Visible = true;
             this.gridColumn6.VisibleIndex = 4;
-            this.gridColumn6.Width = 52;
+            this.gridColumn6.Width = 59;
             // 
             // gridColumn7
             // 
@@ -166,11 +168,11 @@
             this.gridColumn7.AppearanceCell.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
             this.gridColumn7.Caption = "是否生效";
             this.gridColumn7.FieldName = "ParameterValid";
-            this.gridColumn7.MinWidth = 14;
+            this.gridColumn7.MinWidth = 16;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Visible = true;
             this.gridColumn7.VisibleIndex = 5;
-            this.gridColumn7.Width = 55;
+            this.gridColumn7.Width = 63;
             // 
             // gridColumn8
             // 
@@ -179,11 +181,11 @@
             this.gridColumn8.AppearanceCell.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
             this.gridColumn8.Caption = "生效时间";
             this.gridColumn8.FieldName = "ParameterTime";
-            this.gridColumn8.MinWidth = 14;
+            this.gridColumn8.MinWidth = 16;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
             this.gridColumn8.VisibleIndex = 6;
-            this.gridColumn8.Width = 55;
+            this.gridColumn8.Width = 63;
             // 
             // gridColumn9
             // 
@@ -192,11 +194,11 @@
             this.gridColumn9.AppearanceCell.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
             this.gridColumn9.Caption = "参数描述";
             this.gridColumn9.FieldName = "ParameterDescription";
-            this.gridColumn9.MinWidth = 14;
+            this.gridColumn9.MinWidth = 16;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Visible = true;
             this.gridColumn9.VisibleIndex = 7;
-            this.gridColumn9.Width = 52;
+            this.gridColumn9.Width = 59;
             // 
             // gridColumn10
             // 
@@ -205,11 +207,11 @@
             this.gridColumn10.AppearanceCell.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
             this.gridColumn10.Caption = "删除操作";
             this.gridColumn10.ColumnEdit = this.repositoryItemHyperLinkDelete;
-            this.gridColumn10.MinWidth = 14;
+            this.gridColumn10.MinWidth = 16;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
             this.gridColumn10.VisibleIndex = 8;
-            this.gridColumn10.Width = 31;
+            this.gridColumn10.Width = 35;
             // 
             // repositoryItemHyperLinkDelete
             // 
@@ -228,11 +230,11 @@
             this.gridColumn11.AppearanceCell.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
             this.gridColumn11.Caption = "修改操作";
             this.gridColumn11.ColumnEdit = this.repositoryItemHyperLinkAlter_Click;
-            this.gridColumn11.MinWidth = 14;
+            this.gridColumn11.MinWidth = 16;
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Visible = true;
             this.gridColumn11.VisibleIndex = 9;
-            this.gridColumn11.Width = 52;
+            this.gridColumn11.Width = 59;
             // 
             // repositoryItemHyperLinkAlter_Click
             // 
@@ -245,9 +247,10 @@
             // 
             this.simpleButtonAdd.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("simpleButtonAdd.ImageOptions.Image")));
             this.simpleButtonAdd.ImageOptions.ImageUri.Uri = "Add;Size16x16";
-            this.simpleButtonAdd.Location = new System.Drawing.Point(210, 8);
+            this.simpleButtonAdd.Location = new System.Drawing.Point(240, 10);
+            this.simpleButtonAdd.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.simpleButtonAdd.Name = "simpleButtonAdd";
-            this.simpleButtonAdd.Size = new System.Drawing.Size(75, 23);
+            this.simpleButtonAdd.Size = new System.Drawing.Size(86, 30);
             this.simpleButtonAdd.TabIndex = 1;
             this.simpleButtonAdd.Text = "添加";
             this.simpleButtonAdd.Click += new System.EventHandler(this.simpleButtonAdd_Click);
@@ -256,9 +259,10 @@
             // 
             this.simpleButtonAllDelete.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("simpleButtonAllDelete.ImageOptions.Image")));
             this.simpleButtonAllDelete.ImageOptions.ImageUri.Uri = "Cancel;Size16x16";
-            this.simpleButtonAllDelete.Location = new System.Drawing.Point(420, 8);
+            this.simpleButtonAllDelete.Location = new System.Drawing.Point(480, 10);
+            this.simpleButtonAllDelete.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.simpleButtonAllDelete.Name = "simpleButtonAllDelete";
-            this.simpleButtonAllDelete.Size = new System.Drawing.Size(75, 23);
+            this.simpleButtonAllDelete.Size = new System.Drawing.Size(86, 30);
             this.simpleButtonAllDelete.TabIndex = 2;
             this.simpleButtonAllDelete.Text = "全部删除";
             this.simpleButtonAllDelete.Click += new System.EventHandler(this.simpleButtonAllDelete_Click);
@@ -266,22 +270,24 @@
             // simpleButton1
             // 
             this.simpleButton1.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("simpleButton1.ImageOptions.Image")));
-            this.simpleButton1.Location = new System.Drawing.Point(632, 8);
+            this.simpleButton1.Location = new System.Drawing.Point(722, 10);
+            this.simpleButton1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.simpleButton1.Name = "simpleButton1";
-            this.simpleButton1.Size = new System.Drawing.Size(85, 23);
+            this.simpleButton1.Size = new System.Drawing.Size(115, 30);
             this.simpleButton1.TabIndex = 3;
-            this.simpleButton1.Text = "CSV重命名";
+            this.simpleButton1.Text = "CSV规范命名";
             this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
             // 
             // FormSystemParameter
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(825, 346);
+            this.ClientSize = new System.Drawing.Size(943, 445);
             this.Controls.Add(this.simpleButton1);
             this.Controls.Add(this.simpleButtonAllDelete);
             this.Controls.Add(this.simpleButtonAdd);
             this.Controls.Add(this.gridControlPara);
+            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.Name = "FormSystemParameter";
             this.Text = "系统参数";
             this.Load += new System.EventHandler(this.FormSystemParameter_Load);

SIMDP/SIMDP.View/BasicForms/FormSystemParameter.resx

@@ -163,11 +163,11 @@
   </data>
   <data name="simpleButton1.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAHXRFWHRUaXRsZQBFeHBvcnQ7
-        Q1NWO0V4cG9ydFRvQ1NWO2FoWvAAAAB2SURBVDhP3ZLRCYAwDESd2gmygyO4gyv46UBnr3illQRS/PPB
-        cTQtjyAuAIaYGWbiCrL8VVCSpgrWfcNsRBMc1/mMUB+8z16TJiBsJTr3TUKBNmD3932TUKBo7jUJv4HQ
-        Bt5GpAlmI6qg9Lf/oPQQDrOEgnwMN8C+SBPMU4AvAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAddEVYdFRpdGxlAEV4cG9ydDtDU1Y7RXhwb3J0VG9D
+        U1Y7YWha8AAAAHZJREFUOE/dktEJgDAMRJ3aCbKDI7iDK/jpQGeveKWVBFL888FxNC2PIC4AhpgZZuIK
+        svxVUJKmCtZ9w2xEExzX+YxQH7zPXpMmIGwlOvdNQoE2YPf3fZNQoGjuNQm/gdAG3kakCWYjqqD0t/+g
+        9BAOs4SCfAw3wL5IE8xTgC8AAAAASUVORK5CYII=
 </value>
   </data>
 </root>

SIMDP/SIMDP.View/FormCopulerRequest.Designer.cs

@@ -78,7 +78,7 @@ namespace SIMDP
             // label_PageInfo
             // 
             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, 289);
+            this.label_PageInfo.Location = new System.Drawing.Point(6, 503);
             this.label_PageInfo.Name = "label_PageInfo";
             this.label_PageInfo.Size = new System.Drawing.Size(92, 18);
             this.label_PageInfo.TabIndex = 8;
@@ -88,7 +88,7 @@ namespace SIMDP
             // 
             this.btn_Delete.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.btn_Delete.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btn_Delete.ImageOptions.Image")));
-            this.btn_Delete.Location = new System.Drawing.Point(1098, 5);
+            this.btn_Delete.Location = new System.Drawing.Point(1117, 5);
             this.btn_Delete.Name = "btn_Delete";
             this.btn_Delete.Size = new System.Drawing.Size(80, 20);
             this.btn_Delete.TabIndex = 7;
@@ -99,7 +99,7 @@ namespace SIMDP
             // 
             this.btn_Edit.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.btn_Edit.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btn_Edit.ImageOptions.Image")));
-            this.btn_Edit.Location = new System.Drawing.Point(991, 5);
+            this.btn_Edit.Location = new System.Drawing.Point(1008, 5);
             this.btn_Edit.Name = "btn_Edit";
             this.btn_Edit.Size = new System.Drawing.Size(80, 20);
             this.btn_Edit.TabIndex = 6;
@@ -111,7 +111,7 @@ namespace SIMDP
             this.btn_Query.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.btn_Query.DialogResult = System.Windows.Forms.DialogResult.OK;
             this.btn_Query.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btn_Query.ImageOptions.Image")));
-            this.btn_Query.Location = new System.Drawing.Point(777, 5);
+            this.btn_Query.Location = new System.Drawing.Point(790, 5);
             this.btn_Query.Name = "btn_Query";
             this.btn_Query.Size = new System.Drawing.Size(80, 20);
             this.btn_Query.TabIndex = 4;
@@ -126,7 +126,7 @@ namespace SIMDP
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1313, 316);
+            this.panel1.Size = new System.Drawing.Size(1332, 530);
             this.panel1.TabIndex = 1;
             // 
             // coTableLayoutPanel1
@@ -164,21 +164,21 @@ namespace SIMDP
             this.coTableLayoutPanel1.Name = "coTableLayoutPanel1";
             this.coTableLayoutPanel1.RowCount = 1;
             this.coTableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.coTableLayoutPanel1.Size = new System.Drawing.Size(1307, 30);
+            this.coTableLayoutPanel1.Size = new System.Drawing.Size(1326, 30);
             this.coTableLayoutPanel1.TabIndex = 25;
             // 
             // dateEditStart
             // 
             this.dateEditStart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.dateEditStart.EditValue = new System.DateTime(2019, 2, 27, 8, 48, 5, 0);
-            this.dateEditStart.Location = new System.Drawing.Point(87, 4);
+            this.dateEditStart.Location = new System.Drawing.Point(88, 3);
             this.dateEditStart.Name = "dateEditStart";
             this.dateEditStart.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
             this.dateEditStart.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.dateEditStart.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.dateEditStart.Size = new System.Drawing.Size(101, 26);
+            this.dateEditStart.Size = new System.Drawing.Size(103, 26);
             this.dateEditStart.TabIndex = 15;
             this.dateEditStart.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Enter_KeyDown);
             // 
@@ -186,21 +186,21 @@ namespace SIMDP
             // 
             this.dateEditEnd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.dateEditEnd.EditValue = new System.DateTime(2019, 2, 27, 0, 0, 0, 0);
-            this.dateEditEnd.Location = new System.Drawing.Point(278, 4);
+            this.dateEditEnd.Location = new System.Drawing.Point(282, 3);
             this.dateEditEnd.Name = "dateEditEnd";
             this.dateEditEnd.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
             this.dateEditEnd.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.dateEditEnd.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.dateEditEnd.Size = new System.Drawing.Size(101, 26);
+            this.dateEditEnd.Size = new System.Drawing.Size(103, 26);
             this.dateEditEnd.TabIndex = 17;
             this.dateEditEnd.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Enter_KeyDown);
             // 
             // labelControl1
             // 
             this.labelControl1.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.labelControl1.Location = new System.Drawing.Point(197, 6);
+            this.labelControl1.Location = new System.Drawing.Point(201, 6);
             this.labelControl1.Name = "labelControl1";
             this.labelControl1.Size = new System.Drawing.Size(75, 18);
             this.labelControl1.TabIndex = 18;
@@ -209,7 +209,7 @@ namespace SIMDP
             // labelControl4
             // 
             this.labelControl4.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.labelControl4.Location = new System.Drawing.Point(6, 6);
+            this.labelControl4.Location = new System.Drawing.Point(7, 6);
             this.labelControl4.Name = "labelControl4";
             this.labelControl4.Size = new System.Drawing.Size(75, 18);
             this.labelControl4.TabIndex = 16;
@@ -221,7 +221,7 @@ namespace SIMDP
             this.chk_Refresh.AutoSize = true;
             this.chk_Refresh.Checked = true;
             this.chk_Refresh.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.chk_Refresh.Location = new System.Drawing.Point(1214, 4);
+            this.chk_Refresh.Location = new System.Drawing.Point(1233, 4);
             this.chk_Refresh.Name = "chk_Refresh";
             this.chk_Refresh.Size = new System.Drawing.Size(90, 22);
             this.chk_Refresh.TabIndex = 22;
@@ -233,7 +233,7 @@ namespace SIMDP
             // 
             this.btn_Add.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.btn_Add.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btn_Add.ImageOptions.Image")));
-            this.btn_Add.Location = new System.Drawing.Point(884, 5);
+            this.btn_Add.Location = new System.Drawing.Point(899, 5);
             this.btn_Add.Name = "btn_Add";
             this.btn_Add.Size = new System.Drawing.Size(80, 20);
             this.btn_Add.TabIndex = 5;
@@ -243,7 +243,7 @@ namespace SIMDP
             // labelControl2
             // 
             this.labelControl2.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.labelControl2.Location = new System.Drawing.Point(403, 6);
+            this.labelControl2.Location = new System.Drawing.Point(410, 6);
             this.labelControl2.Name = "labelControl2";
             this.labelControl2.Size = new System.Drawing.Size(60, 18);
             this.labelControl2.TabIndex = 26;
@@ -252,16 +252,16 @@ namespace SIMDP
             // txt_remark
             // 
             this.txt_remark.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txt_remark.Location = new System.Drawing.Point(469, 5);
+            this.txt_remark.Location = new System.Drawing.Point(476, 3);
             this.txt_remark.Name = "txt_remark";
-            this.txt_remark.Size = new System.Drawing.Size(101, 24);
+            this.txt_remark.Size = new System.Drawing.Size(103, 24);
             this.txt_remark.TabIndex = 27;
             this.txt_remark.EditValueChanged += new System.EventHandler(this.txt_remark_EditValueChanged);
             // 
             // labelControl3
             // 
             this.labelControl3.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.labelControl3.Location = new System.Drawing.Point(594, 6);
+            this.labelControl3.Location = new System.Drawing.Point(604, 6);
             this.labelControl3.Name = "labelControl3";
             this.labelControl3.Size = new System.Drawing.Size(60, 18);
             this.labelControl3.TabIndex = 26;
@@ -270,9 +270,9 @@ namespace SIMDP
             // txt_MrlCode
             // 
             this.txt_MrlCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txt_MrlCode.Location = new System.Drawing.Point(660, 5);
+            this.txt_MrlCode.Location = new System.Drawing.Point(670, 3);
             this.txt_MrlCode.Name = "txt_MrlCode";
-            this.txt_MrlCode.Size = new System.Drawing.Size(101, 24);
+            this.txt_MrlCode.Size = new System.Drawing.Size(103, 24);
             this.txt_MrlCode.TabIndex = 27;
             this.txt_MrlCode.EditValueChanged += new System.EventHandler(this.txt_MrlCode_EditValueChanged);
             // 
@@ -284,7 +284,7 @@ namespace SIMDP
             this.gridControl_CopulerRequest.Location = new System.Drawing.Point(3, 34);
             this.gridControl_CopulerRequest.MainView = this.gridView;
             this.gridControl_CopulerRequest.Name = "gridControl_CopulerRequest";
-            this.gridControl_CopulerRequest.Size = new System.Drawing.Size(1307, 246);
+            this.gridControl_CopulerRequest.Size = new System.Drawing.Size(1326, 460);
             this.gridControl_CopulerRequest.TabIndex = 0;
             this.gridControl_CopulerRequest.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView});
@@ -366,7 +366,7 @@ namespace SIMDP
             // 
             this.gridColumn10.AppearanceCell.Options.UseTextOptions = true;
             this.gridColumn10.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
-            this.gridColumn10.Caption = "解析物料";
+            this.gridColumn10.Caption = "部件数目";
             this.gridColumn10.FieldName = "MrlContain";
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
@@ -376,7 +376,7 @@ namespace SIMDP
             // 
             this.gridColumn11.AppearanceCell.Options.UseTextOptions = true;
             this.gridColumn11.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
-            this.gridColumn11.Caption = "物料1";
+            this.gridColumn11.Caption = "部件1";
             this.gridColumn11.FieldName = "MCode01";
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Visible = true;
@@ -396,7 +396,7 @@ namespace SIMDP
             // 
             this.gridColumn13.AppearanceCell.Options.UseTextOptions = true;
             this.gridColumn13.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
-            this.gridColumn13.Caption = "物料2";
+            this.gridColumn13.Caption = "部件2";
             this.gridColumn13.FieldName = "MCode02";
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Visible = true;
@@ -447,7 +447,7 @@ namespace SIMDP
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1313, 316);
+            this.ClientSize = new System.Drawing.Size(1332, 530);
             this.Controls.Add(this.panel1);
             this.Name = "FormCopulerRequest";
             this.Text = "车钩需求单";

SIMDP/SIMDP.View/FormCopulerRequest.cs

@@ -47,7 +47,8 @@ namespace SIMDP
 
         private void btn_Add_Click(object sender, EventArgs e)
         {
-            FormEditCopulerRequest editTask = new FormEditCopulerRequest();
+            MoCopulerRequest selectRow = this.gridView.GetFocusedRow() as MoCopulerRequest;
+            FormEditCopulerRequest editTask = new FormEditCopulerRequest(selectRow,2);
             editTask.saveData += new FormEditCopulerRequest.save(Search_RefreshData);
             editTask.ShowDialog();
         }
@@ -80,7 +81,7 @@ namespace SIMDP
         private void btn_Edit_Click(object sender, EventArgs e)
         {
             MoCopulerRequest selectRow = this.gridView.GetFocusedRow() as MoCopulerRequest;
-            FormEditCopulerRequest editTask = new FormEditCopulerRequest(selectRow);
+            FormEditCopulerRequest editTask = new FormEditCopulerRequest(selectRow,1);
             editTask.saveData += new FormEditCopulerRequest.save(Search_RefreshData);
             editTask.ShowDialog();
         }

SIMDP/SIMDP.View/FormEditCopulerRequest.Designer.cs

@@ -29,484 +29,349 @@
         private void InitializeComponent()
         {
             this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
-            this.btn_GetMcode = new DevExpress.XtraEditors.SimpleButton();
-            this.btn_getRecentRemark = new DevExpress.XtraEditors.SimpleButton();
-            this.labelControl15 = new DevExpress.XtraEditors.LabelControl();
-            this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
-            this.btn_Cancel = new DevExpress.XtraEditors.SimpleButton();
-            this.btn_Add = new DevExpress.XtraEditors.SimpleButton();
-            this.btn_Save = new DevExpress.XtraEditors.SimpleButton();
-            this.txt_hcqMcode = new DevExpress.XtraEditors.TextEdit();
-            this.txt_Remark = new DevExpress.XtraEditors.TextEdit();
-            this.txt_requestCode = new DevExpress.XtraEditors.TextEdit();
-            this.txt_unitNum = new DevExpress.XtraEditors.TextEdit();
-            this.txt_ProductType = new DevExpress.XtraEditors.TextEdit();
-            this.txt_MrlCode = new DevExpress.XtraEditors.TextEdit();
-            this.txt_TaskState = new DevExpress.XtraEditors.TextEdit();
-            this.txt_ykMcode = new DevExpress.XtraEditors.TextEdit();
-            this.txt_ykWorkcode = new DevExpress.XtraEditors.TextEdit();
-            this.txt_ProjectName = new DevExpress.XtraEditors.TextEdit();
+            this.gcl_Card = new DevExpress.XtraEditors.GroupControl();
+            this.btn_import = new DevExpress.XtraEditors.SimpleButton();
+            this.labelControl16 = new DevExpress.XtraEditors.LabelControl();
+            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
+            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
             this.txt_MrlName = new DevExpress.XtraEditors.TextEdit();
+            this.txt_requestCode = new DevExpress.XtraEditors.TextEdit();
+            this.txt_Remark = new DevExpress.XtraEditors.TextEdit();
+            this.gcl_unit = new DevExpress.XtraEditors.GroupControl();
+            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
             this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_OrderCode = new DevExpress.XtraEditors.TextEdit();
-            this.txt_hcqWorkcode = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl19 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_ProjectCode = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
-            this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
-            this.labelControl16 = new DevExpress.XtraEditors.LabelControl();
-            this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_ykMcode = new DevExpress.XtraEditors.TextEdit();
+            this.txt_hcqMcode = new DevExpress.XtraEditors.TextEdit();
+            this.btn_Cancel = new DevExpress.XtraEditors.SimpleButton();
+            this.gcl_bind = new DevExpress.XtraEditors.GroupControl();
+            this.txt_unitNum = new DevExpress.XtraEditors.TextEdit();
             this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
-            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
-            this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_WorkCode = new DevExpress.XtraEditors.TextEdit();
             this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
-            this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
-            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
-            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+            this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
+            this.labelControl19 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_hcqWorkcode = new DevExpress.XtraEditors.TextEdit();
+            this.txt_ykWorkcode = new DevExpress.XtraEditors.TextEdit();
+            this.txt_TaskState = new DevExpress.XtraEditors.TextEdit();
+            this.btn_Add = new DevExpress.XtraEditors.SimpleButton();
+            this.btn_Save = new DevExpress.XtraEditors.SimpleButton();
             ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
             this.panelControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_hcqMcode.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_Remark.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcl_Card)).BeginInit();
+            this.gcl_Card.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_MrlName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_requestCode.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_unitNum.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_ProductType.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_MrlCode.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_TaskState.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_Remark.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcl_unit)).BeginInit();
+            this.gcl_unit.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_ykMcode.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_ykWorkcode.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_ProjectName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_MrlName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_OrderCode.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_hcqMcode.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcl_bind)).BeginInit();
+            this.gcl_bind.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_unitNum.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_hcqWorkcode.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_ProjectCode.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_WorkCode.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_ykWorkcode.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_TaskState.Properties)).BeginInit();
             this.SuspendLayout();
             // 
             // panelControl1
             // 
-            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.btn_GetMcode);
-            this.panelControl1.Controls.Add(this.btn_getRecentRemark);
-            this.panelControl1.Controls.Add(this.labelControl15);
-            this.panelControl1.Controls.Add(this.labelControl8);
+            this.panelControl1.Controls.Add(this.gcl_Card);
+            this.panelControl1.Controls.Add(this.gcl_unit);
             this.panelControl1.Controls.Add(this.btn_Cancel);
+            this.panelControl1.Controls.Add(this.gcl_bind);
             this.panelControl1.Controls.Add(this.btn_Add);
             this.panelControl1.Controls.Add(this.btn_Save);
-            this.panelControl1.Controls.Add(this.txt_hcqMcode);
-            this.panelControl1.Controls.Add(this.txt_Remark);
-            this.panelControl1.Controls.Add(this.txt_requestCode);
-            this.panelControl1.Controls.Add(this.txt_unitNum);
-            this.panelControl1.Controls.Add(this.txt_ProductType);
-            this.panelControl1.Controls.Add(this.txt_MrlCode);
-            this.panelControl1.Controls.Add(this.txt_TaskState);
-            this.panelControl1.Controls.Add(this.txt_ykMcode);
-            this.panelControl1.Controls.Add(this.txt_ykWorkcode);
-            this.panelControl1.Controls.Add(this.txt_ProjectName);
-            this.panelControl1.Controls.Add(this.txt_MrlName);
-            this.panelControl1.Controls.Add(this.labelControl10);
-            this.panelControl1.Controls.Add(this.txt_OrderCode);
-            this.panelControl1.Controls.Add(this.txt_hcqWorkcode);
-            this.panelControl1.Controls.Add(this.labelControl19);
-            this.panelControl1.Controls.Add(this.txt_ProjectCode);
-            this.panelControl1.Controls.Add(this.labelControl7);
-            this.panelControl1.Controls.Add(this.labelControl13);
-            this.panelControl1.Controls.Add(this.labelControl16);
-            this.panelControl1.Controls.Add(this.labelControl12);
-            this.panelControl1.Controls.Add(this.labelControl6);
-            this.panelControl1.Controls.Add(this.labelControl11);
-            this.panelControl1.Controls.Add(this.labelControl5);
-            this.panelControl1.Controls.Add(this.txt_WorkCode);
-            this.panelControl1.Controls.Add(this.labelControl3);
-            this.panelControl1.Controls.Add(this.labelControl4);
-            this.panelControl1.Controls.Add(this.labelControl1);
-            this.panelControl1.Controls.Add(this.labelControl2);
+            this.panelControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panelControl1.Location = new System.Drawing.Point(0, 0);
             this.panelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.panelControl1.Name = "panelControl1";
-            this.panelControl1.Size = new System.Drawing.Size(442, 608);
+            this.panelControl1.Size = new System.Drawing.Size(420, 594);
             this.panelControl1.TabIndex = 0;
             // 
-            // btn_GetMcode
-            // 
-            this.btn_GetMcode.Appearance.ForeColor = System.Drawing.Color.Red;
-            this.btn_GetMcode.Appearance.Options.UseForeColor = true;
-            this.btn_GetMcode.Location = new System.Drawing.Point(77, 344);
-            this.btn_GetMcode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.btn_GetMcode.Name = "btn_GetMcode";
-            this.btn_GetMcode.Size = new System.Drawing.Size(118, 30);
-            this.btn_GetMcode.TabIndex = 25;
-            this.btn_GetMcode.Text = "压溃M码/获取：";
-            this.btn_GetMcode.Click += new System.EventHandler(this.btn_GetMcode_Click);
-            // 
-            // btn_getRecentRemark
-            // 
-            this.btn_getRecentRemark.Appearance.ForeColor = System.Drawing.Color.Red;
-            this.btn_getRecentRemark.Appearance.Options.UseForeColor = true;
-            this.btn_getRecentRemark.Location = new System.Drawing.Point(79, 138);
-            this.btn_getRecentRemark.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.btn_getRecentRemark.Name = "btn_getRecentRemark";
-            this.btn_getRecentRemark.Size = new System.Drawing.Size(89, 30);
-            this.btn_getRecentRemark.TabIndex = 25;
-            this.btn_getRecentRemark.Text = "备注/获取：";
-            this.btn_getRecentRemark.Click += new System.EventHandler(this.btn_getRecentRemark_Click);
-            // 
-            // labelControl15
-            // 
-            this.labelControl15.Appearance.Font = new System.Drawing.Font("Tahoma", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelControl15.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(31)))), ((int)(((byte)(53)))));
-            this.labelControl15.Appearance.Options.UseFont = true;
-            this.labelControl15.Appearance.Options.UseForeColor = true;
-            this.labelControl15.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.Vertical;
-            this.labelControl15.Location = new System.Drawing.Point(27, 312);
-            this.labelControl15.Name = "labelControl15";
-            this.labelControl15.Size = new System.Drawing.Size(18, 66);
-            this.labelControl15.TabIndex = 24;
-            this.labelControl15.Text = "BOM";
-            // 
-            // labelControl8
-            // 
-            this.labelControl8.Appearance.Font = new System.Drawing.Font("Tahoma", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelControl8.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(31)))), ((int)(((byte)(53)))));
-            this.labelControl8.Appearance.Options.UseFont = true;
-            this.labelControl8.Appearance.Options.UseForeColor = true;
-            this.labelControl8.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.Vertical;
-            this.labelControl8.Location = new System.Drawing.Point(27, 97);
-            this.labelControl8.Name = "labelControl8";
-            this.labelControl8.Size = new System.Drawing.Size(18, 115);
-            this.labelControl8.TabIndex = 24;
-            this.labelControl8.Text = "需求单信息";
-            // 
-            // btn_Cancel
+            // gcl_Card
             // 
-            this.btn_Cancel.Location = new System.Drawing.Point(338, 547);
-            this.btn_Cancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.btn_Cancel.Name = "btn_Cancel";
-            this.btn_Cancel.Size = new System.Drawing.Size(58, 30);
-            this.btn_Cancel.TabIndex = 23;
-            this.btn_Cancel.Text = "取消";
-            this.btn_Cancel.Click += new System.EventHandler(this.btn_Cancel_Click);
+            this.gcl_Card.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.gcl_Card.ContentImageAlignment = System.Drawing.ContentAlignment.MiddleRight;
+            this.gcl_Card.Controls.Add(this.btn_import);
+            this.gcl_Card.Controls.Add(this.labelControl16);
+            this.gcl_Card.Controls.Add(this.labelControl1);
+            this.gcl_Card.Controls.Add(this.labelControl11);
+            this.gcl_Card.Controls.Add(this.txt_MrlName);
+            this.gcl_Card.Controls.Add(this.txt_requestCode);
+            this.gcl_Card.Controls.Add(this.txt_Remark);
+            this.gcl_Card.Location = new System.Drawing.Point(4, 5);
+            this.gcl_Card.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
+            this.gcl_Card.Name = "gcl_Card";
+            this.gcl_Card.Size = new System.Drawing.Size(401, 165);
+            this.gcl_Card.TabIndex = 38;
+            this.gcl_Card.Text = "流转卡信息";
+            // 
+            // btn_import
+            // 
+            this.btn_import.Location = new System.Drawing.Point(98, 0);
+            this.btn_import.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.btn_import.Name = "btn_import";
+            this.btn_import.Size = new System.Drawing.Size(42, 26);
+            this.btn_import.TabIndex = 21;
+            this.btn_import.Text = "导入";
             // 
-            // btn_Add
+            // labelControl16
             // 
-            this.btn_Add.Location = new System.Drawing.Point(79, 547);
-            this.btn_Add.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.btn_Add.Name = "btn_Add";
-            this.btn_Add.Size = new System.Drawing.Size(58, 30);
-            this.btn_Add.TabIndex = 21;
-            this.btn_Add.Text = "添加";
-            this.btn_Add.Click += new System.EventHandler(this.btn_Add_Click);
+            this.labelControl16.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(31)))), ((int)(((byte)(53)))));
+            this.labelControl16.Appearance.Options.UseForeColor = true;
+            this.labelControl16.Location = new System.Drawing.Point(35, 52);
+            this.labelControl16.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.labelControl16.Name = "labelControl16";
+            this.labelControl16.Size = new System.Drawing.Size(75, 18);
+            this.labelControl16.TabIndex = 0;
+            this.labelControl16.Text = "物料名称：";
             // 
-            // btn_Save
+            // labelControl1
             // 
-            this.btn_Save.Location = new System.Drawing.Point(212, 547);
-            this.btn_Save.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.btn_Save.Name = "btn_Save";
-            this.btn_Save.Size = new System.Drawing.Size(58, 30);
-            this.btn_Save.TabIndex = 22;
-            this.btn_Save.Text = "保存";
-            this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click);
+            this.labelControl1.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(31)))), ((int)(((byte)(53)))));
+            this.labelControl1.Appearance.Options.UseForeColor = true;
+            this.labelControl1.Location = new System.Drawing.Point(35, 114);
+            this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.labelControl1.Name = "labelControl1";
+            this.labelControl1.Size = new System.Drawing.Size(75, 18);
+            this.labelControl1.TabIndex = 0;
+            this.labelControl1.Text = "车钩备注：";
             // 
-            // txt_hcqMcode
+            // labelControl11
             // 
-            this.txt_hcqMcode.EditValue = "";
-            this.txt_hcqMcode.Location = new System.Drawing.Point(201, 315);
-            this.txt_hcqMcode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.txt_hcqMcode.Name = "txt_hcqMcode";
-            this.txt_hcqMcode.Size = new System.Drawing.Size(195, 24);
-            this.txt_hcqMcode.TabIndex = 4;
-            this.txt_hcqMcode.TabStop = false;
+            this.labelControl11.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(31)))), ((int)(((byte)(53)))));
+            this.labelControl11.Appearance.Options.UseForeColor = true;
+            this.labelControl11.Location = new System.Drawing.Point(36, 80);
+            this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.labelControl11.Name = "labelControl11";
+            this.labelControl11.Size = new System.Drawing.Size(75, 18);
+            this.labelControl11.TabIndex = 0;
+            this.labelControl11.Text = "需求单号：";
             // 
-            // txt_Remark
+            // txt_MrlName
             // 
-            this.txt_Remark.EditValue = "测试";
-            this.txt_Remark.Location = new System.Drawing.Point(201, 141);
-            this.txt_Remark.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.txt_Remark.Name = "txt_Remark";
-            this.txt_Remark.Size = new System.Drawing.Size(195, 24);
-            this.txt_Remark.TabIndex = 4;
-            this.txt_Remark.TabStop = false;
+            this.txt_MrlName.EditValue = "测试";
+            this.txt_MrlName.Location = new System.Drawing.Point(157, 49);
+            this.txt_MrlName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.txt_MrlName.Name = "txt_MrlName";
+            this.txt_MrlName.Size = new System.Drawing.Size(195, 24);
+            this.txt_MrlName.TabIndex = 7;
+            this.txt_MrlName.TabStop = false;
             // 
             // txt_requestCode
             // 
             this.txt_requestCode.EditValue = "测试";
-            this.txt_requestCode.Location = new System.Drawing.Point(201, 13);
+            this.txt_requestCode.Location = new System.Drawing.Point(157, 79);
             this.txt_requestCode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_requestCode.Name = "txt_requestCode";
             this.txt_requestCode.Size = new System.Drawing.Size(195, 24);
             this.txt_requestCode.TabIndex = 11;
             // 
-            // txt_unitNum
-            // 
-            this.txt_unitNum.EditValue = "0";
-            this.txt_unitNum.Enabled = false;
-            this.txt_unitNum.Location = new System.Drawing.Point(201, 379);
-            this.txt_unitNum.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.txt_unitNum.Name = "txt_unitNum";
-            this.txt_unitNum.Size = new System.Drawing.Size(195, 24);
-            this.txt_unitNum.TabIndex = 11;
-            // 
-            // txt_ProductType
-            // 
-            this.txt_ProductType.EditValue = "测试";
-            this.txt_ProductType.Location = new System.Drawing.Point(201, 269);
-            this.txt_ProductType.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.txt_ProductType.Name = "txt_ProductType";
-            this.txt_ProductType.Size = new System.Drawing.Size(195, 24);
-            this.txt_ProductType.TabIndex = 11;
-            // 
-            // txt_MrlCode
-            // 
-            this.txt_MrlCode.EditValue = "测试";
-            this.txt_MrlCode.Location = new System.Drawing.Point(201, 109);
-            this.txt_MrlCode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.txt_MrlCode.Name = "txt_MrlCode";
-            this.txt_MrlCode.Size = new System.Drawing.Size(195, 24);
-            this.txt_MrlCode.TabIndex = 3;
-            this.txt_MrlCode.TabStop = false;
-            // 
-            // txt_TaskState
-            // 
-            this.txt_TaskState.EditValue = "0";
-            this.txt_TaskState.Enabled = false;
-            this.txt_TaskState.Location = new System.Drawing.Point(201, 506);
-            this.txt_TaskState.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.txt_TaskState.Name = "txt_TaskState";
-            this.txt_TaskState.Size = new System.Drawing.Size(195, 24);
-            this.txt_TaskState.TabIndex = 20;
-            // 
-            // txt_ykMcode
-            // 
-            this.txt_ykMcode.EditValue = "";
-            this.txt_ykMcode.Location = new System.Drawing.Point(201, 347);
-            this.txt_ykMcode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.txt_ykMcode.Name = "txt_ykMcode";
-            this.txt_ykMcode.Size = new System.Drawing.Size(195, 24);
-            this.txt_ykMcode.TabIndex = 6;
-            this.txt_ykMcode.TabStop = false;
-            // 
-            // txt_ykWorkcode
+            // txt_Remark
             // 
-            this.txt_ykWorkcode.EditValue = "";
-            this.txt_ykWorkcode.Enabled = false;
-            this.txt_ykWorkcode.Location = new System.Drawing.Point(201, 474);
-            this.txt_ykWorkcode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.txt_ykWorkcode.Name = "txt_ykWorkcode";
-            this.txt_ykWorkcode.Size = new System.Drawing.Size(195, 24);
-            this.txt_ykWorkcode.TabIndex = 7;
-            this.txt_ykWorkcode.TabStop = false;
+            this.txt_Remark.EditValue = "测试";
+            this.txt_Remark.Location = new System.Drawing.Point(157, 111);
+            this.txt_Remark.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.txt_Remark.Name = "txt_Remark";
+            this.txt_Remark.Size = new System.Drawing.Size(195, 24);
+            this.txt_Remark.TabIndex = 4;
+            this.txt_Remark.TabStop = false;
             // 
-            // txt_ProjectName
+            // gcl_unit
             // 
-            this.txt_ProjectName.EditValue = "测试";
-            this.txt_ProjectName.Location = new System.Drawing.Point(201, 205);
-            this.txt_ProjectName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.txt_ProjectName.Name = "txt_ProjectName";
-            this.txt_ProjectName.Size = new System.Drawing.Size(195, 24);
-            this.txt_ProjectName.TabIndex = 6;
-            this.txt_ProjectName.TabStop = false;
+            this.gcl_unit.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.gcl_unit.ContentImageAlignment = System.Drawing.ContentAlignment.MiddleRight;
+            this.gcl_unit.Controls.Add(this.labelControl2);
+            this.gcl_unit.Controls.Add(this.labelControl10);
+            this.gcl_unit.Controls.Add(this.txt_ykMcode);
+            this.gcl_unit.Controls.Add(this.txt_hcqMcode);
+            this.gcl_unit.Location = new System.Drawing.Point(2, 176);
+            this.gcl_unit.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
+            this.gcl_unit.Name = "gcl_unit";
+            this.gcl_unit.Size = new System.Drawing.Size(401, 112);
+            this.gcl_unit.TabIndex = 37;
+            this.gcl_unit.Text = "部件信息";
             // 
-            // txt_MrlName
+            // labelControl2
             // 
-            this.txt_MrlName.EditValue = "测试";
-            this.txt_MrlName.Location = new System.Drawing.Point(201, 237);
-            this.txt_MrlName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.txt_MrlName.Name = "txt_MrlName";
-            this.txt_MrlName.Size = new System.Drawing.Size(195, 24);
-            this.txt_MrlName.TabIndex = 7;
-            this.txt_MrlName.TabStop = false;
+            this.labelControl2.Appearance.ForeColor = System.Drawing.Color.Red;
+            this.labelControl2.Appearance.Options.UseForeColor = true;
+            this.labelControl2.Location = new System.Drawing.Point(35, 73);
+            this.labelControl2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.labelControl2.Name = "labelControl2";
+            this.labelControl2.Size = new System.Drawing.Size(87, 18);
+            this.labelControl2.TabIndex = 0;
+            this.labelControl2.Text = "压溃管M码：";
             // 
             // labelControl10
             // 
             this.labelControl10.Appearance.ForeColor = System.Drawing.Color.Red;
             this.labelControl10.Appearance.Options.UseForeColor = true;
-            this.labelControl10.Location = new System.Drawing.Point(79, 318);
+            this.labelControl10.Location = new System.Drawing.Point(35, 40);
             this.labelControl10.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl10.Name = "labelControl10";
             this.labelControl10.Size = new System.Drawing.Size(87, 18);
             this.labelControl10.TabIndex = 0;
             this.labelControl10.Text = "缓冲器M码：";
             // 
-            // txt_OrderCode
-            // 
-            this.txt_OrderCode.EditValue = "测试";
-            this.txt_OrderCode.Location = new System.Drawing.Point(201, 45);
-            this.txt_OrderCode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.txt_OrderCode.Name = "txt_OrderCode";
-            this.txt_OrderCode.Size = new System.Drawing.Size(195, 24);
-            this.txt_OrderCode.TabIndex = 1;
-            this.txt_OrderCode.TabStop = false;
-            // 
-            // txt_hcqWorkcode
-            // 
-            this.txt_hcqWorkcode.EditValue = "";
-            this.txt_hcqWorkcode.Enabled = false;
-            this.txt_hcqWorkcode.Location = new System.Drawing.Point(201, 442);
-            this.txt_hcqWorkcode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.txt_hcqWorkcode.Name = "txt_hcqWorkcode";
-            this.txt_hcqWorkcode.Size = new System.Drawing.Size(195, 24);
-            this.txt_hcqWorkcode.TabIndex = 5;
-            this.txt_hcqWorkcode.TabStop = false;
-            // 
-            // labelControl19
-            // 
-            this.labelControl19.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(31)))), ((int)(((byte)(53)))));
-            this.labelControl19.Appearance.Options.UseForeColor = true;
-            this.labelControl19.Location = new System.Drawing.Point(79, 509);
-            this.labelControl19.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.labelControl19.Name = "labelControl19";
-            this.labelControl19.Size = new System.Drawing.Size(75, 18);
-            this.labelControl19.TabIndex = 0;
-            this.labelControl19.Text = "任务状态：";
-            // 
-            // txt_ProjectCode
+            // txt_ykMcode
             // 
-            this.txt_ProjectCode.EditValue = "测试";
-            this.txt_ProjectCode.Location = new System.Drawing.Point(201, 173);
-            this.txt_ProjectCode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.txt_ProjectCode.Name = "txt_ProjectCode";
-            this.txt_ProjectCode.Size = new System.Drawing.Size(195, 24);
-            this.txt_ProjectCode.TabIndex = 5;
-            this.txt_ProjectCode.TabStop = false;
+            this.txt_ykMcode.EditValue = "";
+            this.txt_ykMcode.Location = new System.Drawing.Point(157, 70);
+            this.txt_ykMcode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.txt_ykMcode.Name = "txt_ykMcode";
+            this.txt_ykMcode.Size = new System.Drawing.Size(195, 24);
+            this.txt_ykMcode.TabIndex = 6;
+            this.txt_ykMcode.TabStop = false;
             // 
-            // labelControl7
+            // txt_hcqMcode
             // 
-            this.labelControl7.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(31)))), ((int)(((byte)(53)))));
-            this.labelControl7.Appearance.Options.UseForeColor = true;
-            this.labelControl7.Location = new System.Drawing.Point(79, 477);
-            this.labelControl7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.labelControl7.Name = "labelControl7";
-            this.labelControl7.Size = new System.Drawing.Size(90, 18);
-            this.labelControl7.TabIndex = 0;
-            this.labelControl7.Text = "压溃工单号：";
+            this.txt_hcqMcode.EditValue = "";
+            this.txt_hcqMcode.Location = new System.Drawing.Point(157, 35);
+            this.txt_hcqMcode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.txt_hcqMcode.Name = "txt_hcqMcode";
+            this.txt_hcqMcode.Size = new System.Drawing.Size(195, 24);
+            this.txt_hcqMcode.TabIndex = 4;
+            this.txt_hcqMcode.TabStop = false;
             // 
-            // labelControl13
+            // btn_Cancel
             // 
-            this.labelControl13.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(31)))), ((int)(((byte)(53)))));
-            this.labelControl13.Appearance.Options.UseForeColor = true;
-            this.labelControl13.Location = new System.Drawing.Point(79, 208);
-            this.labelControl13.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.labelControl13.Name = "labelControl13";
-            this.labelControl13.Size = new System.Drawing.Size(75, 18);
-            this.labelControl13.TabIndex = 0;
-            this.labelControl13.Text = "项目名称：";
+            this.btn_Cancel.Location = new System.Drawing.Point(296, 506);
+            this.btn_Cancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.btn_Cancel.Name = "btn_Cancel";
+            this.btn_Cancel.Size = new System.Drawing.Size(58, 30);
+            this.btn_Cancel.TabIndex = 35;
+            this.btn_Cancel.Text = "取消";
+            this.btn_Cancel.Click += new System.EventHandler(this.btn_Cancel_Click);
             // 
-            // labelControl16
+            // gcl_bind
             // 
-            this.labelControl16.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(31)))), ((int)(((byte)(53)))));
-            this.labelControl16.Appearance.Options.UseForeColor = true;
-            this.labelControl16.Location = new System.Drawing.Point(79, 240);
-            this.labelControl16.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.labelControl16.Name = "labelControl16";
-            this.labelControl16.Size = new System.Drawing.Size(75, 18);
-            this.labelControl16.TabIndex = 0;
-            this.labelControl16.Text = "物料名称：";
+            this.gcl_bind.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.gcl_bind.ContentImageAlignment = System.Drawing.ContentAlignment.MiddleRight;
+            this.gcl_bind.Controls.Add(this.txt_unitNum);
+            this.gcl_bind.Controls.Add(this.labelControl6);
+            this.gcl_bind.Controls.Add(this.labelControl3);
+            this.gcl_bind.Controls.Add(this.labelControl7);
+            this.gcl_bind.Controls.Add(this.labelControl19);
+            this.gcl_bind.Controls.Add(this.txt_hcqWorkcode);
+            this.gcl_bind.Controls.Add(this.txt_ykWorkcode);
+            this.gcl_bind.Controls.Add(this.txt_TaskState);
+            this.gcl_bind.Location = new System.Drawing.Point(4, 294);
+            this.gcl_bind.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
+            this.gcl_bind.Name = "gcl_bind";
+            this.gcl_bind.Size = new System.Drawing.Size(401, 186);
+            this.gcl_bind.TabIndex = 36;
+            this.gcl_bind.Text = "执行状态";
             // 
-            // labelControl12
+            // txt_unitNum
             // 
-            this.labelControl12.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(31)))), ((int)(((byte)(53)))));
-            this.labelControl12.Appearance.Options.UseForeColor = true;
-            this.labelControl12.Location = new System.Drawing.Point(79, 48);
-            this.labelControl12.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.labelControl12.Name = "labelControl12";
-            this.labelControl12.Size = new System.Drawing.Size(60, 18);
-            this.labelControl12.TabIndex = 0;
-            this.labelControl12.Text = "订单号：";
+            this.txt_unitNum.EditValue = "0";
+            this.txt_unitNum.Location = new System.Drawing.Point(155, 42);
+            this.txt_unitNum.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.txt_unitNum.Name = "txt_unitNum";
+            this.txt_unitNum.Size = new System.Drawing.Size(195, 24);
+            this.txt_unitNum.TabIndex = 22;
             // 
             // labelControl6
             // 
             this.labelControl6.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(31)))), ((int)(((byte)(53)))));
             this.labelControl6.Appearance.Options.UseForeColor = true;
-            this.labelControl6.Location = new System.Drawing.Point(79, 382);
+            this.labelControl6.Location = new System.Drawing.Point(33, 44);
             this.labelControl6.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl6.Name = "labelControl6";
             this.labelControl6.Size = new System.Drawing.Size(75, 18);
-            this.labelControl6.TabIndex = 0;
+            this.labelControl6.TabIndex = 21;
             this.labelControl6.Text = "部件数量：";
             // 
-            // labelControl11
-            // 
-            this.labelControl11.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(31)))), ((int)(((byte)(53)))));
-            this.labelControl11.Appearance.Options.UseForeColor = true;
-            this.labelControl11.Location = new System.Drawing.Point(79, 16);
-            this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.labelControl11.Name = "labelControl11";
-            this.labelControl11.Size = new System.Drawing.Size(103, 18);
-            this.labelControl11.TabIndex = 0;
-            this.labelControl11.Text = "MES需求单号：";
-            // 
-            // labelControl5
-            // 
-            this.labelControl5.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(31)))), ((int)(((byte)(53)))));
-            this.labelControl5.Appearance.Options.UseForeColor = true;
-            this.labelControl5.Location = new System.Drawing.Point(79, 272);
-            this.labelControl5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.labelControl5.Name = "labelControl5";
-            this.labelControl5.Size = new System.Drawing.Size(45, 18);
-            this.labelControl5.TabIndex = 0;
-            this.labelControl5.Text = "图号：";
-            // 
-            // txt_WorkCode
-            // 
-            this.txt_WorkCode.EditValue = "测试";
-            this.txt_WorkCode.Location = new System.Drawing.Point(201, 77);
-            this.txt_WorkCode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.txt_WorkCode.Name = "txt_WorkCode";
-            this.txt_WorkCode.Size = new System.Drawing.Size(195, 24);
-            this.txt_WorkCode.TabIndex = 2;
-            this.txt_WorkCode.TabStop = false;
-            // 
             // labelControl3
             // 
             this.labelControl3.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(31)))), ((int)(((byte)(53)))));
             this.labelControl3.Appearance.Options.UseForeColor = true;
-            this.labelControl3.Location = new System.Drawing.Point(79, 445);
+            this.labelControl3.Location = new System.Drawing.Point(33, 77);
             this.labelControl3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl3.Name = "labelControl3";
-            this.labelControl3.Size = new System.Drawing.Size(105, 18);
+            this.labelControl3.Size = new System.Drawing.Size(120, 18);
             this.labelControl3.TabIndex = 0;
-            this.labelControl3.Text = "缓冲器工单号：";
+            this.labelControl3.Text = "关联缓冲器工单：";
             // 
-            // labelControl4
+            // labelControl7
             // 
-            this.labelControl4.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(31)))), ((int)(((byte)(53)))));
-            this.labelControl4.Appearance.Options.UseForeColor = true;
-            this.labelControl4.Location = new System.Drawing.Point(79, 112);
-            this.labelControl4.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.labelControl4.Name = "labelControl4";
-            this.labelControl4.Size = new System.Drawing.Size(75, 18);
-            this.labelControl4.TabIndex = 0;
-            this.labelControl4.Text = "物料编码：";
+            this.labelControl7.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(31)))), ((int)(((byte)(53)))));
+            this.labelControl7.Appearance.Options.UseForeColor = true;
+            this.labelControl7.Location = new System.Drawing.Point(33, 109);
+            this.labelControl7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.labelControl7.Name = "labelControl7";
+            this.labelControl7.Size = new System.Drawing.Size(105, 18);
+            this.labelControl7.TabIndex = 0;
+            this.labelControl7.Text = "关联压溃工单：";
             // 
-            // labelControl1
+            // labelControl19
             // 
-            this.labelControl1.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(31)))), ((int)(((byte)(53)))));
-            this.labelControl1.Appearance.Options.UseForeColor = true;
-            this.labelControl1.Location = new System.Drawing.Point(79, 176);
-            this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.labelControl1.Name = "labelControl1";
-            this.labelControl1.Size = new System.Drawing.Size(60, 18);
-            this.labelControl1.TabIndex = 0;
-            this.labelControl1.Text = "项目号：";
+            this.labelControl19.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(31)))), ((int)(((byte)(53)))));
+            this.labelControl19.Appearance.Options.UseForeColor = true;
+            this.labelControl19.Location = new System.Drawing.Point(33, 141);
+            this.labelControl19.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.labelControl19.Name = "labelControl19";
+            this.labelControl19.Size = new System.Drawing.Size(75, 18);
+            this.labelControl19.TabIndex = 0;
+            this.labelControl19.Text = "任务状态：";
             // 
-            // labelControl2
+            // txt_hcqWorkcode
             // 
-            this.labelControl2.Appearance.ForeColor = System.Drawing.Color.Red;
-            this.labelControl2.Appearance.Options.UseForeColor = true;
-            this.labelControl2.Location = new System.Drawing.Point(79, 80);
-            this.labelControl2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.labelControl2.Name = "labelControl2";
-            this.labelControl2.Size = new System.Drawing.Size(75, 18);
-            this.labelControl2.TabIndex = 0;
-            this.labelControl2.Text = "流转卡号：";
+            this.txt_hcqWorkcode.EditValue = "";
+            this.txt_hcqWorkcode.Location = new System.Drawing.Point(155, 74);
+            this.txt_hcqWorkcode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.txt_hcqWorkcode.Name = "txt_hcqWorkcode";
+            this.txt_hcqWorkcode.Size = new System.Drawing.Size(195, 24);
+            this.txt_hcqWorkcode.TabIndex = 5;
+            this.txt_hcqWorkcode.TabStop = false;
+            // 
+            // txt_ykWorkcode
+            // 
+            this.txt_ykWorkcode.EditValue = "";
+            this.txt_ykWorkcode.Location = new System.Drawing.Point(155, 106);
+            this.txt_ykWorkcode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.txt_ykWorkcode.Name = "txt_ykWorkcode";
+            this.txt_ykWorkcode.Size = new System.Drawing.Size(195, 24);
+            this.txt_ykWorkcode.TabIndex = 7;
+            this.txt_ykWorkcode.TabStop = false;
+            // 
+            // txt_TaskState
+            // 
+            this.txt_TaskState.EditValue = "0";
+            this.txt_TaskState.Location = new System.Drawing.Point(155, 138);
+            this.txt_TaskState.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.txt_TaskState.Name = "txt_TaskState";
+            this.txt_TaskState.Size = new System.Drawing.Size(195, 24);
+            this.txt_TaskState.TabIndex = 20;
+            // 
+            // btn_Add
+            // 
+            this.btn_Add.Location = new System.Drawing.Point(37, 506);
+            this.btn_Add.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.btn_Add.Name = "btn_Add";
+            this.btn_Add.Size = new System.Drawing.Size(58, 30);
+            this.btn_Add.TabIndex = 33;
+            this.btn_Add.Text = "添加";
+            // 
+            // btn_Save
+            // 
+            this.btn_Save.Location = new System.Drawing.Point(170, 506);
+            this.btn_Save.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.btn_Save.Name = "btn_Save";
+            this.btn_Save.Size = new System.Drawing.Size(58, 30);
+            this.btn_Save.TabIndex = 34;
+            this.btn_Save.Text = "保存";
             // 
             // FormEditCopulerRequest
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(443, 608);
+            this.ClientSize = new System.Drawing.Size(420, 594);
+            this.ControlBox = false;
             this.Controls.Add(this.panelControl1);
             this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.MaximizeBox = false;
@@ -516,22 +381,24 @@
             this.Text = "车钩需求单编辑";
             ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
             this.panelControl1.ResumeLayout(false);
-            this.panelControl1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_hcqMcode.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_Remark.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcl_Card)).EndInit();
+            this.gcl_Card.ResumeLayout(false);
+            this.gcl_Card.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_MrlName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_requestCode.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_unitNum.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_ProductType.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_MrlCode.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_TaskState.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_Remark.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcl_unit)).EndInit();
+            this.gcl_unit.ResumeLayout(false);
+            this.gcl_unit.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_ykMcode.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_ykWorkcode.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_ProjectName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_MrlName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_OrderCode.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_hcqMcode.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcl_bind)).EndInit();
+            this.gcl_bind.ResumeLayout(false);
+            this.gcl_bind.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_unitNum.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_hcqWorkcode.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_ProjectCode.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_WorkCode.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_ykWorkcode.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_TaskState.Properties)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -539,40 +406,30 @@
         #endregion
 
         private DevExpress.XtraEditors.PanelControl panelControl1;
-        private DevExpress.XtraEditors.LabelControl labelControl2;
-        private DevExpress.XtraEditors.SimpleButton btn_Cancel;
-        private DevExpress.XtraEditors.SimpleButton btn_Save;
-        private DevExpress.XtraEditors.TextEdit txt_MrlCode;
-        private DevExpress.XtraEditors.TextEdit txt_WorkCode;
-        private DevExpress.XtraEditors.LabelControl labelControl4;
-        private DevExpress.XtraEditors.SimpleButton btn_Add;
-        private DevExpress.XtraEditors.TextEdit txt_ProductType;
-        private DevExpress.XtraEditors.TextEdit txt_ProjectCode;
-        private DevExpress.XtraEditors.LabelControl labelControl5;
-        private DevExpress.XtraEditors.LabelControl labelControl1;
-        private DevExpress.XtraEditors.TextEdit txt_Remark;
-        private DevExpress.XtraEditors.TextEdit txt_ProjectName;
-        private DevExpress.XtraEditors.TextEdit txt_OrderCode;
-        private DevExpress.XtraEditors.LabelControl labelControl13;
-        private DevExpress.XtraEditors.LabelControl labelControl12;
-        private DevExpress.XtraEditors.TextEdit txt_MrlName;
+        private DevExpress.XtraEditors.GroupControl gcl_Card;
+        private DevExpress.XtraEditors.SimpleButton btn_import;
         private DevExpress.XtraEditors.LabelControl labelControl16;
-        private DevExpress.XtraEditors.TextEdit txt_TaskState;
-        private DevExpress.XtraEditors.LabelControl labelControl19;
-        private DevExpress.XtraEditors.TextEdit txt_requestCode;
         private DevExpress.XtraEditors.LabelControl labelControl11;
-        private DevExpress.XtraEditors.LabelControl labelControl8;
-        private DevExpress.XtraEditors.LabelControl labelControl15;
-        private DevExpress.XtraEditors.TextEdit txt_hcqMcode;
-        private DevExpress.XtraEditors.TextEdit txt_unitNum;
-        private DevExpress.XtraEditors.TextEdit txt_ykMcode;
-        private DevExpress.XtraEditors.TextEdit txt_ykWorkcode;
+        private DevExpress.XtraEditors.TextEdit txt_MrlName;
+        private DevExpress.XtraEditors.TextEdit txt_requestCode;
+        private DevExpress.XtraEditors.TextEdit txt_Remark;
+        private DevExpress.XtraEditors.GroupControl gcl_unit;
         private DevExpress.XtraEditors.LabelControl labelControl10;
-        private DevExpress.XtraEditors.TextEdit txt_hcqWorkcode;
+        private DevExpress.XtraEditors.TextEdit txt_ykMcode;
+        private DevExpress.XtraEditors.TextEdit txt_hcqMcode;
+        private DevExpress.XtraEditors.SimpleButton btn_Cancel;
+        private DevExpress.XtraEditors.GroupControl gcl_bind;
+        private DevExpress.XtraEditors.LabelControl labelControl3;
         private DevExpress.XtraEditors.LabelControl labelControl7;
+        private DevExpress.XtraEditors.LabelControl labelControl19;
+        private DevExpress.XtraEditors.TextEdit txt_hcqWorkcode;
+        private DevExpress.XtraEditors.TextEdit txt_ykWorkcode;
+        private DevExpress.XtraEditors.TextEdit txt_TaskState;
+        private DevExpress.XtraEditors.SimpleButton btn_Add;
+        private DevExpress.XtraEditors.SimpleButton btn_Save;
+        private DevExpress.XtraEditors.TextEdit txt_unitNum;
         private DevExpress.XtraEditors.LabelControl labelControl6;
-        private DevExpress.XtraEditors.LabelControl labelControl3;
-        private DevExpress.XtraEditors.SimpleButton btn_getRecentRemark;
-        private DevExpress.XtraEditors.SimpleButton btn_GetMcode;
+        private DevExpress.XtraEditors.LabelControl labelControl1;
+        private DevExpress.XtraEditors.LabelControl labelControl2;
     }
 }

SIMDP/SIMDP.View/FormEditCopulerRequest.cs

@@ -19,69 +19,79 @@ namespace SIMDP
 {
     public partial class FormEditCopulerRequest : DevExpress.XtraEditors.XtraForm
     {
-        /// <summary>
-        /// 定义PLC对象
-        /// </summary>
-        public MoCopulerRequest modelTask;
-        /// <summary>
-        /// 定义委托
-        /// </summary>
         public delegate void save();
-        /// <summary>
-        /// 定义事件，保存数据成功后刷新FormPLC中的数据
-        /// </summary>
         public event save saveData;
 
-        Dictionary<string, string> linkType = new Dictionary<string, string>();
-        public FormEditCopulerRequest()
-        {
-            InitializeComponent();
-
-            this.btn_Save.Enabled = false;
+        public MoCopulerRequest modelTask;
 
-        }
-        public FormEditCopulerRequest(MoCopulerRequest model)
+        public FormEditCopulerRequest(MoCopulerRequest model, int ModifyField)
         {
             InitializeComponent();
 
-            //当需要限制用户修改时取消注释
-            //this.txt_requestCode.Enabled = false;
-            //this.txt_WorkCode.Enabled = false;
-            //this.txt_ProjectCode.Enabled = false;
-            //this.txt_unitNum.Enabled = false;
-            //this.txt_hcqMcode.Enabled = false;
-            //this.txt_ykMcode.Enabled = false;
 
-            this.txt_hcqWorkcode.Enabled = true;
-            this.txt_ykWorkcode.Enabled = true;
-            this.txt_TaskState.Enabled = true;
+            //修改字段
+            if (ModifyField == 1)
+            {
+                if (model != null)
+                {
+                    modelTask = model;
+
+                    this.txt_requestCode.Text = model.RequestCode.ToString();
+                    this.txt_Remark.Text = model.Remark.ToString();
+                    this.txt_MrlName.Text = model.MrlName.ToString();
+
+                    this.txt_hcqMcode.Text = model.MCode01.ToString();
+                    this.txt_ykMcode.Text = model.MCode02.ToString();
+
+                    this.txt_unitNum.Text = model.MrlContain.ToString();
+                    this.txt_hcqWorkcode.Text = model.MWorkCode01.ToString();
+                    this.txt_ykWorkcode.Text = model.MWorkCode02.ToString();
+                    this.txt_TaskState.Text = model.TaskState.ToString();
+
+                    gcl_Card.Enabled = true;
+                    gcl_unit.Enabled = true;
+                    gcl_bind.Enabled = true;
+                    txt_unitNum.Enabled = false;
+                    this.btn_Save.Enabled = true;
+                    this.btn_Add.Enabled = false;
+                    btn_Save.Click += new System.EventHandler(btn_Save_Click);
+
+                    //支持便捷导入
+                    if (model != null)
+                    {
+                        btn_import.Enabled = true;
+                        btn_import.Click += new System.EventHandler(btn_import_Click);
+                    }
+                    else
+                    {
+                        btn_import.Enabled = false;
+                    }
+                }
+            }
 
-            if (model != null)   //修改功能
+            //添加新卡
+            else if (ModifyField == 2)
             {
                 modelTask = model;
-                //LOAD所有参数
-                this.txt_requestCode.Text = model.RequestCode.ToString();
-                this.txt_OrderCode.Text = model.OrderCode.ToString();
-                this.txt_WorkCode.Text = model.WorkCode.ToString();
-                this.txt_MrlCode.Text = model.MCode.ToString();
-                this.txt_Remark.Text = model.Remark.ToString();
 
-                this.txt_ProjectCode.Text = model.ProjectCode.ToString();
-                this.txt_ProjectName.Text = model.ProjectName.ToString();
-                this.txt_MrlName.Text = model.MrlName.ToString();
-                this.txt_ProductType.Text = model.ProductType.ToString();
+                gcl_Card.Enabled = true;
+                gcl_unit.Enabled = true;
+                gcl_bind.Enabled = false;
 
-                this.txt_hcqMcode.Text = model.MCode01.ToString();
-                this.txt_ykMcode.Text = model.MCode02.ToString();
-                this.txt_unitNum.Text = model.MrlContain.ToString();
+                btn_Add.Enabled = true;
+                btn_Save.Enabled = false;
+                btn_Add.Click += new System.EventHandler(btn_Add_Click);
 
-                this.txt_hcqWorkcode.Text = model.MWorkCode01.ToString();
-                this.txt_ykWorkcode.Text = model.MWorkCode02.ToString();
-                this.txt_TaskState.Text = model.TaskState.ToString();
-
-
-                this.btn_Save.Enabled = true;
-                this.btn_Add.Enabled = false;
+                //支持便捷导入
+                if (model != null)
+                {
+                    btn_import.Enabled = true;
+                    btn_import.Click += new System.EventHandler(btn_import_Click);
+                }
+                else
+                {
+                    btn_import.Enabled = false;
+                }
             }
         }
 
@@ -94,54 +104,39 @@ namespace SIMDP
         {
             try
             {
-                modelTask.Date = DateTime.Now;
+                modelTask.MrlName = this.txt_MrlName.Text;
                 modelTask.RequestCode = this.txt_requestCode.Text;
-                modelTask.OrderCode = this.txt_OrderCode.Text;
-                modelTask.WorkCode = this.txt_WorkCode.Text;
-                modelTask.MCode = this.txt_MrlCode.Text;
                 modelTask.Remark = ProEnvironment.RemoveKeyField(this.txt_Remark.Text);
 
-                modelTask.ProjectCode = this.txt_ProjectCode.Text;
-                modelTask.ProjectName = this.txt_ProjectName.Text;
-                modelTask.MrlName = this.txt_MrlName.Text;
-                modelTask.ProductType = this.txt_ProductType.Text;
-
                 modelTask.MCode01 = this.txt_hcqMcode.Text;
                 modelTask.MCode02 = this.txt_ykMcode.Text;
-                // modelTask.MrlContain = Convert.ToInt32(this.txt_unitNum.Text);
-                if ((this.txt_hcqMcode.Text == "") || (this.txt_ykMcode.Text == ""))
-                {
-                    modelTask.MrlContain = 1;
-                }
-                else
-                {
-                    modelTask.MrlContain = 2;
-                }
 
+                if ((this.txt_hcqMcode.Text != "") && (this.txt_ykMcode.Text != ""))
+                    modelTask.MrlContain = 2;
+                else
+                    modelTask.MrlContain = 1;
                 modelTask.MWorkCode01 = this.txt_hcqWorkcode.Text;
                 modelTask.MWorkCode02 = this.txt_ykWorkcode.Text;
                 modelTask.TaskState = Convert.ToInt32(this.txt_TaskState.Text);
 
                 bool flag = BLLFactory<BlCopulerRequest>.Instance.Update(modelTask, modelTask.ID);
-
                 if (flag)
                 {
-                    DevExpress.XtraEditors.XtraMessageBox.Show("修改成功。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    XtraMessageBox.Show("修改成功。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
                     saveData();
                     this.Close();
                 }
                 else
                 {
-                    DevExpress.XtraEditors.XtraMessageBox.Show("修改失败。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    XtraMessageBox.Show("修改失败。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
                     LogHelper.log.Error(string.Format("修改数据库COUPLER_REQUEST失败false"));
                     return;
                 }
-
             }
 
             catch (Exception ex)
             {
-                DevExpress.XtraEditors.XtraMessageBox.Show($"修改失败。{ex.Message}", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                XtraMessageBox.Show($"修改失败。{ex.Message}", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 LogHelper.log.Error(string.Format("修改数据库COUPLER_REQUEST出现错误：{0}", ex));
             }
         }
@@ -151,55 +146,38 @@ namespace SIMDP
         {
             try
             {
-                if (string.IsNullOrEmpty(txt_WorkCode.Text) || string.IsNullOrEmpty(txt_requestCode.Text)
-                    || string.IsNullOrEmpty(txt_ProjectCode.Text))
-                {
-                    DevExpress.XtraEditors.XtraMessageBox.Show("请将信息填写完整。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    return;
-                }
                 if ((this.txt_hcqMcode.Text == "") && (this.txt_ykMcode.Text == ""))
                 {
-                    DevExpress.XtraEditors.XtraMessageBox.Show("请至少填写一个BOM M码。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    XtraMessageBox.Show("请至少填写一个部件的物料编码码。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
                     return;
                 }
 
                 MoCopulerRequest model = new MoCopulerRequest();
+                model.WorkCode = Guid.NewGuid().ToString();
                 model.Date = DateTime.Now;
-                model.RequestCode = this.txt_requestCode.Text;
-                model.OrderCode = this.txt_OrderCode.Text;
-                model.WorkCode = this.txt_WorkCode.Text;
-                model.MCode = this.txt_MrlCode.Text;
-                model.Remark = ProEnvironment.RemoveKeyField(this.txt_Remark.Text);
 
-                model.ProjectCode = this.txt_ProjectCode.Text;
-                model.ProjectName = this.txt_ProjectName.Text;
                 model.MrlName = this.txt_MrlName.Text;
-                model.ProductType = this.txt_ProductType.Text;
+                model.RequestCode = this.txt_requestCode.Text;
+                model.Remark = ProEnvironment.RemoveKeyField(this.txt_Remark.Text);
 
                 model.MCode01 = this.txt_hcqMcode.Text;
                 model.MCode02 = this.txt_ykMcode.Text;
-                // model.MrlContain = Convert.ToInt32(this.txt_unitNum.Text);
-                if ((this.txt_hcqMcode.Text == "") || (this.txt_ykMcode.Text == ""))
-                {
-                    model.MrlContain = 1;
-                }
-                else
-                {
-                    model.MrlContain = 2;
-                }
 
+                if ((this.txt_hcqMcode.Text != "") && (this.txt_ykMcode.Text != ""))
+                    model.MrlContain = 2;
+                else
+                    model.MrlContain = 1;
 
                 bool flag = BLLFactory<BlCopulerRequest>.Instance.Insert(model);
-
                 if (flag)
                 {
-                    DevExpress.XtraEditors.XtraMessageBox.Show("添加成功。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    XtraMessageBox.Show("添加成功。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
                     saveData();
                     this.Close();
                 }
                 else
                 {
-                    DevExpress.XtraEditors.XtraMessageBox.Show("添加失败。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    XtraMessageBox.Show("添加失败。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
                     LogHelper.log.Error(string.Format("添加数据库COUPLER_REQUEST失败false"));
                     return;
                 }
@@ -207,22 +185,19 @@ namespace SIMDP
             }
             catch (Exception ex)
             {
-                DevExpress.XtraEditors.XtraMessageBox.Show($"添加失败。{ex.Message}", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                XtraMessageBox.Show($"添加失败。{ex.Message}", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 LogHelper.log.Error(string.Format("添加数据库COUPLER_REQUEST出现错误：{0}", ex));
             }
         }
 
-        RedisHelper redis = new RedisHelper();
-        private void btn_getRecentRemark_Click(object sender, EventArgs e)
+        private void btn_import_Click(object sender, EventArgs e)
         {
-            string srecentRemark = redis.GetString(SysEnvironment.redis_RecentRemark);
-            this.txt_Remark.Text = srecentRemark;
+            txt_MrlName.Text = modelTask.MrlName;
+            txt_requestCode.Text = modelTask.RequestCode;
+            txt_Remark.Text = modelTask.Remark;
+            txt_hcqMcode.Text = modelTask.MCode01;
+            txt_ykMcode.Text = modelTask.MCode02;
         }
 
-        private void btn_GetMcode_Click(object sender, EventArgs e)
-        {
-            string srecentRemark = redis.GetString(SysEnvironment.redis_RecentMCode);
-            this.txt_ykMcode.Text = srecentRemark;
-        }
     }
 }

SIMDP/SIMDP.View/FormEditProductTask.Designer.cs

@@ -92,8 +92,9 @@
             this.panelControl1.Controls.Add(this.btn_Save);
             this.panelControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panelControl1.Location = new System.Drawing.Point(0, 0);
+            this.panelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.panelControl1.Name = "panelControl1";
-            this.panelControl1.Size = new System.Drawing.Size(326, 516);
+            this.panelControl1.Size = new System.Drawing.Size(373, 663);
             this.panelControl1.TabIndex = 0;
             // 
             // gcl_Barcode
@@ -105,28 +106,30 @@
             this.gcl_Barcode.Controls.Add(this.labelControl6);
             this.gcl_Barcode.Controls.Add(this.labelControl7);
             this.gcl_Barcode.Controls.Add(this.txt_SmallBarcode);
-            this.gcl_Barcode.Location = new System.Drawing.Point(9, 202);
-            this.gcl_Barcode.Margin = new System.Windows.Forms.Padding(2);
+            this.gcl_Barcode.Location = new System.Drawing.Point(10, 260);
+            this.gcl_Barcode.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.gcl_Barcode.Name = "gcl_Barcode";
-            this.gcl_Barcode.Size = new System.Drawing.Size(311, 82);
+            this.gcl_Barcode.Size = new System.Drawing.Size(355, 105);
             this.gcl_Barcode.TabIndex = 31;
             this.gcl_Barcode.Text = "托盘号绑定";
             // 
             // txt_LargeBarcode
             // 
             this.txt_LargeBarcode.EditValue = "";
-            this.txt_LargeBarcode.Location = new System.Drawing.Point(115, 30);
+            this.txt_LargeBarcode.Location = new System.Drawing.Point(131, 39);
+            this.txt_LargeBarcode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_LargeBarcode.Name = "txt_LargeBarcode";
-            this.txt_LargeBarcode.Size = new System.Drawing.Size(171, 20);
+            this.txt_LargeBarcode.Size = new System.Drawing.Size(195, 24);
             this.txt_LargeBarcode.TabIndex = 27;
             // 
             // labelControl6
             // 
             this.labelControl6.Appearance.ForeColor = System.Drawing.Color.Black;
             this.labelControl6.Appearance.Options.UseForeColor = true;
-            this.labelControl6.Location = new System.Drawing.Point(16, 33);
+            this.labelControl6.Location = new System.Drawing.Point(18, 42);
+            this.labelControl6.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl6.Name = "labelControl6";
-            this.labelControl6.Size = new System.Drawing.Size(60, 14);
+            this.labelControl6.Size = new System.Drawing.Size(75, 18);
             this.labelControl6.TabIndex = 26;
             this.labelControl6.Text = "大托盘码：";
             // 
@@ -134,18 +137,20 @@
             // 
             this.labelControl7.Appearance.ForeColor = System.Drawing.Color.Black;
             this.labelControl7.Appearance.Options.UseForeColor = true;
-            this.labelControl7.Location = new System.Drawing.Point(16, 58);
+            this.labelControl7.Location = new System.Drawing.Point(18, 75);
+            this.labelControl7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl7.Name = "labelControl7";
-            this.labelControl7.Size = new System.Drawing.Size(60, 14);
+            this.labelControl7.Size = new System.Drawing.Size(75, 18);
             this.labelControl7.TabIndex = 25;
             this.labelControl7.Text = "小托盘码：";
             // 
             // txt_SmallBarcode
             // 
             this.txt_SmallBarcode.EditValue = "LKT";
-            this.txt_SmallBarcode.Location = new System.Drawing.Point(115, 56);
+            this.txt_SmallBarcode.Location = new System.Drawing.Point(131, 72);
+            this.txt_SmallBarcode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_SmallBarcode.Name = "txt_SmallBarcode";
-            this.txt_SmallBarcode.Size = new System.Drawing.Size(171, 20);
+            this.txt_SmallBarcode.Size = new System.Drawing.Size(195, 24);
             this.txt_SmallBarcode.TabIndex = 28;
             // 
             // gcl_AutoGen
@@ -163,10 +168,10 @@
             this.gcl_AutoGen.Controls.Add(this.txt_MatchNum);
             this.gcl_AutoGen.Controls.Add(this.txt_requestCode);
             this.gcl_AutoGen.Controls.Add(this.txt_AbleMatch);
-            this.gcl_AutoGen.Location = new System.Drawing.Point(9, 289);
-            this.gcl_AutoGen.Margin = new System.Windows.Forms.Padding(2);
+            this.gcl_AutoGen.Location = new System.Drawing.Point(10, 372);
+            this.gcl_AutoGen.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.gcl_AutoGen.Name = "gcl_AutoGen";
-            this.gcl_AutoGen.Size = new System.Drawing.Size(311, 163);
+            this.gcl_AutoGen.Size = new System.Drawing.Size(355, 210);
             this.gcl_AutoGen.TabIndex = 31;
             this.gcl_AutoGen.Text = "自动生成项";
             // 
@@ -174,9 +179,10 @@
             // 
             this.labelControl15.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(31)))), ((int)(((byte)(53)))));
             this.labelControl15.Appearance.Options.UseForeColor = true;
-            this.labelControl15.Location = new System.Drawing.Point(13, 26);
+            this.labelControl15.Location = new System.Drawing.Point(15, 33);
+            this.labelControl15.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl15.Name = "labelControl15";
-            this.labelControl15.Size = new System.Drawing.Size(68, 14);
+            this.labelControl15.Size = new System.Drawing.Size(84, 18);
             this.labelControl15.TabIndex = 0;
             this.labelControl15.Text = "PLC程序号：";
             // 
@@ -184,9 +190,10 @@
             // 
             this.labelControl11.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(31)))), ((int)(((byte)(53)))));
             this.labelControl11.Appearance.Options.UseForeColor = true;
-            this.labelControl11.Location = new System.Drawing.Point(13, 51);
+            this.labelControl11.Location = new System.Drawing.Point(15, 66);
+            this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl11.Name = "labelControl11";
-            this.labelControl11.Size = new System.Drawing.Size(83, 14);
+            this.labelControl11.Size = new System.Drawing.Size(103, 18);
             this.labelControl11.TabIndex = 0;
             this.labelControl11.Text = "MES需求单号：";
             // 
@@ -194,9 +201,10 @@
             // 
             this.labelControl10.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(31)))), ((int)(((byte)(53)))));
             this.labelControl10.Appearance.Options.UseForeColor = true;
-            this.labelControl10.Location = new System.Drawing.Point(12, 111);
+            this.labelControl10.Location = new System.Drawing.Point(14, 143);
+            this.labelControl10.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl10.Name = "labelControl10";
-            this.labelControl10.Size = new System.Drawing.Size(60, 14);
+            this.labelControl10.Size = new System.Drawing.Size(75, 18);
             this.labelControl10.TabIndex = 0;
             this.labelControl10.Text = "抓取顺序：";
             // 
@@ -204,9 +212,10 @@
             // 
             this.labelControl17.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(31)))), ((int)(((byte)(53)))));
             this.labelControl17.Appearance.Options.UseForeColor = true;
-            this.labelControl17.Location = new System.Drawing.Point(12, 135);
+            this.labelControl17.Location = new System.Drawing.Point(14, 174);
+            this.labelControl17.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl17.Name = "labelControl17";
-            this.labelControl17.Size = new System.Drawing.Size(48, 14);
+            this.labelControl17.Size = new System.Drawing.Size(60, 18);
             this.labelControl17.TabIndex = 0;
             this.labelControl17.Text = "配对号：";
             // 
@@ -214,51 +223,57 @@
             // 
             this.labelControl9.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(31)))), ((int)(((byte)(53)))));
             this.labelControl9.Appearance.Options.UseForeColor = true;
-            this.labelControl9.Location = new System.Drawing.Point(12, 86);
+            this.labelControl9.Location = new System.Drawing.Point(14, 111);
+            this.labelControl9.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl9.Name = "labelControl9";
-            this.labelControl9.Size = new System.Drawing.Size(60, 14);
+            this.labelControl9.Size = new System.Drawing.Size(75, 18);
             this.labelControl9.TabIndex = 0;
             this.labelControl9.Text = "能否配对：";
             // 
             // txt_plcProgramcode
             // 
             this.txt_plcProgramcode.EditValue = "";
-            this.txt_plcProgramcode.Location = new System.Drawing.Point(112, 25);
+            this.txt_plcProgramcode.Location = new System.Drawing.Point(128, 32);
+            this.txt_plcProgramcode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_plcProgramcode.Name = "txt_plcProgramcode";
-            this.txt_plcProgramcode.Size = new System.Drawing.Size(171, 20);
+            this.txt_plcProgramcode.Size = new System.Drawing.Size(195, 24);
             this.txt_plcProgramcode.TabIndex = 7;
             this.txt_plcProgramcode.TabStop = false;
             // 
             // txt_GrabOrder
             // 
             this.txt_GrabOrder.EditValue = "";
-            this.txt_GrabOrder.Location = new System.Drawing.Point(111, 110);
+            this.txt_GrabOrder.Location = new System.Drawing.Point(127, 141);
+            this.txt_GrabOrder.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_GrabOrder.Name = "txt_GrabOrder";
-            this.txt_GrabOrder.Size = new System.Drawing.Size(171, 20);
+            this.txt_GrabOrder.Size = new System.Drawing.Size(195, 24);
             this.txt_GrabOrder.TabIndex = 16;
             // 
             // txt_MatchNum
             // 
             this.txt_MatchNum.EditValue = "";
-            this.txt_MatchNum.Location = new System.Drawing.Point(111, 132);
+            this.txt_MatchNum.Location = new System.Drawing.Point(127, 170);
+            this.txt_MatchNum.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_MatchNum.Name = "txt_MatchNum";
-            this.txt_MatchNum.Size = new System.Drawing.Size(171, 20);
+            this.txt_MatchNum.Size = new System.Drawing.Size(195, 24);
             this.txt_MatchNum.TabIndex = 18;
             // 
             // txt_requestCode
             // 
             this.txt_requestCode.EditValue = "";
-            this.txt_requestCode.Location = new System.Drawing.Point(112, 50);
+            this.txt_requestCode.Location = new System.Drawing.Point(128, 64);
+            this.txt_requestCode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_requestCode.Name = "txt_requestCode";
-            this.txt_requestCode.Size = new System.Drawing.Size(171, 20);
+            this.txt_requestCode.Size = new System.Drawing.Size(195, 24);
             this.txt_requestCode.TabIndex = 11;
             // 
             // txt_AbleMatch
             // 
             this.txt_AbleMatch.EditValue = "";
-            this.txt_AbleMatch.Location = new System.Drawing.Point(111, 85);
+            this.txt_AbleMatch.Location = new System.Drawing.Point(127, 109);
+            this.txt_AbleMatch.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_AbleMatch.Name = "txt_AbleMatch";
-            this.txt_AbleMatch.Size = new System.Drawing.Size(171, 20);
+            this.txt_AbleMatch.Size = new System.Drawing.Size(195, 24);
             this.txt_AbleMatch.TabIndex = 15;
             // 
             // gcl_Card
@@ -277,10 +292,10 @@
             this.gcl_Card.Controls.Add(this.txt_MrlCode);
             this.gcl_Card.Controls.Add(this.txt_ProductType);
             this.gcl_Card.Controls.Add(this.txt_CardRemark);
-            this.gcl_Card.Location = new System.Drawing.Point(9, 8);
-            this.gcl_Card.Margin = new System.Windows.Forms.Padding(2);
+            this.gcl_Card.Location = new System.Drawing.Point(10, 10);
+            this.gcl_Card.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.gcl_Card.Name = "gcl_Card";
-            this.gcl_Card.Size = new System.Drawing.Size(311, 191);
+            this.gcl_Card.Size = new System.Drawing.Size(355, 246);
             this.gcl_Card.TabIndex = 31;
             this.gcl_Card.Text = "流转卡信息";
             // 
@@ -288,9 +303,10 @@
             // 
             this.labelControl3.Appearance.ForeColor = System.Drawing.Color.Black;
             this.labelControl3.Appearance.Options.UseForeColor = true;
-            this.labelControl3.Location = new System.Drawing.Point(16, 33);
+            this.labelControl3.Location = new System.Drawing.Point(18, 42);
+            this.labelControl3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl3.Name = "labelControl3";
-            this.labelControl3.Size = new System.Drawing.Size(36, 14);
+            this.labelControl3.Size = new System.Drawing.Size(45, 18);
             this.labelControl3.TabIndex = 0;
             this.labelControl3.Text = "工位：";
             // 
@@ -298,9 +314,10 @@
             // 
             this.labelControl2.Appearance.ForeColor = System.Drawing.Color.Black;
             this.labelControl2.Appearance.Options.UseForeColor = true;
-            this.labelControl2.Location = new System.Drawing.Point(16, 61);
+            this.labelControl2.Location = new System.Drawing.Point(18, 78);
+            this.labelControl2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl2.Name = "labelControl2";
-            this.labelControl2.Size = new System.Drawing.Size(60, 14);
+            this.labelControl2.Size = new System.Drawing.Size(75, 18);
             this.labelControl2.TabIndex = 0;
             this.labelControl2.Text = "流转卡号：";
             // 
@@ -308,123 +325,137 @@
             // 
             this.labelControl4.Appearance.ForeColor = System.Drawing.Color.Black;
             this.labelControl4.Appearance.Options.UseForeColor = true;
-            this.labelControl4.Location = new System.Drawing.Point(16, 142);
+            this.labelControl4.Location = new System.Drawing.Point(18, 183);
+            this.labelControl4.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl4.Name = "labelControl4";
-            this.labelControl4.Size = new System.Drawing.Size(60, 14);
+            this.labelControl4.Size = new System.Drawing.Size(75, 18);
             this.labelControl4.TabIndex = 0;
             this.labelControl4.Text = "物料编码：";
             // 
             // txt_WorkCode
             // 
             this.txt_WorkCode.EditValue = "测试";
-            this.txt_WorkCode.Location = new System.Drawing.Point(115, 58);
+            this.txt_WorkCode.Location = new System.Drawing.Point(131, 75);
+            this.txt_WorkCode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_WorkCode.Name = "txt_WorkCode";
-            this.txt_WorkCode.Size = new System.Drawing.Size(171, 20);
+            this.txt_WorkCode.Size = new System.Drawing.Size(195, 24);
             this.txt_WorkCode.TabIndex = 2;
             this.txt_WorkCode.TabStop = false;
             // 
             // btn_import
             // 
-            this.btn_import.Location = new System.Drawing.Point(86, 0);
+            this.btn_import.Location = new System.Drawing.Point(98, 0);
+            this.btn_import.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.btn_import.Name = "btn_import";
-            this.btn_import.Size = new System.Drawing.Size(37, 20);
+            this.btn_import.Size = new System.Drawing.Size(42, 26);
             this.btn_import.TabIndex = 21;
             this.btn_import.Text = "导入";
+            this.btn_import.Click += new System.EventHandler(this.btn_import_Click_1);
             // 
             // labelControl5
             // 
             this.labelControl5.Appearance.ForeColor = System.Drawing.Color.Black;
             this.labelControl5.Appearance.Options.UseForeColor = true;
-            this.labelControl5.Location = new System.Drawing.Point(16, 114);
+            this.labelControl5.Location = new System.Drawing.Point(18, 147);
+            this.labelControl5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl5.Name = "labelControl5";
-            this.labelControl5.Size = new System.Drawing.Size(36, 14);
+            this.labelControl5.Size = new System.Drawing.Size(45, 18);
             this.labelControl5.TabIndex = 0;
             this.labelControl5.Text = "图号：";
             // 
             // lookUp_Line
             // 
-            this.lookUp_Line.Location = new System.Drawing.Point(115, 30);
+            this.lookUp_Line.Location = new System.Drawing.Point(131, 39);
+            this.lookUp_Line.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.lookUp_Line.Name = "lookUp_Line";
             this.lookUp_Line.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.lookUp_Line.Size = new System.Drawing.Size(171, 20);
+            this.lookUp_Line.Size = new System.Drawing.Size(195, 24);
             this.lookUp_Line.TabIndex = 0;
             // 
             // labelControl14
             // 
             this.labelControl14.Appearance.ForeColor = System.Drawing.Color.Black;
             this.labelControl14.Appearance.Options.UseForeColor = true;
-            this.labelControl14.Location = new System.Drawing.Point(16, 87);
+            this.labelControl14.Location = new System.Drawing.Point(18, 112);
+            this.labelControl14.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl14.Name = "labelControl14";
-            this.labelControl14.Size = new System.Drawing.Size(48, 14);
+            this.labelControl14.Size = new System.Drawing.Size(60, 18);
             this.labelControl14.TabIndex = 0;
             this.labelControl14.Text = "备注名：";
             // 
             // txt_MrlCode
             // 
             this.txt_MrlCode.EditValue = "测试";
-            this.txt_MrlCode.Location = new System.Drawing.Point(115, 138);
+            this.txt_MrlCode.Location = new System.Drawing.Point(131, 177);
+            this.txt_MrlCode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_MrlCode.Name = "txt_MrlCode";
-            this.txt_MrlCode.Size = new System.Drawing.Size(171, 20);
+            this.txt_MrlCode.Size = new System.Drawing.Size(195, 24);
             this.txt_MrlCode.TabIndex = 3;
             this.txt_MrlCode.TabStop = false;
             // 
             // txt_ProductType
             // 
             this.txt_ProductType.EditValue = "测试";
-            this.txt_ProductType.Location = new System.Drawing.Point(115, 112);
+            this.txt_ProductType.Location = new System.Drawing.Point(131, 144);
+            this.txt_ProductType.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_ProductType.Name = "txt_ProductType";
-            this.txt_ProductType.Size = new System.Drawing.Size(171, 20);
+            this.txt_ProductType.Size = new System.Drawing.Size(195, 24);
             this.txt_ProductType.TabIndex = 11;
             // 
             // txt_CardRemark
             // 
             this.txt_CardRemark.EditValue = "测试";
-            this.txt_CardRemark.Location = new System.Drawing.Point(115, 85);
+            this.txt_CardRemark.Location = new System.Drawing.Point(131, 109);
+            this.txt_CardRemark.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_CardRemark.Name = "txt_CardRemark";
-            this.txt_CardRemark.Size = new System.Drawing.Size(171, 20);
+            this.txt_CardRemark.Size = new System.Drawing.Size(195, 24);
             this.txt_CardRemark.TabIndex = 4;
             this.txt_CardRemark.TabStop = false;
             // 
             // btn_Cancel
             // 
-            this.btn_Cancel.Location = new System.Drawing.Point(241, 467);
+            this.btn_Cancel.Location = new System.Drawing.Point(275, 600);
+            this.btn_Cancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.btn_Cancel.Name = "btn_Cancel";
-            this.btn_Cancel.Size = new System.Drawing.Size(51, 23);
+            this.btn_Cancel.Size = new System.Drawing.Size(58, 30);
             this.btn_Cancel.TabIndex = 23;
             this.btn_Cancel.Text = "取消";
             this.btn_Cancel.Click += new System.EventHandler(this.btn_Cancel_Click);
             // 
             // btn_Add
             // 
-            this.btn_Add.Location = new System.Drawing.Point(42, 467);
+            this.btn_Add.Location = new System.Drawing.Point(48, 600);
+            this.btn_Add.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.btn_Add.Name = "btn_Add";
-            this.btn_Add.Size = new System.Drawing.Size(51, 23);
+            this.btn_Add.Size = new System.Drawing.Size(58, 30);
             this.btn_Add.TabIndex = 21;
             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(144, 467);
+            this.btn_Save.Location = new System.Drawing.Point(165, 600);
+            this.btn_Save.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.btn_Save.Name = "btn_Save";
-            this.btn_Save.Size = new System.Drawing.Size(51, 23);
+            this.btn_Save.Size = new System.Drawing.Size(58, 30);
             this.btn_Save.TabIndex = 22;
             this.btn_Save.Text = "保存";
             // 
             // FormEditProductTask
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(326, 516);
+            this.ClientSize = new System.Drawing.Size(373, 663);
             this.ControlBox = false;
             this.Controls.Add(this.panelControl1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
+            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "FormEditProductTask";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "流转任务编辑";
+            this.Text = "流转卡任务编辑";
             ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
             this.panelControl1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcl_Barcode)).EndInit();

SIMDP/SIMDP.View/FormEditProductTask.cs

@@ -32,6 +32,7 @@ namespace SIMDP
 
         /// <summary>
         /// 【添加新卡按钮进入、支持导入】 【绑定托盘按钮进入】 【修改字段按钮进入】
+        /// int ModifyField 0绑定 1修改 2添加
         /// </summary>
         /// <param name="model"></param>
         /// <param name="ModifyField"></param>
@@ -102,6 +103,7 @@ namespace SIMDP
 
           
         }
+
         private void btn_import_Click(object sender, EventArgs e)
         {
             ImportCardFields(modelTask);
@@ -303,5 +305,10 @@ namespace SIMDP
             return false;
 
         }
+
+        private void btn_import_Click_1(object sender, EventArgs e)
+        {
+
+        }
     }
 }

SIMDP/SIMDP.View/FormProductTask.Designer.cs

@@ -533,7 +533,7 @@ namespace SIMDP
             // lookUp_Line
             // 
             this.lookUp_Line.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.lookUp_Line.Location = new System.Drawing.Point(403, 5);
+            this.lookUp_Line.Location = new System.Drawing.Point(403, 3);
             this.lookUp_Line.Margin = new System.Windows.Forms.Padding(3, 3, 3, 0);
             this.lookUp_Line.Name = "lookUp_Line";
             this.lookUp_Line.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
@@ -547,7 +547,7 @@ namespace SIMDP
             // 
             this.dateEditStart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.dateEditStart.EditValue = new System.DateTime(2019, 2, 27, 8, 48, 5, 0);
-            this.dateEditStart.Location = new System.Drawing.Point(57, 5);
+            this.dateEditStart.Location = new System.Drawing.Point(57, 3);
             this.dateEditStart.Margin = new System.Windows.Forms.Padding(3, 3, 3, 0);
             this.dateEditStart.Name = "dateEditStart";
             this.dateEditStart.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
@@ -563,7 +563,7 @@ namespace SIMDP
             // 
             this.dateEditEnd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.dateEditEnd.EditValue = new System.DateTime(2021, 11, 2, 0, 0, 0, 0);
-            this.dateEditEnd.Location = new System.Drawing.Point(230, 5);
+            this.dateEditEnd.Location = new System.Drawing.Point(230, 3);
             this.dateEditEnd.Margin = new System.Windows.Forms.Padding(3, 3, 3, 0);
             this.dateEditEnd.Name = "dateEditEnd";
             this.dateEditEnd.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;

SIMDP/SIMDP.View/MainForm.cs

@@ -39,6 +39,7 @@ namespace SIMDP
             InitProjectParas();
 
             DevExpress.LookAndFeel.UserLookAndFeel.Default.SetSkinStyle("Office 2019 Colorful");//设置主题样式
+
         }
 
         private void InitProjectParas()