同步发票代码

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

@@ -556,7 +556,7 @@ public class IoOrderDetailBizController extends BaseController {
     @Log(title = "发票管理", businessType = BusinessType.DELETE)
     public BaseResponse deleteById(@RequestBody IoOrderInvoiceEntity ioOrderInvoiceEntity) {
 
-        ioOrderInvoiceService.deleteByInvId(ioOrderInvoiceEntity.getId().longValue());
+        ioOrderInvoiceService.deleteByInvId(ioOrderInvoiceEntity.getId()+"");
         //更改 登记状态
         IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
 
@@ -596,28 +596,38 @@ public class IoOrderDetailBizController extends BaseController {
 
     @PostMapping("/udiwms/inout/biz/insertInvoice")
     @Log(title = "发票管理", businessType = BusinessType.INSERT)
-    public BaseResponse insertInvoice(@RequestBody IoOrderDetailBizEntity ioOrderDetailBizEntity) {
+    public BaseResponse insertInvoice(@RequestBody IoOrderInvoiceEntity ioOrderInvoice) {
-
+
-        IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity();
+        for (IoOrderDetailBizEntity ioOrderDetailBizEntity : ioOrderInvoice.getList()) {
-        ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailBizEntity.getOrderIdFk());
+            IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity();
-        ioOrderInvoiceEntity.setBindRlFk(ioOrderDetailBizEntity.getBindRlFk() + "");
+            ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailBizEntity.getOrderIdFk());
-        ioOrderInvoiceEntity.setBatchNo(ioOrderDetailBizEntity.getBatchNo());
+            ioOrderInvoiceEntity.setBindRlFk(ioOrderDetailBizEntity.getBindRlFk() + "");
-        ioOrderInvoiceEntity.setProductDate(ioOrderDetailBizEntity.getProductDate());
+            ioOrderInvoiceEntity.setBatchNo(ioOrderDetailBizEntity.getBatchNo());
-        ioOrderInvoiceEntity.setExpireDate(ioOrderDetailBizEntity.getExpireDate());
+            ioOrderInvoiceEntity.setProductDate(ioOrderDetailBizEntity.getProductDate());
-        ioOrderInvoiceEntity.setBizIdFk(ioOrderDetailBizEntity.getId());
+            ioOrderInvoiceEntity.setExpireDate(ioOrderDetailBizEntity.getExpireDate());
-        ioOrderInvoiceEntity.setCreateTime(new Date());
+            ioOrderInvoiceEntity.setBizIdFk(ioOrderDetailBizEntity.getId());
-        ioOrderInvoiceEntity.setUpdateTime(new Date());
+            ioOrderInvoiceEntity.setCreateTime(new Date());
-        ioOrderInvoiceEntity.setId(IdUtil.getSnowflakeNextId());
+            ioOrderInvoiceEntity.setUpdateTime(new Date());
-        boolean b = ioOrderInvoiceService.insertInvoice(ioOrderInvoiceEntity);
+            ioOrderInvoiceEntity.setId(IdUtil.getSnowflakeNextId());
-
+            ioOrderInvoiceEntity.setMachineNo(ioOrderInvoice.getMachineNo());
+            ioOrderInvoiceEntity.setInvoiceCode(ioOrderInvoice.getInvoiceCode());
+            ioOrderInvoiceEntity.setInvoiceEncode(ioOrderInvoice.getInvoiceEncode());
+            ioOrderInvoiceEntity.setInvoiceDate(ioOrderInvoice.getInvoiceDate());
+            ioOrderInvoiceEntity.setPrice(ioOrderInvoice.getPrice());
+            ioOrderInvoiceEntity.setRemark(ioOrderInvoice.getRemark());
+            ioOrderInvoiceEntity.setLicenseUrl(ioOrderInvoice.getLicenseUrl());
+            boolean b = ioOrderInvoiceService.insertInvoice(ioOrderInvoiceEntity);
+        }
         return ResultVOUtils.success("成功");
 
     }
 
     @PostMapping("/udiwms/inout/biz/updateorderBiz")
-    public BaseResponse updateorderBiz(@RequestBody IoOrderDetailBizEntity ioOrderDetailBizEntity) {
+    public BaseResponse updateorderBiz(@RequestBody List<IoOrderDetailBizEntity> list) {
-        ioOrderDetailBizEntity.setRegStatus(true);
+        for (IoOrderDetailBizEntity ioOrderDetailBizEntity : list) {
-        orderDetailBizService.updateOrderDetailBiz(ioOrderDetailBizEntity);
+            ioOrderDetailBizEntity.setRegStatus(true);
+            orderDetailBizService.updateOrderDetailBiz(ioOrderDetailBizEntity);
+        }
 
         return ResultVOUtils.success("成功");
 
@@ -631,15 +641,16 @@ public class IoOrderDetailBizController extends BaseController {
      */
     @GetMapping("/udiwms/inout/bizDetail/filterBizOrderList")
     public BaseResponse filterBizOrderList(FilterOrderDetailBizRequest orderDetailBizRequest) {
-        List<IoOrderDetailBizResponse> list = orderDetailBizService.filterList(orderDetailBizRequest);
+        List<IoOrderDetailBizResponse> list = orderDetailBizService.getfilterList(orderDetailBizRequest);
         for (IoOrderDetailBizResponse ioOrderDetailBizResponse : list) {
             String msg = "";
             IoOrderInvoiceRequest ioOrderInvoiceEntity = new IoOrderInvoiceRequest();
             ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailBizResponse.getOrderIdFk());
+            ioOrderInvoiceEntity.setBizIdFk(ioOrderDetailBizResponse.getId());
             List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList = ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceEntity);
             for (IoOrderInvoiceEntity obj : ioOrderInvoiceEntityList) {
-                if (StrUtil.isNotEmpty(obj.getInvoiceCode())) {
+                if (StrUtil.isNotEmpty(obj.getInvoiceEncode())) {
-                    msg += "," + obj.getInvoiceCode();
+                    msg += "," + obj.getInvoiceEncode();
                 }
             }
             if (msg.length() > 1) {

src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 @TableName(value = "io_order_invoice")
@@ -108,6 +109,11 @@ public class IoOrderInvoiceEntity {
     @TableField(exist = false)
     private Integer  regId;
 
+
+    @TableField(exist = false)
+    private List<IoOrderDetailBizEntity> list;
+
+
     public static final String COL_ID = "id";
 
     public static final String COL_ORDERIDFK = "orderIdFk";

src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java

@@ -1,15 +1,8 @@
 package com.glxp.api.req.inout;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.glxp.api.entity.inout.IoOrderDetailResultEntity;
-import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
-import com.glxp.api.entity.purchase.SupCertSetEntity;
 import lombok.Data;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * @author : zhangsan
@@ -67,7 +60,7 @@ public class IoOrderInvoiceRequest {
 
     private String remark;
 
-    private Long bizIdFk;
+    private Integer bizIdFk;
 
     public static final String COL_ID = "id";
 

src/main/java/com/glxp/api/res/inout/IoOrderResponse.java

@@ -220,6 +220,10 @@ public class IoOrderResponse {
     private Integer processStatus;
     private int inCodeStatus;
 
+    private Integer allCout;
+
+    private Integer partCount;
+
     private Date checkTime;
     private String checkUserName;
 

src/main/java/com/glxp/api/service/inout/IoOrderInvoiceService.java

@@ -1,7 +1,6 @@
 package com.glxp.api.service.inout;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.glxp.api.entity.inout.IoCodeRelEntity;
 import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import com.glxp.api.req.inout.IoOrderInvoiceRequest;
 
@@ -12,7 +11,7 @@ public interface IoOrderInvoiceService extends IService<IoOrderInvoiceEntity> {
 
     List<IoOrderInvoiceEntity> findByBillNo(String billNo);
 
-    boolean deleteByInvId(Long id);
+    boolean deleteByInvId(String id);
 
     boolean updateByInvId(IoOrderInvoiceRequest ioOrderInvoiceRequest);
 

src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java

@@ -2,15 +2,12 @@ package com.glxp.api.service.inout.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.glxp.api.dao.inout.IoCodeRelMapper;
 import com.glxp.api.dao.inout.IoOrderInvoiceMapper;
-import com.glxp.api.entity.inout.IoCodeRelEntity;
 import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import com.glxp.api.req.inout.IoOrderInvoiceRequest;
+import com.glxp.api.service.inout.IoOrderInvoiceService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
-
-import com.glxp.api.service.inout.IoOrderInvoiceService;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
@@ -30,7 +27,7 @@ public class IoOrderInvoiceServiceImpl extends ServiceImpl<IoOrderInvoiceMapper,
 
 
     @Override
-    public boolean deleteByInvId(Long id) {
+    public boolean deleteByInvId(String id) {
         return this.ioOrderInvoiceMapper.deleteById(id) > 0;
     }