Skip to content

T
topsun-bpm
Commit 496bf3a1 authored by 1650842865's avatar 1650842865
Browse files
Options

原材料变更选择编码时排除产成品和半成品；原材料变更打印页面调整

parent 05d8a905
Hide whitespace changes
Inline Side-by-side
Showing with 326 additions and 77 deletions
topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormDetail.js
View file @ 496bf3a1
...@@ -195,13 +195,13 @@ function loadGrid() { ...@@ -195,13 +195,13 @@ function loadGrid() {
// } // }
}, },
{ {
display: "跟进事项", name: "followMatter", width: 200, minWidth: 60, type: "string", align: "left", display: "跟进事项", name: "followMatter", width: 500, minWidth: 60, type: "string", align: "left",
editor: { editor: {
type: "text" type: "text"
} }
}, },
{ {
display: "执行人", name: "executor", width: 200, minWidth: 60, type: "string", align: "left", display: "执行人", name: "executor", width: 100, minWidth: 60, type: "string", align: "left",
editor: { editor: {
type: 'tree', type: 'tree',
required: true, required: true,
...@@ -225,7 +225,7 @@ function loadGrid() { ...@@ -225,7 +225,7 @@ function loadGrid() {
} }
}, },
{ {
display: "签名确认", name: "confirmTextView", width: 140, minWidth: 60, type: "string", align: "left", display: "签名确认", name: "confirmTextView", width: 100, minWidth: 60, type: "string", align: "left",
editor: { editor: {
type: 'dictionary', type: 'dictionary',
data: {name: 'confirm'}, data: {name: 'confirm'},
...@@ -238,13 +238,13 @@ function loadGrid() { ...@@ -238,13 +238,13 @@ function loadGrid() {
}, },
}, },
{ {
display: "日期", name: "date", width: 200, minWidth: 60, type: "dateTime", align: "left", display: "日期", name: "date", width: 150, minWidth: 60, type: "dateTime", align: "left",
editor: { editor: {
type: "dateTime" type: "dateTime"
} }
}, },
{ {
display: "COMMENTS评论", name: "comments", width: 200, minWidth: 60, type: "string", align: "left" display: "COMMENTS评论", name: "comments", width: 400, minWidth: 60, type: "string", align: "left"
}, },
], ],
dataAction: "server", dataAction: "server",
...@@ -301,13 +301,13 @@ function loadStockGrid() { ...@@ -301,13 +301,13 @@ function loadStockGrid() {
// } // }
}, },
{ {
display: "专属原材料/半成品/在制品/成品数量(张）", name: "description", width: 300, minWidth: 60, type: "string", align: "left", display: "专属原材料/半成品/在制品/成品数量(张）", name: "description", width: 500, minWidth: 60, type: "string", align: "left",
editor: { editor: {
type: "text" type: "text"
} }
}, },
{ {
display: "执行人", name: "executor", width: 200, minWidth: 60, type: "string", align: "left", display: "执行人", name: "executor", width: 100, minWidth: 60, type: "string", align: "left",
editor: { editor: {
type: 'tree', type: 'tree',
required: true, required: true,
...@@ -331,7 +331,7 @@ function loadStockGrid() { ...@@ -331,7 +331,7 @@ function loadStockGrid() {
} }
}, },
{ {
display: "签名确认", name: "confirmTextView", width: 140, minWidth: 60, type: "string", align: "left", display: "签名确认", name: "confirmTextView", width: 100, minWidth: 60, type: "string", align: "left",
editor: { editor: {
type: 'dictionary', type: 'dictionary',
data: {name: 'confirm'}, data: {name: 'confirm'},
...@@ -345,13 +345,13 @@ function loadStockGrid() { ...@@ -345,13 +345,13 @@ function loadStockGrid() {
}, },
}, },
{ {
display: "日期", name: "date", width: 200, minWidth: 60, type: "dateTime", align: "left", display: "日期", name: "date", width: 150, minWidth: 60, type: "dateTime", align: "left",
editor: { editor: {
type: "dateTime" type: "dateTime"
} }
}, },
{ {
display: "COMMENTS评论", name: "comments", width: 200, minWidth: 60, type: "string", align: "left" display: "COMMENTS评论", name: "comments", width: 400, minWidth: 60, type: "string", align: "left"
}, },
], ],
dataAction: "server", dataAction: "server",
......
topsun-xt/src/main/webapp/biz/topsun/ep/change/epMaterialChangeFormDetail.js
View file @ 496bf3a1
...@@ -23,6 +23,8 @@ function bindEvent(){ ...@@ -23,6 +23,8 @@ function bindEvent(){
valueIndex:"MATNR", valueIndex:"MATNR",
getParam: function (item) { getParam: function (item) {
return { return {
noWlfl1:"ZZCP",
noWlfl2:"ZBCP"
//filterValue:$("#brandCode").val() //filterValue:$("#brandCode").val()
} }
}, },
...@@ -40,6 +42,8 @@ function bindEvent(){ ...@@ -40,6 +42,8 @@ function bindEvent(){
valueIndex:"MATNR", valueIndex:"MATNR",
getParam: function (item) { getParam: function (item) {
return { return {
noWlfl1:"ZZCP",
noWlfl2:"ZBCP"
//filterValue:$("#brandCode").val() //filterValue:$("#brandCode").val()
} }
}, },
...@@ -101,13 +105,13 @@ function loadGrid() { ...@@ -101,13 +105,13 @@ function loadGrid() {
// } // }
}, },
{ {
display: "跟进事项", name: "followMatter", width: 200, minWidth: 60, type: "string", align: "left", display: "跟进事项", name: "followMatter", width: 500, minWidth: 60, type: "string", align: "left",
editor: { editor: {
type: "text" type: "text"
} }
}, },
{ {
display: "执行人", name: "executor", width: 200, minWidth: 60, type: "string", align: "left", display: "执行人", name: "executor", width: 100, minWidth: 60, type: "string", align: "left",
editor: { editor: {
type: 'tree', type: 'tree',
required: true, required: true,
...@@ -131,7 +135,7 @@ function loadGrid() { ...@@ -131,7 +135,7 @@ function loadGrid() {
} }
}, },
{ {
display: "签名确认", name: "confirmTextView", width: 140, minWidth: 60, type: "string", align: "left", display: "签名确认", name: "confirmTextView", width: 100, minWidth: 60, type: "string", align: "left",
editor: { editor: {
type: 'dictionary', type: 'dictionary',
data: {name: 'confirm'}, data: {name: 'confirm'},
...@@ -144,13 +148,13 @@ function loadGrid() { ...@@ -144,13 +148,13 @@ function loadGrid() {
}, },
}, },
{ {
display: "日期", name: "date", width: 200, minWidth: 60, type: "dateTime", align: "left", display: "日期", name: "date", width: 150, minWidth: 60, type: "dateTime", align: "left",
editor: { editor: {
type: "dateTime" type: "dateTime"
} }
}, },
{ {
display: "COMMENTS评论", name: "comments", width: 200, minWidth: 60, type: "string", align: "left" display: "COMMENTS评论", name: "comments", width: 400, minWidth: 60, type: "string", align: "left"
}, },
], ],
dataAction: "server", dataAction: "server",
...@@ -207,13 +211,13 @@ function loadStockGrid() { ...@@ -207,13 +211,13 @@ function loadStockGrid() {
// } // }
}, },
{ {
display: "专属原材料/半成品/在制品/成品数量(张）", name: "description", width: 300, minWidth: 60, type: "string", align: "left", display: "专属原材料/半成品/在制品/成品数量(张）", name: "description", width: 500, minWidth: 60, type: "string", align: "left",
editor: { editor: {
type: "text" type: "text"
} }
}, },
{ {
display: "执行人", name: "executor", width: 200, minWidth: 60, type: "string", align: "left", display: "执行人", name: "executor", width: 100, minWidth: 60, type: "string", align: "left",
editor: { editor: {
type: 'tree', type: 'tree',
required: true, required: true,
...@@ -237,7 +241,7 @@ function loadStockGrid() { ...@@ -237,7 +241,7 @@ function loadStockGrid() {
} }
}, },
{ {
display: "签名确认", name: "confirmTextView", width: 140, minWidth: 60, type: "string", align: "left", display: "签名确认", name: "confirmTextView", width: 100, minWidth: 60, type: "string", align: "left",
editor: { editor: {
type: 'dictionary', type: 'dictionary',
data: {name: 'confirm'}, data: {name: 'confirm'},
...@@ -251,13 +255,13 @@ function loadStockGrid() { ...@@ -251,13 +255,13 @@ function loadStockGrid() {
}, },
}, },
{ {
display: "日期", name: "date", width: 200, minWidth: 60, type: "dateTime", align: "left", display: "日期", name: "date", width: 150, minWidth: 60, type: "dateTime", align: "left",
editor: { editor: {
type: "dateTime" type: "dateTime"
} }
}, },
{ {
display: "COMMENTS评论", name: "comments", width: 200, minWidth: 60, type: "string", align: "left" display: "COMMENTS评论", name: "comments", width: 400, minWidth: 60, type: "string", align: "left"
}, },
], ],
dataAction: "server", dataAction: "server",
......
topsun-xt/src/main/webapp/template/print/topsun/epChangeForm.ftl
View file @ 496bf3a1
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<table class="tableBorder"> <table class="tableBorder">
<colgroup> <colgroup>
<col width='14%' /> <col width='14%' />
<col width='84%' /> <col width='86%' />
</colgroup> </colgroup>
<tr> <tr>
<td class="left"> <td class="left">
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
</tr> </tr>
<tr> <tr>
<td class="left"> <td class="left">
PROCESS制程工艺:</td> PROCESS<br/>制程工艺:</td>
<td class="left">${process?default("")?html}</td> <td class="left">${process?default("")?html}</td>
</tr> </tr>
<tr> <tr>
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
<table class="tableBorder"> <table class="tableBorder">
<colgroup> <colgroup>
<col width='14%' /> <col width='14%' />
<col width='84%' /> <col width='86%' />
</colgroup> </colgroup>
<tr> <tr>
<td class="left"> <td class="left">
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
</tr> </tr>
<tr> <tr>
<td class="left"> <td class="left">
PROCESS制程工艺:</td> PROCESS<br/>制程工艺:</td>
<td class="left">${changedProcess?default("")?html}</td> <td class="left">${changedProcess?default("")?html}</td>
</tr> </tr>
<tr> <tr>
......
topsun-xt/src/main/webapp/template/print/topsun/epChangeMaterialForm.ftl 0 → 100644
View file @ 496bf3a1
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<head>
<title>宝绅内部变更申请/通知单</title>
<#include "/print/commonStyleTemplate.ftl" />
<style type="text/css">
td {
font-size: 13px;
}
@page :first{
margin-top: 3.5cm;
}
@page {
size: A4;
margin-top: 3.6cm;
@top-center {
content: element(header);
}
}
</style>
</head>
<body>
<!-- 页眉部分 -->
<div style="position: running(header);" id="header">
<span style="position: absolute;margin-left: 40px;margin-top: 0.8cm">
<img src='data:image/jpg;base64,${bsnPng}' width="150px"/>
</span>
<div class="billTitle" style="font-size: 25px;margin-top: 1.5cm">
宝绅内部变更申请/通知单
</div>
<div class="billTitle" style="font-size: 25px">
Engineering Change Notice
</div>
<table cellspacing="0px" cellpadding="0px" class="tablePrint">
<colgroup>
<col width="2%"/>
<col width="71%"/>
<col width="27%"/>
</colgroup>
<tr>
<td class="left"></td>
<td class="left" style="font-size: 14px;font-weight:bold;">${changeNo?default("")?html}</td>
<td class="left" style="font-size: 14px;font-weight:bold;">变更编号：${billCode?default("")?html}</td>
</tr>
</table>
</div>
<div style="background: #CC8F81;text-align: center;">General Information 基本信息</div>
<table class="tableBorder">
<colgroup>
<col width='14%' />
<col width='37%' />
<col width='49%' />
</colgroup>
<tr>
<td class="left">DATE日期:<br/><@formatDate date=fillinDate/></td>
<td class="left">BRAND品牌名称:<br/>${brandName?default("")?html}</td>
<td class="left">CHANGE REQUESTED BY (DEPT/NAME)变更申请部门/姓名:<br/>${changePerson?default("")?html}</td>
</tr>
</table>
<table class="tableBorder">
<colgroup>
<col width='100%' />
</colgroup>
<tr>
<td class="left">REASON FOR CHANGE变更原因:${reasonDesc?default("")?html}
<br/>
${reasonForChange?replace("nbsp", "&nbsp;&nbsp;&nbsp;&nbsp;")!default("")?html}
<span style="text-decoration: underline"> ${otherReasonDesc?default("")?html}</span>
</td>
</tr>
</table>
<table class="tableBorder">
<colgroup>
<col width='100%' />
</colgroup>
<tr>
<td class="left">CHANGE EFFECTIVE 生效日期:<@formatDate date=effectiveDate/>
<br/>
${changeEffective?replace("nbsp", "&nbsp;&nbsp;&nbsp;&nbsp;")!default("")?html}
</td>
</tr>
</table>
<div style="background: #CC8F81;text-align: center">Change Details 变更内容</div>
<div style="background: yellow;text-align: left">CURRENT SPEC 目前产品信息</div>
<table class="tableBorder">
<colgroup>
<col width='14%' />
<col width='86%' />
</colgroup>
<tr>
<td class="left">
产品代号:</td>
<td class="left">${pd?default("")?html}</td>
</tr>
<tr>
<td class="left">
产品名称:</td>
<td class="left">${productName?default("")?html}</td>
</tr>
<tr>
<td class="left">
涉及成品编码:</td>
<td class="left">${otherProcess?default("")?html}</td>
</tr>
<tr>
<td class="left">旧原材料库存:</td>
<td class="left">${oldMaterial?default("")?html}</td>
</tr>
<tr>
<td class="left">涉及原材料<br/>成品库存:</td>
<td class="left">${othersMaterialStore?default("")?html}</td>
</tr>
<tr>
<td class="left">其他:</td>
<td class="left">${others?default("")?html}</td>
</tr>
</table>
<div style="background: yellow;text-align: left">REVISED SPEC 变更后产品信息</div>
<table class="tableBorder">
<colgroup>
<col width='14%' />
<col width='86%' />
</colgroup>
<tr>
<td class="left">
产品代号:</td>
<td class="left">${changedPd?default("")?html}</td>
</tr>
<tr>
<td class="left">
产品名称:</td>
<td class="left">${changedProductName?default("")?html}</td>
</tr>
<tr>
<td class="left">其他:</td>
<td class="left">${changedOthers?default("")?html}</td>
</tr>
</table>
<div style="background: #CC8F81;text-align: center">Approvals / Checks 确认</div>
<table class="tableBorder">
<colgroup>
<col width='22%' />
<col width='29%' />
<col width='49%' />
</colgroup>
<tr>
<td class="center" style="background: yellow">审批节点</td>
<td class="center" style="background: yellow">DATA 日期</td>
<td class="center" style="background: yellow">COMMENTS 评论</td>
</tr>
<#if approvals?? && approvals?size gt 0>
<#list approvals as detail>
<tr>
<td class="left">${detail.approvalName?default("")?html}</td>
<td class="center">${detail.handledDate?default("")?html}</td>
<td class="left">${detail.opinion?default("")?html}</td>
</tr>
</#list>
<#else>
<tr>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
</tr>
</#if>
</table>
<div style="background: #CC8F81;text-align: center">Implementation 执行人（版具/模具等）</div>
<table class="tableBorder">
<colgroup>
<col width='14%' />
<col width='25%' />
<col width='12%' />
<col width='12%' />
<col width='37%' />
</colgroup>
<tr>
<td class="center" style="background: yellow">部门</td>
<td class="center" style="background: yellow">跟进事项</td>
<td class="center" style="background: yellow">签名确认</td>
<td class="center" style="background: yellow">DATE日期</td>
<td class="center" style="background: yellow">COMMENTS评论</td>
</tr>
<#if implItemMaps?? && implItemMaps?size gt 0>
<#list implItemMaps as detail>
<tr>
<td class="center">${detail.deptName?default("")?html}</td>
<td class="center">${detail.followMatter?default("")?html}</td>
<td class="center">${detail.executor?default("")?html}</td>
<td class="center">${detail.date?default("")?html}</td>
<td class="center">${detail.comments?default("")?html}</td>
</tr>
</#list>
<#else>
<tr>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
</tr>
</#if>
</table>
<div style="background: #CC8F81;text-align: center">Stock / Inventory 库存</div>
<table class="tableBorder">
<colgroup>
<col width='14%' />
<col width='25%' />
<col width='12%' />
<col width='12%' />
<col width='37%' />
</colgroup>
<tr>
<td class="center" style="background: yellow">部门</td>
<td class="center" style="background: yellow">专属原材料/半成品/在制品/成品数量(张）</td>
<td class="center" style="background: yellow">签名确认</td>
<td class="center" style="background: yellow">DATE日期</td>
<td class="center" style="background: yellow">COMMENTS评论</td>
</tr>
<#if stockItemMaps?? && stockItemMaps?size gt 0>
<#list stockItemMaps as detail>
<tr>
<td class="center">${detail.deptName?default("")?html}</td>
<td class="center">${detail.description?default("")?html}</td>
<td class="center">${detail.executor?default("")?html}</td>
<td class="center">${detail.date?default("")?html}</td>
<td class="center">${detail.comments?default("")?html}</td>
</tr>
</#list>
<#else>
<tr>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
</tr>
</#if>
</table>
</body>
</html>
topsun/src/main/java/com/huigou/topsun/ep/change/application/impl/EpChangeFormApplicationImpl.java
View file @ 496bf3a1
...@@ -264,44 +264,66 @@ public class EpChangeFormApplicationImpl extends FlowBroker implements EpChangeF ...@@ -264,44 +264,66 @@ public class EpChangeFormApplicationImpl extends FlowBroker implements EpChangeF
Map<String, String> reasonForChangeMap = new HashMap<>(); Map<String, String> reasonForChangeMap = new HashMap<>();
String reasonForChangePD = (String) map.get("reasonForChange"); String reasonForChangePD = (String) map.get("reasonForChange");
String reasonForChangeMaterial = (String) map.get("materialReasonForChange"); String reasonForChangeMaterial = (String) map.get("materialReasonForChange");
String printPage = "";
//成品变更
if (StringUtil.isNotBlank(reasonForChangePD)){ if (StringUtil.isNotBlank(reasonForChangePD)){
reasonForChange = reasonForChangePD; reasonForChange = reasonForChangePD;
reasonForChangeMap = DictUtil.getDictionary("reasonForChange"); reasonForChangeMap = DictUtil.getDictionary("reasonForChange");
String[] split = reasonForChange.split(",");
List<String> strings = Arrays.asList(split);
StringBuilder change = new StringBuilder();
Map<String, String> finalReasonForChangeMap = reasonForChangeMap;
finalReasonForChangeMap.keySet().stream().limit(3).forEach(key->{
if (strings.contains(key)){
change.append(" √ ");
}
if (StringUtil.isNotBlank(reasonForChangeMaterial)){
change.append(finalReasonForChangeMap.get(key)).append("nbsp");
}
if (StringUtil.isNotBlank(reasonForChangePD)){
change.append(key).append(" ").append(finalReasonForChangeMap.get(key)).append("nbsp");
}
});
map.put("reasonForChange",change.toString());
StringBuilder change2 = new StringBuilder();
finalReasonForChangeMap.keySet().stream().skip(0).skip(1).skip(2).forEach(key->{
if (strings.contains(key)){
change2.append(" √ ");
}
if (StringUtil.isNotBlank(reasonForChangeMaterial)){
change2.append(finalReasonForChangeMap.get(key)).append("nbsp");
}
if (StringUtil.isNotBlank(reasonForChangePD)){
change2.append(key).append(" ").append(finalReasonForChangeMap.get(key)).append("nbsp");
}
});
map.put("reasonForChange2",change2.toString());
printPage = "/print/topsun/epChangeForm.ftl";
} }
//原材料变更
if (StringUtil.isNotBlank(reasonForChangeMaterial)){ if (StringUtil.isNotBlank(reasonForChangeMaterial)){
reasonForChange = reasonForChangeMaterial; reasonForChange = reasonForChangeMaterial;
reasonForChangeMap = DictUtil.getDictionary("materialReasonForChange"); reasonForChangeMap = DictUtil.getDictionary("materialReasonForChange");
String[] split = reasonForChange.split(",");
List<String> strings = Arrays.asList(split);
StringBuilder change = new StringBuilder();
Map<String, String> finalReasonForChangeMap = reasonForChangeMap;
finalReasonForChangeMap.keySet().stream().forEach(key->{
if (strings.contains(key)){
change.append(" √ ");
}
if (StringUtil.isNotBlank(reasonForChangeMaterial)){
change.append(finalReasonForChangeMap.get(key)).append("nbsp");
}
if (StringUtil.isNotBlank(reasonForChangePD)){
change.append(key).append(" ").append(finalReasonForChangeMap.get(key)).append("nbsp");
}
});
map.put("reasonForChange",change.toString());
printPage = "/print/topsun/epChangeMaterialForm.ftl";
} }
String[] split = reasonForChange.split(","); map.put("printPage",printPage);
List<String> strings = Arrays.asList(split);
StringBuilder change = new StringBuilder();
Map<String, String> finalReasonForChangeMap = reasonForChangeMap;
finalReasonForChangeMap.keySet().stream().limit(3).forEach(key->{
if (strings.contains(key)){
change.append(" √ ");
}
if (StringUtil.isNotBlank(reasonForChangeMaterial)){
change.append(finalReasonForChangeMap.get(key)).append("nbsp");
}
if (StringUtil.isNotBlank(reasonForChangePD)){
change.append(key).append(" ").append(finalReasonForChangeMap.get(key)).append("nbsp");
}
});
map.put("reasonForChange",change.toString());
StringBuilder change2 = new StringBuilder();
finalReasonForChangeMap.keySet().stream().skip(0).skip(1).skip(2).forEach(key->{
if (strings.contains(key)){
change2.append(" √ ");
}
if (StringUtil.isNotBlank(reasonForChangeMaterial)){
change2.append(finalReasonForChangeMap.get(key)).append("nbsp");
}
if (StringUtil.isNotBlank(reasonForChangePD)){
change2.append(key).append(" ").append(finalReasonForChangeMap.get(key)).append("nbsp");
}
});
map.put("reasonForChange2",change2.toString());
//处理生效日期类型 //处理生效日期类型
//例如：√ IMMEDIATE 立即变更 RUNNING CHANGE 正常变更（用完后变更） SEASON 换季更改 //例如：√ IMMEDIATE 立即变更 RUNNING CHANGE 正常变更（用完后变更） SEASON 换季更改
Map<String, String> changeEffective = DictUtil.getDictionary("changeEffective"); Map<String, String> changeEffective = DictUtil.getDictionary("changeEffective");
......
topsun/src/main/java/com/huigou/topsun/ep/change/controller/EpChangeFormController.java
View file @ 496bf3a1
...@@ -127,7 +127,7 @@ public class EpChangeFormController extends CommonController { ...@@ -127,7 +127,7 @@ public class EpChangeFormController extends CommonController {
EpChangeFormQueryRequest queryRequest = sdo.toQueryRequest(EpChangeFormQueryRequest.class); EpChangeFormQueryRequest queryRequest = sdo.toQueryRequest(EpChangeFormQueryRequest.class);
queryRequest.setId(id); queryRequest.setId(id);
Map<String,Object> map = this.epChangeFormApplication.print(queryRequest); Map<String,Object> map = this.epChangeFormApplication.print(queryRequest);
String pintPage = String.format("/print/topsun/epChangeForm.ftl"); String pintPage = String.format((String) map.get("printPage"));
return outputAndProcUnitHandlerPDF(pintPage, id, map); return outputAndProcUnitHandlerPDF(pintPage, id, map);
} }
} }
topsun/src/main/java/com/huigou/topsun/sap/productScrapApply/application/impl/ProductScrapApplyApplicationImpl.java
View file @ 496bf3a1
...@@ -264,28 +264,6 @@ public class ProductScrapApplyApplicationImpl extends FlowBroker implements Prod ...@@ -264,28 +264,6 @@ public class ProductScrapApplyApplicationImpl extends FlowBroker implements Prod
productScrapApplyItems.add(productScrapApplyItem); productScrapApplyItems.add(productScrapApplyItem);
} }
productScrapApplyId = mannualStartWorkApplication.startWorkflow(productScrapApply,PROCESS_DEFINITION_KEY,"productScrapApply"); productScrapApplyId = mannualStartWorkApplication.startWorkflow(productScrapApply,PROCESS_DEFINITION_KEY,"productScrapApply");
// else{
// for (SapPurchaseApproval purchaseApproval : purchaseApprovalList) {
// //将存在的作废掉 05.11 lxh
//
// //终止状态不管
// //审批完成的，SAP撤审触发，终止审批完成的，并发起新的流程
// if (purchaseApproval.getStatusId() == BizBillStatus.COMPLETED.getId()){
// purchaseApproval.setStatusId(BizBillStatus.ABORTED.getId());
// purchaseApprovalId=mannualStartWorkApplication.startWorkflow(sapPurchaseApproval,PROCESS_DEFINITION_KEY,"sapPurchaseApproval");
// }
//
// //在审批中，更新明细数据的（先删除，再新增）
// if (purchaseApproval.getStatusId() == BizBillStatus.APPROVING.getId() || purchaseApproval.getStatusId() == BizBillStatus.APPLYING.getId()){
// List<SapPurchaseApprovalItem> itemList = sapPurchaseApprovalItemApplication.querySapPurchaseApprovalItems(purchaseApproval.getId());
// List<String> collect = itemList.stream().map(SapPurchaseApprovalItem::getId).collect(Collectors.toList());
// sapPurchaseApprovalItemApplication.deleteByIds(collect);
// purchaseApprovalId = purchaseApproval.getId();
// }
// this.sapPurchaseApprovalRepository.save(purchaseApproval);
// }
// }
productScrapApplyItemApplication.saveProductScrapApplyItems(productScrapApplyId,productScrapApplyItems); productScrapApplyItemApplication.saveProductScrapApplyItems(productScrapApplyId,productScrapApplyItems);
productScrapApply = productScrapApplyRepository.findOne(productScrapApplyId); productScrapApply = productScrapApplyRepository.findOne(productScrapApplyId);
return productScrapApply.getBillCode(); return productScrapApply.getBillCode();
......
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