Merge remote-tracking branch 'refs/remotes/origin/master'

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -97,7 +97,7 @@ namespace UAS_MES.Make
             {
                 //记录该数据保证在修改不被允许的前提下能偶回复之前的值
                 StandardQTY = decimal.Parse(dt.Rows[0]["pr_outboxinnerqty"].ToString());
-                ms_salecode.Text = dt.Rows[0]["pa_salecode"].ToString();
+                //ms_salecode.Text = dt.Rows[0]["pa_salecode"].ToString();
                 BaseUtil.SetFormValue(this.Controls, dt);
                 if (pa_standardqty.Text != "0")
                 {
@@ -187,6 +187,7 @@ namespace UAS_MES.Make
                         string ms_prodcode = "";
                         string ms_iostatus = "";
                         string ms_outno = "";
+                        string ms_salecode_text = "";
                         if (dt.Rows.Count > 0)
                         {
                             StandardQTY = decimal.Parse(dt.Rows[0]["pr_outboxinnerqty"].ToString());
@@ -194,6 +195,12 @@ namespace UAS_MES.Make
                             ms_prodcode = dt.Rows[0]["ms_prodcode"].ToString();
                             ms_iostatus = dt.Rows[0]["ms_iostatus"].ToString();
                             ms_outno = dt.Rows[0]["ms_outno"].ToString();
+                            ms_salecode_text = dt.Rows[0]["ms_salecode"].ToString();
+                            if (locksalecode.Checked&&ms_salecode.Text != "" && ms_salecode.Text != ms_salecode_text)
+                            {
+                                OperateResult.AppendText(">>序列号" + sn_code.Text + "所属订单号"+ ms_salecode_text + "与界面订单号"+ ms_salecode.Text + "不同,无法采集\n", Color.Red, sn_code);
+                                return;
+                            }
                             BaseUtil.SetFormValue(this.Controls, dt);
                         }
                         if (dt.Rows[0]["ms_outno"].ToString() != "")
@@ -360,8 +367,15 @@ namespace UAS_MES.Make
                                         pa_standardqty.Text = "";
                                         if (AutoPrint.Checked)
                                             Print_Click(new object(), new EventArgs());
-                                        pa_outboxcode.SelectAll();
-                                        pa_outboxcode.Focus();
+                                        if (!CollecRemark.Checked)
+                                        {
+                                            pa_outboxcode.SelectAll();
+                                            pa_outboxcode.Focus();
+                                        }
+                                        else {
+                                            pa_remark.SelectAll();
+                                            pa_remark.Focus();
+                                        }
                                         if (PR_CHECKCARTONW != "0")
                                         {
                                             OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "满箱处于称重工序，请在卡通箱称重界面进行称重打印\n", Color.Black, sn_code);
@@ -440,8 +454,16 @@ namespace UAS_MES.Make
                     pa_status.Text = "1";
                     pa_standardqty.Text = "";
                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "装箱采集", "封箱成功", pa_outboxcode.Text, "");
-                    pa_outboxcode.SelectAll();
-                    pa_outboxcode.Focus();
+                    if (!CollecRemark.Checked)
+                    {
+                        pa_outboxcode.SelectAll();
+                        pa_outboxcode.Focus();
+                    }
+                    else
+                    {
+                        pa_remark.SelectAll();
+                        pa_remark.Focus();
+                    }
                     if (PR_CHECKCARTONW != "0")
                     {
                         OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "处于称重工序，请在卡通箱称重界面进行操作\n", Color.Black, sn_code);
@@ -761,6 +783,7 @@ namespace UAS_MES.Make
                     dh.UpdateByCondition("package", "pa_remark='" + pa_remark.Text + "'", "pa_outboxcode='" + pa_outboxcode.Text + "'");
                     OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "关联信息" + pa_remark.Text + "采集成功\n", Color.Green);
                     pa_remark.Text = "";
+                    pa_outboxcode.SelectAll();
                     pa_outboxcode.Focus();
                 }
                 else OperateResult.AppendText(">>请先采集箱内数据\n", Color.Red);

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -269,6 +269,7 @@ namespace UAS_MES.Make
                         string ms_prodcode = "";
                         string ms_iostatus = "";
                         string ms_outno = "";
+                        string ms_salecode_text = "";
                         if (dt.Rows.Count > 0)
                         {
                             StandardQTY = decimal.Parse(dt.Rows[0]["pr_outboxinnerqty"].ToString());
@@ -276,6 +277,12 @@ namespace UAS_MES.Make
                             ms_prodcode = dt.Rows[0]["ms_prodcode"].ToString();
                             ms_iostatus = dt.Rows[0]["ms_iostatus"].ToString();
                             ms_outno = dt.Rows[0]["ms_outno"].ToString();
+                            ms_salecode_text = dt.Rows[0]["ms_salecode"].ToString();
+                            if (locksalecode.Checked && ms_salecode.Text != "" && ms_salecode.Text != ms_salecode_text)
+                            {
+                                OperateResult.AppendText(">>序列号" + sn_code.Text + "所属订单号" + ms_salecode_text + "与界面订单号" + ms_salecode.Text + "不同,无法采集\n", Color.Red, sn_code);
+                                return;
+                            }
                             BaseUtil.SetFormValue(this.Controls, dt);
                         }
                         if (dt.Rows[0]["ms_outno"].ToString() != "")
