|
|
@@ -236,8 +236,8 @@ public class PdaMsdServiceImpl implements PdaMsdService {
|
|
|
// 3、获取物料资料表中维护的烘烤温度,烘烤时长返回至客户端
|
|
|
Object msdLevel = rs.getGeneralString("mb_msdlevel");
|
|
|
if(StringUtil.hasText(msdLevel)){
|
|
|
- //rs = baseDao.queryForRowSet("select mi_msdplanoventime MI_PLANOVENTIME,mi_msdoventemp MI_OVENTEMP from msdinfo where mi_msdlevel = ?",msdLevel);
|
|
|
- rs = baseDao.queryForRowSet("select PR_BAKETIME MI_PLANOVENTIME,PR_TEMPERATURE MI_OVENTEMP from product left join barcode on bar_prodcode=pr_code where bar_code=?",bar_code);
|
|
|
+ rs = baseDao.queryForRowSet("select mi_msdplanoventime MI_PLANOVENTIME,mi_msdoventemp MI_OVENTEMP from msdinfo where mi_msdlevel = ?",msdLevel);
|
|
|
+ //rs = baseDao.queryForRowSet("select PR_BAKETIME MI_PLANOVENTIME,PR_TEMPERATURE MI_OVENTEMP from product left join barcode on bar_prodcode=pr_code where bar_code=?",bar_code);
|
|
|
if(rs.next()){
|
|
|
return rs.getResultList();
|
|
|
}else {
|