Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_CollectBTMAC.cs

@@ -147,6 +147,7 @@ namespace UAS_MES.Make
                         string ErrorMessage = "";
                         string result = "";
                         sql.Clear();
+                        string checkbt = sncode.Text.Replace(":", "").Replace("-", "");
                         sql.Append("select mal_bt from MakeAddressList where mal_makecode = '" + ms_makecode.Text + "'");
                         dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                         if (dt.Rows.Count > 0)
@@ -154,14 +155,14 @@ namespace UAS_MES.Make
                             Boolean isbt = false;
                             for (int i = 0; i < dt.Rows.Count; i++)
                             {
-                                if (dt.Rows[i][0].ToString() == sncode.Text)
+                                if (dt.Rows[i][0].ToString() == checkbt)
                                 {
                                     isbt = true;
                                 }
                             }
                             if (!isbt)
                             {
-                                OperateResult.AppendText(">>BT号"+ sncode.Text + "不符合工单导入要求\n", Color.Red, sncode);
+                                OperateResult.AppendText(">>BT号"+ checkbt + "不符合工单导入要求\n", Color.Red, sncode);
                                 return;
                             }
                         }
@@ -174,9 +175,9 @@ namespace UAS_MES.Make
                             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             if (dt.Rows.Count > 0)
                             {
-                                if (!(dt.Rows[0]["sr_startcode"].ToString().CompareTo(sncode.Text) <= 0 && dt.Rows[0]["sr_endcode"].ToString().CompareTo(sncode.Text) >= 0))
+                                if (!(dt.Rows[0]["sr_startcode"].ToString().Replace(":", "").Replace("-", "").CompareTo(checkbt) <= 0 && dt.Rows[0]["sr_endcode"].ToString().Replace(":", "").Replace("-", "").CompareTo(checkbt) >= 0))
                                 {
-                                    OperateResult.AppendText(">>BT号"+sncode.Text+"不符合销售单合同范围\n", Color.Red, sncode);
+                                    OperateResult.AppendText(">>BT号"+ checkbt + "不符合销售单合同范围\n", Color.Red, sncode);
                                     return;
                                 }
                             }
@@ -189,15 +190,21 @@ namespace UAS_MES.Make
                             OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                             return;
                         }
-                        if (dh.CheckExist("makeserial", "ms_bt = '" + sncode.Text + "'"))
+                        if (dh.CheckExist("sninfo", "si_bt = '" + checkbt + "'"))
                         {
-                            OperateResult.AppendText(">>录入错误，已存在此BT"+ sncode.Text + "\n", Color.Red, sncode);
+                            OperateResult.AppendText(">>录入错误，此BT:" + checkbt + "已被"+dh.getFieldDataByCondition("sninfo", "si_sn", "si_bt = '"+ checkbt + "'").ToString() +"使用\n", Color.Red, sncode);
+                            OperateResult.AppendText(">>请输入BT\n", Color.Black);
+                            return;
+                        }
+                        if (dh.CheckExist("makeserial", "ms_bt = '" + checkbt + "'"))
+                        {
+                            OperateResult.AppendText(">>录入错误，此BT:" + checkbt + "已被" + dh.getFieldDataByCondition("makeserial", "ms_sncode", "ms_bt = '" + checkbt + "'").ToString() + "使用\n", Color.Red, sncode);
                             OperateResult.AppendText(">>请输入BT\n", Color.Black);
                             return;
                         }
                         else
                         {
-                            ms_bt = sncode.Text;
+                            ms_bt = checkbt;
                             OperateResult.AppendText(">>BT采集完成\n>>请输入MAC\n", Color.Green, sncode);
                             isBT = false;
                             isMAC = true;
@@ -218,6 +225,7 @@ namespace UAS_MES.Make
                     string ErrorMessage = "";
                     string result = "";
                     sql.Clear();
+                    string checkmac = sncode.Text.Replace(":", "").Replace("-", "");
                     sql.Append("select mal_mac from MakeAddressList where mal_makecode = '" + ms_makecode.Text + "'");
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                     if (dt.Rows.Count > 0)
@@ -225,14 +233,14 @@ namespace UAS_MES.Make
                         Boolean ismac = false;
                         for (int i = 0; i < dt.Rows.Count; i++)
                         {
-                            if (dt.Rows[i][0].ToString() == sncode.Text)
+                            if (dt.Rows[i][0].ToString() == checkmac)
                             {
                                 ismac = true;
                             }
                         }
                         if (!ismac)
                         {
-                            OperateResult.AppendText(">>MAC号"+ sncode.Text + "不符合工单导入要求\n", Color.Red, sncode);
+                            OperateResult.AppendText(">>MAC号"+ checkmac + "不符合工单导入要求\n", Color.Red, sncode);
                             return;
                         }
                     }
@@ -245,9 +253,9 @@ namespace UAS_MES.Make
                         dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                         if (dt.Rows.Count > 0)
                         {
-                            if (!(dt.Rows[0]["sr_startcode"].ToString().CompareTo(sncode.Text) <= 0 && dt.Rows[0]["sr_endcode"].ToString().CompareTo(sncode.Text) >= 0))
+                            if (!(dt.Rows[0]["sr_startcode"].ToString().Replace(":", "").Replace("-", "").CompareTo(checkmac) <= 0 && dt.Rows[0]["sr_endcode"].ToString().Replace(":", "").Replace("-", "").CompareTo(checkmac) >= 0))
                             {
-                                OperateResult.AppendText(">>MAC号" + sncode.Text + "不符合销售单合同范围\n", Color.Red, sncode);
+                                OperateResult.AppendText(">>MAC号" + checkmac + "不符合销售单合同范围\n", Color.Red, sncode);
                                 return;
                             }
                         }
