发票修改同步

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

@@ -51,7 +51,9 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
+
 import static com.glxp.api.constant.ConstantStatus.ORDER_STATUS_CHECK_PROCESS;
+import static com.glxp.api.constant.ConstantStatus.ORDER_STATUS_PROCESSING;
 
 
 @Slf4j
@@ -76,6 +78,8 @@ public class IoOrderController extends BaseController {
     IoCheckInoutService ioCheckInoutService;
     @Resource
     BasicCorpService basicCorpService;
+    @Resource
+    IoOrderInvoiceService orderInvoiceService;
 
     /**
      * 查询单据列表
@@ -141,22 +145,13 @@ public class IoOrderController extends BaseController {
             filterOrderRequest.setFromCorp(customerId);
         }
         List<IoOrderResponse> list = orderService.getfilterOrderList(filterOrderRequest);
+
         for (IoOrderResponse ioOrderResponse : list) {
             if (ioOrderResponse.getCheckStatus() == null) {
                 ioOrderResponse.setCheckStatus(0 + "");
             }
-            FilterOrderDetailCodeRequest filterOrderDetailCodeRequest = new FilterOrderDetailCodeRequest();
+            ioOrderResponse = orderInvoiceService.findRegStausByBillNo(ioOrderResponse);
-            filterOrderDetailCodeRequest.setOrderIdFk(ioOrderResponse.getBillNo());
-            List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(filterOrderDetailCodeRequest);
-            BigDecimal amount = new BigDecimal(0.00);
-            for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) {
-                if (ioOrderDetailCodeRespons.getReCount() != 0 && ioOrderDetailCodeRespons.getPrice() != null) {
-                    amount = amount.add(new BigDecimal(ioOrderDetailCodeRespons.getReCount()).multiply(ioOrderDetailCodeRespons.getPrice()));
         }
-            }
-            ioOrderResponse.setAllAmount(amount);
-        }
-
 
         PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.page(pageInfo);

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

@@ -689,26 +689,26 @@ public class IoOrderDetailBizController extends BaseController {
      */
     @GetMapping("/udiwms/inout/bizDetail/filterBizOrderList")
     public BaseResponse filterBizOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest) {
-        List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterList(orderDetailBizRequest);
+        List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(orderDetailBizRequest);
-        for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) {
+        List<IoOrderInvoiceEntity> orderInvoiceEntities = ioOrderInvoiceService.findByBillNo(orderDetailBizRequest.getOrderIdFk());
-            if (ioOrderDetailCodeRespons.getReCount() != 0 && ioOrderDetailCodeRespons.getPrice() != null) {
+        for (IoOrderDetailCodeResponse orderDetailCodeEntity : ioOrderDetailCodeResponses) {
-                ioOrderDetailCodeRespons.setAmount(new BigDecimal(ioOrderDetailCodeRespons.getReCount()).multiply(ioOrderDetailCodeRespons.getPrice()));
+            if (orderDetailCodeEntity.getReCount() != 0 && orderDetailCodeEntity.getPrice() != null) {
+                orderDetailCodeEntity.setAmount(new BigDecimal(orderDetailCodeEntity.getReCount()).multiply(orderDetailCodeEntity.getPrice()));
             }
             String msg = "";
-            IoOrderInvoiceRequest ioOrderInvoiceEntity = new IoOrderInvoiceRequest();
+            for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
-            ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailCodeRespons.getOrderIdFk());
+                if (StrUtil.trimToEmpty(orderInvoiceEntity.getBatchNo()).equals(StrUtil.trimToEmpty(orderDetailCodeEntity.getBatchNo()))
-            ioOrderInvoiceEntity.setBatchNo(ioOrderDetailCodeRespons.getBatchNo());
+                        && StrUtil.trimToEmpty(orderInvoiceEntity.getBindRlFk()).equals(StrUtil.trimToEmpty(orderDetailCodeEntity.getBindRlFk() + ""))) {
-            ioOrderInvoiceEntity.setBindRlFk(ioOrderDetailCodeRespons.getBindRlFk().toString());
+                    orderDetailCodeEntity.setRegStatus(true);
-            List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList = ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceEntity);
+                    if (StrUtil.isNotEmpty(orderInvoiceEntity.getInvoiceEncode())) {
-            for (IoOrderInvoiceEntity obj : ioOrderInvoiceEntityList) {
+                        msg += "," + orderInvoiceEntity.getInvoiceEncode();
-                if (StrUtil.isNotEmpty(obj.getInvoiceEncode())) {
+                    }
-                    msg += "," + obj.getInvoiceEncode();
                 }
             }
             if (msg.length() > 1) {
                 msg = msg.substring(1);
             }
-            ioOrderDetailCodeRespons.setInvoiceCodes(msg);
+            orderDetailCodeEntity.setInvoiceCodes(msg);
         }
         PageInfo<IoOrderDetailCodeResponse> pageInfo = new PageInfo<>(ioOrderDetailCodeResponses);
         return ResultVOUtils.page(pageInfo);

src/main/java/com/glxp/api/dao/inout/IoOrderDao.java

@@ -76,6 +76,7 @@ public interface IoOrderDao extends BaseMapperPlus<IoOrderDao, IoOrderEntity, Io
 
     List<String> selectOrderIdList(@Param("data") String data);
 
-    List<String> selectOrderfirstAndLastIdList(@Param("firstData") String firstData,@Param("lastData") String lastData);
+    List<String> selectOrderfirstAndLastIdList(@Param("firstData") String firstData, @Param("lastData") String lastData);
 
+    List<IoOrderResponse> getfilterOrderList(FilterOrderRequest filterOrderRequest);
 }

