weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev_WMS20260401

Browse Source 
# Conflicts:
#	mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/entity/MaterialBaseInfo.java
#	mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java
#	mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java
#	mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java
#	mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
#	mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
#	mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java
#	mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java
#	mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java
#	mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/facade/IReceiptMaterialDetailService.java
#	mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java
#	mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/todo/ShelfMaterialDetailDO.java
#	mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java
#	mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java
#	mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java
#	mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java
#	mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/po/StockReceiptOrderPO.java
#	mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java
#	mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java
#	mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockReceiptOrder/StockReceiptOrderApi.java
#	mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApp/stockReceiptOrder/StockReceiptOrderAppApi.java
#	mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml
#	mhd_wms/src/main/resources/mapper/stockReceiptOrder/StockReceiptOrderMapper.xml
This commit is contained in:
王奎兴
2026-04-15 18:48:55 +08:00
parent ad310f2fc2 551c618820
commit 22aef1d84d
79 changed files with 3519 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java
+18 -2
View File
@@ -1,15 +1,20 @@
package com.mhd.oms.application.service.businessDocumentOrder;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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;
import com.mhd.common.security.utils.SecurityUtils;
import com.mhd.oms.domain.businessOrderAccount.BusinessOrderAccount;
import com.mhd.oms.domain.businessOrderAccount.repository.mapper.BusinessOrderAccountMapper;
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 javax.annotation.Resource;
import java.util.List;
/**
* 【请填写功能名称】ApplicationService
@@ -23,6 +28,9 @@ public class BusinessDocumentOrderApplicationService {
@Autowired
private BusinessDocumentOrderDomainService businessDocumentOrderDomainService;
@Resource
private BusinessOrderAccountMapper businessOrderAccountMapper;
/**
* 分页查询【请填写功能名称】列表
@@ -70,9 +78,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 +89,12 @@ public class BusinessDocumentOrderApplicationService {
return businessDocumentOrderDomainService.cancelExecute(ids);
}
public BusinessDocumentCargoMulti getCargoContent(Long id) {
return businessDocumentOrderDomainService.getCargoContent(id);
}
public List<BusinessOrderAccount> getFeeDetail(Long id) {
List<BusinessOrderAccount> businessOrderAccounts = businessOrderAccountMapper.selectList(new LambdaQueryWrapper<BusinessOrderAccount>().eq(BusinessOrderAccount::getOrderId, id).eq(BusinessOrderAccount::getIsDelete, 0));
return businessOrderAccounts;
}
}
mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/entity/BusinessDocumentCargoMulti.java
+2
View File
@@ -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")
mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/entity/BusinessDocumentOrder.java
+13
View File
@@ -731,4 +731,17 @@ public class BusinessDocumentOrder extends BaseVOEntity{
//
// @ApiModelProperty(value = "开户银行")
// private String accountBank;
@ApiModelProperty(value = "业务主管")
private String salesManager;
@ApiModelProperty(value = "审核意见")
private String reviewOpinion;
@ApiModelProperty(value = "订单来源")
private String orderSource;
@ApiModelProperty(value = "出入库单号")
private String entryNumber;
}
mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/facade/IBusinessDocumentOrderService.java
+1 -1
View File
@@ -45,7 +45,7 @@ public interface IBusinessDocumentOrderService extends IService<BusinessDocument
*/
public BusinessDocumentOrderPO getInfo(Long id);
public Boolean audit( Long [] ids, Long reviewStatus);
public Boolean audit( Long [] ids, Long reviewStatus, String SalesManager,String reviewOpinion);
String selectByMakerCodeNc(String salesmanCodeNc);
mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java
+8 -2
View File
@@ -99,7 +99,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
}
@Override
public Boolean audit(Long[] ids, Long reviewStatus) {
public Boolean audit(Long[] ids, Long reviewStatus, String SalesManager,String reviewOpinion ) {
LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人
for (Long id:ids){
BusinessDocumentOrder businessDocumentOrder=businessDocumentOrderMapper.selectById(id);
@@ -108,6 +108,9 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
businessDocumentOrder.setReviewId(loginUser.getUserid());
businessDocumentOrder.setReview(loginUser.getUsername());
businessDocumentOrder.setReviewTime(new Date());
businessDocumentOrder.setSalesManager(SalesManager);
businessDocumentOrder.setReviewOpinion(reviewOpinion);
if(reviewStatus==1){
businessDocumentOrder.setOrderStatus(1L);
businessDocumentOrder.setExecuteStatus(1L);
@@ -141,6 +144,8 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
// 先创建执行单
ExecuteOrderDO executeOrderDO=new ExecuteOrderDO();
BeanUtils.copyProperties(businessDocumentOrder,executeOrderDO);
executeOrderDO.setDocumentDate(businessDocumentOrder.getDocumentDate());
executeOrderDO.setBusinessDocumentId(id);
executeOrderDO.setBusinessDocumentNumber(businessDocumentOrder.getGoodsNumber());
executeOrderDO.setGoodsNumber(businessDocumentOrder.getGoodsNumber());
@@ -150,10 +155,11 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
executeOrderDO.setOrganizationId(businessDocumentOrder.getOrganizationId());
executeOrderDO.setOrgName(businessDocumentOrder.getOrgName());
executeOrderDO.setTopOrganizationId(businessDocumentOrder.getTopOrganizationId());
executeOrderDO.setReservationOrderNumber(businessDocumentOrder.getReservationOrderNumber());
Long executeOrderId = executeOrderDomainService.insert(executeOrderDO);
// 更新业务单状态和执行单信息（只保存一次）
// 更新业务单状态和执行单信息
businessDocumentOrder.setExecuteId(loginUser.getUserid());
businessDocumentOrder.setExecuteStatus(2L);
businessDocumentOrder.setExecuteTime(new Date());
mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java
+12
View File
@@ -742,4 +742,16 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
@ApiModelProperty(value = "开户银行")
private String accountBank;
@ApiModelProperty(value = "业务主管")
private String salesManager;
@ApiModelProperty(value = "审核意见")
private String reviewOpinion;
@ApiModelProperty(value = "订单来源")
private String orderSource;
@ApiModelProperty(value = "出入库单号")
private String entryNumber;
}
mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java
+16
View File
@@ -2,6 +2,7 @@ package com.mhd.oms.domain.businessDocumentOrder.repository.todo;
import com.mhd.common.core.annotation.Excel;
import com.mhd.oms.domain.businessDocumentCargoMulti.entity.BusinessDocumentCargoMulti;
import com.mhd.oms.domain.businessOrderAccount.BusinessOrderAccount;
import com.mhd.oms.interfaces.assembler.businessDocumentCargoInfo.BusinessDocumentCargoInfo;
import com.mhd.oms.interfaces.dto.businessDocumentAddressMulti.BusinessDocumentAddressMultiDTO;
import com.mhd.oms.interfaces.dto.businessDocumentCargoMulti.BusinessDocumentCargoMultiDTO;
@@ -765,6 +766,21 @@ public class BusinessDocumentOrderDO extends BaseVOEntity{
@ApiModelProperty(value = "开户银行")
private String accountBank;
@ApiModelProperty(value = "业务主管")
private String salesManager;
@ApiModelProperty(value = "审核意见")
private String reviewOpinion;
@ApiModelProperty("订单来源")
private String orderSource;
@ApiModelProperty(value = "出入库单号")
private String entryNumber;
@ApiModelProperty("费用科目明细")
private List<BusinessOrderAccount> businessOrderAccountList;
@ApiModelProperty("业务单地址集合")
private List<BusinessDocumentAddressMultiDTO> businessDocumentAddressMultiDTOList;
mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
+77 -2
View File
@@ -18,6 +18,8 @@ import com.mhd.oms.domain.businessDocumentOrder.repository.facade.IBusinessDocum
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.businessOrderAccount.BusinessOrderAccount;
import com.mhd.oms.domain.businessOrderAccount.repository.mapper.BusinessOrderAccountMapper;
import com.mhd.oms.domain.orderType.entity.OrderType;
import com.mhd.oms.interfaces.dto.businessDocumentAddressMulti.BusinessDocumentAddressMultiDTO;
import com.mhd.oms.interfaces.dto.businessDocumentCargoMulti.BusinessDocumentCargoMultiDTO;
@@ -61,6 +63,9 @@ public class BusinessDocumentOrderDomainService {
@Resource
private BusinessDocumentOrderMapper businessDocumentOrderMapper;
@Resource
private BusinessOrderAccountMapper businessOrderAccountMapper;
/**
* 分页查询【请填写功能名称】列表
*/
@@ -168,6 +173,10 @@ public class BusinessDocumentOrderDomainService {
tmsOrder.setRealCreateBy(String.valueOf(u.getUserid()));
tmsOrder.setRealCreateName(u.getUsername());
tmsOrder.setAppointShipper(userShipperPo.getShipperEnterpriseName());//20250-07-29修改：订单表委托方保存公司名字，而不是姓名
tmsOrder.setOrderSource(businessDocumentOrderDO.getOrderSource());
tmsOrder.setEntryNumber(businessDocumentOrderDO.getEntryNumber());
// tmsOrder.setSalesManager(u.getUserPo().getUserName());
String salesmanCodeNc = businessDocumentOrderDO.getSalesmanId();
if (salesmanCodeNc != null){
String makerCodeNc = businessDocumentOrderService.selectByMakerCodeNc(salesmanCodeNc);
@@ -311,6 +320,31 @@ public class BusinessDocumentOrderDomainService {
//保存货物信息及地址信息
saveAddress2CargoInfo(tmsOrder.getId(), allCargoList, loadingAddressList, unloadAddressList);
List<BusinessOrderAccount> tmsOrderAccountList=businessDocumentOrderDO.getBusinessOrderAccountList();
if(ObjectUtil.isNotNull(tmsOrderAccountList)&&tmsOrderAccountList.size()>0){
for (BusinessOrderAccount tmsOrderAccount:tmsOrderAccountList){
tmsOrderAccount.setIsDelete(0);
tmsOrderAccount.setOrderId(String.valueOf(tmsOrder.getId()));
tmsOrderAccount.setCreateBy(String.valueOf(u.getUserid()));
tmsOrderAccount.setCreateTime(new Date());
// 设置组织信息
if (businessDocumentOrderDO.getOrganizationId() != null) {
tmsOrderAccount.setOrganizationId(businessDocumentOrderDO.getOrganizationId());
}
if (businessDocumentOrderDO.getOrganizationName() != null) {
tmsOrderAccount.setOrganizationName(businessDocumentOrderDO.getOrganizationName());
}
if (businessDocumentOrderDO.getTopOrganizationId() != null) {
tmsOrderAccount.setTopOrganizationId(businessDocumentOrderDO.getTopOrganizationId());
}
BigDecimal amount = tmsOrderAccount.getAmount();
// if (ObjectUtil.isNotEmpty(amount) && amount.compareTo(BigDecimal.ZERO) > 0) {
// tmsOrderAccountMapper.insert(tmsOrderAccount);
businessOrderAccountMapper.insert(tmsOrderAccount);
// }
}
}
return istrue;
}
@@ -532,6 +566,39 @@ public class BusinessDocumentOrderDomainService {
//保存货物信息及地址信息
saveAddress2CargoInfo(tmsOrder.getId(), allCargoList, loadingAddressList, unloadAddressList);
//删除原来的费用科目
List<BusinessOrderAccount> tmsOrderAccountList1=businessOrderAccountMapper.selectList(new LambdaQueryWrapper<BusinessOrderAccount>().eq(BusinessOrderAccount::getOrderId, businessDocumentOrderDO.getId()).eq(BusinessOrderAccount::getIsDelete, 0));
if(ObjectUtil.isNotNull(tmsOrderAccountList1)&&tmsOrderAccountList1.size()>0){
for (BusinessOrderAccount tmsOrderAccount:tmsOrderAccountList1){
tmsOrderAccount.setIsDelete(1);
tmsOrderAccount.setUpdateBy(String.valueOf(u.getUserid()));
tmsOrderAccount.setUpdateTime(new Date());
businessOrderAccountMapper.updateById(tmsOrderAccount);
}
}
//保存费用科目信息
List<BusinessOrderAccount> tmsOrderAccountList=businessDocumentOrderDO.getBusinessOrderAccountList();
if(ObjectUtil.isNotNull(tmsOrderAccountList)&&tmsOrderAccountList.size()>0){
for (BusinessOrderAccount tmsOrderAccount:tmsOrderAccountList){
tmsOrderAccount.setIsDelete(0);
tmsOrderAccount.setOrderId(String.valueOf(businessDocumentOrderDO.getId()));
tmsOrderAccount.setCreateBy(String.valueOf(u.getUserid()));
tmsOrderAccount.setCreateTime(new Date());
// 设置组织信息
if (businessDocumentOrderDO.getOrganizationId() != null) {
tmsOrderAccount.setOrganizationId(businessDocumentOrderDO.getOrganizationId());
}
if (businessDocumentOrderDO.getOrganizationName() != null) {
tmsOrderAccount.setOrganizationName(businessDocumentOrderDO.getOrganizationName());
}
if (businessDocumentOrderDO.getTopOrganizationId() != null) {
tmsOrderAccount.setTopOrganizationId(businessDocumentOrderDO.getTopOrganizationId());
}
tmsOrderAccount.setId(IdUtil.randomUUID());
businessOrderAccountMapper.insert(tmsOrderAccount);
}
}
return istrue;
}
@@ -553,6 +620,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 +722,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 +773,11 @@ public class BusinessDocumentOrderDomainService {
return serviceRequire.toString();
}
public BusinessDocumentCargoMulti getCargoContent(Long id){
BusinessDocumentCargoMulti businessDocumentCargoMulti = businessDocumentCargoMultiMapper.selectOne(new LambdaQueryWrapper<BusinessDocumentCargoMulti>().eq(BusinessDocumentCargoMulti::getOrderId, id));
if (businessDocumentCargoMulti != null){
return businessDocumentCargoMulti ;
}
return null;
}
}
mhd_oms/src/main/java/com/mhd/oms/domain/businessOrderAccount/BusinessOrderAccount.java
+107
View File
@@ -0,0 +1,107 @@
package com.mhd.oms.domain.businessOrderAccount;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mhd.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
/**
* @author: brb
* @description:
* @create: 2026-04-11 10:46
*/
@Data
@TableName("business_order_account")
public class BusinessOrderAccount {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ID_WORKER_STR)
private String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
@Excel(name = "创建人", width = 15)
private String createBy;
/**创建日期*/
@ApiModelProperty(value = "创建日期")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
@Excel(name = "更新人", width = 15)
private String updateBy;
/**更新日期*/
@ApiModelProperty(value = "更新日期")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
@Excel(name = "所属部门", width = 15)
private String sysOrgCode;
/**删除标识*/
@ApiModelProperty(value = "删除标识")
@Excel(name = "删除标识", width = 15)
private Integer isDelete;
/**所属组织*/
@ApiModelProperty(value = "所属组织")
@Excel(name = "所属组织", width = 15)
private String orgName;
/**组织ID*/
@ApiModelProperty(value = "组织ID")
@Excel(name = "组织ID", width = 15)
private Long organizationId;
/**一级组织ID*/
@ApiModelProperty(value = "一级组织ID")
@Excel(name = "一级组织ID", width = 15)
private Long topOrganizationId;
/**组织名称*/
@ApiModelProperty(value = "组织名称")
@Excel(name = "组织名称", width = 15)
private String organizationName;
/**订单id*/
@ApiModelProperty(value = "订单id")
@Excel(name = "订单id", width = 15)
private String orderId;
/**科目id*/
@ApiModelProperty(value = "科目id")
@Excel(name = "科目id", width = 15)
private Long accountId;
/**科目收支类型（1-应收，2-应付*/
@ApiModelProperty(value = "科目收支类型（1-应收，2-应付")
@Excel(name = "科目收支类型（1-应收，2-应付", width = 15)
private Long accountType;
/**科目编码*/
@ApiModelProperty(value = "科目编码")
@Excel(name = "科目编码", width = 15)
private String subjectCode;
/**科目名称*/
@ApiModelProperty(value = "科目名称")
@Excel(name = "科目名称", width = 15)
private String subjectName;
/**科目费率*/
@ApiModelProperty(value = "科目费率")
@Excel(name = "科目费率", width = 15)
private BigDecimal rate;
/**金额*/
@ApiModelProperty(value = "金额")
@Excel(name = "金额", width = 15)
private BigDecimal amount;
@ApiModelProperty(value = "无税费用")
private BigDecimal taxFreeFee;
@ApiModelProperty(value = "税额")
private BigDecimal taxAmount;
@ApiModelProperty(value = "收款帐户")
private String receiveAccount;
}
mhd_oms/src/main/java/com/mhd/oms/domain/businessOrderAccount/repository/mapper/BusinessOrderAccountMapper.java
+33
View File
@@ -0,0 +1,33 @@
package com.mhd.oms.domain.businessOrderAccount.repository.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mhd.oms.domain.businessOrderAccount.BusinessOrderAccount;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 业务订单科目Mapper接口
*
* @author gen
* @date 2026-04-11
*/
@Mapper
public interface BusinessOrderAccountMapper extends BaseMapper<BusinessOrderAccount> {
/**
* 查询业务订单科目列表
*
* @param businessOrderAccount 业务订单科目
* @return 业务订单科目集合
*/
List<BusinessOrderAccount> selectBusinessOrderAccountList(BusinessOrderAccount businessOrderAccount);
/**
* 根据订单ID查询业务订单科目
*
* @param orderId 订单ID
* @return 业务订单科目集合
*/
List<BusinessOrderAccount> selectBusinessOrderAccountByOrderId(String orderId);
}
mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/entity/ExecuteOrder.java
+34
View File
@@ -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,18 @@ public class ExecuteOrder extends BaseVOEntity{
@ApiModelProperty("业务单状态 0-未下发 1-已下发 2-已完成 3-已取消 4-已拦截")
private Long orderStatus;
@ApiModelProperty("预约单号")
private String reservationOrderNumber;
@ApiModelProperty("tms单号")
private String tmsOrderNumber;
@ApiModelProperty("作业情况")
private String jobStatus;
@ApiModelProperty("预计运输时间")
private Date documentDate;
@ApiModelProperty("备注")
private String shippingNote;
}
mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java
+10 -1
View File
@@ -153,6 +153,7 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
for (BusinessDocumentAddressMulti businessDocumentAddressMulti:businessDocumentAddressMultiUnloadList){
TmsAddressMultiDTO tmsAddressMultiDTO=new TmsAddressMultiDTO();
BeanUtils.copyProperties(businessDocumentAddressMulti,tmsAddressMultiDTO);
tmsAddressMultiDTO.setLayType(2);
unloadAddressList.add(tmsAddressMultiDTO);
}
}
@@ -161,10 +162,18 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
tmsOrderAddDTO.setCargoInfoList(cargoInfoList);
tmsOrderAddDTO.setLoadingAddressList(loadingAddressList);
tmsOrderAddDTO.setUnloadAddressList(unloadAddressList);
tmsOrderAddDTO.setOrderShippingType(2);
tmsOrderAddDTO.setOrderShippingType(businessDocumentOrder.getOrderShippingType().intValue());
tmsOrderAddDTO.setPayerType(0);
tmsOrderAddDTO.setExecuteOrderNumber(executeOrder.getGoodsNumber());
tmsOrderAddDTO.setOrderSource("0");
AjaxResult ajaxResult=wlhyServiceFeign.add(tmsOrderAddDTO);
if(ajaxResult.get("code").toString().equals("200")){
String goodsNumber = (String) ajaxResult.get("data");
if(ObjectUtil.isNotEmpty(goodsNumber)){
executeOrder.setTmsOrderNumber(goodsNumber);
executeOrderMapper.updateById(executeOrder);
}
return true;
}else {
mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java
+40
View File
@@ -7,6 +7,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
import java.util.List;
import com.mhd.common.core.web.domain.BaseVOEntity;
@@ -85,4 +87,42 @@ public class ExecuteOrderPO extends BaseVOEntity{
@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 reservationOrderNumber;
@ApiModelProperty("tms单号")
private String tmsOrderNumber;
@ApiModelProperty("业务单号")
private String businessOrderNumber;
@ApiModelProperty("作业情况")
private String jobStatus;
@ApiModelProperty("预计运输时间")
private Date documentDate;
@ApiModelProperty("备注")
private String shippingNote;
}
mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java
+39
View File
@@ -92,9 +92,48 @@ public class ExecuteOrderDO 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(name = "组织ID集合")
private List<Long> organizationIdList;
@ApiModelProperty(name = "权限菜单ID")
private Long permissionMenuId;
@ApiModelProperty("预约单号")
private String reservationOrderNumber;
@ApiModelProperty("tms单号")
private String tmsOrderNumber;
@ApiModelProperty("业务单号")
private String businessOrderNumber;
@ApiModelProperty("作业情况")
private String jobStatus;
@ApiModelProperty("预计运输时间")
private Date documentDate;
@ApiModelProperty("备注")
private String shippingNote;
}
mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentCargoMulti/BusinessDocumentCargoMultiDTO.java
+3
View File
@@ -99,4 +99,7 @@ public class BusinessDocumentCargoMultiDTO extends BaseVOEntity{
@ApiModelProperty("")
private String materialCode;
@ApiModelProperty("体积")
private BigDecimal materialVolume;
}
mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java
+15
View File
@@ -4,6 +4,7 @@ import com.mhd.common.core.annotation.Excel;
import com.mhd.oms.domain.businessDocumentAddressMulti.entity.BusinessDocumentAddressMulti;
import com.mhd.oms.domain.businessDocumentAddressMulti.repository.todo.BusinessDocumentAddressMultiDO;
import com.mhd.oms.domain.businessDocumentCargoMulti.entity.BusinessDocumentCargoMulti;
import com.mhd.oms.domain.businessOrderAccount.BusinessOrderAccount;
import com.mhd.oms.interfaces.dto.businessDocumentAddressMulti.BusinessDocumentAddressMultiDTO;
import com.mhd.oms.interfaces.dto.businessDocumentCargoMulti.BusinessDocumentCargoMultiDTO;
import lombok.Data;
@@ -753,6 +754,17 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
@ApiModelProperty(value = "开户银行")
private String accountBank;
@ApiModelProperty(value = "业务主管")
private String salesManager;
@ApiModelProperty(value = "审核意见")
private String reviewOpinion;
@ApiModelProperty("订单来源")
private String orderSource;
@ApiModelProperty(value = "出入库单号")
private String entryNumber;
@ApiModelProperty("业务单地址集合")
private List<BusinessDocumentAddressMultiDTO> businessDocumentAddressMultiDTOList;
@@ -769,4 +781,7 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
@ApiModelProperty(value = "卸货地址集合")
private List<BusinessDocumentAddressMultiDTO> unloadAddressList;
@ApiModelProperty("费用科目明细")
private List<BusinessOrderAccount> businessOrderAccountList;
}
mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java
+32
View File
@@ -91,9 +91,41 @@ 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<Long> organizationIdList;
@ApiModelProperty(name = "权限菜单ID")
private Long permissionMenuId;
@ApiModelProperty("作业情况")
private String jobStatus;
@ApiModelProperty("预计运输时间")
private Date documentDate;
@ApiModelProperty("备注")
private String shippingNote;
}
mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentOrder/BusinessDocumentOrderApi.java
+15 -2
View File
@@ -64,6 +64,13 @@ public class BusinessDocumentOrderApi extends BaseController{
}
}
@ApiOperation("根据业务单id查询费用明细")
@GetMapping("/getFeeDetail/{id}")
public AjaxResult getFeeDetail(@PathVariable("id") Long id)
{
return AjaxResult.success(businessDocumentOrderApplicationService.getFeeDetail(id));
}
/**
* 批量删除【业务单】
*/
@@ -89,9 +96,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 +110,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));
}
mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executeOrder/ExecuteOrderApi.java
+11
View File
@@ -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;
}