From 3d4907f49cafa536b6c1c687109327bc403b510a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com> Date: Fri, 17 Apr 2026 09:29:27 +0800 Subject: [PATCH] =?UTF-8?q?oms=E4=B8=8Ebms=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BmsInvoiceListServiceImpl.java | 36 +++++++++++++++---- .../repository/todo/BmsInvoiceListAddDTO.java | 3 ++ .../resources/mapper/BmsInvoiceListMapper.xml | 10 ++++-- .../entity/BusinessDocumentOrder.java | 3 ++ .../BusinessDocumentOrderImpl.java | 1 + .../po/BusinessDocumentOrderPO.java | 3 ++ .../todo/BusinessDocumentOrderDO.java | 3 ++ .../executeOrder/entity/ExecuteOrder.java | 3 ++ .../repository/po/ExecuteOrderPO.java | 4 +++ .../repository/todo/ExecuteOrderDO.java | 3 ++ .../BusinessDocumentOrderDTO.java | 3 ++ .../dto/executeOrder/ExecuteOrderDTO.java | 3 ++ 12 files changed, 67 insertions(+), 8 deletions(-) diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/persistence/BmsInvoiceListServiceImpl.java b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/persistence/BmsInvoiceListServiceImpl.java index a766acff2..2b058e5a3 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/persistence/BmsInvoiceListServiceImpl.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/persistence/BmsInvoiceListServiceImpl.java @@ -2,6 +2,7 @@ package com.mhd.bms.domain.bmsInvoiceList.repository.persistence; import cn.hutool.core.util.ObjectUtil; import com.aliyun.oss.ServiceException; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -184,12 +185,22 @@ public class BmsInvoiceListServiceImpl extends ServiceImpl billManageIds = bmsInvoiceListAddDTO.getBillManageIds(); + List billManages = billManageMapper.selectList(new LambdaQueryWrapper().in(BillManage::getBillManageId, billManageIds)); + if (billManages != null && billManages.size() > 0) { + for (BillManage billManage : billManages) { + billManage.setIsInvoice(1); + billManage.setInvoiceId(bmsInvoiceList.getId().toString()); + billManage.setApplyNumber(bmsInvoiceList.getApplyNumber()); + billManageMapper.updateById(billManage); + } } /*AjaxResult ajaxResult = financeServiceFeign.editIsInvoice(transportationId,1,bmsInvoiceList.getId(),"",bmsInvoiceList.getApplyNumber()); if(!"200".equals(String.valueOf(ajaxResult.get("code")))){ @@ -466,6 +477,19 @@ public class BmsInvoiceListServiceImpl extends ServiceImpl billManages = billManageMapper.selectList(new QueryWrapper().lambda().eq(BillManage::getInvoiceId, id.toString())); + if (ObjectUtil.isNotNull(billManages) && billManages.size() > 0) { + for (BillManage billManage : billManages) { + if (bmsInvoiceListInvoiceStateDTO.getInvoiceState() ==5){ + billManage.setIsInvoice(5); + } + if (bmsInvoiceListInvoiceStateDTO.getInvoiceState() == 3){ + billManage.setIsInvoice(4); + } + billManageMapper.updateById(billManage); + } + } return bmsInvoiceList.getInvoiceState(); } diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/todo/BmsInvoiceListAddDTO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/todo/BmsInvoiceListAddDTO.java index 76935b6a7..9786f26ff 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/todo/BmsInvoiceListAddDTO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/todo/BmsInvoiceListAddDTO.java @@ -76,5 +76,8 @@ public class BmsInvoiceListAddDTO implements Serializable { private String settlementEntity; private List bmsMakeOutInvoices; + @ApiModelProperty(value = "对账单id列表") + @Excel(name = "对账单id列表", width = 15) + private List billManageIds; } \ No newline at end of file diff --git a/mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml b/mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml index 04aece942..4f2eb2a0a 100644 --- a/mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml +++ b/mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml @@ -144,8 +144,14 @@ a.tracking_number, a.apply_number, a.company_name as companyName, - b.bill_number as billNumber, - b.bill_manage_id as billManageId, +-- b.bill_number as billNumber, +-- b.bill_manage_id as billManageId, + (SELECT LISTAGG(bill_number, ', ') WITHIN GROUP (ORDER BY bill_number) + FROM BILL_MANAGE b_sub + WHERE b_sub.apply_number = a.apply_number) as billNumber, + (SELECT LISTAGG(bill_manage_id, ', ') WITHIN GROUP (ORDER BY bill_manage_id) + FROM BILL_MANAGE b_sub + WHERE b_sub.apply_number = a.apply_number) as billManageId, a.SETTLEMENT_CURRENCY as settlementCurrency, a.organization_id AS organizationId, a.organization_name AS organizationName, diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/entity/BusinessDocumentOrder.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/entity/BusinessDocumentOrder.java index f0df40b7b..36cf856eb 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/entity/BusinessDocumentOrder.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/entity/BusinessDocumentOrder.java @@ -741,6 +741,9 @@ public class BusinessDocumentOrder extends BaseVOEntity{ @ApiModelProperty(value = "订单来源") private String orderSource; + @ApiModelProperty("预计出发日期") + private Date layDate; + @ApiModelProperty(value = "出入库单号") private String entryNumber; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java index 8e8602a46..93c1563d5 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java @@ -182,6 +182,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl executeOrderList; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java index 88ffbbf7e..0d54d110a 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java @@ -739,6 +739,9 @@ public class BusinessDocumentOrderDO extends BaseVOEntity{ @ApiModelProperty("收款账户id") private String paymentAccountId; + @ApiModelProperty("预计出发日期") + private Date layDate; + @ApiModelProperty("收款账户信息") private String accountInformation; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/entity/ExecuteOrder.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/entity/ExecuteOrder.java index 45fad0685..e355ffd06 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/entity/ExecuteOrder.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/entity/ExecuteOrder.java @@ -103,6 +103,9 @@ public class ExecuteOrder extends BaseVOEntity{ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private String dischargerName; + @ApiModelProperty("预计出发日期") + private Date layDate; + @ApiModelProperty( "下发状态 0-无状态 1-未下发 2-已下发 ") diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java index 6c1a7a15d..88fdd2cfd 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java @@ -185,6 +185,10 @@ public class ExecuteOrderPO extends BaseVOEntity{ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private String loadingLatitude; + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date layDate; + @ApiModelProperty("$column.columnComment") @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private String loadingUnit; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java index cce380127..f7f4b098f 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java @@ -112,6 +112,9 @@ public class ExecuteOrderDO extends BaseVOEntity{ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private String loadingName; + @ApiModelProperty("预计出发日期") + private Date layDate; + @ApiModelProperty(name = "组织ID集合") private List organizationIdList; diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java index 86835f170..646294525 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java @@ -765,6 +765,9 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{ @ApiModelProperty(value = "出入库单号") private String entryNumber; + @ApiModelProperty("预计出发日期") + private Date layDate; + @ApiModelProperty("业务单地址集合") private List businessDocumentAddressMultiDTOList; diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java index 9d74bd988..a6060fa94 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java @@ -128,4 +128,7 @@ public class ExecuteOrderDTO extends BaseVOEntity{ @ApiModelProperty("备注") private String shippingNote; + + @ApiModelProperty("预计出发日期") + private Date layDate; }