EP推送BPM产品时，根据产品编码查询品牌

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyApplicationImpl.java

@@ -2,6 +2,7 @@ package com.huigou.topsun.sap.nonProdApply.application.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
@@ -19,7 +20,9 @@ import com.huigou.topsun.base.bsnMessage.domain.BsnMessageSponsor;
 import com.huigou.topsun.base.bsnMessage.repository.BsnMessageExecuteRepository;
 import com.huigou.topsun.base.bsnMessage.repository.BsnMessageSponsorRepository;
 
+import com.huigou.topsun.sap.common.DefaultHttpClient;
 import com.huigou.topsun.sap.common.application.SapMutualEpLogApplication;
+import com.huigou.topsun.sap.common.domain.EpResult;
 import com.huigou.topsun.sap.costReimbursement.domain.SapCostReimbursement;
 import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyApplication;
 import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyDeptApplication;
@@ -54,6 +57,7 @@ import org.springframework.util.Assert;
 
 import javax.annotation.Resource;
 import javax.persistence.Column;
+import java.io.IOException;
 import java.util.*;
 
 @Service("nonProdApplyApplication")
@@ -75,6 +79,8 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
     private OperatorApplication operatorApplication;
     @Resource
     private OrgRepository orgRepository;
+    @Autowired
+    DefaultHttpClient defaultHttpClient;
 
     @SneakyThrows
     @Transactional(propagation = Propagation.REQUIRES_NEW)
@@ -591,6 +597,7 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
    try {
        NonProdApplyBaseInfo nonProdApplyBaseInfo = new NonProdApplyBaseInfo();
        SapNonProdApplyDept sapNonProdApplyDept = new SapNonProdApplyDept();
+       ClassHelper.copyProperties(prodApplyFromSapVO,sapNonProdApplyDept);
        ClassHelper.copyProperties(prodApplyFromSapVO, nonProdApplyBaseInfo);
 
        nonProdApplyBaseInfo.setCreatedDate(new Date());
@@ -601,10 +608,29 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
        nonProdApplyBaseInfo.setMaintenanceType("new");
        nonProdApplyBaseInfo.setApprovalDate(new Date());
        nonProdApplyBaseInfo.setKind("product");
+       if (StringUtils.isNotBlank(nonProdApplyBaseInfo.getMatnr())) {
+           String url = "md/mdItem/queryBrandByItemCode/" + nonProdApplyBaseInfo.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 ("200".equals(epResult.getCode())) {
+                   if (epResult.getData()!=null){
+                       nonProdApplyBaseInfo.setBrand(epResult.getData().getCode());
+                       nonProdApplyBaseInfo.setBrandName(epResult.getData().getName());
+                       sapNonProdApplyDept.setMvgr1(epResult.getData().getCode());
+                   }
+               } else {
+                   throw new RuntimeException("从EP查询品牌错误:" + epResult.getMsg());
+               }
+           } catch (IOException e) {
+               throw new RuntimeException("EP服务器无响应请稍后手动重试！error:" + e.getMessage());
+           }
+       }
 
        nonProdApplyBaseInfo = nonProdApplyBaseInfoRepository.save(nonProdApplyBaseInfo);
 
-       ClassHelper.copyProperties(prodApplyFromSapVO,sapNonProdApplyDept);
        sapNonProdApplyDept.setBaseInfoId(nonProdApplyBaseInfo.getId());
 
        nonProdApplyDeptApplication.save(sapNonProdApplyDept);

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

@@ -3,6 +3,7 @@ package com.huigou.topsun.sap.nonProdApply.controller;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.huigou.cache.DictUtil;
 import com.huigou.context.Operator;
 import com.huigou.context.OrgUnit;
@@ -309,7 +310,7 @@ public class NonProdApplyController extends CommonController {
         HashMap<String, Object> messageMap = new HashMap<>();
         messageMap.put("Message_Status","S");
         messageMap.put("Message_Text","成功");
-        LOG.info("参数:=={}",prodApplyFromSapVO);
+        LOG.info("参数:=={}", JSONObject.toJSONString(prodApplyFromSapVO));
         HashMap<String, Object> resultMap = new HashMap<>();
         resultMap.put("TYPE", "S");
         resultMap.put("MESSAGE","成功");

topsun/src/main/java/com/huigou/topsun/sap/sapApplication/application/impl/SapMaterialApplicationImpl.java

@@ -223,6 +223,7 @@ public class SapMaterialApplicationImpl implements SapMaterialApplication {
                      newMap.put("LFDAT", sendDate);               //出货日期
 
                      newMap.put("MEINS", mapItem.get("MEINS_O"));               //单位
+                     newMap.put("NETWR", mapItem.get("NETWR"));               //单位
                      // KPEIN //定价单位
                      newMap.put("KWERT", mapItem.get("KWERT"));  //       //折前总金额
                      newMap.put("KOEIN", mapItem.get("KOEIN")); //         币别