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 index eac49cbc1..b1a842de3 100644 --- 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 @@ -1,5 +1,6 @@ package com.mhd.oms.application.service.businessDocumentOrder; +import com.mhd.oms.domain.businessDocumentCargoMulti.entity.BusinessDocumentCargoMulti; 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; @@ -70,9 +71,9 @@ public class BusinessDocumentOrderApplicationService { return businessDocumentOrderDomainService.getInfo(id); } - public Boolean audit( Long[] ids, Long reviewStatus) + public Boolean audit( Long[] ids, Long reviewStatus, String SalesManager,String reviewOpinion) { - return businessDocumentOrderDomainService.audit(ids,reviewStatus); + return businessDocumentOrderDomainService.audit(ids,reviewStatus,SalesManager,reviewOpinion); } public boolean execute(Long[] ids) { return businessDocumentOrderDomainService.execute(ids); @@ -81,4 +82,7 @@ public class BusinessDocumentOrderApplicationService { return businessDocumentOrderDomainService.cancelExecute(ids); } + public BusinessDocumentCargoMulti getCargoContent(Long id) { + return businessDocumentOrderDomainService.getCargoContent(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 index b633cea83..09bd2c45b 100644 --- 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 @@ -80,6 +80,8 @@ public class BusinessDocumentCargoMulti extends BaseVOEntity{ private String weightUnitId; @ApiModelProperty(value = "重量单位名称") private String weightUnit; + @ApiModelProperty(value = "体积") + private BigDecimal materialVolume; @ApiModelProperty(value = "数量单位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 index e46c72d4c..1b8904a50 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/entity/BusinessDocumentOrder.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/entity/BusinessDocumentOrder.java @@ -731,4 +731,10 @@ public class BusinessDocumentOrder extends BaseVOEntity{ // // @ApiModelProperty(value = "开户银行") // private String accountBank; + + @ApiModelProperty(value = "业务主管") + private String salesManager; + + @ApiModelProperty(value = "审核意见") + private String reviewOpinion; } 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 index adff5acb2..f78b70f0c 100644 --- 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 @@ -45,7 +45,7 @@ public interface IBusinessDocumentOrderService extends IService businessDocumentAddressMultiDTOList; 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 index 19d362419..5a78b4606 100644 --- 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 @@ -168,6 +168,8 @@ public class BusinessDocumentOrderDomainService { tmsOrder.setRealCreateBy(String.valueOf(u.getUserid())); tmsOrder.setRealCreateName(u.getUsername()); tmsOrder.setAppointShipper(userShipperPo.getShipperEnterpriseName());//20250-07-29修改：订单表委托方保存公司名字，而不是姓名 +// tmsOrder.setSalesManager(u.getUserPo().getUserName()); + String salesmanCodeNc = businessDocumentOrderDO.getSalesmanId(); if (salesmanCodeNc != null){ String makerCodeNc = businessDocumentOrderService.selectByMakerCodeNc(salesmanCodeNc); @@ -553,6 +555,7 @@ public class BusinessDocumentOrderDomainService { tmsCargoInfo.setOrderId(String.valueOf(id)); tmsCargoInfo.setCargoWeight(tmsCargoInfoDTO.getWeight()==null ? BigDecimal.ZERO: tmsCargoInfoDTO.getWeight()); tmsCargoInfo.setCargoNum(tmsCargoInfoDTO.getCargoNum()==null ? BigDecimal.ZERO: tmsCargoInfoDTO.getCargoNum()); + tmsCargoInfo.setMaterialVolume(tmsCargoInfoDTO.getMaterialVolume()==null ? BigDecimal.ZERO: tmsCargoInfoDTO.getMaterialVolume()); businessDocumentCargoMultiMapper.insert(tmsCargoInfo); } @@ -654,10 +657,10 @@ public class BusinessDocumentOrderDomainService { return businessDocumentOrderService.getInfo(id); } - public Boolean audit( Long[] ids, Long reviewStatus) + public Boolean audit( Long[] ids, Long reviewStatus, String SalesManager,String reviewOpinion) { - return businessDocumentOrderService.audit(ids,reviewStatus); + return businessDocumentOrderService.audit(ids,reviewStatus,SalesManager,reviewOpinion); } public Boolean execute(Long[] ids) { return businessDocumentOrderService.execute(ids); @@ -705,4 +708,11 @@ public class BusinessDocumentOrderDomainService { return serviceRequire.toString(); } + public BusinessDocumentCargoMulti getCargoContent(Long id){ + BusinessDocumentCargoMulti businessDocumentCargoMulti = businessDocumentCargoMultiMapper.selectOne(new LambdaQueryWrapper().eq(BusinessDocumentCargoMulti::getOrderId, id)); + if (businessDocumentCargoMulti != null){ + return businessDocumentCargoMulti ; + } + return null; + } } diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/entity/ExecuteOrder.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/entity/ExecuteOrder.java index 53d4620ac..dfeec3884 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/entity/ExecuteOrder.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/entity/ExecuteOrder.java @@ -68,6 +68,26 @@ public class ExecuteOrder extends BaseVOEntity{ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private Long topOrganizationId; + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String vehicleTypeName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long orderShippingType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String appointShipper; + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingName; + + @ApiModelProperty( "下发状态 0-无状态 1-未下发 2-已下发 ") private Long issueStatus; @@ -85,4 +105,9 @@ public class ExecuteOrder extends BaseVOEntity{ @ApiModelProperty("业务单状态 0-未下发 1-已下发 2-已完成 3-已取消 4-已拦截") private Long orderStatus; + @ApiModelProperty("预约单号") + private String reservationOrderNumber; + + @ApiModelProperty("tms单号") + private String tmsOrderNumber; } 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 index 4582fdd1a..2b4c28243 100644 --- 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 @@ -161,10 +161,15 @@ public class ExecuteOrderImpl extends ServiceImpl organizationIdList; @ApiModelProperty(name = "权限菜单ID") private Long permissionMenuId; + + @ApiModelProperty("预约单号") + private String reservationOrderNumber; + + @ApiModelProperty("tms单号") + private String tmsOrderNumber; + + @ApiModelProperty("业务单号") + private String businessOrderNumber; } 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 index c1bfb0a5f..fc6120cf1 100644 --- 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 @@ -99,4 +99,7 @@ public class BusinessDocumentCargoMultiDTO extends BaseVOEntity{ @ApiModelProperty("") private String materialCode; + @ApiModelProperty("体积") + private BigDecimal materialVolume; + } diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java index 7b9b8b548..d9b5d7c62 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java @@ -753,6 +753,11 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{ @ApiModelProperty(value = "开户银行") private String accountBank; + @ApiModelProperty(value = "业务主管") + private String salesManager; + @ApiModelProperty(value = "审核意见") + private String reviewOpinion; + @ApiModelProperty("业务单地址集合") private List businessDocumentAddressMultiDTOList; diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java index 2e93096e2..e0885446c 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java @@ -91,6 +91,29 @@ public class ExecuteOrderDTO extends BaseVOEntity{ private Long topOrganizationId; + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String vehicleTypeName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long orderShippingType; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String appointShipper; + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String unloadName; + + @ApiModelProperty("$column.columnComment") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String loadingName; + + @ApiModelProperty("业务单号") + private String businessOrderNumber; + + @ApiModelProperty(name = "组织ID集合") private List organizationIdList; 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 index 4de65d716..ef638f67a 100644 --- 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 @@ -89,9 +89,9 @@ public class BusinessDocumentOrderApi extends BaseController{ */ @ApiOperation("业务单审核") @GetMapping(value = "/audit") - public AjaxResult audit(@RequestParam("ids") Long[] ids,@RequestParam("reviewStatus") Long reviewStatus) + public AjaxResult audit(@RequestParam("ids") Long[] ids,@RequestParam("reviewStatus") Long reviewStatus,@RequestParam("salesManager") String salesManager,@RequestParam("reviewOpinion") String reviewOpinion) { - return AjaxResult.success(businessDocumentOrderApplicationService.audit(ids,reviewStatus)); + return AjaxResult.success(businessDocumentOrderApplicationService.audit(ids,reviewStatus,salesManager,reviewOpinion)); } /** @@ -103,6 +103,12 @@ public class BusinessDocumentOrderApi extends BaseController{ { return toAjax(businessDocumentOrderApplicationService.execute(ids)); } + @ApiOperation("获取业务单的货物内容") + @GetMapping("/getCargoContent/{id}") + public AjaxResult getCargoContent(@PathVariable("id") Long id) + { + return AjaxResult.success(businessDocumentOrderApplicationService.getCargoContent(id)); + } 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 index 099bce344..a77f0c8eb 100644 --- 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 @@ -2,6 +2,8 @@ package com.mhd.oms.interfaces.facade.executeOrder; import java.util.List; +import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.system.api.model.LoginUser; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -103,6 +105,15 @@ public class ExecuteOrderApi extends BaseController{ return toAjax(executeOrderApplicationService.cancelIssueDocuments(ids)); } + @ApiOperation("获取当前登录人信息") + @GetMapping("/getCurrentUser") + public LoginUser getCurrentUser() + { + LoginUser u = SecurityUtils.getLoginUser(); +// u.getUserPo().getUserName(); + return u; + } +