Merge branch '#5' into 'master'

aship/aship#5 防伪码功能-调整

See merge request !7

deploy/IOne-SRM-Prod/application.yml

@@ -30,11 +30,11 @@ srm:
     print:
         printInSrm: false
         printIpPrefixInSide: 192
-        printHostOutSide: http://61.130.98.122:8089/
+        printHostOutSide: http://192.168.12.28:8080/
         printHostInSide: http://192.168.12.28:8080/
-        printOrderUrl: WebReport/ReportServer?reportlet=ZMT/SRM/srmorder.cpt&shdh=
-        printLabelUrl: WebReport/ReportServer?reportlet=ZMT/SRM/srmlabel.cpt&shdh=
-        printLabelA4Url: WebReport/ReportServer?reportlet=ZMT/SRM/srmlabelA4.cpt&shdh=
+        printOrderUrl: finereport/ReportServer?reportlet=ZMT/srm/srmorder.cpt&shdh=
+        printLabelUrl: finereport/ReportServer?reportlet=ZMT/srm/srmlabel.cpt&shdh=
+        printLabelA4Url: finereport/ReportServer?reportlet=ZMT/srm/srmlabelA4.cpt&shdh=
     soapWs:
         wsDynamicClient: true
         wsUrl: http://192.168.12.10/web/ws/r/aws_ttsrv4

deploy/IOne-SRM-Staging/application.yml

@@ -30,11 +30,11 @@ srm:
     print:
         printInSrm: false
         printIpPrefixInSide: 192
-        printHostOutSide: http://61.130.98.122:8089/
+        printHostOutSide: http://192.168.12.28:8080/
         printHostInSide: http://192.168.12.28:8080/
-        printOrderUrl: WebReport/ReportServer?reportlet=ZMT/SRM_TEST/srmorder.cpt&shdh=
-        printLabelUrl: WebReport/ReportServer?reportlet=ZMT/SRM_TEST/srmlabel.cpt&shdh=
-        printLabelA4Url: WebReport/ReportServer?reportlet=ZMT/SRM_TEST/srmlabelA4.cpt&shdh=
+        printOrderUrl: finereport/ReportServer?reportlet=ZMT/srm/srmorder.cpt&shdh=
+        printLabelUrl: finereport/ReportServer?reportlet=ZMT/srm/srmlabel.cpt&shdh=
+        printLabelA4Url: finereport/ReportServer?reportlet=ZMT/srm/srmlabelA4.cpt&shdh=
     soapWs:
         wsDynamicClient: true
         wsUrl: http://192.168.12.10/web/ws/r/aws_ttsrv4_toptest

src/main/resources/application.yml

@@ -76,11 +76,11 @@ srm:
     print:
         printInSrm: true
         printIpPrefixInSide: 192
-        printHostOutSide: http://61.130.98.122:8089/
+        printHostOutSide: http://192.168.12.28:8080/
         printHostInSide: http://192.168.12.28:8080/
-        printOrderUrl: WebReport/ReportServer?reportlet=ZMT/SRM/srmorder.cpt&shdh=
-        printLabelUrl: WebReport/ReportServer?reportlet=ZMT/SRM/srmlabel.cpt&shdh=
-        printLabelA4Url: WebReport/ReportServer?reportlet=ZMT/SRM/srmlabelA4.cpt&shdh=
+        printOrderUrl: finereport/ReportServer?reportlet=ZMT/srm/srmorder.cpt&shdh=
+        printLabelUrl: finereport/ReportServer?reportlet=ZMT/srm/srmlabel.cpt&shdh=
+        printLabelA4Url: finereport/ReportServer?reportlet=ZMT/srm/srmlabelA4.cpt&shdh=
     soapWs:
         wsDynamicClient: true
         wsUrl: http://127.0.0.1:6394/ws/r/aws_ttsrv4_toptest
@@ -181,11 +181,11 @@ srm:
     print:
         printInSrm: false
         printIpPrefixInSide: 192
-        printHostOutSide: http://61.130.98.122:8089/
+        printHostOutSide: http://192.168.12.28:8080/
         printHostInSide: http://192.168.12.28:8080/
-        printOrderUrl: WebReport/ReportServer?reportlet=ZMT/SRM_TEST/srmorder.cpt&shdh=
-        printLabelUrl: WebReport/ReportServer?reportlet=ZMT/SRM_TEST/srmlabel.cpt&shdh=
-        printLabelA4Url: WebReport/ReportServer?reportlet=ZMT/SRM_TEST/srmlabelA4.cpt&shdh=
+        printOrderUrl: finereport/ReportServer?reportlet=ZMT/srm/srmorder.cpt&shdh=
+        printLabelUrl: finereport/ReportServer?reportlet=ZMT/srm/srmlabel.cpt&shdh=
+        printLabelA4Url: finereport/ReportServer?reportlet=ZMT/srm/srmlabelA4.cpt&shdh=
     soapWs:
         wsDynamicClient: true
         wsUrl: http://127.0.0.1:6394/ws/r/aws_ttsrv4_toptest

