品质异常单调整

topsun-xt/src/main/webapp/biz/topsun/sap/exceptionReport/exceptionReportDetail.js

@@ -68,13 +68,13 @@ function initialize() {
         onChange: function (v) {
             if (v.value == "in") { //内部
                 if ($('#exceptionReasonType').val()==1){
-                    Public.tip("供应商原料问题的异常类型只能是内部！");
+                    Public.tip("供应商原料问题的异常类型只能是外部！");
                     clearExceptionType();
                      return false;
                 }
             } else {
                 if ($('#exceptionReasonType').val()!=""&&$('#exceptionReasonType').val()!=1){
-                    Public.tip("生产和客户异常的异常类型只能是外部！");
+                    Public.tip("生产和客户异常的异常类型只能是内部！");
                     clearExceptionType();
                     return false;
                 }

topsun-xt/src/main/webapp/biz/topsun/sap/exceptionReport/exceptionReportDetailSupplier.jsp

@@ -29,6 +29,7 @@
         <x:hidden name="exceptionType" value="out"/>
         <x:hidden name="frgdt"/>
         <x:hidden name="werks"/>
+        <x:hidden name="werksName"/>
         <x:hidden name="manager"/>
         <x:hidden name="deputyManager"/>
         <x:hidden name="generalManager"/>
@@ -37,7 +38,8 @@
         <x:hidden name="checkOperatorName"/>
         <x:hidden name="dutyDept"/>
         <x:hidden name="dutyDeptName"/>
-        <div class="hg-form-cols">
+        <x:hidden name="sourceBillCode"/>
+         <div class="hg-form-cols">
             <c:if test="${statusId==1||statusId==3}">
             <div style="float: right; margin-right: 10px;" class="btn-group" id="buttonBox">
                 <button id="save" title="" type="button" onclick="printPage()" class="btn btn-gray"><i
@@ -52,7 +54,7 @@
                 <!--x:selectC name="exceptionType" label="异常类型" labelCol="1" fieldCol="2" required="true" dictionary="exceptionType"/-->
                 <x:inputC name="exceptionDate" label="异常日期" labelCol="1" fieldCol="2" required="true" wrapper="date"/>
                 <x:inputC name="reportDate" label="呈报日期" labelCol="1" fieldCol="2" required="true" wrapper="date"/>
-                <x:selectC name="exceptionReasonType" label="异常原因分类" labelCol="1" fieldCol="2" required="true" dictionary="exceptionReasonType"/>
+                <x:selectC name="exceptionReasonType" label="异常原因分类" labelCol="1" fieldCol="2" required="false"  disabled="true" dictionary="exceptionReasonType"/>
 
                 <x:hidden name="customerNo"/>
                 <x:inputC name="customerName" required="true" label="供应商名称" labelCol="1" wrapper="select" fieldCol="2"/>

topsun-xt/src/main/webapp/biz/topsun/sap/exceptionReport/exceptionReportList.js

@@ -47,7 +47,7 @@ function initGrid() {
                 , {display: "id", name: "id", width: "100", align: "left", type: "string", hide: true}
                 , {display: "报告编号", name: "billCode", width: 150, minWidth: 60, type: "string", align: "center"}
                 , {display: "异常类型", name: "exceptionTypeTextView", width: 80, minWidth: 60, type: "string", align: "center"}
-                , {display: "单据类型", name: "billType", width: 80, minWidth: 60, type: "string", align: "center",
+               /*, {display: "单据类型", name: "billType", width: 80, minWidth: 60, type: "string", align: "center",
                     render: function (item) {
                        if (item.billType=="supplier"){
                             return "供应商";
@@ -59,25 +59,25 @@ function initGrid() {
                             return "生产";
                         }
                     }
-                }
+                } */
                 , {display: "异常原因分类", name: "exceptionReasonTypeTextView", width: 100, minWidth: 60, type: "string", align: "center"}
 
                 , {display: "呈报日期", name: "reportDate", width: 100, minWidth: 60, type: "date", align: "center"}
                 , {display: "异常日期", name: "exceptionDate", width: 100, minWidth: 60, type: "date", align: "center"}
                // , {display: "异常标题", name: "exceptionTitle", width: 200, minWidth: 60, type: "date", align: "center"}
                // , {display: "客户编号", name: "customerName", width: 200, minWidth: 60, type: "date", align: "center"}
-                , {display: "客户名称", name: "customerName", width: 200, minWidth: 60, type: "date", align: "center"}
-                , {display: "客户单号", name: "customerOrderNo", width: 180, minWidth: 60, type: "date", align: "center"}
-                , {display: "紧急程度", name: "urgencyTextView", width: 80, minWidth: 60, type: "date", align: "center"}
-                , {display: "改善措施", name: "dealMethod", width: 200, minWidth: 60, type: "date", align: "center"}
-                , {display: "异常原因", name: "exceptionReason", width: 200, minWidth: 60, type: "date", align: "center"}
-                , {display: "责任部门", name: "dutyDeptName", width: 120, minWidth: 60, type: "date", align: "center"}
-                , {display: "责任人", name: "checkOperatorName", width: 100, minWidth: 60, type: "date", align: "center"}
-                , {display: "处理结果", name: "dealResult", width: 200, minWidth: 60, type: "date", align: "center"}
+                , {display: "客户名称", name: "customerName", width: 200, minWidth: 60, type: "string", align: "center"}
+                , {display: "客户单号", name: "customerOrderNo", width: 180, minWidth: 60, type: "string", align: "center"}
+                , {display: "紧急程度", name: "urgencyTextView", width: 80, minWidth: 60, type: "string", align: "center"}
+                , {display: "改善措施", name: "dealMethod", width: 200, minWidth: 60, type: "string", align: "center"}
+                , {display: "异常原因", name: "exceptionReason", width: 200, minWidth: 60, type: "string", align: "center"}
+                , {display: "责任部门", name: "dutyDeptName", width: 120, minWidth: 60, type: "string", align: "center"}
+                , {display: "责任人", name: "checkOperatorName", width: 100, minWidth: 60, type: "string", align: "center"}
+                , {display: "处理结果", name: "dealResult", width: 200, minWidth: 60, type: "string", align: "center"}
                 //, {display: "备注", name: "remark", width: 200, minWidth: 60, type: "date", align: "center"}
                 , {display: "创建日期", name: "fillinDate", width: 150, minWidth: 60, type: "dateTime", align: "center"}
-                , {display: "创建部门", name: "deptName", width: 120, minWidth: 60, type: "date", align: "center"}
-                , {display: "创建人", name: "personMemberName", width: 100, minWidth: 60, type: "date", align: "center"}
+                , {display: "创建部门", name: "deptName", width: 120, minWidth: 60, type: "string", align: "center"}
+                , {display: "创建人", name: "personMemberName", width: 100, minWidth: 60, type: "string", align: "center"}
             ],
             dataAction: 'server',
             url: web_app.name + '/exceptionReport/slicedExceptionReportList.ajax?',

topsun/src/main/java/com/huigou/topsun/sap/exceptionReport/application/impl/ExceptionReportApplicationImpl.java

@@ -792,8 +792,12 @@ public class ExceptionReportApplicationImpl extends FlowBroker implements Except
         ExceptionReport exceptionReport = this.exceptionReportRepository.findOne(bizId);
         //查询 单据日期
         String fillinDateStr = DateUtil.getDateFormat("yyyy-MM-dd HH:mm:ss", exceptionReport.getFillinDate());
+        String title="品质异常报告单";
         //设置标题
-        return String.format("%s%s(%s)%s", exceptionReport.getDeptName(),exceptionReport.getPersonMemberName(), fillinDateStr,"品质异常报告单");
+        if ("supplier".equals(exceptionReport.getBillType())){
+           title+="(供应商)";
+        }
+        return String.format("%s%s(%s)%s", exceptionReport.getDeptName(),exceptionReport.getPersonMemberName(), fillinDateStr,title);
     }
 
      @Override