|
|
@@ -146,27 +146,27 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
String MO=map.get("iMakeCode").toString();
|
|
|
String Item=map.get("Item").toString();
|
|
|
|
|
|
- SqlRowList rs=baseDao.queryForRowSet("select * from makeitem where mi_makecode='"+MO+"'");
|
|
|
+ SqlRowList rs=baseDao.queryForRowSet("select * from "+Master+".makeitem where mi_makecode='"+MO+"'");
|
|
|
//如果已经存在工单了
|
|
|
if(rs.next()){
|
|
|
String[] str=Item.split("\\|");
|
|
|
String mi_id=rs.getString("mi_id");
|
|
|
- baseDao.execute("delete from makeitemdetail where mid_miid='"+mi_id+"'");
|
|
|
+ baseDao.execute("delete from "+Master+".makeitemdetail where mid_miid='"+mi_id+"'");
|
|
|
for (int i=0;i<str.length;i++) {
|
|
|
Object key = str[i].split("#")[0];
|
|
|
Object value = str[i].split("#")[1];
|
|
|
- baseDao.execute("insert into makeitemdetail(mid_id,mid_miid,mid_item,mid_value)" +
|
|
|
- "values(makeitemdetail_seq.nextval,'"+mi_id+"','"+key.toString()+"','"+value.toString()+"')");
|
|
|
+ baseDao.execute("insert into "+Master+".makeitemdetail(mid_id,mid_miid,mid_item,mid_value)" +
|
|
|
+ "values("+Master+".makeitemdetail_seq.nextval,'"+mi_id+"','"+key.toString()+"','"+value.toString()+"')");
|
|
|
}
|
|
|
}else {
|
|
|
- int mi_id = baseDao.getSeqId("makeitem_seq");
|
|
|
+ int mi_id = baseDao.getSeqId(Master+".makeitem_seq");
|
|
|
String[] str=Item.split("\\|");
|
|
|
baseDao.execute("insert into makeitem(mi_id,mi_makecode,mi_indate)values("+mi_id+",'"+MO+"',sysdate)");
|
|
|
for (int i=0;i<str.length;i++) {
|
|
|
Object key = str[i].split("#")[0];
|
|
|
Object value = str[i].split("#")[1];
|
|
|
- baseDao.execute("insert into makeitemdetail(mid_id,mid_miid,mid_item,mid_value)" +
|
|
|
- "values(makeitemdetail_seq.nextval,'"+mi_id+"','"+key.toString()+"','"+value.toString()+"')");
|
|
|
+ baseDao.execute("insert into "+Master+".makeitemdetail(mid_id,mid_miid,mid_item,mid_value)" +
|
|
|
+ "values("+Master+".makeitemdetail_seq.nextval,'"+mi_id+"','"+key.toString()+"','"+value.toString()+"')");
|
|
|
}
|
|
|
}
|
|
|
return rmap;
|
|
|
@@ -181,7 +181,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
return rmap;
|
|
|
}
|
|
|
SqlRowList rs=baseDao.queryForRowSet("select ct_code,ct_number_3,ct_varchar50_18,ct_varchar500_1,ct_varchar500_2,ct_varchar500_3,ct_varchar500_4,ct_varchar500_5,ct_number_2,ct_varchar50_27,ct_number_19,ct_varchar50_30,ct_varchar50_25,ct_number_12,ct_number_23,ct_varchar50_34,ct_varchar50_39,ct_varchar50_22,ct_statuscode,ct_date_1,ct_status,ct_recorder,ct_varchar50_10,ct_date_2,ct_id,ct_varchar50_1,ct_varchar50_2,ct_varchar50_3,ct_varchar50_4,ct_varchar50_5,ct_varchar50_6,ct_varchar50_7,ct_varchar50_8,ct_varchar50_11,ct_number_1,ct_varchar50_9,ct_varchar50_12,ct_varchar50_13,ct_varchar50_14,ct_varchar50_15,ct_varchar50_16,ct_caller" +
|
|
|
- " from CUSTOMTABLE where ct_id="+map.get("CT_ID") +" and ct_caller='MakeFee'");
|
|
|
+ " from "+Master+".CUSTOMTABLE where ct_id="+map.get("CT_ID") +" and ct_caller='MakeFee'");
|
|
|
if(rs.next()){
|
|
|
for(String key:rs.getCurrentMap().keySet()){
|
|
|
rmap.put(key,rs.getCurrentMap().get(key));
|
|
|
@@ -198,7 +198,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
Map<Object, Object> rmap = new HashMap<Object, Object>();
|
|
|
String formstore=map.get("data").toString();
|
|
|
Map<Object, Object> gstore = BaseUtil.parseFormStoreToMap(formstore);
|
|
|
- String gridSql = SqlUtil.getUpdateSqlByFormStore(gstore,"CUSTOMTABLE", "CT_ID");
|
|
|
+ String gridSql = SqlUtil.getUpdateSqlByFormStore(gstore,Master+".CUSTOMTABLE", "CT_ID");
|
|
|
baseDao.execute(gridSql);
|
|
|
return null;
|
|
|
}
|