【慧眼EIS，修改接口ItemCode/getItemCode】

src/main/java/com/uas/eis/controller/QueryController.java

@@ -47,7 +47,7 @@ public class QueryController {
 
 	//http://xx.xx.xx.xx:xxx/api/ItemCode/getAssemblyInfo?partcode=xxx&materialcode=xxxx&proname=xxx&ver=1.0
 	@RequestMapping(value = "/ItemCode/getItemCode" )
-	public Map<String,Object> getItemCode(HttpServletRequest request, String partcode, String materialcode, String proname, String ver){
-		return queryService.getItemCode(partcode,materialcode,proname,ver);
+	public Map<String,Object> getItemCode(HttpServletRequest request, String partcode, String partcodetype){
+		return queryService.getItemCode(partcode,partcodetype);
 	}
 }

src/main/java/com/uas/eis/service/QueryService.java

@@ -20,5 +20,5 @@ public interface QueryService {
 
 	ApiResult<List<Map<String,Object>>> getMakeProcess(String accessKey, String requestId, String macode);
 
-	Map<String,Object> getItemCode(String partcode, String materialcode, String proname, String ver);
+	Map<String,Object> getItemCode(String partcode, String partcodetype);
 }

src/main/java/com/uas/eis/serviceImpl/QueryServiceImpl.java

@@ -310,31 +310,65 @@ public class QueryServiceImpl implements QueryService {
 		return ApiResponse.successRsp("0",requestId,null);
 	}
 
+	/**
+	 *
+	 * @param partcode
+	 * @param partcodetype
+	 * @return
+	 * 	{
+	 * 			"code" : {
+	 * 			"msg": "成功",
+	 * 					"code": "0000"
+	 * 		        },
+	 * 			"bo": {
+	 * 			"itemName": "IP Camera|高清智能摄像头",
+	 * 					"itemCode": "060020300406",
+	 * 					"bomVersion": "1.0"
+	 *       }
+	 *   }
+	 */
 	@Override
-	public Map<String,Object> getItemCode(String partcode, String materialcode, String proname, String ver) {
-		String data = "partcode:"+partcode+",materialcode:"+materialcode+",proname:"+proname+",ver:"+ver;
-		baseDao.execute("insert into eisquerydata(ed_id,ed_data,ed_type) SELECT eisquerydata_SEQ.NEXTVAL,?,? FROM DUAL",data,"getItemCode");
+	public Map<String,Object> getItemCode(String partcode, String partcodetype) {
 		Map<String,Object> map = new HashMap<>();
 		Map<String,Object> map1 = new HashMap<>();
-		map1.put("msg","成功");
-		map1.put("code","0000");
-		map.put("code",map1);
-		Map<String,Object> map2 = new HashMap<>();
-		map2.put("itemName","IP Camera|高清智能摄像头");
-		map2.put("itemCode","060020300406");
-		map2.put("bomVersion","1.0");
-		map.put("bo",map2);
-		return map;
-		/*{
-			"code" : {
-			"msg": "成功",
-					"code": "0000"
-		},
-			"bo": {
-			"itemName": "IP Camera|高清智能摄像头",
-					"itemCode": "060020300406",
-					"bomVersion": "1.0"
-		}}*/
+		String data = "partcode:"+partcode+",partcodetype:"+partcodetype;
+		baseDao.execute("insert into eisquerydata(ed_id,ed_data,ed_type) SELECT eisquerydata_SEQ.NEXTVAL,?,? FROM DUAL",data,"getItemCode");
+		if(StringUtil.hasText(partcode)){
+			//select ITEM_NAME,BOM_VER  from zte_order 取工单一节，然后根据工单对应的生产批次号获取
+			SqlRowList rs = baseDao.queryForRowSet("select ma_code,ma_custpo,batch_no,MATERIAL_CODE,ITEM_NAME,BOM_VER from make " +
+					" left join zte_order on ma_custpo=BATCH_NO where SUBSTR(ma_code,INSTR(ma_code, '-')+1)=?",partcode);
+            if(rs.next()){
+				if(StringUtil.hasText(rs.getString("batch_no"))){
+					map1.put("msg","成功");
+					map1.put("code","0000");
+					map.put("code",map1);
+					Map<String,Object> map2 = new HashMap<>();
+					map2.put("itemName",rs.getObject("item_name"));
+					map2.put("itemCode",rs.getObject("material_code"));
+					map2.put("bomVersion",rs.getObject("bom_ver"));
+					map.put("bo",map2);
+					return map;
+				}else{
+					map1.put("msg","失败，查询到partcode:"+partcode+"对应的工单:"+rs.getString("ma_code")+"的ma_custpo在客户订单表无数据！");
+					map1.put("code","1000");
+					map.put("code",map1);
+					map.put("bo","null");
+					return map;
+				}
+			}else{
+				map1.put("msg","失败，未查询到partcode:"+partcode+"对应的工单！");
+				map1.put("code","1000");
+				map.put("code",map1);
+				map.put("bo","null");
+				return map;
+			}
+		}else{
+			map1.put("msg","失败，partcode为空！");
+			map1.put("code","1000");
+			map.put("code",map1);
+			map.put("bo","null");
+			return map;
+		}
 	}
 
 	private String checkAccessKey(String accessKey,String requestId){