From 7ea25a9b15f53cbf3a9810d39841010ac570fa76 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 29 Apr 2024 14:35:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=8C=85=E4=BB=B6?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AF=BC=E5=87=BA=E3=80=81=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/DistributionBillOrderPackExcel.java | 5 +++- .../mapper/DistrilbutionBillStockMapper.xml | 24 ++++++++++++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionBillOrderPackExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionBillOrderPackExcel.java index bbf7de7f3..8cf5ebc19 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionBillOrderPackExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionBillOrderPackExcel.java @@ -28,12 +28,15 @@ public class DistributionBillOrderPackExcel { @ExcelProperty("包件码") private String orderPackageCode; @ColumnWidth(20) - @ExcelProperty("客户车次号") + @ExcelProperty("自提批次号") private String trainNumber; //客户车次号 @ColumnWidth(20) @ExcelProperty("订单自编号") private String orderCode; @ColumnWidth(20) + @ExcelProperty("包件状态") + private String orderPackageStatusName; + @ColumnWidth(20) @ExcelProperty("仓库") private String sendWarehouseName; @ColumnWidth(20) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml index fb12e0e81..d47383bf6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml @@ -158,7 +158,6 @@ SELECT - lds.outbound_type, ldpl.order_package_code orderPackageCode, ldpl.warehouse, ldpl.firsts, ldpl.SECOND, ldpl.third_product thirdProduct, + ldbl.pickup_batch AS trainNumber, ldpl.material_code materialCode, ldpl.material_name materialName, ldpl.waybill_number waybillNumber, @@ -322,10 +321,23 @@ ldbls.create_user stockupCreateUser, ldbl.pick_up_time stockuppickUpTime, ldbls.create_time signForCreateTime, - case + CASE + ldpl.order_package_status + WHEN 10 THEN + '未入库' + WHEN 20 THEN + '已入库' + WHEN 30 THEN + '中转入库' + WHEN 60 THEN + '已出库' + WHEN 70 THEN + '已签收' ELSE '未知' + END orderPackageStatusName, + CASE WHEN ldbl.conditions = 30 THEN ldbl.update_user end as clerkCheck, - case + CASE WHEN ldbl.conditions = 30 THEN ldbl.update_time end as clerkUpdateTime FROM logpm_distrilbution_bill_lading ldbl From ec6ba775f0d263ad4ef044ed60f4200d62b136d1 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Mon, 29 Apr 2024 14:38:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E7=B4=A2?= =?UTF-8?q?=E8=8F=B2=E4=BA=9A=E8=AE=A2=E5=8D=95=E5=8C=85=E4=BB=B6=E6=95=B0?= =?UTF-8?q?=E4=B8=8D=E5=87=86=E7=A1=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../suofeiya/mq/FactoryOrderListener.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/mq/FactoryOrderListener.java b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/mq/FactoryOrderListener.java index a4a69c4a4..a366aec37 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/mq/FactoryOrderListener.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/mq/FactoryOrderListener.java @@ -189,16 +189,25 @@ public class FactoryOrderListener { // 组装暂存单数据 List advances = new ArrayList<>(); for (OrderInfoVO orderInfoVO : details) { + List packageList = new ArrayList<>(); + if (CollUtil.isEmpty(advanceMap)) { + return; + } + List packageInfoVOS = advanceMap.get(orderInfoVO.getOrderNo()); + if (ObjectUtil.isEmpty(packageInfoVOS)) { + return; + } + TrunklineAdvanceEntity advanceEntity = new TrunklineAdvanceEntity(); advanceEntity.setTenantId(tenantId); advanceEntity.setStatus(0); advanceEntity.setIsDeleted(0); - advanceEntity.setHasPackage(CollUtil.isNotEmpty(vo.getPackageInfo()) ? 1 : 0); + advanceEntity.setHasPackage(CollUtil.isNotEmpty(packageInfoVOS) ? 1 : 0); advanceEntity.setOrderType(vo.getOrderType()); advanceEntity.setBrand(BrandEnums.SFY.getValue()); advanceEntity.setSiteName(""); advanceEntity.setArea(""); - advanceEntity.setTotalNum(CollUtil.isNotEmpty(vo.getPackageInfo()) ? vo.getPackageInfo().size() : 0); + advanceEntity.setTotalNum(CollUtil.isNotEmpty(packageInfoVOS) ? packageInfoVOS.size() : 0); advanceEntity.setPackName(""); advanceEntity.setPackCode(""); advanceEntity.setWarehouseId(startWarehouseId); @@ -220,14 +229,6 @@ public class FactoryOrderListener { advanceEntity.setSenderFactory(vo.getSendAddr()); - List packageList = new ArrayList<>(); - if (CollUtil.isEmpty(advanceMap)) { - return; - } - List packageInfoVOS = advanceMap.get(orderInfoVO.getOrderNo()); - if (ObjectUtil.isEmpty(packageInfoVOS)) { - return; - } for (PackageInfoVO orderPackageDTO : packageInfoVOS) { advanceEntity.setDealerCode(orderPackageDTO.getDealerNo()); advanceEntity.setDealerName(orderPackageDTO.getDealerName());