6/11 单据查询页面

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

@@ -97,6 +97,9 @@ public class IoOrderController extends BaseController {
     @Resource
     InvProductDetailService invProductDetailService;
 
+    @Resource
+    IoOrderInvoiceService ioOrderInvoiceService;
+
     /**
      * 查询单据列表
      *
@@ -132,7 +135,20 @@ public class IoOrderController extends BaseController {
         if (!customerId.equals("110")) {
             filterOrderRequest.setFromCorp(customerId);
         }
+        //拿到当前单据
         List<IoOrderResponse> list = orderService.filterList(filterOrderRequest);
+        //根据单据查询 发票号
+        for (IoOrderResponse ioOrderResponse : list){
+            FilterOrderDetailCodeRequest filterOrderDetailCodeRequest = new FilterOrderDetailCodeRequest();
+            filterOrderDetailCodeRequest.setOrderIdFk(ioOrderResponse.getBillNo());
+            List<IoOrderInvoiceEntity> orderInvoiceEntities = ioOrderInvoiceService.findByBillNo(filterOrderDetailCodeRequest.getOrderIdFk());
+            String invoiceCodes = orderInvoiceEntities.stream()
+                    .map(IoOrderInvoiceEntity::getInvoiceEncode)
+                    .collect(Collectors.joining(","));
+            log.error("当前所有的发票号{}",invoiceCodes);
+            ioOrderResponse.setInvoiceCodes(invoiceCodes);
+        }
+
         PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.page(pageInfo);
     }

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

@@ -41,6 +41,7 @@ import com.glxp.api.util.BeanCopyUtils;
 import com.glxp.api.util.JasperUtils;
 import com.glxp.api.util.MsDateUtil;
 import com.glxp.api.vo.dev.DeviceInfoVo;
+import lombok.extern.slf4j.Slf4j;
 import net.sf.jasperreports.engine.JRException;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Value;
@@ -64,6 +65,7 @@ import java.util.*;
  * 单据扫码明细查询接口
  */
 @RestController
+@Slf4j
 public class IoOrderDetailResultController extends BaseController {
     @Resource
     IoOrderService orderService;
@@ -345,6 +347,7 @@ public class IoOrderDetailResultController extends BaseController {
             ioOrderDetailResultData.put("productDate", ioOrderDetailResultResponse.getProductDate() == null ? ' ' : ioOrderDetailResultResponse.getProductDate());
             ioOrderDetailResultData.put("expireDate", ioOrderDetailResultResponse.getExpireDate() == null ? ' ' : ioOrderDetailResultResponse.getExpireDate());
             ioOrderDetailResultData.put("coName", ioOrderDetailResultResponse.getCoName() == null ? ' ' : ioOrderDetailResultResponse.getCoName());
+            ioOrderDetailResultData.put("corpName", ioOrderDetailResultResponse.getCorpName()== null ? ' ' : ioOrderDetailResultResponse.getCorpName());
             ioOrderDetailResultData.put("certCode", ioOrderDetailResultResponse.getCertCode() == null ? ' ' : ioOrderDetailResultResponse.getCertCode());
             ioOrderDetailResultData.put("ylqxzcrbarmc", ioOrderDetailResultResponse.getYlqxzcrbarmc() == null ? ' ' : ioOrderDetailResultResponse.getYlqxzcrbarmc());
             ioOrderDetailResultData.put("manufacturer", ioOrderDetailResultResponse.getManufacturer() == null ? ' ' : ioOrderDetailResultResponse.getManufacturer());

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

@@ -214,6 +214,7 @@ public class IoOrderDetailResultResponse {
     @ExcelProperty(value = "发票确认时间", index = 12)
     private Date confirmTime;
 
+    @ExcelProperty(value = "配送商", index = 7)
     private String corpName;
 
 

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

@@ -264,6 +264,8 @@ public class IoOrderResponse {
 
     private String checkPreInOrders;
 
+    private String invoiceCodes;//单据所有发票号
+
 
     public String getFromName() {
 

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

@@ -53,7 +53,7 @@
                 AND io.fromCorp = #{fromCorp}
             </if>
             <if test="invoiceEncode != null and invoiceEncode != ''">
-                AND ioi.invoiceEncode = #{invoiceEncode}
+                AND ioi.invoiceEncode like concat('%', #{invoiceEncode}, '%')
             </if>
             <if test="keyWord != null and keyWord != ''">
                 AND (