Merge remote-tracking branch 'origin/dev' into dev

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js

@@ -1214,6 +1214,19 @@ function bindEvent_mrp(){
             $('#dispoName').val(data.NAME);
         }
     });
+
+    $("#sbdkz").combox({onChange:function(data){
+        var mtart = $("#mtart").val();
+        //物料类型只有选了这两种类型后，可以不填，其他值只能选2
+        if (mtart != "ZZCP" && mtart != "ZSHB") {
+            if (data.value != "2"){
+                $("#sbdkz").val("")
+                $("#sbdkz_text").val("")
+                Public.tip("物料类型不是产成品和自制机械设备时，只能选”只汇总请求“")
+            }
+        }
+        }
+    });
 }
 
 function bindEvent_warehouse(){

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

@@ -9,9 +9,12 @@
         td {
             font-size: 13px;
         }
+        @page :first{
+            margin-top: 1.8cm;
+        }
         @page {
             size: A4;
-            margin: 1.2cm 1cm 0cm;
+            margin-top: 1.9cm;
             @top-center {
                 content: element(header);
             }
@@ -22,13 +25,15 @@
 <!-- 页眉部分 -->
 <div style="position: running(header);" id="header">
     <div class="billTitle" style="font-size: 25px">
+    <span style="position: absolute;margin-left: 70px">
+        <img src='data:image/jpg;base64,${bsnPng}' width="100px"/>
+    </span>
         宝绅内部变更申请/通知单</div>
     <table cellspacing="0px" cellpadding="0px" class="tablePrint">
         <colgroup>
             <col width="20%"/>
             <col width="52%"/>
             <col width="28%"/>
-            <col width="28%"/>
         </colgroup>
         <tr>
             <td class="left">${changeNo?default("")?html}</td>
@@ -39,8 +44,8 @@
         </tr>
     </table>
 </div>
-<div class="title" style="background: #CC8F81;text-align: center;margin-top: 100px">General Information 基本信息</div>
-<table cellspacing="0px" cellpadding="0px" class="tableBorder">
+<div style="background: #CC8F81;text-align: center;">General Information 基本信息</div>
+<table class="tableBorder">
     <colgroup>
         <col width='14%' />
         <col width='33%' />
@@ -52,7 +57,7 @@
         <td class="left">CHANGE REQUESTED BY (DEPT/NAME)变更申请部门/姓名:<br/>${deptName?default("")?html}</td>
     </tr>
 </table>
-<table cellspacing="0px" cellpadding="0px" class="tableBorder">
+<table class="tableBorder">
     <colgroup>
         <col width='100%' />
     </colgroup>
@@ -66,7 +71,7 @@
         </td>
     </tr>
 </table>
-<table cellspacing="0px" cellpadding="0px" class="tableBorder">
+<table class="tableBorder">
     <colgroup>
         <col width='100%' />
     </colgroup>
@@ -77,9 +82,9 @@
         </td>
     </tr>
 </table>
-<div class="title" style="background: #CC8F81;text-align: center">Change Details 变更内容</div>
-<div class="title" style="background: yellow;text-align: left">CURRENT SPEC 目前产品信息</div>
-<table cellspacing="0px" cellpadding="0px" class="tableBorder">
+<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='84%' />
@@ -108,8 +113,8 @@
         <td class="left">${others?default("")?html}</td>
     </tr>
 </table>
-<div class="title" style="background: yellow;text-align: left">REVISED SPEC 变更后产品信息</div>
-<table cellspacing="0px" cellpadding="0px" class="tableBorder">
+<div style="background: yellow;text-align: left">REVISED SPEC 变更后产品信息</div>
+<table class="tableBorder">
     <colgroup>
         <col width='14%' />
         <col width='84%' />
@@ -138,10 +143,8 @@
         <td class="left">${changedOthers?default("")?html}</td>
     </tr>
 </table>
-
-<div class="blank_div"></div>
-<div class="title" style="background: #CC8F81;text-align: center">Approvals / Checks 确认</div>
-<table cellspacing="0px" cellpadding="0px" class="tableBorder">
+<div style="background: #CC8F81;text-align: center">Approvals / Checks 确认</div>
+<table class="tableBorder">
     <colgroup>
         <col width='22%' />
         <col width='25%' />
@@ -168,8 +171,8 @@
         </tr>
     </#if>
 </table>
-<div class="title" style="background: #CC8F81;text-align: center">Implementation 执行人（版具/模具等）</div>
-<table cellspacing="0px" cellpadding="0px" class="tableBorder">
+<div style="background: #CC8F81;text-align: center">Implementation 执行人（版具/模具等）</div>
+<table class="tableBorder">
     <colgroup>
         <col width='14%' />
         <col width='25%' />
@@ -205,8 +208,8 @@
         </tr>
     </#if>
 </table>
-<div class="title" style="background: #CC8F81;text-align: center">Stock / Inventory 库存</div>
-<table cellspacing="0px" cellpadding="0px" class="tableBorder">
+<div style="background: #CC8F81;text-align: center">Stock / Inventory 库存</div>
+<table class="tableBorder">
     <colgroup>
         <col width='14%' />
         <col width='25%' />

topsun/src/main/java/com/huigou/topsun/ep/change/controller/EpChangeFormController.java

@@ -67,7 +67,7 @@ public class EpChangeFormController extends CommonController {
         String type = this.getSDO().getString("type");
         if ("product".equals(type)){
             reasonForChange = DictUtil.getDictionary("reasonForChange");
-            reasonForChange.remove("MATERIAL CHANGE");
+            //reasonForChange.remove("MATERIAL CHANGE");
             this.putAttribute("reasonForChangeList",reasonForChange);
             return forward("epChangeFormDetail",epChangeForm);
         }else {

topsun/src/main/java/com/huigou/topsun/ep/order/domain/vo/EpSaleOrderCancelVo.java

@@ -46,7 +46,7 @@ public class EpSaleOrderCancelVo implements Serializable {
     /**
      * 产品类型
      */
-    @JsonProperty("productType")
+    @JsonProperty("productTypeName")
     private String productType;
 
     /**

topsun/src/main/java/com/huigou/topsun/sap/permit/application/impl/SapPermitApplicationImpl.java

@@ -305,14 +305,6 @@ public class SapPermitApplicationImpl extends FlowBroker implements SapPermitApp
          //Document document = null;
          ByteArrayOutputStream byteArrayOutputStream = null;
         try {
-            response.reset();
-            response.setHeader("Content-Type", "application/pdf-stream");
-            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("放行条.pdf", "UTF-8"));
-            String randoms=CommonUtil.createGUID().substring(0,10);
-            /*File  fileDir=new File("bar");
-            if(!fileDir.exists()) {
-               fileDir.mkdirs();
-            }*/
             File  file = new File("bar-"+permit.getBillCode()+".png");
             if(!file.exists()) {
                 String IMG_TYPE_PNG = "image/png";
@@ -328,8 +320,6 @@ public class SapPermitApplicationImpl extends FlowBroker implements SapPermitApp
         }catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException("PDF生成失败！");
-        } finally {
-
         }
        return  byteArrayOutputStream;
     }