@@ -260,9 +268,15 @@ namespace UAS_MES.Make
                         OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                         return;
                     }
-                    if (dh.CheckExist("makeserial", "ms_mac = '" + sncode.Text + "'"))
+                    if (dh.CheckExist("sninfo", "si_bt = '" + checkmac + "'"))
+                    {
+                        OperateResult.AppendText(">>录入错误，此MAC:" + checkmac + "已被" + dh.getFieldDataByCondition("sninfo", "si_sn", "si_mac = '" + checkmac + "'").ToString() + "使用\n", Color.Red, sncode);
+                        OperateResult.AppendText(">>请输入MAC\n", Color.Black);
+                        return;
+                    }
+                    if (dh.CheckExist("makeserial", "ms_mac = '" + checkmac + "'"))
                     {
-                        OperateResult.AppendText(">>录入错误，已存在此MAC"+ sncode.Text + "\n", Color.Red, sncode);
+                        OperateResult.AppendText(">>录入错误，此MAC:" + checkmac + "已被" + dh.getFieldDataByCondition("makeserial", "ms_sncode", "ms_mac = '" + checkmac + "'").ToString() + "使用\n", Color.Red, sncode);
                         OperateResult.AppendText(">>请输入MAC\n", Color.Black);
                         return;
                     }
@@ -276,12 +290,12 @@ namespace UAS_MES.Make
                             string si_id = dh.getFieldDataByCondition("sninfo", "max(si_id) si_id", " si_sn='"+ sn_code + "' or si_sn in(select sn from makesnrelation where sn='"+ sn_code + "'  or beforesn = '" + sn_code + "')").ToString();
                             if (si_id != "")
                             {
-                                dh.BatchInsert("update  sninfo set si_mac = :mac,si_bt =:bt,si_indate = sysdate where si_id = :osiId", new String[] { "mac", "bt", "osiId" }, new string[] { sncode.Text }, new string[] { ms_bt }, new string[] { si_id });
+                                dh.BatchInsert("update  sninfo set si_mac = :mac,si_bt =:bt,si_indate = sysdate where si_id = :osiId", new String[] { "mac", "bt", "osiId" }, new string[] { checkmac }, new string[] { ms_bt }, new string[] { si_id });
                             }
                             else {
-                                dh.BatchInsert("insert into sninfo (si_id,si_sn,si_mac,si_bt,si_indate) values (SnInfo_seq.nextval,:si_sn,:si_mac,:si_bt,sysdate)", new String[] { "si_sn", "si_mac", "si_bt" }, new string[] { sn_code }, new string[] { sncode.Text }, new string[] { ms_bt });
+                                dh.BatchInsert("insert into sninfo (si_id,si_sn,si_mac,si_bt,si_indate) values (SnInfo_seq.nextval,:si_sn,:si_mac,:si_bt,sysdate)", new String[] { "si_sn", "si_mac", "si_bt" }, new string[] { sn_code }, new string[] { checkmac }, new string[] { ms_bt });
                             }
-                            dh.BatchInsert("update  makeserial set ms_mac = :mac,ms_bt =:bt where ms_id = :oMsId", new String[] { "mac", "bt", "oMsId" }, new string[] { sncode.Text }, new string[] { ms_bt }, new string[] { oMsID.ToString() });
+                            dh.BatchInsert("update  makeserial set ms_mac = :mac,ms_bt =:bt where ms_id = :oMsId", new String[] { "mac", "bt", "oMsId" }, new string[] { checkmac }, new string[] { ms_bt }, new string[] { oMsID.ToString() });
                             OperateResult.AppendText(">>BT/MAC采集完成,执行更新\n", Color.Green);
                             LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "BT/MAC采集", "采集成功", sn_code, "");
                             sql.Clear();

UAS-MES/FunctionCode/Make/Make_LabelCheck.Designer.cs

@@ -28,6 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_LabelCheck));
             this.label1 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
@@ -46,6 +47,7 @@
             this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.pr_detail = new System.Windows.Forms.Label();
+            this.cancel = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.SuspendLayout();
             // 
             // label1
@@ -138,7 +140,7 @@
             // 
             this.label10.AutoSize = true;
             this.label10.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label10.Location = new System.Drawing.Point(88, 581);
+            this.label10.Location = new System.Drawing.Point(50, 592);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(40, 27);
             this.label10.TabIndex = 12;
@@ -149,7 +151,7 @@
             this.sncode.AllPower = null;
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(148, 581);
+            this.sncode.Location = new System.Drawing.Point(110, 592);
             this.sncode.Name = "sncode";
             this.sncode.Power = null;
             this.sncode.Size = new System.Drawing.Size(252, 28);
@@ -214,11 +216,30 @@
             this.pr_detail.Size = new System.Drawing.Size(0, 31);
             this.pr_detail.TabIndex = 16;
             // 
