ECN变更的打印预览调整，查询页面调整

topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormDetail.js

@@ -197,7 +197,7 @@ function loadGrid() {
             {
                 display: "跟进事项", name: "followMatter", width: 200, minWidth: 60, type: "string", align: "left",
                 editor: {
-                    type: "string"
+                    type: "text"
                 }
             },
             {

topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormDetail.jsp

@@ -26,7 +26,7 @@
     <div class="hg-form-cols">
         <div class="hg-form-row">
             <x:inputC name="changeNo" required="true" label="变更序号" labelCol="2" maxLength="64" fieldCol="2" />
-            <x:inputC name="brandName" required="false" label="品牌名称" labelCol="2" fieldCol="2" wrapper="select"/>
+            <x:inputC name="brandName" required="true" label="品牌名称" labelCol="2" fieldCol="2" wrapper="select"/>
             <x:hidden name="brandCode"/>
             <x:hidden name="changePersonId"/>
             <x:inputC name="changePerson" required="false" label="变更申请部门/姓名" labelCol="2" fieldCol="2" wrapper="select"/>

topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormList.js

@@ -27,6 +27,8 @@ function loadGrid() {
     });
     gridManager = UICtrl.grid("#maingrid", {
         columns: [
+            {display: "审批状态", name: "statusTextView", width: 100, minWidth: 60, type: "string", align: "left"},
+            {display: "创建日期", name: "fillinDate", width: 120, minWidth: 60, type: "date", align: "left"},
             {display: "序号", name: "changeNo", width: 150, minWidth: 60, type: "string", align: "left"},
             {display: "单据编号", name: "billCode", width: 150, minWidth: 60, type: "string", align: "left"},
             {display: "变更事项", name: "changeMatter", width: 200, minWidth: 60, type: "string", align: "left"},
@@ -35,8 +37,6 @@ function loadGrid() {
             {display: "变更原因", name: "reasonForChangeTextView", width: 150, minWidth: 60, type: "string", align: "left"},
             {display: "原材料变更原因", name: "materialReasonForChangeTextView", width: 150, minWidth: 60, type: "string", align: "left"},
             {display: "原因描述", name: "reasonDesc", width: 150, minWidth: 60, type: "string", align: "left"},
-            {display: "审批状态", name: "statusTextView", width: 100, minWidth: 60, type: "string", align: "left"},
-            {display: "创建日期", name: "fillinDate", width: 120, minWidth: 60, type: "date", align: "left"},
             {display: "申请人", name: "personMemberName", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "申请部门", name: "deptName", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "状态码", name: "code", width: 100, minWidth: 60, type: "string", align: "left"},

topsun-xt/src/main/webapp/biz/topsun/ep/change/epMaterialChangeFormDetail.js

@@ -88,7 +88,7 @@ function loadGrid() {
             {
                 display: "跟进事项", name: "followMatter", width: 200, minWidth: 60, type: "string", align: "left",
                 editor: {
-                    type: "string"
+                    type: "text"
                 }
             },
             {

topsun-xt/src/main/webapp/template/print/topsun/epChangeForm.ftl

@@ -26,7 +26,7 @@
     </colgroup>
     <tr>
         <td class="left">${changeNo?default("")?html}</td>
-        <td class="right">变更编号SCF#：${billCode?default("")?html}</td>
+        <td class="right">变更编号：${billCode?default("")?html}</td>
     </tr>
 </table>
 <div class="title" style="background: #CC8F81;text-align: center">General Information 基本信息</div>
@@ -90,13 +90,13 @@
     </tr>
     <tr>
         <td class="left">
-            PRODUCT NAME:
+            PRODUCT NAME
             产品名称:</td>
         <td class="left">${productName?default("")?html}</td>
     </tr>
     <tr>
         <td class="left">
-            PROCESS:
+            PROCESS
             制程工艺:</td>
         <td class="left">${process?default("")?html}</td>
     </tr>
@@ -123,13 +123,13 @@
     </tr>
     <tr>
         <td class="left">
-            PRODUCT NAME:
+            PRODUCT NAME
             产品名称:</td>
         <td class="left">${changedProductName?default("")?html}</td>
     </tr>
     <tr>
         <td class="left">
-            PROCESS:
+            PROCESS
             制程工艺:</td>
         <td class="left">${changedProcess?default("")?html}</td>
     </tr>

topsun/src/main/java/com/huigou/topsun/ep/change/application/impl/EpChangeFormApplicationImpl.java

@@ -243,7 +243,7 @@ public class EpChangeFormApplicationImpl extends FlowBroker implements EpChangeF
         //日志记录
         Map<String, Object> resultMap = new HashMap<>();
         try {
-            String execute = httpClient.executeForEp(map, "pro/productionSolution/openEcn?productionSolutionId="+epChangeForm.getProductionSolutionId());
+            String execute = httpClient.executeForEp(map, "pro/productionSolution/openEcn?pds="+epChangeForm.getPd());
             EpResult epResult = JSONObject.parseObject(execute, EpResult.class);
             resultMap.put("TYPE", epResult.getCode());
             resultMap.put("message", epResult.getMsg());