From fd25a5cc67a87bfdd6646e1a92d8e512a1c9c816 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Thu, 26 Dec 2024 14:38:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E9=98=B3=E5=85=89=E9=87=87=E8=B4=AD=E5=B9=B3=E5=8F=B0=E8=BF=BD?= =?UTF-8?q?=E6=BA=AF=E7=A0=81=E4=B8=8A=E4=BC=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/IoCodeController.java | 7 +++ .../api/req/inout/AddBizProductReqeust.java | 7 +++ .../impl/AlihealthBusServiceImpl.java | 2 + .../impl/IoOrderDetailBizServiceImpl.java | 50 ++++++++++++++++++- 4 files changed, 64 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeController.java index fc8e2204..82487e32 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeController.java @@ -155,6 +155,13 @@ public class IoCodeController extends BaseController { if (CollUtil.isNotEmpty(list)) { exportExcelList.addAll(list); + }else { + YcFileCodeUploadVo ycFileCodeUploadVo = new YcFileCodeUploadVo(); + ycFileCodeUploadVo.setCode(""); + ycFileCodeUploadVo.setYcBillNo(ycBillNo); + ycFileCodeUploadVo.setYcBizNo(ioOrderDetailBizResponse.getYcBizNo()); + + exportExcelList.add(ycFileCodeUploadVo); } } diff --git a/src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java b/src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java index 475a6b9c..03faf434 100644 --- a/src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java +++ b/src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java @@ -1,5 +1,7 @@ package com.glxp.api.req.inout; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.glxp.api.entity.alihealth.AliYljgBillDetail; import com.glxp.api.entity.alihealth.AliYljgBillDetailDrug; import com.glxp.api.entity.alihealth.AliYljgSearchbill; @@ -34,4 +36,9 @@ public class AddBizProductReqeust { List datas; //多选添加 AliYljgSearchbill aliData; //多选添加 + + @ExcelProperty("销售发票号（第二票）") + @ColumnWidth(50) + private String salesInvoiceNumberSecondTicket; + } diff --git a/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java b/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java index 3e8c78c8..331d428e 100644 --- a/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java +++ b/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java @@ -18,6 +18,7 @@ import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.inout.IoCodeLostEntity; import com.glxp.api.entity.inout.IoOrderEntity; +import com.glxp.api.entity.inout.IoOrderInvoiceEntity; import com.glxp.api.exception.JsonException; import com.glxp.api.req.alihealth.AliYljgSearchbillReqeust; import com.glxp.api.req.alihealth.AlihealthYljgListupoutDetailReqeust; @@ -224,6 +225,7 @@ public class AlihealthBusServiceImpl implements AlihealthBusService { List productRequests = new ArrayList<>(); for (YcFileOrderUploadVo orderUploadVo : orderList) { AddBizProductReqeust productRequest = buildProductRequest(orderUploadVo, orderEntity, bizProductRequest.getFromCorp()); + productRequest.setSalesInvoiceNumberSecondTicket(orderUploadVo.getSalesInvoiceNumberSecondTicket()); productRequests.add(productRequest); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index e159eb84..13fd0422 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -10,6 +10,8 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.inout.IoOrderDetailBizDao; +import com.glxp.api.dao.inout.IoOrderDetailCodeDao; +import com.glxp.api.dao.inout.IoOrderInvoiceMapper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; @@ -17,12 +19,14 @@ import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.entity.inout.IoOrderEntity; +import com.glxp.api.entity.inout.IoOrderInvoiceEntity; import com.glxp.api.entity.purchase.SupCertEntity; import com.glxp.api.entity.purchase.SupProductEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.req.inout.AddBizProductReqeust; import com.glxp.api.req.inout.FilterOrderDetailBizRequest; import com.glxp.api.req.inout.FilterOrderDetailCodeRequest; +import com.glxp.api.req.inout.IoOrderInvoiceRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.inout.IoOrderDetailBizResponse; import com.glxp.api.res.inout.IoOrderDetailCodeResponse; @@ -41,6 +45,7 @@ import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.purchase.SupCertService; import com.glxp.api.service.purchase.SupProductService; import com.glxp.api.service.system.SystemParamConfigService; +import com.glxp.api.util.DateUtil; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.IntUtil; import com.glxp.api.util.OrderNoTypeBean; @@ -60,7 +65,10 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { @Resource IoOrderDetailBizDao ioOrderDetailBizDao; - + @Resource + IoOrderInvoiceMapper ioOrderInvoiceMapper; + @Resource + IoOrderDetailCodeDao orderDetailCodeDao; @Override public IoOrderDetailBizEntity selectById(Long id) { return ioOrderDetailBizDao.selectById(id); @@ -294,6 +302,8 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { SystemParamConfigService systemParamConfigService; @Resource SupCertService supCertService; + @Resource + IoOrderInvoiceService ioOrderInvoiceService; @Override @@ -445,8 +455,44 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { ioOrderDetailBizEntity.setSupId(item.getSupId()); ioOrderDetailBizEntity.setYcBizNo(item.getYcBizNo()); if (item.getCount() != null) ioOrderDetailBizEntity.setCount(item.getCount()); - + String salesInvoiceNumberSecondTicket = item.getSalesInvoiceNumberSecondTicket(); + if (StrUtil.isNotEmpty(salesInvoiceNumberSecondTicket)){ + ioOrderDetailBizEntity.setRegStatus(true); + } this.insert(ioOrderDetailBizEntity); + + //补充发票号 + + if (StrUtil.isNotEmpty(salesInvoiceNumberSecondTicket)){ + + IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity(); + ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailBizEntity.getOrderIdFk()); + ioOrderInvoiceEntity.setBindRlFk(ioOrderDetailBizEntity.getBindRlFk() + ""); + ioOrderInvoiceEntity.setBatchNo(ioOrderDetailBizEntity.getBatchNo()); + ioOrderInvoiceEntity.setProductDate(ioOrderDetailBizEntity.getProductDate()); + ioOrderInvoiceEntity.setExpireDate(ioOrderDetailBizEntity.getExpireDate()); + ioOrderInvoiceEntity.setBizIdFk(ioOrderDetailBizEntity.getId()); + ioOrderInvoiceEntity.setCreateTime(new Date()); + ioOrderInvoiceEntity.setUpdateTime(new Date()); + ioOrderInvoiceEntity.setId(IdUtil.getSnowflakeNextId()); + ioOrderInvoiceEntity.setMachineNo(null); + ioOrderInvoiceEntity.setInvoiceCode(null); + ioOrderInvoiceEntity.setInvoiceEncode(salesInvoiceNumberSecondTicket); + ioOrderInvoiceEntity.setInvoiceDate(DateUtil.getDate()); + ioOrderInvoiceEntity.setPrice(String.valueOf(item.getPrice())); + ioOrderInvoiceEntity.setRemark(""); + ioOrderInvoiceEntity.setLicenseUrl(""); + boolean b = ioOrderInvoiceService.insertInvoice(ioOrderInvoiceEntity); + + +// if (CollUtil.isNotEmpty(orderInvoiceEntities)) { +// orderDetailCodeEntity.setRegStatus(true); +// } else { +// orderDetailCodeEntity.setRegStatus(false); +// } +// orderDetailCodeDao.updateById(orderDetailCodeEntity); + } + } orderEntity.setUpdateTime(new Date());