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

执行单添加发牌状态与日期，入库单添加运输业务单号

Browse Source
This commit is contained in:
赵辉
2026-06-04 16:28:08 +08:00
parent c7e4ced035
commit 3a004607b2
8 changed files with 79 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java
+6 -6
View File
@@ -2331,12 +2331,12 @@ public class UserApplicationService {
}
}
//用户账号传值
if (StringUtils.isNotEmpty(checkDO.getUserAccount())) {
//调用工具类校验，用户账号格式错误
if (!RegexUtil.isAccountLegal(checkDO.getUserAccount())) {
throw new DigitalLogisticsException(UserError.USER_ACCOUNT_REG_ERROR);
}
}
// if (StringUtils.isNotEmpty(checkDO.getUserAccount())) {
// //调用工具类校验，用户账号格式错误
// if (!RegexUtil.isAccountLegal(checkDO.getUserAccount())) {
// throw new DigitalLogisticsException(UserError.USER_ACCOUNT_REG_ERROR);
// }
// }
//用户手机号传值
// if (StringUtils.isNotEmpty(checkDO.getUserPhone()) && checkDO.getDataSources() != null && checkDO.getDataSources()!=2) {
// //调用工具类校验，手机号格式错误
mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
+11
View File
@@ -25,6 +25,8 @@ import com.mhd.oms.domain.businessOrderAccount.BusinessOrderAccount;
import com.mhd.oms.domain.businessOrderAccount.repository.mapper.BusinessOrderAccountMapper;
import com.mhd.oms.domain.reservationOrder.entity.ReservationOrder;
import com.mhd.oms.domain.reservationOrder.repository.mapper.ReservationOrderMapper;
import com.mhd.oms.domain.reservationStockInOrder.entity.ReservationStockInOrder;
import com.mhd.oms.domain.reservationStockInOrder.repository.mapper.ReservationStockInOrderMapper;
import com.mhd.oms.domain.reservationStockOutOrder.entity.ReservationStockOutOrder;
import com.mhd.oms.domain.reservationStockOutOrder.repository.mapper.ReservationStockOutOrderMapper;
import com.mhd.oms.domain.reserveStockOutOrder.entity.ReserveStockOutOrder;
@@ -83,6 +85,9 @@ public class BusinessDocumentOrderDomainService {
@Resource
private ReservationStockOutOrderMapper reservationStockOutOrderMapper;
@Autowired
private ReservationStockInOrderMapper reservationStockInOrderMapper;
/**
* 分页查询【请填写功能名称】列表
*/
@@ -233,6 +238,12 @@ public class BusinessDocumentOrderDomainService {
reservationStockOutOrder.setBusinessNumber(tmsOrder.getGoodsNumber());
reservationStockOutOrderMapper.updateById(reservationStockOutOrder);
}
ReservationStockInOrder reservationStockInOrder = reservationStockInOrderMapper.selectOne(new LambdaQueryWrapper<ReservationStockInOrder>().eq(ReservationStockInOrder::getInOrderNumber, tmsOrder.getInOrderNumber()));
if (reservationStockInOrder != null){
reservationStockInOrder.setBusinessNumber(tmsOrder.getGoodsNumber());
reservationStockInOrderMapper.updateById(reservationStockInOrder);
}
List<BusinessDocumentAddressMultiDTO> loadingAddressList = businessDocumentOrderDO.getLoadingAddressList();//装货地信息集合
List<BusinessDocumentAddressMultiDTO> unloadAddressList = businessDocumentOrderDO.getUnloadAddressList();//卸货地信息集合
String loadCityCounty="",unloadCityCounty="";
mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/entity/ExecuteOrder.java
+7
View File
@@ -150,5 +150,12 @@ public class ExecuteOrder extends BaseVOEntity{
@Excel(name = "发票编号")
private String invoiceNumber;
@ApiModelProperty("发票上传状态(0.未上传,1.已上传)")
private Integer invoiceStatus;
@ApiModelProperty("发票上传时间")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date invoiceDate;
}
mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java
+9
View File
@@ -12,6 +12,7 @@ import java.math.BigDecimal;
import java.util.List;
import com.mhd.common.core.web.domain.BaseVOEntity;
import org.springframework.format.annotation.DateTimeFormat;
/**
@@ -222,4 +223,12 @@ public class ExecuteOrderPO extends BaseVOEntity{
@Excel(name = "卸货联系人")
private String dischargerName;
@ApiModelProperty("发票上传状态(0.未上传,1.已上传)")
private Integer invoiceStatus;
@ApiModelProperty("发票上传时间")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date invoiceDate;
}
mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java
+18
View File
@@ -151,4 +151,22 @@ public class ExecuteOrderDO extends BaseVOEntity{
@ApiModelProperty("发票编号")
@Excel(name = "发票编号")
private String invoiceNumber;
@ApiModelProperty("发票上传状态(0.未上传,1.已上传)")
private Integer invoiceStatus;
@ApiModelProperty("发票上传时间")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date invoiceDate;
@ApiModelProperty("发票上传开始时间")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date invoiceStartTime;
@ApiModelProperty("发票上传结束时间")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date invoiceEndTime;
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java
+3
View File
@@ -427,4 +427,7 @@ public class ReservationStockInOrder extends BaseVOEntity {
@ApiModelProperty("推送人姓名")
private String pushByName;
@ApiModelProperty("运输业务单号")
private String businessNumber;
}
mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java
+19
View File
@@ -137,4 +137,23 @@ public class ExecuteOrderDTO extends BaseVOEntity{
@ApiModelProperty("业务单元")
private String businessUnit;
@ApiModelProperty("发票上传状态(0.未上传,1.已上传)")
private Integer invoiceStatus;
@ApiModelProperty("发票上传时间")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date invoiceDate;
@ApiModelProperty("发票上传开始时间")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date invoiceStartTime;
@ApiModelProperty("发票上传结束时间")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date invoiceEndTime;
}
mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml
+6
View File
@@ -54,6 +54,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="goodsNumber != null and goodsNumber != ''">
and eo.GOODS_NUMBER like concat('%', #{goodsNumber}, '%')
</if>
<if test="invoiceStartTime != null">
and eo.INVOICE_DATE &gt;= #{invoiceStartTime}
</if>
<if test="invoiceEndTime != null">
and eo.INVOICE_DATE &lt;= #{invoiceEndTime}
</if>
<if test="businessUnit != null and businessUnit != ''">
and eo.BUSINESS_UNIT like concat('%', #{businessUnit}, '%')
</if>