From dd26dacfde9f4a7ed5745e2173592d6fd07ca732 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 1 Aug 2024 17:12:08 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=9B=B6=E6=8B=85=E7=AD=BE=E6=94=B6BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionSignforServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 42a23782e..3802e9373 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 @@ -6080,8 +6080,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Thu, 1 Aug 2024 18:12:25 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=AF=B9=E5=B7=B2=E7=AD=BE=E6=94=B6=E5=8C=85?= =?UTF-8?q?=E4=BB=B6=E8=BF=9B=E8=A1=8C=E8=B7=B3=E8=BF=87=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionSignforServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) 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 3802e9373..5cadc2905 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 @@ -5260,6 +5260,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>>包件已签收:{}",parcelListEntity.getOrderPackageCode()); + continue; + } //查询是否进行装车 DistributionLoadscanEntity loadscanEntities = distributionLoadscanService.getOne(Wrappers.query().lambda() .eq(DistributionLoadscanEntity::getPackageId, parcelListEntity.getId()) From b6533bd6e855ec035c6be22ce288a3c40a517f1c Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 1 Aug 2024 19:02:49 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=92=8C=E6=89=98=E7=9B=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=A1=E6=81=AF=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PrintTemplateStatusConstant.java | 3 +++ .../mapper/DistributionReservationMapper.xml | 6 ++---- .../DistributionReservationPackageMapper.xml | 6 ++---- .../DistributionDeliveryListServiceImpl.java | 9 ++++++-- .../WarehouseWarehousingEntryController.java | 21 +++++++++++++++++++ .../IWarehouseWarehousingEntryService.java | 9 ++++++++ .../WarehouseWarehousingEntryServiceImpl.java | 14 ++++++++++++- 7 files changed, 57 insertions(+), 11 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/printTemplate/PrintTemplateStatusConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/printTemplate/PrintTemplateStatusConstant.java index c3c1c3ab7..9a50966bb 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/printTemplate/PrintTemplateStatusConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/printTemplate/PrintTemplateStatusConstant.java @@ -22,6 +22,9 @@ public enum PrintTemplateStatusConstant { daiqueren_12("配送任务打印模板-商配","12"), peisongtask_ziti("配送任务打印模板-自提","13"), daiqueren_14("订单模版","15"), + wallbill_1("运单打印模板","16"), + stock_import_1("库存品入库模块","17"), + daiqueren_1("配送任务打印模板-市配","1"); /** * 状态 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index 0193edefc..6079c756d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -798,8 +798,8 @@ ldpl.order_package_code, ldpl.cargo_title, ldpl.shelf_title, - lwtg.tray_code AS pallet, - lwug.allocation_title AS goodsAllocation, + ldpl.pallet AS pallet, + ldpl.goods_allocation AS goodsAllocation, ldpl.firsts_code, ldpl.firsts, ldpl.second_code, @@ -836,8 +836,6 @@ FROM logpm_distribution_reservation_package AS ldrp LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldpl.order_package_code = ldrp.packet_bar_code - LEFT JOIN logpm_warehouse_tray_goods AS lwtg ON ldpl.id = lwtg.association_id and lwtg.association_type = 3 - LEFT JOIN logpm_warehouse_updown_goods AS lwug ON ldpl.id = lwug.association_id and lwug.association_type = 3 and packet_bar_status != 2 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml index 8713b5085..3dbe718d2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml @@ -137,8 +137,8 @@ WHERE ldpl.order_package_code, ldpl.cargo_title, ldpl.shelf_title, - lwtg.tray_code AS pallet, - lwug.allocation_title AS goodsAllocation, + ldpl.pallet AS pallet, + ldpl.goods_allocation AS goodsAllocation, ldpl.firsts_code, ldpl.firsts, ldpl.second_code, @@ -175,8 +175,6 @@ WHERE FROM logpm_distribution_reservation_package AS ldrp LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldpl.id = ldrp.parce_list_id - LEFT JOIN logpm_warehouse_tray_goods AS lwtg ON ldpl.id = lwtg.association_id and lwtg.association_type = 3 - LEFT JOIN logpm_warehouse_updown_goods AS lwug ON ldpl.id = lwug.association_id and lwug.association_type = 3 ldrp.packet_bar_status != 2 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index e8d307b88..752073946 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -1624,7 +1624,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl> allStockArticle = reservationStockarticleEntityList.stream().filter(f -> Func.isNotEmpty(f.getIsZero())).collect(Collectors.groupingBy(DistributionReservationStockarticleEntity::getIsZero)); +// Map> allStockArticle = reservationStockarticleEntityList.stream().filter(f -> Func.isNotEmpty(f.getIsZero())).collect(Collectors.groupingBy(DistributionReservationStockarticleEntity::getIsZero)); DistributionDeliverySelfEntity finalDistributionDeliverySelfEntity = distributionDeliverySelfEntity; List updatePackageList = new ArrayList<>(); List orderCodes = new ArrayList<>(); @@ -1694,7 +1694,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl> printBatch(@ApiParam(value = "主键集合", required = true) @RequestParam String ids, @ApiParam(value = "打印类型", required = true) @RequestParam Integer type) { + try { + log.info(">>>>>>>>>>>>>>>>>> printBatch {}",ids); + List printPreviewVOS = warehouseWarehousingEntryService.printBatch(ids, type); + return R.data(printPreviewVOS); + } catch (Exception e) { + throw new RuntimeException(e); + } + + } + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWarehousingEntryService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWarehousingEntryService.java index c6ff201ba..1e1191dd4 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWarehousingEntryService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWarehousingEntryService.java @@ -19,6 +19,7 @@ package com.logpm.warehouse.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.distribution.vo.print.PrintPreviewVO; import com.logpm.warehouse.dto.WarehouseWarehousingEntryDTO; import com.logpm.warehouse.entity.WarehouseWarehouseEntity; import com.logpm.warehouse.entity.WarehouseWarehousingEntryEntity; @@ -72,4 +73,12 @@ public interface IWarehouseWarehousingEntryService extends BaseService data, Boolean isCovered); List exportWarehouseWarehousing(Map paramMap); + + /** + * 打印入库单 + * @param ids 入库单ID字符串 逗号凭借 + * @param type + * @return + */ + List printBatch(String ids, Integer type); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java index dc14d6f47..87e94a938 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java @@ -24,7 +24,9 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.basic.entity.BasicMaterialEntity; +import com.logpm.basic.entity.BasicPrintTemplateEntity; import com.logpm.basic.feign.IBasicMaterialClient; +import com.logpm.basic.feign.IBasicPrintTemplateClient; import com.logpm.basicdata.entity.BasicdataClientEntity; import com.logpm.basicdata.entity.BasicdataStoreBrandEntity; import com.logpm.basicdata.entity.BasicdataTrayEntity; @@ -38,6 +40,7 @@ import com.logpm.distribution.entity.DistributionStockListInfoEntity; import com.logpm.distribution.feign.IDistributionStockListClient; import com.logpm.distribution.feign.IDistributionStockListInfoClient; import com.logpm.distribution.vo.DistributionStockListVO; +import com.logpm.distribution.vo.print.PrintPreviewVO; import com.logpm.warehouse.dto.NoDataStockListDTO; import com.logpm.warehouse.dto.UpShelfStockDTO; import com.logpm.warehouse.dto.WarehouseWarehousingEntryDTO; @@ -55,6 +58,7 @@ import com.logpm.warehouse.service.IWarehouseWarehousingEntryService; import com.logpm.warehouse.vo.WarehouseWarehousingEntryVO; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; +import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant; import org.springblade.common.exception.CustomerException; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; @@ -96,6 +100,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl printBatch(String ids, Integer type) { + BasicPrintTemplateEntity printTemplate = basicPrintTemplateClient.getPrintTemplate(PrintTemplateStatusConstant.stock_import_1.getValue()); + if (ObjectUtils.isNull(printTemplate)){ + throw new ServiceException("打印模板不存在！"); + } + return null; - + } } From 0b7e05269281ba4ec4d2be19102be753d79d8126 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 1 Aug 2024 19:10:25 +0800 Subject: [PATCH 4/5] =?UTF-8?q?1.=E4=BB=93=E5=BA=93=E5=B9=BF=E6=92=AD?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WarehouseUpdownTypeServiceImpl.java | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java index bdb55b65b..ac731c2ca 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java @@ -1712,8 +1712,8 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl { - String allocationTitle = warehouseUpdownGoodsLogEntity.getAllocationTitle(); - String content = "包件在 "+warehouseName+" 下架，库位 "+allocationTitle; + String positionCode = warehouseUpdownGoodsLogEntity.getPositionCode(); + String content = "包件在 "+warehouseName+" 下架，库位 "+positionCode; List packageCodeList = new ArrayList<>(); packageCodeList.add(warehouseUpdownGoodsLogEntity.getAssociationValue()); warehousePackageTrackLogService.addBatchLog(packageCodeList,content,warehouseId,warehouseName, AuthUtil.getNickName(), WorkNodeEnums.DELIST.getCode()); @@ -1919,9 +1919,30 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl packageCodes = new ArrayList<>(); + packageCodes.add(parcelListEntity.getOrderPackageCode()); + + jsonObject.put("orderPackageCodes",packageCodes); + jsonObject.put("warehouseId",warehouseId); + + FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.ALLOCATION.EXCHANGE).msg(jsonObject.toJSONString()).build(); + + sendFanoutService.sendFanoutMsg(fanoutMsg); + + String positionCode = updownTypeEntity.getPositionCode(); + String content = "包件在 "+parcelListEntity.getWarehouse()+" 下架，库位 "+positionCode; + warehousePackageTrackLogService.addBatchLog(packageCodes,content,warehouseId,parcelListEntity.getWarehouse(), AuthUtil.getNickName(), WorkNodeEnums.DELIST.getCode()); + } else { log.error("包件下架失败，找不到上架方式,updownTypeId:{}", updownTypeId); } + } return Resp.scanSuccess("下架成功", "成功下架" + num + "件"); } From 068b4c88b69b9b55af6720f69fff7cb6e6435b86 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 2 Aug 2024 10:07:16 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=93=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/mapper/DistributionStockListMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml index 40be18b37..02127e1f1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml @@ -124,7 +124,7 @@