Skip to content

T
topsun-bpm
Commit fb3c0762 authored by 鲁鑫's avatar 鲁鑫
Browse files
Options

客户异常报告多选

parent 15fd5837
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 246 additions and 48 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/exceptionReport/chooseExceptionClientDetail.jsp 0 → 100644
View file @ fb3c0762
<%--采购申请--%>
<%@ page contentType="text/html; charset=utf-8" language="java" %>
<%@ taglib uri="/WEB-INF/taglib.tld" prefix="x" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<form class="hg-form ui-show" method="post" action="" id="queryMainForm">
<x:hidden name="customerOrderNo"/>
<div class="hg-form-row">
<x:inputC name="aufnr" label="生产单号" labelCol="2" fieldCol="2"/>
</div>
<x:searchButtons/>
</form>
<x:title title="生产单列表" hideTable="#maingrid" name="list"/>
<div id="maingrid" style="margin:2px;"></div>
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/exceptionReport/chooseExceptionDetail.jsp deleted 100644 → 0
View file @ 15fd5837
<%--采购申请--%>
<%@ page contentType="text/html; charset=utf-8" language="java" %>
<%@ taglib uri="/WEB-INF/taglib.tld" prefix="x" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html>
<head>
<x:base include="layout,dialog,grid,tree,dateTime,combox,attachment,commonTree,comboDialog"/>
</head>
<body>
<div class="container-fluid">
<x:billTitle title="请选择异常报告单类型" needStatus="true" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<div class="hg-form-cols">
<div class="hg-form-row">
<x:selectC name="billType" label="报告单类型" labelCol="4" fieldCol="8" required="true"/>
</div>
</div>
</form>
</div>
</body>
\ No newline at end of file
topsun-xt/src/main/webapp/template/exceptionReport.ftl
View file @ fb3c0762
......@@ -149,20 +149,20 @@
<td class="td2" >
<#if (itemList)?? && ((itemList)?size > 0)>
<#list itemList as list>
<p class="p1" style="width:90pt" ><span>${(list.money)!' '}</span></p>
</#list>
</#if>
</td>
<td class="td1">
<p class="p1"><span style="font-weight:bolder ">折算金额</span></p>
</td>
<td class="td2">
<#if (itemList)?? && ((itemList)?size > 0)>
<#list itemList as list>
<p class="p1" style="width:85pt" ><span>${(list.rmbMoney)!' '}</span></p>
<p class="p1" style="width:90pt" ><span>${(list.totalMoney)!' '}</span></p>
</#list>
</#if>
</td>
<#-- <td class="td1">-->
<#-- <p class="p1"><span style="font-weight:bolder ">折算金额</span></p>-->
<#-- </td>-->
<#-- <td class="td2">-->
<#-- <#if (itemList)?? && ((itemList)?size > 0)>-->
<#-- <#list itemList as list>-->
<#-- <p class="p1" style="width:85pt" ><span>${(list.rmbMoney)!' '}</span></p>-->
<#-- </#list>-->
<#-- </#if>-->
<#-- </td>-->
<td class="td1">
<p class="p1"><span style="font-weight:bolder ">客诉编号</span></p>
</td>
......@@ -230,6 +230,14 @@
</td>
</tr>
<tr >
<td class="td1">
<p class="p1"><span style="font-weight:bolder ">赔付金额</span></p>
</td>
<td class="td2" style="width:90%">
<p class="p1" style="width:auto" ><span>${(head.payMoney)!' '}</span></p>
</td>
</tr>
</table>
<table>
<tr >
......@@ -259,7 +267,11 @@
<p class="p1"><span style="font-weight:bolder ">备注</span></p>
</td>
<td class="td2" style="width:90%">
<p class="p1" style="width:auto"><span class="autoLine">${(head.remark)!' '}</span></p>
<p class="p1" style="width:auto">
<span class="autoLine">${(head.remark)!' '}</span>
<br/>
<span class="autoLine">${(head.opinion)!' '}</span>
</p>
</td>
</tr>
......
topsun/src/main/java/com/huigou/topsun/sap/exceptionReport/application/impl/ExceptionReportApplicationImpl.java
View file @ fb3c0762
......@@ -728,7 +728,7 @@ public class ExceptionReportApplicationImpl extends FlowBroker implements Except
} else{
exceptionReport.setExceptionType("外部");
}
String sql="select s.code,w.handler_name,w.handler_id,w.dept_name,w.full_id,w.HANDLED_DATE FROM WF_PROCUNITHANDLER w left join sa_oporg s on s.id=w.HANDLER_ID";
String sql="select s.code,w.handler_name,w.handler_id,w.dept_name,w.full_id,w.HANDLED_DATE,w.opinion FROM WF_PROCUNITHANDLER w left join sa_oporg s on s.id=w.HANDLER_ID";
sql+=" where biz_id='"+id+"' order by w.HANDLED_DATE desc ";
List<Map<String, Object>> mapList=sqlExecutorDao.queryToListMap(sql);
Map<String ,Object> data = new HashMap<>();
......@@ -738,7 +738,9 @@ public class ExceptionReportApplicationImpl extends FlowBroker implements Except
}
if (mapList.size()>1) {
String preLastAuditPerson = mapList.get(1).get("handlerName").toString();
String opinion = mapList.get(1).get("opinion").toString();
data.put("preAuditPerson",preLastAuditPerson);
data.put("opinion",opinion);
}
if ("supplier".equals(exceptionReport.getBillType())){
//StringBuffer dealmethod=new StringBuffer("");
......
topsun/src/main/java/com/huigou/topsun/sap/exceptionReport/controller/ExceptionReportController.java
View file @ fb3c0762
......@@ -6,6 +6,8 @@ import com.huigou.topsun.sap.exceptionReport.application.*;
import com.huigou.topsun.sap.exceptionReport.domain.ExceptionReport;
import com.huigou.topsun.sap.exceptionReport.domain.ExceptionReportResponsible;
import com.huigou.topsun.sap.exceptionReport.domain.query.ExceptionReportQueryRequest;
import com.huigou.topsun.sap.sapApplication.application.SapMaterialApplication;
import com.huigou.topsun.sap.sapApplication.domain.query.SapDialogOrderQuery;
import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.client.CommonController;
......@@ -15,6 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.util.ObjectUtils;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -40,6 +44,8 @@ public class ExceptionReportController extends CommonController {
private ExceptionReportCashApplication exceptionReportCashApplication;
@Autowired
private ExceptionReportGoodsApplication exceptionReportGoodsApplication;
@Autowired
private SapMaterialApplication sapMaterialApplication;
@Override
protected String getPagePath() {
......@@ -65,8 +71,11 @@ public class ExceptionReportController extends CommonController {
return toResult(map);
}
public String chooseExceptionDetail(){
return forward("chooseExceptionDetail");
public String chooseExceptionClientDetail(){
SDO sdo = this.getSDO();
String customerOrderNo = sdo.getString("customerOrderNo");
this.putAttribute("customerOrderNo",customerOrderNo);
return forward("chooseExceptionClientDetail");
}
/**
......@@ -258,4 +267,16 @@ public class ExceptionReportController extends CommonController {
this.putAttribute("customerOrders",list);
return success();
}
public String slicedExceptionClientList(){
SDO sdo = this.getSDO();
SapDialogOrderQuery queryRequest = sdo.toObject(SapDialogOrderQuery.class);
List<Map<String,String>> mapList = new ArrayList<>();
try {
mapList = sapMaterialApplication.getSapCustomerOrder(queryRequest);
} catch (IOException e) {
throw new RuntimeException(e.getMessage());
}
return packGridDataAndResult(mapList);
}
}
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