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

组织排队开关，新增用户司机同步yms，oms预约单修改

Browse Source
This commit is contained in:
赵辉
2026-05-21 15:15:49 +08:00
parent a29ac3050e
commit 4f03f56126
26 changed files with 465 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
+1 -1
View File
@@ -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();
/**
* 生成货源单信息
*/
mhd_oms/src/main/java/com/mhd/oms/domain/reservationOrder/service/OmsAddressMultiService.java
+14 -3
View File
@@ -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);
}