|
|
@@ -117,7 +117,7 @@ public class PdaMsdServiceImpl implements PdaMsdService {
|
|
|
String pr_msdlevel = null;
|
|
|
Double pr_msdlifetime = null;
|
|
|
SqlRowList barrs = baseDao.queryForRowSet("select bar_code,bar_prodcode,pr_code,nvl(pr_msdlevel,'无') pr_msdlevel," +
|
|
|
- "max(PR_MAXTIME) mi_msdlifttime,pr_ismsd,max(pr_statuscode) pr_statuscode " +
|
|
|
+ "nvl(max(PR_MAXTIME),0) mi_msdlifttime,pr_ismsd,max(pr_statuscode) pr_statuscode " +
|
|
|
"from barcode left join product on pr_code = bar_prodcode left join msdinfo on mi_msdlevel = pr_msdlevel " +
|
|
|
"where bar_code=? group by bar_code,bar_prodcode,pr_code,pr_msdlevel,pr_ismsd", bar_code);
|
|
|
if(barrs.next()){
|
|
|
@@ -127,6 +127,9 @@ public class PdaMsdServiceImpl implements PdaMsdService {
|
|
|
throw new APIErrorException(APIErrorCode.ILLEGAL_ARGUMENTS, "条码："+bar_code+"对应物料："+pr_code+"，尚未审核！");
|
|
|
}
|
|
|
pr_msdlevel = barrs.getGeneralString("pr_msdlevel");
|
|
|
+ if(barrs.getGeneralDouble("mi_msdlifttime")==0){
|
|
|
+ throw new APIErrorException(APIErrorCode.ILLEGAL_ARGUMENTS, "条码："+bar_code+"对应物料："+pr_code+"未维护湿敏信息");
|
|
|
+ }
|
|
|
if(NumberUtil.isEmpty(barrs.getGeneralString("mi_msdlifttime"))){
|
|
|
int count = baseDao.getCount("select count(1) from msdinfo where mi_msdlevel = '"+barrs.getGeneralString("pr_msdlevel")+"'");
|
|
|
if(count == 0){
|
