|
|
@@ -1469,8 +1469,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
|
|
|
if (paras[7].Value.ToString() == "null") //只有正确的条码，读注浆信息
|
|
|
{
|
|
|
|
|
|
- sqlString = @"select
|
|
|
- nvl(gdd.MaterialCode, nvl(g.MaterialCode,g.GoodsCode)) MaterialCode,
|
|
|
+ sqlString = @"select
|
|
|
tp_pm_inproduction.GoodsName,
|
|
|
tp_pm_inproduction.GroutingUserID,
|
|
|
tp_pm_inproduction.GroutingUserCode,
|
|
|
@@ -1557,7 +1556,6 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
|
|
|
dr[Constant.BarCodeResultTableColumns.out_logoID.ToString()] = ds.Tables[0].Rows[0]["logoid"].ToString();
|
|
|
dr[Constant.BarCodeResultTableColumns.out_logoCode.ToString()] = ds.Tables[0].Rows[0]["logocode"].ToString();
|
|
|
dr[Constant.BarCodeResultTableColumns.out_logoName.ToString()] = ds.Tables[0].Rows[0]["logoname"].ToString();
|
|
|
- dr[Constant.BarCodeResultTableColumns.out_MaterialCode.ToString()] = ds.Tables[0].Rows[0]["MaterialCode"].ToString();
|
|
|
dr[Constant.BarCodeResultTableColumns.out_deliverLimitCycle.ToString()] = ds.Tables[0].Rows[0]["DeliverLimitCycle"].ToString();
|
|
|
}
|
|
|
|
|
|
@@ -1706,7 +1704,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
|
|
|
/// <returns>DataSet</returns>
|
|
|
public static DataSet CheckBarcodePDA(int procedureID, string barcode, SUserInfo sUserInfo)
|
|
|
{
|
|
|
- IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
|
|
|
+ IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
|
|
|
try
|
|
|
{
|
|
|
oracleConn.Open();
|
ztl