+            // cancel
+            // 
+            this.cancel.AllPower = null;
+            this.cancel.BackColor = System.Drawing.Color.Transparent;
+            this.cancel.DownImage = ((System.Drawing.Image)(resources.GetObject("cancel.DownImage")));
+            this.cancel.Image = null;
+            this.cancel.IsShowBorder = true;
+            this.cancel.Location = new System.Drawing.Point(435, 592);
+            this.cancel.MoveImage = ((System.Drawing.Image)(resources.GetObject("cancel.MoveImage")));
+            this.cancel.Name = "cancel";
+            this.cancel.NormalImage = ((System.Drawing.Image)(resources.GetObject("cancel.NormalImage")));
+            this.cancel.Power = null;
+            this.cancel.Size = new System.Drawing.Size(88, 28);
+            this.cancel.TabIndex = 17;
+            this.cancel.Text = "取消核对";
+            this.cancel.UseVisualStyleBackColor = false;
+            this.cancel.Click += new System.EventHandler(this.cancel_Click);
+            // 
             // Make_LabelCheck
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1329, 651);
+            this.ClientSize = new System.Drawing.Size(1329, 649);
+            this.Controls.Add(this.cancel);
             this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.showResult);
             this.Controls.Add(this.sncode);
@@ -264,5 +285,6 @@
         private System.Windows.Forms.ColumnHeader columnHeader3;
         private System.Windows.Forms.ColumnHeader columnHeader4;
         private System.Windows.Forms.Label pr_detail;
+        private CustomControl.ButtonUtil.NormalButton cancel;
     }
 }

UAS-MES/FunctionCode/Make/Make_LabelCheck.cs

@@ -182,15 +182,18 @@ namespace UAS_MES.Make
                     //说明比对不一致
                     else
                     {
-                        //清空核对变量的值
-                        needCheckedInfo = "";
                         //信息核对失败
                         //>> 请输入SN
                         OperateResult.AppendText(">>上料信息或序列号采集信息"+needCheckedInfo+"核对失败,不一致\n", Color.Red, sncode);
-                        OperateResult.AppendText(">>请采集SN\n", Color.Black);
-                        //imei1校对结束，下次输入的是SN
-                        isCheckItem = false;
-                        checkIndex = 0;
+                        //为采集信息
+                        if (checkItemInfo.Rows[checkIndex]["TYPE"].ToString() == "MS")
+                        {
+                            OperateResult.AppendText(">>请采集" + checkItemInfo.Rows[checkIndex]["checkitem"].ToString() + "\n", Color.Black, sncode);
+                        }
+                        else//为上料信息
+                        {
+                            OperateResult.AppendText(">>请采集物料" + checkItemInfo.Rows[checkIndex]["checkitem"].ToString() + "条码\n", Color.Black, sncode);
+                        }
                     }
                 }
             }
@@ -237,5 +240,13 @@ namespace UAS_MES.Make
                 OperateResult.AppendText(">>请采集物料"+ checkItemInfo.Rows[index]["checkitem"].ToString() + "条码\n", Color.Black, sncode);
             }
         }
+
+        private void cancel_Click(object sender, EventArgs e)
+        {
+            OperateResult.AppendText(">>请采集SN\n", Color.Black);
+            checkIndex = 0;
+            isCheckItem = false;
+            SN = "";
+        }
     }
 }

UAS-MES/FunctionCode/Make/Make_LabelCheck.resx

@@ -117,4 +117,43 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="cancel.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="cancel.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="cancel.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
 </root>

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -62,6 +62,8 @@ namespace UAS_MES.Make
         StringBuilder insertSninfoValues;//存插入sninfo的值
 
         StringBuilder toSi;//存更新sninfo的值
