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

UAS-MES/FunctionCode/Make/Make_CollectBTMAC.cs

@@ -365,7 +365,7 @@ namespace UAS_MES.Make
                             LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "BT/MAC采集", "采集成功", sn_code, "");
                             if (CollectRemark.Checked && Remark.Text != "")
                             {
-                                LogicHandler.CollectRemarkInf(sncode.Text, "", "", ms_makecode.Text, ma_prodcode.Text, Remark.Text);
+                                LogicHandler.CollectRemarkInf(sn_code, "", "", ms_makecode.Text, ma_prodcode.Text, Remark.Text);
                             }
                             sql.Clear();
                             sql.Append("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty from make left join makecraftdetail on ");