BUG修改

UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -216,7 +216,7 @@ namespace UAS_MES.Make
                         if (LogicHandler.CheckSNBeforeLoad(ma_code.Text, code.Text, sp_fsoncode, sp_soncode, sp_barcoderule, sp_prefix, length, sp_ifrepeat, out ErrorMessage))
                         {
                             //判断采集的条码和本次采集的也不能重复
-                            if (CollectData.Contains(code.Text))
+                            if (CollectData.Contains(code.Text) && sp_ifrepeat != "-1")
                             {
                                 OperateResult.AppendText(">>条码" + code.Text + "已经上料\n", Color.Red, code);
                                 return;

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -150,7 +150,7 @@ namespace UAS_MES.Make
                             if (LogicHandler.CheckSNBeforeLoad(ma_code.Text, code.Text, sp_fsoncode, sp_soncode, sp_barcoderule, sp_prefix, length, sp_ifrepeat, out ErrorMessage))
                             {
                                 //判断采集的条码和本次采集的也不能重复
-                                if (CollectData.Contains(code.Text))
+                                if (CollectData.Contains(code.Text) && sp_ifrepeat != "-1")
                                 {
                                     OperateResult.AppendText(">>条码" + code.Text + "已经上料\n", Color.Red, code);
                                     return;

UAS-MES/PublicMethod/LogicHandler.cs

@@ -631,7 +631,7 @@ namespace UAS_MES.PublicMethod
                 sql.Append(",SP_SCCODE,SP_STEPCODE,SP_LINECODE,SP_WCCODE,SP_MAKECODE,SP_SNCODE,SP_YMD,SP_HM,SP_IFNG,SP_PRODCODE");
                 sql.Append(",SP_DATE,SP_CRAFTCODE,sp_inman)  select STEPPASSED_SEq.NEXTVAL,'" + cd_ifmidinput + "','" + cd_ifmidfinish + "',");
                 sql.Append("ms_ifrework,case when ms_ifrework=-1 then 0 when ms_stepcode='" + CurrentStep + "' then 0 when " + ifpast + ">0 ");
-                sql.Append("then -1 else 0 end,0,ms_checkno,'良品','" + iSourceCode + "','" + CurrentStep + "','" + LineCode + "',ms_makecode,ms_sncode,");
+                sql.Append("then -1 else 0 end,ms_checkno,'良品','" + iSourceCode + "','" + CurrentStep + "','" + LineCode + "',ms_wccode,ms_makecode,ms_sncode,");
                 sql.Append("to_char(sysdate,'yyyymmdd'),to_char(sysdate,'hh24miss'),0,ms_prodcode,SYSDATE,ms_craftcode,'" + iUserCode + "' ");
                 sql.Append("from mes_package_view left join makeserial on ms_sncode=v_barcode and ms_makecode=v_makecode where v_outboxcode='" + iOutBoxCode + "'");
                 ExeSQL.Add(sql.ToString());