Skip to content

S
srm
Commit 30db7299 authored by 顾俭's avatar 顾俭
Browse files
Options

Merge branch 'aship/aship#1' into 'master' 

aship/aship#1 防伪码功能

See merge request !2
parents 30dd196a 2cb62142
Show whitespace changes
Inline Side-by-side
Showing with 1310 additions and 39 deletions
deploy/IOne-SRM-Prod/application.yml
View file @ 30db7299
......@@ -37,7 +37,8 @@ srm:
printLabelA4Url: WebReport/ReportServer?reportlet=ZMT/SRM/srmlabelA4.cpt&shdh=
soapWs:
wsDynamicClient: true
wsUrl: http://192.168.1.30:6394/ws/r/aws_ttsrv4
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_ttsrv4?wsdl
......
deploy/IOne-SRM-Staging/application.yml
View file @ 30db7299
......@@ -37,7 +37,8 @@ srm:
printLabelA4Url: WebReport/ReportServer?reportlet=ZMT/SRM_TEST/srmlabelA4.cpt&shdh=
soapWs:
wsDynamicClient: true
wsUrl: http://192.168.1.30:6394/ws/r/aws_ttsrv4_toptest
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_ttsrv4_toptest?wsdl
......
src/main/java/com/i1/erp/barcode/service/BarCodeGenService.java 0 → 100644
View file @ 30db7299
package com.i1.erp.barcode.service;
import com.i1.base.exception.IOneServiceException;
import com.i1.erp.entity.request.*;
import com.i1.srm.purchaseOrder.web.dto.PoBarcodeDtlDto;
import com.i1.srm.purchaseOrder.web.dto.PoBarcodeDto;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@Service
public class BarCodeGenService implements IBarCodeGenService {
private static final Logger logger = LoggerFactory.getLogger(BarCodeGenService.class);
@Override
public Request genXml(PoBarcodeDto input) throws IOneServiceException {
String organization = Objects.requireNonNull(input.getFactoryUid());
String pmm01 = Objects.requireNonNull(input.getPurchaseOrderUid());
List<PoBarcodeDtlDto> dtls = Objects.requireNonNull(input.getDtl());
Access access = Access.of(Authentication.of("017552", "tiptop"),
Connection.of("SRM", "192.168.1.1"),
Organization.of(organization),
Locale.of("zh_cn"));
List<Field> mstFieldList = new ArrayList<>();
mstFieldList.add(Field.of("pmm01", pmm01));
Record mstRecord = Record.of(mstFieldList);
Master mst = Master.of(mstRecord, "MST");
List<Detail> detailList = new ArrayList<>();
List<Record> dtlRecordList = new ArrayList<>();
for (PoBarcodeDtlDto dtl : dtls) {
List<Field> dtlFieldList = new ArrayList<>();
dtlFieldList.add(Field.of("pmn02", String.valueOf(dtl.getPoDtlRow())));
dtlFieldList.add(Field.of("num", String.valueOf(dtl.getBarcodeAmount())));
dtlFieldList.add(Field.of("pmn04", dtl.getProductUid()));
Record dtlRecord = Record.of(dtlFieldList);
dtlRecordList.add(dtlRecord);
}
Detail detail = Detail.of(dtlRecordList, "DTL");
detailList.add(detail);
// recordSet：mst + dtl
RecordSet recordSet = RecordSet.of("1", mst, detailList);
List<RecordSet> recordSetList = new ArrayList<>();
recordSetList.add(recordSet);
RequestContent requestContent = new RequestContent();
requestContent.setDocument(Document.of(recordSetList));
requestContent.setParameter(Parameter.of(Record.of(null)));
return Request.of(access, requestContent);
}
}
src/main/java/com/i1/erp/barcode/service/IBarCodeGenService.java 0 → 100644
View file @ 30db7299
package com.i1.erp.barcode.service;
import com.i1.base.exception.IOneServiceException;
import com.i1.erp.entity.request.Request;
import com.i1.srm.purchaseOrder.web.dto.PoBarcodeDto;
public interface IBarCodeGenService {
Request genXml(PoBarcodeDto input) throws IOneServiceException;
}
src/main/java/com/i1/erp/barcode/soap/BarcodeGenClient.java 0 → 100644
View file @ 30db7299
package com.i1.erp.barcode.soap;
import com.i1.base.exception.IOneServiceException;
import com.i1.erp.WebServiceClient;
import com.i1.erp.barcode.service.BarCodeGenService;
import com.i1.erp.base.web.dto.SyncResponse;
import com.i1.erp.entity.request.Request;
import com.i1.erp.entity.response.Response;
import com.i1.srm.purchaseOrder.web.dto.PoBarcodeDto;
import org.apache.commons.lang3.StringUtils;
import org.apache.cxf.endpoint.Client;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import tw.com.dsc.tiptop.tiptopservicegateway.SRMGenbarcodeRequestSRMGenbarcodeRequest;
import tw.com.dsc.tiptop.tiptopservicegateway.SRMGenbarcodeResponseSRMGenbarcodeResponse;
import static com.i1.erp.base.web.dto.SyncResponseCode.FAIL_CODE;
import static com.i1.erp.base.web.dto.SyncResponseCode.SUCCESS_CODE;
import static com.i1.srm.utils.SafeType.safeString;
@Component
public class BarcodeGenClient extends WebServiceClient {
@Value("${srm.soapWs.wsDynamicClient}")
public Boolean wsDynamicClient;
@Value("${srm.soapWs.wsdlUrl}")
private String WSDL_URL;
@Value("${srm.soapWs.genBarcode}")
public String ERP_GEN_BARCODE_OP;
private Logger logger = LoggerFactory.getLogger(BarcodeGenClient.class);
@Autowired
private BarCodeGenService barCodeGenServicel;
public SyncResponse genBarcode(PoBarcodeDto input) {
try {
// xml
logger.info("prepare gen barcode {}", input.getFactoryUid() + "-" + input.getPurchaseOrderUid());
Request requestXml = barCodeGenServicel.genXml(input);
if (requestXml == null) {
logger.error("error:防伪码申请无法生成XML结构");
return SyncResponse.of(FAIL_CODE, "防伪码申请无法生成XML结构");
}
// request
SRMGenbarcodeRequestSRMGenbarcodeRequest genbarcodeRequest = new SRMGenbarcodeRequestSRMGenbarcodeRequest();
genbarcodeRequest.setRequest(covertObjectToXML(requestXml, Request.class));
logger.info(genbarcodeRequest.getRequest());
if (StringUtils.isBlank(WSDL_URL) || StringUtils.isBlank(ERP_GEN_BARCODE_OP)) {
throw new IOneServiceException("WSDL不可为空.");
}
Client client = getClient(WSDL_URL);
Object[] objects = client.invoke(ERP_GEN_BARCODE_OP, new Object[]{genbarcodeRequest});
client.destroy();
// response
if (objects != null && objects.length > 0) {
SRMGenbarcodeResponseSRMGenbarcodeResponse originalResponse = (SRMGenbarcodeResponseSRMGenbarcodeResponse) objects[0];
logger.info(originalResponse.getResponse());
Response response = convertXMLToObject(originalResponse.getResponse(), Response.class);
if (response.getExecution().getStatus().getCode().equalsIgnoreCase("0")) {
return SyncResponse.of(SUCCESS_CODE, "申请防伪码成功");
} else {
String errorDetails = String.format("失败码：%s, 原因: %s, SQL: ",
safeString(response.getExecution().getStatus().getCode()),
safeString(response.getExecution().getStatus().getDescription()),
safeString(response.getExecution().getStatus().getSqlcode()));
return SyncResponse.of(FAIL_CODE, errorDetails);
}
} else {
logger.error("ERP无响应.");
return SyncResponse.of(FAIL_CODE, "ERP无响应");
}
} catch (Exception e) {
logger.error("e", e);
return SyncResponse.of(FAIL_CODE, e.getMessage());
}
}
}
src/main/java/com/i1/srm/am/entity/Function.java
View file @ 30db7299
......@@ -15,7 +15,7 @@ import static com.i1.srm.am.entity.Resource.*;
public enum Function {
INDEX_NOTICE_FUNCTION(0, 0, "首页公告", Lists.newArrayList(QUERY, CREATE, VIEW_NOTICE_HISTORY)),
//1采购协同管理
PURCHASE_ORDER_FUNCTION(1, 11, "采购单管理", Lists.newArrayList(QUERY, VIEW, RETURN, EXPORT)),
PURCHASE_ORDER_FUNCTION(1, 11, "采购单管理", Lists.newArrayList(QUERY, VIEW, RETURN, EXPORT, GEN_BARCODE)),
PURCHASE_ORDER_CHANGE_FUNCTION(14, 12, "采购变更单管理", Lists.newArrayList(QUERY, VIEW, EXPORT, RETURN, CONFIRM, RETURN_ACCEPT, RETURN_REJECT, CONFIRM_ACCEPT, CONFIRM_REJECT)),
//2送货协同管理
......
src/main/java/com/i1/srm/am/entity/Resource.java
View file @ 30db7299
......@@ -62,7 +62,8 @@ public enum Resource {
PUNISH(52, "处罚"),
CHECK_RELEASE(53, "审核发布"),
ADDITIONAL_RECORDING(54, "补录税票"),
SEND_TO_ERP(55, "上传ERP")
SEND_TO_ERP(55, "上传ERP"),
GEN_BARCODE(56, "申请防伪码")
;
private Integer id;
......
src/main/java/com/i1/srm/base/web/dto/BaseSupplierFileDto.java
View file @ 30db7299
......@@ -122,6 +122,7 @@ public class BaseSupplierFileDto extends Dto<BaseSupplierFile> {
private String stopReason;
private String uploadErp;
private String uploadErpResult;
private String useBarcode;
public String getSupplierUid() {
return supplierUid;
......@@ -978,4 +979,12 @@ public class BaseSupplierFileDto extends Dto<BaseSupplierFile> {
public void setUploadErpResult(String uploadErpResult) {
this.uploadErpResult = uploadErpResult;
}
public String getUseBarcode() {
return useBarcode;
}
public void setUseBarcode(String useBarcode) {
this.useBarcode = useBarcode;
}
}
src/main/java/com/i1/srm/purchaseOrder/web/PoMstFileController.java
View file @ 30db7299
package com.i1.srm.purchaseOrder.web;
import com.i1.base.exception.IOneWebRestfulException;
import com.i1.base.web.AbstractController;
import com.i1.erp.barcode.soap.BarcodeGenClient;
import com.i1.erp.base.web.dto.SyncResponse;
import com.i1.srm.am.entity.Function;
import com.i1.srm.am.entity.Resource;
import com.i1.srm.am.service.ResourcePermission;
import com.i1.srm.am.service.SecuredPage;
import com.i1.srm.purchaseOrder.dao.entity.PoMstFile;
import com.i1.srm.purchaseOrder.service.IPoMstFileService;
import com.i1.srm.purchaseOrder.web.dto.PoBarcodeDtlDto;
import com.i1.srm.purchaseOrder.web.dto.PoBarcodeDto;
import com.i1.srm.purchaseOrder.web.dto.PoMstFileDto;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Objects;
@RestController
@RequestMapping("/purchaseOrders")
@SecuredPage(Function.PURCHASE_ORDER_FUNCTION)
public class PoMstFileController extends AbstractController<PoMstFile, PoMstFileDto> {
private Logger logger = LoggerFactory.getLogger(PoMstFileController.class);
@Autowired
private IPoMstFileService service;
......@@ -22,4 +36,31 @@ public class PoMstFileController extends AbstractController<PoMstFile, PoMstFile
protected IPoMstFileService getService() {
return service;
}
@Autowired
private BarcodeGenClient barcodeGenClient;
/**
* 申请防伪码
*
* @param input
* @return soap接口返回结果
* @throws IOneWebRestfulException
*/
@RequestMapping(value = "/genBarcode", method = RequestMethod.POST)
@ResourcePermission(values = {Resource.GEN_BARCODE})
@ResponseStatus(HttpStatus.CREATED)
public SyncResponse getBarCode(@RequestBody PoBarcodeDto input) throws IOneWebRestfulException {
try {
// TODO check
String factoryUid = Objects.requireNonNull(input.getFactoryUid());
String purchaseOrderUid = Objects.requireNonNull(input.getPurchaseOrderUid());
List<PoBarcodeDtlDto> dtls = Objects.requireNonNull(input.getDtl());
return barcodeGenClient.genBarcode(input);
} catch (Exception e) {
throw new IOneWebRestfulException(e);
}
}
}
src/main/java/com/i1/srm/purchaseOrder/web/dto/PoBarcodeDtlDto.java 0 → 100644
View file @ 30db7299
package com.i1.srm.purchaseOrder.web.dto;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import java.math.BigDecimal;
@JsonIgnoreProperties(ignoreUnknown = true)
public class PoBarcodeDtlDto {
private Long poDtlRow;
private String productUid;
private BigDecimal barcodeAmount;
public Long getPoDtlRow() {
return poDtlRow;
}
public void setPoDtlRow(Long poDtlRow) {
this.poDtlRow = poDtlRow;
}
public String getProductUid() {
return productUid;
}
public void setProductUid(String productUid) {
this.productUid = productUid;
}
public BigDecimal getBarcodeAmount() {
return barcodeAmount;
}
public void setBarcodeAmount(BigDecimal barcodeAmount) {
this.barcodeAmount = barcodeAmount;
}
}
src/main/java/com/i1/srm/purchaseOrder/web/dto/PoBarcodeDto.java 0 → 100644
View file @ 30db7299
package com.i1.srm.purchaseOrder.web.dto;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import java.util.List;
@JsonIgnoreProperties(ignoreUnknown = true)
public class PoBarcodeDto {
private String factoryUid;
private String purchaseOrderUid;
private List<PoBarcodeDtlDto> dtl;
public String getFactoryUid() {
return factoryUid;
}
public void setFactoryUid(String factoryUid) {
this.factoryUid = factoryUid;
}
public String getPurchaseOrderUid() {
return purchaseOrderUid;
}
public void setPurchaseOrderUid(String purchaseOrderUid) {
this.purchaseOrderUid = purchaseOrderUid;
}
public List<PoBarcodeDtlDto> getDtl() {
return dtl;
}
public void setDtl(List<PoBarcodeDtlDto> dtl) {
this.dtl = dtl;
}
}
src/main/java/tw/com/dsc/tiptop/tiptopservicegateway/ObjectFactory.java
View file @ 30db7299
......@@ -44,6 +44,17 @@ public class ObjectFactory {
private final static QName _SRMGetgysRequest_QNAME = new QName("http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", "SRM_getgysRequest");
private final static QName _SRMFahuochehuiResponse_QNAME = new QName("http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", "SRM_fahuochehuiResponse");
private final static QName _SRMFahuochehuiRequest_QNAME = new QName("http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", "SRM_fahuochehuiRequest");
// 新增防伪码
private final static QName _SRMGenbarcodeRequest_QNAME = new QName("http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", "SRM_genbarcodeRequest");
private final static QName _SRMGenbarcodeResponse_QNAME = new QName("http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", "SRM_genbarcodeResponse");
private final static QName _SRMGetbarcodestatusRequest_QNAME = new QName("http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", "SRM_getbarcodestatusRequest");
private final static QName _SRMGetbarcodestatusResponse_QNAME = new QName("http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", "SRM_getbarcodestatusResponse");
private final static QName _SRMVoidbarcodeRequest_QNAME = new QName("http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", "SRM_voidbarcodeRequest");
private final static QName _SRMVoidbarcodeResponse_QNAME = new QName("http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", "SRM_voidbarcodeResponse");
private final static QName _SRMFahuoconfirmRequest_QNAME = new QName("http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", "SRM_fahuoconfirmRequest");
private final static QName _SRMFahuoconfirmResponse_QNAME = new QName("http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", "SRM_fahuoconfirmResponse");
private final static QName _SRMPrintbarcodeRequest_QNAME = new QName("http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", "SRM_printbarcodeRequest");
private final static QName _SRMPrintbarcodeResponse_QNAME = new QName("http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", "SRM_printbarcodeResponse");
/**
* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: tw.com.dsc.tiptop.tiptopservicegateway
......@@ -212,6 +223,85 @@ public class ObjectFactory {
return new SRMFahuochehuiRequestSRMFahuochehuiRequest();
}
/**
* Create an instance of {@link SRMGenbarcodeRequestSRMGenbarcodeRequest }
*
*/
public SRMGenbarcodeRequestSRMGenbarcodeRequest createSRMGenbarcodeRequestSRMGenbarcodeRequest() {
return new SRMGenbarcodeRequestSRMGenbarcodeRequest();
}
/**
* Create an instance of {@link SRMGenbarcodeResponseSRMGenbarcodeResponse }
*
*/
public SRMGenbarcodeResponseSRMGenbarcodeResponse createSRMGenbarcodeResponseSRMGenbarcodeResponse() {
return new SRMGenbarcodeResponseSRMGenbarcodeResponse();
}
/**
* Create an instance of {@link SRMGetbarcodestatusRequestSRMGetbarcodestatusRequest }
*
*/
public SRMGetbarcodestatusRequestSRMGetbarcodestatusRequest createSRMGetbarcodestatusRequestSRMGetbarcodestatusRequest() {
return new SRMGetbarcodestatusRequestSRMGetbarcodestatusRequest();
}
/**
* Create an instance of {@link SRMGetbarcodestatusResponseSRMGetbarcodestatusResponse }
*
*/
public SRMGetbarcodestatusResponseSRMGetbarcodestatusResponse createSRMGetbarcodestatusResponseSRMGetbarcodestatusResponse() {
return new SRMGetbarcodestatusResponseSRMGetbarcodestatusResponse();
}
/**
* Create an instance of {@link SRMPrintbarcodeRequestSRMPrintbarcodeRequest }
*
*/
public SRMPrintbarcodeRequestSRMPrintbarcodeRequest createSRMPrintbarcodeRequestSRMPrintbarcodeRequest() {
return new SRMPrintbarcodeRequestSRMPrintbarcodeRequest();
}
/**
* Create an instance of {@link SRMPrintbarcodeResponseSRMPrintbarcodeResponse }
*
*/
public SRMPrintbarcodeResponseSRMPrintbarcodeResponse createSRMPrintbarcodeResponseSRMPrintbarcodeResponse() {
return new SRMPrintbarcodeResponseSRMPrintbarcodeResponse();
}
/**
* Create an instance of {@link SRMVoidbarcodeRequestSRMVoidbarcodeRequest }
*
*/
public SRMVoidbarcodeRequestSRMVoidbarcodeRequest createSRMVoidbarcodeRequestSRMVoidbarcodeRequest() {
return new SRMVoidbarcodeRequestSRMVoidbarcodeRequest();
}
/**
* Create an instance of {@link SRMVoidbarcodeResponseSRMVoidbarcodeResponse }
*
*/
public SRMVoidbarcodeResponseSRMVoidbarcodeResponse createSRMVoidbarcodeResponseSRMVoidbarcodeResponse() {
return new SRMVoidbarcodeResponseSRMVoidbarcodeResponse();
}
/**
* Create an instance of {@link SRMFahuoconfirmRequestSRMFahuoconfirmRequest }
*
*/
public SRMFahuoconfirmRequestSRMFahuoconfirmRequest createSRMFahuoconfirmRequestSRMFahuoconfirmRequest() {
return new SRMFahuoconfirmRequestSRMFahuoconfirmRequest();
}
/**
* Create an instance of {@link SRMFahuoconfirmResponseSRMFahuoconfirmResponse }
*
*/
public SRMFahuoconfirmResponseSRMFahuoconfirmResponse createSRMFahuoconfirmResponseSRMFahuoconfirmResponse() {
return new SRMFahuoconfirmResponseSRMFahuoconfirmResponse();
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link SRMTestResponseSRMTestResponse }{@code >}}
*
......@@ -391,4 +481,96 @@ public class ObjectFactory {
public JAXBElement<SRMFahuochehuiRequestSRMFahuochehuiRequest> createSRMFahuochehuiRequest(SRMFahuochehuiRequestSRMFahuochehuiRequest value) {
return new JAXBElement<SRMFahuochehuiRequestSRMFahuochehuiRequest>(_SRMFahuochehuiRequest_QNAME, SRMFahuochehuiRequestSRMFahuochehuiRequest.class, null, value);
}
//barcode
/**
* Create an instance of {@link JAXBElement }{@code <}{@link SRMGenbarcodeRequestSRMGenbarcodeRequest }{@code >}}
*
*/
@XmlElementDecl(namespace = "http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", name = "SRM_genbarcodeRequest")
public JAXBElement<SRMGenbarcodeRequestSRMGenbarcodeRequest> createSRMGenbarcodeRequest(SRMGenbarcodeRequestSRMGenbarcodeRequest value) {
return new JAXBElement<SRMGenbarcodeRequestSRMGenbarcodeRequest>(_SRMGenbarcodeRequest_QNAME, SRMGenbarcodeRequestSRMGenbarcodeRequest.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link SRMGenbarcodeResponseSRMGenbarcodeResponse }{@code >}}
*
*/
@XmlElementDecl(namespace = "http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", name = "SRM_genbarcodeResponse")
public JAXBElement<SRMGenbarcodeResponseSRMGenbarcodeResponse> createSRMGenbarcodeResponse(SRMGenbarcodeResponseSRMGenbarcodeResponse value) {
return new JAXBElement<SRMGenbarcodeResponseSRMGenbarcodeResponse>(_SRMGenbarcodeResponse_QNAME, SRMGenbarcodeResponseSRMGenbarcodeResponse.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link SRMGetbarcodestatusRequestSRMGetbarcodestatusRequest }{@code >}}
*
*/
@XmlElementDecl(namespace = "http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", name = "SRM_getbarcodestatusRequest")
public JAXBElement<SRMGetbarcodestatusRequestSRMGetbarcodestatusRequest> createSRMGetbarcodestatusRequest(SRMGetbarcodestatusRequestSRMGetbarcodestatusRequest value) {
return new JAXBElement<SRMGetbarcodestatusRequestSRMGetbarcodestatusRequest>(_SRMGetbarcodestatusRequest_QNAME, SRMGetbarcodestatusRequestSRMGetbarcodestatusRequest.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link SRMGetbarcodestatusResponseSRMGetbarcodestatusResponse }{@code >}}
*
*/
@XmlElementDecl(namespace = "http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", name = "SRM_getbarcodestatusResponse")
public JAXBElement<SRMGetbarcodestatusResponseSRMGetbarcodestatusResponse> createSRMGetbarcodestatusResponse(SRMGetbarcodestatusResponseSRMGetbarcodestatusResponse value) {
return new JAXBElement<SRMGetbarcodestatusResponseSRMGetbarcodestatusResponse>(_SRMGetbarcodestatusResponse_QNAME, SRMGetbarcodestatusResponseSRMGetbarcodestatusResponse.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link SRMVoidbarcodeRequestSRMVoidbarcodeRequest }{@code >}}
*
*/
@XmlElementDecl(namespace = "http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", name = "SRM_voidbarcodeRequest")
public JAXBElement<SRMVoidbarcodeRequestSRMVoidbarcodeRequest> createSRMVoidbarcodeRequest(SRMVoidbarcodeRequestSRMVoidbarcodeRequest value) {
return new JAXBElement<SRMVoidbarcodeRequestSRMVoidbarcodeRequest>(_SRMVoidbarcodeRequest_QNAME, SRMVoidbarcodeRequestSRMVoidbarcodeRequest.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link SRMVoidbarcodeResponseSRMVoidbarcodeResponse }{@code >}}
*
*/
@XmlElementDecl(namespace = "http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", name = "SRM_voidbarcodeResponse")
public JAXBElement<SRMVoidbarcodeResponseSRMVoidbarcodeResponse> createSRMVoidbarcodeResponse(SRMVoidbarcodeResponseSRMVoidbarcodeResponse value) {
return new JAXBElement<SRMVoidbarcodeResponseSRMVoidbarcodeResponse>(_SRMVoidbarcodeResponse_QNAME, SRMVoidbarcodeResponseSRMVoidbarcodeResponse.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link SRMPrintbarcodeRequestSRMPrintbarcodeRequest }{@code >}}
*
*/
@XmlElementDecl(namespace = "http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", name = "SRM_printbarcodeRequest")
public JAXBElement<SRMPrintbarcodeRequestSRMPrintbarcodeRequest> createSRMPrintbarcodeRequest(SRMPrintbarcodeRequestSRMPrintbarcodeRequest value) {
return new JAXBElement<SRMPrintbarcodeRequestSRMPrintbarcodeRequest>(_SRMPrintbarcodeRequest_QNAME, SRMPrintbarcodeRequestSRMPrintbarcodeRequest.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link SRMPrintbarcodeResponseSRMPrintbarcodeResponse }{@code >}}
*
*/
@XmlElementDecl(namespace = "http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", name = "SRM_printbarcodeResponse")
public JAXBElement<SRMPrintbarcodeResponseSRMPrintbarcodeResponse> createSRMPrintbarcodeResponse(SRMPrintbarcodeResponseSRMPrintbarcodeResponse value) {
return new JAXBElement<SRMPrintbarcodeResponseSRMPrintbarcodeResponse>(_SRMPrintbarcodeResponse_QNAME, SRMPrintbarcodeResponseSRMPrintbarcodeResponse.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link SRMFahuoconfirmRequestSRMFahuoconfirmRequest }{@code >}}
*
*/
@XmlElementDecl(namespace = "http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", name = "SRM_fahuoconfirmRequest")
public JAXBElement<SRMFahuoconfirmRequestSRMFahuoconfirmRequest> createSRMFahuoconfirmRequest(SRMFahuoconfirmRequestSRMFahuoconfirmRequest value) {
return new JAXBElement<SRMFahuoconfirmRequestSRMFahuoconfirmRequest>(_SRMFahuoconfirmRequest_QNAME, SRMFahuoconfirmRequestSRMFahuoconfirmRequest.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link SRMFahuoconfirmResponseSRMFahuoconfirmResponse }{@code >}}
*
*/
@XmlElementDecl(namespace = "http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", name = "SRM_fahuoconfirmResponse")
public JAXBElement<SRMFahuoconfirmResponseSRMFahuoconfirmResponse> createSRMFahuoconfirmResponse(SRMFahuoconfirmResponseSRMFahuoconfirmResponse value) {
return new JAXBElement<SRMFahuoconfirmResponseSRMFahuoconfirmResponse>(_SRMFahuoconfirmResponse_QNAME, SRMFahuoconfirmResponseSRMFahuoconfirmResponse.class, null, value);
}
}
src/main/java/tw/com/dsc/tiptop/tiptopservicegateway/SRMFahuoconfirmRequestSRMFahuoconfirmRequest.java 0 → 100755
View file @ 30db7299
package tw.com.dsc.tiptop.tiptopservicegateway;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
/**
* <p>SRM_fahuoconfirmRequest_SRM_fahuoconfirmRequest complex type的 Java 类。
*
* <p>以下模式片段指定包含在此类中的预期内容。
*
* <pre>
* &lt;complexType name="SRM_fahuoconfirmRequest_SRM_fahuoconfirmRequest">
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="request" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "SRM_fahuoconfirmRequest_SRM_fahuoconfirmRequest", propOrder = {
"request"
})
public class SRMFahuoconfirmRequestSRMFahuoconfirmRequest {
@XmlElement(required = true, nillable = true)
protected String request;
/**
* 获取request属性的值。
*
* @return
* possible object is
* {@link String }
*
*/
public String getRequest() {
return request;
}
/**
* 设置request属性的值。
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setRequest(String value) {
this.request = value;
}
}
src/main/java/tw/com/dsc/tiptop/tiptopservicegateway/SRMFahuoconfirmResponseSRMFahuoconfirmResponse.java 0 → 100755
View file @ 30db7299
package tw.com.dsc.tiptop.tiptopservicegateway;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
/**
* <p>SRM_fahuoconfirmResponse_SRM_fahuoconfirmResponse complex type的 Java 类。
*
* <p>以下模式片段指定包含在此类中的预期内容。
*
* <pre>
* &lt;complexType name="SRM_fahuoconfirmResponse_SRM_fahuoconfirmResponse">
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="response" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "SRM_fahuoconfirmResponse_SRM_fahuoconfirmResponse", propOrder = {
"response"
})
public class SRMFahuoconfirmResponseSRMFahuoconfirmResponse {
@XmlElement(required = true, nillable = true)
protected String response;
/**
* 获取response属性的值。
*
* @return
* possible object is
* {@link String }
*
*/
public String getResponse() {
return response;
}
/**
* 设置response属性的值。
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setResponse(String value) {
this.response = value;
}
}
src/main/java/tw/com/dsc/tiptop/tiptopservicegateway/SRMGenbarcodeRequestSRMGenbarcodeRequest.java 0 → 100755
View file @ 30db7299
package tw.com.dsc.tiptop.tiptopservicegateway;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
/**
* <p>SRM_genbarcodeRequest_SRM_genbarcodeRequest complex type的 Java 类。
*
* <p>以下模式片段指定包含在此类中的预期内容。
*
* <pre>
* &lt;complexType name="SRM_genbarcodeRequest_SRM_genbarcodeRequest">
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="request" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "SRM_genbarcodeRequest_SRM_genbarcodeRequest", propOrder = {
"request"
})
public class SRMGenbarcodeRequestSRMGenbarcodeRequest {
@XmlElement(required = true, nillable = true)
protected String request;
/**
* 获取request属性的值。
*
* @return
* possible object is
* {@link String }
*
*/
public String getRequest() {
return request;
}
/**
* 设置request属性的值。
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setRequest(String value) {
this.request = value;
}
}
src/main/java/tw/com/dsc/tiptop/tiptopservicegateway/SRMGenbarcodeResponseSRMGenbarcodeResponse.java 0 → 100755
View file @ 30db7299
package tw.com.dsc.tiptop.tiptopservicegateway;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
/**
* <p>SRM_genbarcodeResponse_SRM_genbarcodeResponse complex type的 Java 类。
*
* <p>以下模式片段指定包含在此类中的预期内容。
*
* <pre>
* &lt;complexType name="SRM_genbarcodeResponse_SRM_genbarcodeResponse">
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="response" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "SRM_genbarcodeResponse_SRM_genbarcodeResponse", propOrder = {
"response"
})
public class SRMGenbarcodeResponseSRMGenbarcodeResponse {
@XmlElement(required = true, nillable = true)
protected String response;
/**
* 获取response属性的值。
*
* @return
* possible object is
* {@link String }
*
*/
public String getResponse() {
return response;
}
/**
* 设置response属性的值。
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setResponse(String value) {
this.response = value;
}
}
src/main/java/tw/com/dsc/tiptop/tiptopservicegateway/SRMGetbarcodestatusRequestSRMGetbarcodestatusRequest.java 0 → 100755
View file @ 30db7299
package tw.com.dsc.tiptop.tiptopservicegateway;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
/**
* <p>SRM_getbarcodestatusRequest_SRM_getbarcodestatusRequest complex type的 Java 类。
*
* <p>以下模式片段指定包含在此类中的预期内容。
*
* <pre>
* &lt;complexType name="SRM_getbarcodestatusRequest_SRM_getbarcodestatusRequest">
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="request" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "SRM_getbarcodestatusRequest_SRM_getbarcodestatusRequest", propOrder = {
"request"
})
public class SRMGetbarcodestatusRequestSRMGetbarcodestatusRequest {
@XmlElement(required = true, nillable = true)
protected String request;
/**
* 获取request属性的值。
*
* @return
* possible object is
* {@link String }
*
*/
public String getRequest() {
return request;
}
/**
* 设置request属性的值。
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setRequest(String value) {
this.request = value;
}
}
src/main/java/tw/com/dsc/tiptop/tiptopservicegateway/SRMGetbarcodestatusResponseSRMGetbarcodestatusResponse.java 0 → 100755
View file @ 30db7299
package tw.com.dsc.tiptop.tiptopservicegateway;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
/**
* <p>SRM_getbarcodestatusResponse_SRM_getbarcodestatusResponse complex type的 Java 类。
*
* <p>以下模式片段指定包含在此类中的预期内容。
*
* <pre>
* &lt;complexType name="SRM_getbarcodestatusResponse_SRM_getbarcodestatusResponse">
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="response" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "SRM_getbarcodestatusResponse_SRM_getbarcodestatusResponse", propOrder = {
"response"
})
public class SRMGetbarcodestatusResponseSRMGetbarcodestatusResponse {
@XmlElement(required = true, nillable = true)
protected String response;
/**
* 获取response属性的值。
*
* @return
* possible object is
* {@link String }
*
*/
public String getResponse() {
return response;
}
/**
* 设置response属性的值。
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setResponse(String value) {
this.response = value;
}
}
src/main/java/tw/com/dsc/tiptop/tiptopservicegateway/SRMPrintbarcodeRequestSRMPrintbarcodeRequest.java 0 → 100755
View file @ 30db7299
package tw.com.dsc.tiptop.tiptopservicegateway;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
/**
* <p>SRM_printbarcodeRequest_SRM_printbarcodeRequest complex type的 Java 类。
*
* <p>以下模式片段指定包含在此类中的预期内容。
*
* <pre>
* &lt;complexType name="SRM_printbarcodeRequest_SRM_printbarcodeRequest">
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="request" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "SRM_printbarcodeRequest_SRM_printbarcodeRequest", propOrder = {
"request"
})
public class SRMPrintbarcodeRequestSRMPrintbarcodeRequest {
@XmlElement(required = true, nillable = true)
protected String request;
/**
* 获取request属性的值。
*
* @return
* possible object is
* {@link String }
*
*/
public String getRequest() {
return request;
}
/**
* 设置request属性的值。
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setRequest(String value) {
this.request = value;
}
}
src/main/java/tw/com/dsc/tiptop/tiptopservicegateway/SRMPrintbarcodeResponseSRMPrintbarcodeResponse.java 0 → 100755
View file @ 30db7299
package tw.com.dsc.tiptop.tiptopservicegateway;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
/**
* <p>SRM_printbarcodeResponse_SRM_printbarcodeResponse complex type的 Java 类。
*
* <p>以下模式片段指定包含在此类中的预期内容。
*
* <pre>
* &lt;complexType name="SRM_printbarcodeResponse_SRM_printbarcodeResponse">
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="response" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "SRM_printbarcodeResponse_SRM_printbarcodeResponse", propOrder = {
"response"
})
public class SRMPrintbarcodeResponseSRMPrintbarcodeResponse {
@XmlElement(required = true, nillable = true)
protected String response;
/**
* 获取response属性的值。
*
* @return
* possible object is
* {@link String }
*
*/
public String getResponse() {
return response;
}
/**
* 设置response属性的值。
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setResponse(String value) {
this.response = value;
}
}
src/main/java/tw/com/dsc/tiptop/tiptopservicegateway/SRMVoidbarcodeRequestSRMVoidbarcodeRequest.java 0 → 100755
View file @ 30db7299
package tw.com.dsc.tiptop.tiptopservicegateway;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
/**
* <p>SRM_voidbarcodeRequest_SRM_voidbarcodeRequest complex type的 Java 类。
*
* <p>以下模式片段指定包含在此类中的预期内容。
*
* <pre>
* &lt;complexType name="SRM_voidbarcodeRequest_SRM_voidbarcodeRequest">
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="request" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "SRM_voidbarcodeRequest_SRM_voidbarcodeRequest", propOrder = {
"request"
})
public class SRMVoidbarcodeRequestSRMVoidbarcodeRequest {
@XmlElement(required = true, nillable = true)
protected String request;
/**
* 获取request属性的值。
*
* @return
* possible object is
* {@link String }
*
*/
public String getRequest() {
return request;
}
/**
* 设置request属性的值。
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setRequest(String value) {
this.request = value;
}
}
src/main/java/tw/com/dsc/tiptop/tiptopservicegateway/SRMVoidbarcodeResponseSRMVoidbarcodeResponse.java 0 → 100755
View file @ 30db7299
package tw.com.dsc.tiptop.tiptopservicegateway;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
/**
* <p>SRM_voidbarcodeResponse_SRM_voidbarcodeResponse complex type的 Java 类。
*
* <p>以下模式片段指定包含在此类中的预期内容。
*
* <pre>
* &lt;complexType name="SRM_voidbarcodeResponse_SRM_voidbarcodeResponse">
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="response" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "SRM_voidbarcodeResponse_SRM_voidbarcodeResponse", propOrder = {
"response"
})
public class SRMVoidbarcodeResponseSRMVoidbarcodeResponse {
@XmlElement(required = true, nillable = true)
protected String response;
/**
* 获取response属性的值。
*
* @return
* possible object is
* {@link String }
*
*/
public String getResponse() {
return response;
}
/**
* 设置response属性的值。
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setResponse(String value) {
this.response = value;
}
}
src/main/java/tw/com/dsc/tiptop/tiptopservicegateway/TIPTOPServiceGateWayPortType.java
View file @ 30db7299
......@@ -141,4 +141,65 @@ public interface TIPTOPServiceGateWayPortType {
@WebParam(name = "SRM_fahuochehuiRequest", targetNamespace = "http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", partName = "parameters")
SRMFahuochehuiRequestSRMFahuochehuiRequest parameters);
// 新增防伪码接口
/**
*
* @param parameters
* @return
* returns tw.com.dsc.tiptop.tiptopservicegateway.SRMFahuoconfirmResponseSRMFahuoconfirmResponse
*/
@WebMethod(operationName = "SRM_fahuoconfirm")
@WebResult(name = "SRM_fahuoconfirmResponse", targetNamespace = "http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", partName = "parameters")
public SRMFahuoconfirmResponseSRMFahuoconfirmResponse srmFahuoconfirm(
@WebParam(name = "SRM_fahuoconfirmRequest", targetNamespace = "http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", partName = "parameters")
SRMFahuoconfirmRequestSRMFahuoconfirmRequest parameters);
/**
*
* @param parameters
* @return
* returns tw.com.dsc.tiptop.tiptopservicegateway.SRMGenbarcodeResponseSRMGenbarcodeResponse
*/
@WebMethod(operationName = "SRM_genbarcode")
@WebResult(name = "SRM_genbarcodeResponse", targetNamespace = "http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", partName = "parameters")
public SRMGenbarcodeResponseSRMGenbarcodeResponse srmGenbarcode(
@WebParam(name = "SRM_genbarcodeRequest", targetNamespace = "http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", partName = "parameters")
SRMGenbarcodeRequestSRMGenbarcodeRequest parameters);
/**
*
* @param parameters
* @return
* returns tw.com.dsc.tiptop.tiptopservicegateway.SRMGetbarcodestatusResponseSRMGetbarcodestatusResponse
*/
@WebMethod(operationName = "SRM_getbarcodestatus")
@WebResult(name = "SRM_getbarcodestatusResponse", targetNamespace = "http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", partName = "parameters")
public SRMGetbarcodestatusResponseSRMGetbarcodestatusResponse srmGetbarcodestatus(
@WebParam(name = "SRM_getbarcodestatusRequest", targetNamespace = "http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", partName = "parameters")
SRMGetbarcodestatusRequestSRMGetbarcodestatusRequest parameters);
/**
*
* @param parameters
* @return
* returns tw.com.dsc.tiptop.tiptopservicegateway.SRMPrintbarcodeResponseSRMPrintbarcodeResponse
*/
@WebMethod(operationName = "SRM_printbarcode")
@WebResult(name = "SRM_printbarcodeResponse", targetNamespace = "http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", partName = "parameters")
public SRMPrintbarcodeResponseSRMPrintbarcodeResponse srmPrintbarcode(
@WebParam(name = "SRM_printbarcodeRequest", targetNamespace = "http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", partName = "parameters")
SRMPrintbarcodeRequestSRMPrintbarcodeRequest parameters);
/**
*
* @param parameters
* @return
* returns tw.com.dsc.tiptop.tiptopservicegateway.SRMVoidbarcodeResponseSRMVoidbarcodeResponse
*/
@WebMethod(operationName = "SRM_voidbarcode")
@WebResult(name = "SRM_voidbarcodeResponse", targetNamespace = "http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", partName = "parameters")
public SRMVoidbarcodeResponseSRMVoidbarcodeResponse srmVoidbarcode(
@WebParam(name = "SRM_voidbarcodeRequest", targetNamespace = "http://www.dsc.com.tw/tiptop/TIPTOPServiceGateWay", partName = "parameters")
SRMVoidbarcodeRequestSRMVoidbarcodeRequest parameters);
}
src/main/resources/application.yml
View file @ 30db7299
......@@ -84,6 +84,7 @@ srm:
soapWs:
wsDynamicClient: true
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_ttsrv4?wsdl
......@@ -102,6 +103,8 @@ srm:
defaultPoChgReturnType: 0
supplierErpCheck: false
supplierErpSend: false
genBarcode: SRM_genbarcode
email:
enable: true
recipients: gujian@benchmarkchina.com,raven@benchmarkchina.com
......@@ -183,6 +186,7 @@ srm:
soapWs:
wsDynamicClient: true
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_ttsrv4_toptest?wsdl
......@@ -206,7 +210,7 @@ srm:
recipients: gujian@benchmarkchina.com,raven@benchmarkchina.com
logging:
level:
org.hibernate.SQL: DEBUG
org.hibernate.SQL: INFO
org.hibernate.type.descriptor.sql.BasicBinder: DEBUG
org.hibernate.type.descriptor.sql.BasicExtractor: DEBUG
file: log/srm.log
\ No newline at end of file
src/main/resources/logback-spring.xml
View file @ 30db7299
......@@ -29,28 +29,28 @@
<appender-ref ref="FILE-OUT"/>
</root>
<!--错误日志写入error.log-->
<appender name="ERROR-OUT" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>log/error.log</file>
<encoder>
<pattern>[ %-5level] [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] %logger{96} [%file:%line] - %msg%n</pattern>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>log/error-erp-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<maxFileSize>50 MB</maxFileSize>
<maxHistory>30</maxHistory>
<totalSizeCap>1GB</totalSizeCap>
</rollingPolicy>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>ERROR</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!--&lt;!&ndash;错误日志写入error.log&ndash;&gt;-->
<!--<appender name="ERROR-OUT" class="ch.qos.logback.core.rolling.RollingFileAppender">-->
<!--<file>log/error-erp.log</file>-->
<!--<encoder>-->
<!--<pattern>[ %-5level] [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] %logger{96} [%file:%line] - %msg%n</pattern>-->
<!--</encoder>-->
<!--<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">-->
<!--<fileNamePattern>log/error-erp-%d{yyyy-MM-dd}.%i.log</fileNamePattern>-->
<!--<maxFileSize>50 MB</maxFileSize>-->
<!--<maxHistory>30</maxHistory>-->
<!--<totalSizeCap>1GB</totalSizeCap>-->
<!--</rollingPolicy>-->
<!--<filter class="ch.qos.logback.classic.filter.LevelFilter">-->
<!--<level>ERROR</level>-->
<!--<onMatch>ACCEPT</onMatch>-->
<!--<onMismatch>DENY</onMismatch>-->
<!--</filter>-->
<!--</appender>-->
<!--erp接口另加错误输出-->
<logger name="com.i1.erp" level="error">
<appender-ref ref="ERROR-OUT"/>
</logger>
<!--&lt;!&ndash;erp接口另加错误输出&ndash;&gt;-->
<!--<logger name="com.i1.erp" level="error">-->
<!--<appender-ref ref="ERROR-OUT"/>-->
<!--</logger>-->
</configuration>
\ No newline at end of file
src/main/resources/static/app/srm/home/notice/notice.js
View file @ 30db7299
......@@ -69,7 +69,7 @@ angular.module('IOne').controller('HomeNoticeController', function ($scope, $roo
};
$scope.isMyself = function (notice) {
return (notice && notice.releasor == $rootScope.userInfo.username) || $rootScope.userInfo.username == 'admin';
return (notice && $rootScope.userInfo) && (notice.releasor == $rootScope.userInfo.username || $rootScope.userInfo.username == 'admin');
};
$scope.isAclAllowed = function () {
......
src/main/resources/static/app/srm/purchaseOrder/po.js
View file @ 30db7299
......@@ -13,7 +13,11 @@
}]);
angular.module('IOne').factory('PoMstFileService', function ($http) {
return angular.extend(new BaseService('/purchaseOrders', $http), {});
return angular.extend(new BaseService('/purchaseOrders', $http), {
genBarcode: function (input) {
return this.httpService.post('/purchaseOrders/genBarcode', input);
}
});
});
angular.module('IOne').factory('PoDtlFileService', function ($http) {
......
src/main/resources/static/app/srm/purchaseOrder/query/query.html
View file @ 30db7299
......@@ -120,6 +120,10 @@
<div class="button-bar">
<button class="btn btn-default mrs" ng-click="view()" ng-disabled="!currentPurchaseOrderMaster" acl-check func=" 'PURCHASE_ORDER_FUNCTION' " resource=" 'VIEW' ">查看</button>
<button class="btn btn-default mrs" ng-click="openReturnPage()" ng-disabled="!canDoReturn()" acl-check func=" 'PURCHASE_ORDER_FUNCTION' " resource=" 'RETURN' ">回执</button>
<button class="btn btn-default mrs" ng-if="queryCondition.poMst.supplier && queryCondition.poMst.supplier.useBarcode == 'Y'"
data-toggle="modal" data-target="#get-barcode-dlg"
ng-disabled="!currentPurchaseOrderMaster" acl-check func=" 'PURCHASE_ORDER_FUNCTION' " resource=" 'GEN_BARCODE' ">申请防伪码
</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"
......@@ -131,4 +135,33 @@
</div>
<div ui-grid="gridOptions" ui-grid-selection ui-grid-resize-columns class="grid"></div>
<!--申请防伪码开窗-->
<div class="modal fade" id="get-barcode-dlg" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">防伪码申请
<!--<h5>请填写申请数量</h5>-->
</h4>
</div>
<div class="modal-body">
<h5><strong>采购单{{selectedPurchaseOrder.poMst.purchaseOrderUid}}，请填写需要申请项次的申请数量：</strong></h5>
<!--ui-grid-selection-->
<div ui-grid="barcodeGridOptions" ui-grid-resize-columns
ui-grid-edit ui-grid-row-edit ui-grid-cellNav class="grid" style="height: 300px">
</div>
</div>
<div class="modal-footer">
<button class="btn btn-primary" type="button" ng-click="genBarcodeClick()">确认</button>
<button class="btn btn-primary" type="button" data-dismiss="modal">取消</button>
</div>
</div>
</div>
</div>
</div>
src/main/resources/static/app/srm/purchaseOrder/query/query.js
View file @ 30db7299
......@@ -2,7 +2,7 @@ angular.module('IOne').controller('PurchaseOrderQueryController', function ($sco
PoMstFileService, PoDtlFileService, BaseFactoryFileService, AuthService,
BaseSupplierFileService, BaseProductFileService, UtilService, Constants) {
//variables
var interval;
var intervals = [];
$scope.Constants = Constants;
$scope.baseProductFileService = BaseProductFileService;
......@@ -51,7 +51,8 @@ angular.module('IOne').controller('PurchaseOrderQueryController', function ($sco
if ($scope.queryCondition.poMst.supplier.id) {
$scope.queryCondition.poMst.supplier = {
id: $scope.queryCondition.poMst.supplier.id,
name: $scope.queryCondition.poMst.supplier.name
name: $scope.queryCondition.poMst.supplier.name,
useBarcode: $scope.queryCondition.poMst.supplier.useBarcode
};
}
......@@ -144,9 +145,9 @@ angular.module('IOne').controller('PurchaseOrderQueryController', function ($sco
$scope.gridOptions.onRegisterApi = function (gridApi) {
//set gridApi on scope
$scope.gridApi = gridApi;
interval = $interval(function () {
intervals.push($interval(function () {
$scope.gridApi.core.handleWindowResize();
}, 100);
}, 100));
gridApi.selection.on.rowSelectionChanged($scope, function (row) {
if (row.isSelected) {
......@@ -223,7 +224,7 @@ angular.module('IOne').controller('PurchaseOrderQueryController', function ($sco
UtilService.exportExcel(jsonData, '采购单', header);
});
}
};
$scope.canDoReturn = function () {
......@@ -244,8 +245,10 @@ angular.module('IOne').controller('PurchaseOrderQueryController', function ($sco
});
$scope.$on("$destroy", function () {
if (interval) {
$interval.cancel(interval);
if (intervals) {
angular.forEach(intervals, function (item) {
$interval.cancel(item);
})
}
});
......@@ -273,4 +276,85 @@ angular.module('IOne').controller('PurchaseOrderQueryController', function ($sco
}
};
$scope.isAdmin = function () {
return $rootScope.isAdmin;
};
// 申请防伪码
$scope.barcodeGridOptions = {
enableRowSelection: false,
enableSelectAll: true,
multiSelect: false,
selectionRowHeaderWidth: 35,
enableSorting: true,
enableColumnResizing: true,
columnDefs: [
{name: '项次', field: 'poDtlRow', width: 50},
{name: '物料编号', field: 'product.productUid', width: 100},
{name: '物料名称', field: 'product.name', width: 130},
{name: '物料规格', field: 'product.standard', width: 180},
{name: '申请数量', field: 'barcodeAmount', width: 80, enableCellEdit: true, type: 'number', cellClass: 'editable-field'},
{name: '订单数量', field: 'orderAmount', width: 80},
{name: '回执数量', field: 'supplierReturnedAmount', width: 80},
{name: '已交数量', field: 'deliveredAmount', width: 80},
{name: '已关联数量', field: 'relationAmount', width: 80}
],
data: []
};
$scope.barcodeGridOptions.onRegisterApi = function (barcodeGridApi) {
$scope.barcodeGridApi = barcodeGridApi;
intervals.push($interval(function () {
$scope.barcodeGridApi.core.handleWindowResize();
}, 100));
};
$scope.genBarcodeClick = function () {
var barcodeInput = {};
var barcodeDtlInput = [];
barcodeInput.factoryUid = $scope.selectedPurchaseOrder.factory.factoryUid;
barcodeInput.purchaseOrderUid = $scope.selectedPurchaseOrder.poMst.purchaseOrderUid;
angular.forEach($scope.barcodeGridOptions.data, function (item) {
if (item.barcodeAmount && item.barcodeAmount > 0) {
barcodeDtlInput.push({
poDtlRow: item.poDtlRow,
productUid: item.product.productUid,
barcodeAmount: item.barcodeAmount
})
}
});
barcodeInput.dtl = barcodeDtlInput;
PoMstFileService.genBarcode(barcodeInput).then(
function (response) {
if (response.data) {
if (response.data.code == '0') {
UtilService.showInfo("申请防伪码成功");
$('#get-barcode-dlg').modal('hide');
} else {
UtilService.showError("申请防伪码失败:<br>" + response.data.message);
}
} else {
UtilService.showError("申请防伪码失败:<br>" + response);
}
}, function (response) {
UtilService.showError("申请防伪码失败:<br>" + response.data);
$('#get-barcode-dlg').modal('hide');
}
);
};
// load po dtl data
$('#get-barcode-dlg').on('show.bs.modal', function (e) {
$scope.barcodeGridOptions.data = [];
PoDtlFileService.getAllByExample({
poMst: {id: $scope.selectedPurchaseOrder.poMst.id}
}).then(function (response) {
$scope.barcodeGridOptions.data = response.data;
angular.forEach($scope.barcodeGridOptions.data, function (item) {
item.barcodeAmount = 0;
});
});
});
});
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