+
+        string macOrBt = "";//存储去掉":"或者"-"的mac和bt
         public Make_SeqProgramTransform()
         {
             InitializeComponent();
@@ -357,18 +359,23 @@ namespace UAS_MES.Make
         private bool checkRules(int step)
         {
             type = ListA.Rows[step - 2]["psr_type"].ToString() == "WIFI" ? "MAC" : ListA.Rows[step - 2]["psr_type"].ToString();
+            //将type中的mac和bt中的"-"和":"号去掉
+            if (type == "MAC" || type == "BT")
+            {
+                macOrBt = code.Text.Replace(":", "").Replace("-", "");
+            }
             //如果前缀和长度都满足的话
             if ((ListA.Rows[step - 2]["psr_length"].ToString() == "" ? true : code.Text.Length != int.Parse(ListA.Rows[step - 2]["psr_length"].ToString())))
             {
                 OperateResult.AppendText(">>" + ListA.Rows[step - 2]["psr_type"] + "长度校验不通过,请重新输入\n", Color.Red);
-                OperateResult.AppendText(">>请重新输入" + ListA.Rows[step - 2]["psr_type"] + "\n", Color.Black,code);
+                OperateResult.AppendText(">>请重新输入" + ListA.Rows[step - 2]["psr_type"] + "\n", Color.Black, code);
                 return false;
             }
             //以|符号分割前缀
             string[] preFixs = ListA.Rows[step - 2]["psr_prefix"].ToString().Split('|');
             //只要满足其中一个前缀条件即可
             bool isfit = false;
-            for (int i=0;i<preFixs.Length;i++) {
+            for (int i = 0; i < preFixs.Length; i++) {
                 if (preFixs[i] == "" ? true : code.Text.StartsWith(preFixs[i]))
                 {
                     //满足其中一条即可
@@ -379,7 +386,7 @@ namespace UAS_MES.Make
             if (!isfit)
             {
                 OperateResult.AppendText(">>" + ListA.Rows[step - 2]["psr_type"] + "前缀校验不通过,请重新输入\n", Color.Red);
-                OperateResult.AppendText(">>请重新输入" + ListA.Rows[step - 2]["psr_type"] + "\n", Color.Black,code);
+                OperateResult.AppendText(">>请重新输入" + ListA.Rows[step - 2]["psr_type"] + "\n", Color.Black, code);
                 return false;
             }
             switch (type)
@@ -387,20 +394,26 @@ namespace UAS_MES.Make
                 case "IMEI1":
                 case "IMEI2":
                 case "IMEI3":
-                    if (!ChangeResult.Checked&&checkExist("ms_status in (1,2,3) and nvl(ms_nextmacode,' ')=' ' and  (ms_imei1='" + code.Text + "' or ms_imei2 = '" + code.Text + "' or ms_imei3 = '" + code.Text + "')")
-                        || ChangeResult.Checked && checkExist("ms_status in (1,2,3) and nvl(ms_nextmacode,' ')=' ' and  (ms_imei1='" + code.Text + "' or ms_imei2 = '" + code.Text + "' or ms_imei3 = '" + code.Text + "') and ms_id <> '"+oMsid+"'"))
+                    if (!ChangeResult.Checked && checkExist("ms_status in (1,2,3) and nvl(ms_nextmacode,' ')=' ' and  (ms_imei1='" + code.Text + "' or ms_imei2 = '" + code.Text + "' or ms_imei3 = '" + code.Text + "')")
+                        || ChangeResult.Checked && checkExist("ms_status in (1,2,3) and nvl(ms_nextmacode,' ')=' ' and  (ms_imei1='" + code.Text + "' or ms_imei2 = '" + code.Text + "' or ms_imei3 = '" + code.Text + "') and ms_id <> '" + oMsid + "'"))
                     {
                         OperateResult.AppendText(">>" + type + ":" + code.Text + "错误，不允许重复\n", Color.Red);
-                        OperateResult.AppendText(">>请输入" + type + "\n", Color.Black,code);
+                        OperateResult.AppendText(">>请输入" + type + "\n", Color.Black, code);
                         return false;
                     }
                     else
-                    {
+                    {   //校验sninfo中是否已经存在这个
+                        if (dh.CheckExist("sninfo", "si_imei1='" + code.Text + "' or si_imei2 = '" + code.Text + "' or si_imei3 = '" + code.Text + "'"))
+                        {
+                            OperateResult.AppendText(">>" + type + ":" + code.Text + "错误，不允许重复\n", Color.Red);
+                            OperateResult.AppendText(">>请输入" + type + "\n", Color.Black, code);
+                            return false;
+                        }
                         //判断IMEI1,IMEI2,IMEI3中是否已经有这个号了
                         if (imei.ToString().Contains(code.Text))
                         {
                             OperateResult.AppendText(">>" + type + ":" + code.Text + "已录，请重新输入\n", Color.Red);
-                            OperateResult.AppendText(">>请输入" + type + "\n", Color.Black,code);
+                            OperateResult.AppendText(">>请输入" + type + "\n", Color.Black, code);
                             return false;
                         }
                     }
@@ -408,19 +421,52 @@ namespace UAS_MES.Make
                     imei.Append("'" + code.Text + "',");
                     s1.Append("MS_" + type + " = '" + code.Text + "',");
                     insertSninfoFields.Append("si_" + type + ",");
-                    insertSninfoValues.Append("'"+code.Text+"',");
+                    insertSninfoValues.Append("'" + code.Text + "',");
                     toSi.Append("si_" + type + " = '" + code.Text + "',");
                     break;
                 case "BT":
                 case "MAC":
+                    if (!ChangeResult.Checked && checkExist("ms_status in (1,2,3) and nvl(ms_nextmacode,' ')=' ' and  MS_" + type + "='" + macOrBt + "'")
+                        || ChangeResult.Checked && checkExist("ms_status in (1,2,3) and nvl(ms_nextmacode,' ')=' ' and  MS_" + type + "='" + macOrBt + "' and ms_id <> '" + oMsid + "'"))
+                    {
+                        OperateResult.AppendText(">>" + ListA.Rows[step - 2]["psr_type"].ToString() + ":" + code.Text + "错误，不允许重复\n", Color.Red);
+                        OperateResult.AppendText(">>请输入" + ListA.Rows[step - 2]["psr_type"].ToString() + "\n", Color.Black, code);
+                        return false;
+                    }
+                    else
+                    {
+                        //校验在sninfo表中是否存在
+                        if (dh.CheckExist("sninfo", "si_" + type + "='" + macOrBt + "'"))
+                        {
+                            OperateResult.AppendText(">>" + ListA.Rows[step - 2]["psr_type"].ToString() + ":" + code.Text + "错误，不允许重复\n", Color.Red);
+                            OperateResult.AppendText(">>请输入" + ListA.Rows[step - 2]["psr_type"].ToString() + "\n", Color.Black, code);
+                            return false;
+                        }
+                    }
+                    //通过校验,将包含IMEI的值拼接
+                    s1.Append("MS_" + type + " = '" + macOrBt + "',");
+                    insertSninfoFields.Append("si_" + type + ",");
+                    insertSninfoValues.Append("'" + macOrBt + "',");
+                    toSi.Append("si_" + type + " = '" + macOrBt + "',");
+                    break;
                 case "NETCODE":
-                    if (!ChangeResult.Checked&&checkExist("ms_status in (1,2,3) and nvl(ms_nextmacode,' ')=' ' and  MS_" + type + "='" + code.Text + "'")
-                        || ChangeResult.Checked && checkExist("ms_status in (1,2,3) and nvl(ms_nextmacode,' ')=' ' and  MS_" + type + "='" + code.Text + "' and ms_id <> '"+oMsid+"'"))
+                    if (!ChangeResult.Checked && checkExist("ms_status in (1,2,3) and nvl(ms_nextmacode,' ')=' ' and  MS_" + type + "='" + code.Text + "'")
+                        || ChangeResult.Checked && checkExist("ms_status in (1,2,3) and nvl(ms_nextmacode,' ')=' ' and  MS_" + type + "='" + code.Text + "' and ms_id <> '" + oMsid + "'"))
                     {
                         OperateResult.AppendText(">>" + ListA.Rows[step - 2]["psr_type"].ToString() + ":" + code.Text + "错误，不允许重复\n", Color.Red);
-                        OperateResult.AppendText(">>请输入" + ListA.Rows[step - 2]["psr_type"].ToString() + "\n", Color.Black,code);
+                        OperateResult.AppendText(">>请输入" + ListA.Rows[step - 2]["psr_type"].ToString() + "\n", Color.Black, code);
                         return false;
                     }
+                    else
+                    {
+                        //校验在sninfo表中是否存在
+                        if (dh.CheckExist("sninfo", "si_" + type + "='" + code.Text + "'"))
+                        {
+                            OperateResult.AppendText(">>" + ListA.Rows[step - 2]["psr_type"].ToString() + ":" + code.Text + "错误，不允许重复\n", Color.Red);
+                            OperateResult.AppendText(">>请输入" + ListA.Rows[step - 2]["psr_type"].ToString() + "\n", Color.Black, code);
+                            return false;
+                        }
+                    }
                     //通过校验,将包含IMEI的值拼接
                     s1.Append("MS_" + type + " = '" + code.Text + "',");
                     insertSninfoFields.Append("si_" + type + ",");
@@ -429,7 +475,14 @@ namespace UAS_MES.Make
                     break;
             }
             //满足规则，则采集
-            hs.Add(ListA.Rows[step - 2]["psr_type"].ToString(), code.Text);
+            if (type == "MAC" || type == "BT")
+            {
+                hs.Add(ListA.Rows[step - 2]["psr_type"].ToString(), macOrBt);
+            }
+            else
+            {
+                hs.Add(ListA.Rows[step - 2]["psr_type"].ToString(), code.Text);
+            }
             //说明已经是最后一个校验规则
             if (step == ListA.Rows.Count + 1)
             {
@@ -441,8 +494,8 @@ namespace UAS_MES.Make
                     //遍历判断已采集的信息是否已存在
                     foreach (DictionaryEntry de in hs)
                     {
-                        if (!ChangeResult.Checked &&dh.CheckExist("makeserial", "ms_status in (1,2,3) and nvl(ms_nextmacode,' ')=' ' and  MS_" + (de.Key.ToString() == "WIFI" ? "MAC" : de.Key) + "='" + de.Value + "'")
-                            ||(ChangeResult.Checked&& dh.CheckExist("makeserial", "ms_status in (1,2,3) and nvl(ms_nextmacode,' ')=' ' and  MS_" + (de.Key.ToString() == "WIFI" ? "MAC" : de.Key) + "='" + de.Value + "' and ms_id <> '"+oMsid+"'")))
+                        if (!ChangeResult.Checked && dh.CheckExist("makeserial", "ms_status in (1,2,3) and nvl(ms_nextmacode,' ')=' ' and  MS_" + (de.Key.ToString() == "WIFI" ? "MAC" : de.Key) + "='" + de.Value + "'")
+                            || (ChangeResult.Checked && dh.CheckExist("makeserial", "ms_status in (1,2,3) and nvl(ms_nextmacode,' ')=' ' and  MS_" + (de.Key.ToString() == "WIFI" ? "MAC" : de.Key) + "='" + de.Value + "' and ms_id <> '" + oMsid + "'")))
                         {
                             flag = false;
                             OperateResult.AppendText(">>" + de.Key + "已被使用,请重新输入TSN,重新转换\n", Color.Red);
@@ -450,6 +503,18 @@ namespace UAS_MES.Make
                             clearInfo();
                             break;
                         }
+                        else
+                        {
+                            //校验sninfo中是否存在
+                            if (dh.CheckExist("sninfo", "si_" + (de.Key.ToString() == "WIFI" ? "MAC" : de.Key) + "='" + de.Value + "'"))
+                            {
+                                flag = false;
+                                OperateResult.AppendText(">>" + de.Key + "已被使用,请重新输入TSN,重新转换\n", Color.Red);
+                                //清空信息
+                                clearInfo();
+                                break;
+                            }
+                        }
                     }
 
                     //根据flag判断关联采集信息二次校验结果

UAS-MES/FunctionCode/Make/Make_UpdateCollectCode.cs

@@ -149,7 +149,7 @@ namespace UAS_MES.Make
                     {
                         case "MAC/WIFI":
                         case "BT":
-                            if (dh.CheckExist("makeserial", "ms_" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + " ='" + inputValue.Text + "' and ms_id='" + ms_id + "'"))
+                            if (dh.CheckExist("makeserial", "ms_" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + " ='" + inputValue.Text.Replace(":", "").Replace("-", "") + "' and ms_id='" + ms_id + "'"))
                             {
                                 //如果一样提示用户“MAC 不允许与原来的值一致”，“请采集MAC”；
                                 OperateResult.AppendText("<<" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + "不允许与原来的值一致\n", Color.Red);
@@ -175,18 +175,18 @@ namespace UAS_MES.Make
                                     return;
                                 }
                                 //验证长度前缀通过,验证数据库
-                                if (dh.CheckExist("makeserial", "ms_status in (1,2,3) and nvl(ms_nextmacode,' ')=' ' and  ms_" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + " ='" + inputValue.Text + "'"))
+                                if (dh.CheckExist("makeserial", "ms_status in (1,2,3) and nvl(ms_nextmacode,' ')=' ' and  ms_" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + " ='" + inputValue.Text.Replace(":", "").Replace("-", "") + "'"))
                                 {
                                     OperateResult.AppendText("<<" + ((CheckBox)list[step - 1]).Text + ":" + inputValue.Text + "错误，已被使用\n", Color.Red, inputValue);
                                     return;
                                 }
                                 //通过校验
-                                sb.Append("ms_" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + " = '" + inputValue.Text + "',");
-                                toSi.Append("si_" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + " = '" + inputValue.Text + "',");
+                                sb.Append("ms_" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + " = '" + inputValue.Text.Replace(":", "").Replace("-", "") + "',");
+                                toSi.Append("si_" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + " = '" + inputValue.Text.Replace(":", "").Replace("-", "") + "',");
                                 insertSninfoFields.Append("si_" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + ",");
-                                insertSninfoValues.Append("'"+inputValue.Text+"',");
+                                insertSninfoValues.Append("'"+inputValue.Text.Replace(":", "").Replace("-", "") + "',");
                                 oldData.Append("ms_" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + ":" + dt.Rows[0]["ms_" + ((CheckBox)list[step - 1]).Text.Split('/')[0]].ToString() + ",");
-                                newData.Append("ms_" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + ":" + inputValue.Text + ",");
+                                newData.Append("ms_" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + ":" + inputValue.Text.Replace(":", "").Replace("-", "") + ",");
                             }
                             break;
                         case "网标":

UAS-MES/FunctionCode/Warehouse/Warehouse_FinishedProductOut.Designer.cs

@@ -157,6 +157,7 @@
             // palletBtn
             // 
             this.palletBtn.AutoSize = true;
+            this.palletBtn.Checked = true;
             this.palletBtn.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.palletBtn.Location = new System.Drawing.Point(14, 427);
             this.palletBtn.Margin = new System.Windows.Forms.Padding(2);
@@ -177,7 +178,6 @@
             this.serBtn.Name = "serBtn";
             this.serBtn.Size = new System.Drawing.Size(108, 25);
             this.serBtn.TabIndex = 220;
-            this.serBtn.TabStop = true;
             this.serBtn.Text = "单台序列号";
             this.serBtn.UseVisualStyleBackColor = true;
             this.serBtn.Click += new System.EventHandler(this.serBtn_Click);
@@ -189,10 +189,9 @@
             this.bigboxBtn.Location = new System.Drawing.Point(97, 427);
             this.bigboxBtn.Margin = new System.Windows.Forms.Padding(2);
             this.bigboxBtn.Name = "bigboxBtn";
-            this.bigboxBtn.Size = new System.Drawing.Size(76, 25);
+            this.bigboxBtn.Size = new System.Drawing.Size(60, 25);
             this.bigboxBtn.TabIndex = 221;
-            this.bigboxBtn.TabStop = true;
-            this.bigboxBtn.Text = "大箱号";
+            this.bigboxBtn.Text = "箱号";
             this.bigboxBtn.UseVisualStyleBackColor = true;
             this.bigboxBtn.Click += new System.EventHandler(this.serBtn_Click);
             // 

UAS-MES/FunctionCode/Warehouse/Warehouse_FinishedProductOut.cs

@@ -56,6 +56,9 @@ namespace UAS_MES.Warehouse
 
             asc.controllInitializeSize(this);
             needMakeIn = dh.GetConfig("needMakeIn", "MESSetting").ToString();
+            input.Focus();
+            OperateResult.AppendText("请输入栈板进行采集\n", Color.Black, input);
+
         }
 
         private void Pi_inoutno_DbChange(object sender, EventArgs e)

UAS-MES/FunctionCode/Warehouse/Warehouse_ProductMakeIn.Designer.cs

@@ -29,101 +29,27 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            this.InOutDetailDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
-            this.pim_outboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pim_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pim_mac = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pim_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.getqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.label8 = new System.Windows.Forms.Label();
-            this.cancel = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
             this.input = new System.Windows.Forms.TextBox();
             this.bigboxBtn = new System.Windows.Forms.RadioButton();
             this.serBtn = new System.Windows.Forms.RadioButton();
             this.palletBtn = new System.Windows.Forms.RadioButton();
             this.label1 = new System.Windows.Forms.Label();
-            this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
-            ((System.ComponentModel.ISupportInitialize)(this.InOutDetailDGV)).BeginInit();
+            this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
+            this.cancel = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
+            this.getqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.InOutDetailDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
+            this.pim_outboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pim_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pim_mac = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pim_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.InOutDetailDGV)).BeginInit();
             this.SuspendLayout();
             // 
-            // InOutDetailDGV
-            // 
-            this.InOutDetailDGV.AllowUserToAddRows = false;
-            this.InOutDetailDGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.InOutDetailDGV.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.pim_outboxcode,
-            this.pim_id,
-            this.pim_mac,
-            this.pim_prodcode,
-            this.pr_detail,
-            this.pr_spec});
-            this.InOutDetailDGV.EnableContentClick = true;
-            this.InOutDetailDGV.Location = new System.Drawing.Point(11, 42);
-            this.InOutDetailDGV.Margin = new System.Windows.Forms.Padding(2);
-            this.InOutDetailDGV.Name = "InOutDetailDGV";
-            this.InOutDetailDGV.RowTemplate.Height = 27;
-            this.InOutDetailDGV.Size = new System.Drawing.Size(665, 329);
-            this.InOutDetailDGV.TabIndex = 219;
-            // 
-            // pim_outboxcode
-            // 
-            this.pim_outboxcode.DataPropertyName = "pim_outboxcode";
-            this.pim_outboxcode.HeaderText = "栈板/箱号";
-            this.pim_outboxcode.MinimumWidth = 120;
-            this.pim_outboxcode.Name = "pim_outboxcode";
-            this.pim_outboxcode.ReadOnly = true;
-            this.pim_outboxcode.Width = 120;
-            // 
-            // pim_id
-            // 
-            this.pim_id.DataPropertyName = "pim_id";
-            this.pim_id.HeaderText = "pim_id";
-            this.pim_id.Name = "pim_id";
-            this.pim_id.Visible = false;
-            // 
-            // pim_mac
-            // 
-            this.pim_mac.DataPropertyName = "pim_mac";
-            this.pim_mac.HeaderText = "SN号";
-            this.pim_mac.Name = "pim_mac";
-            this.pim_mac.ReadOnly = true;
-            // 
-            // pim_prodcode
-            // 
-            this.pim_prodcode.DataPropertyName = "pim_prodcode";
-            this.pim_prodcode.HeaderText = "产品代码";
-            this.pim_prodcode.Name = "pim_prodcode";
-            this.pim_prodcode.ReadOnly = true;
-            // 
-            // pr_detail
-            // 
-            this.pr_detail.DataPropertyName = "pr_detail";
-            this.pr_detail.HeaderText = "名称";
-            this.pr_detail.Name = "pr_detail";
-            this.pr_detail.ReadOnly = true;
-            // 
-            // pr_spec
-            // 
-            this.pr_spec.DataPropertyName = "pr_spec";
-            this.pr_spec.HeaderText = "规格";
-            this.pr_spec.Name = "pr_spec";
-            this.pr_spec.ReadOnly = true;
-            // 
-            // getqty
-            // 
-            this.getqty.AutoSize = true;
-            this.getqty.CutLength = null;
-            this.getqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.getqty.Location = new System.Drawing.Point(101, 12);
-            this.getqty.MaximumSize = new System.Drawing.Size(200, 0);
-            this.getqty.Name = "getqty";
-            this.getqty.Size = new System.Drawing.Size(0, 21);
-            this.getqty.TabIndex = 228;
-            // 
             // label8
             // 
             this.label8.AutoSize = true;
@@ -134,19 +60,6 @@
             this.label8.TabIndex = 227;
             this.label8.Text = "已采集数";
             // 
-            // cancel
-            // 
-            this.cancel.AutoSize = true;
-            this.cancel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cancel.Location = new System.Drawing.Point(234, 447);
-            this.cancel.Margin = new System.Windows.Forms.Padding(2);
-            this.cancel.Name = "cancel";
-            this.cancel.Power = null;
-            this.cancel.Size = new System.Drawing.Size(61, 25);
-            this.cancel.TabIndex = 233;
-            this.cancel.Text = "取消";
-            this.cancel.UseVisualStyleBackColor = true;
-            // 
             // input
             // 
             this.input.Location = new System.Drawing.Point(87, 447);
@@ -163,10 +76,9 @@
             this.bigboxBtn.Location = new System.Drawing.Point(111, 397);
             this.bigboxBtn.Margin = new System.Windows.Forms.Padding(2);
             this.bigboxBtn.Name = "bigboxBtn";
-            this.bigboxBtn.Size = new System.Drawing.Size(76, 25);
+            this.bigboxBtn.Size = new System.Drawing.Size(60, 25);
             this.bigboxBtn.TabIndex = 231;
-            this.bigboxBtn.TabStop = true;
-            this.bigboxBtn.Text = "大箱号";
+            this.bigboxBtn.Text = "箱号";
             this.bigboxBtn.UseVisualStyleBackColor = true;
             this.bigboxBtn.Click += new System.EventHandler(this.serBtn_Click);
             // 
@@ -179,7 +91,6 @@
             this.serBtn.Name = "serBtn";
             this.serBtn.Size = new System.Drawing.Size(108, 25);
             this.serBtn.TabIndex = 230;
-            this.serBtn.TabStop = true;
             this.serBtn.Text = "单台序列号";
             this.serBtn.UseVisualStyleBackColor = true;
             this.serBtn.Click += new System.EventHandler(this.serBtn_Click);
@@ -187,6 +98,7 @@
             // palletBtn
             // 
             this.palletBtn.AutoSize = true;
+            this.palletBtn.Checked = true;
             this.palletBtn.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.palletBtn.Location = new System.Drawing.Point(28, 397);
             this.palletBtn.Margin = new System.Windows.Forms.Padding(2);
@@ -217,6 +129,93 @@
             this.OperateResult.TabIndex = 235;
             this.OperateResult.Text = "";
             // 
+            // cancel
+            // 
+            this.cancel.AutoSize = true;
+            this.cancel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cancel.Location = new System.Drawing.Point(234, 447);
+            this.cancel.Margin = new System.Windows.Forms.Padding(2);
+            this.cancel.Name = "cancel";
+            this.cancel.Power = null;
+            this.cancel.Size = new System.Drawing.Size(61, 25);
+            this.cancel.TabIndex = 233;
+            this.cancel.Text = "取消";
+            this.cancel.UseVisualStyleBackColor = true;
+            // 
+            // getqty
+            // 
+            this.getqty.AutoSize = true;
+            this.getqty.CutLength = null;
+            this.getqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.getqty.Location = new System.Drawing.Point(101, 12);
+            this.getqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.getqty.Name = "getqty";
+            this.getqty.Size = new System.Drawing.Size(0, 21);
+            this.getqty.TabIndex = 228;
+            // 
+            // InOutDetailDGV
+            // 
+            this.InOutDetailDGV.AllowUserToAddRows = false;
+            this.InOutDetailDGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.InOutDetailDGV.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.pim_outboxcode,
+            this.pim_id,
+            this.pim_mac,
+            this.pim_prodcode,
+            this.pr_detail,
+            this.pr_spec});
+            this.InOutDetailDGV.EnableContentClick = true;
+            this.InOutDetailDGV.Location = new System.Drawing.Point(11, 42);
+            this.InOutDetailDGV.Margin = new System.Windows.Forms.Padding(2);
+            this.InOutDetailDGV.Name = "InOutDetailDGV";
+            this.InOutDetailDGV.RowTemplate.Height = 27;
+            this.InOutDetailDGV.Size = new System.Drawing.Size(665, 329);
+            this.InOutDetailDGV.TabIndex = 219;
+            // 
+            // pim_outboxcode
+            // 
+            this.pim_outboxcode.DataPropertyName = "pim_outboxcode";
+            this.pim_outboxcode.HeaderText = "栈板/箱号";
+            this.pim_outboxcode.MinimumWidth = 120;
+            this.pim_outboxcode.Name = "pim_outboxcode";
+            this.pim_outboxcode.ReadOnly = true;
+            this.pim_outboxcode.Width = 120;
+            // 
+            // pim_id
+            // 
+            this.pim_id.DataPropertyName = "pim_id";
+            this.pim_id.HeaderText = "pim_id";
+            this.pim_id.Name = "pim_id";
+            this.pim_id.Visible = false;
+            // 
+            // pim_mac
+            // 
+            this.pim_mac.DataPropertyName = "pim_mac";
+            this.pim_mac.HeaderText = "SN号";
+            this.pim_mac.Name = "pim_mac";
+            this.pim_mac.ReadOnly = true;
+            // 
+            // pim_prodcode
+            // 
+            this.pim_prodcode.DataPropertyName = "pim_prodcode";
+            this.pim_prodcode.HeaderText = "产品代码";
+            this.pim_prodcode.Name = "pim_prodcode";
+            this.pim_prodcode.ReadOnly = true;
+            // 
+            // pr_detail
+            // 
+            this.pr_detail.DataPropertyName = "pr_detail";
+            this.pr_detail.HeaderText = "名称";
+            this.pr_detail.Name = "pr_detail";
+            this.pr_detail.ReadOnly = true;
+            // 
+            // pr_spec
+            // 
+            this.pr_spec.DataPropertyName = "pr_spec";
+            this.pr_spec.HeaderText = "规格";
+            this.pr_spec.Name = "pr_spec";
+            this.pr_spec.ReadOnly = true;
+            // 
             // Warehouse_ProductMakeIn
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -238,8 +237,8 @@
             this.Text = "完工入库";
             this.Load += new System.EventHandler(this.Warehouse_ProductMakeIn_Load);
             this.SizeChanged += new System.EventHandler(this.Warehouse_ProductMakeIn_SizeChanged);
