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-22 17:22:06 +08:00
parent 3062adeca9
commit bf33392aed
6 changed files with 527 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java
+13 -10
View File
@@ -23,7 +23,6 @@ import com.mhd.oms.domain.businessOrderAccount.repository.mapper.BusinessOrderAc
import com.mhd.common.core.domain.dto.wlhy.TmsAddressMultiDTO;
import com.mhd.common.core.domain.dto.wlhy.TmsCargoInfoDTO;
import com.mhd.common.core.domain.dto.wlhy.TmsOrderAccount;
import com.mhd.common.core.domain.dto.wlhy.TmsOrderAddDTO;
import com.mhd.common.core.exception.ServiceException;
import com.mhd.common.core.web.domain.AjaxResult;
import com.mhd.oms.domain.reservationStockInOrder.entity.ReservationStockInOrder;
@@ -31,6 +30,7 @@ import com.mhd.oms.domain.reservationStockInOrder.repository.mapper.ReservationS
import com.mhd.oms.domain.reservationStockOutOrder.entity.ReservationStockOutOrder;
import com.mhd.oms.domain.reservationStockOutOrder.repository.mapper.ReservationStockOutOrderMapper;
import com.mhd.system.api.WlhyServiceFeign;
import com.mhd.system.api.domain.TmsOrderAddDTO;
import com.mhd.system.api.model.LoginUser;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -359,6 +359,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
tmsOrderAddDTO.setExecuteOrderNumber(executeOrder.getGoodsNumber());
tmsOrderAddDTO.setOrderSource("0");
tmsOrderAddDTO.setOrganizationId(organizationId);
tmsOrderAddDTO.setLoginUser(loginUser);
String orgName = executeOrderMapper.getOrgNameByOrgId(organizationId);
tmsOrderAddDTO.setOrganizationName(orgName);
@@ -369,15 +370,17 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
if(ObjectUtil.isNotEmpty(goodsNumber)){
executeOrder.setTmsOrderNumber(goodsNumber);
executeOrderMapper.updateById(executeOrder);
ReservationStockInOrder reservationStockInOrder = reservationStockInOrderMapper.selectOne(new LambdaQueryWrapper<ReservationStockInOrder>().eq(ReservationStockInOrder::getBusinessOrderNo, executeOrder.getGoodsNumber()));
if (ObjectUtil.isNotNull(reservationStockInOrder)) {
reservationStockInOrder.setTmsOrderNumber(goodsNumber);
reservationStockInOrderMapper.updateById(reservationStockInOrder);
}
ReservationStockOutOrder reservationStockOutOrder = reservationStockOutOrderMapper.selectOne(new LambdaQueryWrapper<ReservationStockOutOrder>().eq(ReservationStockOutOrder::getBusinessOrderNo, executeOrder.getGoodsNumber()));
if (ObjectUtil.isNotNull(reservationStockOutOrder)) {
reservationStockOutOrder.setTmsOrderNumber(goodsNumber);
reservationStockOutOrderMapper.updateById(reservationStockOutOrder);
if (businessDocumentOrder.getInOrderNumber()!=null){
ReservationStockInOrder reservationStockInOrder = reservationStockInOrderMapper.selectOne(new LambdaQueryWrapper<ReservationStockInOrder>().eq(ReservationStockInOrder::getInOrderNumber,businessDocumentOrder.getInOrderNumber()));
if (ObjectUtil.isNotNull(reservationStockInOrder)) {
reservationStockInOrder.setTmsOrderNumber(goodsNumber);
reservationStockInOrderMapper.updateById(reservationStockInOrder);
}
ReservationStockOutOrder reservationStockOutOrder = reservationStockOutOrderMapper.selectOne(new LambdaQueryWrapper<ReservationStockOutOrder>().eq(ReservationStockOutOrder::getOutOrderNumber,businessDocumentOrder.getInOrderNumber()));
if (ObjectUtil.isNotNull(reservationStockOutOrder)) {
reservationStockOutOrder.setTmsOrderNumber(goodsNumber);
reservationStockOutOrderMapper.updateById(reservationStockOutOrder);
}
}
}
}else {
mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java
+14 -10
View File
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mhd.common.core.domain.dto.wlhy.TmsAddressMultiDTO;
import com.mhd.common.core.domain.dto.wlhy.TmsCargoInfoDTO;
import com.mhd.common.core.domain.dto.wlhy.TmsOrderAccount;
import com.mhd.common.core.domain.dto.wlhy.TmsOrderAddDTO;
import com.mhd.system.api.domain.TmsOrderAddDTO;
import com.mhd.common.core.domain.entity.TmsOrder;
import com.mhd.common.core.exception.ServiceException;
import com.mhd.common.core.web.domain.AjaxResult;
@@ -204,6 +204,7 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
tmsOrderAddDTO.setExecuteOrderNumber(executeOrder.getGoodsNumber());
tmsOrderAddDTO.setOrderSource("0");
tmsOrderAddDTO.setOrganizationId(organizationId);
tmsOrderAddDTO.setLoginUser(loginUser);
String orgName = executeOrderMapper.getOrgNameByOrgId(organizationId);
tmsOrderAddDTO.setOrganizationName(orgName);
@@ -214,17 +215,20 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
if(ObjectUtil.isNotEmpty(goodsNumber)){
executeOrder.setTmsOrderNumber(goodsNumber);
executeOrderMapper.updateById(executeOrder);
ReservationStockInOrder reservationStockInOrder = reservationStockInOrderMapper.selectOne(new LambdaQueryWrapper<ReservationStockInOrder>().eq(ReservationStockInOrder::getBusinessOrderNo, executeOrder.getGoodsNumber()));
if (ObjectUtil.isNotNull(reservationStockInOrder)) {
reservationStockInOrder.setTmsOrderNumber(goodsNumber);
reservationStockInOrderMapper.updateById(reservationStockInOrder);
}
ReservationStockOutOrder reservationStockOutOrder = reservationStockOutOrderMapper.selectOne(new LambdaQueryWrapper<ReservationStockOutOrder>().eq(ReservationStockOutOrder::getBusinessOrderNo, executeOrder.getGoodsNumber()));
if (ObjectUtil.isNotNull(reservationStockOutOrder)) {
reservationStockOutOrder.setTmsOrderNumber(goodsNumber);
reservationStockOutOrderMapper.updateById(reservationStockOutOrder);
if (businessDocumentOrder.getInOrderNumber()!=null){
ReservationStockInOrder reservationStockInOrder = reservationStockInOrderMapper.selectOne(new LambdaQueryWrapper<ReservationStockInOrder>().eq(ReservationStockInOrder::getInOrderNumber,businessDocumentOrder.getInOrderNumber()));
if (ObjectUtil.isNotNull(reservationStockInOrder)) {
reservationStockInOrder.setTmsOrderNumber(goodsNumber);
reservationStockInOrderMapper.updateById(reservationStockInOrder);
}
ReservationStockOutOrder reservationStockOutOrder = reservationStockOutOrderMapper.selectOne(new LambdaQueryWrapper<ReservationStockOutOrder>().eq(ReservationStockOutOrder::getOutOrderNumber,businessDocumentOrder.getInOrderNumber()));
if (ObjectUtil.isNotNull(reservationStockOutOrder)) {
reservationStockOutOrder.setTmsOrderNumber(goodsNumber);
reservationStockOutOrderMapper.updateById(reservationStockOutOrder);
}
}
}
mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
+1 -1
View File
@@ -102,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.audit_status, a.audit_remark, a.audit_by, a.audit_by_name, a.audit_time, a.warehouse_id, a.warehouse_code, a.warehouse_name, a.shipper_id, a.shipper_code,
a.shipper_name, a.order_type_code, a.order_type_name, a.customer_id, a.customer_code, a.customer_name, a.expect_time, a.supply_chain_number, a.priority_level_code,
a.priority_level_name, a.direct_warehouse, a.review, a.annex_url, a.material_quantity, a.quantity, a.weight_limit, a.volume_limit, a.check_quantity, a.cancel_order, a.cancel_remark, a.cancel_by, a.cancel_by_name,
a.cancel_time, a.close_order, a.close_remark, a.close_by, a.close_by_name, a.close_time, a.check_status,
a.cancel_time, a.close_order, a.close_remark, a.close_by, a.close_by_name, a.close_time, a.check_status,a.BUSINESS_ORDER_NO,
a.check_task_distribution, a.check_task_distribution_time, a.check_operators_by, a.check_operators_name, a.mobilize_code,
a.remark, a.create_time, a.create_by, a.create_by_name,
a.update_time, a.update_by, a.update_by_name, a.del_flag, over_stock_id, over_stock_status, over_stock_type,a."TO",