修改接口BUG

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -443,7 +443,6 @@ namespace UAS_MES.Make
         {
             if (dh.CheckExist("package", "pa_outboxcode='" + pa_outboxcode.Text + "' and nvl(pa_status,0)=0"))
             {
-
                 string Seal = MessageBox.Show(this.ParentForm, "是否确认封箱？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
                 if (Seal == "Yes")
                 {

UAS-MES/PublicMethod/LogicHandler.cs

@@ -519,16 +519,24 @@ namespace UAS_MES.PublicMethod
 
         public static void CartonBoxStepPass(string iMakeCode, string iSourceCode, string iCartonBox, string iUserCode, string iResult, out string oErrorMessage)
         {
-            DataTable dt = (DataTable)dh.ExecuteSql("select ms_status,V_BARCODE,V_MAKECODE from mes_package_view left join makeserial on V_MAKECODE=ms_makecode and  v_barcode = ms_sncode where V_OUTBOXCODE='" + iCartonBox + "'", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ms_status,V_BARCODE,V_MAKECODE,ms_craftcode,ms_prodcode from mes_package_view left join makeserial on V_MAKECODE=ms_makecode and  v_barcode = ms_sncode where V_OUTBOXCODE='" + iCartonBox + "'", "select");
+            //获取当前资源的工序
+            string stepcode = dh.getFieldDataByCondition("source", "sc_stepcode", "sc_code='" + iSourceCode + "'").ToString();
+            string Prcode = dt.Rows[0]["ms_prodcode"].ToString();
+            string Craftcode = dt.Rows[0]["ms_craftcode"].ToString();
+            string ifoqc = dh.getFieldDataByCondition("craft left join craftdetail on cd_crid=cr_id", "nvl(cd_ifoqc) cd_ifoqc", "cr_prodcode='" + Prcode + "' and cr_code='" + Craftcode + "' and cd_stepcode='" + stepcode + "'").ToString();
             oErrorMessage = "";
-            for (int i = 0; i < dt.Rows.Count; i++)
+            if (ifoqc == "0")
             {
-                string ms_status = dt.Rows[i]["ms_status"].ToString();
-                string sn = dt.Rows[i]["V_BARCODE"].ToString();
-                string makecode = dt.Rows[i]["V_MAKECODE"].ToString();
-                if (ms_status != "2")
+                for (int i = 0; i < dt.Rows.Count; i++)
                 {
-                    CS_SetResult(makecode, iSourceCode, sn, iUserCode, iResult, out oErrorMessage);
+                    string ms_status = dt.Rows[i]["ms_status"].ToString();
+                    string sn = dt.Rows[i]["V_BARCODE"].ToString();
+                    string makecode = dt.Rows[i]["V_MAKECODE"].ToString();
+                    if (ms_status != "2")
+                    {
+                        CS_SetResult(makecode, iSourceCode, sn, iUserCode, iResult, out oErrorMessage);
+                    }
                 }
             }
         }
@@ -639,7 +647,7 @@ namespace UAS_MES.PublicMethod
             GetStepCodeAndNameAndLineBySource(iSourceCode, ref CurrentStep, ref CurrentStepName, ref LineCode);
             //更新工序会上一执行步骤
             sql.Clear();
-            sql.Append("merge into makeserial using mes_package_view on (v_outboxcode='"+ iOutBoxCode + "' and ms_sncode=");
+            sql.Append("merge into makeserial using mes_package_view on (v_outboxcode='" + iOutBoxCode + "' and ms_sncode=");
             sql.Append("v_barcode and ms_makecode=v_makecode) when matched then update set ms_nextstepcode=ms_stepcode");
             sql.Append(",ms_status=1,ms_sccode='" + iSourceCode + "' ");
             ExeSQL.Add(sql.ToString());
@@ -1315,14 +1323,14 @@ namespace UAS_MES.PublicMethod
                 return false;
         }
 
-        public static void RecordProdWeight(string iSN, string iType,float iWeight, string iUnit, string iLineCode, string iPrCode, string iSource, string iUser)
+        public static void RecordProdWeight(string iSN, string iType, float iWeight, string iUnit, string iLineCode, string iPrCode, string iSource, string iUser)
         {
             //记录重量
             sql.Clear();
             sql.Append("insert into weightlog(wl_id,wl_type,wl_scancode,wl_weight,wl_unit,wl_linecode,");
             sql.Append("wl_prodcode,wl_sccode,wl_indate,wl_inman) values (weightlog_seq.nextval,:wl_type,:wl_scancode,");
             sql.Append(":wl_weight,:wl_unit,:wl_linecode,:wl_prodcode,:wl_sccode,sysdate,:wl_inman)");
-            dh.ExecuteSql(sql.ToString(), "insert", iType  , iSN  , iWeight ,iUnit ,iLineCode  , iPrCode , iSource , iUser);
+            dh.ExecuteSql(sql.ToString(), "insert", iType, iSN, iWeight, iUnit, iLineCode, iPrCode, iSource, iUser);
         }
 
 

UAS_MesInterface(4.0)/MesHelper.cs

@@ -279,8 +279,8 @@ namespace BenQGuru.eMES.DLLService
             }
             oErrMessage = "";
             sql.Clear();
-            sql.Append("select max(ms_id) from makeserial where ms_sncode in (select '"+ iSN + "' from dual union select ");
-            sql.Append("beforesn from makesnrelation where sn='"+ iSN + "' and beforesn<>' ')");
+            sql.Append("select max(ms_id) from makeserial where ms_sncode in (select '" + iSN + "' from dual union select ");
+            sql.Append("beforesn from makesnrelation where sn='" + iSN + "' and beforesn<>' ')");
             DataTable dt = (DataTable)ExecuteSql(sql.ToString(), "select");
             string ms_id = dt.Rows[0][0].ToString();
             oMoCode = getFieldDataByCondition("MakeSerial", "ms_makecode", "ms_id='" + ms_id + "'").ToString();
@@ -457,7 +457,7 @@ namespace BenQGuru.eMES.DLLService
                         sql.Append("insert into makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,mb_indate,mb_stepcode");
                         sql.Append(",mb_sourcecode,mb_badcode,mb_badtable,mb_bgcode,mb_soncode,mb_status) select makebad_seq.nextval");
                         sql.Append(",ma_code,ms_code,ms_sncode,'" + iUserCode + "',sysdate,'" + CurrentStep + "','" + iSourceCode + "',:bc_code,'',");
-                        sql.Append("'"+ BgCode + "',sp_soncode,'0' from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
+                        sql.Append("'" + BgCode + "',sp_soncode,'0' from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
                         sql.Append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
                         List<string> InsertSQL = new List<string>();
                         for (int i = 0; i < BadCode.Length; i++)
@@ -564,9 +564,9 @@ namespace BenQGuru.eMES.DLLService
                 return false;
             }
             oErrMessage = "";
-            sql.Length = 0;
-            string omakeCode;
+            string omakeCode = "";
             GetRcardMOInfo(iSN, out omakeCode, out oErrMessage);
+            sql.Clear();
             sql.Append("begin ");
             for (int i = 0; i < iTestDetail.Length; i++)
             {
@@ -641,7 +641,7 @@ namespace BenQGuru.eMES.DLLService
             oErrMessage = param[6];
             omakecode = param[4];
             if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
-                return SetStepFinish(omakecode, iResCode, iSN, iOperator, iResult, "", iErrCode, out oErrMessage);
+                return SetStepFinish(omakecode, iResCode, iSN, "", iResult, iOperator, iErrCode, out oErrMessage);
             else
                 return false;
         }
@@ -948,6 +948,7 @@ namespace BenQGuru.eMES.DLLService
                 case "INSERT":
                     try
                     {
+                        Console.WriteLine(sql);
                         result = command.ExecuteNonQuery();
                     }
                     catch (Exception)

UAS_MesInterface/MESHelper.cs

@@ -38,7 +38,7 @@ namespace BenQGuru.eMES.DLLService
         //用于存放批量执行的SQL
         List<string> sqls = new List<string>();
         //系统默认的的连接字符串
-        private string ConnectionStrings = "Data Source=192.168.230.200/orcl;User ID=MES_TEST;PassWord=select!#%*(;";
+        private string ConnectionStrings = "Data Source=192.168.230.200/orcl;User ID=MES;PassWord=select!#%*(;";
         //用户选择的数据库的连接字符串
         private OracleConnection connection;
         //用户选择的数据库的连接字符串
@@ -272,7 +272,11 @@ namespace BenQGuru.eMES.DLLService
                 return false;
             }
             oErrMessage = "";
-            string ms_id = getFieldDataByCondition("MakeSerial", "max(ms_id) ms_id", "ms_sncode='" + iSN + "' or ms_firstsn in (select firstsn from makesnrelation where sn='" + iSN + "')").ToString();
+            sql.Length = 0;
+            sql.Append("select max(ms_id) from makeserial where ms_sncode in (select '" + iSN + "' from dual union select ");
+            sql.Append("beforesn from makesnrelation where sn='" + iSN + "' and beforesn<>' ')");
+            DataTable dt = (DataTable)ExecuteSql(sql.ToString(), "select");
+            string ms_id = dt.Rows[0][0].ToString();
             oMoCode = getFieldDataByCondition("MakeSerial", "ms_makecode", "ms_id='" + ms_id + "'").ToString();
             if (oMoCode != "")
                 return true;
@@ -549,9 +553,9 @@ namespace BenQGuru.eMES.DLLService
                 return false;
             }
             oErrMessage = "";
-            sql.Length = 0;
             string omakeCode;
             GetRcardMOInfo(iSN, out omakeCode, out oErrMessage);
+            sql.Length = 0;
             sql.Append("begin ");
             for (int i = 0; i < iTestDetail.Length; i++)
             {
@@ -624,7 +628,7 @@ namespace BenQGuru.eMES.DLLService
             oErrMessage = param[6];
             omakecode = param[4];
             if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
-                return SetStepFinish(omakecode, iResCode, iSN, iOperator, iResult, "", iErrCode, out oErrMessage);
+                return SetStepFinish(omakecode, iResCode, iSN, "", iResult, iOperator, iErrCode, out oErrMessage);
             else
                 return false;
         }