diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java index fb1f49065..7a2515c9b 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java @@ -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().eq(ReservationStockInOrder::getBusinessOrderNo, executeOrder.getGoodsNumber())); + if (ObjectUtil.isNotNull(reservationStockInOrder)) { + reservationStockInOrder.setTmsOrderNumber(goodsNumber); + reservationStockInOrderMapper.updateById(reservationStockInOrder); + } + ReservationStockOutOrder reservationStockOutOrder = reservationStockOutOrderMapper.selectOne(new LambdaQueryWrapper().eq(ReservationStockOutOrder::getBusinessOrderNo, executeOrder.getGoodsNumber())); + if (ObjectUtil.isNotNull(reservationStockOutOrder)) { + reservationStockOutOrder.setTmsOrderNumber(goodsNumber); + reservationStockOutOrderMapper.updateById(reservationStockOutOrder); + } } }else { throw new ServiceException(ajaxResult.get("msg").toString()); diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java index 36d66585a..f83d05440 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java @@ -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().eq(ReservationStockInOrder::getBusinessOrderNo, executeOrder.getGoodsNumber())); + if (ObjectUtil.isNotNull(reservationStockInOrder)) { + reservationStockInOrder.setTmsOrderNumber(goodsNumber); + reservationStockInOrderMapper.updateById(reservationStockInOrder); + } + ReservationStockOutOrder reservationStockOutOrder = reservationStockOutOrderMapper.selectOne(new LambdaQueryWrapper().eq(ReservationStockOutOrder::getBusinessOrderNo, executeOrder.getGoodsNumber())); + if (ObjectUtil.isNotNull(reservationStockOutOrder)) { + reservationStockOutOrder.setTmsOrderNumber(goodsNumber); + reservationStockOutOrderMapper.updateById(reservationStockOutOrder); + } + } return true; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java index f315cf684..765976e0d 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java @@ -386,4 +386,7 @@ public class ReservationStockInOrder extends BaseVOEntity { @ApiModelProperty("业务员名称") private String salesmanName; + @ApiModelProperty("tms订单号") + private String tmsOrderNumber; + } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java index 05377a3b4..3b51b668b 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java @@ -409,4 +409,5 @@ public class ReservationStockInOrderPO extends BaseVOEntity { private String salesmanId; @ApiModelProperty("业务员名称") private String salesmanName; + } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java index 8f7637f8d..a6d55e2fd 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java @@ -177,16 +177,21 @@ public class ReservationStockInOrderDomainService { ReservationInMaterialDetailBaseDO inMaterialDetailBaseDO = new ReservationInMaterialDetailBaseDO(); BeanUtils.copyProperties(stockInOrderPO, inMaterialDetailBaseDO); inMaterialDetailBaseDO.setInOrderNumber(stockInOrderPO.getInOrderNumber()); - if (stockInOrderDO.getNeedTransport() ==0) { - List businessDocumentOrders = businessDocumentOrderMapper.selectList(new LambdaQueryWrapper().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 businessDocumentOrders = businessDocumentOrderMapper.selectList(new LambdaQueryWrapper().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); } diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java index 0cc798e61..9072dc4bd 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java @@ -427,4 +427,7 @@ public class ReservationStockOutOrder extends BaseVOEntity { @ApiModelProperty("业务员名称") private String salesmanName; + @ApiModelProperty("tms订单号") + private String tmsOrderNumber; + } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java index 35dccb28c..669b901d8 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java @@ -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 businessDocumentOrders = businessDocumentOrderMapper.selectList(new LambdaQueryWrapper().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); } diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml index 7c3b99a63..61b74660f 100644 --- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml @@ -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 汇总