aship/aship#3 防伪码功能-作废重打：controller

src/main/java/com/i1/erp/barcode/service/BarcodeVoidService.java

@@ -2,6 +2,7 @@ package com.i1.erp.barcode.service;
 
 import com.i1.base.exception.IOneServiceException;
 import com.i1.erp.entity.request.*;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -12,6 +13,9 @@ public class BarcodeVoidService implements IBarcodeVoidService {
     @Override
     public Request getRequestXml(String organization, String barcode) throws IOneServiceException {
 
+        if (StringUtils.isBlank(organization)|| StringUtils.isBlank(barcode)) {
+            throw new IOneServiceException("防伪码作废参数为空");
+        }
         Access access = Access.of(Authentication.of("017552", "tiptop"),
                 Connection.of("SRM", "192.168.1.1"),
                 Organization.of(organization),

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

@@ -13,10 +13,12 @@ import static com.i1.srm.am.entity.Resource.*;
 
 @JsonFormat(shape = JsonFormat.Shape.OBJECT)
 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_CHANGE_FUNCTION(14, 12, "采购变更单管理", Lists.newArrayList(QUERY, VIEW, EXPORT, RETURN, CONFIRM, RETURN_ACCEPT, RETURN_REJECT, CONFIRM_ACCEPT, CONFIRM_REJECT)),
+    BARCODE(92,13,"防伪码作废重打", Lists.newArrayList(VOID_BARCODE,PRINT_BARCODE,GET_BARCODE_STATUS)),
 
     //2送货协同管理
     DELIVERY_ORDER_FUNCTION(2, 21, "送货单管理", Lists.newArrayList(QUERY, CREATE, UPDATE, VIEW, DELETE, CREATE_LABEL, UPDATE_LABEL, RELEASE, UNDO_RELEASE, EXPORT)),

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

+package com.i1.srm.purchaseOrder.web;
+
+import com.i1.base.exception.IOneWebRestfulException;
+import com.i1.erp.barcode.soap.BarcodeGetStatusClient;
+import com.i1.erp.barcode.soap.BarcodeVoidClient;
+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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 申请防伪码在/purchaseOrders/genBarcode
+ * 获取防伪码打印url在/purchaseOrderDetails/{id}/printBarcode
+ *
+ */
+@RestController
+@RequestMapping("/barcode")
+@SecuredPage(Function.BARCODE)
+public class BarcodeController {
+
+    @Autowired
+    private BarcodeGetStatusClient barcodeGetStatusClient;
+
+    @Autowired
+    private BarcodeVoidClient barcodeVoidClient;
+
+    private Logger logger = LoggerFactory.getLogger(BarcodeController.class);
+
+    @RequestMapping(value = "/status", method = RequestMethod.GET)
+    @ResourcePermission(values = {Resource.GET_BARCODE_STATUS})
+    @ResponseStatus(HttpStatus.CREATED)
+    public SyncResponse getBarCodeStatus(@RequestParam String factoryUid, @RequestParam String barcode) throws IOneWebRestfulException {
+        return barcodeGetStatusClient.getBarcodeStatus(factoryUid, barcode);
+    }
+
+    @RequestMapping(value = "/void", method = RequestMethod.DELETE)
+    @ResourcePermission(values = {Resource.VOID_BARCODE})
+    public SyncResponse voidBarcode(@RequestParam String factoryUid, @RequestParam String barcode) throws IOneWebRestfulException {
+        logger.info("作废防伪码{}", barcode);
+        return barcodeVoidClient.voidBarcode(factoryUid, barcode);
+    }
+
+}

src/main/java/com/i1/srm/purchaseOrder/web/dto/BarcodeStatusAndVoidDto.java

+package com.i1.srm.purchaseOrder.web.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class BarcodeStatusAndVoidDto {
+    private String factoryUid;
+    private String barcode;
+
+    public String getFactoryUid() {
+        return factoryUid;
+    }
+
+    public void setFactoryUid(String factoryUid) {
+        this.factoryUid = factoryUid;
+    }
+
+    public String getBarcode() {
+        return barcode;
+    }
+
+    public void setBarcode(String barcode) {
+        this.barcode = barcode;
+    }
+}