Commit 63835794 authored by gaoyingwei's avatar gaoyingwei

update:修改 下单表单流程结束后简化流程,向门户发送确认状态(包括定时

parent 21a0debf
...@@ -2571,7 +2571,8 @@ public class CollaborationController extends BaseController { ...@@ -2571,7 +2571,8 @@ public class CollaborationController extends BaseController {
// String namekeyunitprice = master.getFormTable().getFieldMap4Display().get("单价").getName(); // String namekeyunitprice = master.getFormTable().getFieldMap4Display().get("单价").getName();
// BigDecimal unitprice = (BigDecimal)master.getAllDataMap().get(namekeyunitprice); // BigDecimal unitprice = (BigDecimal)master.getAllDataMap().get(namekeyunitprice);
try { /** 注释返回给门户确认流程
try {
List<HttpMessageConverter<?>> list = restTemplate.getMessageConverters(); List<HttpMessageConverter<?>> list = restTemplate.getMessageConverters();
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
HttpMessageConverter<?> httpMessageConverter = list.get(i); HttpMessageConverter<?> httpMessageConverter = list.get(i);
...@@ -2587,7 +2588,19 @@ public class CollaborationController extends BaseController { ...@@ -2587,7 +2588,19 @@ public class CollaborationController extends BaseController {
} catch(Exception e){ } catch(Exception e){
colManager.updateColSummaryGeneralStateBySource(code,5); colManager.updateColSummaryGeneralStateBySource(code,5);
} }
*/
colManager.updateColSummaryGeneralStateBySource(code,1);
DIC_DATA_URL = url + "/signprintmessage/oaSetPrintStatus";
DIC_DATA_URL = DIC_DATA_URL+"?printId="+code+"&printStatus=1";
try {
Map<String, Object> respnose = restTemplate.postForObject(DIC_DATA_URL, null, Map.class);
if(!(Boolean) respnose.get("success")){
colManager.updateColSummaryGeneralStateBySource(code,5);
}
} catch(Exception e){
colManager.updateColSummaryGeneralStateBySource(code,5);
}
} }
} }
} }
......
...@@ -130,7 +130,7 @@ public class FalseDoTimer { ...@@ -130,7 +130,7 @@ public class FalseDoTimer {
//下单流程 //下单流程
} else if ("XDLC".equals(ctpTemplate.getTempleteNumber()) | "ECXDLC".equals(ctpTemplate.getTempleteNumber()) } else if ("XDLC".equals(ctpTemplate.getTempleteNumber()) | "ECXDLC".equals(ctpTemplate.getTempleteNumber())
| "XDLCQT".equals(ctpTemplate.getTempleteNumber()) | "ECXDLCQT".equals(ctpTemplate.getTempleteNumber())) { | "XDLCQT".equals(ctpTemplate.getTempleteNumber()) | "ECXDLCQT".equals(ctpTemplate.getTempleteNumber())) {
if (oastate == 4) { //审核通过 if (oastate == 5) { //审核通过
String filePath = SystemEnvironment.getApplicationFolder() + File.separator + "fkmap" + File.separator + "url.properties" ; String filePath = SystemEnvironment.getApplicationFolder() + File.separator + "fkmap" + File.separator + "url.properties" ;
InputStream in = new BufferedInputStream(new FileInputStream(filePath)); InputStream in = new BufferedInputStream(new FileInputStream(filePath));
Properties p = new Properties(); Properties p = new Properties();
...@@ -272,15 +272,23 @@ public class FalseDoTimer { ...@@ -272,15 +272,23 @@ public class FalseDoTimer {
// DIC_DATA_URL = DIC_DATA_URL + "?id=" + code + "&printStatus=" + 1 + "&pageSize=" + pageSize1 + "&cover=" + cover1 + "&coverSize=" + coverSize1 + "&nevinSize=" + nevinSize1 + "&insertSize=" + insertSize1 + "&machinetype=" + machinetype1 + "&distribution=" + distribution1 + "&pagesided=" + pagesided1 + "&urgent=" + urgent + "&aggregate=" + totalprice + "&price=" + unitprice + "&remark=" + remarks; // DIC_DATA_URL = DIC_DATA_URL + "?id=" + code + "&printStatus=" + 1 + "&pageSize=" + pageSize1 + "&cover=" + cover1 + "&coverSize=" + coverSize1 + "&nevinSize=" + nevinSize1 + "&insertSize=" + insertSize1 + "&machinetype=" + machinetype1 + "&distribution=" + distribution1 + "&pagesided=" + pagesided1 + "&urgent=" + urgent + "&aggregate=" + totalprice + "&price=" + unitprice + "&remark=" + remarks;
respnose = restTemplate.postForObject(DIC_DATA_URL, null, Map.class); /** 注释返回给门户确认流程 respnose = restTemplate.postForObject(DIC_DATA_URL, null, Map.class);
String succ=respnose.get("success").toString(); String succ=respnose.get("success").toString();
if (Strings.isNotBlank(succ)&&"true".equals(succ)) { if (Strings.isNotBlank(succ)&&"true".equals(succ)) {
colManager.updateColSummaryGeneralStateBySource(code, 0); colManager.updateColSummaryGeneralStateBySource(code, 0);
} }
*/
DIC_DATA_URL = url + "/signprintmessage/oaSetPrintStatus";
DIC_DATA_URL = DIC_DATA_URL+"?printId="+code+"&printStatus=1";
respnose = restTemplate.postForObject(DIC_DATA_URL, null, Map.class);
String succ=respnose.get("success").toString();
if (Strings.isNotBlank(succ)&&"true".equals(succ)) {
colManager.updateColSummaryGeneralStateBySource(code, 1);
}
} else if (oastate == 5) { //终止流程 } else if (oastate == 6) { //终止流程
String filePath = SystemEnvironment.getApplicationFolder() + File.separator + "fkmap" + File.separator + "url.properties" ; String filePath = SystemEnvironment.getApplicationFolder() + File.separator + "fkmap" + File.separator + "url.properties" ;
InputStream in = new BufferedInputStream(new FileInputStream(filePath)); InputStream in = new BufferedInputStream(new FileInputStream(filePath));
Properties p = new Properties(); Properties p = new Properties();
......
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