上料采集界面BUG处理

UAS_MES_YDCY/FunctionCode/Make/Make_Decompose.cs

@@ -320,6 +320,7 @@ namespace UAS_MES_NEW.Make
                                     //上料校验规则判断
                                     if (!LogicHandler.CheckSNBeforeLoad(LabelDataGridView.Rows[i].Cells["cm_makecode"].Value.ToString(), ms_sncode.Text, LabelDataGridView.Rows[i].Cells["New_BarCode"].Value.ToString(), sp_fsoncode, sp_soncode, sp_barcoderule, sp_prefix, length, sp_ifrepeat, sp_checksalecode, sp_subnum, sp_subnumlength, "0", sp_rate, out resultstr, out userate, out subfix, out ErrorMessage))
                                     {
+                                        LogicHandler.CheckBarcode(ms_makecode.Text, ms_sncode.Text, LabelDataGridView.Rows[i].Cells["New_BarCode"].Value.ToString(), resultstr, Tag.ToString());
                                         OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                                         LoadData(sncode_1, sender, new KeyEventArgs(Keys.Enter));
                                         continue;

UAS_MES_YDCY/FunctionCode/Make/Make_FeedingCollection.cs

@@ -548,6 +548,7 @@ namespace UAS_MES_NEW.Make
         //此类中通用的保存逻辑
         private void Save_OtherCode(string sp_fsoncode, string sp_soncode, string ma_code, string ms_sncode, string sp_id, string resultstr,string userate,string subfix)
         {
+            LogicHandler.CheckBarcode(ma_code, ms_sncode, code.Text, resultstr, Tag.ToString());
             CollectDataSonCode.Add(sp_soncode);
             //采集成功提示
             ResultStr.Add(resultstr);

UAS_MES_YDCY/FunctionCode/Make/Make_FeedingCollectionBadOnly.cs

@@ -540,6 +540,7 @@ namespace UAS_MES_NEW.Make
         //此类中通用的保存逻辑
         private void Save_OtherCode(string sp_fsoncode, string sp_soncode, string ma_code, string ms_sncode, string sp_id, string resultstr, string userate, string subfix)
         {
+            LogicHandler.CheckBarcode(ma_code, ms_sncode, code.Text, resultstr, Tag.ToString());
             CollectDataSonCode.Add(sp_soncode);
             ReturnUseRate.Add(userate);
             ReturnSubFix.Add(subfix);
@@ -604,6 +605,9 @@ namespace UAS_MES_NEW.Make
                 CollectData.Clear();
                 TSN.Clear();
                 SPID.Clear();
+                ReturnUseRate.Clear();
+                ReturnSubFix.Clear();
+                ResultStr.Clear();
                 CheckBarcode.Clear();
                 CollectDataSonCode.Clear();
                 //采集成功，设置序列号栏目为空
@@ -619,6 +623,9 @@ namespace UAS_MES_NEW.Make
             SPID.Clear();
             TSN.Clear();
             CheckBarcode.Clear();
+            ReturnUseRate.Clear();
+            ReturnSubFix.Clear();
+            ResultStr.Clear();
             CollectData.Clear();
             CollectDataSonCode.Clear();
             if (dt1 != null)

UAS_MES_YDCY/PublicMethod/LogicHandler.cs

@@ -1819,6 +1819,17 @@ namespace UAS_MES_NEW.PublicMethod
             dh.ExecuteSql(sql.ToString(), "insert", printValue, printType, MakeCode, prodCode, sourceCode, stepcode, ifRePrint, userCode, fileName);
         }
 
+        public static void CheckBarcode(string makecode, string sn, string cm_barcode, string cm_substr, string caller)
+        {
+            if (cm_substr != "")
+            {
+                if (cm_barcode.IndexOf(cm_substr) == 0)
+                {
+                    DoCommandLog(caller, "", makecode, User.UserLineCode, User.UserSourceCode, "上料采集截取", "条码" + cm_barcode + "截取条码" + cm_substr, sn, "");
+                }
+            }
+        }
+
 
         public static bool GetMobileAllInfo(string iSN, out Dictionary<string, string> oInfo, out string oErrMessage)
         {