-            ((System.ComponentModel.ISupportInitialize)(this.InOutDetailDGV)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.InOutDetailDGV)).EndInit();
             this.ResumeLayout(true);
             this.PerformLayout();
 

UAS-MES/FunctionCode/Warehouse/Warehouse_ProductMakeIn.cs

@@ -450,7 +450,9 @@ namespace UAS_MES.Warehouse
             sql.Clear();
             sql.Append("select pim_id,pim_outboxcode,pim_mac,pim_prodcode,pr_detail,pr_spec from prodiomac ");
             sql.Append("left join product on pr_code=pim_prodcode where pr_detail is null");
-            bindingSource1.DataSource = dh.ExecuteSql(sql.GetString(), "select"); 
+            bindingSource1.DataSource = dh.ExecuteSql(sql.GetString(), "select");
+            input.Focus();
+            OperateResult.AppendText("请输入栈板进行采集\n", Color.Black, input);
         }
 
         private void Warehouse_ProductMakeIn_SizeChanged(object sender, EventArgs e)

UAS-MES/FunctionCode/Warehouse/Warehouse_ProductMakeIn.resx

@@ -117,23 +117,8 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="pim_outboxcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pim_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pim_mac.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pim_prodcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pr_detail.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pr_spec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
+  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
   </metadata>
   <metadata name="pim_outboxcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
@@ -153,7 +138,4 @@
   <metadata name="pr_spec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>