From 3e31c560d6c2e04adb3d0e668885c62ade8fc326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com> Date: Fri, 29 May 2026 22:58:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1=E5=8D=95bu?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mhd/system/api/OmsServiceFeign.java | 2 +- .../BusinessDocumentOrderImpl.java | 343 ++++++++++-------- .../BusinessDocumentOrderDomainService.java | 16 +- .../persistence/ExecuteOrderImpl.java | 12 +- .../repository/po/ExecuteOrderPO.java | 2 +- .../entity/ReservationStockOutOrder.java | 4 + .../po/ReservationStockOutOrderPO.java | 4 + .../todo/ReservationStockOutOrderDO.java | 4 + .../todo/ReservationStockOutOrderDTO.java | 4 + .../BusinessDocumentOrderMapper.xml | 10 +- .../ReservationStockOutOrderMapper.xml | 2 +- 11 files changed, 252 insertions(+), 151 deletions(-) diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java index 67bfc1ea6..5c75d2a54 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.concurrent.CompletableFuture; -@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE, url = "http://10.33.0.99:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE, fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface OmsServiceFeign { 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 908015ab2..157768725 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 @@ -226,6 +226,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl().eq(ExecuteOrder::getBusinessDocumentId, id).eq(ExecuteOrder::getDelFlag,1) .last("LIMIT 1") - ); - if (ObjectUtil.isNotNull(objects)) { - throw new ServerException("业务单已生成执行单，请先取消执行单"); - } - - // 先创建执行单 - ExecuteOrderDO executeOrderDO=new ExecuteOrderDO(); - BeanUtils.copyProperties(businessDocumentOrder,executeOrderDO); - executeOrderDO.setDocumentDate(businessDocumentOrder.getDocumentDate()); - executeOrderDO.setLayDate(businessDocumentOrder.getLayDate()); - executeOrderDO.setBusinessDocumentId(id); - executeOrderDO.setBusinessDocumentNumber(businessDocumentOrder.getGoodsNumber()); - executeOrderDO.setGoodsNumber(businessDocumentOrder.getGoodsNumber()); - executeOrderDO.setCreateBy(loginUser.getUserid()); - executeOrderDO.setCreateTime(new Date()); - executeOrderDO.setCreateByName(loginUser.getWlhyLoginUser().getRealname()); - executeOrderDO.setUpdateByName(loginUser.getWlhyLoginUser().getRealname()); - executeOrderDO.setDelFlag(1); - executeOrderDO.setOrganizationId(businessDocumentOrder.getOrganizationId()); - executeOrderDO.setOrgName(businessDocumentOrder.getOrgName()); - executeOrderDO.setTopOrganizationId(businessDocumentOrder.getTopOrganizationId()); - executeOrderDO.setReservationOrderNumber(businessDocumentOrder.getReservationOrderNumber()); - - Long executeOrderId = executeOrderDomainService.insert(executeOrderDO); - - // 更新业务单状态和执行单信息 - businessDocumentOrder.setExecuteId(loginUser.getUserid()); - businessDocumentOrder.setExecuteStatus(2L); - businessDocumentOrder.setExecuteTime(new Date()); - businessDocumentOrder.setExecutor(loginUser.getUsername()); - businessDocumentOrder.setOrderStatus(2L); - businessDocumentOrder.setExecuteOrderId(String.valueOf(executeOrderId)); - businessDocumentOrder.setExecuteOrderNumber(businessDocumentOrder.getGoodsNumber()); - businessDocumentOrderMapper.updateById(businessDocumentOrder); - - // 创建执行单后立即下发到TMS - ExecuteOrder executeOrder = executeOrderMapper.selectById(executeOrderId); - if (ObjectUtil.isNotNull(executeOrder)){ - executeOrder.setIssueStatus(2L); - executeOrder.setIssueTime(new Date()); - executeOrder.setIssueId(loginUser.getUserid()); - executeOrder.setIssueName(loginUser.getWlhyLoginUser().getRealname()); - executeOrder.setUpdateByName(loginUser.getWlhyLoginUser().getRealname()); - executeOrder.setOrderStatus(1L); - executeOrder.setBusinessUnit(orgName); - executeOrderMapper.updateById(executeOrder); + // 判断是否为拆单-主单(splicingOrderType == 4) + if (businessDocumentOrder.getSplicingOrderType() != null && businessDocumentOrder.getSplicingOrderType() == 4) { + // 查询所有子单 + List subOrders = businessDocumentOrderMapper.selectList( + new LambdaQueryWrapper() + .eq(BusinessDocumentOrder::getMainOrderId, String.valueOf(id)) + .eq(BusinessDocumentOrder::getDelFlag, 1) + ); - //下发到tms - TmsOrderAddDTO tmsOrderAddDTO=new TmsOrderAddDTO(); - List cargoInfoList=new ArrayList(); - List loadingAddressList=new ArrayList(); - List unloadAddressList=new ArrayList(); - List tmsOrderAccountList=new ArrayList(); - - if(ObjectUtil.isNotNull(businessDocumentOrder)){ - BeanUtils.copyProperties(businessDocumentOrder,tmsOrderAddDTO); - tmsOrderAddDTO.setExecuteOrderId(String.valueOf(executeOrderId)); - tmsOrderAddDTO.setExecuteOrderNumber(executeOrder.getGoodsNumber()); - - //货物信息 - List businessDocumentCargoMultiList=businessDocumentCargoMultiMapper.selectList(new QueryWrapper().lambda() - .eq(BusinessDocumentCargoMulti::getOrderId,businessDocumentOrder.getId()) - .eq(BusinessDocumentCargoMulti::getDelFlag,1)); - if(ObjectUtil.isNotNull(businessDocumentCargoMultiList)&&businessDocumentCargoMultiList.size()>0){ - for (BusinessDocumentCargoMulti businessDocumentCargoMulti:businessDocumentCargoMultiList){ - TmsCargoInfoDTO tmsCargoInfoDTO=new TmsCargoInfoDTO(); - BeanUtils.copyProperties(businessDocumentCargoMulti,tmsCargoInfoDTO); - cargoInfoList.add(tmsCargoInfoDTO); + if (subOrders != null && !subOrders.isEmpty()) { + // 执行并下发所有子单 + for (BusinessDocumentOrder subOrder : subOrders) { + // 检查子单是否已生成执行单 + ExecuteOrder subExecuteOrder = executeOrderMapper.selectOne( + new LambdaQueryWrapper() + .eq(ExecuteOrder::getBusinessDocumentId, subOrder.getId()) + .eq(ExecuteOrder::getDelFlag, 1) + .last("LIMIT 1") + ); + + if (ObjectUtil.isNotNull(subExecuteOrder)) { + continue; // 子单已执行,跳过 } + + // 执行并下发子单 + executeAndIssueSingleOrder(subOrder, loginUser, organizationId, orgName); } - //装货地址信息 - List businessDocumentAddressMultiList=businessDocumentAddressMultiMapper.selectList(new QueryWrapper().lambda() - .eq(BusinessDocumentAddressMulti::getOrderId,businessDocumentOrder.getId()) - .eq(BusinessDocumentAddressMulti::getDelFlag,1) - .eq(BusinessDocumentAddressMulti::getLayType,1)); - if(ObjectUtil.isNotNull(businessDocumentAddressMultiList)&&businessDocumentAddressMultiList.size()>0){ - for (BusinessDocumentAddressMulti businessDocumentAddressMulti:businessDocumentAddressMultiList){ - TmsAddressMultiDTO tmsAddressMultiDTO=new TmsAddressMultiDTO(); - BeanUtils.copyProperties(businessDocumentAddressMulti,tmsAddressMultiDTO); - loadingAddressList.add(tmsAddressMultiDTO); - } - } - - //卸货货地址信息 - List businessDocumentAddressMultiUnloadList=businessDocumentAddressMultiMapper.selectList(new QueryWrapper().lambda() - .eq(BusinessDocumentAddressMulti::getOrderId,businessDocumentOrder.getId()) - .eq(BusinessDocumentAddressMulti::getDelFlag,1) - .eq(BusinessDocumentAddressMulti::getLayType,2)); - if(ObjectUtil.isNotNull(businessDocumentAddressMultiUnloadList)&&businessDocumentAddressMultiUnloadList.size()>0){ - for (BusinessDocumentAddressMulti businessDocumentAddressMulti:businessDocumentAddressMultiUnloadList){ - TmsAddressMultiDTO tmsAddressMultiDTO=new TmsAddressMultiDTO(); - BeanUtils.copyProperties(businessDocumentAddressMulti,tmsAddressMultiDTO); - tmsAddressMultiDTO.setLayType(2); - unloadAddressList.add(tmsAddressMultiDTO); - } - } - - //账单信息 - List businessOrderAccountList = businessOrderAccountMapper.selectList(new QueryWrapper().lambda() - .eq(BusinessOrderAccount::getOrderId, businessDocumentOrder.getId()) - .eq(BusinessOrderAccount::getIsDelete, 0)); - if(ObjectUtil.isNotNull(businessOrderAccountList)&&businessOrderAccountList.size()>0){ - for (BusinessOrderAccount businessOrderAccount:businessOrderAccountList){ - TmsOrderAccount tmsOrderAccount = new TmsOrderAccount(); - BeanUtils.copyProperties(businessOrderAccount, tmsOrderAccount); - tmsOrderAccountList.add(tmsOrderAccount); - } - } - - tmsOrderAddDTO.setAppointShipper(businessDocumentOrder.getAppointShipper()); - tmsOrderAddDTO.setAppointShipperId(businessDocumentOrder.getAppointShipperId()); - tmsOrderAddDTO.setCargoInfoList(cargoInfoList); - tmsOrderAddDTO.setLoadingAddressList(loadingAddressList); - tmsOrderAddDTO.setUnloadAddressList(unloadAddressList); - tmsOrderAddDTO.setTmsOrderAccountList(tmsOrderAccountList); - tmsOrderAddDTO.setOrderShippingType(businessDocumentOrder.getOrderShippingType().intValue()); - tmsOrderAddDTO.setPayerType(0); - tmsOrderAddDTO.setExecuteOrderNumber(executeOrder.getGoodsNumber()); - tmsOrderAddDTO.setOrderSource("0"); - tmsOrderAddDTO.setOrganizationId(organizationId); - tmsOrderAddDTO.setLoginUser(loginUser); - tmsOrderAddDTO.setOrganizationName(orgName); - - AjaxResult ajaxResult=wlhyServiceFeign.add(tmsOrderAddDTO); - if(ajaxResult.get("code").toString().equals("200")){ - String goodsNumber = (String) ajaxResult.get("data"); - if(ObjectUtil.isNotEmpty(goodsNumber)){ - executeOrder.setTmsOrderNumber(goodsNumber); - executeOrderMapper.updateById(executeOrder); - if (businessDocumentOrder.getInOrderNumber()!=null){ - ReservationStockInOrder reservationStockInOrder = reservationStockInOrderMapper.selectOne(new LambdaQueryWrapper().eq(ReservationStockInOrder::getInOrderNumber,businessDocumentOrder.getInOrderNumber())); - if (ObjectUtil.isNotNull(reservationStockInOrder)) { - reservationStockInOrder.setTmsOrderNumber(goodsNumber); - reservationStockInOrderMapper.updateById(reservationStockInOrder); - } - ReservationStockOutOrder reservationStockOutOrder = reservationStockOutOrderMapper.selectOne(new LambdaQueryWrapper().eq(ReservationStockOutOrder::getOutOrderNumber,businessDocumentOrder.getInOrderNumber())); - if (ObjectUtil.isNotNull(reservationStockOutOrder)) { - reservationStockOutOrder.setTmsOrderNumber(goodsNumber); - reservationStockOutOrderMapper.updateById(reservationStockOutOrder); - } - } - } - }else { - throw new ServiceException(ajaxResult.get("msg").toString()); - } + // 更新主单状态 + businessDocumentOrder.setExecuteId(loginUser.getUserid()); + businessDocumentOrder.setExecuteStatus(2L); + businessDocumentOrder.setExecuteTime(new Date()); + businessDocumentOrder.setExecutor(loginUser.getUsername()); + businessDocumentOrder.setOrderStatus(2L); + businessDocumentOrderMapper.updateById(businessDocumentOrder); } + } else { + // 非拆单主单,执行原有逻辑 + ExecuteOrder objects = executeOrderMapper.selectOne(new LambdaQueryWrapper().eq(ExecuteOrder::getBusinessDocumentId, id).eq(ExecuteOrder::getDelFlag,1) .last("LIMIT 1") + ); + if (ObjectUtil.isNotNull(objects)) { + throw new ServerException("业务单已生成执行单，请先取消执行单"); + } + + // 执行并下发主单 + executeAndIssueSingleOrder(businessDocumentOrder, loginUser, organizationId, orgName); } } } @@ -586,6 +485,162 @@ public class BusinessDocumentOrderImpl extends ServiceImpl cargoInfoList=new ArrayList(); + List loadingAddressList=new ArrayList(); + List unloadAddressList=new ArrayList(); + List tmsOrderAccountList=new ArrayList(); + + BeanUtils.copyProperties(businessDocumentOrder,tmsOrderAddDTO); + tmsOrderAddDTO.setExecuteOrderId(String.valueOf(executeOrderId)); + tmsOrderAddDTO.setExecuteOrderNumber(executeOrder.getGoodsNumber()); + BusinessDeliveryDetailsLink businessDeliveryDetailsLink = businessDeliveryDetailsLinkMapper.selectOne(new LambdaQueryWrapper().eq(BusinessDeliveryDetailsLink::getSubOrderId, businessDocumentOrder.getId())); + if (ObjectUtil.isNotNull(businessDeliveryDetailsLink)) { + Integer bag = businessDeliveryDetailsLink.getBag(); + Integer box = businessDeliveryDetailsLink.getBox(); + //相加 + tmsOrderAddDTO.setGoodsName(String.valueOf(bag + box)); + } + + //货物信息 + List businessDocumentCargoMultiList=businessDocumentCargoMultiMapper.selectList(new QueryWrapper().lambda() + .eq(BusinessDocumentCargoMulti::getOrderId,businessDocumentOrder.getId()) + .eq(BusinessDocumentCargoMulti::getDelFlag,1)); + if(ObjectUtil.isNotNull(businessDocumentCargoMultiList)&&businessDocumentCargoMultiList.size()>0){ + for (BusinessDocumentCargoMulti businessDocumentCargoMulti:businessDocumentCargoMultiList){ + TmsCargoInfoDTO tmsCargoInfoDTO=new TmsCargoInfoDTO(); + BeanUtils.copyProperties(businessDocumentCargoMulti,tmsCargoInfoDTO); + cargoInfoList.add(tmsCargoInfoDTO); + } + } + + //装货地址信息 + List businessDocumentAddressMultiList=businessDocumentAddressMultiMapper.selectList(new QueryWrapper().lambda() + .eq(BusinessDocumentAddressMulti::getOrderId,businessDocumentOrder.getId()) + .eq(BusinessDocumentAddressMulti::getDelFlag,1) + .eq(BusinessDocumentAddressMulti::getLayType,1)); + if(ObjectUtil.isNotNull(businessDocumentAddressMultiList)&&businessDocumentAddressMultiList.size()>0){ + for (BusinessDocumentAddressMulti businessDocumentAddressMulti:businessDocumentAddressMultiList){ + TmsAddressMultiDTO tmsAddressMultiDTO=new TmsAddressMultiDTO(); + BeanUtils.copyProperties(businessDocumentAddressMulti,tmsAddressMultiDTO); + loadingAddressList.add(tmsAddressMultiDTO); + } + } + + //卸货货地址信息 + List businessDocumentAddressMultiUnloadList=businessDocumentAddressMultiMapper.selectList(new QueryWrapper().lambda() + .eq(BusinessDocumentAddressMulti::getOrderId,businessDocumentOrder.getId()) + .eq(BusinessDocumentAddressMulti::getDelFlag,1) + .eq(BusinessDocumentAddressMulti::getLayType,2)); + if(ObjectUtil.isNotNull(businessDocumentAddressMultiUnloadList)&&businessDocumentAddressMultiUnloadList.size()>0){ + for (BusinessDocumentAddressMulti businessDocumentAddressMulti:businessDocumentAddressMultiUnloadList){ + TmsAddressMultiDTO tmsAddressMultiDTO=new TmsAddressMultiDTO(); + BeanUtils.copyProperties(businessDocumentAddressMulti,tmsAddressMultiDTO); + tmsAddressMultiDTO.setLayType(2); + unloadAddressList.add(tmsAddressMultiDTO); + } + } + + //账单信息 + List businessOrderAccountList = businessOrderAccountMapper.selectList(new QueryWrapper().lambda() + .eq(BusinessOrderAccount::getOrderId, businessDocumentOrder.getId()) + .eq(BusinessOrderAccount::getIsDelete, 0)); + if(ObjectUtil.isNotNull(businessOrderAccountList)&&businessOrderAccountList.size()>0){ + for (BusinessOrderAccount businessOrderAccount:businessOrderAccountList){ + TmsOrderAccount tmsOrderAccount = new TmsOrderAccount(); + BeanUtils.copyProperties(businessOrderAccount, tmsOrderAccount); + tmsOrderAccountList.add(tmsOrderAccount); + } + } + + tmsOrderAddDTO.setAppointShipper(businessDocumentOrder.getAppointShipper()); + tmsOrderAddDTO.setAppointShipperId(businessDocumentOrder.getAppointShipperId()); + tmsOrderAddDTO.setCargoInfoList(cargoInfoList); + tmsOrderAddDTO.setLoadingAddressList(loadingAddressList); + tmsOrderAddDTO.setUnloadAddressList(unloadAddressList); + tmsOrderAddDTO.setTmsOrderAccountList(tmsOrderAccountList); + tmsOrderAddDTO.setOrderShippingType(businessDocumentOrder.getOrderShippingType().intValue()); + tmsOrderAddDTO.setPayerType(0); + tmsOrderAddDTO.setExecuteOrderNumber(executeOrder.getGoodsNumber()); + tmsOrderAddDTO.setOrderSource("0"); + tmsOrderAddDTO.setOrganizationId(organizationId); + tmsOrderAddDTO.setLoginUser(loginUser); + tmsOrderAddDTO.setOrganizationName(orgName); + + AjaxResult ajaxResult=wlhyServiceFeign.add(tmsOrderAddDTO); + if(ajaxResult.get("code").toString().equals("200")){ + String goodsNumber = (String) ajaxResult.get("data"); + if(ObjectUtil.isNotEmpty(goodsNumber)){ + executeOrder.setTmsOrderNumber(goodsNumber); + executeOrderMapper.updateById(executeOrder); + if (businessDocumentOrder.getInOrderNumber()!=null){ + ReservationStockInOrder reservationStockInOrder = reservationStockInOrderMapper.selectOne(new LambdaQueryWrapper().eq(ReservationStockInOrder::getInOrderNumber,businessDocumentOrder.getInOrderNumber())); + if (ObjectUtil.isNotNull(reservationStockInOrder)) { + reservationStockInOrder.setTmsOrderNumber(goodsNumber); + reservationStockInOrderMapper.updateById(reservationStockInOrder); + } + ReservationStockOutOrder reservationStockOutOrder = reservationStockOutOrderMapper.selectOne(new LambdaQueryWrapper().eq(ReservationStockOutOrder::getOutOrderNumber,businessDocumentOrder.getInOrderNumber())); + if (ObjectUtil.isNotNull(reservationStockOutOrder)) { + reservationStockOutOrder.setTmsOrderNumber(goodsNumber); + reservationStockOutOrderMapper.updateById(reservationStockOutOrder); + } + } + } + }else { + throw new ServiceException(ajaxResult.get("msg").toString()); + } + } + } + @Override @Transactional(rollbackFor = Exception.class) public Boolean cancelExecute(List ids) throws Exception{ diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java index fa14fce38..c320e8891 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java @@ -25,6 +25,10 @@ import com.mhd.oms.domain.businessOrderAccount.BusinessOrderAccount; import com.mhd.oms.domain.businessOrderAccount.repository.mapper.BusinessOrderAccountMapper; import com.mhd.oms.domain.reservationOrder.entity.ReservationOrder; import com.mhd.oms.domain.reservationOrder.repository.mapper.ReservationOrderMapper; +import com.mhd.oms.domain.reservationStockOutOrder.entity.ReservationStockOutOrder; +import com.mhd.oms.domain.reservationStockOutOrder.repository.mapper.ReservationStockOutOrderMapper; +import com.mhd.oms.domain.reserveStockOutOrder.entity.ReserveStockOutOrder; +import com.mhd.oms.domain.reserveStockOutOrder.repository.mapper.ReserveStockOutOrderMapper; import com.mhd.oms.interfaces.dto.businessDocumentAddressMulti.BusinessAuditDTO; import com.mhd.oms.interfaces.dto.businessDocumentAddressMulti.BusinessDocumentAddressMultiDTO; import com.mhd.oms.interfaces.dto.businessDocumentCargoMulti.BusinessDocumentCargoMultiDTO; @@ -76,6 +80,9 @@ public class BusinessDocumentOrderDomainService { @Resource private BusinessDeliveryDetailsLinkMapper businessDeliveryDetailsLinkMapper; + + @Resource + private ReservationStockOutOrderMapper reservationStockOutOrderMapper; /** * 分页查询【请填写功能名称】列表 */ @@ -221,6 +228,11 @@ public class BusinessDocumentOrderDomainService { tmsOrder.setGoodsNumber(OrderSequence.getOrderCode()); } + ReservationStockOutOrder reservationStockOutOrder = reservationStockOutOrderMapper.selectOne(new LambdaQueryWrapper().eq(ReservationStockOutOrder::getOutOrderNumber, tmsOrder.getInOrderNumber())); + if (reservationStockOutOrder != null){ + reservationStockOutOrder.setBusinessNumber(tmsOrder.getGoodsNumber()); + reservationStockOutOrderMapper.updateById(reservationStockOutOrder); + } List loadingAddressList = businessDocumentOrderDO.getLoadingAddressList();//装货地信息集合 List unloadAddressList = businessDocumentOrderDO.getUnloadAddressList();//卸货地信息集合 String loadCityCounty="",unloadCityCounty=""; @@ -340,8 +352,8 @@ public class BusinessDocumentOrderDomainService { } else { tmsOrder.setSplicingOrderType(0L); // 普通单 } - //一小时候后 - tmsOrder.setDocumentDate(DateUtils.addHours(new Date(), 1)); + //一天后 + tmsOrder.setDocumentDate(DateUtils.addHours(new Date(), 24)); boolean istrue = businessDocumentOrderMapper.insert(tmsOrder) > 0; 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 e05152818..ca7770ce9 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 @@ -7,6 +7,8 @@ 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.oms.domain.businessDeliveryDetailsLink.entity.BusinessDeliveryDetailsLink; +import com.mhd.oms.domain.businessDeliveryDetailsLink.repository.mapper.BusinessDeliveryDetailsLinkMapper; import com.mhd.system.api.domain.TmsOrderAddDTO; import com.mhd.common.core.domain.entity.TmsOrder; import com.mhd.common.core.exception.ServiceException; @@ -69,6 +71,8 @@ public class ExecuteOrderImpl extends ServiceImpl().eq(BusinessDeliveryDetailsLink::getSubOrderId, businessDocumentOrder.getId())); + if (ObjectUtil.isNotNull(businessDeliveryDetailsLink)) { + Integer bag = businessDeliveryDetailsLink.getBag(); + Integer box = businessDeliveryDetailsLink.getBox(); + //相加 + tmsOrderAddDTO.setGoodsName(String.valueOf(bag + box)); + } tmsOrderAddDTO.setOrganizationName(orgName); diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java index 6f5e702cd..e4a592e75 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java @@ -216,7 +216,7 @@ public class ExecuteOrderPO extends BaseVOEntity{ @ApiModelProperty("主单业务单号") @Excel(name = "主单业务单号") - private String mainOrderNumber; + private String mainOrderNum; @ApiModelProperty("卸货联系人") @Excel(name = "卸货联系人") 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 967299b4a..11eac890c 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 @@ -478,4 +478,8 @@ public class ReservationStockOutOrder extends BaseVOEntity { @Excel(name = "退货数量") private BigDecimal returnQuantity; + @ApiModelProperty("运输业务单号") + @Excel(name = "运输业务单号") + private String businessNumber; + } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java index f0e24df35..f959a61f8 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java @@ -492,4 +492,8 @@ public class ReservationStockOutOrderPO extends BaseVOEntity { @Excel(name = "退货数量") private BigDecimal returnQuantity; private List reservationDeliveryDetailsLinkList; + + @ApiModelProperty("运输业务单号") + @Excel(name = "运输业务单号") + private String businessNumber; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java index ca3c6a3aa..ca560a674 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java @@ -527,4 +527,8 @@ public class ReservationStockOutOrderDO extends BaseVOEntity { @Excel(name = "退货数量") private BigDecimal returnQuantity; private List reservationDeliveryDetailsLinkList; + + @ApiModelProperty("运输业务单号") + @Excel(name = "运输业务单号") + private String businessNumber; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java index e1ceaaea5..b14f12d55 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java @@ -516,4 +516,8 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO @Excel(name = "退货数量") private BigDecimal returnQuantity; private List reservationDeliveryDetailsLinkList; + + @ApiModelProperty("运输业务单号") + @Excel(name = "运输业务单号") + private String businessNumber; } \ No newline at end of file diff --git a/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml b/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml index 33da7f54a..9fe12e12d 100644 --- a/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml @@ -726,7 +726,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id from NGWL_TEST_WLHY.TMS_ORDER where EXECUTE_ORDER_NUMBER = #{goodsNumber} and SPLICING_ORDER_TYPE = 1 diff --git a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml index 57b897f91..bb4365550 100644 --- a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml @@ -112,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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.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.remark, a.create_time, a.create_by, a.create_by_name,a.business_number, a.update_time, a.update_by, a.update_by_name, a.del_flag, over_stock_id, over_stock_status, over_stock_type,a."TO", a.CONTACT_PERSON,a.VEHICLE_MODEL_PLATE,a.ENTRUST_NO,a.TEL,a.DRIVER_SIGN,a.FAX,a.DECLARE_CUSTOMS,a.MANUFACTURER, a.CUSTOMS_DECLARER_INFO,a.DELIVERY_ADDR,a.ENTRY_EXIT_CUSTOMS,a.DEPARTURE_ARRIVAL_COUNTRY,a.CARRIER,a.CONTAINER_NO,a.CONTAINER_NO_NAME,a.OUTBOUND_DATE,