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

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -185,6 +185,7 @@ namespace UAS_MES.Make
                         if (dt.Rows.Count > 0)
                         {
                             BaseUtil.SetFormValue(this.Controls, dt);
+                            LockMakeCode.Checked = true;
                             //提示用户“<<工单号：取ma_makecode”
                             OperateResult.AppendText("<<工单号：" + ma_code.Text + "\n", Color.Black);
                             //提示用户“<< 序列号：XXXX”
@@ -241,9 +242,8 @@ namespace UAS_MES.Make
                                     OperateResult.AppendText(">>序列号:" + sncode.Text + "打印成功\n", Color.Green);
                                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "彩盒打印", "彩盒打印成功", sncode.Text, "");
                                     //刷新打印数量和剩余数量
-                                    dt = (DataTable)dh.ExecuteSql("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
+                                    dt = (DataTable)dh.ExecuteSql("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty,mcd_okqty from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
                                     BaseUtil.SetFormValue(Controls, dt);
-                                    mcd_okqty.Text = int.Parse(mcd_okqty.Text) + 1 + "";
                                     sncode.Text = "";
                                     ms_id = null;
                                     sncode.Focus();

UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -111,6 +111,7 @@ namespace UAS_MES.Make
                             if (dt.Rows.Count > 0)
                             {
                                 BaseUtil.SetFormValue(this.Controls, dt);
+                                Lock.Checked = true;
                                 LoadCollectNum();
                                 if (PrintLabel.SelectedValue == null)
                                 {

UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -35,6 +35,7 @@ namespace UAS_MES.Make
         //是否通过串口获取数据
         bool GetData = true;
         string LastSncode;
+        bool WeightChange = false;
 
         string ErrorMessage;
 
@@ -121,6 +122,10 @@ namespace UAS_MES.Make
                                 }
                             }
                             //如果未打开串口设置为0
+                            if (pr_colorboxunit.Text == "kg" && !WeightChange)
+                            {
+                                weight.Text = (float.Parse(weight.Text) / 1000).ToString();
+                            }
                             double ActualWeight = double.Parse(weight.Text == "" ? "0" : weight.Text);
                             if ((ActualWeight >= MinWeight) && (ActualWeight <= MaxWeight))
                             {
@@ -173,7 +178,13 @@ namespace UAS_MES.Make
                             {
                                 weight.Text = Regex.Replace(serialPort1.ReadLine(), "\\D+", "");
                                 if (pr_colorboxunit.Text == "kg")
+                                {
                                     weight.Text = (float.Parse(weight.Text) / 1000).ToString();
+                                    WeightChange = true;
+                                }
+                                else {
+                                    WeightChange = false;
+                                }
                             }
                             catch (Exception)
                             {

UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -211,7 +211,7 @@ namespace UAS_MES.Make
 
         private void Make_FuselageLabelPrint_FormClosing(object sender, FormClosingEventArgs e)
         {
-            lbl.Quit();
+            BaseUtil.ClosePrint(lbl);
         }
 
         private void Make_FuselageLabelPrint_SizeChanged(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -26,7 +26,7 @@ namespace UAS_MES.Make
         string oMsID = "";
         string oOutBoxCode = "";
         decimal StandardQTY = 0;
-
+        string LastSncode;
         System.DateTime[] indate;
 
         public Make_PackageCollection()
@@ -247,6 +247,7 @@ namespace UAS_MES.Make
                                     if (LogicHandler.SetStepResult(ms_makecode.Text, User.UserSourceCode, sn_code.Text, "包装采集", "装箱成功", User.UserCode, out ErrorMessage))
                                     {
                                         LoadCheckQTY();
+                                        LastSncode = sn_code.Text;
                                         OperateResult.AppendText(">>序列号" + sn_code.Text + "采集成功！\n", Color.Green);
                                         LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "装箱采集", "采集成功", sn_code.Text, "");
                                         //满箱更新状态为1
@@ -341,7 +342,7 @@ namespace UAS_MES.Make
                 ob_nowcheckqty.ForeColor = Color.Black;
                 SendCheck.Enabled = false;
                 OperateResult.AppendText(">>批次" + ob_checkno.Text + "送检成功\n", Color.Green);
-                LogicHandler.InsertMakeProcess(sn_code.Text, oMakeCode, User.UserSourceCode, "手动送检", "手动送检成功", User.UserCode);
+                LogicHandler.InsertMakeProcess(LastSncode, oMakeCode, User.UserSourceCode, "手动送检", "手动送检成功", User.UserCode);
                 //记录操作日志
                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "手动送检", "手动送检成功", "", ob_checkno.Text);
                 ob_checkno.Text = "";

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -37,6 +37,7 @@ namespace UAS_MES.Make
         decimal StandardQTY = 0;
 
         string oOutBoxCode = "";
+        string LastSncode;
 
         //创建串口实例
         SerialPort serialPort1 = new SerialPort();
@@ -331,6 +332,7 @@ namespace UAS_MES.Make
                                                 pa_standardqty.Text = "";
                                                 pa_status.Text = "1";
                                                 OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "称量合格\n", Color.Green);
+                                                LastSncode = sn_code.Text;
                                                 if (AutoPrint.Checked)
                                                     Print_Click(new object(), new EventArgs());
                                             }
@@ -423,7 +425,7 @@ namespace UAS_MES.Make
                 ob_nowcheckqty.ForeColor = Color.Black;
                 SendCheck.Enabled = false;
                 OperateResult.AppendText(">>批次" + ob_checkno.Text + "送检成功\n", Color.Green);
-                LogicHandler.InsertMakeProcess(sn_code.Text, oMakeCode, User.UserSourceCode, "手动送检", "手动送检成功", User.UserCode);
+                LogicHandler.InsertMakeProcess(LastSncode, oMakeCode, User.UserSourceCode, "手动送检", "手动送检成功", User.UserCode);
                 //记录操作日志
                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "手动送检", "手动送检成功", "", ob_checkno.Text);
                 ob_checkno.Text = "";

UAS-MES/FunctionCode/Make/Make_RePrintLabel.cs

@@ -89,6 +89,7 @@ namespace UAS_MES.Make
         private void Make_RePrintLabel_FormClosing(object sender, FormClosingEventArgs e)
         {
             //窗口关闭的时候
+            BaseUtil.ClosePrint(lbl);
         }
 
         private void radioButton_CheckedChange(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -229,6 +229,7 @@ namespace UAS_MES.Make
                 bg_name.Text = BadInf_1[mb_id]["bg_name"];
                 bg_code.Text = BadInf_1[mb_id]["mb_bgcode"];
                 mb_badremark.Text = BadInf_1[mb_id]["mb_badremark"];
+                mbr_id = "";
             }
             if (e.Node.Level == 1)
             {
@@ -358,6 +359,15 @@ namespace UAS_MES.Make
                 OperatResult.AppendText(">>" + ErrorMessage + "未维护不良原因\n", Color.Red);
                 return;
             }
+            //如果岗位资源对应工序的版面不为空的时候
+            if (dh.getFieldDataByCondition("makeserial left join step on ms_stepcode=st_code", "st_table", "ms_sncode='" + GetSNCode.Text + "'").ToString() != "")
+            {
+                if (!dh.CheckExist("makebadrsloc", "mbl_mbrid='" + mbr_id + "' and mbl_sncode='" + GetSNCode.Text + "' "))
+                {
+                    OperatResult.AppendText(">>工序存在版面必须维护不良位置\n", Color.Red);
+                    return;
+                }
+            }
             dt = (DataTable)dh.ExecuteSql("select cr_id from craft where cr_statuscode='AUDITED' and cr_code='" + cr_code.Text + "'", "select");
             if (dt.Rows.Count == 0)
                 OperatResult.AppendText(">>回流工序不存在\n", Color.Red);

UAS-MES/FunctionCode/Make/Make_SpecialCartonPack.cs

@@ -35,7 +35,7 @@ namespace UAS_MES.Make
         double MinWeight;
 
         int StandardQTY = 0;
-
+        string LastSncode;
         string oOutBoxCode = "";
 
         //创建串口实例
@@ -266,6 +266,7 @@ namespace UAS_MES.Make
                                     {
                                         LoadCheckQTY();
                                         OperateResult.AppendText(">>序列号" + sn_code.Text + "采集成功！\n", Color.Green);
+                                        LastSncode = sn_code.Text;
                                         //满箱更新状态为1
                                         if (int.Parse(pa_currentqty.Text == "" ? "0" : pa_currentqty.Text) + 1 == int.Parse(pr_outboxinnerqty.Text))
                                         {
@@ -345,7 +346,7 @@ namespace UAS_MES.Make
                 ob_nowcheckqty.ForeColor = Color.Black;
                 SendCheck.Enabled = false;
                 OperateResult.AppendText(">>批次" + ob_checkno.Text + "送检成功\n", Color.Green);
-                LogicHandler.InsertMakeProcess(sn_code.Text, oMakeCode, User.UserSourceCode, "手动送检", "手动送检成功", User.UserCode);
+                LogicHandler.InsertMakeProcess(LastSncode, oMakeCode, User.UserSourceCode, "手动送检", "手动送检成功", User.UserCode);
                 //记录操作日志
                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "手动送检", "手动送检成功", "", ob_checkno.Text);
                 ob_checkno.Text = "";

UAS-MES/FunctionCode/Packing/Packing_CartonTransfer.cs

@@ -98,10 +98,10 @@ namespace UAS_MES.Packing
         {
             if (e.KeyCode == Keys.Enter)
             {
-
                 string ms_id = dh.getFieldDataByCondition("makeserial", "max(ms_id) ms_id", "ms_sncode = '" + sn_code.Text + "'").ToString();
                 if (ms_id != "")
                 {
+                    OperateResult.AppendText(">>序列号:" + sn_code.Text + "\n", Color.Black);
                     sql.Clear();
                     sql.Append("select ms_id,ms_prodcode,ms_outboxcode,ms_makecode ms_msmakecode, ms_sccode,");
                     sql.Append("nvl(ms_currentstepcode,ms_stepcode ) laststepcode, ms_sccode lastsccode,");

UAS-MES/PublicMethod/LogicHandler.cs

@@ -1358,7 +1358,7 @@ namespace UAS_MES.PublicMethod
             switch (iRule)
             {
                 case "TSN":
-                    dt = (DataTable)dh.ExecuteSql("select ms_id,ms_prodcode,ms_nextmacode,ms_salecode,ms_downstatus from makeserial where ms_sncode='" + iSN + "' order by ms_id desc", "select");
+                    dt = (DataTable)dh.ExecuteSql("select ms_id,ms_prodcode,ms_nextmacode,ms_salecode,ms_downstatus from makeserial where ms_sncode='" + iSN + "' and ms_status=2 order by ms_id desc", "select");
                     if (dt.Rows.Count > 0)
                     {
                         if (dt.Rows[0]["ms_downstatus"].ToString() != "0")
@@ -1403,7 +1403,7 @@ namespace UAS_MES.PublicMethod
                     break;
                 case "RULE":
                     int sp_length = int.Parse(iLength != "" ? iLength : "0");
-                    if (iSN.Substring(0, iPrefix.Length) == iPrefix || iPrefix == "")
+                    if (iSN.StartsWith(iPrefix) || iPrefix == "")
                     {
                         //进行长度匹配
                         if (iSN.Length == sp_length || sp_length == 0)