diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java index 10d00b87b..15260de74 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java @@ -30,6 +30,12 @@ public interface RabbitConstant { String RECEIVE_INFO_QUEUE = "receive_info_queue" + ModuleNameConstant.DEVAUTH; String RECEIVE_INFO_EXCHANGE = "receive_info_exchange" + ModuleNameConstant.DEVAUTH; String RECEIVE_INFO_ROUTING = "receive_info_routing" + ModuleNameConstant.DEVAUTH; + /** + * 新系统推送信息 + */ + String NEW_SYSTEM_RECEIVE_INFO_QUEUE = "new_system_receive_info_queue"+ ModuleNameConstant.DEVAUTH; + String NEW_SYSTEM_RECEIVE_INFO_EXCHANGE = "new_system_receive_info_exchange"+ ModuleNameConstant.DEVAUTH; + String NEW_SYSTEM_RECEIVE_INFO_ROUTING = "new_system_receive_info_routing"+ ModuleNameConstant.DEVAUTH; /** * 卸车完成确认 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java index 3e201b64f..261e801f8 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java @@ -20,6 +20,7 @@ import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.vo.DistributionParcelListVO; import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; +import org.springblade.core.tool.api.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -129,4 +130,6 @@ public interface IDistributionParcelListClient { @GetMapping(API_PREFIX+"/findByOrderInfoByOrderPackageCodeAndWarehouseId") Map findByOrderInfoByOrderPackageCodeAndWarehouseId(@RequestParam String orderPackCode,@RequestParam Long warehouseId); + @GetMapping(API_PREFIX+"/queryOrderByOrderPackageCode") + R queryOrderByOrderPackageCode( @RequestParam String orderPackageCode); } diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/comfac/constant/FactoryConstant.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/comfac/constant/FactoryConstant.java new file mode 100644 index 000000000..34e7b8c73 --- /dev/null +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/comfac/constant/FactoryConstant.java @@ -0,0 +1,15 @@ +package com.logpm.factory.comfac.constant; + +/** + * 工厂名称常量池 + * + * @author zhy + */ +public class FactoryConstant { + + public static final String PIANO = "皮阿诺"; + public static final String MENGT = "梦天"; + public static final String ZHIBANG = "志邦"; + public static final String OUPAI = "欧派"; + +} diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/comfac/dto/OrderStatusDTO.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/comfac/dto/OrderStatusDTO.java new file mode 100644 index 000000000..ccc3d3129 --- /dev/null +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/comfac/dto/OrderStatusDTO.java @@ -0,0 +1,114 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.factory.comfac.dto; + +import lombok.Data; +import org.springblade.core.tool.utils.StringUtil; + +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; + +/** + * OrderStatus + * + * @author zhy + * @since 2023-06-12 + */ +@Data +public class OrderStatusDTO implements Serializable { + private static final long serialVersionUID = 1L; + + @NotEmpty(message = "派车单号不能为空") + private String dispatchNumber;//派车单号 + + @NotEmpty(message = "客户订单号不能为空") + private String orderNo;//客户订单号 + + @NotEmpty(message = "工厂ID不能为空") + private String plantId;//工厂ID + + @NotEmpty(message = "物流单号不能为空") + private String logiBillNo;//物流单号 + + @NotEmpty(message = "包件码不能为空") + private String unitNo;//包件码 + + @NotEmpty(message = "操作时间不能为空") + private String operationTime;//操作时间 + + @NotEmpty(message = "当前仓库不能为空") + private String currentWarehouse;//当前仓库 + + @NotEmpty(message = "目的仓库不能为空") + private String destinationWarehouse;//目的仓库 + + @NotEmpty(message = "状态不能为空") + private String status;//状态 + + @NotEmpty(message = "送货任务ID不能为空") + private String distributionContactId; + + @NotEmpty(message = "托盘id") + private Integer trayId; + + @NotEmpty(message = "托盘编码") + private String trayNo; + + @NotEmpty(message = "操作人名称") + private String username; + + + /** + * 验证参数是否都存在 + * @return + */ + public boolean verifyData(){ + if(StringUtil.isBlank(dispatchNumber)){ + return false; + } + if(StringUtil.isBlank(orderNo)){ + return false; + } + if(StringUtil.isBlank(plantId)){ + return false; + } + if(StringUtil.isBlank(logiBillNo)){ + return false; + } + if(StringUtil.isBlank(unitNo)){ + return false; + } + if(StringUtil.isBlank(operationTime)){ + return false; + } + if(StringUtil.isBlank(currentWarehouse)){ + return false; + } + if(StringUtil.isBlank(destinationWarehouse)){ + return false; + } + if(StringUtil.isBlank(status)){ + return false; + } + if(StringUtil.isBlank(distributionContactId)){ + return false; + } + return true; + } + + +} diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/feign/IOuPaiFactoryClinet.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/feign/IOuPaiFactoryClinet.java new file mode 100644 index 000000000..0fc16179d --- /dev/null +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/feign/IOuPaiFactoryClinet.java @@ -0,0 +1,30 @@ +package com.logpm.factory.oupai.feign; + +import com.logpm.factory.comfac.dto.OrderStatusDTO; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.tool.api.R; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +/* + * logisticsplatform-service + * @Author Diss + * @Create 2024/1/2 22:15 + */ +@FeignClient( + value = ModuleNameConstant.APPLICATION_FACTORY_NAME +) +public interface IOuPaiFactoryClinet { + String API_PREFIX = "/oupai/client"; + String TOP = API_PREFIX + "/newSystemHandleStatusData"; + String TEST = API_PREFIX + "/test"; + + @PostMapping(TOP) + R newSystemHandleStatusData(@RequestBody OrderStatusDTO orderStatusDTO); + + +} + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java index ecde9ee1d..1cd73a96a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java @@ -32,6 +32,7 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; @@ -259,4 +260,14 @@ public class DistributionParcelListClient implements IDistributionParcelListClie } + + + @Override + public R queryOrderByOrderPackageCode(String orderPackageCode) { + DistributionParcelListEntity distributionParcelList = new DistributionParcelListEntity(); + distributionParcelList.setOrderPackageCode(orderPackageCode); + DistributionParcelListEntity detail = distributionParcelListService.getOne(Condition.getQueryWrapper(distributionParcelList)); + return R.data(detail); + + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 8d69d56b0..519292543 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -16,8 +16,8 @@ */ package com.logpm.distribution.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.alibaba.fastjson.JSON; +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; @@ -44,8 +44,9 @@ import com.logpm.distribution.wrapper.DistributionDisStockListWrapper; import com.logpm.distribution.wrapper.DistributionParcelListAppWrapper; import com.logpm.distribution.wrapper.DistributionParcelListWrapper; import com.logpm.distribution.wrapper.DistributionStockArticleWrapper; +import com.logpm.factory.comfac.dto.OrderStatusDTO; +import com.logpm.factory.oupai.feign.IOuPaiFactoryClinet; import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient; -import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.jetbrains.annotations.NotNull; @@ -53,6 +54,7 @@ import org.springblade.common.constant.DictBizConstant; import org.springblade.common.constant.DistributionTypeConstant; import org.springblade.common.constant.Inventory.InventoryLoadingStatusConstant; import org.springblade.common.constant.Inventory.InventorySigningStatusConstant; +import org.springblade.common.constant.ModuleNameConstant; import org.springblade.common.constant.RabbitConstant; import org.springblade.common.constant.common.IsOrNoConstant; import org.springblade.common.constant.delivery.DeliveryStatusConstant; @@ -70,6 +72,7 @@ import org.springblade.common.utils.CommonUtil; import org.springblade.common.utils.FileUtil; import org.springblade.common.utils.GaoDeApiUtil; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.mp.support.Condition; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; @@ -77,6 +80,8 @@ import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.system.cache.DictBizCache; import org.springblade.system.feign.IDictBizClient; +import org.springframework.amqp.AmqpException; +import org.springframework.amqp.core.Message; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -86,11 +91,13 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; -import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; import java.util.stream.Collectors; @@ -105,81 +112,84 @@ import java.util.stream.Collectors; @Slf4j public class DistributionSignforServiceImpl extends BaseServiceImpl implements IDistributionSignforService { @Autowired - private DistributionLoadscanServiceImpl distributionLoadscanService; + private DistributionLoadscanServiceImpl distributionLoadscanService; @Autowired - private DistributionLoadscaninvnServiceImpl distributionLoadscaninvnService; + private DistributionLoadscaninvnServiceImpl distributionLoadscaninvnService; @Autowired - private IDistributionParcelListService distributionParcelListService; + private IDistributionParcelListService distributionParcelListService; @Autowired - private IDistributionStockArticleService distributionStockArticleService; + private IDistributionStockArticleService distributionStockArticleService; @Autowired - private DistributionLoadscanMapper distributionLoadscanMapper; + private DistributionLoadscanMapper distributionLoadscanMapper; @Autowired - private DistributionLoadscaninvnMapper distributionLoadscaninvnMapper; + private DistributionLoadscaninvnMapper distributionLoadscaninvnMapper; @Autowired - private DistributionDeliveryListMapper distributionDeliveryListMapper; + private DistributionDeliveryListMapper distributionDeliveryListMapper; @Autowired - private DistributionDeliverySelfMapper distributionDeliverySelfMapper; + private DistributionDeliverySelfMapper distributionDeliverySelfMapper; @Autowired - private DistributionDeliveryTripartiteMapper distributionDeliveryTripartiteMapper; + private DistributionDeliveryTripartiteMapper distributionDeliveryTripartiteMapper; @Autowired - private DistributionSignforMapper distributionSignforMapper; + private DistributionSignforMapper distributionSignforMapper; @Autowired - private DistributionStockMapper distributionStockMapper; + private DistributionStockMapper distributionStockMapper; @Autowired - private IDictBizClient dictBizClient; + private IDictBizClient dictBizClient; @Autowired - private IBasicdataDriverArteryClient iBasicdataDriverArteryClient; + private IBasicdataDriverArteryClient iBasicdataDriverArteryClient; @Autowired - private IDistributionReservationPackageService reservationPackageService; + private IDistributionReservationPackageService reservationPackageService; @Autowired - private IDistributionAsyncService distributionAsyncService; + private IDistributionAsyncService distributionAsyncService; @Autowired - private IBasicdataWarehouseClient basicdataWarehouseClient; + private IBasicdataWarehouseClient basicdataWarehouseClient; @Autowired - private DistributionReservationMapper distributionReservationMapper; + private DistributionReservationMapper distributionReservationMapper; @Autowired - private IDisStockListDetailService disStockListDetailService; + private IDisStockListDetailService disStockListDetailService; @Autowired - private IDistributionStockListService distributionStockListService; + private IDistributionStockListService distributionStockListService; @Autowired - private DistributionStockListMapper distributionStockListMapper; + private DistributionStockListMapper distributionStockListMapper; @Autowired - private DistributionAddvalueMapper distributionAddvalueMapper; + private DistributionAddvalueMapper distributionAddvalueMapper; @Autowired - private IDistributionAddvalueService distributionAddvalueService; + private IDistributionAddvalueService distributionAddvalueService; @Autowired - private IDistributionAddvaluePackageService distributionAddvaluePackageService; + private IDistributionAddvaluePackageService distributionAddvaluePackageService; @Autowired - private IDistributionLoadscanAbnormalService distributionLoadscanAbnormalService; + private IDistributionLoadscanAbnormalService distributionLoadscanAbnormalService; @Autowired - private IDistributionReservationStockarticleService distributionReservationStockarticleService; + private IDistributionReservationStockarticleService distributionReservationStockarticleService; @Autowired - private IDistributionReservationPackageService distributionReservationPackageService; + private IDistributionReservationPackageService distributionReservationPackageService; @Autowired - private IDistributionReservationZeroPackageService distributionReservationZeroPackageService; + private IDistributionReservationZeroPackageService distributionReservationZeroPackageService; @Autowired - private IDistributionSignPrintService iDistributionSignPrintService; + private IDistributionSignPrintService iDistributionSignPrintService; @Autowired - private IDistributionParcelNumberService distributionParcelNumberService; + private IDistributionParcelNumberService distributionParcelNumberService; @Autowired - private IWarehouseUpdownTypeClient warehouseUpdownTypeClient; + private IWarehouseUpdownTypeClient warehouseUpdownTypeClient; @Autowired - private DistributionStockArticleMapper distributionStockArticleMapper; + private DistributionStockArticleMapper distributionStockArticleMapper; @Autowired - private IBasicdataClientClient basicdataClientClient; + private IBasicdataClientClient basicdataClientClient; @Autowired - private DistributionParcelListMapper distributionParcelListMapper; + private DistributionParcelListMapper distributionParcelListMapper; @Autowired @Lazy private IDistributionDeliveryListService distributionDeliveryListService; @Autowired @Lazy private IDistributionReservationService distributionReservationService; -@Autowired - private RabbitTemplate rabbitTemplate; + @Autowired + private RabbitTemplate rabbitTemplate; + + // private IBasicdataWarehouseClient warehouseUpdownTypeClient; + @Autowired + private IOuPaiFactoryClinet ouPaiFactoryClinet; -// private IBasicdataWarehouseClient warehouseUpdownTypeClient; @Override public IPage selectDistributionSignforPage(IPage page, DistributionSignforVO distributionSignfor) { @@ -207,8 +217,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl f.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue())).mapToInt(DistributionParcelListEntity::getQuantity).sum(); + if (Func.isNotEmpty(distributionParcelListEntities)) { + weizhuangchejianshu += distributionParcelListEntities.stream().filter(f -> f.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue())).mapToInt(DistributionParcelListEntity::getQuantity).sum(); zhuangchejianshu += distributionParcelListEntities.stream().filter(f -> f.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue())).mapToInt(DistributionParcelListEntity::getQuantity).sum(); weiqianshoujianshu += distributionParcelListEntities.stream().filter(f -> !f.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())).mapToInt(DistributionParcelListEntity::getQuantity).sum(); qianshoujianshu += distributionParcelListEntities.stream().filter(f -> f.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())).mapToInt(DistributionParcelListEntity::getQuantity).sum(); @@ -221,9 +231,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl disStockListDetailEntities = distributionReservationMapper.selectInventoryListByReservation(d.getReservationId()); - if (Func.isNotEmpty(disStockListDetailEntities)){ + if (Func.isNotEmpty(disStockListDetailEntities)) { //查询库存品未装车数 int inventoryuweizhuancghe = disStockListDetailEntities.stream().filter(f -> f.getStockLockingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue())).mapToInt(DisStockListDetailEntity::getNum).sum(); weizhuangchejianshu += inventoryuweizhuancghe; @@ -380,18 +390,18 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl packageLoadingMap = loadscanEntities.stream().collect(Collectors.toMap(DistributionLoadscanEntity::getPackageId, Function.identity(), (k1, k2) -> k2)); List packageIds = loadscanEntities.stream().distinct().map(DistributionLoadscanEntity::getPackageId).collect(Collectors.toList()); List distributionParcelListEntities = distributionParcelListService.listByIds(packageIds); List distributionParcelListVOS = DistributionParcelListWrapper.build().listVO(distributionParcelListEntities); - distributionParcelListVOS.forEach(p->{ + distributionParcelListVOS.forEach(p -> { DistributionNumberDetailDTO detailDTO = Func.copy(p, DistributionNumberDetailDTO.class); - if (Func.isNotEmpty(packageLoadingMap.get(p.getId()))){ + if (Func.isNotEmpty(packageLoadingMap.get(p.getId()))) { DistributionLoadscanEntity distributionLoadscanEntity = packageLoadingMap.get(p.getId()); detailDTO.setLoadingTime(distributionLoadscanEntity.getScanTime()); detailDTO.setLoadingStatusName(OrderPackageLoadingStatusConstant.weizhuancghe.getName()); - if (distributionLoadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())){ + if (distributionLoadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) { //签收 detailDTO.setSigningTime(distributionLoadscanEntity.getSigningTime()); detailDTO.setSigningStatusName(OrderPackageStatusConstant.yiqianshou.getName()); @@ -403,15 +413,15 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl mapState = new HashMap<>(); + mapState.put("orderStatusDTO", orderStatusDTO); + mapState.put("brand", brand); + rabbitTemplate.convertAndSend(RabbitConstant.NEW_SYSTEM_RECEIVE_INFO_QUEUE, mapState); + return Resp.scanSuccess("签收成功", str); } @@ -1385,10 +1422,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl getAppDeliveryreservationListPage( DistributionAppDeliveryListDTO distributionDeliveryList) { + public List getAppDeliveryreservationListPage(DistributionAppDeliveryListDTO distributionDeliveryList) { //查询客户 List customList = baseMapper.selectAppcustomListPage(distributionDeliveryList.getId()); @@ -1909,7 +1946,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl parcelNumberVOS = distributionReservationMapper.selectReservationZeroOrderDetail(orderId, Long.parseLong(distributionDeliveryList.getReservationId())); - parcelNumberVOS.forEach(p -> { + parcelNumberVOS.forEach(p -> { DistributionLoadscanEntity loadscanEntity = distributionLoadscanService.getOne(Wrappers.query().lambda().eq(DistributionLoadscanEntity::getReservationId, distributionDeliveryList.getReservationId()).eq(DistributionLoadscanEntity::getOrderId, orderId).eq(DistributionLoadscanEntity::getPackageId, p.getParcelListId()).ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())); p.setLoadingNum(0); p.setSigningNum(0); @@ -1923,13 +1960,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl> orderMap = distributionLoadscanEntities.stream().collect(Collectors.groupingBy(DistributionLoadscanEntity::getOrderId)); @@ -2305,7 +2342,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl parcelListEntityList = distributionReservationMapper.selectPackageListByReservationId(distributionSignforEntity.getReservationId()); //包件不需要考虑备货、装车直接可进行签收 过滤已装车的包件 @@ -2656,9 +2694,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl mapState = new HashMap<>(); + mapState.put("orderStatusDTO", orderStatusDTO); + mapState.put("brand", brand); + //rabbitTemplate.convertAndSend(RabbitConstant.NEW_SYSTEM_RECEIVE_INFO_QUEUE, mapState); + rabbitTemplate.convertAndSend(RabbitConstant.NEW_SYSTEM_RECEIVE_INFO_EXCHANGE, RabbitConstant.NEW_SYSTEM_RECEIVE_INFO_ROUTING, mapState); + System.out.println("发送消息成功"); + } + //维护客户信息状态 reservationEntity.setLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getValue()); @@ -2702,7 +2762,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl detail = distributionParcelListClient.queryOrderByOrderPackageCode("P0041231007B673609"); + System.out.println(detail.getData()); + // 推送数据 + String status = orderStatusDTO.getStatus(); + String unitNo = orderStatusDTO.getUnitNo(); + String operationTime = orderStatusDTO.getOperationTime(); + // || "7".equals(status) 增加签收状态推送 + if ("2".equals(status) || "3".equals(status) || "5".equals(status) || "6".equals(status) || "8".equals(status) || "9".equals(status)) { + + System.out.println("log.warn(\"#############oupai-handleStatusData: 当前数据的状态不推送 status={}\", status);"); +// return Resp.fail(400, "当前数据的状态不推送"); + } + + //继续判断是否到达目的仓 + String currentWarehouseId = orderStatusDTO.getCurrentWarehouse();//当前仓Id + //查询destinationWarehouse logiBillNo plantId数据 + System.out.println("log.info(\"oupai-handleStatusData >>> unitNo={}\", );"+unitNo); +// Map supplyData = advanceDetailClient.getSupplyData(unitNo); + DistributionParcelListEntity distributionParcelList = new DistributionParcelListEntity(); + distributionParcelList.setOrderPackageCode(orderStatusDTO.getUnitNo()); + R distributionParcelListEntity = distributionParcelListClient.queryOrderByOrderPackageCode(orderStatusDTO.getUnitNo()); + if (ObjectUtils.isEmpty(distributionParcelListEntity.getData())) { + + System.out.println("//\treturn Resp.fail(400, \"未查询到该单据信息\");"); + } + String destinationWarehouseId = String.valueOf(distributionParcelListEntity.getData().getAcceptWarehouseId());//目的仓id + if (StringUtil.isBlank(currentWarehouseId) || StringUtil.isBlank(destinationWarehouseId)) { + System.out.println("\t\t\tlog.warn(\"##############oupai-handleStatusData: 仓库数据有问题currentWarehouseId={} destinationWarehouseId={}"+currentWarehouseId+" destinationWarehouseId="+destinationWarehouseId); + // return Resp.fail(400, "仓库数据有误"); + } + + if (!currentWarehouseId.equals(destinationWarehouseId)) { + System.out.println("\t\t\tlog.info(\"##############oupai-handleStatusData: 不用处理的状态 currentWarehouseId={} destinationWarehouseId={}\", currentWarehouseId, destinationWarehouseId);\n"); + + System.out.println("//return Resp.fail(400, \"不是目的仓\");"); + } + + //FactoryOrderEntity factoryOrder = factoryOrderService.selectEntityByOrderPackageCode(unitNo); + // System.out.println(factoryOrder); + // return Resp.success("成功"); + } + @Autowired + private IDistributionStockArticleService distributionStockArticleService; + @Test + public void test18(){ + DistributionStockArticleEntity distributionStockArticle = new DistributionStockArticleEntity(); + distributionStockArticle.setId(1739219471358267394L); + DistributionStockArticleEntity detail = distributionStockArticleService.getOne(Condition.getQueryWrapper(distributionStockArticle)); + System.out.println(detail.getBrand()); + } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/RabbitMqConfiguration.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/RabbitMqConfiguration.java index fefc0f844..82db476e0 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/RabbitMqConfiguration.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/RabbitMqConfiguration.java @@ -2,6 +2,7 @@ package com.logpm.factory.config; import com.alibaba.nacos.shaded.com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; +import org.springblade.common.constant.ModuleNameConstant; import org.springblade.common.constant.RabbitConstant; import org.springframework.amqp.core.*; import org.springframework.amqp.rabbit.connection.ConnectionFactory; @@ -182,6 +183,24 @@ public class RabbitMqConfiguration { return BindingBuilder.bind(receiveInfoQueue).to(receiveInfoExchange).with(RabbitConstant.RECEIVE_INFO_ROUTING).noargs(); } + @Bean + public Queue newSystemReceiveInfoHandler() { + return new Queue(RabbitConstant.NEW_SYSTEM_RECEIVE_INFO_QUEUE, true); + } + @Bean + public CustomExchange newSystemReceiveInfoExchange() { + Map args = Maps.newHashMap(); + args.put("x-delayed-type", "direct"); + return new CustomExchange(RabbitConstant.NEW_SYSTEM_RECEIVE_INFO_EXCHANGE, "x-delayed-message", true, false, args); + } + @Bean + public Binding newSystemReceiveInfoBinding(Queue newSystemReceiveInfoHandler, CustomExchange newSystemReceiveInfoExchange) { + return BindingBuilder.bind(newSystemReceiveInfoHandler) + .to(newSystemReceiveInfoExchange) + .with(RabbitConstant.NEW_SYSTEM_RECEIVE_INFO_ROUTING) + .noargs(); + } + /***/ diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/controller/FactoryPackageController.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/controller/FactoryPackageController.java index 7489d5096..8e5c9404d 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/controller/FactoryPackageController.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/controller/FactoryPackageController.java @@ -18,8 +18,10 @@ package com.logpm.factory.oupai.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.logpm.factory.comfac.dto.OrderStatusDTO; import com.logpm.factory.oupai.entity.FactoryPackageEntity; import com.logpm.factory.oupai.service.IFactoryPackageService; +import com.logpm.factory.oupai.service.IOuPaiFactoryService; import com.logpm.factory.oupai.vo.FactoryPackageVO; import com.logpm.factory.oupai.wrapper.FactoryPackageWrapper; import io.swagger.annotations.Api; @@ -50,7 +52,7 @@ import java.util.Map; public class FactoryPackageController extends BladeController { private final IFactoryPackageService factoryPackageService; - + private IOuPaiFactoryService ouPaiFactoryService; /** * 欧派工厂包件 详情 */ @@ -123,7 +125,15 @@ public class FactoryPackageController extends BladeController { return R.status(factoryPackageService.deleteLogic(Func.toLongList(ids))); } - + /** + * 欧派工厂订单 欧派推送包件状态 + */ + @PostMapping("/pushPckage") + @ApiOperationSupport(order = 8) + @ApiOperation(value = "传入订单信息", notes = "传入orderStatusDTO") + public R outbound(@RequestBody OrderStatusDTO orderStatusDTO) { + return ouPaiFactoryService.newSystemHandleStatusData(orderStatusDTO); + } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/feign/OuPaiFactoryClinet.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/feign/OuPaiFactoryClinet.java new file mode 100644 index 000000000..0f86a2bb1 --- /dev/null +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/feign/OuPaiFactoryClinet.java @@ -0,0 +1,34 @@ +package com.logpm.factory.oupai.feign; + +import com.logpm.factory.comfac.dto.OrderStatusDTO; +import com.logpm.factory.oupai.service.IOuPaiFactoryService; +import lombok.AllArgsConstructor; +import org.springblade.core.tenant.annotation.NonDS; +import org.springblade.core.tool.api.R; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/* + * logisticsplatform-service + * @Author Diss + * @Create 2024/1/2 22:13 + */ +@NonDS +@ApiIgnore +@RestController +@AllArgsConstructor +public class OuPaiFactoryClinet implements IOuPaiFactoryClinet{ + + private IOuPaiFactoryService ouPaiFactoryService; + + + @Override + @PostMapping(TOP) + public R newSystemHandleStatusData(OrderStatusDTO orderStatusDTO) { + return ouPaiFactoryService.newSystemHandleStatusData(orderStatusDTO); + } + + + +} diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IOuPaiFactoryService.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IOuPaiFactoryService.java index 633a3ef44..588e3f22e 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IOuPaiFactoryService.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IOuPaiFactoryService.java @@ -39,4 +39,6 @@ public interface IOuPaiFactoryService { * @return */ R handleStatusData(OrderStatusDTO orderStatusDTO); + + R newSystemHandleStatusData(OrderStatusDTO orderStatusDTO); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java index 71ac1beec..dbbe68519 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java @@ -8,6 +8,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.logpm.distribution.entity.DistributionParcelListEntity; +import com.logpm.distribution.feign.IDistributionParcelListClient; +import com.logpm.factory.comfac.constant.FactoryConstant; import com.logpm.factory.comfac.dto.OrderStatusDTO; import com.logpm.factory.comfac.service.IAsyncDataService; import com.logpm.factory.oupai.entity.*; @@ -88,7 +91,8 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { @Autowired private BladeRedis bladeRedis; - + @Autowired + private IDistributionParcelListClient distributionParcelListClient; @Override public String saveOuPaiFactoryOrderDTOByCarCarNumber(String code) { @@ -402,7 +406,6 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { @Override public R handleStatusData(OrderStatusDTO orderStatusDTO) { - // 推送数据 String status = orderStatusDTO.getStatus(); String unitNo = orderStatusDTO.getUnitNo(); @@ -539,6 +542,117 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { log.info("包件推送记录未null 包条码{}", factoryPackageEntity.getCode()); } +// return Resp.success("物流状态传递成功"); + } + + @Override + public R newSystemHandleStatusData(OrderStatusDTO orderStatusDTO) { + // 推送数据 + String status = orderStatusDTO.getStatus(); + String unitNo = orderStatusDTO.getUnitNo(); + String operationTime = orderStatusDTO.getOperationTime(); + // || "7".equals(status) 增加签收状态推送 + if ("2".equals(status) || "3".equals(status) || "5".equals(status) || "6".equals(status) || "8".equals(status) || "9".equals(status)) { + log.warn("#############oupai-handleStatusData: 当前数据的状态不推送 status={}", status); + return Resp.fail(400, "当前数据的状态不推送"); + } + + //继续判断是否到达目的仓 + String currentWarehouseId = orderStatusDTO.getCurrentWarehouse();//当前仓Id + //查询destinationWarehouse logiBillNo plantId数据 + log.info("oupai-handleStatusData >>> unitNo={}", unitNo); + R distributionParcelListEntity = distributionParcelListClient.queryOrderByOrderPackageCode(unitNo); + if (ObjectUtils.isEmpty(distributionParcelListEntity.getData())) { + return Resp.fail(400, "未查询到该单据信息"); + } + String destinationWarehouseId = String.valueOf(distributionParcelListEntity.getData().getAcceptWarehouseId());//目的仓id + if (StringUtil.isBlank(currentWarehouseId) || StringUtil.isBlank(destinationWarehouseId)) { + log.warn("##############oupai-handleStatusData: 仓库数据有问题currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId); + return Resp.fail(400, "仓库数据有误"); + } + + if (!currentWarehouseId.equals(destinationWarehouseId)) { + log.info("##############oupai-handleStatusData: 不用处理的状态 currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId); + return Resp.fail(400, "不是目的仓"); + } + + // 查询这个包件对应到新系统的订单 + FactoryOrderEntity factoryOrder = factoryOrderService.selectEntityByOrderPackageCode(unitNo); + + if (Objects.isNull(factoryOrder)) { + return Resp.fail(400, "未查询到该单据推送订单信息"); + } + // 如何判断这个包间是非干仓配的数据 + + if (!"经销商".equals(factoryOrder.getBusinessModel())) { + log.info("oupai- 该包条为干仓配的数据类型 不进行推送 >>> unitNo={} businessModel:{}", unitNo, factoryOrder.getBusinessModel()); + return Resp.fail(400, "包条为干仓配的数据类型"); + } + + boolean isPushHtNomal = checkOpfactoryOrderBusinessModel(factoryOrder); + if (isPushHtNomal) { + log.info("oupai- 该包条为汇通使用欧派系统进行作业类型型 不进行推送 >>> unitNo={} businessModel:{}", unitNo, factoryOrder.getBusinessModel()); + return Resp.fail(400, "该包条为汇通使用欧派系统进行作业类型"); + } + + // 通过仓库编码查询 + ReceivingOrderEntity receivingOrderEntity = receivingOrderMapper.selectById(factoryOrder.getReceivingId()); + + if (Objects.isNull(receivingOrderEntity)) { + log.info(" 该订单为没有收货单 不进行推送 >>> receivingId={} ", factoryOrder.getReceivingId()); + return Resp.fail(400, "未查询到该单据推送收货单信息"); + } + + if (StringUtil.isBlank(receivingOrderEntity.getCurrentWarehouseOid())) { + log.info(" 该订单为没有收货仓 不进行推送 >>> getCurrentWarehouseOid={} ", receivingOrderEntity.getCurrentWarehouseOid()); + return Resp.fail(400, "收货仓信息不能为null"); + } + if (!receivingOrderEntity.getCurrentWarehouseName().contains("仓")) { + log.info(" 该订单为没有收货仓信息不正确 getCurrentWarehouseName={} ", receivingOrderEntity.getCurrentWarehouseName()); + return Resp.fail(400, "该订单为没有收货仓信息不正确"); + } + + + JSONObject detailObject = new JSONObject(); + detailObject.put("WarehouseOid", receivingOrderEntity.getCurrentWarehouseOid()); + detailObject.put("WarehouseBelong", "oppein"); + detailObject.put("Creator", orderStatusDTO.getUsername()); + detailObject.put("PackageCode", unitNo); + // 增加当仓直接入库的 就没有卸车收货的状态 直接 进行入库 入库就表示货物进入当前仓库 + if ("4".equals(status) || "1".equals(status)) { + detailObject.put("Operate", "收货"); + } else if ("7".equals(status)) { + detailObject.put("Operate", "发货"); + } else { + log.info(" 该包件的状态不正确 status={} ", status); + return Resp.fail(400, "该包件的状态不正确"); + } + + // 查询系统的包件对象 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(FactoryPackageEntity::getCode, unitNo); + FactoryPackageEntity factoryPackageEntity = factoryPackageService.getOne(lambdaQueryWrapper); + if (ObjectUtils.isNotNull(factoryPackageEntity)) { + // 推送数据 + String url = ouPaiProperties.getUri() + "tims_odata_api/api/odata/PackageFeedbackRecord"; + OpPackagePushLogEntity opPackagePushLogEntity = sendPushOuPaiData(factoryPackageEntity.getId(), url, 1, detailObject); + + if (opPackagePushLogEntity == null) { + log.info(" >>>>>>>>>>>>>>>>>>>>>>> 包件 {} 已推送欧派 状态 {}", unitNo, detailObject.get("Operate")); + } else { + // 需要盘点这个对象的 + String resp = opPackagePushLogEntity.getResp(); + // 转换为json + // JSONObject respJson = JSONObject.parseObject(resp); + log.info(" >>>>>>>>>>>>>>>>>>>>>>> 推送欧派返回数据 {}", resp); + // TODO: 2023/10/25 不知道返回成功的状态是多少 + // 需要修改包件对应的状态 + factoryPackageEntity.setPushStatus(1); + factoryPackageService.updateById(factoryPackageEntity); + } + } + System.out.println("物流状态传递成功"); + return Resp.success("物流状态传递成功"); } /** diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/NewSystemReceiveInfoHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/NewSystemReceiveInfoHandler.java new file mode 100644 index 000000000..d0ec1290b --- /dev/null +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/NewSystemReceiveInfoHandler.java @@ -0,0 +1,68 @@ +package com.logpm.factory.receiver; +/* + * logisticsplatform-service + * @Author Diss + * @Create 2024/1/4 17:41 + */ + +import com.logpm.factory.comfac.constant.FactoryConstant; +import com.logpm.factory.comfac.dto.OrderStatusDTO; +import com.logpm.factory.oupai.service.IOuPaiFactoryService; +import com.rabbitmq.client.Channel; +import lombok.extern.slf4j.Slf4j; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.common.constant.RabbitConstant; +import org.springblade.common.exception.CustomerException; +import org.springblade.core.tool.api.R; +import org.springframework.amqp.core.Message; +import org.springframework.amqp.rabbit.annotation.RabbitHandler; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.io.IOException; +import java.security.NoSuchAlgorithmException; +import java.util.Map; +import java.util.Objects; + +@Slf4j +@RabbitListener(queues = RabbitConstant.NEW_SYSTEM_RECEIVE_INFO_QUEUE) +@Component +public class NewSystemReceiveInfoHandler { + + @Autowired + private IOuPaiFactoryService ouPaiFactoryService; + + @RabbitHandler + public void newSystemReceiveInfoHandler(Map map, Message message, Channel channel) throws IOException, NoSuchAlgorithmException { + System.out.println(map); + OrderStatusDTO orderStatusDTO = (OrderStatusDTO) map.get("orderStatusDTO"); + log.info("##################receiveInfoHandler：处理签收信息数据"); + String brand = (String) map.get("brand"); //品牌 + //根据品牌进行处理 + if (Objects.isNull(brand)) { + log.info("##################receiveInfoHandler: 未找到对应订单 orderSelfNum={}", orderStatusDTO.getOrderNo()); + return; + } + R r = null; + switch (brand) { + case FactoryConstant.OUPAI: + try { + r = ouPaiFactoryService.newSystemHandleStatusData(orderStatusDTO); + log.info("################出库接口返回结果+{}" + r.getMsg()); + } catch (Exception e) { + log.error(">>> 欧派异常报错 ", e); + } + int code = r.getCode(); + if (code == 400 || code == 200) { + log.info("##################receiveInfoHandler: 该条数据不用处理 orderNo={}", orderStatusDTO.getUnitNo()); + } else { + throw new CustomerException(code, r.getMsg()); + } + break; + default: + log.info("##################receiveInfoHandler: 未知品牌 type={}", brand); + } + + } +} diff --git a/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java b/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java index 0ce5ff714..4695849e2 100644 --- a/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java +++ b/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java @@ -12,14 +12,20 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.nacos.common.utils.MD5Utils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fasterxml.jackson.core.JsonProcessingException; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.logpm.distribution.entity.DistributionParcelListEntity; +import com.logpm.distribution.feign.IDistributionParcelListClient; +import com.logpm.factory.comfac.dto.OrderStatusDTO; import com.logpm.factory.excel.ExcelMode14; import com.logpm.factory.excel.JpDataMode; import com.logpm.factory.excel.OrderStatusLogMode; import com.logpm.factory.listener.ExcelListener; import com.logpm.factory.listener.OrderStatusLogListener; import com.logpm.factory.mt.feign.IMtOrderMainClinet; +import com.logpm.factory.oupai.entity.FactoryOrderEntity; import com.logpm.factory.oupai.entity.FactoryPackageEntity; import com.logpm.factory.oupai.entity.OpOrderStatusLogEntity; +import com.logpm.factory.oupai.service.IFactoryOrderService; import com.logpm.factory.oupai.service.IFactoryPackageService; import com.logpm.factory.oupai.service.IOuPaiFactoryDataService; import com.logpm.factory.oupai.service.impl.OuPaiFactoryServiceImpl; @@ -816,17 +822,65 @@ public class TestService { } - + @Autowired + private IDistributionParcelListClient distributionParcelListClient; + @Autowired + private IFactoryOrderService factoryOrderService; @Test - public void test19() throws NoSuchAlgorithmException, JsonProcessingException { + public void test19(){ + OrderStatusDTO orderStatusDTO = new OrderStatusDTO(); + orderStatusDTO.setStatus("7"); //状态 + orderStatusDTO.setUnitNo("P0041231007B673609"); //包件码 + orderStatusDTO.setOperationTime("2021-08-25 15:39:54"); //操作时间 + orderStatusDTO.setCurrentWarehouse("17119930215609234689"); //收货仓 //1711993021509234689 荆门仓 + orderStatusDTO.setUsername("liu"); //操作人 + R detail = distributionParcelListClient.queryOrderByOrderPackageCode("P0041231007B673609"); + System.out.println(detail.getData()); + // 推送数据 + String status = orderStatusDTO.getStatus(); + String unitNo = orderStatusDTO.getUnitNo(); + String operationTime = orderStatusDTO.getOperationTime(); + // || "7".equals(status) 增加签收状态推送 + if ("2".equals(status) || "3".equals(status) || "5".equals(status) || "6".equals(status) || "8".equals(status) || "9".equals(status)) { + + System.out.println("log.warn(\"#############oupai-handleStatusData: 当前数据的状态不推送 status={}\", status);"); +// return Resp.fail(400, "当前数据的状态不推送"); + } - mtOrderMainClinet.sendOrderPackageScan("0","1","2","3","4"); - } + //继续判断是否到达目的仓 + String currentWarehouseId = orderStatusDTO.getCurrentWarehouse();//当前仓Id + //查询destinationWarehouse logiBillNo plantId数据 + System.out.println("log.info(\"oupai-handleStatusData >>> unitNo={}\", );"+unitNo); +// Map supplyData = advanceDetailClient.getSupplyData(unitNo); + DistributionParcelListEntity distributionParcelList = new DistributionParcelListEntity(); + distributionParcelList.setOrderPackageCode(orderStatusDTO.getUnitNo()); + R distributionParcelListEntity = distributionParcelListClient.queryOrderByOrderPackageCode(orderStatusDTO.getUnitNo()); + if (ObjectUtils.isEmpty(distributionParcelListEntity.getData())) { + System.out.println("//\treturn Resp.fail(400, \"未查询到该单据信息\");"); + } + String destinationWarehouseId = String.valueOf(distributionParcelListEntity.getData().getAcceptWarehouseId());//目的仓id + if (StringUtil.isBlank(currentWarehouseId) || StringUtil.isBlank(destinationWarehouseId)) { + System.out.println("\t\t\tlog.warn(\"##############oupai-handleStatusData: 仓库数据有问题currentWarehouseId={} destinationWarehouseId={}"+currentWarehouseId+" destinationWarehouseId="+destinationWarehouseId); + // return Resp.fail(400, "仓库数据有误"); + } + if (!currentWarehouseId.equals(destinationWarehouseId)) { + System.out.println("\t\t\tlog.info(\"##############oupai-handleStatusData: 不用处理的状态 currentWarehouseId={} destinationWarehouseId={}\", currentWarehouseId, destinationWarehouseId);\n"); + System.out.println("//return Resp.fail(400, \"不是目的仓\");"); + } + FactoryOrderEntity factoryOrder = factoryOrderService.selectEntityByOrderPackageCode(unitNo); + System.out.println(factoryOrder); + // return Resp.success("成功"); + } } + + + + +