DK.Service/PMModuleLogic/PMModuleLogic.cs

@@ -5141,7 +5141,19 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                                 where f.BANMA=:BarCode  and FHTIME is not null and SENDOUTFLAG<>1 order by FHTIME desc ";
                 }
                 else {
-                    sql = "select  f.FHUserCode,f.FINISHEDLOADBATCHNO,FHTIME,SENDOUTFLAG from TP_PM_FINISHEDPRODUCT f left join TP_PM_GroutingDailyDetail on TP_PM_GroutingDailyDetail.GROUTINGDAILYDETAILID=f.GROUTINGDAILYDETAILID WHERE TP_PM_GroutingDailyDetail.outlabelcode = :BarCode ";
+                    string sqlString = @"select FUN_CMN_GetBarCode(:barcode,null,:accountid) From DUAL";
+                    OracleParameter[] paras1 = new OracleParameter[]{
+                                    new OracleParameter(":barcode",OracleDbType.Varchar2, barcode,ParameterDirection.Input),
+                                    new OracleParameter(":accountid",OracleDbType.Int32, sUserInfo.AccountID,ParameterDirection.Input),
+                                };
+                    DataSet ds = oracleConn.GetSqlResultToDs(sqlString, paras1);
+
+                    if (ds != null && ds.Tables[0].Rows.Count > 0)
+                    {
+                        barcode = ds.Tables[0].Rows[0][0].ToString();
+                    }
+
+                    sql = "select  f.FHUserCode,f.FINISHEDLOADBATCHNO,FHTIME,SENDOUTFLAG from TP_PM_FINISHEDPRODUCT f  WHERE f.BarCode = :BarCode ";
                 }
 
                 string currentBarcode = string.Empty;