放行条增加打印和条形码，采购订单重复接收改为都是新建单据

pom.xml

@@ -384,6 +384,14 @@
                 <enabled>true</enabled>
             </snapshots>
         </repository>
+        <repository>
+            <id>barcode4j</id>
+            <url>https://mvnrepository.com/artifact/net.sf.barcode4j/barcode4j-light/</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+
     </repositories>
 
 </project>
\ No newline at end of file

topsun-xt/src/main/webapp/biz/topsun/sap/permit/sapPermitDetail.js

@@ -150,6 +150,9 @@ function reloadGrid() {
     gridManager.loadData();
 }
 
+function  printPage() {
+    Public.openPostWindow(web_app.name + '/PDFViewer/PDFViewer.do',{id: $("#id").val(),fileType:"permit"});
+}
 
 function getExtendedData(processAction) {
 //回退、打回、转交时，不需要验证必填项是否已经填写；

topsun-xt/src/main/webapp/biz/topsun/sap/permit/sapPermitDetail.jsp

@@ -24,7 +24,13 @@
     <x:hidden name="personMemberId"/>
     <x:hidden name="personMemberName"/>
     <div class="hg-form-cols">
+        <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
+                    class="fa fa-save"></i>打印
+            </button>
+        </div>
         <div class="hg-form-row">
+
             <x:hidden name="dutyDepart"/>
             <x:inputC name="dutyDepartName" required="true" label="责任部门" labelCol="2" fieldCol="2" wrapper="tree"/>
             <x:hidden name="applyPerson"/>

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseApproval/sapPurchaseApprovalList.js

@@ -22,6 +22,7 @@ function initPurchaseListGrid() {
                 , {display: "采购申请编号", name: "banfn", width: 150, minWidth: 60, type: "string", align: "center"}
                 , {display: "消息类型", name: "type", width: 100, minWidth: 60, type: "string", align: "center"}
                 , {display: "消息文本", name: "message", width: 200, minWidth: 60, type: "string", align: "center"}
+                , {display: "创建日期", name: "fillinDate", width: 140, minWidth: 60, type: "string", align: "center"}
             ],
             dataAction: 'server',
             url: web_app.name + '/sapPurchaseApproval/slicedSapPurchaseApprovalList.ajax?',

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseApproval/sapPurchaseApprovalList.jsp

@@ -17,7 +17,8 @@
             <form class="hg-form ui-show" method="post" action="" id="queryMainForm">
                 <div class="hg-form-row">
                     <x:inputC name="billCode" label="需求跟踪编号" labelCol="1"/>
-                </div>
+                    <x:inputC name="banfn" label="采购申请编号" labelCol="1"/>
+                 </div>
                 <x:searchButtons/>
             </form>
             <x:title title="采购审批明细" hideTable="#purchaseApprovalGrid" name="list"/>

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderList.js

@@ -23,6 +23,7 @@ function loadGrid() {
                 , {display: "采购订单类型", name: "bsart", width: 150, minWidth: 60, type: "string", align: "center"}
                 , {display: "采购订单类型描述", name: "batxt", width: 150, minWidth: 60, type: "string", align: "center"}
                 , {display: "sap回执", name: "message", width: 200, minWidth: 60, type: "string", align: "center"}
+                , {display: "创建日期", name: "fillinDate", width: 140, minWidth: 60, type: "string", align: "center"}
 
             ],
             dataAction: 'server',

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderList.jsp

@@ -17,6 +17,7 @@
             <form class="hg-form ui-show" method="post" action="" id="queryMainForm">
                 <div class="hg-form-row">
                     <x:inputC name="billCode" label="需求跟踪编号" labelCol="1"/>
+                    <x:inputC name="ebeln" label="采购订单号码" labelCol="1"/>
                 </div>
                 <x:searchButtons/>
             </form>

topsun-xt/src/main/webapp/pdfjs/PDFViewer.jsp

+<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    String serverHost = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort();
+    String basePath = serverHost + request.getContextPath();
+    request.setAttribute("basePath", basePath);
+%>
+<html>
+<head>
+    <title>${fileName}</title>
+    <script src="${basePath}/lib/jquery/jquery.min.js"></script>
+    <%--引入common.js禁用F12开发者工具--%>
+    <script src="${basePath}/javaScript/common.js"></script>
+    <script type="text/javascript">
+        $(function () {
+            $("#pdfViewer").attr("height", $(document).height());
+            var url = "${basePath}/pdfjs/web/viewer.html?file=" + encodeURIComponent("${basePath}/PDFViewer/displayPDF.ajax?id=${fileId}&fileType=${fileType}");
+            $("#pdfViewer").attr("src", url);
+        })
+    </script>
+</head>
+<body>
+<iframe id="pdfViewer" width="100%"></iframe>
+</body>
+</html>

topsun-xt/src/main/webapp/pdfjs/web/cmaps/CNS2-V.bcmap

+RCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSECNS2-H
\ No newline at end of file

topsun-xt/src/main/webapp/pdfjs/web/cmaps/ETenms-B5-H.bcmap

+RCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSE	ETen-B5-H`
 ^

\ No newline at end of file

topsun-xt/src/main/webapp/pdfjs/web/cmaps/GB-H.bcmap

+RCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSE

!!]aX!!]`21>	pz$]"Rd-U7*
4%+ Z {/%<9Kb1]."`],"]
+"]h"]F"]$"]"]`"]>"]"]z"]X"]6"]"]r"]P"]."]"]j"]H"]&"]"]b"]@"]"]|"]Z"]8"]"]t"]R"]0"]"]l"]J"]("]"]d"]B"] "X~']W"]5"]"]q"]O"]-"]"]i"]G"]%"]"]a"]?"]"]{"]Y"]7"]"]s"]Q"]/"]
"]k"]I"]'"]"]c"]A"]"]}"]["]9
\ No newline at end of file