|
|
@@ -156,7 +156,7 @@ public class PdaBatchServiceImpl implements PdaBatchService {
|
|
|
if (ismsd) {
|
|
|
//判断原条码是否有msdbarcode
|
|
|
Double exposuretime = 0.0;
|
|
|
- SqlRowList orMsdbarcode = baseDao.queryForRowSet("select nvl(mb_floorlife,pr_msdlifetime) mb_floorlife,nvl(mb_exposuretime,0) + ceil((sysdate - MB_ACTIONDATE) * 24.0 * 60.0) exposuretime"
|
|
|
+ SqlRowList orMsdbarcode = baseDao.queryForRowSet("select nvl(mb_floorlife,0) mb_floorlife,nvl(mb_exposuretime,0) + ceil((sysdate - MB_ACTIONDATE) * 24.0 * 60.0) exposuretime"
|
|
|
+ " from msdbarcode left join product on pr_code = mb_prodcode where mb_barcode = '"+or_barcode+"'");
|
|
|
Map<String, Object> msdMap = new HashMap<String, Object>();
|
|
|
if(orMsdbarcode.next()){
|
|
|
@@ -247,7 +247,7 @@ public class PdaBatchServiceImpl implements PdaBatchService {
|
|
|
baseDao.updateByCondition("Barcode", "bar_status=1,bar_remain=" + rest, "bar_id=" + or_barid);
|
|
|
// 湿敏元件产生MSDLOG
|
|
|
if (ismsd) {
|
|
|
- SqlRowList orMsdbarcode = baseDao.queryForRowSet("select nvl(mb_floorlife,pr_msdlifetime) mb_floorlife from msdbarcode left join product on pr_code = mb_prodcode where mb_barcode = '"+or_barcode+"'");
|
|
|
+ SqlRowList orMsdbarcode = baseDao.queryForRowSet("select nvl(mb_floorlife,0) mb_floorlife from msdbarcode left join product on pr_code = mb_prodcode where mb_barcode = '"+or_barcode+"'");
|
|
|
if(orMsdbarcode.next()){
|
|
|
restTime = orMsdbarcode.getGeneralDouble("mb_floorlife");
|
|
|
}else{
|
