|
|
@@ -109,6 +109,9 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
case GetPSN:
|
|
|
remap = GetPSN(json);
|
|
|
break;
|
|
|
+ case GetMakeRelation:
|
|
|
+ remap = GetMakeRelation(json);
|
|
|
+ break;
|
|
|
default:
|
|
|
err = -1;
|
|
|
break;
|
|
|
@@ -909,6 +912,128 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ private Map<Object,Object> GetMakeRelation(JSONObject map){
|
|
|
+ String oErrMessage="";
|
|
|
+ Map<Object, Object> rmap = new HashMap<Object, Object>();
|
|
|
+ if(map.get("iSN")==null){
|
|
|
+ oErrMessage = "SN不能为空";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ String iSN=map.get("iSN").toString();
|
|
|
+ Object iMakecode=baseDao.getFieldDataByCondition("makeserial","ms_makecode","ms_id=(select max(ms_id) from makeserial where ms_sncode='"+iSN+"')");
|
|
|
+ if(iMakecode==null){
|
|
|
+ oErrMessage = iSN+"无关联工单";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ //之前有获取过的
|
|
|
+ SqlRowList rs=baseDao.queryForRowSet("select * from makeinfodet left join MakeRemark on MID_ORDERCODE=ordernumber " +
|
|
|
+ "left join aftersaledet on asd_sn=mid_sn left join DeliveryIn on DeliveryIn.sn=mid_sn " +
|
|
|
+ "left join Deliveryout on Deliveryout.sn=mid_sn left join remakedet on mid_sn=RMD_SN where mid_ordercode='"+iMakecode+"' and rownum=1");
|
|
|
+ if(rs.next()){
|
|
|
+ rmap.put("MID_ID","");
|
|
|
+ rmap.put("MID_MIID",rs.getString("MID_MIID"));
|
|
|
+ rmap.put("MID_ORDERCODE",rs.getString("MID_ORDERCODE"));
|
|
|
+ rmap.put("MID_SN",rs.getString("MID_SN"));
|
|
|
+ rmap.put("MID_WIFIMAC",rs.getString("MID_WIFIMAC"));
|
|
|
+ rmap.put("MID_IMEI",rs.getString("MID_IMEI"));
|
|
|
+ rmap.put("MID_BTMAC",rs.getString("MID_BTMAC"));
|
|
|
+ rmap.put("MID_OSVERSION",rs.getString("MID_OSVERSION"));
|
|
|
+ rmap.put("MID_OSPRODUCTKEY",rs.getString("MID_OSPRODUCTKEY"));
|
|
|
+ rmap.put("MID_OSPRODUCTID",rs.getString("MID_OSPRODUCTID"));
|
|
|
+ rmap.put("MID_DRIVERVERSION",rs.getString("MID_DRIVERVERSION"));
|
|
|
+ rmap.put("MID_BIOSVERSION",rs.getString("MID_BIOSVERSION"));
|
|
|
+ rmap.put("MID_PROCESSID",rs.getString("MID_PROCESSID"));
|
|
|
+ rmap.put("MID_HARDDISKSN",rs.getString("MID_HARDDISKSN"));
|
|
|
+ rmap.put("MID_HARDDISKMODEL",rs.getString("MID_HARDDISKMODEL"));
|
|
|
+ rmap.put("MID_CREATETIME",rs.getString("MID_CREATETIME"));
|
|
|
+ rmap.put("MID_DETNO",rs.getString("MID_DETNO"));
|
|
|
+ rmap.put("MID_EC",rs.getString("MID_EC"));
|
|
|
+ rmap.put("ORDERNUMBER",rs.getString("ORDERNUMBER"));
|
|
|
+ rmap.put("CUSTOMER",rs.getString("CUSTOMER"));
|
|
|
+ rmap.put("MODEL",rs.getString("MODEL"));
|
|
|
+ rmap.put("ORDERQUANTITY",rs.getString("ORDERQUANTITY"));
|
|
|
+ rmap.put("BARCODE",rs.getString("BARCODE"));
|
|
|
+ rmap.put("CPU",rs.getString("CPU"));
|
|
|
+ rmap.put("RAM",rs.getString("RAM"));
|
|
|
+ rmap.put("ROM",rs.getString("ROM"));
|
|
|
+ rmap.put("GENERATION",rs.getString("GENERATION"));
|
|
|
+ rmap.put("WIFI",rs.getString("WIFI"));
|
|
|
+ rmap.put("LCD",rs.getString("LCD"));
|
|
|
+ rmap.put("DPI",rs.getString("DPI"));
|
|
|
+ rmap.put("TP",rs.getString("TP"));
|
|
|
+ rmap.put("NFC",rs.getString("NFC"));
|
|
|
+ rmap.put("CAMERA",rs.getString("CAMERA"));
|
|
|
+ rmap.put("BAT",rs.getString("BAT"));
|
|
|
+ rmap.put("GPS",rs.getString("GPS"));
|
|
|
+ rmap.put("FINGERPRINT",rs.getString("FINGERPRINT"));
|
|
|
+ rmap.put("MAINBOARDVER",rs.getString("MAINBOARDVER"));
|
|
|
+ rmap.put("SUBBOARDVER",rs.getString("SUBBOARDVER"));
|
|
|
+ rmap.put("OSTYPE",rs.getString("OSTYPE"));
|
|
|
+ rmap.put("MACHINECODE",rs.getString("MACHINECODE"));
|
|
|
+ rmap.put("MCU",rs.getString("MCU"));
|
|
|
+ rmap.put("GYROSCOPE",rs.getString("GYROSCOPE"));
|
|
|
+ rmap.put("ACCELEROMETER",rs.getString("ACCELEROMETER"));
|
|
|
+ rmap.put("MAGNETOMETER",rs.getString("MAGNETOMETER"));
|
|
|
+ rmap.put("LIGHTSENSOR",rs.getString("LIGHTSENSOR"));
|
|
|
+ rmap.put("BRIDGEIC",rs.getString("BRIDGEIC"));
|
|
|
+ rmap.put("REMARK",rs.getString("REMARK"));
|
|
|
+ rmap.put("IDENTITYMODULE",rs.getString("IDENTITYMODULE"));
|
|
|
+ rmap.put("ASD_MACHINETYPE",rs.getString("ASD_MACHINETYPE"));
|
|
|
+ rmap.put("ASD_RECIVETIME",rs.getString("ASD_RECIVETIME"));
|
|
|
+ rmap.put("ASD_SALEER",rs.getString("ASD_SALEER"));
|
|
|
+ rmap.put("ASD_CUSTNAME",rs.getString("ASD_CUSTNAME"));
|
|
|
+ rmap.put("ASD_QTY",rs.getString("ASD_QTY"));
|
|
|
+ rmap.put("ASD_SENDMAN",rs.getString("ASD_SENDMAN"));
|
|
|
+ rmap.put("ASD_CONFIG",rs.getString("ASD_CONFIG"));
|
|
|
+ rmap.put("ASD_CONTENT",rs.getString("ASD_CONTENT"));
|
|
|
+ rmap.put("ASD_KIND",rs.getString("ASD_KIND"));
|
|
|
+ rmap.put("ASD_DEALMAN",rs.getString("ASD_DEALMAN"));
|
|
|
+ rmap.put("ASD_FINISHTIME",rs.getString("ASD_FINISHTIME"));
|
|
|
+ rmap.put("ASD_STATUS",rs.getString("ASD_STATUS"));
|
|
|
+ rmap.put("ASD_REMARK",rs.getString("ASD_REMARK"));
|
|
|
+ rmap.put("ASD_ACTREMAKETIME",rs.getString("ASD_ACTREMAKETIME"));
|
|
|
+ rmap.put("ASD_BIOS",rs.getString("ASD_BIOS"));
|
|
|
+ rmap.put("ASD_OS",rs.getString("ASD_OS"));
|
|
|
+ rmap.put("ASD_DETNO",rs.getString("ASD_DETNO"));
|
|
|
+ rmap.put("ASD_SN",rs.getString("ASD_SN"));
|
|
|
+ rmap.put("ASD_IMEI",rs.getString("ASD_IMEI"));
|
|
|
+ rmap.put("ASD_INDATE",rs.getString("ASD_INDATE"));
|
|
|
+ rmap.put("SN",rs.getString("SN"));
|
|
|
+ rmap.put("IMEI",rs.getString("IMEI"));
|
|
|
+ rmap.put("SALES",rs.getString("SALES"));
|
|
|
+ rmap.put("DELIVERY",rs.getString("DELIVERY"));
|
|
|
+ rmap.put("RMD_MACHINETYPE",rs.getString("RMD_MACHINETYPE"));
|
|
|
+ rmap.put("RMD_SN",rs.getString("RMD_SN"));
|
|
|
+ rmap.put("RMD_REMARK",rs.getString("RMD_REMARK"));
|
|
|
+ rmap.put("RMD_RECIVETIME",rs.getString("RMD_RECIVETIME"));
|
|
|
+ rmap.put("RMD_SALEER",rs.getString("RMD_SALEER"));
|
|
|
+ rmap.put("RMD_CUSTNAME",rs.getString("RMD_CUSTNAME"));
|
|
|
+ rmap.put("RMD_QTY",rs.getString("RMD_QTY"));
|
|
|
+ rmap.put("RMD_ASSISTANT",rs.getString("RMD_ASSISTANT"));
|
|
|
+ rmap.put("RMD_BADNAME",rs.getString("RMD_BADNAME"));
|
|
|
+ rmap.put("RMD_BADCONFRM",rs.getString("RMD_BADCONFRM"));
|
|
|
+ rmap.put("RMD_BADTYPE",rs.getString("RMD_BADTYPE"));
|
|
|
+ rmap.put("RMD_BADREASON",rs.getString("RMD_BADREASON"));
|
|
|
+ rmap.put("RMD_DEALMAN",rs.getString("RMD_DEALMAN"));
|
|
|
+ rmap.put("RMD_FINISHTIME",rs.getString("RMD_FINISHTIME"));
|
|
|
+ rmap.put("RMD_STATUS",rs.getString("RMD_STATUS"));
|
|
|
+ rmap.put("RMD_ANAREASON",rs.getString("RMD_ANAREASON"));
|
|
|
+ rmap.put("RMD_REPAIR",rs.getString("RMD_REPAIR"));
|
|
|
+ rmap.put("RMD_REPAIRKIND",rs.getString("RMD_REPAIRKIND"));
|
|
|
+ rmap.put("RMD_DAYS",rs.getString("RMD_DAYS"));
|
|
|
+ rmap.put("RMD_MDM",rs.getString("RMD_MDM"));
|
|
|
+ rmap.put("RMD_TYPE",rs.getString("RMD_TYPE"));
|
|
|
+ rmap.put("RMD_DETNO",rs.getString("RMD_DETNO"));
|
|
|
+ return rmap;
|
|
|
+ }else{
|
|
|
+ oErrMessage = "无对应配置信息";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
private Map<Object,Object> GetProdInfo(JSONObject map){
|
|
|
Map<Object, Object> rmap = new HashMap<Object, Object>();
|
|
|
String iSN=null;
|