src/main/resources/static/app/srm/deliveryOrder/query/query.js

@@ -57,9 +57,9 @@ angular.module('IOne').controller('DeliveryOrderQueryController', function ($sco
             {name: '序号', field: 'getIndex()', width: 50, cellTemplate: cellTemplate},
             {
                 name: '操作', field: "doMst.deliveryOrderUid",
-                cellTemplate: "<a ng-if='row.entity.doMst.released == \"1\"' href ng-click='grid.appScope.printDeliveryOrder(row.entity)' title='打印送货单'><i class='fa fa-print'></i></a> " +
-                    "<a ng-if='row.entity.doMst.released == \"1\"' href style='margin-left: 5px;' ng-click='grid.appScope.printDeliveryOrderLabels(row.entity)' title='打印箱A4版标签'><i class='fa fa-print'></i></a>" +
-                    "<a ng-if='row.entity.doMst.released == \"1\" && row.entity.doMst.supplier.useBarcode != \"Y\"' href style='margin-left: 10px;' ng-click='grid.appScope.printDeliveryOrderSingleLabel(row.entity)' title='打印箱条码标签'><i class='fa fa-print'></i></a>",
+                cellTemplate: "<a ng-if='row.entity.doMst.sentToErpInfo == \"1\" || row.entity.doMst.sentToErpInfo == \"提交审核成功\"' href ng-click='grid.appScope.printDeliveryOrder(row.entity)' title='打印送货单'><i class='fa fa-print'></i></a> " +
+                    "<a ng-if='row.entity.doMst.sentToErpInfo == \"1\" || row.entity.doMst.sentToErpInfo == \"提交审核成功\"'  href style='margin-left: 5px;' ng-click='grid.appScope.printDeliveryOrderLabels(row.entity)' title='打印箱A4版标签'><i class='fa fa-print'></i></a>" +
+                    "<a ng-if='(row.entity.doMst.sentToErpInfo == \"1\" || row.entity.doMst.sentToErpInfo == \"提交审核成功\") && row.entity.doMst.supplier.useBarcode != \"Y\"' href style='margin-left: 10px;' ng-click='grid.appScope.printDeliveryOrderSingleLabel(row.entity)' title='打印箱条码标签'><i class='fa fa-print'></i></a>",
                 width: 100, cellClass: 'print-icon'
             },
             {name: '送货单号', field: 'doMst.deliveryOrderUid', width: 120, cellTemplate: cellTemplate},

src/main/resources/static/app/srm/deliveryOrder/view/view.html

@@ -73,9 +73,9 @@
     </div>
 
     <div class="button-bar">
-        <button class="btn btn-primary" ng-click="printDeliveryOrder()" ng-disabled="currentDeliveryOrder.released !='1'">打印送货单</button>
-        <button class="btn btn-primary" ng-click="printDeliveryOrderLabels()" ng-disabled="productGridOption.data.length == 0 || currentDeliveryOrder.released !='1'">打印A4标签</button>
-        <button class="btn btn-primary" ng-click="printDeliveryOrderSingleLabel()" ng-disabled="productGridOption.data.length == 0 || currentDeliveryOrder.released !='1'"
+        <button class="btn btn-primary" ng-click="printDeliveryOrder()" ng-disabled="currentDeliveryOrder.released !='1' && currentDeliveryOrder.sentToErpInfo !='提交审核成功'">打印送货单</button>
+        <button class="btn btn-primary" ng-click="printDeliveryOrderLabels()" ng-disabled="productGridOption.data.length == 0 || (currentDeliveryOrder.released !='1' && currentDeliveryOrder.sentToErpInfo !='提交审核成功')">打印A4标签</button>
+        <button class="btn btn-primary" ng-click="printDeliveryOrderSingleLabel()" ng-disabled="productGridOption.data.length == 0 || (currentDeliveryOrder.released !='1' && currentDeliveryOrder.sentToErpInfo !='提交审核成功')"
                 ng-if="currentDeliveryOrder.supplier.useBarcode !=='Y'">打印条码标签
         </button>
         <button class=" btn btn-primary" ng-click="saveLabels()" ng-hide="labelGridOption.data.length == 0 || labelGridOption.data[0].doDtlProduct.steelCoil == '0'"