Merge branch 'dev_20260429' into dev_WMS20260401
# Conflicts: # mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDO.java # mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java
This commit is contained in:
王奎兴
+1
-1
@@ -386,7 +386,7 @@ public class BusinessDocumentOrderDomainService {
|
||||
businessDocumentOrderDO.setOrgName(String.valueOf(u.getUserPo().getOrganizationName()));
|
||||
}
|
||||
businessDocumentOrderDO.setTopOrganizationId(u.getUserPo().getTopOrganizationId());
|
||||
BigDecimal deliveryFreight=tmsOrder.getDeliveryFreight();
|
||||
BigDecimal deliveryFreight=businessDocumentOrderDO.getDeliveryFreight();
|
||||
/**
|
||||
* 生成货源单信息
|
||||
*/
|
||||
|
||||
+14
-3
@@ -992,6 +992,9 @@ public class OmsAddressMultiService implements IOmsAddressMultiService {
|
||||
BeanUtils.copyProperties(tmsOrderAddDTO, resevationOrder);
|
||||
String id = tmsOrderAddDTO.getId();
|
||||
resevationOrder.setId(Long.valueOf(id));
|
||||
if (tmsOrderAddDTO.getOrderType()==2){
|
||||
resevationOrder.setOrderType(0);
|
||||
}
|
||||
|
||||
// 设置更新时间戳和用户信息
|
||||
resevationOrder.setUpdateTime(new Date());
|
||||
@@ -1417,12 +1420,15 @@ public class OmsAddressMultiService implements IOmsAddressMultiService {
|
||||
cargoDTO.setCargoName(reservationCargo.getCargoName());
|
||||
cargoDTO.setCargoNum(reservationCargo.getCargoNum() != null ? reservationCargo.getCargoNum() : BigDecimal.ZERO);
|
||||
cargoDTO.setCargoWeight(reservationCargo.getCargoWeight() != null ? reservationCargo.getCargoWeight() : BigDecimal.ZERO);
|
||||
cargoDTO.setWeight(reservationCargo.getCargoWeight() != null ? reservationCargo.getCargoWeight() : BigDecimal.ZERO);
|
||||
cargoDTO.setMaterialVolume(reservationCargo.getCargoVolume() != null ? reservationCargo.getCargoVolume() : BigDecimal.ZERO);
|
||||
cargoDTO.setCargoUnitName(reservationCargo.getCargoUnitName());
|
||||
cargoDTO.setWeightUnit(reservationCargo.getCargoUnitName());
|
||||
cargoDTO.setGoodsTypeId(reservationCargo.getGoodsTypeId());
|
||||
cargoDTO.setGoodsType(reservationCargo.getGoodsType());
|
||||
cargoDTO.setGoodsNameId(reservationCargo.getGoodsNameId());
|
||||
cargoDTO.setGoodsName(reservationCargo.getGoodsName());
|
||||
cargoDTO.setCargoName(reservationCargo.getGoodsName());
|
||||
cargoDTO.setMaterialContent(reservationCargo.getCargoContent());
|
||||
cargoDTO.setMachineCode(reservationCargo.getMachineCode());
|
||||
businessDocumentCargoMultiList.add(cargoDTO);
|
||||
@@ -1522,8 +1528,8 @@ public class OmsAddressMultiService implements IOmsAddressMultiService {
|
||||
tmsCargoInfo.setCreateTime(new Date());
|
||||
tmsCargoInfo.setUpdateTime(new Date());
|
||||
tmsCargoInfo.setOrderId(id);
|
||||
tmsCargoInfo.setCargoWeight(tmsCargoInfoDTO.getWeight()==null ? BigDecimal.ZERO: tmsCargoInfoDTO.getWeight());
|
||||
tmsCargoInfo.setCargoVolume(tmsCargoInfoDTO.getMaterialVolume()==null ? BigDecimal.ZERO: tmsCargoInfoDTO.getMaterialVolume());
|
||||
tmsCargoInfo.setCargoWeight(tmsCargoInfoDTO.getCargoWeight()==null ? BigDecimal.ZERO: tmsCargoInfoDTO.getCargoWeight());
|
||||
tmsCargoInfo.setCargoVolume(tmsCargoInfoDTO.getCargoVolume()==null ? BigDecimal.ZERO: tmsCargoInfoDTO.getCargoVolume());
|
||||
tmsCargoInfo.setCargoContent(tmsCargoInfoDTO.getCargoContent());
|
||||
tmsCargoInfo.setCargoNum(tmsCargoInfoDTO.getCargoNum()==null ? BigDecimal.ZERO: tmsCargoInfoDTO.getCargoNum());
|
||||
tmsCargoInfo.setGoodsName(tmsCargoInfoDTO.getGoodsName());
|
||||
@@ -1682,6 +1688,10 @@ public class OmsAddressMultiService implements IOmsAddressMultiService {
|
||||
|
||||
@Override
|
||||
public Map<Integer, Long> countByOrderType() {
|
||||
//获取当前登录用户
|
||||
LoginUser loginUser = SecurityUtils.getLoginUser();
|
||||
Long userId = loginUser.getUserPo().getUserId();
|
||||
|
||||
// 使用MyBatis Plus的LambdaQueryWrapper进行分组统计
|
||||
Map<Integer, Long> countMap = new HashMap<>();
|
||||
|
||||
@@ -1689,7 +1699,8 @@ public class OmsAddressMultiService implements IOmsAddressMultiService {
|
||||
for (int i = 0; i <= 5; i++) {
|
||||
LambdaQueryWrapper<ReservationOrder> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(ReservationOrder::getIsDelete, 0)
|
||||
.eq(ReservationOrder::getOrderType, i);
|
||||
.eq(ReservationOrder::getOrderType, i)
|
||||
.eq(ReservationOrder::getRealCreateBy, userId);
|
||||
long count = resevationOrderMapper.selectCount(queryWrapper);
|
||||
countMap.put(i, count);
|
||||
}
|
||||
|
||||
@@ -62,6 +62,9 @@ public class OmsCargoInfoDTO implements Serializable {
|
||||
@ApiModelProperty("体积")
|
||||
private BigDecimal materialVolume;
|
||||
|
||||
@ApiModelProperty("货物体积")
|
||||
private BigDecimal cargoVolume;
|
||||
|
||||
@ApiModelProperty("内容")
|
||||
private String cargoContent;
|
||||
|
||||
|
||||
@@ -480,6 +480,9 @@ public class OmsOrderAddDTO implements Serializable {
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private java.util.Date documentDate;
|
||||
|
||||
@ApiModelProperty(value = "预约单类型")
|
||||
private Integer orderType;
|
||||
|
||||
|
||||
@ApiModelProperty("费用科目明细")
|
||||
private List<OmsOrderAccount> tmsOrderAccountList;
|
||||
|
||||
+6
-1
@@ -236,7 +236,12 @@ public class ResevationOrderApi extends BaseController{
|
||||
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return Result.error("取消预约失败：" + e.getMessage());
|
||||
String errorMsg = e.getMessage();
|
||||
// 移除错误消息中的换行符及后面的无用信息
|
||||
if (errorMsg != null && errorMsg.contains("\n[ErrorCode]:")) {
|
||||
errorMsg = errorMsg.substring(0, errorMsg.indexOf("\n[ErrorCode]:"));
|
||||
}
|
||||
return Result.error("取消预约失败:" + errorMsg);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -18,17 +18,17 @@ spring:
|
||||
discovery:
|
||||
# server-addr: 127.0.0.1:8848
|
||||
# 线上测试环境配置 容器名+端口号
|
||||
server-addr: 10.33.0.129:6010
|
||||
# server-addr: 10.102.192.5:6848
|
||||
# username: nacos
|
||||
# password: manhuoda@2023
|
||||
# server-addr: 10.33.0.129:6010
|
||||
server-addr: 10.102.192.31:6848
|
||||
username: nacos
|
||||
password: manhuoda@2023
|
||||
config:
|
||||
# server-addr: 127.0.0.1:8848
|
||||
# 线上测试环境配置 容器名+端口号
|
||||
server-addr: 10.33.0.129:6010
|
||||
# server-addr: 10.102.192.5:6848
|
||||
# username: nacos
|
||||
# password: manhuoda@2023
|
||||
# server-addr: 10.33.0.129:6010
|
||||
server-addr: 10.102.192.31:6848
|
||||
username: nacos
|
||||
password: manhuoda@2023
|
||||
#线上正式环境
|
||||
# server-addr: 10.102.192.105:6848
|
||||
# 锁定server端的配置文件（读取它的配置项）
|
||||
|
||||
Reference in New Issue
Block a user