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

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -235,7 +235,7 @@ namespace UAS_MES.Make
                                     doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
                                     Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text));
                                     //提示用户打印成功
-                                    OperateResult.AppendText(">>序列号:" + sncode.Text + "打印成功\n", Color.Green);
+                                    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,mcd_okqty from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");

UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -362,9 +362,9 @@ namespace UAS_MES.Make
                             sql.Append("cm_dropsccode='" + User.UserSourceCode + "' where cm_id='" + LabelDataGridView.Rows[i].Cells["cm_id"].Value + "'");
                             dh.ExecuteSql(sql.GetString(), "update");
 
-                            //将新批号绑定到序列号中
-                            dt = (DataTable)dh.ExecuteSql("select sp_id from stepproduct where sp_mothercode='" + ms_prodcode.Text + "'", "select");
-                            string sp_id = dt.Rows[0]["sp_id"].ToString();
+                            ////将新批号绑定到序列号中
+                            //dt = (DataTable)dh.ExecuteSql("select sp_id from stepproduct where sp_mothercode='" + LabelDataGridView.Rows[i].Cells["cm_maprodcode"].Value + "'", "select");
+                            //string sp_id = dt.Rows[0]["sp_id"].ToString();
                             sql.Clear();
                             sql.Append("insert into craftmaterial (cm_id, cm_makecode,cm_maid,cm_maprodcode,cm_soncode,cm_mscode,cm_sncode,cm_stepcode,cm_stepname,");
                             sql.Append("cm_craftcode,cm_craftname,cm_barcode,cm_inqty,cm_indate,cm_inman,cm_linecode,cm_wccode,cm_sourcecode,cm_spid, cm_materialtype,cm_status,cm_fsoncode,cm_firstsn)");

UAS-MES/FunctionCode/Warehouse/Warehouse_FinishedProductOut.cs

@@ -618,7 +618,7 @@ namespace UAS_MES.Warehouse
                 sql.Append(" group by ms_prodcode,ms_salecode) left join (select pd_ordercode,pd_prodcode,outqty-nvl((select count(1) from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_prodcode=pd_prodcode),0)ungetqty");
                 sql.Append("  from (select pd_ordercode,pd_prodcode,sum(pd_outqty)outqty from prodiodetail where pd_piid=" + pi_id.Text + " group by pd_prodcode,pd_ordercode)) on ms_prodcode=pd_prodcode and ms_salecode=pd_ordercode where nvl(pd_prodcode,' ')<>' ' or nvl(pd_ordercode,' ')<>' ' or cn>nvl(ungetqty,0)");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                if (!(int.Parse(dt.Rows[0]["cn"].ToString()) > 0))
+                if ((int.Parse(dt.Rows[0]["cn"].ToString()) > 0))
                 {
                     OperateResult.AppendText(type + input.Text + "内的序列号中的物料+订单不在出货单中或者栈板内中序列号的数量大于剩余出货数，栈板内物料号:" + dt.Rows[0]["ms_prodcode"].ToString() + "，订单号:" + dt.Rows[0]["ms_salecode"].ToString() + "，数量:" + dt.Rows[0]["cn"].ToString() + "\n", Color.Red, input);
                     return false;

UAS-MES/PublicMethod/Print.cs

@@ -26,6 +26,11 @@ namespace UAS_MES.PublicMethod
             //查询模板对应的取值SQL和参数名称
             DataTable dt = (DataTable)dh.ExecuteSql("select lp_name,lp_sql from label left join LABELPARAMETER on la_id=lp_laid where la_id='" + LaID + "'", "select");
             StringBuilder sb = new StringBuilder();
+            if (doc == null)
+            {
+                MessageBox.Show("打印文件不存在");
+                return;
+            }
             //执行全部的SQL
             for (int i = 0; i < dt.Rows.Count; i++)
             {

UAS-MES/PublicMethod/ftpOperater.cs

@@ -287,6 +287,7 @@ namespace UAS_MES.PublicMethod
                 File.Copy(sourceFile, destFile, true);
             }
             catch {
+                MessageBox.Show("标签文件下载失败，检查文件是否存在于指定路径或网络是否通畅");
             }
             return destFile;
         }