Merge remote-tracking branch 'origin/master'

fi/shkd-fi-fi/src/main/java/shkd/fi/fi/common/orc/DetailList.java

@@ -12,13 +12,37 @@ import java.util.Date;
  */
 public class DetailList {
 
+    /**
+     * 单价？？
+     */
     private String unitPrice;
+    /**
+     * 金额
+     */
     private String totalAmount;
+    /**
+     * 税率
+     */
     private String taxRate;
+    /**
+     * 单位
+     */
     private String unit;
+    /**
+     * 数量
+     */
     private String quantity;
+    /**
+     * 规格型号？？
+     */
     private String specifictionModel;
+    /**
+     * 税额
+     */
     private String tax;
+    /**
+     * 货物或应税劳务、服务名称
+     */
     private String commodityName;
     public void setUnitPrice(String unitPrice) {
          this.unitPrice = unitPrice;

fi/shkd-fi-fi/src/main/java/shkd/fi/fi/common/orc/ErrorResponse.java

@@ -0,0 +1,52 @@
+package shkd.fi.fi.common.orc;
+
+public class ErrorResponse {
+    /**
+     * Copyright 2024 bejson.com
+     */
+    /**
+     * Auto-generated: 2024-07-12 15:26:47
+     *
+     * @author bejson.com (i@bejson.com)
+     * @website http://www.bejson.com/java2pojo/
+     */
+
+    private long code;
+    private String subCode;
+    private String message;
+    private String subMessage;
+
+    public void setCode(long code) {
+        this.code = code;
+    }
+
+    public long getCode() {
+        return code;
+    }
+
+    public void setSubCode(String subCode) {
+        this.subCode = subCode;
+    }
+
+    public String getSubCode() {
+        return subCode;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setSubMessage(String subMessage) {
+        this.subMessage = subMessage;
+    }
+
+    public String getSubMessage() {
+        return subMessage;
+    }
+
+}
+

fi/shkd-fi-fi/src/main/java/shkd/fi/fi/common/orc/OCRRetureData.java

@@ -15,6 +15,13 @@ public class OCRRetureData {
     private String method;
     private String requestId;
     private List<Response> response;
+    private ErrorResponse errorResponse;
+    public void setErrorResponse(ErrorResponse errorResponse) {
+         this.errorResponse = errorResponse;
+     }
+     public ErrorResponse getErrorResponse() {
+         return errorResponse;
+     }
     public void setMethod(String method) {
          this.method = method;
      }

fi/shkd-fi-fi/src/main/java/shkd/fi/fi/common/orc/Response.java

@@ -2,6 +2,7 @@
  * Copyright 2024 bejson.com
  */
 package shkd.fi.fi.common.orc;
+
 import java.util.Date;
 import java.util.List;
 
@@ -13,40 +14,126 @@ import java.util.List;
  */
 public class Response {
 
+    /**
+     * 城市？？
+     */
     private String city;
+    /**
+     * 购买方银行账号
+     */
     private String buyerBankAccount;
+    /**
+     * 备注
+     */
     private String remark;
+    /**
+     * 标题？？
+     */
     private String title;
+    /**
+     * 开票人？？
+     */
     private String issuer;
+    /**
+     * 合计税额:飞机燃油附加费
+     */
     private double totalTax;
+    /**
+     * 发票联次 eg:第一联
+     */
     private String invoiceTemplateType;
+    /**
+     * 销售方名称
+     */
     private String saleName;
+    /**
+     * 销售方税号
+     */
     private String saleTaxNo;
+    /**
+     * 省份
+     */
     private String province;
+    /**
+     * 销售方地址电话？？
+     */
     private String sellerAddrTel;
+    /**
+     * 发票类型
+     */
     private String invoiceType;
+    /**
+     * 发票号码
+     */
     private String invoiceNo;
+    /**
+     * 发票联次名称 eg:发票联
+     */
     private String invoiceTemplateName;
+    /**
+     * 发票位置
+     */
     private InvoicePosition invoicePosition;
+    /**
+     * 发票在影像中的旋转角度(顺时针)
+     */
     private int orientation;
+    /**
+     * 机器编号
+     */
     private String machineCode;
+    /**
+     * 购买方地址电话
+     */
     private String buyerAddrTel;
     private String transitMark;
     private String reviewer;
+    /**
+     * 开票日期
+     */
     private Date invoiceDate;
+    /**
+     * 发票代码
+     */
     private String invoiceCode;
+    /**
+     * 购买方名称
+     */
     private String purchaserName;
+    /**
+     * 校验码
+     */
     private String checkCode;
     private double totalAmount;
+    /**
+     * 购买方税号
+     */
     private String purchaserTaxNo;
+    /**
+     * 销售方银行账号
+     */
     private String sellerBankAccount;
+    /**
+     * 发票密文
+     */
     private String invoiceCiphertext;
+    /**
+     * 明细
+     */
     private List<DetailList> detailList;
+    /**
+     * 是否有公司印章:0-无;1-有
+     */
     private int hasSeal;
+    /**
+     * 价税合计
+     */
     private double amountTax;
+
     public void setCity(String city) {
         this.city = city;
     }
+
     public String getCity() {
         return city;
     }
@@ -54,6 +141,7 @@ public class Response {
     public void setBuyerBankAccount(String buyerBankAccount) {
         this.buyerBankAccount = buyerBankAccount;
     }
+
     public String getBuyerBankAccount() {
         return buyerBankAccount;
     }
@@ -61,6 +149,7 @@ public class Response {
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
     public String getRemark() {
         return remark;
     }
@@ -68,6 +157,7 @@ public class Response {
     public void setTitle(String title) {
         this.title = title;
     }
+
     public String getTitle() {
         return title;
     }
@@ -75,6 +165,7 @@ public class Response {
     public void setIssuer(String issuer) {
         this.issuer = issuer;
     }
+
     public String getIssuer() {
         return issuer;
     }
@@ -82,6 +173,7 @@ public class Response {
     public void setTotalTax(double totalTax) {
         this.totalTax = totalTax;
     }
+
     public double getTotalTax() {
         return totalTax;
     }
@@ -89,6 +181,7 @@ public class Response {
     public void setInvoiceTemplateType(String invoiceTemplateType) {
         this.invoiceTemplateType = invoiceTemplateType;
     }
+
     public String getInvoiceTemplateType() {
         return invoiceTemplateType;
     }
@@ -96,6 +189,7 @@ public class Response {
     public void setSaleName(String saleName) {
         this.saleName = saleName;
     }
+
     public String getSaleName() {
         return saleName;
     }
@@ -103,6 +197,7 @@ public class Response {
     public void setSaleTaxNo(String saleTaxNo) {
         this.saleTaxNo = saleTaxNo;
     }
+
     public String getSaleTaxNo() {
         return saleTaxNo;
     }
@@ -110,6 +205,7 @@ public class Response {
     public void setProvince(String province) {
         this.province = province;
     }
+
     public String getProvince() {
         return province;
     }
@@ -117,6 +213,7 @@ public class Response {
     public void setSellerAddrTel(String sellerAddrTel) {
         this.sellerAddrTel = sellerAddrTel;
     }
+
     public String getSellerAddrTel() {
         return sellerAddrTel;
     }
@@ -124,6 +221,7 @@ public class Response {
     public void setInvoiceType(String invoiceType) {
         this.invoiceType = invoiceType;
     }
+
     public String getInvoiceType() {
         return invoiceType;
     }
@@ -131,6 +229,7 @@ public class Response {
     public void setInvoiceNo(String invoiceNo) {
         this.invoiceNo = invoiceNo;
     }
+
     public String getInvoiceNo() {
         return invoiceNo;
     }
@@ -138,6 +237,7 @@ public class Response {
     public void setInvoiceTemplateName(String invoiceTemplateName) {
         this.invoiceTemplateName = invoiceTemplateName;
     }
+
     public String getInvoiceTemplateName() {
         return invoiceTemplateName;
     }
@@ -145,6 +245,7 @@ public class Response {
     public void setInvoicePosition(InvoicePosition invoicePosition) {
         this.invoicePosition = invoicePosition;
     }
+
     public InvoicePosition getInvoicePosition() {
         return invoicePosition;
     }
@@ -152,6 +253,7 @@ public class Response {
     public void setOrientation(int orientation) {
         this.orientation = orientation;
     }
+
     public int getOrientation() {
         return orientation;
     }
@@ -159,6 +261,7 @@ public class Response {
     public void setMachineCode(String machineCode) {
         this.machineCode = machineCode;
     }
+
     public String getMachineCode() {
         return machineCode;
     }
@@ -166,6 +269,7 @@ public class Response {
     public void setBuyerAddrTel(String buyerAddrTel) {
         this.buyerAddrTel = buyerAddrTel;
     }
+
     public String getBuyerAddrTel() {
         return buyerAddrTel;
     }
@@ -173,6 +277,7 @@ public class Response {
     public void setTransitMark(String transitMark) {
         this.transitMark = transitMark;
     }
+
     public String getTransitMark() {
         return transitMark;
     }
@@ -180,6 +285,7 @@ public class Response {
     public void setReviewer(String reviewer) {
         this.reviewer = reviewer;
     }
+
     public String getReviewer() {
         return reviewer;
     }
@@ -187,6 +293,7 @@ public class Response {
     public void setInvoiceDate(Date invoiceDate) {
         this.invoiceDate = invoiceDate;
     }
+
     public Date getInvoiceDate() {
         return invoiceDate;
     }
@@ -194,6 +301,7 @@ public class Response {
     public void setInvoiceCode(String invoiceCode) {
         this.invoiceCode = invoiceCode;
     }
+
     public String getInvoiceCode() {
         return invoiceCode;
     }
@@ -201,6 +309,7 @@ public class Response {
     public void setPurchaserName(String purchaserName) {
         this.purchaserName = purchaserName;
     }
+
     public String getPurchaserName() {
         return purchaserName;
     }
@@ -208,6 +317,7 @@ public class Response {
     public void setCheckCode(String checkCode) {
         this.checkCode = checkCode;
     }
+
     public String getCheckCode() {
         return checkCode;
     }
@@ -215,6 +325,7 @@ public class Response {
     public void setTotalAmount(double totalAmount) {
         this.totalAmount = totalAmount;
     }
+
     public double getTotalAmount() {
         return totalAmount;
     }
@@ -222,6 +333,7 @@ public class Response {
     public void setPurchaserTaxNo(String purchaserTaxNo) {
         this.purchaserTaxNo = purchaserTaxNo;
     }
+
     public String getPurchaserTaxNo() {
         return purchaserTaxNo;
     }
@@ -229,6 +341,7 @@ public class Response {
     public void setSellerBankAccount(String sellerBankAccount) {
         this.sellerBankAccount = sellerBankAccount;
     }
+
     public String getSellerBankAccount() {
         return sellerBankAccount;
     }
@@ -236,6 +349,7 @@ public class Response {
     public void setInvoiceCiphertext(String invoiceCiphertext) {
         this.invoiceCiphertext = invoiceCiphertext;
     }
+
     public String getInvoiceCiphertext() {
         return invoiceCiphertext;
     }
@@ -243,6 +357,7 @@ public class Response {
     public void setDetailList(List<DetailList> detailList) {
         this.detailList = detailList;
     }
+
     public List<DetailList> getDetailList() {
         return detailList;
     }
@@ -250,6 +365,7 @@ public class Response {
     public void setHasSeal(int hasSeal) {
         this.hasSeal = hasSeal;
     }
+
     public int getHasSeal() {
         return hasSeal;
     }
@@ -257,6 +373,7 @@ public class Response {
     public void setAmountTax(double amountTax) {
         this.amountTax = amountTax;
     }
+
     public double getAmountTax() {
         return amountTax;
     }

fi/shkd-fi-fi/src/main/java/shkd/fi/fi/formplugin/ApFinapbillFormPlugin.java

@@ -1,12 +1,15 @@
 package shkd.fi.fi.formplugin;
 
 import kd.bos.bill.AbstractBillPlugIn;
+import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.form.CloseCallBack;
 import kd.bos.form.FormShowParameter;
 import kd.bos.form.ShowType;
 import kd.bos.form.control.events.ItemClickEvent;
+import kd.bos.form.events.ClosedCallBackEvent;
 
 import java.util.EventObject;
+import java.util.List;
 
 public class ApFinapbillFormPlugin extends AbstractBillPlugIn {
     @Override
@@ -21,13 +24,24 @@ public class ApFinapbillFormPlugin extends AbstractBillPlugIn {
         String itemKey = evt.getItemKey();
         if ("shkd_fpocr".equals(itemKey)) {
             FormShowParameter parameter = new FormShowParameter();
-            parameter.setCustomParam("id","");
+            Object id = this.getModel().getValue("id");
+            if (id.equals(0L)) {
+                this.getView().showMessage("请先保存单据");
+                return;
+            }
+            parameter.setCustomParam("id", id);
             parameter.setCustomParam("billno", this.getModel().getValue("billno"));
-//            parameter.setCustomParam("id","");
             parameter.setFormId("shkd_uploadattachments");
             parameter.setCloseCallBack(new CloseCallBack(this, "shkd_fpocr"));
             parameter.getOpenStyle().setShowType(ShowType.Modal);
             this.getView().showForm(parameter);
         }
     }
+
+    @Override
+    public void closedCallBack(ClosedCallBackEvent closedCallBackEvent) {
+        super.closedCallBack(closedCallBackEvent);
+
     }
+}
+