aship/aship#2 防伪码功能-打印：接口

src/main/java/com/i1/erp/barcode/service/BarCodeGenService.java → src/main/java/com/i1/erp/barcode/service/BarcodeGenService.java

@@ -13,8 +13,8 @@ import java.util.List;
 import java.util.Objects;
 
 @Service
-public class BarCodeGenService implements IBarCodeGenService {
-    private static final Logger logger = LoggerFactory.getLogger(BarCodeGenService.class);
+public class BarcodeGenService implements IBarcodeGenService {
+    private static final Logger logger = LoggerFactory.getLogger(BarcodeGenService.class);
 
     @Override
     public Request genXml(PoBarcodeDto input) throws IOneServiceException {

src/main/java/com/i1/erp/barcode/service/BarCodePrintService.java → src/main/java/com/i1/erp/barcode/service/BarcodePrintService.java

@@ -9,7 +9,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Service
-public class BarCodePrintService implements IBarCodePrintService {
+public class BarcodePrintService implements IBarcodePrintService {
 
     @Override
     public Request getRequestXml(String organization, String docno, String seq, String barcode, String type) throws IOneServiceException {

src/main/java/com/i1/erp/barcode/service/IBarCodeGenService.java → src/main/java/com/i1/erp/barcode/service/IBarcodeGenService.java

@@ -4,6 +4,6 @@ import com.i1.base.exception.IOneServiceException;
 import com.i1.erp.entity.request.Request;
 import com.i1.srm.purchaseOrder.web.dto.PoBarcodeDto;
 
-public interface IBarCodeGenService {
+public interface IBarcodeGenService {
     Request genXml(PoBarcodeDto input) throws IOneServiceException;
 }

src/main/java/com/i1/erp/barcode/service/IBarCodePrintService.java → src/main/java/com/i1/erp/barcode/service/IBarcodePrintService.java

@@ -3,6 +3,6 @@ package com.i1.erp.barcode.service;
 import com.i1.base.exception.IOneServiceException;
 import com.i1.erp.entity.request.Request;
 
-public interface IBarCodePrintService {
+public interface IBarcodePrintService {
     Request getRequestXml(String organization, String docno, String seq, String barcode, String type) throws IOneServiceException;
 }

src/main/java/com/i1/erp/barcode/soap/BarcodeGenClient.java

@@ -2,7 +2,7 @@ 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.barcode.service.IBarcodeGenService;
 import com.i1.erp.base.web.dto.SyncResponse;
 import com.i1.erp.entity.request.Request;
 import com.i1.erp.entity.response.Response;
@@ -33,13 +33,13 @@ public class BarcodeGenClient extends WebServiceClient {
     private Logger logger = LoggerFactory.getLogger(BarcodeGenClient.class);
 
     @Autowired
-    private BarCodeGenService barCodeGenService;
+    private IBarcodeGenService barcodeGenService;
 
     public SyncResponse genBarcode(PoBarcodeDto input) {
         try {
             // xml
             logger.info("prepare gen barcode {}", input.getFactoryUid() + "-" + input.getPurchaseOrderUid());
-            Request requestXml = barCodeGenService.genXml(input);
+            Request requestXml = barcodeGenService.genXml(input);
             if (requestXml == null) {
                 logger.error("error:防伪码申请无法生成XML结构");
                 return SyncResponse.of(FAIL_CODE, "防伪码申请无法生成XML结构");

src/main/java/com/i1/erp/barcode/soap/BarCodePrintClient.java → src/main/java/com/i1/erp/barcode/soap/BarcodePrintClient.java

@@ -2,7 +2,7 @@ package com.i1.erp.barcode.soap;
 
 import com.i1.base.exception.IOneServiceException;
 import com.i1.erp.WebServiceClient;
-import com.i1.erp.barcode.service.IBarCodePrintService;
+import com.i1.erp.barcode.service.IBarcodePrintService;
 import com.i1.erp.base.web.dto.SyncResponseWithList;
 import com.i1.erp.entity.request.Field;
 import com.i1.erp.entity.request.RecordSet;
@@ -30,15 +30,18 @@ import static com.i1.srm.utils.SafeType.safeString;
  * 防伪码接口只做了动态客户端版本
  */
 @Component
-public class BarCodePrintClient extends WebServiceClient {
+public class BarcodePrintClient extends WebServiceClient {
+
+    public static final String TYPE_FIRST_PRINT = "1";
+    public static final String TYPE_REPRINT = "2";
 
     @Value("${srm.soapWs.printBarcode}")
     public String ERP_PRINT_BARCODE_OP;
     @Value("${srm.soapWs.wsdlUrl}")
     private String WSDL_URL;
-    @Autowired
-    private IBarCodePrintService barCodePrintService;
 
+    @Autowired
+    private IBarcodePrintService barcodePrintService;
     private Logger logger = LoggerFactory.getLogger(BarcodeGenClient.class);
 
     public SyncResponseWithList getBarcodePrintUrls(String organization, String docno, String seq, String barcode, String type) {
@@ -46,7 +49,7 @@ public class BarCodePrintClient extends WebServiceClient {
         try {
             // xml
             logger.info("prepare gen barcode {}", organization + "-" + docno + "-" + seq + "-" + barcode + "-" + type);
-            Request requestXml = barCodePrintService.getRequestXml(organization, docno, seq, barcode, type);
+            Request requestXml = barcodePrintService.getRequestXml(organization, docno, seq, barcode, type);
             if (requestXml == null) {
                 logger.error("error:防伪码打印地址无法生成XML结构");
                 return SyncResponseWithList.of(FAIL_CODE, "防伪码打印地址无法生成XML结构", urls);

src/main/java/com/i1/srm/am/entity/Resource.java

@@ -64,7 +64,9 @@ public enum Resource {
     ADDITIONAL_RECORDING(54,     "补录税票"),
     SEND_TO_ERP(55,         "上传ERP"),
     GEN_BARCODE(56,         "申请防伪码"),
-    PRINT_BARCODE(57,       "打印防伪码")
+    PRINT_BARCODE(57,       "打印防伪码"),
+    VOID_BARCODE(58,        "作废防伪码"),
+    GET_BARCODE_STATUS(59,  "查询防伪码状态")
     ;
 
     private Integer id;

src/main/java/com/i1/srm/purchaseOrder/web/PoDtlFileController.java

@@ -3,7 +3,7 @@ package com.i1.srm.purchaseOrder.web;
 import com.i1.base.exception.IOneServiceException;
 import com.i1.base.exception.IOneWebRestfulException;
 import com.i1.base.web.AbstractController;
-import com.i1.erp.barcode.soap.BarCodePrintClient;
+import com.i1.erp.barcode.soap.BarcodePrintClient;
 import com.i1.erp.base.web.dto.SyncResponseWithList;
 import com.i1.srm.am.entity.Function;
 import com.i1.srm.am.entity.Resource;
@@ -29,6 +29,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
+import static com.i1.erp.barcode.soap.BarcodePrintClient.TYPE_FIRST_PRINT;
 import static com.i1.erp.base.web.dto.SyncResponseCode.FAIL_CODE;
 import static com.i1.erp.base.web.dto.SyncResponseCode.SUCCESS_CODE;
 
@@ -45,7 +46,7 @@ public class PoDtlFileController extends AbstractController<PoDtlFile, PoDtlFile
     @Autowired
     private IPoMstFileService poMstFileService;
     @Autowired
-    private BarCodePrintClient barCodePrintClient;
+    private BarcodePrintClient barCodePrintClient;
 
     @Override
     protected IPoDtlFileService getService() {
@@ -205,7 +206,12 @@ public class PoDtlFileController extends AbstractController<PoDtlFile, PoDtlFile
         }
     }
 
-
+    /**
+     * 获取防伪码打印url，根据采购单项次
+     * @param id
+     * @return
+     * @throws IOneWebRestfulException
+     */
     @ResourcePermission(values = {Resource.PRINT_BARCODE})
     @RequestMapping(value = "/{id}/printBarcode", method = RequestMethod.GET)
     public PoBarcodePrintDto printBarcode(@PathVariable Long id) throws IOneWebRestfulException {
@@ -213,7 +219,8 @@ public class PoDtlFileController extends AbstractController<PoDtlFile, PoDtlFile
             List<String> urls = new ArrayList<>();
             PoDtlFile exist = getService().get(id);
             if (exist != null) {
-                SyncResponseWithList responseWithList = barCodePrintClient.getBarcodePrintUrls(exist.getPoMst().getFactory().getFactoryUid(), exist.getPoMst().getPurchaseOrderUid(), exist.getPoDtlRow().toString(), "", "1");
+                SyncResponseWithList responseWithList = barCodePrintClient.getBarcodePrintUrls(exist.getPoMst().getFactory().getFactoryUid(),
+                        exist.getPoMst().getPurchaseOrderUid(), exist.getPoDtlRow().toString(), "", TYPE_FIRST_PRINT);
                 if (SUCCESS_CODE.equals(responseWithList.getCode())) {
                     urls.addAll(responseWithList.getContent());
                 }