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

UAS-MES/FunctionCode/Make/Make_RePrintLabel.cs

@@ -268,7 +268,12 @@ namespace UAS_MES.Make
                 OperateResult.AppendText("<<打印成功\n", Color.Green);
                 Print.CodeSoft(lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), Printer.Text, inputValue.Text, int.Parse(printNum.Text), indate[PrintLabel.SelectedIndex]);
                 //打印成功,记录日志commandlog , cl_operate彩盒或者机身标补打印，cl_result补打印成功
-                LogicHandler.DoCommandLog(User.UserCode, "", User.UserLineCode, User.UserSourceCode, "卡通箱标签补打印,箱号:"+ inputValue.Text, "补打印成功","", "");
+                //LogicHandler.DoCommandLog(User.UserCode, "", User.UserLineCode, User.UserSourceCode, "卡通箱标签补打印,箱号:"+ inputValue.Text, "补打印成功","", "");
+                sql.Clear();
+                sql.Append("insert into commandlog(cl_id,cl_man,cl_date,cl_linecode,cl_sourcecode,cl_makecode,cl_operate,");
+                sql.Append("cl_result,cl_sncode,cl_code) values (commandlog_seq.nextval,:inman,sysdate,:linecode,:sourcecode,:makecode,");
+                sql.Append(":operate,:result,'','')");
+                dh.ExecuteSql(sql.GetString(), "insert",User.UserCode,User.UserLineCode,User.UserSourceCode,ms_makecode.Text,"卡通箱标签补打印,箱号:" + inputValue.Text, "补打印成功");
                 //如果pa_downstatus<>0，则更新pa_downstatus=-1 where pa_outboxcode=?code，同时插入记录至表 MAKEDOWN
                 if (mapB.Rows[0]["pa_downstatus"].ToString()=="0") {
                     dh.ExecuteSql("update package set pa_downstatus='-1' where pa_outboxcode='"+ inputValue.Text+"'", "update");
@@ -308,8 +313,8 @@ namespace UAS_MES.Make
             //拼接sql插入语句
             sql.Clear();
             sql.Append("INSERT INTO MAKEDOWN (MD_ID,MD_LINECODE,MD_SCCODE,MD_STEPCODE,");
-            sql.Append("MD_SNCODE,MD_PRODCODE,MD_MACODE, MD_DOWNREASON, MD_CODE,");
-            sql.Append("MD_DOWNDATE,MD_DOWNMAN,MD_STATUS) value(MAKEDOWN_seq.nextval,'" + User.UserLineCode + "','" + User.UserSourceCode + "',");
+            sql.Append(CartonBox.Checked?"MD_OUTBOXCODE":"MD_SNCODE"+",MD_PRODCODE,MD_MACODE, MD_DOWNREASON, MD_CODE,");
+            sql.Append("MD_DOWNDATE,MD_DOWNMAN,MD_STATUS) values (MAKEDOWN_seq.nextval,'" + User.UserLineCode + "','" + User.UserSourceCode + "',");
             sql.Append("'" + User.CurrentStepCode + "','" + inputValue.Text + "','" + pr_code.Text + "','" + ms_makecode.Text + "','补打标签','" + md_code + "',sysdate,'" + User.UserCode + "','-1')");
             //执行
             dh.ExecuteSql(sql.GetString(), "insert");
@@ -365,7 +370,9 @@ namespace UAS_MES.Make
                             LogicHandler.DoCommandLog(User.UserCode, "", User.UserLineCode, User.UserSourceCode, "标签补打核对", "核对成功", TSN, "");
                         }
                         else
-                        OperateResult.AppendText("<<核对失败\n", Color.Red);
+                        {
+                            OperateResult.AppendText("<<核对失败\n", Color.Red);
+                        }
                         //清空TSN的值
                         TSN = "";
                         rePrintCheck.Text = "";
@@ -377,7 +384,7 @@ namespace UAS_MES.Make
                     //第一次输入
                     if (TSN == "")
                     {
-                        infoc = (DataTable)dh.ExecuteSql("select pa_prodcode,pa_downstatus from package where pa_outboxcode='"+rePrintCheck.Text+"' and pa_type=1", "select");
+                        infoc = (DataTable)dh.ExecuteSql("select pa_prodcode,pa_makecode,pa_downstatus from package where pa_outboxcode='"+rePrintCheck.Text+"' and pa_type=1", "select");
                         //如果查询无值，提示用户卡通箱号不存在，请输入卡通箱号
                         if (infoc.Rows.Count==0)
                         {
@@ -393,20 +400,28 @@ namespace UAS_MES.Make
                     else
                     {
                         //比对两次输入的是否一致
-                        if (TSN==rePrintCheck.Text)
+                        if (TSN == rePrintCheck.Text)
                         {
                             //提示用户核对成功
                             OperateResult.AppendText("<<核对成功\n", Color.Green);
                             //如果卡通箱号是下地状态 pa_downstatus<>0 ,更新pa_downstatus=0;
-                            if (infoc.Rows[0]["pa_downstatus"].ToString()!="0")
+                            if (infoc.Rows[0]["pa_downstatus"].ToString() != "0")
                             {
                                 sql.Clear();
                                 sql.Append("update makedown set md_status=0,Md_UPREASON='标签补打核对',Md_UPMAN='" + User.UserCode + "',Md_UPDATE=SYSDATE WHERE Md_OUTBOXCODE='" + TSN + "' AND Md_PRODCODE='" + infoc.Rows[0]["pa_prodcode"].ToString() + "' AND Md_STATUS=-1");
                             }
                             //记录操作日志commandlog ， 补打核对，核对成功
-                            LogicHandler.DoCommandLog(User.UserCode, "", User.UserLineCode, User.UserSourceCode, "标签补打核对,卡通箱号:"+TSN, "核对成功", "", "");
+                            //LogicHandler.DoCommandLog(User.UserCode, "", User.UserLineCode, User.UserSourceCode, "标签补打核对,卡通箱号:" + TSN, "核对成功", "", "");
+                            sql.Clear();
+                            sql.Append("insert into commandlog(cl_id,cl_man,cl_date,cl_linecode,cl_sourcecode,cl_makecode,cl_operate,");
+                            sql.Append("cl_result,cl_sncode,cl_code) values (commandlog_seq.nextval,:inman,sysdate,:linecode,:sourcecode,:makecode,");
+                            sql.Append(":operate,:result,'','')");
+                            dh.ExecuteSql(sql.GetString(), "insert", User.UserCode, User.UserLineCode, User.UserSourceCode,infoc.Rows[0]["pa_makecode"].ToString(), "标签补打核对,卡通箱号:" + TSN, "核对成功");
+                        }
+                        else
+                        {
+                            OperateResult.AppendText("<<核对失败\n", Color.Red);
                         }
-                        OperateResult.AppendText("<<核对失败\n", Color.Red);
                         //清空TSN的值
                         TSN = "";
                         rePrintCheck.Text = "";