From 0878376b37cbcb7f40a2c3ec5ce53fe5c8c66f73 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 24 May 2024 13:55:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=89=98=E7=9B=98=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=93=81BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml index a6100efd3..3ff0cfc9a 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml @@ -185,7 +185,7 @@ lwtg.create_user operateUser FROM logpm_warehouse_tray_goods lwtg - JOIN logpm_distribution_stock_list ldsl ON lwtg.association_id = ldsl.material_id + JOIN logpm_distribution_stock_list ldsl ON lwtg.association_id = ldsl.material_id AND lwtg.incoming_batch = ldsl.incoming_batch LEFT JOIN logpm_warehouse_tary_allocation AS lwta ON lwtg.tray_id = lwta.tray_id LEFT JOIN logpm_warehouse_updown_goods AS lwug ON lwta.allocation_id = lwug.allocation_id LEFT JOIN logpm_warehouse_goods_allocation AS lwga ON lwga.id = lwug.allocation_id From 70d5dacd5577715e9d4d0d9d6beacb7957d12919 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Fri, 24 May 2024 16:33:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E5=8D=B8?= =?UTF-8?q?=E8=BD=A6=E7=A1=AE=E8=AE=A4=E6=8E=A8=E9=80=81=E6=A2=A6=E5=A4=A9?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TrunklineCarsLoadServiceImpl.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index c338e5da9..60e20dcc9 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -408,12 +408,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl Date: Fri, 24 May 2024 17:00:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat(all):=20=E5=A2=9E=E5=8A=A0=E7=9A=AE?= =?UTF-8?q?=E9=98=BF=E8=AF=BA=E7=AD=BE=E6=94=B6=E6=95=B0=E6=8D=AE=E5=9B=9E?= =?UTF-8?q?=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionAsyncServiceImpl.java | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index 0bc8e7664..5ff0481fc 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -2,6 +2,7 @@ package com.logpm.distribution.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; @@ -43,6 +44,7 @@ import org.springblade.common.constant.DistributionTypeConstant; import org.springblade.common.constant.Inventory.InventoryLoadingStatusConstant; import org.springblade.common.constant.Inventory.InventoryPackageStatusConstant; import org.springblade.common.constant.Inventory.InventorySigningStatusConstant; +import org.springblade.common.constant.RabbitConstant; import org.springblade.common.constant.WorkNodeEnums; import org.springblade.common.constant.common.IsOrNoConstant; import org.springblade.common.constant.delivery.DeliveryLoadingStatusConstant; @@ -62,6 +64,7 @@ import org.springblade.common.constant.stockup.StockupTypeConstant; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.utils.Func; +import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Transactional; @@ -118,6 +121,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { private final ITrunklineWaybillTrackClient trunklineWaybillTrackClient; private final IWarehouseWaybillClient waybillClient; private final FactoryDataMessageSender factoryDataMessageSender; + private final RabbitTemplate rabbitTemplate; // private final @@ -1440,7 +1444,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { @Transactional(rollbackFor = Exception.class) @LogpmAsync("asyncExecutor") public void sendReviewFactory(Long signingId, String warehouseName, Long warehouseId) { - String brands = "梦天,欧派,志邦";//可追加 + String brands = "梦天,欧派,志邦,皮阿诺";//可追加 log.info(">>>>>>>>>>> 签收推送 对象 {}", "signingId：=" + signingId + "warehouseName：=" + warehouseName + "warehouseId：=" + warehouseId); //查询签收信息 DistributionSignforEntity distributionSignforEntity = distributionSignforMapper.selectById(signingId); @@ -1565,6 +1569,28 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { factoryDataMessageSender.sendNodeDataByBrand(msg); } + if (Func.isNotEmpty(brand.get("皮阿诺"))) { + List zb = brand.get("皮阿诺"); + if (CollUtil.isNotEmpty(zb)) { + for (MtReceiveContentDTO mtReceiveContentDTO : zb) { + try { + // 发送入库消息 + com.logpm.distribution.dto.OrderStatusDTO orderStatusDTO = new com.logpm.distribution.dto.OrderStatusDTO(); + // 通过包件id 查询包件 + orderStatusDTO.setUnitNo(mtReceiveContentDTO.getUnitNo()); + orderStatusDTO.setOrderNo(mtReceiveContentDTO.getOrderCode()); + orderStatusDTO.setStatus("7"); + orderStatusDTO.setOperationTime(DateUtil.now()); + orderStatusDTO.setCurrentWarehouse(warehouseId.toString()); + Map map = new HashMap<>(); + map.put("messageData", JSONUtil.toJsonStr(orderStatusDTO)); + rabbitTemplate.convertAndSend(RabbitConstant.HWY_ORDER_STATUS_EXCHANGE, RabbitConstant.HWY_ORDER_STATUS_ROUTING, map); + } catch (Exception e) { + log.error("入库推送失败：{}", e); + } + } + } + } //....工厂 } catch (Exception e) { From 9e64b02af2bd972af3432141616562d692d49f7b Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Fri, 24 May 2024 17:01:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat(all):=20=E5=A2=9E=E5=8A=A0=E8=80=81?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=BF=97=E9=82=A6=E4=BD=9C=E4=B8=9A=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E6=95=B0=E6=8D=AE=E5=9B=9E=E4=BC=A0=EF=BC=8C=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E5=BF=97=E9=82=A6=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zbom/config/InterceptorAdapterConfig.java | 4 ++-- .../zbom/controller/OrderController.java | 22 ++++++++++++++----- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/config/InterceptorAdapterConfig.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/config/InterceptorAdapterConfig.java index 6ee97e0d1..545afdee9 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/config/InterceptorAdapterConfig.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/config/InterceptorAdapterConfig.java @@ -21,8 +21,8 @@ public class InterceptorAdapterConfig implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry interceptorRegistry) { - interceptorRegistry.addInterceptor(new ZbFactoryAccountsInterceptor(zbFactoryProperties)) - .addPathPatterns("/**").order(2); +// interceptorRegistry.addInterceptor(new ZbFactoryAccountsInterceptor(zbFactoryProperties)) +// .addPathPatterns("/**").order(2); interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis, environment)) .addPathPatterns("/**").order(3); } diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/controller/OrderController.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/controller/OrderController.java index 0e348ef7d..fc344839e 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/controller/OrderController.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/controller/OrderController.java @@ -1,21 +1,16 @@ package com.logpm.factorydata.zbom.controller; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.factorydata.enums.SaxStatusEnums; import com.logpm.factorydata.feign.IFactoryDataClient; import com.logpm.factorydata.vo.SendMsg; import com.logpm.factorydata.zbom.constants.ZbomConstants; import com.logpm.factorydata.zbom.entity.FactoryLogEntity; -import com.logpm.factorydata.zbom.entity.ZbFactoryOrderLogEntity; -import com.logpm.factorydata.zbom.entity.ZbReceiptEntity; import com.logpm.factorydata.zbom.service.FactoryLogService; -import com.logpm.factorydata.zbom.service.IFactoryOrderLogService; -import com.logpm.factorydata.zbom.service.IReceiptService; import com.logpm.factorydata.zbom.vo.ZBReceiptDTO; import com.logpm.factorydata.zbom.vo.ZbResp; import io.swagger.annotations.Api; @@ -31,6 +26,7 @@ import org.springblade.common.utils.FileLogsUtil; import org.springblade.core.oss.model.BladeFile; import org.springblade.core.tool.api.R; import org.springblade.resource.feign.IOssClient; +import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -63,8 +59,22 @@ public class OrderController { private final FactoryLogService factoryLogService; private final IOssClient ossClient; + private final RabbitTemplate rabbitTemplate; + @ResponseBody + @PostMapping("pushData") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "推送志邦工厂节点数据", notes = "推送志邦工厂节点数据") + public ZbResp pushData(@RequestBody String msg, HttpServletRequest request) { + log.info("推送志邦工厂节点数据：{}", msg); + if (StrUtil.isNotEmpty(msg)) { + rabbitTemplate.convertAndSend(FactoryDataConstants.Mq.Exchanges.NODE_DATA_PUSH, + FactoryDataConstants.Mq.RoutingKeys.ZBOM_NODE_DATA_PUSH, msg); + } + return ZbResp.success("成功"); + } + @ResponseBody @PostMapping @ApiOperationSupport(order = 1)