From 66d42a90275d0077f9bfefe7466a403839264524 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Wed, 9 Aug 2023 18:37:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/DistributionParcelListEntity.java | 7 +++++++ .../oldproject/vo/DistributionParcelListEntityVO.java | 7 +++++++ .../pan/service/impl/PanFactoryDataServiceImpl.java | 1 + .../logpm/oldproject/mapper/AdvanceDetailMapper.xml | 10 ++++++++-- 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java index 1bbb49a6b..2cdd24ec0 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java @@ -24,6 +24,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; +import java.util.Date; + /** * 在库订单包件清单 实体类 * @@ -116,6 +118,11 @@ public class DistributionParcelListEntity extends TenantEntity { */ @ApiModelProperty(value = "三级品") private String thirdProduct; + /** + * 入库时间 + */ + @ApiModelProperty(value = "入库时间") + private Date warehouseEntryTimeEnd; /** * 运单号 */ diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/vo/DistributionParcelListEntityVO.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/vo/DistributionParcelListEntityVO.java index e33239e6f..b7e1935ba 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/vo/DistributionParcelListEntityVO.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/vo/DistributionParcelListEntityVO.java @@ -3,6 +3,8 @@ package com.logpm.oldproject.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + @Data public class DistributionParcelListEntityVO { @@ -55,6 +57,11 @@ public class DistributionParcelListEntityVO { */ @ApiModelProperty(value = "物料") private String materialName; + /** + * 入库时间 + */ + @ApiModelProperty(value = "入库时间") + private Date warehouseEntryTimeEnd; /** * 物料编码 */ diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java index a5ddf564e..685d79bad 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java @@ -480,6 +480,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { private void saveOrderPackage(String unitNo, DistributionStockArticleEntity distributionStockArticleEntity, Long id, BasicdataWarehouseEntity basicdataWarehouseEntity,String waybillNoNum) { DistributionParcelListEntityVO vo = advanceDetailClient.getByUnitNo(unitNo); WarehouseWaybillEntity warehouseWaybill = warehouseWaybillClient.findByWaybillNo(waybillNoNum); + DistributionParcelListEntity entity = new DistributionParcelListEntity(); BeanUtil.copyProperties(vo, entity); entity.setOrderPackageCode(vo.getPacketBarCode()); diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml index b2927906e..a19bbd1ad 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml @@ -100,7 +100,12 @@ hdp.productcode materialCode, hdp.productname materialName, ad.mscsNum quantity, - ad.mctsTruck trainNumber + ad.mctsTruck trainNumber, + ( + select create_time from ht_scan_log where unitNo = #{unitNo} and type = 1 or type = 4 and unitNo = #{unitNo} + ORDER BY create_time desc + limit 1 + ) warehouseEntryTimeEnd from ht_order_detail od left join ht_advance_detail ad on ad.unitNo = od.unitNo left join ht_warehouse w on w.id = od.now_warehouse_id @@ -109,8 +114,9 @@ left join ht_cargo c on s.cargo_id = c.id left join ht_tray_scan_des tsd on tsd.unitNo = od.unitNo left join ht_tray t on t.id = tsd.tray_id - left join ht_tray_scan_des htsd on od.unitNo = htsd.unitNo + left join ht_detail_product hdp on hdp.unit_no = od.unitNo where od.unitNo = #{unitNo} +