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

oms修改

Browse Source
This commit is contained in:
赵辉
2026-04-13 09:23:58 +08:00
parent 51dc67957c
commit 287dd2242c
18 changed files with 376 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/entity/BusinessDocumentOrder.java
+7
View File
@@ -737,4 +737,11 @@ public class BusinessDocumentOrder extends BaseVOEntity{
@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/persistence/BusinessDocumentOrderImpl.java
+1
View File
@@ -145,6 +145,7 @@ 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());
mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java
+6
View File
@@ -748,4 +748,10 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
@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
+10
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;
@@ -771,6 +772,15 @@ public class BusinessDocumentOrderDO extends BaseVOEntity{
@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
+65
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,8 @@ 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();
@@ -313,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;
}
@@ -534,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;
}
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
+9
View File
@@ -110,4 +110,13 @@ public class ExecuteOrder extends BaseVOEntity{
@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
+4
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);
}
}
@@ -163,6 +164,9 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
tmsOrderAddDTO.setUnloadAddressList(unloadAddressList);
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");
mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java
+7
View File
@@ -116,6 +116,13 @@ public class ExecuteOrderPO extends BaseVOEntity{
@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
+10
View File
@@ -126,4 +126,14 @@ public class ExecuteOrderDO extends BaseVOEntity{
@ApiModelProperty("业务单号")
private String businessOrderNumber;
@ApiModelProperty("作业情况")
private String jobStatus;
@ApiModelProperty("预计运输时间")
private Date documentDate;
@ApiModelProperty("备注")
private String shippingNote;
}