From 9854da258e4a9f93892edf62cb0955e13f2830e1 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sat, 26 Oct 2024 13:00:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E9=80=89=E5=8D=95=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=BF=90=E5=8D=95=E5=AE=A1=E6=A0=B8=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionStockArticleMapper.xml | 3 +++ .../trunkline/service/impl/OpenOrderServiceImpl.java | 11 +++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 941f51f08..6ff37135b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -758,6 +758,8 @@ ldsa.is_zero, ldsa.accept_warehouse_id, ldsa.accept_warehouse_name, ldsa.order_delivery_status from logpm_distribution_stock_article ldsa LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id + LEFT JOIN logpm_trunkline_waybill_order AS ltwo ON ldsa.waybill_number = ltwo.waybill_no + LEFT JOIN logpm_warehouse_waybill AS lww ON lww.id = ltwo.waybill_id ldsa.order_status in ('10','20','30','70') and ldsa.reservation_status in ('10','20') @@ -858,6 +860,7 @@ and ldsa.customer_address like concat('%',#{par.customerAddress},'%') + AND lww.check_status = 1 ORDER BY ldsa.warehouse_entry_time DESC diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 89cd67f67..ac308de89 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -801,7 +801,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService { //计算扫码入库的包件是否需要把运单和提货单挂上 openOrderAsyncService.dealwithBillladingInfo(advanceIds,warehouseId,warehouseName,waybillId,waybillNo); - + //判断是否是开单及入库的配置 + Boolean aBoolean = basicdataOpenIncomingClient.checkOpenIncoming(warehouseId, brandId); + if (Boolean.TRUE.equals(aBoolean)) { + openOrderAsyncService.incomingPackageBatch(advanceIds, AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getTenantId(), AuthUtil.getNickName(), IncomingTypeEnum.OPEN_TO_IN.getCode(), warehouseId, warehouseName, waybillEntity); + waybillEntity.setStockCount(waybillEntity.getTotalCount()); + waybillEntity.setWaybillStatus("20"); + warehouseWaybillClient.updateEntity(waybillEntity); + } //异步存入日志 String nickName = AuthUtil.getNickName(); @@ -972,7 +979,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { if (Objects.isNull(basicdataCategoryEntity)) { basicdataCategoryEntity = new BasicdataCategoryEntity(); basicdataCategoryEntity.setName(goodsName); - basicdataCategoryEntity.setType("10"); + basicdataCategoryEntity.setType("1"); goodsId = basicdataCategoryClient.addReturnId(basicdataCategoryEntity); } else { goodsId = basicdataCategoryEntity.getId();