调整锡膏上料处理

src/com/uas/mes/pda/service/impl/PdaSpmServiceImpl.java

@@ -142,9 +142,9 @@ public  class PdaSpmServiceImpl implements PdaSpmService {
                 throw new APIErrorException(APIErrorCode.BUSINESS_FAILED,"条码"+barcode+",当前已回温: "+rewarmingTime+" 小时,回温时长超过24小时，不允许上料！");
             }
             //不能上料超过两次
-            if(Integer.valueOf(spmBarcode.get("SPB_LOADINGTIMES").toString())>=2){
+            /*if(Integer.valueOf(spmBarcode.get("SPB_LOADINGTIMES").toString())>=2){
                 throw new APIErrorException(APIErrorCode.BUSINESS_FAILED,"条码"+barcode+"已经上料过两次，不允许再上料！");
-            }
+            }*/
             //搅拌后时间累计需要≥3分钟后才允许扫描上线使用
             if(Float.compare(Float.valueOf(spmBarcode.get("MIXMINUTE").toString()),3)<=0){
                 throw new APIErrorException(APIErrorCode.BUSINESS_FAILED,"条码"+barcode+",需要搅拌3分钟之后才可以上线使用。搅拌时间为："+spmBarcode.get("SPB_MIXDATE"));
@@ -179,9 +179,14 @@ public  class PdaSpmServiceImpl implements PdaSpmService {
             baseDao.updateByCondition("spmbarcode","spb_status='已用尽',spb_emptydate = sysdate","spb_barcode='"+barcode+"'");
             content = content+"锡膏已用尽。";
         }
-        saveSpmlog("'"+barcode+"'","上料",content,linecode,macode);
-
-        baseDao.execute("UPDATE spmlog SET spl_side = nvl(( SELECT dl_table FROM deviceline WHERE dl_linecode = spl_linecode AND dl_macode = spl_makecode ), '') WHERE spl_operation = '上料' AND spl_makecode = ? AND spl_linecode = ? AND spl_barcode = ?",macode,linecode,barcode);
+        Map<String, Object> spmBarcode = validSpmBarcode(barcode);
+        if(Integer.valueOf(spmBarcode.get("SPB_LOADINGTIMES").toString()) > 1){
+            saveSpmlog("'"+barcode+"'","续加",content,linecode,macode);
+            baseDao.execute("UPDATE spmlog SET spl_side = nvl(( SELECT dl_table FROM deviceline WHERE dl_linecode = spl_linecode AND dl_macode = spl_makecode ), '') WHERE spl_operation = '续加' AND spl_makecode = ? AND spl_linecode = ? AND spl_barcode = ?",macode,linecode,barcode);
+        }else{
+            saveSpmlog("'"+barcode+"'","上料",content,linecode,macode);
+            baseDao.execute("UPDATE spmlog SET spl_side = nvl(( SELECT dl_table FROM deviceline WHERE dl_linecode = spl_linecode AND dl_macode = spl_makecode ), '') WHERE spl_operation = '上料' AND spl_makecode = ? AND spl_linecode = ? AND spl_barcode = ?",macode,linecode,barcode);
+        }
     }
 
     @Override