@@ -473,8 +480,16 @@ namespace UAS_MES.Make
                                         OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "称量完成\n", Color.Green);
                                         if (AutoPrint.Checked)
                                             Print_Click(new object(), new EventArgs());
-                                        pa_outboxcode.SelectAll();
-                                        pa_outboxcode.Focus();
+                                        if (!CollecRemark.Checked)
+                                        {
+                                            pa_outboxcode.SelectAll();
+                                            pa_outboxcode.Focus();
+                                        }
+                                        else
+                                        {
+                                            pa_remark.SelectAll();
+                                            pa_remark.Focus();
+                                        }
                                     }
                                 }
                                 else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
@@ -575,8 +590,16 @@ namespace UAS_MES.Make
                         OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                     }
                     LoadCheckQTY();
-                    pa_outboxcode.SelectAll();
-                    pa_outboxcode.Focus();
+                    if (!CollecRemark.Checked)
+                    {
+                        pa_outboxcode.SelectAll();
+                        pa_outboxcode.Focus();
+                    }
+                    else
+                    {
+                        pa_remark.SelectAll();
+                        pa_remark.Focus();
+                    }
                 }
             }
             else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "错误或者已封箱\n", Color.Red);

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.resx

@@ -212,24 +212,6 @@
   <metadata name="pd_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="pd_barcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pa_outboxcode1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pa_prodcode1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pd_innerqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pa_indate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pd_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <data name="DeleteAll.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m

UAS-MES/FunctionCode/Query/Query_MakeInf.cs

@@ -46,8 +46,9 @@ namespace UAS_MES.Query
                 string ma_prodcode = dt.Rows[0]["ma_prodcode"].ToString();
                 string ma_craftcode = dt.Rows[0]["ma_craftcode"].ToString();
                 string ma_bomversion = dt.Rows[0]["ma_bomversion"].ToString();
+                string ma_salecode = dt.Rows[0]["ma_salecode"].ToString();
                 sql.Clear();
-                sql.Append("select pr_code,pr_outboxinnerqty,pr_sendchecktype,pr_detail,pr_agingtime");
+                sql.Append("select pr_code,pr_outboxinnerqty,case pr_sendchecktype when 'SaleCode' then '按合同送检' when 'LineCode' then '按线别送检' end pr_sendchecktype,pr_detail,pr_agingtime");
                 sql.Append(",(pr_colorboxminw||'-'||pr_colorboxmaxw||' '||pr_colorboxunit)pr_colorboxweight,");
                 sql.Append("(pr_cartonminw||'-'||pr_cartonmaxw||' '||pr_cartonunit)pr_cartonweight from product where pr_code='" + ma_prodcode + "'");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
@@ -63,6 +64,24 @@ namespace UAS_MES.Query
                     BaseUtil.FillDgvWithDataTable(Carft, dt);
                 }
                 sql.Clear();
+                sql.Append("select (msr_startno||'-'||msr_endno) beforesnrange,msr_qty beforesnqty from makesnrule where msr_makecode='" + MakeCode.Text + "' and msr_type='before'");
+                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                if (dt.Rows.Count > 0)
+                {
+                    BaseUtil.SetFormValue(this.Controls, dt);
+                }
+                sql.Clear();
+                sql.Append("select (msr_startno||'-'||msr_endno) aftersnrange,msr_qty aftersnqty from makesnrule where msr_makecode='" + MakeCode.Text + "' and msr_type='after'");
+                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                if (dt.Rows.Count > 0)
+                {
+                    BaseUtil.SetFormValue(this.Controls, dt);
+                }
+                //获取SN关联信息
+                MacNum.Text = dh.getFieldDataByCondition("Makeaddresslist", "count(1)", "mal_makecode='" + MakeCode.Text + "' and mal_mac is not null").ToString();
+                BTNum.Text = dh.getFieldDataByCondition("Makeaddresslist", "count(1)", "mal_makecode='" + MakeCode.Text + "' and mal_bt is not null").ToString();
+                IMEINum.Text = dh.getFieldDataByCondition("Makeimeilist", "count(1)", "mil_makecode='" + MakeCode.Text + "' and mil_imei1 is not null").ToString();
+                sql.Clear();
                 sql.Append("select * from StepProduct left join product on pr_code=sp_soncode where sp_bomversion='" + ma_bomversion + "' and sp_mothercode='" + ma_prodcode + "' and sp_craftcode='" + ma_craftcode + "'");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 if (dt.Rows.Count > 0)

UAS-MES/FunctionCode/Query/Query_MakeInf.resx

@@ -207,6 +207,9 @@
   <metadata name="CD_IFWEIGH.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="CD_FIRSTSTEP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="CD_IFOFFLINE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -216,9 +219,6 @@
   <metadata name="CD_STEPCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="CD_FIRSTSTEP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="CD_STEPNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -282,6 +282,9 @@
   <metadata name="CD_IFWEIGH.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="CD_FIRSTSTEP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="CD_IFOFFLINE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -291,9 +294,6 @@
   <metadata name="CD_STEPCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="CD_FIRSTSTEP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="CD_STEPNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>