|
|
@@ -118,9 +118,18 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
case GetFeeReason:
|
|
|
remap = GetFeeReason(json);
|
|
|
break;
|
|
|
+ case GetMakeSN:
|
|
|
+ remap = GetMakeSN(json);
|
|
|
+ break;
|
|
|
case SetFeeReason:
|
|
|
remap = SetFeeReason(json);
|
|
|
break;
|
|
|
+ case WriteMakeInfo:
|
|
|
+ remap = WriteMakeInfo(json);
|
|
|
+ break;
|
|
|
+ case GetMakeInfo:
|
|
|
+ remap = GetMakeInfo(json);
|
|
|
+ break;
|
|
|
default:
|
|
|
err = -1;
|
|
|
break;
|
|
|
@@ -132,14 +141,134 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
return remap;
|
|
|
}
|
|
|
|
|
|
+ private Map<Object,Object> GetMakeInfo(JSONObject map){
|
|
|
+ Map<Object, Object> rmap = new HashMap<Object, Object>();
|
|
|
+ String iSN=null;
|
|
|
+ String oErrMessage=null;
|
|
|
+ if(map.get("iSN")==null){
|
|
|
+ oErrMessage = "SN不能为空";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ iSN=map.get("iSN").toString();
|
|
|
+ Object makecode=baseDao.getFieldDataByCondition(Master+".makeserial","ms_makecode","ms_id=(select max(ms_id) from "+Master+".makeserial where ms_sncode='"+iSN+"')");
|
|
|
+ if(makecode==null){
|
|
|
+ oErrMessage = "SN不存在";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ SqlRowList rs=baseDao.queryForRowSet("select mid_item,mid_value from "+Master+".makeitem left join "+Master+".makeitemdetail on mi_id=mid_miid " +
|
|
|
+ "where mi_makecode='"+makecode+"' and mid_item is not null");
|
|
|
+ while(rs.next()){
|
|
|
+ rmap.put(rs.getString("mid_item"),rs.getString("mid_value"));
|
|
|
+ }
|
|
|
+ return rmap;
|
|
|
+ /*if(rs.next()){
|
|
|
+
|
|
|
+ }else{
|
|
|
+ oErrMessage = "SN未查询到关联信息";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }*/
|
|
|
+ }
|
|
|
+
|
|
|
+ private Map<Object,Object> WriteMakeInfo(JSONObject map){
|
|
|
+ Map<Object, Object> rmap = new HashMap<Object, Object>();
|
|
|
+ String oErrMessage=null;
|
|
|
+ if(map.get("iMakeCode")==null){
|
|
|
+ oErrMessage = "工单号不能为空";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ String MO=map.get("iMakeCode").toString();
|
|
|
+ String Item=map.get("Item").toString();
|
|
|
+
|
|
|
+ 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 "+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 "+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(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 "+Master+".makeitemdetail(mid_id,mid_miid,mid_item,mid_value)" +
|
|
|
+ "values("+Master+".makeitemdetail_seq.nextval,'"+mi_id+"','"+key.toString()+"','"+value.toString()+"')");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+
|
|
|
+ private Map<Object,Object> GetMakeSN(JSONObject map){
|
|
|
+ Map<Object, Object> rmap = new HashMap<Object, Object>();
|
|
|
+ List<Map<String, Object>> maps = new ArrayList<>();
|
|
|
+ String ma_custname="";
|
|
|
+ String TIME_BEGIN="";
|
|
|
+ String TIME_END="";
|
|
|
+ String oErrMessage="";
|
|
|
+ if(map.get("MA_CUSTNAME")==null){
|
|
|
+ oErrMessage = "客户名称不能为空";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ if(map.get("TIME_BEGIN")==null){
|
|
|
+ oErrMessage = "开始时间不能为空";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ if(map.get("TIME_END")==null){
|
|
|
+ oErrMessage = "结束时间不能为空";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ ma_custname=map.get("MA_CUSTNAME").toString();
|
|
|
+ TIME_BEGIN=map.get("TIME_BEGIN").toString();
|
|
|
+ TIME_END=map.get("TIME_END").toString();
|
|
|
+ SqlRowList rs=baseDao.queryForRowSet("select ms_sncode from makeserial left join make on ma_code=ms_makecode where ms_enddate between to_date('"+TIME_BEGIN+"','yyyy-mm-dd') " +
|
|
|
+ "and to_date('"+TIME_END+"','yyyy-mm-dd') and ma_custname='"+ma_custname+"'");
|
|
|
+ rmap.put("data",rs.getResultList());
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+
|
|
|
private Map<Object,Object> GetFeeReason(JSONObject map){
|
|
|
Map<Object, Object> rmap = new HashMap<Object, Object>();
|
|
|
- return;
|
|
|
+ String oErrMessage="";
|
|
|
+ if(map.get("CT_ID")==null){
|
|
|
+ oErrMessage = "单据ID不能为空";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ 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 "+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));
|
|
|
+ }
|
|
|
+ return rmap;
|
|
|
+ }else {
|
|
|
+ oErrMessage = "单据ID不存在";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
private Map<Object,Object> SetFeeReason(JSONObject map){
|
|
|
Map<Object, Object> rmap = new HashMap<Object, Object>();
|
|
|
- return;
|
|
|
+ String formstore=map.get("data").toString();
|
|
|
+ Map<Object, Object> gstore = BaseUtil.parseFormStoreToMap(formstore);
|
|
|
+ String gridSql = SqlUtil.getUpdateSqlByFormStore(gstore,Master+".CUSTOMTABLE", "CT_ID");
|
|
|
+ baseDao.execute(gridSql);
|
|
|
+ return null;
|
|
|
}
|
|
|
|
|
|
private Map<Object,Object> GoMo(JSONObject map){
|