src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java

@@ -27,8 +27,10 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus<IoOrderDetailBizDao,
     List<IoOrderDetailCodeResponse> getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest);
 
     List<IoOrderInvoiceResponse> filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest);
+
     IoOrderInvoiceResponse selectByinvoiceId(Long id);
 
+    List<IoOrderDetailCodeResponse> getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest);
 
     /**
      * 查询单条单据业务详情

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

@@ -240,6 +240,7 @@ public class IoOrderResponse {
 
     private Integer busType;           //1:正常；2：送货；3.到货
 
+    private int invoiceStatus;//发票登记状态0：未登记，1：未全部登记；2：已全部登记
 
     public String getFromName() {
         if (StrUtil.isNotEmpty(fromInvName))

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

@@ -51,4 +51,7 @@ public interface IoOrderDetailBizService {
 
     Boolean updateOrderDetailBiz(IoOrderDetailBizEntity ioOrderDetailBizEntity);
 
+    List<IoOrderDetailCodeResponse> getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest);
+
+
 }

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

@@ -3,6 +3,7 @@ package com.glxp.api.service.inout;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import com.glxp.api.req.inout.IoOrderInvoiceRequest;
+import com.glxp.api.res.inout.IoOrderResponse;
 
 import java.util.List;
 
@@ -19,5 +20,6 @@ public interface IoOrderInvoiceService extends IService<IoOrderInvoiceEntity> {
 
     List<IoOrderInvoiceEntity> selectOrderInvoice(IoOrderInvoiceRequest ioOrderInvoiceRequest);
 
+    IoOrderResponse findRegStausByBillNo(IoOrderResponse orderResponse);
 
 }

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

@@ -142,4 +142,6 @@ public interface IoOrderService {
     List<IoOrderEntity> selectList(Long userId);
 
     List<String> selectOrderIdList(@Param("data") String data);
+
+    List<IoOrderResponse> getfilterOrderList(FilterOrderRequest filterOrderRequest);
 }

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

@@ -197,4 +197,14 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
         return ioOrderDetailBizDao.updateById(ioOrderDetailBizEntity) > 0;
     }
 
+    @Override
+    public List<IoOrderDetailCodeResponse> getfilterOrderList(FilterOrderDetailCodeRequest OrderDetailCodeRequest) {
+        if (null == OrderDetailCodeRequest) {
+            return Collections.emptyList();
+        }
+        if (null != OrderDetailCodeRequest.getPage() && null != OrderDetailCodeRequest.getLimit()) {
+            PageHelper.offsetPage((OrderDetailCodeRequest.getPage() - 1) * OrderDetailCodeRequest.getLimit(), OrderDetailCodeRequest.getLimit());
+        }
+        return ioOrderDetailBizDao.getfilterOrderList(OrderDetailCodeRequest);
+    }
 }

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

@@ -1,17 +1,23 @@
 package com.glxp.api.service.inout.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.api.dao.inout.IoOrderDetailCodeDao;
 import com.glxp.api.dao.inout.IoOrderInvoiceMapper;
+import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import com.glxp.api.req.inout.IoOrderInvoiceRequest;
+import com.glxp.api.res.inout.IoOrderResponse;
 import com.glxp.api.service.inout.IoOrderInvoiceService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -20,6 +26,8 @@ import java.util.List;
 public class IoOrderInvoiceServiceImpl extends ServiceImpl<IoOrderInvoiceMapper, IoOrderInvoiceEntity> implements IoOrderInvoiceService {
     @Resource
     IoOrderInvoiceMapper ioOrderInvoiceMapper;
+    @Resource
+    IoOrderDetailCodeDao orderDetailCodeDao;
 
     @Override
     public List<IoOrderInvoiceEntity> findByBillNo(String orderIdFk) {
@@ -51,4 +59,41 @@ public class IoOrderInvoiceServiceImpl extends ServiceImpl<IoOrderInvoiceMapper,
     public List<IoOrderInvoiceEntity> selectOrderInvoice(IoOrderInvoiceRequest ioOrderInvoiceRequest) {
         return ioOrderInvoiceMapper.selectOrderInvoice(ioOrderInvoiceRequest);
     }
+
+    @Override
+    public IoOrderResponse findRegStausByBillNo(IoOrderResponse orderResponse) {
+        List<IoOrderInvoiceEntity> orderInvoiceEntities = ioOrderInvoiceMapper.selectList(new QueryWrapper<IoOrderInvoiceEntity>().eq("orderIdFk", orderResponse.getBillNo()));
+        List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeDao.selectList(new QueryWrapper<IoOrderDetailCodeEntity>().eq("orderIdFk", orderResponse.getBillNo()));
+        if (CollUtil.isNotEmpty(orderDetailCodeEntities)) {
+            BigDecimal amount = new BigDecimal(0.00);
+            for (IoOrderDetailCodeEntity orderDetailCodeEntity : orderDetailCodeEntities) {
+                for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
+                    if (StrUtil.trimToEmpty(orderInvoiceEntity.getBatchNo()).equals(StrUtil.trimToEmpty(orderDetailCodeEntity.getBatchNo()))
+                            && StrUtil.trimToEmpty(orderInvoiceEntity.getBindRlFk()).equals(StrUtil.trimToEmpty(orderDetailCodeEntity.getBindRlFk() + ""))) {
+                        orderDetailCodeEntity.setRegStatus(true);
+                    }
+                }
+                if (orderDetailCodeEntity.getReCount() != 0 && orderDetailCodeEntity.getPrice() != null) {
+                    amount = amount.add(new BigDecimal(orderDetailCodeEntity.getReCount()).multiply(orderDetailCodeEntity.getPrice()));
+                }
+            }
+            orderResponse.setAllAmount(amount);
+        } else
+            return orderResponse;
+
+        int isAll = 0;
+        for (IoOrderDetailCodeEntity orderDetailCodeEntity : orderDetailCodeEntities) {
+            if (orderDetailCodeEntity.isRegStatus()) {
+                isAll++;
+            }
+        }
+        if (orderDetailCodeEntities.size() == isAll)
+            orderResponse.setInvoiceStatus(2);//已全部登记
+        else if (isAll > 0) {
+            orderResponse.setInvoiceStatus(1);//未全部登记
+        }
+        return orderResponse;
+
+    }
+
 }

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

@@ -1020,4 +1020,15 @@ public class IoOrderServiceImpl implements IoOrderService {
         return false;
     }
 
+    @Override
+    public List<IoOrderResponse> getfilterOrderList(FilterOrderRequest filterOrderRequest) {
+        if (null == filterOrderRequest) {
+            return Collections.emptyList();
+        }
+        if (null != filterOrderRequest.getPage() && null != filterOrderRequest.getLimit()) {
+            PageHelper.offsetPage((filterOrderRequest.getPage() - 1) * filterOrderRequest.getLimit(), filterOrderRequest.getLimit());
+        }
+        return orderDao.getfilterOrderList(filterOrderRequest);
+    }
+
 }

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -473,16 +473,12 @@
 
 
     <select id="getfilterOrderList" resultType="com.glxp.api.res.inout.IoOrderResponse">
-        SELECT
+        SELECT io.*,
-        io.*,
         bus.NAME AS billTypeName,
         ad.NAME  AS deptName,
         aw.NAME  AS invName,
-        bc.NAME AS fromCorpName,
+        bc.NAME  AS fromCorpName
-        COUNT(IF(dc.regStatus = 1, 1, NULL)) AS allCout,
+        FROM io_order io
-        COUNT(IF(dc.regStatus = 0, 1, NULL)) AS partCount
-        FROM
-        io_order io
         LEFT JOIN basic_bussiness_type bus ON io.action = bus.action
         LEFT JOIN auth_dept ad ON io.deptCode = ad.CODE
         LEFT JOIN auth_warehouse aw ON io.invCode = aw.CODE
@@ -608,7 +604,7 @@
         </where>
         GROUP BY io.id
         <choose>
-            <when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
+            <when test="(orderBy != null) and (sort == 'desc' or sort == 'asc')">
                 order by ${orderBy} ${sort}
             </when>
             <otherwise>
@@ -616,5 +612,4 @@
             </otherwise>
         </choose>
     </select>
-
 </mapper>

src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml

@@ -57,7 +57,7 @@
     </select>
 
     <select id="filterListInv" resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
-        SELECT ic.*,cpmctymc,ggxh
+        SELECT ic.*, cpmctymc, ggxh
         FROM io_order_invoice ic
                      LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
                      LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
@@ -113,10 +113,7 @@
     </select>
 
     <select id="getfilterOrderList" resultType="com.glxp.api.res.inout.IoOrderDetailCodeResponse">
-        select io_order_detail_code.*,
+        select *
-        (select count(*)
-        FROM io_order_invoice
-        where io_order_invoice.orderIdFk = io_order_detail_code.orderIdFk) as sucCount
         from io_order_detail_code
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
@@ -128,12 +125,7 @@
             <if test="batchNo != null and batchNo != ''">
                 AND batchNo = #{batchNo}
             </if>
-            <if test="productName != null and productName != ''">
-                AND bp.cpmctymc like concat('%', #{productName}, '%')
-            </if>
         </where>
         group by io_order_detail_code.id
     </select>
-
-
 </mapper>