物料查询品牌调整

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyNextController.java

@@ -293,16 +293,18 @@ public class NonProdApplyNextController extends CommonController {
                 return forward("nonProdApplyClass", nonProdApplyDept);
             case "V": //销售
                if (StringUtils.isNotBlank(nonProdApplyDept.getMatnr())) {
-                  String url = "/md/mditem/queryBrandByItemCode?sapItemcode=" + nonProdApplyDept.getMatnr();
+                  String url = "md/mditem/queryBrandByItemCode/" + nonProdApplyDept.getMatnr();
                      Map map = new HashMap();
                 try {
                     //{msg:"","code":"",data:{"code":"","name":}}
                     String result = defaultHttpClient.executeForEp(map, url);
                     EpResult epResult = JSONObject.parseObject(result, EpResult.class);
-                    if ("".equals(epResult.getMsg())) {
-                        nonProdApplyDept.setBrand(epResult.getData().getCode());
-                        nonProdApplyDept.setBrandName(epResult.getData().getName());
-                        nonProdApplyDept.setMvgr2(epResult.getData().getCode());
+                    if ("200".equals(epResult.getCode())) {
+                        if (epResult.getData()!=null){
+                            nonProdApplyDept.setBrand(epResult.getData().getCode());
+                            nonProdApplyDept.setBrandName(epResult.getData().getName());
+                            nonProdApplyDept.setMvgr2(epResult.getData().getCode());
+                        }
                     } else {
                         throw new RuntimeException("从EP查询品牌错误:" + epResult.getMsg());
                     }