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

UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -249,6 +249,7 @@ namespace UAS_MES.Make
                             //更新半成品SN已被工单使用
                             dh.BatchInsert("update makeserial set ms_nextmacode='" + ma_code.Text + "' where ms_id=(select max(ms_id) from makeserial where ms_sncode=:sncode and ms_makecode<>'" + ma_code.Text + "')", new string[] { "sncode" }, TSN.ToArray());
                             OperateResult.AppendText(">>序列号" + ms_sncode.Text + "对应的物料已经采集完成\n", Color.Green);
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "上料采集", "上料成功", ms_sncode.Text, "");
                             doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
                             Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, ms_sncode.Text, int.Parse(PrintNum.Text));
                             RemainIndex = 0;

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -418,6 +418,7 @@ namespace UAS_MES.Make
                 //采集成功，设置序列号栏目为空
                 RemainIndex = 0;
                 OperateResult.AppendText(">>序列号" + sn_code.Text + "上料采集完成！\n", Color.Green);
+                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "上料采集", "上料成功", sn_code.Text, "");
                 if (LogicHandler.SetStepResult(ma_code, User.UserSourceCode, sn_code.Text, "上料采集", "上料成功", User.UserCode, out ErrorMessage))
                 {
                     //提示正确返回时传递的信息

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -180,7 +180,7 @@ namespace UAS_MES.Make
                         }
                         if (dt.Rows[0]["ms_outno"].ToString() != "")
                         {
-                            OperateResult.AppendText(">>序列号" + sn_code.Text + "已被出货单" + dt.Rows[0]["ms_outno"].ToString() + "采集，不允许操作\n", Color.Red,sn_code);
+                            OperateResult.AppendText(">>序列号" + sn_code.Text + "已被出货单" + dt.Rows[0]["ms_outno"].ToString() + "采集，不允许操作\n", Color.Red, sn_code);
                             return;
                         }
                         if (dt.Rows[0]["ms_iostatus"].ToString() != "0")
@@ -267,17 +267,17 @@ namespace UAS_MES.Make
                         {
                             if (dt.Rows[0]["pa_mothercode"].ToString() != "")
                             {
-                                OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "已被大箱或栈板" + dt.Rows[0]["pa_mothercode"].ToString() + "采集，不允许操作\n", Color.Red);
+                                OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "已被大箱或栈板" + dt.Rows[0]["pa_mothercode"].ToString() + "采集，不允许操作\n", Color.Red, sn_code);
                                 return;
                             }
                             if (dt.Rows[0]["pa_outno"].ToString() != "")
                             {
-                                OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "已被出货单" + dt.Rows[0]["pa_outno"].ToString() + "采集，不允许操作\n", Color.Red);
+                                OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "已被出货单" + dt.Rows[0]["pa_outno"].ToString() + "采集，不允许操作\n", Color.Red, sn_code);
                                 return;
                             }
                             if (dt.Rows[0]["pa_iostatus"].ToString() != "0")
                             {
-                                OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "处于入库状态，不允许操作\n", Color.Red);
+                                OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "处于入库状态，不允许操作\n", Color.Red, sn_code);
                                 return;
                             }
                         }

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -341,17 +341,17 @@ namespace UAS_MES.Make
                         {
                             if (dt.Rows[0]["pa_mothercode"].ToString() != "")
                             {
-                                OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "已被大箱或栈板" + dt.Rows[0]["pa_mothercode"].ToString() + "采集，不允许操作\n", Color.Red);
+                                OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "已被大箱或栈板" + dt.Rows[0]["pa_mothercode"].ToString() + "采集，不允许操作\n", Color.Red, sn_code);
                                 return;
                             }
                             if (dt.Rows[0]["pa_outno"].ToString() != "")
                             {
-                                OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "已被出货单" + dt.Rows[0]["pa_outno"].ToString() + "采集，不允许操作\n", Color.Red);
+                                OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "已被出货单" + dt.Rows[0]["pa_outno"].ToString() + "采集，不允许操作\n", Color.Red, sn_code);
                                 return;
                             }
                             if (dt.Rows[0]["pa_iostatus"].ToString() != "0")
                             {
-                                OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "处于入库状态，不允许操作\n", Color.Red);
+                                OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "处于入库状态，不允许操作\n", Color.Red, sn_code);
                                 return;
                             }
                         }