1

mjava-lingmingguangzi/src/main/java/com/malk/lingmingguangzi/service/LingmingguangziServiceImpl.java

@@ -357,13 +357,61 @@ public class LingmingguangziServiceImpl implements LingmingguangziService {
     @Override
     public McR getProductDeliveryStatus(String keyword,int pageNo,int pageSize,String type) {
         Map<String,Object> param = new HashMap<>();
+
+        //物料编码
         param.put("pageNo",pageNo);
         param.put("pageSize",pageSize);
-        param.put("saleCode",keyword);
+        param.put("partnumber",keyword);
         Map<String,Object> res = get(getErpUrl(type) + "pws/pdm/pdmProductForm/list", param, getHeader(type));
-
         Map result = (Map) res.get("result");
         List<Map> data = (List<Map>) result.get("records");
+
+        if (data.isEmpty()){
+            //物料名称
+            param.remove("partnumber");
+            param.put("partname",keyword);
+            res = get(getErpUrl(type) + "pws/pdm/pdmProductForm/list", param, getHeader(type));
+            result = (Map) res.get("result");
+            data = (List<Map>) result.get("records");
+        }
+
+        if (data.isEmpty()){
+            //物料型号
+            param.remove("partname");
+            param.put("pmodel",keyword);
+            res = get(getErpUrl(type) + "pws/pdm/pdmProductForm/list", param, getHeader(type));
+            result = (Map) res.get("result");
+            data = (List<Map>) result.get("records");
+        }
+
+        if (data.isEmpty()){
+            //物料规格
+            param.remove("pmodel");
+            param.put("pstandard",keyword);
+            res = get(getErpUrl(type) + "pws/pdm/pdmProductForm/list", param, getHeader(type));
+            result = (Map) res.get("result");
+            data = (List<Map>) result.get("records");
+        }
+
+        if (data.isEmpty()){
+            //客户型号
+            param.remove("pstandard");
+            param.put("customerModel",keyword);
+            res = get(getErpUrl(type) + "pws/pdm/pdmProductForm/list", param, getHeader(type));
+            result = (Map) res.get("result");
+            data = (List<Map>) result.get("records");
+        }
+
+        //交付名称
+        if (data.isEmpty()){
+            param.remove("customerModel");
+            param.put("saleCode",keyword);
+            res = get(getErpUrl(type) + "pws/pdm/pdmProductForm/list", param, getHeader(type));
+            result = (Map) res.get("result");
+            data = (List<Map>) result.get("records");
+        }
+
+        //交付说明
         if (data.isEmpty()){
             param.remove("saleCode");
             param.put("saleName",keyword);
@@ -372,6 +420,8 @@ public class LingmingguangziServiceImpl implements LingmingguangziService {
             data = (List<Map>) result.get("records");
         }
 
+
+
         int totalCount = (int) result.get("total");
         int currentPage = (int) result.get("current");
 
@@ -1027,9 +1077,9 @@ public class LingmingguangziServiceImpl implements LingmingguangziService {
         formData.put("employeeField_m25inxlq",formData.get("employeeField_m25inxlq_id"));//对接销售
         formData.put("employeeField_m2cz3vbt",formData.get("employeeField_m2cz3vbt_id"));//关联人员
 
-        String jsonString = formData.get("associationFormField_m0yq620s_id").toString();
-        String currencyJsonString = StringEscapeUtils.unescapeJava(jsonString.substring(1, jsonString.length() - 1));
-        formData.put("associationFormField_m0yq620s",currencyJsonString);//结算币别
+//        /*String jsonString = formData.get("associationFormField_m0yq620s_id").toString();
+//        String currencyJsonString = StringEscapeUtils.unescapeJava(jsonString.substring(1, jsonString.length() - 1));
+//        formData.put("associationFormField_m0yq620s",currencyJsonString);//结算币别*/
 
 
 
@@ -1119,12 +1169,11 @@ public class LingmingguangziServiceImpl implements LingmingguangziService {
             return McR.errorParam("项目名称不能为空！");
         }
 
-        //根据项目名称获取项目id
         if (Strings.isNullOrEmpty(projectId)){
             TBR projectTbr = (TBR) UtilHttp.doGet("https://open.teambition.com/api/v3/project/query", initHeaderToken(), UtilMap.map("name", projectName), TBR.class);
             List<Map> projectList = (List<Map>) projectTbr.getResult();
             if (projectList.isEmpty()){
-                return McR.errorParam("项目名称不存在！");
+                return McR.errorParam("未在TB中查询到此项目信息！");
             }
             Map projectMap = projectList.get(0);
             projectId = projectMap.get("id").toString();
@@ -1274,7 +1323,7 @@ public class LingmingguangziServiceImpl implements LingmingguangziService {
             TBR projectTbr = (TBR) UtilHttp.doGet("https://open.teambition.com/api/v3/project/query", initHeaderToken(), UtilMap.map("name", projectName), TBR.class);
             List<Map> projectList = (List<Map>) projectTbr.getResult();
             if (projectList.isEmpty()){
-                return McR.errorParam("项目名称不存在！");
+                return McR.errorParam("未在TB中查询到此项目信息！");
             }
             Map projectMap = projectList.get(0);
             projectId = projectMap.get("id").toString();
@@ -1394,15 +1443,16 @@ public class LingmingguangziServiceImpl implements LingmingguangziService {
         }
 
         //获取父任务工作流状态
+        //获取父任务详情
         TBR tbr2 = (TBR) UtilHttp.doGet("https://open.teambition.com/api/v3/task/query", initHeaderToken(), UtilMap.map("taskId", parentTaskId), TBR.class);
         List<Map<String, Object>> result2 = (List<Map<String, Object>>) tbr2.getResult();
         String sfcId = result2.get(0).get("sfcId").toString();
         String tfsId = result2.get(0).get("tfsId").toString();
-
+        //获取项目任务类型
         TBR tbr3 = (TBR) UtilHttp.doGet("https://open.teambition.com/api/v3/project/"+projectId+"/scenariofieldconfig/search", initHeaderToken(), UtilMap.map("sfcIds", sfcId), TBR.class);
         List<Map<String, Object>> result3 = (List<Map<String, Object>>) tbr3.getResult();
         String taskflowId = result3.get(0).get("taskflowId").toString();
-
+        //搜索项目工作流状态
         TBR tbr4 = (TBR) UtilHttp.doGet("https://open.teambition.com/api/v3/project/" + projectId + "/taskflowstatus/search", initHeaderToken(), UtilMap.map("tfIds", taskflowId), TBR.class);
         List<Map<String, Object>> result4 = (List<Map<String, Object>>) tbr4.getResult();
         result4.forEach(tf -> {

mjava-lingmingguangzi/src/main/resources/application-prod.yml

@@ -45,15 +45,17 @@ aliwork:
 
 #深圳环境
 erp_sz:
-  url:  https://szerp.adapsphotonics.net:28443/
+  url:  http://127.0.0.1:9093/
   username: 黄君
   password: 123456789aa
-#  filePath: e:\\crm\\file\\sz\\
-  filePath: d:\\
+  filePath: e:\\crm\\file\\sz\\
+#  filePath: d:\\
+#  filePath: /home/server/lingmingguangzi/file/sz/
 #香港环境
 erp_xg:
-  url: https://hkerp.adapsphotonics.net:28443/
+  url: http://127.0.0.1:9094/
   username: 黄君
   password: Hello@1234
-#  filePath: e:\\crm\\file\\xg\\
-  filePath: d:\\
+  filePath: e:\\crm\\file\\xg\\
+#  filePath: d:\\
+#  filePath: /home/server/lingmingguangzi/file/xg/