Skip to content

S
srm
Commit 7f3e64a1 authored by 顾俭's avatar 顾俭
Browse files
Options

打印ws调用修改、新增采购打印

parent e10bb379
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 43 deletions
deploy/IOne-SRM-Prod/application.yml
View file @ 7f3e64a1
......@@ -35,24 +35,27 @@ srm:
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=
printPurchaseOrderUrl: finereport/ReportServer?reportlet=ZMT%2FSRM%2Ferppo.cpt&plant=TOREPLACEPLANT&docno=TOREPLACEDOCNO
soapWs:
wsDynamicClient: true
wsUrl: http://192.168.12.10/web/ws/r/aws_ttsrv41
wsdlUrl: http://192.168.12.10/web/ws/r/aws_ttsrv41?wsdl
deliverOrderWSDL: http://192.168.12.10/web/ws/r/aws_ttsrv41?wsdl
wsUrl: http://192.168.12.10/web/ws/r/aws_ttsrv4
wsdlUrl: http://192.168.12.10/web/ws/r/aws_ttsrv4?wsdl
deliverOrderWSDL: http://192.168.12.10/web/ws/r/aws_ttsrv4?wsdl
deliverOrderFahuo: SRM_fahuo
deliverOrderChehuiWSDL: http://192.168.12.10/web/ws/r/aws_ttsrv41?wsdl
deliverOrderChehuiWSDL: http://192.168.12.10/web/ws/r/aws_ttsrv4?wsdl
deliverOrderFahuochehui: SRM_fahuochehui
productWSDL: http://192.168.12.10/web/ws/r/aws_ttsrv41?wsdl
productWSDL: http://192.168.12.10/web/ws/r/aws_ttsrv4?wsdl
productLiaojian: SRM_liaojian
supplierWSDL: http://192.168.12.10/web/ws/r/aws_ttsrv41?wsdl
supplierWSDL: http://192.168.12.10/web/ws/r/aws_ttsrv4?wsdl
supplierGetgys: SRM_getgys
poChgWSDL: http://192.168.12.10/web/ws/r/aws_ttsrv41?wsdl
poChgWSDL: http://192.168.12.10/web/ws/r/aws_ttsrv4?wsdl
poChgPobiangeng: SRM_pobiangeng
defaultReturnType: 0
defaultPoChgReturnType: 0
supplierErpCheck: true
supplierErpSend: true
wsdlUrlGenBarcode: http://192.168.12.10/web/ws/r/aws_ttsrv41?wsdl
wsdlUrlPrintBarcode: http://192.168.12.10/web/ws/r/aws_ttsrv42?wsdl
genBarcode: SRM_genbarcode
printBarcode: SRM_printbarcode
voidBarcode: SRM_voidbarcode
......
deploy/IOne-SRM-Staging/application.yml
View file @ 7f3e64a1
......@@ -35,24 +35,27 @@ srm:
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=
printPurchaseOrderUrl: finereport/ReportServer?reportlet=ZMT%2FSRM%2Ferppo.cpt&plant=TOREPLACEPLANT&docno=TOREPLACEDOCNO
soapWs:
wsDynamicClient: true
wsUrl: http://192.168.12.10/web/ws/r/aws_ttsrv41_toptest
wsdlUrl: http://192.168.12.10/web/ws/r/aws_ttsrv41_toptest?wsdl
deliverOrderWSDL: http://192.168.12.10/web/ws/r/aws_ttsrv41_toptest?wsdl
wsUrl: http://192.168.12.10/web/ws/r/aws_ttsrv4_toptest
wsdlUrl: http://192.168.12.10/web/ws/r/aws_ttsrv4_toptest?wsdl
deliverOrderWSDL: http://192.168.12.10/web/ws/r/aws_ttsrv4_toptest?wsdl
deliverOrderFahuo: SRM_fahuo
deliverOrderChehuiWSDL: http://192.168.12.10/web/ws/r/aws_ttsrv41_toptest?wsdl
deliverOrderChehuiWSDL: http://192.168.12.10/web/ws/r/aws_ttsrv4_toptest?wsdl
deliverOrderFahuochehui: SRM_fahuochehui
productWSDL: http://192.168.12.10/web/ws/r/aws_ttsrv41_toptest?wsdl
productWSDL: http://192.168.12.10/web/ws/r/aws_ttsrv4_toptest?wsdl
productLiaojian: SRM_liaojian
supplierWSDL: http://192.168.12.10/web/ws/r/aws_ttsrv41_toptest?wsdl
supplierWSDL: http://192.168.12.10/web/ws/r/aws_ttsrv4_toptest?wsdl
supplierGetgys: SRM_getgys
poChgWSDL: http://192.168.12.10/web/ws/r/aws_ttsrv41_toptest?wsdl
poChgWSDL: http://192.168.12.10/web/ws/r/aws_ttsrv4_toptest?wsdl
poChgPobiangeng: SRM_pobiangeng
defaultReturnType: 0
defaultPoChgReturnType: 0
supplierErpCheck: true
supplierErpSend: true
wsdlUrlGenBarcode: http://192.168.12.10/web/ws/r/aws_ttsrv41_toptest?wsdl
wsdlUrlPrintBarcode: http://192.168.12.10/web/ws/r/aws_ttsrv42_toptest?wsdl
genBarcode: SRM_genbarcode
printBarcode: SRM_printbarcode
voidBarcode: SRM_voidbarcode
......@@ -60,5 +63,5 @@ srm:
fahuoConfirm: SRM_fahuoconfirm
email:
enable: true
recipients: gujian@benchmarkchina.com,raven@benchmarkchina.com
recipients:
logoImg: data:image/png;base64,xxx
src/main/java/com/i1/erp/barcode/soap/BarcodeGenClient.java
View file @ 7f3e64a1
......@@ -30,7 +30,7 @@ public class BarcodeGenClient extends WebServiceClient {
@Value("${srm.soapWs.genBarcode}")
public String ERP_GEN_BARCODE_OP;
@Value("${srm.soapWs.wsdlUrl}")
@Value("${srm.soapWs.wsdlUrlGenBarcode}")
private String WSDL_URL;
private Logger logger = LoggerFactory.getLogger(BarcodeGenClient.class);
......
src/main/java/com/i1/erp/barcode/soap/BarcodePrintClient.java
View file @ 7f3e64a1
......@@ -38,7 +38,7 @@ public class BarcodePrintClient extends WebServiceClient {
@Value("${srm.soapWs.printBarcode}")
public String ERP_PRINT_BARCODE_OP;
@Value("${srm.soapWs.wsdlUrl}")
@Value("${srm.soapWs.wsdlUrlPrintBarcode}")
private String WSDL_URL;
@Autowired
......
src/main/java/com/i1/srm/am/entity/Function.java
View file @ 7f3e64a1
......@@ -16,7 +16,7 @@ public enum Function {
// TODO 新环境id重整
INDEX_NOTICE_FUNCTION(0, 0, "首页公告", Lists.newArrayList(QUERY, CREATE, VIEW_NOTICE_HISTORY)),
//1采购协同管理
PURCHASE_ORDER_FUNCTION(1, 11, "采购单管理", Lists.newArrayList(QUERY, VIEW, RETURN, EXPORT, GEN_BARCODE, PRINT_BARCODE)),
PURCHASE_ORDER_FUNCTION(1, 11, "采购单管理", Lists.newArrayList(QUERY, VIEW, RETURN, EXPORT, GEN_BARCODE, PRINT_BARCODE, PRINT)),
PURCHASE_ORDER_CHANGE_FUNCTION(14, 12, "采购变更单管理", Lists.newArrayList(QUERY, VIEW, EXPORT, RETURN, CONFIRM, RETURN_ACCEPT, RETURN_REJECT, CONFIRM_ACCEPT, CONFIRM_REJECT)),
BARCODE_FUNCTION(92,13,"防伪码作废补打", Lists.newArrayList(VOID_BARCODE,PRINT_BARCODE,GET_BARCODE_STATUS)),
......
src/main/java/com/i1/srm/am/entity/Resource.java
View file @ 7f3e64a1
......@@ -66,7 +66,8 @@ public enum Resource {
GEN_BARCODE(56, "申请防伪码"),
PRINT_BARCODE(57, "打印防伪码"),
VOID_BARCODE(58, "作废防伪码"),
GET_BARCODE_STATUS(59, "查询防伪码状态")
GET_BARCODE_STATUS(59, "查询防伪码状态"),
PRINT(60, "打印")
;
private Integer id;
......
src/main/java/com/i1/srm/base/web/BaseConfigController.java
View file @ 7f3e64a1
......@@ -34,6 +34,9 @@ public class BaseConfigController {
@Value("${srm.print.printLabelA4Url:}")
public String printLabelA4Url;
@Value("${srm.print.printPurchaseOrderUrl:}")
public String printPurchaseOrderUrl;
@RequestMapping(value = "/getPrintUrls", method = RequestMethod.GET)
public Map getAllByExample() throws IOneWebRestfulException {
Map<String, Object> printMap = ImmutableMap.<String, Object>builder()
......@@ -44,6 +47,7 @@ public class BaseConfigController {
.put("printOrderUrl", printOrderUrl)
.put("printLabelUrl", printLabelUrl)
.put("printLabelA4Url", printLabelA4Url)
.put("printPurchaseOrderUrl", printPurchaseOrderUrl)
.build();
return printMap;
}
......
src/main/resources/application.yml
View file @ 7f3e64a1
......@@ -40,13 +40,22 @@ spring:
static-locations: file:/root/SRM, classpath:/static/,classpath:/META-INF/resources/,classpath:/resources/,classpath:/public/
mail:
host: smtp.exmail.qq.com
password: doFT9irMo2JNQQ
port: 25
username: gitlab@benchmarkchina.com
properties.mail.smtp.auth: true
properties.mail.smtp.starttls.enable: true
properties.mail.debug: true
host:
password:
port:
username:
properties.mail.smtp.auth:
properties.mail.smtp.starttls.enable:
properties.mail.debug:
# mail:
# host: smtp.exmail.qq.com
# password: doFT9irMo2JNQQ
# port: 25
# username: gitlab@benchmarkchina.com
# properties.mail.smtp.auth: true
# properties.mail.smtp.starttls.enable: true
# properties.mail.debug: true
management:
security:
......@@ -83,26 +92,28 @@ srm:
printLabelA4Url: finereport/ReportServer?reportlet=ZMT/srm/srmlabelA4.cpt&shdh=
soapWs:
wsDynamicClient: true
wsUrl: http://127.0.0.1:6394/ws/r/aws_ttsrv41_toptest
wsdlUrl: http://127.0.0.1:6394/web/ws/r/aws_ttsrv41_toptest?wsdl
deliverOrderWSDL: http://127.0.0.1:6394/ws/r/aws_ttsrv41?wsdl
wsUrl: http://127.0.0.1:6394/ws/r/aws_ttsrv4_toptest
wsdlUrl: http://127.0.0.1:6394/web/ws/r/aws_ttsrv4_toptest?wsdl
deliverOrderWSDL: http://127.0.0.1:6394/ws/r/aws_ttsrv4?wsdl
deliverOrderFahuo: SRM_fahuo
deliverOrderChehuiWSDL: http://127.0.0.1:6394/ws/r/aws_ttsrv41?wsdl
deliverOrderChehuiWSDL: http://127.0.0.1:6394/ws/r/aws_ttsrv4?wsdl
deliverOrderFahuochehui: SRM_fahuochehui
productWSDL: http://127.0.0.1:6394/ws/r/aws_ttsrv41?wsdl
productWSDL: http://127.0.0.1:6394/ws/r/aws_ttsrv4?wsdl
productLiaojian: SRM_liaojian
supplierWSDL: http://127.0.0.1:6394/ws/r/aws_ttsrv41?wsdl
supplierWSDL: http://127.0.0.1:6394/ws/r/aws_ttsrv4?wsdl
supplierGetgys: SRM_getgys
supplierGongyingshang: SRM_gongyingshang
supplierGyscf: SRM_gyscf
poChgWSDL: http://127.0.0.1:6394/ws/r/aws_ttsrv41?wsdl
poChgWSDL: http://127.0.0.1:6394/ws/r/aws_ttsrv4?wsdl
poChgPobiangeng: SRM_pobiangeng
invoiceWSDL: http://127.0.0.1:6394/ws/r/aws_ttsrv41?wsdl
invoiceWSDL: http://127.0.0.1:6394/ws/r/aws_ttsrv4?wsdl
invoiceFapiao: SRM_fapiao
defaultReturnType: 0
defaultPoChgReturnType: 0
supplierErpCheck: false
supplierErpSend: false
wsdlUrlGenBarcode: http://127.0.0.1:6394/web/ws/r/aws_ttsrv4_toptest?wsdl
wsdlUrlPrintBarcode: http://127.0.0.1:6394/web/ws/r/aws_ttsrv4_toptest?wsdl
genBarcode: SRM_genbarcode
printBarcode: SRM_printbarcode
voidBarcode: SRM_voidbarcode
......@@ -186,28 +197,31 @@ srm:
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=
printPurchaseOrderUrl: finereport/ReportServer?reportlet=ZMT%2FSRM%2Ferppo.cpt&plant=TOREPLACEPLANT&docno=TOREPLACEDOCNO
soapWs:
wsDynamicClient: true
wsUrl: http://127.0.0.1:6394/ws/r/aws_ttsrv41_toptest
wsdlUrl: http://127.0.0.1:6394/web/ws/r/aws_ttsrv41_toptest?wsdl
deliverOrderWSDL: http://127.0.0.1:6394/ws/r/aws_ttsrv41_toptest?wsdl
wsUrl: http://127.0.0.1:6394/ws/r/aws_ttsrv4_toptest
wsdlUrl: http://127.0.0.1:6394/web/ws/r/aws_ttsrv4_toptest?wsdl
deliverOrderWSDL: http://127.0.0.1:6394/ws/r/aws_ttsrv4_toptest?wsdl
deliverOrderFahuo: SRM_fahuo
deliverOrderChehuiWSDL: http://127.0.0.1:6394/ws/r/aws_ttsrv41_toptest?wsdl
deliverOrderChehuiWSDL: http://127.0.0.1:6394/ws/r/aws_ttsrv4_toptest?wsdl
deliverOrderFahuochehui: SRM_fahuochehui
productWSDL: http://127.0.0.1:6394/ws/r/aws_ttsrv41_toptest?wsdl
productWSDL: http://127.0.0.1:6394/ws/r/aws_ttsrv4_toptest?wsdl
productLiaojian: SRM_liaojian
supplierWSDL: http://127.0.0.1:6394/ws/r/aws_ttsrv41_toptest?wsdl
supplierWSDL: http://127.0.0.1:6394/ws/r/aws_ttsrv4_toptest?wsdl
supplierGetgys: SRM_getgys
supplierGongyingshang: SRM_gongyingshang
supplierGyscf: SRM_gyscf
poChgWSDL: http://127.0.0.1:6394/ws/r/aws_ttsrv41_toptest?wsdl
poChgWSDL: http://127.0.0.1:6394/ws/r/aws_ttsrv4_toptest?wsdl
poChgPobiangeng: SRM_pobiangeng
invoiceWSDL: http://127.0.0.1:6394/ws/r/aws_ttsrv41_toptest?wsdl
invoiceWSDL: http://127.0.0.1:6394/ws/r/aws_ttsrv4_toptest?wsdl
invoiceFapiao: SRM_fapiao
defaultReturnType: 1
defaultPoChgReturnType: 1
supplierErpCheck: false
supplierErpSend: false
wsdlUrlGenBarcode: http://127.0.0.1:6394/web/ws/r/aws_ttsrv4_toptest?wsdl
wsdlUrlPrintBarcode: http://127.0.0.1:6394/web/ws/r/aws_ttsrv4_toptest?wsdl
genBarcode: SRM_genbarcode
printBarcode: SRM_printbarcode
voidBarcode: SRM_voidbarcode
......
src/main/resources/static/app/srm/purchaseOrder/query/query.html
View file @ 7f3e64a1
......@@ -128,6 +128,9 @@
ng-click="printBarcodeClick()"
ng-disabled="!currentPurchaseOrderMaster" acl-check func=" 'PURCHASE_ORDER_FUNCTION' " resource=" 'PRINT_BARCODE' ">打印防伪码
</button>
<button class="btn btn-default mrs" ng-click="printClick()"
ng-disabled="!currentPurchaseOrderMaster" acl-check func=" 'PURCHASE_ORDER_FUNCTION' " resource=" 'PRINT' ">打印
</button>
<button class="btn btn-default mrs" ng-click="clickExport()" ng-disabled="gridOptions.data.length == 0" acl-check func=" 'PURCHASE_ORDER_FUNCTION' " resource=" 'EXPORT' ">导出</button>
<ul uib-pagination total-items="pageOption.totalElements" ng-model="pageOption.page" items-per-page="pageOption.size" ng-change="getPurchaseOrderDetails()"
class="pagination-sm pull-right mbn mtn" boundary-links="true" rotate="false" max-size="5"
......
src/main/resources/static/app/srm/purchaseOrder/query/query.js
View file @ 7f3e64a1
......@@ -212,7 +212,7 @@ angular.module('IOne').controller('PurchaseOrderQueryController', function ($sco
receivedAmount: item.receivedAmount || '0',
unverifiedAmount: item.unverifiedAmount || '0',
whunverifiedAmount: item.whunverifiedAmount || '0',
remark: item.remark ||' ',
remark: item.remark || ' ',
supplierUid: item.poMst.supplier.supplierUid || ' ',
supplierName: item.poMst.supplier.name || ' ',
factoryName: item.factory.name || ' ',
......@@ -411,4 +411,23 @@ angular.module('IOne').controller('PurchaseOrderQueryController', function ($sco
)
}
// 打印采购单
$scope.printClick = function () {
var serverUrl = (window.location.host).substr(0, 3);
var url = '';
if (serverUrl == $rootScope.printUrls.printIpPrefixInSide) {
url = $rootScope.printUrls.printHostInSide + $rootScope.printUrls.printPurchaseOrderUrl;
} else {
url = $rootScope.printUrls.printHostOutSide + $rootScope.printUrls.printPurchaseOrderUrl;
}
url = url.replace('TOREPLACEPLANT', $scope.currentPurchaseOrderMaster.factory.factoryUid);
url = url.replace('TOREPLACEDOCNO', $window.btoa($scope.currentPurchaseOrderMaster.purchaseOrderUid));
try {
$window.open(url);
} catch (e) {
console.error(e);
}
}
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment