From 79ca006214d807b5721e1518be30bc9cdfbefc64 Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Tue, 27 Jan 2026 11:03:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E5=92=8C=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E5=8D=95=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ocumentAddressMultiApplicationService.java | 72 ++ ...sDocumentCargoMultiApplicationService.java | 72 ++ ...sinessDocumentOrderApplicationService.java | 81 ++ .../ExecuteOrderApplicationService.java | 72 ++ .../entity/BusinessDocumentAddressMulti.java | 99 +++ .../IBusinessDocumentAddressMultiService.java | 43 ++ .../BusinessDocumentAddressMultiMapper.java | 22 + .../BusinessDocumentAddressMultiImpl.java | 81 ++ .../po/BusinessDocumentAddressMultiPO.java | 99 +++ .../todo/BusinessDocumentAddressMultiDO.java | 102 +++ ...nessDocumentAddressMultiDomainService.java | 64 ++ .../entity/BusinessDocumentCargoMulti.java | 67 ++ .../IBusinessDocumentCargoMultiService.java | 43 ++ .../BusinessDocumentCargoMultiMapper.java | 22 + .../BusinessDocumentCargoMultiImpl.java | 81 ++ .../po/BusinessDocumentCargoMultiPO.java | 67 ++ .../todo/BusinessDocumentCargoMultiDO.java | 70 ++ ...sinessDocumentCargoMultiDomainService.java | 64 ++ .../entity/BusinessDocumentOrder.java | 691 +++++++++++++++++ .../facade/IBusinessDocumentOrderService.java | 47 ++ .../mapper/BusinessDocumentOrderMapper.java | 22 + .../BusinessDocumentOrderImpl.java | 144 ++++ .../po/BusinessDocumentOrderPO.java | 693 +++++++++++++++++ .../todo/BusinessDocumentOrderDO.java | 698 +++++++++++++++++ .../BusinessDocumentOrderDomainService.java | 71 ++ .../executeOrder/entity/ExecuteOrder.java | 71 ++ .../facade/IExecuteOrderService.java | 43 ++ .../repository/mapper/ExecuteOrderMapper.java | 22 + .../persistence/ExecuteOrderImpl.java | 81 ++ .../repository/po/ExecuteOrderPO.java | 71 ++ .../repository/todo/ExecuteOrderDO.java | 74 ++ .../service/ExecuteOrderDomainService.java | 64 ++ ...BusinessDocumentAddressMultiAssembler.java | 65 ++ .../BusinessDocumentCargoMultiAssembler.java | 65 ++ .../BusinessDocumentOrderAssembler.java | 65 ++ .../executeOrder/ExecuteOrderAssembler.java | 65 ++ .../BusinessDocumentAddressMultiDTO.java | 102 +++ .../BusinessDocumentCargoMultiDTO.java | 70 ++ .../BusinessDocumentOrderDTO.java | 699 ++++++++++++++++++ .../dto/executeOrder/ExecuteOrderDTO.java | 74 ++ .../BusinessDocumentAddressMultiApi.java | 99 +++ .../BusinessDocumentCargoMultiApi.java | 99 +++ .../BusinessDocumentOrderApi.java | 109 +++ .../facade/executeOrder/ExecuteOrderApi.java | 99 +++ .../BusinessDocumentAddressMultiMapper.xml | 124 ++++ .../BusinessDocumentCargoMultiMapper.xml | 92 +++ .../BusinessDocumentOrderMapper.xml | 676 +++++++++++++++++ .../executeOrder/ExecuteOrderMapper.xml | 88 +++ 48 files changed, 6604 insertions(+) create mode 100644 mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentAddressMulti/BusinessDocumentAddressMultiApplicationService.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentCargoMulti/BusinessDocumentCargoMultiApplicationService.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/application/service/executeOrder/ExecuteOrderApplicationService.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/entity/BusinessDocumentAddressMulti.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/repository/facade/IBusinessDocumentAddressMultiService.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/repository/mapper/BusinessDocumentAddressMultiMapper.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/repository/persistence/BusinessDocumentAddressMultiImpl.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/repository/po/BusinessDocumentAddressMultiPO.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/repository/todo/BusinessDocumentAddressMultiDO.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/service/BusinessDocumentAddressMultiDomainService.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/entity/BusinessDocumentCargoMulti.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/facade/IBusinessDocumentCargoMultiService.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/mapper/BusinessDocumentCargoMultiMapper.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/persistence/BusinessDocumentCargoMultiImpl.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/po/BusinessDocumentCargoMultiPO.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/todo/BusinessDocumentCargoMultiDO.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/service/BusinessDocumentCargoMultiDomainService.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/entity/BusinessDocumentOrder.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/facade/IBusinessDocumentOrderService.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/mapper/BusinessDocumentOrderMapper.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/entity/ExecuteOrder.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/facade/IExecuteOrderService.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/mapper/ExecuteOrderMapper.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/service/ExecuteOrderDomainService.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/interfaces/assembler/businessDocumentAddressMulti/BusinessDocumentAddressMultiAssembler.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/interfaces/assembler/businessDocumentCargoMulti/BusinessDocumentCargoMultiAssembler.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/interfaces/assembler/businessDocumentOrder/BusinessDocumentOrderAssembler.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/interfaces/assembler/executeOrder/ExecuteOrderAssembler.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentAddressMulti/BusinessDocumentAddressMultiDTO.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentCargoMulti/BusinessDocumentCargoMultiDTO.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentAddressMulti/BusinessDocumentAddressMultiApi.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentCargoMulti/BusinessDocumentCargoMultiApi.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentOrder/BusinessDocumentOrderApi.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executeOrder/ExecuteOrderApi.java create mode 100644 mhd_oms/src/main/resources/mapper/businessDocumentAddressMulti/BusinessDocumentAddressMultiMapper.xml create mode 100644 mhd_oms/src/main/resources/mapper/businessDocumentCargoMulti/BusinessDocumentCargoMultiMapper.xml create mode 100644 mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml create mode 100644 mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentAddressMulti/BusinessDocumentAddressMultiApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentAddressMulti/BusinessDocumentAddressMultiApplicationService.java new file mode 100644 index 000000000..7be36a435 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentAddressMulti/BusinessDocumentAddressMultiApplicationService.java @@ -0,0 +1,72 @@ +package com.mhd.oms.application.service.businessDocumentAddressMulti; + +import com.mhd.oms.domain.businessDocumentAddressMulti.repository.po.BusinessDocumentAddressMultiPO; +import com.mhd.oms.domain.businessDocumentAddressMulti.repository.todo.BusinessDocumentAddressMultiDO; +import com.mhd.oms.domain.businessDocumentAddressMulti.service.BusinessDocumentAddressMultiDomainService; +import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.system.api.model.LoginUser; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.List; +/** + * 【请填写功能名称】ApplicationService + * + * @author gen + * @date 2026-01-26 + */ +@Service +@Slf4j +public class BusinessDocumentAddressMultiApplicationService { + @Autowired + private BusinessDocumentAddressMultiDomainService businessDocumentAddressMultiDomainService; + + + /** + * 分页查询【请填写功能名称】列表 + */ + + public List queryList(BusinessDocumentAddressMultiDO businessDocumentAddressMultiDO) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (loginUser != null){ + Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); + if (topOrganizationId != null && topOrganizationId != 1){ + businessDocumentAddressMultiDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); + } + } + return businessDocumentAddressMultiDomainService.queryList(businessDocumentAddressMultiDO); + } + + + /** + * 新增【请填写功能名称】 + */ + public Boolean insert(BusinessDocumentAddressMultiDO businessDocumentAddressMultiDO) { + + return businessDocumentAddressMultiDomainService.insert(businessDocumentAddressMultiDO); + } + + /** + * 修改【请填写功能名称】 + */ + public Boolean update(BusinessDocumentAddressMultiDO businessDocumentAddressMultiDO) { + return businessDocumentAddressMultiDomainService.update(businessDocumentAddressMultiDO); + } + + /** + * 批量删除【请填写功能名称】 + */ + public boolean delete(Long[] ids) { + return businessDocumentAddressMultiDomainService.delete(ids); + } + + /** + * 获取【请填写功能名称】详细信息 + */ + public BusinessDocumentAddressMultiPO getInfo(Long id) + { + return businessDocumentAddressMultiDomainService.getInfo(id); + } + + +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentCargoMulti/BusinessDocumentCargoMultiApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentCargoMulti/BusinessDocumentCargoMultiApplicationService.java new file mode 100644 index 000000000..0ba35bd8a --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentCargoMulti/BusinessDocumentCargoMultiApplicationService.java @@ -0,0 +1,72 @@ +package com.mhd.oms.application.service.businessDocumentCargoMulti; + +import com.mhd.oms.domain.businessDocumentCargoMulti.repository.po.BusinessDocumentCargoMultiPO; +import com.mhd.oms.domain.businessDocumentCargoMulti.repository.todo.BusinessDocumentCargoMultiDO; +import com.mhd.oms.domain.businessDocumentCargoMulti.service.BusinessDocumentCargoMultiDomainService; +import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.system.api.model.LoginUser; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.List; +/** + * 【请填写功能名称】ApplicationService + * + * @author gen + * @date 2026-01-26 + */ +@Service +@Slf4j +public class BusinessDocumentCargoMultiApplicationService { + @Autowired + private BusinessDocumentCargoMultiDomainService businessDocumentCargoMultiDomainService; + + + /** + * 分页查询【请填写功能名称】列表 + */ + + public List queryList(BusinessDocumentCargoMultiDO businessDocumentCargoMultiDO) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (loginUser != null){ + Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); + if (topOrganizationId != null && topOrganizationId != 1){ + businessDocumentCargoMultiDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); + } + } + return businessDocumentCargoMultiDomainService.queryList(businessDocumentCargoMultiDO); + } + + + /** + * 新增【请填写功能名称】 + */ + public Boolean insert(BusinessDocumentCargoMultiDO businessDocumentCargoMultiDO) { + + return businessDocumentCargoMultiDomainService.insert(businessDocumentCargoMultiDO); + } + + /** + * 修改【请填写功能名称】 + */ + public Boolean update(BusinessDocumentCargoMultiDO businessDocumentCargoMultiDO) { + return businessDocumentCargoMultiDomainService.update(businessDocumentCargoMultiDO); + } + + /** + * 批量删除【请填写功能名称】 + */ + public boolean delete(Long[] ids) { + return businessDocumentCargoMultiDomainService.delete(ids); + } + + /** + * 获取【请填写功能名称】详细信息 + */ + public BusinessDocumentCargoMultiPO getInfo(Long id) + { + return businessDocumentCargoMultiDomainService.getInfo(id); + } + + +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java new file mode 100644 index 000000000..4613747bb --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java @@ -0,0 +1,81 @@ +package com.mhd.oms.application.service.businessDocumentOrder; + +import com.mhd.oms.domain.businessDocumentOrder.repository.po.BusinessDocumentOrderPO; +import com.mhd.oms.domain.businessDocumentOrder.repository.todo.BusinessDocumentOrderDO; +import com.mhd.oms.domain.businessDocumentOrder.service.BusinessDocumentOrderDomainService; +import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.system.api.model.LoginUser; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; +/** + * 【请填写功能名称】ApplicationService + * + * @author gen + * @date 2026-01-26 + */ +@Service +@Slf4j +public class BusinessDocumentOrderApplicationService { + @Autowired + private BusinessDocumentOrderDomainService businessDocumentOrderDomainService; + + + /** + * 分页查询【请填写功能名称】列表 + */ + + public List queryList(BusinessDocumentOrderDO businessDocumentOrderDO) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (loginUser != null){ + Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); + if (topOrganizationId != null && topOrganizationId != 1){ + businessDocumentOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); + } + } + return businessDocumentOrderDomainService.queryList(businessDocumentOrderDO); + } + + + /** + * 新增【请填写功能名称】 + */ + public Boolean insert(BusinessDocumentOrderDO businessDocumentOrderDO) { + + return businessDocumentOrderDomainService.insert(businessDocumentOrderDO); + } + + /** + * 修改【请填写功能名称】 + */ + public Boolean update(BusinessDocumentOrderDO businessDocumentOrderDO) { + return businessDocumentOrderDomainService.update(businessDocumentOrderDO); + } + + /** + * 批量删除【请填写功能名称】 + */ + public boolean delete(Long[] ids) { + return businessDocumentOrderDomainService.delete(ids); + } + + /** + * 获取【请填写功能名称】详细信息 + */ + public BusinessDocumentOrderPO getInfo(Long id) + { + return businessDocumentOrderDomainService.getInfo(id); + } + + public BusinessDocumentOrderPO audit( Long id, Long reviewStatus) + { + return businessDocumentOrderDomainService.audit(id,reviewStatus); + } + public boolean execute(Long[] ids) { + return businessDocumentOrderDomainService.execute(ids); + } + +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/executeOrder/ExecuteOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/executeOrder/ExecuteOrderApplicationService.java new file mode 100644 index 000000000..ec5df5c08 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/executeOrder/ExecuteOrderApplicationService.java @@ -0,0 +1,72 @@ +package com.mhd.oms.application.service.executeOrder; + +import com.mhd.oms.domain.executeOrder.repository.po.ExecuteOrderPO; +import com.mhd.oms.domain.executeOrder.repository.todo.ExecuteOrderDO; +import com.mhd.oms.domain.executeOrder.service.ExecuteOrderDomainService; +import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.system.api.model.LoginUser; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.List; +/** + * 【请填写功能名称】ApplicationService + * + * @author gen + * @date 2026-01-27 + */ +@Service +@Slf4j +public class ExecuteOrderApplicationService { + @Autowired + private ExecuteOrderDomainService executeOrderDomainService; + + + /** + * 分页查询【请填写功能名称】列表 + */ + + public List queryList(ExecuteOrderDO executeOrderDO) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (loginUser != null){ + Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); + if (topOrganizationId != null && topOrganizationId != 1){ + executeOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); + } + } + return executeOrderDomainService.queryList(executeOrderDO); + } + + + /** + * 新增【请填写功能名称】 + */ + public Boolean insert(ExecuteOrderDO executeOrderDO) { + + return executeOrderDomainService.insert(executeOrderDO); + } + + /** + * 修改【请填写功能名称】 + */ + public Boolean update(ExecuteOrderDO executeOrderDO) { + return executeOrderDomainService.update(executeOrderDO); + } + + /** + * 批量删除【请填写功能名称】 + */ + public boolean delete(Long[] ids) { + return executeOrderDomainService.delete(ids); + } + + /** + * 获取【请填写功能名称】详细信息 + */ + public ExecuteOrderPO getInfo(Long id) + { + return executeOrderDomainService.getInfo(id); + } + + +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/entity/BusinessDocumentAddressMulti.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/entity/BusinessDocumentAddressMulti.java new file mode 100644 index 000000000..b1f54c9dd --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/entity/BusinessDocumentAddressMulti.java @@ -0,0 +1,99 @@ +package com.mhd.oms.domain.businessDocumentAddressMulti.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.mhd.common.core.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import com.mhd.common.core.web.domain.BaseVOEntity; +import java.math.BigDecimal; +import lombok.Data; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + + +/** + * 【请填写功能名称】对象 business_document_address_multi + * + * @author gen + * @date 2026-01-26 + */ + +@Data +public class BusinessDocumentAddressMulti extends BaseVOEntity{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long organizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String organizationName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long topOrganizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String orderId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String areaCode; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String areaName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String address; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String longitude; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String latitude; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String contactName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String contactPhone; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date layDate; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String layTime; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String layTimeId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long layType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long sort; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String shortName; + + +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/repository/facade/IBusinessDocumentAddressMultiService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/repository/facade/IBusinessDocumentAddressMultiService.java new file mode 100644 index 000000000..e46fcbb5f --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/repository/facade/IBusinessDocumentAddressMultiService.java @@ -0,0 +1,43 @@ +package com.mhd.oms.domain.businessDocumentAddressMulti.repository.facade; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.mhd.oms.domain.businessDocumentAddressMulti.entity.BusinessDocumentAddressMulti; +import com.mhd.oms.domain.businessDocumentAddressMulti.repository.po.BusinessDocumentAddressMultiPO; +import com.mhd.oms.domain.businessDocumentAddressMulti.repository.todo.BusinessDocumentAddressMultiDO; + +import java.util.List; + +/** + * 【请填写功能名称】Service接口 + * + * @author gen + * @date 2026-01-26 + */ +public interface IBusinessDocumentAddressMultiService extends IService +{ + /** + * 分页查询【请填写功能名称】列表 + */ + public List queryList(BusinessDocumentAddressMultiDO businessDocumentAddressMultiDO); + + /** + * 新增【请填写功能名称】 + */ + public Boolean insert(BusinessDocumentAddressMultiDO businessDocumentAddressMultiDO); + + /** + * 修改【请填写功能名称】 + */ + public Boolean update(BusinessDocumentAddressMultiDO businessDocumentAddressMultiDO); + + /** + * 批量删除【请填写功能名称】 + */ + public Boolean delete(Long[] ids); + + + /** + * 查询【请填写功能名称】 + */ + public BusinessDocumentAddressMultiPO getInfo(Long id); +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/repository/mapper/BusinessDocumentAddressMultiMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/repository/mapper/BusinessDocumentAddressMultiMapper.java new file mode 100644 index 000000000..2877b2ed3 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/repository/mapper/BusinessDocumentAddressMultiMapper.java @@ -0,0 +1,22 @@ +package com.mhd.oms.domain.businessDocumentAddressMulti.repository.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.mhd.oms.domain.businessDocumentAddressMulti.entity.BusinessDocumentAddressMulti; +import com.mhd.oms.domain.businessDocumentAddressMulti.repository.po.BusinessDocumentAddressMultiPO; +import com.mhd.oms.domain.businessDocumentAddressMulti.repository.todo.BusinessDocumentAddressMultiDO; +import org.apache.ibatis.annotations.Param; +/** + * 【请填写功能名称】Mapper接口 + * + * @author gen + * @date 2026-01-26 + */ +public interface BusinessDocumentAddressMultiMapper extends BaseMapper +{ + /** + * 查询【请填写功能名称】列表 + */ + public List queryList(BusinessDocumentAddressMultiDO businessDocumentAddressMultiDO); + +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/repository/persistence/BusinessDocumentAddressMultiImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/repository/persistence/BusinessDocumentAddressMultiImpl.java new file mode 100644 index 000000000..9a0a3cac0 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/repository/persistence/BusinessDocumentAddressMultiImpl.java @@ -0,0 +1,81 @@ +package com.mhd.oms.domain.businessDocumentAddressMulti.repository.persistence; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.mhd.oms.domain.businessDocumentAddressMulti.entity.BusinessDocumentAddressMulti; +import com.mhd.oms.domain.businessDocumentAddressMulti.repository.facade.IBusinessDocumentAddressMultiService; +import com.mhd.oms.domain.businessDocumentAddressMulti.repository.mapper.BusinessDocumentAddressMultiMapper; +import com.mhd.oms.domain.businessDocumentAddressMulti.repository.po.BusinessDocumentAddressMultiPO; +import com.mhd.oms.domain.businessDocumentAddressMulti.repository.todo.BusinessDocumentAddressMultiDO; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * 【请填写功能名称】Service业务层处理 + * + * @author gen + * @date 2026-01-26 + */ +@Service +public class BusinessDocumentAddressMultiImpl extends ServiceImpl implements IBusinessDocumentAddressMultiService{ + @Autowired + private BusinessDocumentAddressMultiMapper businessDocumentAddressMultiMapper; + + /** + * 查询【请填写功能名称】列表 + */ + @Override + public List queryList(BusinessDocumentAddressMultiDO businessDocumentAddressMultiDO) + { + return businessDocumentAddressMultiMapper.queryList(businessDocumentAddressMultiDO); + } + + /** + * 新增【请填写功能名称】 + */ + @Override + public Boolean insert(BusinessDocumentAddressMultiDO businessDocumentAddressMultiDO) { + BusinessDocumentAddressMulti businessDocumentAddressMulti = new BusinessDocumentAddressMulti(); + BeanUtils.copyProperties(businessDocumentAddressMultiDO,businessDocumentAddressMulti); + return this.save(businessDocumentAddressMulti); + } + + /** + * 修改【请填写功能名称】 + */ + @Override + public Boolean update(BusinessDocumentAddressMultiDO businessDocumentAddressMultiDO) { + BusinessDocumentAddressMulti businessDocumentAddressMulti = new BusinessDocumentAddressMulti(); + BeanUtils.copyProperties(businessDocumentAddressMultiDO,businessDocumentAddressMulti); + return this.updateById(businessDocumentAddressMulti); + } + + /** + * 批量删除【请填写功能名称】 + */ + @Override + public Boolean delete(Long[] ids ) { + List list = new ArrayList<>(); + for (Long id : ids) { + BusinessDocumentAddressMulti businessDocumentAddressMulti = new BusinessDocumentAddressMulti(); + businessDocumentAddressMulti.setId(id); + businessDocumentAddressMulti.setDelFlag(2); + list.add(businessDocumentAddressMulti); + } + return this.updateBatchById(list); + } + + /** + * 修改【请填写功能名称】 + */ + @Override + public BusinessDocumentAddressMultiPO getInfo(Long id) { + BusinessDocumentAddressMulti businessDocumentAddressMulti = this.getById(id); + BusinessDocumentAddressMultiPO businessDocumentAddressMultiPO = new BusinessDocumentAddressMultiPO(); + BeanUtils.copyProperties(businessDocumentAddressMulti,businessDocumentAddressMultiPO); + return businessDocumentAddressMultiPO; + } +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/repository/po/BusinessDocumentAddressMultiPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/repository/po/BusinessDocumentAddressMultiPO.java new file mode 100644 index 000000000..6eb125fc8 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/repository/po/BusinessDocumentAddressMultiPO.java @@ -0,0 +1,99 @@ +package com.mhd.oms.domain.businessDocumentAddressMulti.repository.po; + +import com.mhd.common.core.annotation.Excel; +import lombok.Data; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.math.BigDecimal; +import com.mhd.common.core.web.domain.BaseVOEntity; + + +/** + * 【请填写功能名称】对象 business_document_address_multi + * + * @author gen + * @date 2026-01-26 + */ + +@Data +@ApiModel(value = "【请填写功能名称】对象", description = "【请填写功能名称】响应对象") +public class BusinessDocumentAddressMultiPO extends BaseVOEntity{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long id; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long organizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String organizationName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long topOrganizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String orderId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String areaCode; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String areaName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String address; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String longitude; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String latitude; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String contactName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String contactPhone; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date layDate; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String layTime; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String layTimeId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long layType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long sort; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String shortName; + + + +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/repository/todo/BusinessDocumentAddressMultiDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/repository/todo/BusinessDocumentAddressMultiDO.java new file mode 100644 index 000000000..dc0895c55 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/repository/todo/BusinessDocumentAddressMultiDO.java @@ -0,0 +1,102 @@ +package com.mhd.oms.domain.businessDocumentAddressMulti.repository.todo; + +import com.mhd.common.core.annotation.Excel; +import lombok.Data; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.math.BigDecimal; +import io.swagger.annotations.ApiModelProperty; +import com.mhd.common.core.web.domain.BaseVOEntity; + +import java.util.List; + + +/** + * 【请填写功能名称】对象 business_document_address_multi + * + * @author gen + * @date 2026-01-26 + */ + +@Data +public class BusinessDocumentAddressMultiDO extends BaseVOEntity{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long id; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long organizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String organizationName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long topOrganizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String orderId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String areaCode; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String areaName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String address; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String longitude; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String latitude; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String contactName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String contactPhone; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date layDate; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String layTime; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String layTimeId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long layType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long sort; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String shortName; + + @ApiModelProperty(name = "组织ID集合") + private List organizationIdList; + + @ApiModelProperty(name = "权限菜单ID") + private Long permissionMenuId; +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/service/BusinessDocumentAddressMultiDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/service/BusinessDocumentAddressMultiDomainService.java new file mode 100644 index 000000000..4e8825a02 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentAddressMulti/service/BusinessDocumentAddressMultiDomainService.java @@ -0,0 +1,64 @@ +package com.mhd.oms.domain.businessDocumentAddressMulti.service; + +import com.mhd.oms.domain.businessDocumentAddressMulti.repository.facade.IBusinessDocumentAddressMultiService; +import com.mhd.oms.domain.businessDocumentAddressMulti.repository.po.BusinessDocumentAddressMultiPO; +import com.mhd.oms.domain.businessDocumentAddressMulti.repository.todo.BusinessDocumentAddressMultiDO; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +/** + * 【请填写功能名称】 + * + * @author gen + * @date 2026-01-26 + */ +@Service +@Slf4j +public class BusinessDocumentAddressMultiDomainService { + + @Autowired + private IBusinessDocumentAddressMultiService businessDocumentAddressMultiService; + + + /** + * 分页查询【请填写功能名称】列表 + */ + public List queryList(BusinessDocumentAddressMultiDO businessDocumentAddressMultiDO) { + return businessDocumentAddressMultiService.queryList(businessDocumentAddressMultiDO); + } + + + /** + * 新增【请填写功能名称】 + */ + public Boolean insert(BusinessDocumentAddressMultiDO businessDocumentAddressMultiDO) { + + return businessDocumentAddressMultiService.insert(businessDocumentAddressMultiDO); + } + + /** + * 修改【请填写功能名称】 + */ + public Boolean update(BusinessDocumentAddressMultiDO businessDocumentAddressMultiDO) { + return businessDocumentAddressMultiService.update(businessDocumentAddressMultiDO); + } + + /** + * 批量删除【请填写功能名称】 + */ + public Boolean delete(Long[] ids) { + return businessDocumentAddressMultiService.delete(ids); + } + + /** + * 获取【请填写功能名称】详细信息 + */ + public BusinessDocumentAddressMultiPO getInfo(Long id) + { + return businessDocumentAddressMultiService.getInfo(id); + } + + +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/entity/BusinessDocumentCargoMulti.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/entity/BusinessDocumentCargoMulti.java new file mode 100644 index 000000000..973f68838 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/entity/BusinessDocumentCargoMulti.java @@ -0,0 +1,67 @@ +package com.mhd.oms.domain.businessDocumentCargoMulti.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.mhd.common.core.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import com.mhd.common.core.web.domain.BaseVOEntity; +import java.math.BigDecimal; +import lombok.Data; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + + +/** + * 【请填写功能名称】对象 business_document_cargo_multi + * + * @author gen + * @date 2026-01-26 + */ + +@Data +public class BusinessDocumentCargoMulti extends BaseVOEntity{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long organizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String organizationName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long topOrganizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String layInfoId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsTypeId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsNameId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal cargoWeight; + + +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/facade/IBusinessDocumentCargoMultiService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/facade/IBusinessDocumentCargoMultiService.java new file mode 100644 index 000000000..b1e9bb4c4 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/facade/IBusinessDocumentCargoMultiService.java @@ -0,0 +1,43 @@ +package com.mhd.oms.domain.businessDocumentCargoMulti.repository.facade; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.mhd.oms.domain.businessDocumentCargoMulti.entity.BusinessDocumentCargoMulti; +import com.mhd.oms.domain.businessDocumentCargoMulti.repository.po.BusinessDocumentCargoMultiPO; +import com.mhd.oms.domain.businessDocumentCargoMulti.repository.todo.BusinessDocumentCargoMultiDO; + +import java.util.List; + +/** + * 【请填写功能名称】Service接口 + * + * @author gen + * @date 2026-01-26 + */ +public interface IBusinessDocumentCargoMultiService extends IService +{ + /** + * 分页查询【请填写功能名称】列表 + */ + public List queryList(BusinessDocumentCargoMultiDO businessDocumentCargoMultiDO); + + /** + * 新增【请填写功能名称】 + */ + public Boolean insert(BusinessDocumentCargoMultiDO businessDocumentCargoMultiDO); + + /** + * 修改【请填写功能名称】 + */ + public Boolean update(BusinessDocumentCargoMultiDO businessDocumentCargoMultiDO); + + /** + * 批量删除【请填写功能名称】 + */ + public Boolean delete(Long[] ids); + + + /** + * 查询【请填写功能名称】 + */ + public BusinessDocumentCargoMultiPO getInfo(Long id); +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/mapper/BusinessDocumentCargoMultiMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/mapper/BusinessDocumentCargoMultiMapper.java new file mode 100644 index 000000000..61430fe50 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/mapper/BusinessDocumentCargoMultiMapper.java @@ -0,0 +1,22 @@ +package com.mhd.oms.domain.businessDocumentCargoMulti.repository.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.mhd.oms.domain.businessDocumentCargoMulti.entity.BusinessDocumentCargoMulti; +import com.mhd.oms.domain.businessDocumentCargoMulti.repository.po.BusinessDocumentCargoMultiPO; +import com.mhd.oms.domain.businessDocumentCargoMulti.repository.todo.BusinessDocumentCargoMultiDO; +import org.apache.ibatis.annotations.Param; +/** + * 【请填写功能名称】Mapper接口 + * + * @author gen + * @date 2026-01-26 + */ +public interface BusinessDocumentCargoMultiMapper extends BaseMapper +{ + /** + * 查询【请填写功能名称】列表 + */ + public List queryList(BusinessDocumentCargoMultiDO businessDocumentCargoMultiDO); + +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/persistence/BusinessDocumentCargoMultiImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/persistence/BusinessDocumentCargoMultiImpl.java new file mode 100644 index 000000000..03391670f --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/persistence/BusinessDocumentCargoMultiImpl.java @@ -0,0 +1,81 @@ +package com.mhd.oms.domain.businessDocumentCargoMulti.repository.persistence; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.mhd.oms.domain.businessDocumentCargoMulti.entity.BusinessDocumentCargoMulti; +import com.mhd.oms.domain.businessDocumentCargoMulti.repository.facade.IBusinessDocumentCargoMultiService; +import com.mhd.oms.domain.businessDocumentCargoMulti.repository.mapper.BusinessDocumentCargoMultiMapper; +import com.mhd.oms.domain.businessDocumentCargoMulti.repository.po.BusinessDocumentCargoMultiPO; +import com.mhd.oms.domain.businessDocumentCargoMulti.repository.todo.BusinessDocumentCargoMultiDO; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * 【请填写功能名称】Service业务层处理 + * + * @author gen + * @date 2026-01-26 + */ +@Service +public class BusinessDocumentCargoMultiImpl extends ServiceImpl implements IBusinessDocumentCargoMultiService{ + @Autowired + private BusinessDocumentCargoMultiMapper businessDocumentCargoMultiMapper; + + /** + * 查询【请填写功能名称】列表 + */ + @Override + public List queryList(BusinessDocumentCargoMultiDO businessDocumentCargoMultiDO) + { + return businessDocumentCargoMultiMapper.queryList(businessDocumentCargoMultiDO); + } + + /** + * 新增【请填写功能名称】 + */ + @Override + public Boolean insert(BusinessDocumentCargoMultiDO businessDocumentCargoMultiDO) { + BusinessDocumentCargoMulti businessDocumentCargoMulti = new BusinessDocumentCargoMulti(); + BeanUtils.copyProperties(businessDocumentCargoMultiDO,businessDocumentCargoMulti); + return this.save(businessDocumentCargoMulti); + } + + /** + * 修改【请填写功能名称】 + */ + @Override + public Boolean update(BusinessDocumentCargoMultiDO businessDocumentCargoMultiDO) { + BusinessDocumentCargoMulti businessDocumentCargoMulti = new BusinessDocumentCargoMulti(); + BeanUtils.copyProperties(businessDocumentCargoMultiDO,businessDocumentCargoMulti); + return this.updateById(businessDocumentCargoMulti); + } + + /** + * 批量删除【请填写功能名称】 + */ + @Override + public Boolean delete(Long[] ids ) { + List list = new ArrayList<>(); + for (Long id : ids) { + BusinessDocumentCargoMulti businessDocumentCargoMulti = new BusinessDocumentCargoMulti(); + businessDocumentCargoMulti.setId(id); + businessDocumentCargoMulti.setDelFlag(2); + list.add(businessDocumentCargoMulti); + } + return this.updateBatchById(list); + } + + /** + * 修改【请填写功能名称】 + */ + @Override + public BusinessDocumentCargoMultiPO getInfo(Long id) { + BusinessDocumentCargoMulti businessDocumentCargoMulti = this.getById(id); + BusinessDocumentCargoMultiPO businessDocumentCargoMultiPO = new BusinessDocumentCargoMultiPO(); + BeanUtils.copyProperties(businessDocumentCargoMulti,businessDocumentCargoMultiPO); + return businessDocumentCargoMultiPO; + } +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/po/BusinessDocumentCargoMultiPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/po/BusinessDocumentCargoMultiPO.java new file mode 100644 index 000000000..4b635ffe5 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/po/BusinessDocumentCargoMultiPO.java @@ -0,0 +1,67 @@ +package com.mhd.oms.domain.businessDocumentCargoMulti.repository.po; + +import com.mhd.common.core.annotation.Excel; +import lombok.Data; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.math.BigDecimal; +import com.mhd.common.core.web.domain.BaseVOEntity; + + +/** + * 【请填写功能名称】对象 business_document_cargo_multi + * + * @author gen + * @date 2026-01-26 + */ + +@Data +@ApiModel(value = "【请填写功能名称】对象", description = "【请填写功能名称】响应对象") +public class BusinessDocumentCargoMultiPO extends BaseVOEntity{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long id; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long organizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String organizationName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long topOrganizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String layInfoId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsTypeId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsNameId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal cargoWeight; + + + +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/todo/BusinessDocumentCargoMultiDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/todo/BusinessDocumentCargoMultiDO.java new file mode 100644 index 000000000..6d6244e98 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/todo/BusinessDocumentCargoMultiDO.java @@ -0,0 +1,70 @@ +package com.mhd.oms.domain.businessDocumentCargoMulti.repository.todo; + +import com.mhd.common.core.annotation.Excel; +import lombok.Data; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.math.BigDecimal; +import io.swagger.annotations.ApiModelProperty; +import com.mhd.common.core.web.domain.BaseVOEntity; + +import java.util.List; + + +/** + * 【请填写功能名称】对象 business_document_cargo_multi + * + * @author gen + * @date 2026-01-26 + */ + +@Data +public class BusinessDocumentCargoMultiDO extends BaseVOEntity{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long id; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long organizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String organizationName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long topOrganizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String layInfoId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsTypeId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsNameId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal cargoWeight; + + @ApiModelProperty(name = "组织ID集合") + private List organizationIdList; + + @ApiModelProperty(name = "权限菜单ID") + private Long permissionMenuId; +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/service/BusinessDocumentCargoMultiDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/service/BusinessDocumentCargoMultiDomainService.java new file mode 100644 index 000000000..0359b2a0c --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/service/BusinessDocumentCargoMultiDomainService.java @@ -0,0 +1,64 @@ +package com.mhd.oms.domain.businessDocumentCargoMulti.service; + +import com.mhd.oms.domain.businessDocumentCargoMulti.repository.facade.IBusinessDocumentCargoMultiService; +import com.mhd.oms.domain.businessDocumentCargoMulti.repository.po.BusinessDocumentCargoMultiPO; +import com.mhd.oms.domain.businessDocumentCargoMulti.repository.todo.BusinessDocumentCargoMultiDO; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +/** + * 【请填写功能名称】 + * + * @author gen + * @date 2026-01-26 + */ +@Service +@Slf4j +public class BusinessDocumentCargoMultiDomainService { + + @Autowired + private IBusinessDocumentCargoMultiService businessDocumentCargoMultiService; + + + /** + * 分页查询【请填写功能名称】列表 + */ + public List queryList(BusinessDocumentCargoMultiDO businessDocumentCargoMultiDO) { + return businessDocumentCargoMultiService.queryList(businessDocumentCargoMultiDO); + } + + + /** + * 新增【请填写功能名称】 + */ + public Boolean insert(BusinessDocumentCargoMultiDO businessDocumentCargoMultiDO) { + + return businessDocumentCargoMultiService.insert(businessDocumentCargoMultiDO); + } + + /** + * 修改【请填写功能名称】 + */ + public Boolean update(BusinessDocumentCargoMultiDO businessDocumentCargoMultiDO) { + return businessDocumentCargoMultiService.update(businessDocumentCargoMultiDO); + } + + /** + * 批量删除【请填写功能名称】 + */ + public Boolean delete(Long[] ids) { + return businessDocumentCargoMultiService.delete(ids); + } + + /** + * 获取【请填写功能名称】详细信息 + */ + public BusinessDocumentCargoMultiPO getInfo(Long id) + { + return businessDocumentCargoMultiService.getInfo(id); + } + + +} 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 new file mode 100644 index 000000000..bb0fd53b9 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/entity/BusinessDocumentOrder.java @@ -0,0 +1,691 @@ +package com.mhd.oms.domain.businessDocumentOrder.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.mhd.common.core.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import com.mhd.common.core.web.domain.BaseVOEntity; +import java.math.BigDecimal; +import lombok.Data; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + + +/** + * 【请填写功能名称】对象 business_document_order + * + * @author gen + * @date 2026-01-26 + */ + +@Data +public class BusinessDocumentOrder extends BaseVOEntity{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String realCreateBy; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String realCreateName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String createCompanyId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingAreaId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingAddress; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingLongitude; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingLatitude; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingUnit; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String freighterName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingPhone; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date loadingDate; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadAreaId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadAddress; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadLongitude; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadLatitude; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String dischargerName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadPhone; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date unloadingData; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsTypeId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsNameId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal weightMin; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal weightMax; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsUntisId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsUntis; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long transportationModeId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String transportationName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String carType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String carTypeName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String serviceRequireId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String serviceRequire; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String remarks; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long waybillFrom; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isSource; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date sourceCloseTime; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String executorId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isDelete; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String lineTitleLeft; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String lineTitleRight; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String sysOrgCode; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isCommon; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsTypeMajor; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long auditStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long waybillMode; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date latestBiddingTime; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal deliveryFreight; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal collectedFreight; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal uncollectedFreight; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal collectLessFreight; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String auditBy; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date auditTime; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String businessType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal transportationUnitPrice; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long radioValue; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String createrName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String createrPhone; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isElectricFence; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String wxaQrcode; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String appointShipperId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String createUserId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String appointShipper; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String signatureAddress; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String qrCodeImgUrl; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String shippingNote; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long receivableType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String thirdPartyOrderNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String dispatchOrderNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String appointDriverEnterpriseId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String appointDriverEnterprise; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String cancelOrderRemark; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String orderDriverId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal goodsQuantity; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsQuantityUnitId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsQuantityUnit; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String biddingUnit; + + @ApiModelProperty("业务单状态 0-待审核 1-待执行 2-进行中 3-已完成 4-已取消 5-已拦截") + private Long orderStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long splicingOrderType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long splicingStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String mainOrderId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String mainOrderNum; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String mergeOrderId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String mergeOrderNum; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long payerType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String machineNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long stockFlag; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal infoFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long infoFeePayeeType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String infoFeePayee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long infoFeeStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String infoFeeDocumentNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long orderShippingType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String recipientId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String recipientName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long settlementStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date settlementTime; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date paymentTime; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String reconciliationInnerNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String receivePaymentNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String invoiceId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isInvoice; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String vehicleTypeId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String vehicleTypeName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String carrier; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String carrierName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long szwlUserId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal freightUnitPrice; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long biddingStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String biddingRemarks; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal cargoInsuranceAmount; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String destination; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal freightCharges; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String payer; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String salesmanId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isDeclare; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String route; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String containerType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String containerTypeName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String cardType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String cardTypeName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String externalContainerNo; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String transitPlace; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String shipper; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsShipper; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsShipperTel; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadingCompany; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String contractNo; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal freightFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal unloadingFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal customsFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal shortageFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal miscellaneousFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal otherFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal detentionFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal taxRate; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String settlementCurrency; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal volume; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String detailContent; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsRoute; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsPort; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsContact; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsContactPhone; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsRemark; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String orgId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsCategory; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String makerCodeNc; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String salesmanCodeNc; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customerCodeNc; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String salesmanName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String orgName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long organizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String organizationName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long topOrganizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date documentDate; + + @ApiModelProperty( "审核状态 0-未审核 1-审核通过 2-已驳回") + private Long reviewStatus; + + @ApiModelProperty("审核时间") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date reviewTime; + + @ApiModelProperty("审核人id") + private Long reviewId; + + @ApiModelProperty("审核人") + private String review; + + + + @ApiModelProperty( "执行状态 0-无状态 1-未执行 2-已执行 3-已下发") + private Long executeStatus; + + @ApiModelProperty("执行时间") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date executeTime; + + @ApiModelProperty("执行人id") + private Long executeId; + + @ApiModelProperty("审核人") + private String executor; +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/facade/IBusinessDocumentOrderService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/facade/IBusinessDocumentOrderService.java new file mode 100644 index 000000000..85d931690 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/facade/IBusinessDocumentOrderService.java @@ -0,0 +1,47 @@ +package com.mhd.oms.domain.businessDocumentOrder.repository.facade; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.mhd.oms.domain.businessDocumentOrder.entity.BusinessDocumentOrder; +import com.mhd.oms.domain.businessDocumentOrder.repository.po.BusinessDocumentOrderPO; +import com.mhd.oms.domain.businessDocumentOrder.repository.todo.BusinessDocumentOrderDO; + +import java.util.List; + +/** + * 【请填写功能名称】Service接口 + * + * @author gen + * @date 2026-01-26 + */ +public interface IBusinessDocumentOrderService extends IService +{ + /** + * 分页查询【请填写功能名称】列表 + */ + public List queryList(BusinessDocumentOrderDO businessDocumentOrderDO); + + /** + * 新增【请填写功能名称】 + */ + public Boolean insert(BusinessDocumentOrderDO businessDocumentOrderDO); + + /** + * 修改【请填写功能名称】 + */ + public Boolean update(BusinessDocumentOrderDO businessDocumentOrderDO); + + /** + * 批量删除【请填写功能名称】 + */ + public Boolean delete(Long[] ids); + + public Boolean execute(Long[] ids); + + + /** + * 查询【请填写功能名称】 + */ + public BusinessDocumentOrderPO getInfo(Long id); + + public BusinessDocumentOrderPO audit( Long id, Long reviewStatus); +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/mapper/BusinessDocumentOrderMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/mapper/BusinessDocumentOrderMapper.java new file mode 100644 index 000000000..d22144e25 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/mapper/BusinessDocumentOrderMapper.java @@ -0,0 +1,22 @@ +package com.mhd.oms.domain.businessDocumentOrder.repository.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.mhd.oms.domain.businessDocumentOrder.entity.BusinessDocumentOrder; +import com.mhd.oms.domain.businessDocumentOrder.repository.po.BusinessDocumentOrderPO; +import com.mhd.oms.domain.businessDocumentOrder.repository.todo.BusinessDocumentOrderDO; +import org.apache.ibatis.annotations.Param; +/** + * 【请填写功能名称】Mapper接口 + * + * @author gen + * @date 2026-01-26 + */ +public interface BusinessDocumentOrderMapper extends BaseMapper +{ + /** + * 查询【请填写功能名称】列表 + */ + public List queryList(BusinessDocumentOrderDO businessDocumentOrderDO); + +} 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 new file mode 100644 index 000000000..127667a38 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java @@ -0,0 +1,144 @@ +package com.mhd.oms.domain.businessDocumentOrder.repository.persistence; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.oms.domain.businessDocumentOrder.entity.BusinessDocumentOrder; +import com.mhd.oms.domain.businessDocumentOrder.repository.facade.IBusinessDocumentOrderService; +import com.mhd.oms.domain.businessDocumentOrder.repository.mapper.BusinessDocumentOrderMapper; +import com.mhd.oms.domain.businessDocumentOrder.repository.po.BusinessDocumentOrderPO; +import com.mhd.oms.domain.businessDocumentOrder.repository.todo.BusinessDocumentOrderDO; +import com.mhd.oms.domain.executeOrder.entity.ExecuteOrder; +import com.mhd.oms.domain.executeOrder.repository.todo.ExecuteOrderDO; +import com.mhd.oms.domain.executeOrder.service.ExecuteOrderDomainService; +import com.mhd.system.api.model.LoginUser; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * 【请填写功能名称】Service业务层处理 + * + * @author gen + * @date 2026-01-26 + */ +@Service +public class BusinessDocumentOrderImpl extends ServiceImpl implements IBusinessDocumentOrderService{ + @Autowired + private BusinessDocumentOrderMapper businessDocumentOrderMapper; + + @Autowired + private ExecuteOrderDomainService executeOrderDomainService; + + /** + * 查询【请填写功能名称】列表 + */ + @Override + public List queryList(BusinessDocumentOrderDO businessDocumentOrderDO) + { + return businessDocumentOrderMapper.queryList(businessDocumentOrderDO); + } + + /** + * 新增【请填写功能名称】 + */ + @Override + public Boolean insert(BusinessDocumentOrderDO businessDocumentOrderDO) { + BusinessDocumentOrder businessDocumentOrder = new BusinessDocumentOrder(); + BeanUtils.copyProperties(businessDocumentOrderDO,businessDocumentOrder); + return this.save(businessDocumentOrder); + } + + /** + * 修改【请填写功能名称】 + */ + @Override + public Boolean update(BusinessDocumentOrderDO businessDocumentOrderDO) { + BusinessDocumentOrder businessDocumentOrder = new BusinessDocumentOrder(); + BeanUtils.copyProperties(businessDocumentOrderDO,businessDocumentOrder); + return this.updateById(businessDocumentOrder); + } + + /** + * 批量删除【请填写功能名称】 + */ + @Override + public Boolean delete(Long[] ids ) { + List list = new ArrayList<>(); + for (Long id : ids) { + BusinessDocumentOrder businessDocumentOrder = new BusinessDocumentOrder(); + businessDocumentOrder.setId(id); + businessDocumentOrder.setDelFlag(2); + list.add(businessDocumentOrder); + } + return this.updateBatchById(list); + } + + /** + * 修改【请填写功能名称】 + */ + @Override + public BusinessDocumentOrderPO getInfo(Long id) { + BusinessDocumentOrder businessDocumentOrder = this.getById(id); + BusinessDocumentOrderPO businessDocumentOrderPO = new BusinessDocumentOrderPO(); + BeanUtils.copyProperties(businessDocumentOrder,businessDocumentOrderPO); + return businessDocumentOrderPO; + } + + @Override + public BusinessDocumentOrderPO audit(Long id, Long reviewStatus) { + LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人 + BusinessDocumentOrder businessDocumentOrder=businessDocumentOrderMapper.selectById(id); + if (ObjectUtil.isNotNull(businessDocumentOrder)){ + businessDocumentOrder.setReviewStatus(reviewStatus); + businessDocumentOrder.setReviewId(loginUser.getUserid()); + businessDocumentOrder.setReview(loginUser.getUsername()); + businessDocumentOrder.setReviewTime(new Date()); + if(reviewStatus==1){ + businessDocumentOrder.setOrderStatus(1L); + businessDocumentOrder.setExecuteStatus(1L); + }else{ + businessDocumentOrder.setOrderStatus(0L); + } + businessDocumentOrderMapper.updateById(businessDocumentOrder); + BusinessDocumentOrder businessDocumentOrder1 = this.getById(id); + BusinessDocumentOrderPO businessDocumentOrderPO = new BusinessDocumentOrderPO(); + BeanUtils.copyProperties(businessDocumentOrder1,businessDocumentOrderPO); + return businessDocumentOrderPO; + } + return null; + } + + @Override + public Boolean execute(Long[] ids) { + LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人 + for (Long id:ids){ + BusinessDocumentOrder businessDocumentOrder=businessDocumentOrderMapper.selectById(id); + if (ObjectUtil.isNotNull(businessDocumentOrder)){ + businessDocumentOrder.setExecuteId(loginUser.getUserid()); + businessDocumentOrder.setExecuteStatus(2L); + businessDocumentOrder.setExecuteTime(new Date()); + businessDocumentOrder.setExecutor(loginUser.getUsername()); + businessDocumentOrder.setOrderStatus(2L); + businessDocumentOrderMapper.updateById(businessDocumentOrder); + ExecuteOrderDO executeOrderDO=new ExecuteOrderDO(); + executeOrderDO.setBusinessDocumentId(id); + executeOrderDO.setBusinessDocumentNumber(businessDocumentOrder.getGoodsNumber()); + executeOrderDO.setGoodsNumber(businessDocumentOrder.getGoodsNumber()); + executeOrderDO.setCreateBy(loginUser.getUserid()); + executeOrderDO.setCreateTime(new Date()); + executeOrderDO.setOrganizationId(businessDocumentOrder.getOrganizationId()); + executeOrderDO.setOrgName(businessDocumentOrder.getOrgName()); + executeOrderDO.setTopOrganizationId(businessDocumentOrder.getTopOrganizationId()); + executeOrderDomainService.insert(executeOrderDO); + + } + + } + return null; + } +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java new file mode 100644 index 000000000..59bfde511 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java @@ -0,0 +1,693 @@ +package com.mhd.oms.domain.businessDocumentOrder.repository.po; + +import com.mhd.common.core.annotation.Excel; +import lombok.Data; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.math.BigDecimal; +import com.mhd.common.core.web.domain.BaseVOEntity; +import org.springframework.format.annotation.DateTimeFormat; + + +/** + * 【请填写功能名称】对象 business_document_order + * + * @author gen + * @date 2026-01-26 + */ + +@Data +@ApiModel(value = "【请填写功能名称】对象", description = "【请填写功能名称】响应对象") +public class BusinessDocumentOrderPO extends BaseVOEntity{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long id; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String realCreateBy; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String realCreateName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String createCompanyId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingAreaId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingAddress; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingLongitude; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingLatitude; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingUnit; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String freighterName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingPhone; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date loadingDate; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadAreaId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadAddress; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadLongitude; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadLatitude; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String dischargerName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadPhone; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date unloadingData; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsTypeId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsNameId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal weightMin; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal weightMax; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsUntisId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsUntis; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long transportationModeId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String transportationName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String carType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String carTypeName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String serviceRequireId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String serviceRequire; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String remarks; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long waybillFrom; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isSource; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date sourceCloseTime; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String executorId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isDelete; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String lineTitleLeft; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String lineTitleRight; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String sysOrgCode; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isCommon; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsTypeMajor; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long auditStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long waybillMode; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date latestBiddingTime; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal deliveryFreight; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal collectedFreight; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal uncollectedFreight; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal collectLessFreight; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String auditBy; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date auditTime; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String businessType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal transportationUnitPrice; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long radioValue; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String createrName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String createrPhone; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isElectricFence; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String wxaQrcode; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String appointShipperId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String createUserId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String appointShipper; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String signatureAddress; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String qrCodeImgUrl; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String shippingNote; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long receivableType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String thirdPartyOrderNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String dispatchOrderNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String appointDriverEnterpriseId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String appointDriverEnterprise; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String cancelOrderRemark; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String orderDriverId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal goodsQuantity; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsQuantityUnitId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsQuantityUnit; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String biddingUnit; + + @ApiModelProperty("业务单状态 0-待审核 1-待执行 2-进行中 3-已完成 4-已取消 5-已拦截") + private Long orderStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long splicingOrderType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long splicingStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String mainOrderId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String mainOrderNum; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String mergeOrderId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String mergeOrderNum; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long payerType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String machineNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long stockFlag; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal infoFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long infoFeePayeeType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String infoFeePayee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long infoFeeStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String infoFeeDocumentNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long orderShippingType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String recipientId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String recipientName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long settlementStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date settlementTime; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date paymentTime; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String reconciliationInnerNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String receivePaymentNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String invoiceId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isInvoice; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String vehicleTypeId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String vehicleTypeName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String carrier; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String carrierName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long szwlUserId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal freightUnitPrice; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long biddingStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String biddingRemarks; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal cargoInsuranceAmount; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String destination; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal freightCharges; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String payer; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String salesmanId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isDeclare; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String route; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String containerType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String containerTypeName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String cardType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String cardTypeName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String externalContainerNo; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String transitPlace; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String shipper; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsShipper; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsShipperTel; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadingCompany; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String contractNo; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal freightFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal unloadingFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal customsFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal shortageFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal miscellaneousFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal otherFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal detentionFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal taxRate; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String settlementCurrency; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal volume; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String detailContent; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsRoute; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsPort; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsContact; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsContactPhone; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsRemark; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String orgId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsCategory; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String makerCodeNc; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String salesmanCodeNc; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customerCodeNc; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String salesmanName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String orgName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long organizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String organizationName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long topOrganizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date documentDate; + + + @ApiModelProperty( "审核状态 0-未审核 1-审核通过 2-已驳回") + private Long reviewStatus; + + @ApiModelProperty("审核时间") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date reviewTime; + + @ApiModelProperty("审核人id") + private Long reviewId; + + @ApiModelProperty("审核人") + private String review; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long EXECUTE_STATUS; + + @ApiModelProperty( "执行状态 0-无状态 1-未执行 2-已执行 3-已下发") + private Long executeStatus; + + @ApiModelProperty("执行时间") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date executeTime; + + @ApiModelProperty("执行人id") + private Long executeId; + + @ApiModelProperty("审核人") + private String executor; +} 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 new file mode 100644 index 000000000..1d8ad28b7 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java @@ -0,0 +1,698 @@ +package com.mhd.oms.domain.businessDocumentOrder.repository.todo; + +import com.mhd.common.core.annotation.Excel; +import lombok.Data; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.math.BigDecimal; +import io.swagger.annotations.ApiModelProperty; +import com.mhd.common.core.web.domain.BaseVOEntity; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.List; + + +/** + * 【请填写功能名称】对象 business_document_order + * + * @author gen + * @date 2026-01-26 + */ + +@Data +public class BusinessDocumentOrderDO extends BaseVOEntity{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long id; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String realCreateBy; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String realCreateName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String createCompanyId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingAreaId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingAddress; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingLongitude; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingLatitude; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingUnit; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String freighterName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingPhone; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date loadingDate; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadAreaId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadAddress; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadLongitude; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadLatitude; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String dischargerName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadPhone; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date unloadingData; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsTypeId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsNameId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal weightMin; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal weightMax; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsUntisId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsUntis; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long transportationModeId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String transportationName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String carType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String carTypeName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String serviceRequireId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String serviceRequire; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String remarks; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long waybillFrom; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isSource; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date sourceCloseTime; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String executorId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isDelete; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String lineTitleLeft; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String lineTitleRight; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String sysOrgCode; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isCommon; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsTypeMajor; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long auditStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long waybillMode; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date latestBiddingTime; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal deliveryFreight; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal collectedFreight; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal uncollectedFreight; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal collectLessFreight; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String auditBy; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date auditTime; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String businessType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal transportationUnitPrice; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long radioValue; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String createrName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String createrPhone; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isElectricFence; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String wxaQrcode; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String appointShipperId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String createUserId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String appointShipper; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String signatureAddress; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String qrCodeImgUrl; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String shippingNote; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long receivableType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String thirdPartyOrderNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String dispatchOrderNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String appointDriverEnterpriseId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String appointDriverEnterprise; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String cancelOrderRemark; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String orderDriverId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal goodsQuantity; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsQuantityUnitId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsQuantityUnit; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String biddingUnit; + + @ApiModelProperty("业务单状态 0-待审核 1-待执行 2-进行中 3-已完成 4-已取消 5-已拦截") + private Long orderStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long splicingOrderType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long splicingStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String mainOrderId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String mainOrderNum; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String mergeOrderId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String mergeOrderNum; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long payerType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String machineNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long stockFlag; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal infoFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long infoFeePayeeType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String infoFeePayee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long infoFeeStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String infoFeeDocumentNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long orderShippingType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String recipientId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String recipientName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long settlementStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date settlementTime; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date paymentTime; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String reconciliationInnerNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String receivePaymentNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String invoiceId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isInvoice; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String vehicleTypeId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String vehicleTypeName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String carrier; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String carrierName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long szwlUserId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal freightUnitPrice; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long biddingStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String biddingRemarks; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal cargoInsuranceAmount; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String destination; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal freightCharges; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String payer; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String salesmanId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isDeclare; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String route; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String containerType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String containerTypeName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String cardType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String cardTypeName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String externalContainerNo; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String transitPlace; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String shipper; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsShipper; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsShipperTel; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadingCompany; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String contractNo; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal freightFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal unloadingFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal customsFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal shortageFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal miscellaneousFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal otherFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal detentionFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal taxRate; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String settlementCurrency; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal volume; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String detailContent; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsRoute; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsPort; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsContact; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsContactPhone; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsRemark; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String orgId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsCategory; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String makerCodeNc; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String salesmanCodeNc; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customerCodeNc; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String salesmanName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String orgName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long organizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String organizationName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long topOrganizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date documentDate; + + @ApiModelProperty(name = "组织ID集合") + private List organizationIdList; + + @ApiModelProperty(name = "权限菜单ID") + private Long permissionMenuId; + + @ApiModelProperty( "审核状态 0-未审核 1-审核通过 2-已驳回") + private Long reviewStatus; + + @ApiModelProperty("审核时间") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date reviewTime; + + @ApiModelProperty("审核人id") + private Long reviewId; + + @ApiModelProperty("审核人") + private String review; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long EXECUTE_STATUS; + + @ApiModelProperty( "执行状态 0-无状态 1-未执行 2-已执行 3-已下发") + private Long executeStatus; + + @ApiModelProperty("执行时间") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date executeTime; + + @ApiModelProperty("执行人id") + private Long executeId; + + @ApiModelProperty("审核人") + private String executor; +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java new file mode 100644 index 000000000..3163836b9 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java @@ -0,0 +1,71 @@ +package com.mhd.oms.domain.businessDocumentOrder.service; + +import com.mhd.oms.domain.businessDocumentOrder.repository.facade.IBusinessDocumentOrderService; +import com.mhd.oms.domain.businessDocumentOrder.repository.po.BusinessDocumentOrderPO; +import com.mhd.oms.domain.businessDocumentOrder.repository.todo.BusinessDocumentOrderDO; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +/** + * 【请填写功能名称】 + * + * @author gen + * @date 2026-01-26 + */ +@Service +@Slf4j +public class BusinessDocumentOrderDomainService { + + @Autowired + private IBusinessDocumentOrderService businessDocumentOrderService; + + + /** + * 分页查询【请填写功能名称】列表 + */ + public List queryList(BusinessDocumentOrderDO businessDocumentOrderDO) { + return businessDocumentOrderService.queryList(businessDocumentOrderDO); + } + + + /** + * 新增【请填写功能名称】 + */ + public Boolean insert(BusinessDocumentOrderDO businessDocumentOrderDO) { + + return businessDocumentOrderService.insert(businessDocumentOrderDO); + } + + /** + * 修改【请填写功能名称】 + */ + public Boolean update(BusinessDocumentOrderDO businessDocumentOrderDO) { + return businessDocumentOrderService.update(businessDocumentOrderDO); + } + + /** + * 批量删除【请填写功能名称】 + */ + public Boolean delete(Long[] ids) { + return businessDocumentOrderService.delete(ids); + } + + /** + * 获取【请填写功能名称】详细信息 + */ + public BusinessDocumentOrderPO getInfo(Long id) + { + return businessDocumentOrderService.getInfo(id); + } + + public BusinessDocumentOrderPO audit( Long id, Long reviewStatus) + { + + return businessDocumentOrderService.audit(id,reviewStatus); + } + public Boolean execute(Long[] ids) { + return businessDocumentOrderService.execute(ids); + } +} 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 new file mode 100644 index 000000000..07d2f76d6 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/entity/ExecuteOrder.java @@ -0,0 +1,71 @@ +package com.mhd.oms.domain.executeOrder.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.mhd.common.core.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import com.mhd.common.core.web.domain.BaseVOEntity; +import java.math.BigDecimal; +import lombok.Data; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + + +/** + * 【请填写功能名称】对象 execute_order + * + * @author gen + * @date 2026-01-27 + */ + +@Data +public class ExecuteOrder extends BaseVOEntity{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String realCreateBy; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String realCreateName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String createCompanyId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String orgName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long organizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long businessDocumentId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String businessDocumentNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String organizationName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long topOrganizationId; + + +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/facade/IExecuteOrderService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/facade/IExecuteOrderService.java new file mode 100644 index 000000000..580820c7d --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/facade/IExecuteOrderService.java @@ -0,0 +1,43 @@ +package com.mhd.oms.domain.executeOrder.repository.facade; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.mhd.oms.domain.executeOrder.entity.ExecuteOrder; +import com.mhd.oms.domain.executeOrder.repository.po.ExecuteOrderPO; +import com.mhd.oms.domain.executeOrder.repository.todo.ExecuteOrderDO; + +import java.util.List; + +/** + * 【请填写功能名称】Service接口 + * + * @author gen + * @date 2026-01-27 + */ +public interface IExecuteOrderService extends IService +{ + /** + * 分页查询【请填写功能名称】列表 + */ + public List queryList(ExecuteOrderDO executeOrderDO); + + /** + * 新增【请填写功能名称】 + */ + public Boolean insert(ExecuteOrderDO executeOrderDO); + + /** + * 修改【请填写功能名称】 + */ + public Boolean update(ExecuteOrderDO executeOrderDO); + + /** + * 批量删除【请填写功能名称】 + */ + public Boolean delete(Long[] ids); + + + /** + * 查询【请填写功能名称】 + */ + public ExecuteOrderPO getInfo(Long id); +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/mapper/ExecuteOrderMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/mapper/ExecuteOrderMapper.java new file mode 100644 index 000000000..b4763a0eb --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/mapper/ExecuteOrderMapper.java @@ -0,0 +1,22 @@ +package com.mhd.oms.domain.executeOrder.repository.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.mhd.oms.domain.executeOrder.entity.ExecuteOrder; +import com.mhd.oms.domain.executeOrder.repository.po.ExecuteOrderPO; +import com.mhd.oms.domain.executeOrder.repository.todo.ExecuteOrderDO; +import org.apache.ibatis.annotations.Param; +/** + * 【请填写功能名称】Mapper接口 + * + * @author gen + * @date 2026-01-27 + */ +public interface ExecuteOrderMapper extends BaseMapper +{ + /** + * 查询【请填写功能名称】列表 + */ + public List queryList(ExecuteOrderDO executeOrderDO); + +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java new file mode 100644 index 000000000..f7bcd611c --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java @@ -0,0 +1,81 @@ +package com.mhd.oms.domain.executeOrder.repository.persistence; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.mhd.oms.domain.executeOrder.entity.ExecuteOrder; +import com.mhd.oms.domain.executeOrder.repository.facade.IExecuteOrderService; +import com.mhd.oms.domain.executeOrder.repository.mapper.ExecuteOrderMapper; +import com.mhd.oms.domain.executeOrder.repository.po.ExecuteOrderPO; +import com.mhd.oms.domain.executeOrder.repository.todo.ExecuteOrderDO; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * 【请填写功能名称】Service业务层处理 + * + * @author gen + * @date 2026-01-27 + */ +@Service +public class ExecuteOrderImpl extends ServiceImpl implements IExecuteOrderService{ + @Autowired + private ExecuteOrderMapper executeOrderMapper; + + /** + * 查询【请填写功能名称】列表 + */ + @Override + public List queryList(ExecuteOrderDO executeOrderDO) + { + return executeOrderMapper.queryList(executeOrderDO); + } + + /** + * 新增【请填写功能名称】 + */ + @Override + public Boolean insert(ExecuteOrderDO executeOrderDO) { + ExecuteOrder executeOrder = new ExecuteOrder(); + BeanUtils.copyProperties(executeOrderDO,executeOrder); + return this.save(executeOrder); + } + + /** + * 修改【请填写功能名称】 + */ + @Override + public Boolean update(ExecuteOrderDO executeOrderDO) { + ExecuteOrder executeOrder = new ExecuteOrder(); + BeanUtils.copyProperties(executeOrderDO,executeOrder); + return this.updateById(executeOrder); + } + + /** + * 批量删除【请填写功能名称】 + */ + @Override + public Boolean delete(Long[] ids ) { + List list = new ArrayList<>(); + for (Long id : ids) { + ExecuteOrder executeOrder = new ExecuteOrder(); + executeOrder.setId(id); + executeOrder.setDelFlag(2); + list.add(executeOrder); + } + return this.updateBatchById(list); + } + + /** + * 修改【请填写功能名称】 + */ + @Override + public ExecuteOrderPO getInfo(Long id) { + ExecuteOrder executeOrder = this.getById(id); + ExecuteOrderPO executeOrderPO = new ExecuteOrderPO(); + BeanUtils.copyProperties(executeOrder,executeOrderPO); + return executeOrderPO; + } +} 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 new file mode 100644 index 000000000..0b80055fb --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java @@ -0,0 +1,71 @@ +package com.mhd.oms.domain.executeOrder.repository.po; + +import com.mhd.common.core.annotation.Excel; +import lombok.Data; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.math.BigDecimal; +import com.mhd.common.core.web.domain.BaseVOEntity; + + +/** + * 【请填写功能名称】对象 execute_order + * + * @author gen + * @date 2026-01-27 + */ + +@Data +@ApiModel(value = "【请填写功能名称】对象", description = "【请填写功能名称】响应对象") +public class ExecuteOrderPO extends BaseVOEntity{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long id; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String realCreateBy; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String realCreateName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String createCompanyId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String orgName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long organizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long businessDocumentId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String businessDocumentNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String organizationName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long topOrganizationId; + + + +} 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 new file mode 100644 index 000000000..425f766a8 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java @@ -0,0 +1,74 @@ +package com.mhd.oms.domain.executeOrder.repository.todo; + +import com.mhd.common.core.annotation.Excel; +import lombok.Data; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.math.BigDecimal; +import io.swagger.annotations.ApiModelProperty; +import com.mhd.common.core.web.domain.BaseVOEntity; + +import java.util.List; + + +/** + * 【请填写功能名称】对象 execute_order + * + * @author gen + * @date 2026-01-27 + */ + +@Data +public class ExecuteOrderDO extends BaseVOEntity{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long id; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String realCreateBy; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String realCreateName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String createCompanyId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String orgName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long organizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long businessDocumentId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String businessDocumentNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String organizationName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long topOrganizationId; + + @ApiModelProperty(name = "组织ID集合") + private List organizationIdList; + + @ApiModelProperty(name = "权限菜单ID") + private Long permissionMenuId; +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/service/ExecuteOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/service/ExecuteOrderDomainService.java new file mode 100644 index 000000000..6ae1840c2 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/service/ExecuteOrderDomainService.java @@ -0,0 +1,64 @@ +package com.mhd.oms.domain.executeOrder.service; + +import com.mhd.oms.domain.executeOrder.repository.facade.IExecuteOrderService; +import com.mhd.oms.domain.executeOrder.repository.po.ExecuteOrderPO; +import com.mhd.oms.domain.executeOrder.repository.todo.ExecuteOrderDO; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +/** + * 【请填写功能名称】 + * + * @author gen + * @date 2026-01-27 + */ +@Service +@Slf4j +public class ExecuteOrderDomainService { + + @Autowired + private IExecuteOrderService executeOrderService; + + + /** + * 分页查询【请填写功能名称】列表 + */ + public List queryList(ExecuteOrderDO executeOrderDO) { + return executeOrderService.queryList(executeOrderDO); + } + + + /** + * 新增【请填写功能名称】 + */ + public Boolean insert(ExecuteOrderDO executeOrderDO) { + + return executeOrderService.insert(executeOrderDO); + } + + /** + * 修改【请填写功能名称】 + */ + public Boolean update(ExecuteOrderDO executeOrderDO) { + return executeOrderService.update(executeOrderDO); + } + + /** + * 批量删除【请填写功能名称】 + */ + public Boolean delete(Long[] ids) { + return executeOrderService.delete(ids); + } + + /** + * 获取【请填写功能名称】详细信息 + */ + public ExecuteOrderPO getInfo(Long id) + { + return executeOrderService.getInfo(id); + } + + +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/assembler/businessDocumentAddressMulti/BusinessDocumentAddressMultiAssembler.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/assembler/businessDocumentAddressMulti/BusinessDocumentAddressMultiAssembler.java new file mode 100644 index 000000000..fc2fb99b6 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/assembler/businessDocumentAddressMulti/BusinessDocumentAddressMultiAssembler.java @@ -0,0 +1,65 @@ +package com.mhd.oms.interfaces.assembler.businessDocumentAddressMulti; + +import cn.hutool.core.util.ObjectUtil; +import com.mhd.oms.domain.businessDocumentAddressMulti.repository.todo.BusinessDocumentAddressMultiDO; +import com.mhd.oms.interfaces.dto.businessDocumentAddressMulti.BusinessDocumentAddressMultiDTO; +import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException; +import com.mhd.common.core.exception.digitalLogisticsException.UserError; +import com.mhd.common.core.utils.bean.BeanUtils; +import com.mhd.common.core.utils.IgnoreNullUtil; +import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.system.api.model.LoginUser; +import org.springframework.stereotype.Component; + +import java.util.Date; + +/** + * 【请填写功能名称】Assembler + * + * @author gen + * @date 2026-01-26 + */ +@Component +public class BusinessDocumentAddressMultiAssembler { + + /** + * 转换实体 + */ + public BusinessDocumentAddressMultiDO toDO(BusinessDocumentAddressMultiDTO businessDocumentAddressMultiDTO) { + BusinessDocumentAddressMultiDO businessDocumentAddressMultiDO = new BusinessDocumentAddressMultiDO(); + // 拷贝 + BeanUtils.copyProperties(businessDocumentAddressMultiDTO, businessDocumentAddressMultiDO, IgnoreNullUtil.getNullPropertyNames(businessDocumentAddressMultiDTO)); + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (ObjectUtil.isNull(loginUser)) { + throw new DigitalLogisticsException(UserError.TIMEOUT); + } + String userName = loginUser.getUsername(); + // 获取登录人id + Long userId = loginUser.getUserid(); + if(businessDocumentAddressMultiDTO.getId() != null){ + if(userId != null){ + businessDocumentAddressMultiDO.setUpdateBy(userId); + }else { + businessDocumentAddressMultiDO.setUpdateBy(new Long("0")); + } + businessDocumentAddressMultiDO.setUpdateByName(userName); + businessDocumentAddressMultiDO.setUpdateTime(new Date()); + + }else { + if(userId != null){ + businessDocumentAddressMultiDO.setCreateBy(userId); + businessDocumentAddressMultiDO.setUpdateBy(userId); + }else { + businessDocumentAddressMultiDO.setCreateBy(new Long("0")); + businessDocumentAddressMultiDO.setUpdateBy(new Long("0")); + } + businessDocumentAddressMultiDO.setCreateByName(userName); + businessDocumentAddressMultiDO.setUpdateByName(userName); + businessDocumentAddressMultiDO.setCreateTime(new Date()); + businessDocumentAddressMultiDO.setUpdateTime(new Date()); + businessDocumentAddressMultiDO.setDelFlag(1); + } + return businessDocumentAddressMultiDO; + } + +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/assembler/businessDocumentCargoMulti/BusinessDocumentCargoMultiAssembler.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/assembler/businessDocumentCargoMulti/BusinessDocumentCargoMultiAssembler.java new file mode 100644 index 000000000..f96be3ef3 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/assembler/businessDocumentCargoMulti/BusinessDocumentCargoMultiAssembler.java @@ -0,0 +1,65 @@ +package com.mhd.oms.interfaces.assembler.businessDocumentCargoMulti; + +import cn.hutool.core.util.ObjectUtil; +import com.mhd.oms.domain.businessDocumentCargoMulti.repository.todo.BusinessDocumentCargoMultiDO; +import com.mhd.oms.interfaces.dto.businessDocumentCargoMulti.BusinessDocumentCargoMultiDTO; +import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException; +import com.mhd.common.core.exception.digitalLogisticsException.UserError; +import com.mhd.common.core.utils.bean.BeanUtils; +import com.mhd.common.core.utils.IgnoreNullUtil; +import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.system.api.model.LoginUser; +import org.springframework.stereotype.Component; + +import java.util.Date; + +/** + * 【请填写功能名称】Assembler + * + * @author gen + * @date 2026-01-26 + */ +@Component +public class BusinessDocumentCargoMultiAssembler { + + /** + * 转换实体 + */ + public BusinessDocumentCargoMultiDO toDO(BusinessDocumentCargoMultiDTO businessDocumentCargoMultiDTO) { + BusinessDocumentCargoMultiDO businessDocumentCargoMultiDO = new BusinessDocumentCargoMultiDO(); + // 拷贝 + BeanUtils.copyProperties(businessDocumentCargoMultiDTO, businessDocumentCargoMultiDO, IgnoreNullUtil.getNullPropertyNames(businessDocumentCargoMultiDTO)); + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (ObjectUtil.isNull(loginUser)) { + throw new DigitalLogisticsException(UserError.TIMEOUT); + } + String userName = loginUser.getUsername(); + // 获取登录人id + Long userId = loginUser.getUserid(); + if(businessDocumentCargoMultiDTO.getId() != null){ + if(userId != null){ + businessDocumentCargoMultiDO.setUpdateBy(userId); + }else { + businessDocumentCargoMultiDO.setUpdateBy(new Long("0")); + } + businessDocumentCargoMultiDO.setUpdateByName(userName); + businessDocumentCargoMultiDO.setUpdateTime(new Date()); + + }else { + if(userId != null){ + businessDocumentCargoMultiDO.setCreateBy(userId); + businessDocumentCargoMultiDO.setUpdateBy(userId); + }else { + businessDocumentCargoMultiDO.setCreateBy(new Long("0")); + businessDocumentCargoMultiDO.setUpdateBy(new Long("0")); + } + businessDocumentCargoMultiDO.setCreateByName(userName); + businessDocumentCargoMultiDO.setUpdateByName(userName); + businessDocumentCargoMultiDO.setCreateTime(new Date()); + businessDocumentCargoMultiDO.setUpdateTime(new Date()); + businessDocumentCargoMultiDO.setDelFlag(1); + } + return businessDocumentCargoMultiDO; + } + +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/assembler/businessDocumentOrder/BusinessDocumentOrderAssembler.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/assembler/businessDocumentOrder/BusinessDocumentOrderAssembler.java new file mode 100644 index 000000000..0211b8488 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/assembler/businessDocumentOrder/BusinessDocumentOrderAssembler.java @@ -0,0 +1,65 @@ +package com.mhd.oms.interfaces.assembler.businessDocumentOrder; + +import cn.hutool.core.util.ObjectUtil; +import com.mhd.oms.domain.businessDocumentOrder.repository.todo.BusinessDocumentOrderDO; +import com.mhd.oms.interfaces.dto.businessDocumentOrder.BusinessDocumentOrderDTO; +import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException; +import com.mhd.common.core.exception.digitalLogisticsException.UserError; +import com.mhd.common.core.utils.bean.BeanUtils; +import com.mhd.common.core.utils.IgnoreNullUtil; +import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.system.api.model.LoginUser; +import org.springframework.stereotype.Component; + +import java.util.Date; + +/** + * 【请填写功能名称】Assembler + * + * @author gen + * @date 2026-01-26 + */ +@Component +public class BusinessDocumentOrderAssembler { + + /** + * 转换实体 + */ + public BusinessDocumentOrderDO toDO(BusinessDocumentOrderDTO businessDocumentOrderDTO) { + BusinessDocumentOrderDO businessDocumentOrderDO = new BusinessDocumentOrderDO(); + // 拷贝 + BeanUtils.copyProperties(businessDocumentOrderDTO, businessDocumentOrderDO, IgnoreNullUtil.getNullPropertyNames(businessDocumentOrderDTO)); + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (ObjectUtil.isNull(loginUser)) { + throw new DigitalLogisticsException(UserError.TIMEOUT); + } + String userName = loginUser.getUsername(); + // 获取登录人id + Long userId = loginUser.getUserid(); + if(businessDocumentOrderDTO.getId() != null){ + if(userId != null){ + businessDocumentOrderDO.setUpdateBy(userId); + }else { + businessDocumentOrderDO.setUpdateBy(new Long("0")); + } + businessDocumentOrderDO.setUpdateByName(userName); + businessDocumentOrderDO.setUpdateTime(new Date()); + + }else { + if(userId != null){ + businessDocumentOrderDO.setCreateBy(userId); + businessDocumentOrderDO.setUpdateBy(userId); + }else { + businessDocumentOrderDO.setCreateBy(new Long("0")); + businessDocumentOrderDO.setUpdateBy(new Long("0")); + } + businessDocumentOrderDO.setCreateByName(userName); + businessDocumentOrderDO.setUpdateByName(userName); + businessDocumentOrderDO.setCreateTime(new Date()); + businessDocumentOrderDO.setUpdateTime(new Date()); + businessDocumentOrderDO.setDelFlag(1); + } + return businessDocumentOrderDO; + } + +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/assembler/executeOrder/ExecuteOrderAssembler.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/assembler/executeOrder/ExecuteOrderAssembler.java new file mode 100644 index 000000000..f66a658d4 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/assembler/executeOrder/ExecuteOrderAssembler.java @@ -0,0 +1,65 @@ +package com.mhd.oms.interfaces.assembler.executeOrder; + +import cn.hutool.core.util.ObjectUtil; +import com.mhd.oms.domain.executeOrder.repository.todo.ExecuteOrderDO; +import com.mhd.oms.interfaces.dto.executeOrder.ExecuteOrderDTO; +import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException; +import com.mhd.common.core.exception.digitalLogisticsException.UserError; +import com.mhd.common.core.utils.bean.BeanUtils; +import com.mhd.common.core.utils.IgnoreNullUtil; +import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.system.api.model.LoginUser; +import org.springframework.stereotype.Component; + +import java.util.Date; + +/** + * 【请填写功能名称】Assembler + * + * @author gen + * @date 2026-01-27 + */ +@Component +public class ExecuteOrderAssembler { + + /** + * 转换实体 + */ + public ExecuteOrderDO toDO(ExecuteOrderDTO executeOrderDTO) { + ExecuteOrderDO executeOrderDO = new ExecuteOrderDO(); + // 拷贝 + BeanUtils.copyProperties(executeOrderDTO, executeOrderDO, IgnoreNullUtil.getNullPropertyNames(executeOrderDTO)); + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (ObjectUtil.isNull(loginUser)) { + throw new DigitalLogisticsException(UserError.TIMEOUT); + } + String userName = loginUser.getUsername(); + // 获取登录人id + Long userId = loginUser.getUserid(); + if(executeOrderDTO.getId() != null){ + if(userId != null){ + executeOrderDO.setUpdateBy(userId); + }else { + executeOrderDO.setUpdateBy(new Long("0")); + } + executeOrderDO.setUpdateByName(userName); + executeOrderDO.setUpdateTime(new Date()); + + }else { + if(userId != null){ + executeOrderDO.setCreateBy(userId); + executeOrderDO.setUpdateBy(userId); + }else { + executeOrderDO.setCreateBy(new Long("0")); + executeOrderDO.setUpdateBy(new Long("0")); + } + executeOrderDO.setCreateByName(userName); + executeOrderDO.setUpdateByName(userName); + executeOrderDO.setCreateTime(new Date()); + executeOrderDO.setUpdateTime(new Date()); + executeOrderDO.setDelFlag(1); + } + return executeOrderDO; + } + +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentAddressMulti/BusinessDocumentAddressMultiDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentAddressMulti/BusinessDocumentAddressMultiDTO.java new file mode 100644 index 000000000..22d8f3304 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentAddressMulti/BusinessDocumentAddressMultiDTO.java @@ -0,0 +1,102 @@ +package com.mhd.oms.interfaces.dto.businessDocumentAddressMulti; + +import com.mhd.common.core.annotation.Excel; +import lombok.Data; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.math.BigDecimal; +import io.swagger.annotations.ApiModelProperty; +import com.mhd.common.core.web.domain.BaseVOEntity; + +import java.util.List; + +/** + * 【请填写功能名称】对象 business_document_address_multi + * + * @author gen + * @date 2026-01-26 + */ + +@Data +public class BusinessDocumentAddressMultiDTO extends BaseVOEntity{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long id; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long organizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String organizationName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long topOrganizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String orderId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String areaCode; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String areaName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String address; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String longitude; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String latitude; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String contactName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String contactPhone; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date layDate; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String layTime; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String layTimeId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long layType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long sort; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String shortName; + + + @ApiModelProperty(name = "组织ID集合") + private List organizationIdList; + + @ApiModelProperty(name = "权限菜单ID") + private Long permissionMenuId; +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentCargoMulti/BusinessDocumentCargoMultiDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentCargoMulti/BusinessDocumentCargoMultiDTO.java new file mode 100644 index 000000000..922e68ffe --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentCargoMulti/BusinessDocumentCargoMultiDTO.java @@ -0,0 +1,70 @@ +package com.mhd.oms.interfaces.dto.businessDocumentCargoMulti; + +import com.mhd.common.core.annotation.Excel; +import lombok.Data; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.math.BigDecimal; +import io.swagger.annotations.ApiModelProperty; +import com.mhd.common.core.web.domain.BaseVOEntity; + +import java.util.List; + +/** + * 【请填写功能名称】对象 business_document_cargo_multi + * + * @author gen + * @date 2026-01-26 + */ + +@Data +public class BusinessDocumentCargoMultiDTO extends BaseVOEntity{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long id; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long organizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String organizationName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long topOrganizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String layInfoId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsTypeId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsNameId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal cargoWeight; + + + @ApiModelProperty(name = "组织ID集合") + private List organizationIdList; + + @ApiModelProperty(name = "权限菜单ID") + private Long permissionMenuId; +} 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 new file mode 100644 index 000000000..cc1508020 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java @@ -0,0 +1,699 @@ +package com.mhd.oms.interfaces.dto.businessDocumentOrder; + +import com.mhd.common.core.annotation.Excel; +import lombok.Data; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.math.BigDecimal; +import io.swagger.annotations.ApiModelProperty; +import com.mhd.common.core.web.domain.BaseVOEntity; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.List; + +/** + * 【请填写功能名称】对象 business_document_order + * + * @author gen + * @date 2026-01-26 + */ + +@Data +public class BusinessDocumentOrderDTO extends BaseVOEntity{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long id; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String realCreateBy; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String realCreateName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String createCompanyId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingAreaId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingAddress; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingLongitude; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingLatitude; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingUnit; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String freighterName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingPhone; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date loadingDate; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadAreaId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadAddress; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadLongitude; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadLatitude; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String dischargerName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadPhone; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date unloadingData; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsTypeId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsNameId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal weightMin; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal weightMax; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsUntisId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsUntis; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long transportationModeId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String transportationName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String carType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String carTypeName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String serviceRequireId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String serviceRequire; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String remarks; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long waybillFrom; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isSource; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date sourceCloseTime; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String executorId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isDelete; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String lineTitleLeft; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String lineTitleRight; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String sysOrgCode; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isCommon; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsTypeMajor; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long auditStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long waybillMode; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date latestBiddingTime; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal deliveryFreight; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal collectedFreight; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal uncollectedFreight; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal collectLessFreight; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String auditBy; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date auditTime; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String businessType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal transportationUnitPrice; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long radioValue; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String createrName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String createrPhone; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isElectricFence; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String wxaQrcode; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String appointShipperId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String createUserId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String appointShipper; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String signatureAddress; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String qrCodeImgUrl; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String shippingNote; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long receivableType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String thirdPartyOrderNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String dispatchOrderNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String appointDriverEnterpriseId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String appointDriverEnterprise; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String cancelOrderRemark; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String orderDriverId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal goodsQuantity; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsQuantityUnitId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsQuantityUnit; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String biddingUnit; + + @ApiModelProperty("业务单状态 0-待审核 1-待执行 2-进行中 3-已完成 4-已取消 5-已拦截") + private Long orderStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long splicingOrderType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long splicingStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String mainOrderId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String mainOrderNum; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String mergeOrderId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String mergeOrderNum; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long payerType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String machineNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long stockFlag; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal infoFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long infoFeePayeeType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String infoFeePayee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long infoFeeStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String infoFeeDocumentNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long orderShippingType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String recipientId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String recipientName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long settlementStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date settlementTime; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date paymentTime; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String reconciliationInnerNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String receivePaymentNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String invoiceId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isInvoice; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String vehicleTypeId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String vehicleTypeName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String carrier; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String carrierName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long szwlUserId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal freightUnitPrice; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long biddingStatus; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String biddingRemarks; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal cargoInsuranceAmount; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String destination; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal freightCharges; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String payer; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String salesmanId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isDeclare; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String route; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String containerType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String containerTypeName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String cardType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String cardTypeName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String externalContainerNo; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String transitPlace; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String shipper; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsShipper; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsShipperTel; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadingCompany; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String contractNo; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal freightFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal unloadingFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal customsFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal shortageFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal miscellaneousFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal otherFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal detentionFee; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal taxRate; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String settlementCurrency; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private BigDecimal volume; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String detailContent; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsRoute; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsPort; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsContact; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsContactPhone; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customsRemark; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String orgId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsCategory; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String makerCodeNc; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String salesmanCodeNc; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String customerCodeNc; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String salesmanName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String orgName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long organizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String organizationName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long topOrganizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date documentDate; + + + @ApiModelProperty(name = "组织ID集合") + private List organizationIdList; + + @ApiModelProperty(name = "权限菜单ID") + private Long permissionMenuId; + + @ApiModelProperty( "审核状态 0-未审核 1-审核通过 2-已驳回") + private Long reviewStatus; + + @ApiModelProperty("审核时间") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date reviewTime; + + @ApiModelProperty("审核人id") + private Long reviewId; + + @ApiModelProperty("审核人") + private String review; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long EXECUTE_STATUS; + + @ApiModelProperty( "执行状态 0-无状态 1-未执行 2-已执行 3-已下发") + private Long executeStatus; + + @ApiModelProperty("执行时间") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date executeTime; + + @ApiModelProperty("执行人id") + private Long executeId; + + @ApiModelProperty("审核人") + private String executor; + +} 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 new file mode 100644 index 000000000..c3a14599f --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java @@ -0,0 +1,74 @@ +package com.mhd.oms.interfaces.dto.executeOrder; + +import com.mhd.common.core.annotation.Excel; +import lombok.Data; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.math.BigDecimal; +import io.swagger.annotations.ApiModelProperty; +import com.mhd.common.core.web.domain.BaseVOEntity; + +import java.util.List; + +/** + * 【请填写功能名称】对象 execute_order + * + * @author gen + * @date 2026-01-27 + */ + +@Data +public class ExecuteOrderDTO extends BaseVOEntity{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long id; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String realCreateBy; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String realCreateName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String createCompanyId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String goodsNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String orgName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long organizationId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long businessDocumentId; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String businessDocumentNumber; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String organizationName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long topOrganizationId; + + + @ApiModelProperty(name = "组织ID集合") + private List organizationIdList; + + @ApiModelProperty(name = "权限菜单ID") + private Long permissionMenuId; +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentAddressMulti/BusinessDocumentAddressMultiApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentAddressMulti/BusinessDocumentAddressMultiApi.java new file mode 100644 index 000000000..c01027007 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentAddressMulti/BusinessDocumentAddressMultiApi.java @@ -0,0 +1,99 @@ +package com.mhd.oms.interfaces.facade.businessDocumentAddressMulti; + +import java.util.List; + +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.mhd.oms.interfaces.dto.businessDocumentAddressMulti.BusinessDocumentAddressMultiDTO; +import com.mhd.oms.domain.businessDocumentAddressMulti.repository.todo.BusinessDocumentAddressMultiDO; +import com.mhd.oms.domain.businessDocumentAddressMulti.repository.po.BusinessDocumentAddressMultiPO; +import com.mhd.oms.application.service.businessDocumentAddressMulti.BusinessDocumentAddressMultiApplicationService; +import com.mhd.oms.interfaces.assembler.businessDocumentAddressMulti.BusinessDocumentAddressMultiAssembler; +import javax.annotation.Resource; +import com.mhd.common.core.web.controller.BaseController; +import com.mhd.common.core.web.domain.AjaxResult; +import com.mhd.common.core.web.page.TableDataInfo; + +/** + * 【业务单地址信息】Api + * + * @author gen + * @date 2026-01-26 + */ +@RestController +@RequestMapping("/businessDocumentAddressMultiApi") +public class BusinessDocumentAddressMultiApi extends BaseController{ + @Autowired + private BusinessDocumentAddressMultiApplicationService businessDocumentAddressMultiApplicationService; + + @Resource + private BusinessDocumentAddressMultiAssembler businessDocumentAddressMultiAssembler; + + /** + * 分页查询【业务单地址信息】列表 + */ + @ApiOperation("查询【业务单地址信息】列表") + @GetMapping("/list") + public TableDataInfo list(BusinessDocumentAddressMultiDTO businessDocumentAddressMultiDTO) + { + //转换实体 + BusinessDocumentAddressMultiDO businessDocumentAddressMultiDO = businessDocumentAddressMultiAssembler.toDO(businessDocumentAddressMultiDTO); + startPage(); + List list = businessDocumentAddressMultiApplicationService.queryList(businessDocumentAddressMultiDO); + return getDataTable(list); + } + + /** + * 编辑【业务单地址信息】 + */ + @ApiOperation("编辑【业务单地址信息】") + @PostMapping("/edit") + public AjaxResult edit(@RequestBody BusinessDocumentAddressMultiDTO businessDocumentAddressMultiDTO) + { + //转换实体 + BusinessDocumentAddressMultiDO businessDocumentAddressMultiDO = businessDocumentAddressMultiAssembler.toDO(businessDocumentAddressMultiDTO); + if(businessDocumentAddressMultiDTO.getId() != null){ + return toAjax(businessDocumentAddressMultiApplicationService.update(businessDocumentAddressMultiDO)); + }else { + return toAjax(businessDocumentAddressMultiApplicationService.insert(businessDocumentAddressMultiDO)); + } + } + + /** + * 批量删除【业务单地址信息】 + */ + @ApiOperation("批量删除【业务单地址信息】") + @DeleteMapping("/deleteByIds/{ids}") + public AjaxResult delete(@PathVariable Long[] ids) + { + return toAjax(businessDocumentAddressMultiApplicationService.delete(ids)); + } + + /** + * 获取【业务单地址信息】详细信息 + */ + @ApiOperation("获取【业务单地址信息】") + @GetMapping(value = "/getInfo/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(businessDocumentAddressMultiApplicationService.getInfo(id)); + } + + + + + + + + + + + +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentCargoMulti/BusinessDocumentCargoMultiApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentCargoMulti/BusinessDocumentCargoMultiApi.java new file mode 100644 index 000000000..d5b43d562 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentCargoMulti/BusinessDocumentCargoMultiApi.java @@ -0,0 +1,99 @@ +package com.mhd.oms.interfaces.facade.businessDocumentCargoMulti; + +import java.util.List; + +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.mhd.oms.interfaces.dto.businessDocumentCargoMulti.BusinessDocumentCargoMultiDTO; +import com.mhd.oms.domain.businessDocumentCargoMulti.repository.todo.BusinessDocumentCargoMultiDO; +import com.mhd.oms.domain.businessDocumentCargoMulti.repository.po.BusinessDocumentCargoMultiPO; +import com.mhd.oms.application.service.businessDocumentCargoMulti.BusinessDocumentCargoMultiApplicationService; +import com.mhd.oms.interfaces.assembler.businessDocumentCargoMulti.BusinessDocumentCargoMultiAssembler; +import javax.annotation.Resource; +import com.mhd.common.core.web.controller.BaseController; +import com.mhd.common.core.web.domain.AjaxResult; +import com.mhd.common.core.web.page.TableDataInfo; + +/** + * 【业务单货物信息】Api + * + * @author gen + * @date 2026-01-26 + */ +@RestController +@RequestMapping("/businessDocumentCargoMultiApi") +public class BusinessDocumentCargoMultiApi extends BaseController{ + @Autowired + private BusinessDocumentCargoMultiApplicationService businessDocumentCargoMultiApplicationService; + + @Resource + private BusinessDocumentCargoMultiAssembler businessDocumentCargoMultiAssembler; + + /** + * 分页查询【业务单货物信息】列表 + */ + @ApiOperation("查询【业务单货物信息】列表") + @GetMapping("/list") + public TableDataInfo list(BusinessDocumentCargoMultiDTO businessDocumentCargoMultiDTO) + { + //转换实体 + BusinessDocumentCargoMultiDO businessDocumentCargoMultiDO = businessDocumentCargoMultiAssembler.toDO(businessDocumentCargoMultiDTO); + startPage(); + List list = businessDocumentCargoMultiApplicationService.queryList(businessDocumentCargoMultiDO); + return getDataTable(list); + } + + /** + * 编辑【业务单货物信息】 + */ + @ApiOperation("编辑【业务单货物信息】") + @PostMapping("/edit") + public AjaxResult edit(@RequestBody BusinessDocumentCargoMultiDTO businessDocumentCargoMultiDTO) + { + //转换实体 + BusinessDocumentCargoMultiDO businessDocumentCargoMultiDO = businessDocumentCargoMultiAssembler.toDO(businessDocumentCargoMultiDTO); + if(businessDocumentCargoMultiDTO.getId() != null){ + return toAjax(businessDocumentCargoMultiApplicationService.update(businessDocumentCargoMultiDO)); + }else { + return toAjax(businessDocumentCargoMultiApplicationService.insert(businessDocumentCargoMultiDO)); + } + } + + /** + * 批量删除【业务单货物信息】 + */ + @ApiOperation("批量删除【业务单货物信息】") + @DeleteMapping("/deleteByIds/{ids}") + public AjaxResult delete(@PathVariable Long[] ids) + { + return toAjax(businessDocumentCargoMultiApplicationService.delete(ids)); + } + + /** + * 获取【业务单货物信息】详细信息 + */ + @ApiOperation("获取【业务单货物信息】") + @GetMapping(value = "/getInfo/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(businessDocumentCargoMultiApplicationService.getInfo(id)); + } + + + + + + + + + + + +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentOrder/BusinessDocumentOrderApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentOrder/BusinessDocumentOrderApi.java new file mode 100644 index 000000000..6434ab9bd --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentOrder/BusinessDocumentOrderApi.java @@ -0,0 +1,109 @@ +package com.mhd.oms.interfaces.facade.businessDocumentOrder; + +import java.util.List; + +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.mhd.oms.interfaces.dto.businessDocumentOrder.BusinessDocumentOrderDTO; +import com.mhd.oms.domain.businessDocumentOrder.repository.todo.BusinessDocumentOrderDO; +import com.mhd.oms.domain.businessDocumentOrder.repository.po.BusinessDocumentOrderPO; +import com.mhd.oms.application.service.businessDocumentOrder.BusinessDocumentOrderApplicationService; +import com.mhd.oms.interfaces.assembler.businessDocumentOrder.BusinessDocumentOrderAssembler; +import javax.annotation.Resource; +import com.mhd.common.core.web.controller.BaseController; +import com.mhd.common.core.web.domain.AjaxResult; +import com.mhd.common.core.web.page.TableDataInfo; + +/** + * 【业务单】Api + * + * @author gen + * @date 2026-01-26 + */ +@RestController +@RequestMapping("/businessDocumentOrderApi") +public class BusinessDocumentOrderApi extends BaseController{ + @Autowired + private BusinessDocumentOrderApplicationService businessDocumentOrderApplicationService; + + @Resource + private BusinessDocumentOrderAssembler businessDocumentOrderAssembler; + + /** + * 分页查询【业务单】列表 + */ + @ApiOperation("查询【业务单】列表") + @GetMapping("/list") + public TableDataInfo list(BusinessDocumentOrderDTO businessDocumentOrderDTO) + { + //转换实体 + BusinessDocumentOrderDO businessDocumentOrderDO = businessDocumentOrderAssembler.toDO(businessDocumentOrderDTO); + startPage(); + List list = businessDocumentOrderApplicationService.queryList(businessDocumentOrderDO); + return getDataTable(list); + } + + /** + * 编辑【业务单】 + */ + @ApiOperation("编辑【业务单】") + @PostMapping("/edit") + public AjaxResult edit(@RequestBody BusinessDocumentOrderDTO businessDocumentOrderDTO) + { + //转换实体 + BusinessDocumentOrderDO businessDocumentOrderDO = businessDocumentOrderAssembler.toDO(businessDocumentOrderDTO); + if(businessDocumentOrderDTO.getId() != null){ + return toAjax(businessDocumentOrderApplicationService.update(businessDocumentOrderDO)); + }else { + return toAjax(businessDocumentOrderApplicationService.insert(businessDocumentOrderDO)); + } + } + + /** + * 批量删除【业务单】 + */ + @ApiOperation("批量删除【业务单】") + @DeleteMapping("/deleteByIds/{ids}") + public AjaxResult delete(@PathVariable Long[] ids) + { + return toAjax(businessDocumentOrderApplicationService.delete(ids)); + } + + /** + * 获取【业务单】详细信息 + */ + @ApiOperation("获取【业务单】") + @GetMapping(value = "/getInfo/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(businessDocumentOrderApplicationService.getInfo(id)); + } + + /** + * 业务单审核 + */ + @ApiOperation("业务单审核") + @GetMapping(value = "/audit") + public AjaxResult audit(@RequestParam("id") Long id,@RequestParam("reviewStatus") Long reviewStatus) + { + return AjaxResult.success(businessDocumentOrderApplicationService.audit(id,reviewStatus)); + } + + /** + * 批量执行【业务单】 + */ + @ApiOperation("批量执行【业务单】") + @PostMapping("/execute") + public AjaxResult execute(@RequestParam("ids") Long[] ids) + { + return toAjax(businessDocumentOrderApplicationService.execute(ids)); + } + + + + + + + +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executeOrder/ExecuteOrderApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executeOrder/ExecuteOrderApi.java new file mode 100644 index 000000000..3f0b0acc6 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executeOrder/ExecuteOrderApi.java @@ -0,0 +1,99 @@ +package com.mhd.oms.interfaces.facade.executeOrder; + +import java.util.List; + +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.mhd.oms.interfaces.dto.executeOrder.ExecuteOrderDTO; +import com.mhd.oms.domain.executeOrder.repository.todo.ExecuteOrderDO; +import com.mhd.oms.domain.executeOrder.repository.po.ExecuteOrderPO; +import com.mhd.oms.application.service.executeOrder.ExecuteOrderApplicationService; +import com.mhd.oms.interfaces.assembler.executeOrder.ExecuteOrderAssembler; +import javax.annotation.Resource; +import com.mhd.common.core.web.controller.BaseController; +import com.mhd.common.core.web.domain.AjaxResult; +import com.mhd.common.core.web.page.TableDataInfo; + +/** + * 【请填写功能名称】Api + * + * @author gen + * @date 2026-01-27 + */ +@RestController +@RequestMapping("/executeOrderApi") +public class ExecuteOrderApi extends BaseController{ + @Autowired + private ExecuteOrderApplicationService executeOrderApplicationService; + + @Resource + private ExecuteOrderAssembler executeOrderAssembler; + + /** + * 分页查询【请填写功能名称】列表 + */ + @ApiOperation("查询【请填写功能名称】列表") + @GetMapping("/list") + public TableDataInfo list(ExecuteOrderDTO executeOrderDTO) + { + //转换实体 + ExecuteOrderDO executeOrderDO = executeOrderAssembler.toDO(executeOrderDTO); + startPage(); + List list = executeOrderApplicationService.queryList(executeOrderDO); + return getDataTable(list); + } + + /** + * 编辑【请填写功能名称】 + */ + @ApiOperation("编辑【请填写功能名称】") + @PostMapping("/edit") + public AjaxResult edit(@RequestBody ExecuteOrderDTO executeOrderDTO) + { + //转换实体 + ExecuteOrderDO executeOrderDO = executeOrderAssembler.toDO(executeOrderDTO); + if(executeOrderDTO.getId() != null){ + return toAjax(executeOrderApplicationService.update(executeOrderDO)); + }else { + return toAjax(executeOrderApplicationService.insert(executeOrderDO)); + } + } + + /** + * 批量删除【请填写功能名称】 + */ + @ApiOperation("批量删除【请填写功能名称】") + @DeleteMapping("/deleteByIds/{ids}") + public AjaxResult delete(@PathVariable Long[] ids) + { + return toAjax(executeOrderApplicationService.delete(ids)); + } + + /** + * 获取【请填写功能名称】详细信息 + */ + @ApiOperation("获取【请填写功能名称】") + @GetMapping(value = "/getInfo/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(executeOrderApplicationService.getInfo(id)); + } + + + + + + + + + + + +} diff --git a/mhd_oms/src/main/resources/mapper/businessDocumentAddressMulti/BusinessDocumentAddressMultiMapper.xml b/mhd_oms/src/main/resources/mapper/businessDocumentAddressMulti/BusinessDocumentAddressMultiMapper.xml new file mode 100644 index 000000000..f28533448 --- /dev/null +++ b/mhd_oms/src/main/resources/mapper/businessDocumentAddressMulti/BusinessDocumentAddressMultiMapper.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select ID, ORGANIZATION_ID, ORGANIZATION_NAME, TOP_ORGANIZATION_ID, CREATE_TIME, CREATE_BY, CREATE_BY_NAME, UPDATE_TIME, UPDATE_BY, UPDATE_BY_NAME, DEL_FLAG, ORDER_ID, AREA_CODE, AREA_NAME, ADDRESS, LONGITUDE, LATITUDE, CONTACT_NAME, CONTACT_PHONE, LAY_DATE, LAY_TIME, LAY_TIME_ID, LAY_TYPE, SORT, SHORT_NAME from business_document_address_multi + + + + + + and ID = #{id} + + + and ORGANIZATION_ID = #{organizationId} + + + and ORGANIZATION_NAME like concat('%', #{organizationName}, '%') + + + and TOP_ORGANIZATION_ID = #{topOrganizationId} + + + and CREATE_TIME = #{createTime} + + + and CREATE_BY = #{createBy} + + + and CREATE_BY_NAME like concat('%', #{createByName}, '%') + + + and UPDATE_TIME = #{updateTime} + + + and UPDATE_BY = #{updateBy} + + + and UPDATE_BY_NAME like concat('%', #{updateByName}, '%') + + + and DEL_FLAG = #{delFlag} + + + and ORDER_ID = #{orderId} + + + and AREA_CODE = #{areaCode} + + + and AREA_NAME like concat('%', #{areaName}, '%') + + + and ADDRESS = #{address} + + + and LONGITUDE = #{longitude} + + + and LATITUDE = #{latitude} + + + and CONTACT_NAME like concat('%', #{contactName}, '%') + + + and CONTACT_PHONE = #{contactPhone} + + + and LAY_DATE = #{layDate} + + + and LAY_TIME = #{layTime} + + + and LAY_TIME_ID = #{layTimeId} + + + and LAY_TYPE = #{layType} + + + and SORT = #{sort} + + + and SHORT_NAME like concat('%', #{shortName}, '%') + + + + + + \ No newline at end of file diff --git a/mhd_oms/src/main/resources/mapper/businessDocumentCargoMulti/BusinessDocumentCargoMultiMapper.xml b/mhd_oms/src/main/resources/mapper/businessDocumentCargoMulti/BusinessDocumentCargoMultiMapper.xml new file mode 100644 index 000000000..56b88b1b0 --- /dev/null +++ b/mhd_oms/src/main/resources/mapper/businessDocumentCargoMulti/BusinessDocumentCargoMultiMapper.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + select ID, ORGANIZATION_ID, ORGANIZATION_NAME, TOP_ORGANIZATION_ID, CREATE_TIME, CREATE_BY, CREATE_BY_NAME, UPDATE_TIME, UPDATE_BY, UPDATE_BY_NAME, DEL_FLAG, LAY_INFO_ID, GOODS_TYPE_ID, GOODS_TYPE, GOODS_NAME_ID, GOODS_NAME, CARGO_WEIGHT from business_document_cargo_multi + + + + + + and ID = #{id} + + + and ORGANIZATION_ID = #{organizationId} + + + and ORGANIZATION_NAME like concat('%', #{organizationName}, '%') + + + and TOP_ORGANIZATION_ID = #{topOrganizationId} + + + and CREATE_TIME = #{createTime} + + + and CREATE_BY = #{createBy} + + + and CREATE_BY_NAME like concat('%', #{createByName}, '%') + + + and UPDATE_TIME = #{updateTime} + + + and UPDATE_BY = #{updateBy} + + + and UPDATE_BY_NAME like concat('%', #{updateByName}, '%') + + + and DEL_FLAG = #{delFlag} + + + and LAY_INFO_ID = #{layInfoId} + + + and GOODS_TYPE_ID = #{goodsTypeId} + + + and GOODS_TYPE = #{goodsType} + + + and GOODS_NAME_ID = #{goodsNameId} + + + and GOODS_NAME like concat('%', #{goodsName}, '%') + + + and CARGO_WEIGHT = #{cargoWeight} + + + + + + \ No newline at end of file diff --git a/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml b/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml new file mode 100644 index 000000000..19a291d5b --- /dev/null +++ b/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml @@ -0,0 +1,676 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select ID, REAL_CREATE_BY, REAL_CREATE_NAME, CREATE_BY, CREATE_COMPANY_ID, CREATE_TIME, UPDATE_BY, UPDATE_TIME, GOODS_NUMBER, LOADING_AREA_ID, LOADING_NAME, LOADING_ADDRESS, LOADING_LONGITUDE, LOADING_LATITUDE, LOADING_UNIT, FREIGHTER_NAME, LOADING_PHONE, LOADING_DATE, UNLOAD_AREA_ID, UNLOAD_NAME, UNLOAD_ADDRESS, UNLOAD_LONGITUDE, UNLOAD_LATITUDE, DISCHARGER_NAME, UNLOAD_PHONE, UNLOADING_DATA, GOODS_TYPE_ID, GOODS_TYPE, GOODS_NAME_ID, GOODS_NAME, WEIGHT_MIN, WEIGHT_MAX, GOODS_UNTIS_ID, GOODS_UNTIS, TRANSPORTATION_MODE_ID, TRANSPORTATION_NAME, CAR_TYPE, CAR_TYPE_NAME, SERVICE_REQUIRE_ID, SERVICE_REQUIRE, REMARKS, WAYBILL_FROM, IS_SOURCE, SOURCE_CLOSE_TIME, EXECUTOR_ID, IS_DELETE, LINE_TITLE_LEFT, LINE_TITLE_RIGHT, SYS_ORG_CODE, IS_COMMON, GOODS_TYPE_MAJOR, AUDIT_STATUS, WAYBILL_MODE, LATEST_BIDDING_TIME, DELIVERY_FREIGHT, COLLECTED_FREIGHT, UNCOLLECTED_FREIGHT, COLLECT_LESS_FREIGHT, AUDIT_BY, AUDIT_TIME, BUSINESS_TYPE, TRANSPORTATION_UNIT_PRICE, RADIO_VALUE, CREATER_NAME, CREATER_PHONE, IS_ELECTRIC_FENCE, WXA_QRCODE, APPOINT_SHIPPER_ID, CREATE_USER_ID, APPOINT_SHIPPER, IS_STATUS, SIGNATURE_ADDRESS, QR_CODE_IMG_URL, SHIPPING_NOTE, RECEIVABLE_TYPE, THIRD_PARTY_ORDER_NUMBER, DISPATCH_ORDER_NUMBER, APPOINT_DRIVER_ENTERPRISE_ID, APPOINT_DRIVER_ENTERPRISE, CANCEL_ORDER_REMARK, ORDER_DRIVER_ID, GOODS_QUANTITY, GOODS_QUANTITY_UNIT_ID, GOODS_QUANTITY_UNIT, BIDDING_UNIT, ORDER_STATUS, SPLICING_ORDER_TYPE, SPLICING_STATUS, MAIN_ORDER_ID, MAIN_ORDER_NUM, MERGE_ORDER_ID, MERGE_ORDER_NUM, PAYER_TYPE, MACHINE_NUMBER, STOCK_FLAG, INFO_FEE, INFO_FEE_PAYEE_TYPE, INFO_FEE_PAYEE, INFO_FEE_STATUS, INFO_FEE_DOCUMENT_NUMBER, ORDER_SHIPPING_TYPE, RECIPIENT_ID, RECIPIENT_NAME, SETTLEMENT_STATUS, SETTLEMENT_TIME, PAYMENT_TIME, RECONCILIATION_INNER_NUMBER, RECEIVE_PAYMENT_NUMBER, INVOICE_ID, IS_INVOICE, VEHICLE_TYPE_ID, VEHICLE_TYPE_NAME, CARRIER, CARRIER_NAME, SZWL_USER_ID, FREIGHT_UNIT_PRICE, BIDDING_STATUS, BIDDING_REMARKS, CARGO_INSURANCE_AMOUNT, DESTINATION, FREIGHT_CHARGES, PAYER, SALESMAN_ID, IS_DECLARE, ROUTE, CONTAINER_TYPE, CONTAINER_TYPE_NAME, CARD_TYPE, CARD_TYPE_NAME, EXTERNAL_CONTAINER_NO, TRANSIT_PLACE, SHIPPER, CUSTOMS_SHIPPER, CUSTOMS_SHIPPER_TEL, UNLOADING_COMPANY, CONTRACT_NO, FREIGHT_FEE, UNLOADING_FEE, CUSTOMS_FEE, SHORTAGE_FEE, MISCELLANEOUS_FEE, OTHER_FEE, DETENTION_FEE, TAX_RATE, SETTLEMENT_CURRENCY, VOLUME, DETAIL_CONTENT, CUSTOMS_ROUTE, CUSTOMS_PORT, CUSTOMS_CONTACT, CUSTOMS_CONTACT_PHONE, CUSTOMS_REMARK, ORG_ID, GOODS_CATEGORY, MAKER_CODE_NC, SALESMAN_CODE_NC, CUSTOMER_CODE_NC, SALESMAN_NAME, ORG_NAME, ORGANIZATION_ID, ORGANIZATION_NAME, TOP_ORGANIZATION_ID, DOCUMENT_DATE from business_document_order + + + + + + and ID = #{id} + + + and REAL_CREATE_BY = #{realCreateBy} + + + and REAL_CREATE_NAME like concat('%', #{realCreateName}, '%') + + + and CREATE_BY = #{createBy} + + + and CREATE_COMPANY_ID = #{createCompanyId} + + + and CREATE_TIME = #{createTime} + + + and UPDATE_BY = #{updateBy} + + + and UPDATE_TIME = #{updateTime} + + + and GOODS_NUMBER = #{goodsNumber} + + + and LOADING_AREA_ID = #{loadingAreaId} + + + and LOADING_NAME like concat('%', #{loadingName}, '%') + + + and LOADING_ADDRESS = #{loadingAddress} + + + and LOADING_LONGITUDE = #{loadingLongitude} + + + and LOADING_LATITUDE = #{loadingLatitude} + + + and LOADING_UNIT = #{loadingUnit} + + + and FREIGHTER_NAME like concat('%', #{freighterName}, '%') + + + and LOADING_PHONE = #{loadingPhone} + + + and LOADING_DATE = #{loadingDate} + + + and UNLOAD_AREA_ID = #{unloadAreaId} + + + and UNLOAD_NAME like concat('%', #{unloadName}, '%') + + + and UNLOAD_ADDRESS = #{unloadAddress} + + + and UNLOAD_LONGITUDE = #{unloadLongitude} + + + and UNLOAD_LATITUDE = #{unloadLatitude} + + + and DISCHARGER_NAME like concat('%', #{dischargerName}, '%') + + + and UNLOAD_PHONE = #{unloadPhone} + + + and UNLOADING_DATA = #{unloadingData} + + + and GOODS_TYPE_ID = #{goodsTypeId} + + + and GOODS_TYPE = #{goodsType} + + + and GOODS_NAME_ID = #{goodsNameId} + + + and GOODS_NAME like concat('%', #{goodsName}, '%') + + + and WEIGHT_MIN = #{weightMin} + + + and WEIGHT_MAX = #{weightMax} + + + and GOODS_UNTIS_ID = #{goodsUntisId} + + + and GOODS_UNTIS = #{goodsUntis} + + + and TRANSPORTATION_MODE_ID = #{transportationModeId} + + + and TRANSPORTATION_NAME like concat('%', #{transportationName}, '%') + + + and CAR_TYPE = #{carType} + + + and CAR_TYPE_NAME like concat('%', #{carTypeName}, '%') + + + and SERVICE_REQUIRE_ID = #{serviceRequireId} + + + and SERVICE_REQUIRE = #{serviceRequire} + + + and REMARKS = #{remarks} + + + and WAYBILL_FROM = #{waybillFrom} + + + and IS_SOURCE = #{isSource} + + + and SOURCE_CLOSE_TIME = #{sourceCloseTime} + + + and EXECUTOR_ID = #{executorId} + + + and IS_DELETE = #{isDelete} + + + and LINE_TITLE_LEFT = #{lineTitleLeft} + + + and LINE_TITLE_RIGHT = #{lineTitleRight} + + + and SYS_ORG_CODE = #{sysOrgCode} + + + and IS_COMMON = #{isCommon} + + + and GOODS_TYPE_MAJOR = #{goodsTypeMajor} + + + and AUDIT_STATUS = #{auditStatus} + + + and WAYBILL_MODE = #{waybillMode} + + + and LATEST_BIDDING_TIME = #{latestBiddingTime} + + + and DELIVERY_FREIGHT = #{deliveryFreight} + + + and COLLECTED_FREIGHT = #{collectedFreight} + + + and UNCOLLECTED_FREIGHT = #{uncollectedFreight} + + + and COLLECT_LESS_FREIGHT = #{collectLessFreight} + + + and AUDIT_BY = #{auditBy} + + + and AUDIT_TIME = #{auditTime} + + + and BUSINESS_TYPE = #{businessType} + + + and TRANSPORTATION_UNIT_PRICE = #{transportationUnitPrice} + + + and RADIO_VALUE = #{radioValue} + + + and CREATER_NAME like concat('%', #{createrName}, '%') + + + and CREATER_PHONE = #{createrPhone} + + + and IS_ELECTRIC_FENCE = #{isElectricFence} + + + and WXA_QRCODE = #{wxaQrcode} + + + and APPOINT_SHIPPER_ID = #{appointShipperId} + + + and CREATE_USER_ID = #{createUserId} + + + and APPOINT_SHIPPER = #{appointShipper} + + + and IS_STATUS = #{isStatus} + + + and SIGNATURE_ADDRESS = #{signatureAddress} + + + and QR_CODE_IMG_URL = #{qrCodeImgUrl} + + + and SHIPPING_NOTE = #{shippingNote} + + + and RECEIVABLE_TYPE = #{receivableType} + + + and THIRD_PARTY_ORDER_NUMBER = #{thirdPartyOrderNumber} + + + and DISPATCH_ORDER_NUMBER = #{dispatchOrderNumber} + + + and APPOINT_DRIVER_ENTERPRISE_ID = #{appointDriverEnterpriseId} + + + and APPOINT_DRIVER_ENTERPRISE = #{appointDriverEnterprise} + + + and CANCEL_ORDER_REMARK = #{cancelOrderRemark} + + + and ORDER_DRIVER_ID = #{orderDriverId} + + + and GOODS_QUANTITY = #{goodsQuantity} + + + and GOODS_QUANTITY_UNIT_ID = #{goodsQuantityUnitId} + + + and GOODS_QUANTITY_UNIT = #{goodsQuantityUnit} + + + and BIDDING_UNIT = #{biddingUnit} + + + and ORDER_STATUS = #{orderStatus} + + + and SPLICING_ORDER_TYPE = #{splicingOrderType} + + + and SPLICING_STATUS = #{splicingStatus} + + + and MAIN_ORDER_ID = #{mainOrderId} + + + and MAIN_ORDER_NUM = #{mainOrderNum} + + + and MERGE_ORDER_ID = #{mergeOrderId} + + + and MERGE_ORDER_NUM = #{mergeOrderNum} + + + and PAYER_TYPE = #{payerType} + + + and MACHINE_NUMBER = #{machineNumber} + + + and STOCK_FLAG = #{stockFlag} + + + and INFO_FEE = #{infoFee} + + + and INFO_FEE_PAYEE_TYPE = #{infoFeePayeeType} + + + and INFO_FEE_PAYEE = #{infoFeePayee} + + + and INFO_FEE_STATUS = #{infoFeeStatus} + + + and INFO_FEE_DOCUMENT_NUMBER = #{infoFeeDocumentNumber} + + + and ORDER_SHIPPING_TYPE = #{orderShippingType} + + + and RECIPIENT_ID = #{recipientId} + + + and RECIPIENT_NAME like concat('%', #{recipientName}, '%') + + + and SETTLEMENT_STATUS = #{settlementStatus} + + + and SETTLEMENT_TIME = #{settlementTime} + + + and PAYMENT_TIME = #{paymentTime} + + + and RECONCILIATION_INNER_NUMBER = #{reconciliationInnerNumber} + + + and RECEIVE_PAYMENT_NUMBER = #{receivePaymentNumber} + + + and INVOICE_ID = #{invoiceId} + + + and IS_INVOICE = #{isInvoice} + + + and VEHICLE_TYPE_ID = #{vehicleTypeId} + + + and VEHICLE_TYPE_NAME like concat('%', #{vehicleTypeName}, '%') + + + and CARRIER = #{carrier} + + + and CARRIER_NAME like concat('%', #{carrierName}, '%') + + + and SZWL_USER_ID = #{szwlUserId} + + + and FREIGHT_UNIT_PRICE = #{freightUnitPrice} + + + and BIDDING_STATUS = #{biddingStatus} + + + and BIDDING_REMARKS = #{biddingRemarks} + + + and CARGO_INSURANCE_AMOUNT = #{cargoInsuranceAmount} + + + and DESTINATION = #{destination} + + + and FREIGHT_CHARGES = #{freightCharges} + + + and PAYER = #{payer} + + + and SALESMAN_ID = #{salesmanId} + + + and IS_DECLARE = #{isDeclare} + + + and ROUTE = #{route} + + + and CONTAINER_TYPE = #{containerType} + + + and CONTAINER_TYPE_NAME like concat('%', #{containerTypeName}, '%') + + + and CARD_TYPE = #{cardType} + + + and CARD_TYPE_NAME like concat('%', #{cardTypeName}, '%') + + + and EXTERNAL_CONTAINER_NO = #{externalContainerNo} + + + and TRANSIT_PLACE = #{transitPlace} + + + and SHIPPER = #{shipper} + + + and CUSTOMS_SHIPPER = #{customsShipper} + + + and CUSTOMS_SHIPPER_TEL = #{customsShipperTel} + + + and UNLOADING_COMPANY = #{unloadingCompany} + + + and CONTRACT_NO = #{contractNo} + + + and FREIGHT_FEE = #{freightFee} + + + and UNLOADING_FEE = #{unloadingFee} + + + and CUSTOMS_FEE = #{customsFee} + + + and SHORTAGE_FEE = #{shortageFee} + + + and MISCELLANEOUS_FEE = #{miscellaneousFee} + + + and OTHER_FEE = #{otherFee} + + + and DETENTION_FEE = #{detentionFee} + + + and TAX_RATE = #{taxRate} + + + and SETTLEMENT_CURRENCY = #{settlementCurrency} + + + and VOLUME = #{volume} + + + and DETAIL_CONTENT = #{detailContent} + + + and CUSTOMS_ROUTE = #{customsRoute} + + + and CUSTOMS_PORT = #{customsPort} + + + and CUSTOMS_CONTACT = #{customsContact} + + + and CUSTOMS_CONTACT_PHONE = #{customsContactPhone} + + + and CUSTOMS_REMARK = #{customsRemark} + + + and ORG_ID = #{orgId} + + + and GOODS_CATEGORY = #{goodsCategory} + + + and MAKER_CODE_NC = #{makerCodeNc} + + + and SALESMAN_CODE_NC = #{salesmanCodeNc} + + + and CUSTOMER_CODE_NC = #{customerCodeNc} + + + and SALESMAN_NAME like concat('%', #{salesmanName}, '%') + + + and ORG_NAME like concat('%', #{orgName}, '%') + + + and ORGANIZATION_ID = #{organizationId} + + + and ORGANIZATION_NAME like concat('%', #{organizationName}, '%') + + + and TOP_ORGANIZATION_ID = #{topOrganizationId} + + + and DOCUMENT_DATE = #{documentDate} + + + + + + \ No newline at end of file diff --git a/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml b/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml new file mode 100644 index 000000000..0902653c4 --- /dev/null +++ b/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + select ID, REAL_CREATE_BY, REAL_CREATE_NAME, CREATE_BY, CREATE_COMPANY_ID, CREATE_TIME, UPDATE_BY, UPDATE_TIME, DEL_FLAG, GOODS_NUMBER, ORG_NAME, ORGANIZATION_ID, BUSINESS_DOCUMENT_ID, BUSINESS_DOCUMENT_NUMBER, ORGANIZATION_NAME, TOP_ORGANIZATION_ID from execute_order + + + + + + and ID = #{id} + + + and REAL_CREATE_BY = #{realCreateBy} + + + and REAL_CREATE_NAME like concat('%', #{realCreateName}, '%') + + + and CREATE_BY = #{createBy} + + + and CREATE_COMPANY_ID = #{createCompanyId} + + + and CREATE_TIME = #{createTime} + + + and UPDATE_BY = #{updateBy} + + + and UPDATE_TIME = #{updateTime} + + + and DEL_FLAG = #{delFlag} + + + and GOODS_NUMBER = #{goodsNumber} + + + and ORG_NAME like concat('%', #{orgName}, '%') + + + and ORGANIZATION_ID = #{organizationId} + + + and BUSINESS_DOCUMENT_ID = #{businessDocumentId} + + + and BUSINESS_DOCUMENT_NUMBER = #{businessDocumentNumber} + + + and ORGANIZATION_NAME like concat('%', #{organizationName}, '%') + + + and TOP_ORGANIZATION_ID = #{topOrganizationId} + + + + + + \ No newline at end of file