DK.Service/PMModuleLogic/PMModuleLogic.cs

@@ -5123,20 +5123,9 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
      //           }
                 #endregion
 
-                string gbarcode = null;
+
 				string FINISHEDLOADBATCHNO = null;
                 string fhtime = "";
-				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)
-				{
-					gbarcode = ds.Tables[0].Rows[0][0].ToString();
-				}
                 string sql = "";
                 // 1.判断产品是否在产成品表中
                 if (barcode.Length == 8)
@@ -5152,15 +5141,9 @@ 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.FHUserID,
-                                f.FHUserCode,
-                                f.GoodsID,
-                                f.GoodsCode,
-                                f.GoodsName,
-                                f.BarCode, 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  order by FHTIME desc ";
+                    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 ";
                 }
 
-                // where BarCode=FUN_CMN_GetBarCode(:BarCode,null,:Accountid)";
                 string currentBarcode = string.Empty;
 				OracleParameter[] paras = new OracleParameter[]{
 					new OracleParameter(":BarCode",OracleDbType.NVarchar2,barcode,ParameterDirection.Input),
@@ -5205,7 +5188,6 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 					#endregion
 
 					#region 未交坯
-					//sql = "select GoodsCode from TP_PM_GroutingDailyDetail where BarCode=FUN_CMN_GetBarCode(:BarCode,null,:Accountid) and DeliverTime is null";
 					sql = "select GoodsCode from TP_PM_GroutingDailyDetail where BarCode=:BarCode and DeliverTime is null";
 					dsResult = oracleConn.GetSqlResultToDs(sql, paras);
 					if (dsResult != null && dsResult.Tables[0].Rows.Count > 0)
@@ -5225,15 +5207,15 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 
 
 				#region 查询产品相关信息
-				sql = @" select  BANMA,TP_PM_FINISHEDPRODUCT.GOODSCODE,MATERIALCODE,MATERIALREMARK,FINISHEDLOADBATCHNO,count(1) Count from TP_PM_FINISHEDPRODUCT  left join TP_PM_GroutingDailyDetail on TP_PM_GroutingDailyDetail.BARCODE=TP_PM_FINISHEDPRODUCT.BARCODE  where 1=1 ";
+				sql = @" select  BANMA,TP_PM_FINISHEDPRODUCT.GOODSCODE,MATERIALCODE,MATERIALREMARK,FINISHEDLOADBATCHNO,count(1) Count from TP_PM_FINISHEDPRODUCT  left join TP_PM_GroutingDailyDetail on TP_PM_GroutingDailyDetail.GROUTINGDAILYDETAILID=TP_PM_FINISHEDPRODUCT.GROUTINGDAILYDETAILID  where 1=1 ";
 				if (!string.IsNullOrEmpty(FINISHEDLOADBATCHNO))
 				{
 					sql += " and FINISHEDLOADBATCHNO='" + FINISHEDLOADBATCHNO + "'";
 				}
-                if (!string.IsNullOrEmpty(fhtime))
-                {
-                    sql += " and FHTIME=FUN_CMN_GETDATETIME('" + fhtime + "') ";
-                }
+                //if (!string.IsNullOrEmpty(fhtime))
+                //{
+                //    sql += " and FHTIME=FUN_CMN_GETDATETIME('" + fhtime + "') ";
+                //}
                 sql += " group by BANMA,TP_PM_FINISHEDPRODUCT.GOODSCODE,MATERIALCODE,MATERIALREMARK,FINISHEDLOADBATCHNO";
                 dsResult = oracleConn.GetSqlResultToDs(sql);
 				if (dsResult != null && dsResult.Tables[0].Rows.Count > 0)
@@ -5241,12 +5223,6 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 					resultEntity.Result = dsResult.Tables[0];
 					resultEntity.Status= Constant.ServiceResultStatus.Success;
 				}
-				//else
-				//{
-				//	resultEntity.Result = -2;// 条码未注浆
-				//	resultEntity.Message = "条码【" + barcode + "】未注浆";
-				//	return resultEntity;
-				//}
 				#endregion
 
 				return resultEntity;