Commit 7ba3fcca authored by gaoyingwei's avatar gaoyingwei

add:增加表单模板xml文件

parent 905c65a8
...@@ -147,8 +147,11 @@ import org.apache.commons.lang3.math.NumberUtils; ...@@ -147,8 +147,11 @@ import org.apache.commons.lang3.math.NumberUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -11242,11 +11245,24 @@ public class ColManagerImpl implements ColManager { ...@@ -11242,11 +11245,24 @@ public class ColManagerImpl implements ColManager {
@Override @Override
public Map<String, Object> parameterChangeGetMoney(Map<String,Object> paramMap) { public Map<String, Object> parameterChangeGetMoney(Map<String,Object> paramMap) {
paramMap.get("kx"); // paramMap.get("kx");
// 调用ERP接口 //封装好参数
//调用ERP接口
//jiecan
//http://192.168.3.44:8080/webapi/config/getPrice
// RestTemplate restTemplate = new RestTemplate();
// HttpHeaders headers = new HttpHeaders();
// headers.setContentType(MediaType.APPLICATION_JSON);
// Map<String, Object> respnose = restTemplate.getForObject("http://192.168.3.44:8080/webapi/config/getPrice", null, Map.class);
RestTemplate rest = new RestTemplate();
Map<String, String> params = new HashMap<String, String>();
// params.put("s", "hello");
// String url = "http://localhost:8990/drce/hello";
String respnose = rest.getForObject("http://192.168.3.44:8080/webapi/config/getPrice", String.class,paramMap);
Map<String, Object> resultMap = new HashMap<>(); Map<String, Object> resultMap = new HashMap<>();
resultMap.put("zj",100); resultMap.put("zj",100);
return resultMap; paramMap.put("zj",respnose);
return paramMap;
} }
@AjaxAccess @AjaxAccess
......
...@@ -180,7 +180,8 @@ public class FalseDoTimer { ...@@ -180,7 +180,8 @@ public class FalseDoTimer {
covers += "烫金,"; covers += "烫金,";
if (cover3.equals("1")) if (cover3.equals("1"))
covers += "UV,"; covers += "UV,";
covers = covers.substring(0, covers.length() - 1); if (covers.length() > 0)
covers = covers.substring(0, covers.length() - 1);
String namekeycoverSize = master.getFormTable().getFieldMap4Display().get("封面纸张").getName(); String namekeycoverSize = master.getFormTable().getFieldMap4Display().get("封面纸张").getName();
String coverSize = (String) master.getAllDataMap().get(namekeycoverSize); String coverSize = (String) master.getAllDataMap().get(namekeycoverSize);
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment