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-18 14:19:12 +08:00
parent 7f701ca701
commit d6ee9fb2ec
8 changed files with 84 additions and 11 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
+19
View File
@@ -26,6 +26,10 @@ 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;
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.system.api.WlhyServiceFeign;
import com.mhd.system.api.model.LoginUser;
import org.springframework.beans.BeanUtils;
@@ -63,6 +67,11 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
@Autowired
private BusinessOrderAccountMapper businessOrderAccountMapper;
@Autowired
private ReservationStockInOrderMapper reservationStockInOrderMapper;
@Autowired
private ReservationStockOutOrderMapper reservationStockOutOrderMapper;
@Autowired
private WlhyServiceFeign wlhyServiceFeign;
@@ -356,6 +365,16 @@ 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);
}
}
}else {
throw new ServiceException(ajaxResult.get("msg").toString());
mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java
+22
View File
@@ -1,6 +1,7 @@
package com.mhd.oms.domain.executeOrder.repository.persistence;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mhd.common.core.domain.dto.wlhy.TmsAddressMultiDTO;
@@ -24,6 +25,10 @@ import com.mhd.oms.domain.executeOrder.repository.facade.IExecuteOrderService;
import com.mhd.oms.domain.executeOrder.repository.mapper.ExecuteOrderMapper;
import com.mhd.oms.domain.executeOrder.repository.po.ExecuteOrderPO;
import com.mhd.oms.domain.executeOrder.repository.todo.ExecuteOrderDO;
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.system.api.WlhyServiceFeign;
import com.mhd.system.api.model.LoginUser;
import io.swagger.annotations.ApiModelProperty;
@@ -55,6 +60,11 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
@Autowired
private BusinessDocumentAddressMultiMapper businessDocumentAddressMultiMapper;
@Autowired
private ReservationStockInOrderMapper reservationStockInOrderMapper;
@Autowired
private ReservationStockOutOrderMapper reservationStockOutOrderMapper;
@Autowired
private WlhyServiceFeign wlhyServiceFeign;
@Autowired
@@ -106,6 +116,7 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean issueDocuments(Long[] ids) {
LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人
for (Long id:ids){
@@ -199,6 +210,17 @@ 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);
}
}
return true;
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java
+3
View File
@@ -386,4 +386,7 @@ public class ReservationStockInOrder extends BaseVOEntity {
@ApiModelProperty("业务员名称")
private String salesmanName;
@ApiModelProperty("tms订单号")
private String tmsOrderNumber;
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java
+1
View File
@@ -409,4 +409,5 @@ public class ReservationStockInOrderPO extends BaseVOEntity {
private String salesmanId;
@ApiModelProperty("业务员名称")
private String salesmanName;
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java
+15 -10
View File
@@ -177,16 +177,21 @@ public class ReservationStockInOrderDomainService {
ReservationInMaterialDetailBaseDO inMaterialDetailBaseDO = new ReservationInMaterialDetailBaseDO();
BeanUtils.copyProperties(stockInOrderPO, inMaterialDetailBaseDO);
inMaterialDetailBaseDO.setInOrderNumber(stockInOrderPO.getInOrderNumber());
if (stockInOrderDO.getNeedTransport() ==0) {
List<BusinessDocumentOrder> businessDocumentOrders = businessDocumentOrderMapper.selectList(new LambdaQueryWrapper<BusinessDocumentOrder>().eq(BusinessDocumentOrder::getInOrderNumber, stockInOrderDO.getInOrderNumber()).notIn(BusinessDocumentOrder::getOrderStatus, 4, 5));
if (businessDocumentOrders != null && businessDocumentOrders.size() > 0) {
for (BusinessDocumentOrder businessDocumentOrder : businessDocumentOrders) {
businessDocumentOrder.setOrderStatus(4L);
businessDocumentOrderMapper.updateById(businessDocumentOrder);
}
}
}
// if (stockInOrderDO.getNeedTransport() ==0) {
// List<BusinessDocumentOrder> businessDocumentOrders = businessDocumentOrderMapper.selectList(new LambdaQueryWrapper<BusinessDocumentOrder>().eq(BusinessDocumentOrder::getInOrderNumber, stockInOrderDO.getInOrderNumber()).notIn(BusinessDocumentOrder::getOrderStatus, 4, 5));
// if (businessDocumentOrders != null && businessDocumentOrders.size() > 0) {
// for (BusinessDocumentOrder businessDocumentOrder : businessDocumentOrders) {
// businessDocumentOrder.setOrderStatus(4L);
// String executeOrderNumber = businessDocumentOrder.getExecuteOrderNumber();
//
// if (executeOrderNumber !=null){
// throw new ServiceException("该业务单已生成执行单，取消失败");
// }
// businessDocumentOrderMapper.updateById(businessDocumentOrder);
// }
// }
// }
//
return materialDetailService.batchUpdate(stockInOrderDO.getMaterialDetailList(), inMaterialDetailBaseDO);
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java
+3
View File
@@ -427,4 +427,7 @@ public class ReservationStockOutOrder extends BaseVOEntity {
@ApiModelProperty("业务员名称")
private String salesmanName;
@ApiModelProperty("tms订单号")
private String tmsOrderNumber;
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java
+20
View File
@@ -2,6 +2,7 @@ package com.mhd.oms.domain.reservationStockOutOrder.service;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -11,6 +12,8 @@ import com.mhd.common.core.utils.StringUtils;
import com.mhd.common.core.utils.bean.BeanUtils;
import com.mhd.common.core.web.domain.AjaxResult;
import com.mhd.common.security.utils.SecurityUtils;
import com.mhd.oms.domain.businessDocumentOrder.entity.BusinessDocumentOrder;
import com.mhd.oms.domain.businessDocumentOrder.repository.mapper.BusinessDocumentOrderMapper;
import com.mhd.oms.domain.reservationInMaterialDetail.entity.ReservationInMaterialDetail;
import com.mhd.oms.domain.reservationOutMaterialDetail.entity.ReservationOutMaterialDetail;
import com.mhd.oms.domain.reservationOutMaterialDetail.repository.facade.IReservationOutMaterialDetailService;
@@ -85,6 +88,8 @@ public class ReservationStockOutOrderDomainService {
// private IMaterialBaseInfoService materialBaseInfoService;
@Autowired
private ReservationStockInOrderMapper reservationStockInOrderMapper;
@Autowired
private BusinessDocumentOrderMapper businessDocumentOrderMapper;
// @Autowired
// private IMaterialWarehouseControlService materialWarehouseControlService;
// @Autowired
@@ -192,6 +197,21 @@ public class ReservationStockOutOrderDomainService {
ReservationOutMaterialDetailBaseDO outMaterialDetailBaseDO = new ReservationOutMaterialDetailBaseDO();
BeanUtils.copyProperties(stockOutOrderDO, outMaterialDetailBaseDO);
outMaterialDetailBaseDO.setOutOrderNumber(stockInOrderPO.getOutOrderNumber());
// if (stockOutOrderDO.getNeedTransportFlag() .equals("0")) {
// List<BusinessDocumentOrder> businessDocumentOrders = businessDocumentOrderMapper.selectList(new LambdaQueryWrapper<BusinessDocumentOrder>().eq(BusinessDocumentOrder::getInOrderNumber, stockOutOrderDO.getOutOrderNumber()).notIn(BusinessDocumentOrder::getOrderStatus, 4, 5));
// if (businessDocumentOrders != null && businessDocumentOrders.size() > 0) {
// for (BusinessDocumentOrder businessDocumentOrder : businessDocumentOrders) {
// businessDocumentOrder.setOrderStatus(4L);
// String executeOrderNumber = businessDocumentOrder.getExecuteOrderNumber();
//
// if (executeOrderNumber !=null){
// throw new ServiceException("该业务单已生成执行单，取消失败");
// }
// businessDocumentOrderMapper.updateById(businessDocumentOrder);
// }
// }
// }
return outMaterialDetailService.batchUpdate(stockOutOrderDO.getMaterialDetailList(), outMaterialDetailBaseDO);
}
mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
+1 -1
View File
@@ -94,7 +94,7 @@
a.in_order_id, a.organization_id, a.organization_name, a.top_organization_id, a.notice_number, a.in_order_number, a.status,
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.supplier_id, a.supplier_code, a.supplier_name, a.expect_time, a.supply_chain_number,
a.priority_level_code, a.priority_level_name, a.direct_warehouse, a.annex_url, a.material_quantity, a.quantity,
a.priority_level_code, a.priority_level_name, a.direct_warehouse, a.annex_url, a.material_quantity, a.quantity,a.business_order_no,
-- 计划入库数量：入库明细表 in_material_detail 的 quantity 汇总
<!-- (select ifnull(sum(imd.quantity), 0)-->
<!-- from in_material_detail imd-->