|
|
@@ -2060,7 +2060,22 @@ public class BatchDealServiceImpl implements BatchDealService {
|
|
|
if((cn1+cn2)==0){
|
|
|
BaseUtil.showErrorOnSuccess("输入的条件有误,请检查条件");
|
|
|
}
|
|
|
- }else if(("MakeMAC!Query").equals(caller)){
|
|
|
+ }
|
|
|
+ else if(("SNRELATIONINFO").equals(caller)){
|
|
|
+ //未被使用的SN
|
|
|
+ int cn2= baseDao.getCount("select count(1) cn from SNRELATIONINFO where "+data+"");
|
|
|
+ sqls.add("delete from SNRELATIONINFO where "+data+"");
|
|
|
+ sqls.add("INSERT INTO MessageLog(ml_date,ml_man,ml_content,ml_result,ml_search) VALUES(sysdate,'"
|
|
|
+ + SystemSession.getUser().getEm_name() + "','批量删除SN打印关系','删除"+cn2+"条成功','Make!Base')");
|
|
|
+ baseDao.execute(sqls);
|
|
|
+ if( cn2 != 0 ){
|
|
|
+ BaseUtil.showErrorOnSuccess(cn2+"条码删除成功");
|
|
|
+ }
|
|
|
+ if((cn2)==0){
|
|
|
+ BaseUtil.showErrorOnSuccess("输入的条件有误,请检查条件");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else if(("MakeMAC!Query").equals(caller)){
|
|
|
//被使用过的MACBT
|
|
|
int cn1= baseDao.getCount("select count(1) cn from makeaddresslist where "+data+" and nvl(mal_sncode,' ') <> ' '");
|
|
|
//未被使用的MACBT
|
|
|
@@ -2147,7 +2162,21 @@ public class BatchDealServiceImpl implements BatchDealService {
|
|
|
BaseUtil.showErrorOnSuccess(cn2+"条码删除成功."+cn1+"条删除失败."+(cn1 > 0 ? "失败原因:已被使用":""));
|
|
|
}
|
|
|
|
|
|
- }
|
|
|
+ }else if(("SNRELATIONINFO").equals(caller)){
|
|
|
+ String ids = CollectionUtil.pluckSqlString(store, "sr_id");
|
|
|
+ int cn3 = 0;
|
|
|
+ cn3 = baseDao.getCount("select count(1) cn from SNRELATIONINFO where sr_id in("+ids+") ");
|
|
|
+ List<String> sqls = new ArrayList<String>();
|
|
|
+ for(Map<Object,Object> map:store){
|
|
|
+ sqls.add("delete from SNRELATIONINFO where sr_id="+map.get("sr_id") +" ");
|
|
|
+ }
|
|
|
+ sqls.add("INSERT INTO MessageLog(ml_date,ml_man,ml_content,ml_result,ml_search) VALUES(sysdate,'"
|
|
|
+ + SystemSession.getUser().getEm_name() + "','批量删除工单SN打印关系','删除"+cn3+"条成功','Make!Base')");
|
|
|
+ baseDao.execute(sqls);
|
|
|
+ if( cn3 != 0 ){
|
|
|
+ BaseUtil.showErrorOnSuccess(cn3+"条码删除成功");
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|