Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

@@ -2,6 +2,7 @@ package com.glxp.api.controller.inout;
 
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
@@ -28,6 +29,7 @@ import com.glxp.api.entity.thrsys.ThrOrderDetailEntity;
 import com.glxp.api.entity.thrsys.ThrOrderEntity;
 import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity;
 import com.glxp.api.req.inout.*;
+import com.glxp.api.req.inv.FilterInvoiceRequest;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
@@ -56,6 +58,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -615,7 +618,6 @@ public class IoOrderDetailBizController extends BaseController {
     }
 
 
-
     @PostMapping("/udiwms/inout/biz/insertInvoice")
     @Log(title = "发票管理", businessType = BusinessType.INSERT)
     public BaseResponse insertInvoice(@RequestBody IoOrderInvoiceEntity ioOrderInvoice) {
@@ -644,6 +646,20 @@ public class IoOrderDetailBizController extends BaseController {
 
     }
 
+    //解析发票二维码
+    @GetMapping("/udiwms/inout/biz/parseInvoice")
+    public BaseResponse parseInvoice(String code) {
+        List<String> list = Arrays.asList(code.split(","));
+        FilterInvoiceRequest filterInvoiceRequest = new FilterInvoiceRequest();
+        filterInvoiceRequest.setType(list.get(1));
+        filterInvoiceRequest.setInvoiceCode(list.get(2));
+        filterInvoiceRequest.setInvoiceEncode(list.get(3));
+        filterInvoiceRequest.setPrice(new BigDecimal(list.get(4)));
+        filterInvoiceRequest.setInvoiceDate(DateUtil.formatDateTime(DateUtil.parse(list.get(5), "yyyyMMdd")));
+        return ResultVOUtils.success(filterInvoiceRequest);
+    }
+
+
     @PostMapping("/udiwms/inout/biz/updateorderBiz")
     public BaseResponse updateorderBiz(@RequestBody List<IoOrderDetailCodeEntity> list) {
         for (IoOrderDetailCodeEntity ioOrderDetailBizEntity : list) {

src/main/java/com/glxp/api/req/inv/FilterInvoiceRequest.java

@@ -0,0 +1,41 @@
+package com.glxp.api.req.inv;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 查询库存预警消息参数
+ */
+@Data
+public class FilterInvoiceRequest extends ListPageRequest {
+
+
+    /**
+     * 预警类型：10：增值税电子普通发票；01：增值税专用发票；04：增值税普通发票；32：电子发票(普通发票)；31：电子发票(增值税专用发票)
+     */
+    private String type;
+
+    /**
+     * 发票代码
+     */
+    private String invoiceCode;
+
+    /**
+     * 发票编码
+     */
+    private String invoiceEncode;
+
+    /**
+     * 开票日期
+     */
+    private String invoiceDate;
+
+
+    /**
+     * 发票价格
+     */
+    private BigDecimal price;
+
+}