From 9b10d7385c8cd3cc314f11a31d33c18e177c78ae Mon Sep 17 00:00:00 2001 From: Diss <1157651603@qq.com> Date: Tue, 9 Jan 2024 15:53:32 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8C=85=E4=BB=B6=E6=98=8E=E7=BB=86?= =?UTF-8?q?=EF=BC=9A=E5=85=A5=E5=BA=93=E6=97=B6=E9=97=B4=EF=BC=8C=E8=A3=85?= =?UTF-8?q?=E8=BD=A6=E6=97=B6=E9=97=B4=EF=BC=8C=E7=AD=BE=E6=94=B6=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=B7=B2=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=90=9C=E7=B4=A2=20=E5=AE=9E=E9=99=85=E8=A3=85?= =?UTF-8?q?=E8=BD=A6=E4=BA=BA=EF=BC=8C=E5=AE=9E=E9=99=85=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E4=BA=BA=EF=BC=8C=E9=85=8D=E9=80=81=E8=BD=A6=E6=AC=A1=E5=8F=B7?= =?UTF-8?q?=EF=BC=8C=E8=BD=A6=E7=89=8C=E5=8F=B7=E6=90=9C=E7=B4=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/DistributionParcelListVO.java | 34 +++++++++++++++++++ .../mapper/DistributionParcelListMapper.xml | 23 ++++++++++--- 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java index 46584e39c..836c3ffd8 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java @@ -17,6 +17,7 @@ package com.logpm.distribution.vo; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.logpm.distribution.entity.DistributionParcelListEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -167,4 +168,37 @@ public class DistributionParcelListVO extends DistributionParcelListEntity { private String noteNumber; + /** + * 时间模糊查询需要的值 + */ + @ApiModelProperty(value = "入库开始时间") + @TableField(exist = false) + @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss") + private String startWarehouseEntryTimeEnd; + + @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "入库结束时间") + @TableField(exist = false) + private String lastWarehouseEntryTimeEnd; + + @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "装车开始时间") + @TableField(exist = false) + private String startLoadingTime; + + @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "装车结束时间") + @TableField(exist = false) + private String lastLoadingTime; + + @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "签收开始时间") + @TableField(exist = false) + private String startSigningTime; + + @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "签收结束时间") + @TableField(exist = false) + private String lastSigningTime; + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index e443fba7a..8449daa30 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -163,11 +163,11 @@ and ldr.reservation_code = #{param.reservationCode} - - and lddl.vehicle_name = #{param.DvehicleName} + + and lddl.vehicle_name = #{param.dvehicleName} - - and ldl.vehicle_name = #{param.ZvehicleName} + + and ldl.vehicle_name = #{param.vehicleName} and date_format(from_unixtime(ldl.scan_time),'%Y-%m-%d') = date_format(#{param.scanTime}),'%Y-%m-%d') @@ -253,6 +253,21 @@ and ldpl.waybill_number = #{param.waybillNumber} + + and ldl.scan_user = #{param.scanUser} + + + and ldl.signing_user = #{param.signingUser} + + + and ldpl.warehouse_entry_time_end BETWEEN #{param.startWarehouseEntryTimeEnd} AND #{param.lastWarehouseEntryTimeEnd} + + + AND ldl.scan_time BETWEEN #{param.startLoadingTime} AND #{param.lastLoadingTime} + + + AND ldl.signing_time BETWEEN #{param.startSigningTime} AND #{param.lastSigningTime} + From a6e053ae9a633ed27d47804f795a5298b6ec68ef Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 9 Jan 2024 17:07:37 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E9=85=8D=E9=80=81?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E4=B8=BA0=E7=9A=84=E9=85=8D=E9=80=81?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=92=8C=E9=A2=84=E7=BA=A6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E3=80=81PC=E7=AD=BE=E6=94=B6=E5=BA=93=E5=AD=98=E5=93=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionDeliveryInfoMapper.xml | 4 ++-- .../distribution/mapper/DistributionDeliveryListMapper.xml | 2 +- .../service/impl/DistributionReservationServiceImpl.java | 6 +++--- .../service/impl/DistributionSignforServiceImpl.java | 4 +++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml index 940a009da..8da37d894 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml @@ -121,7 +121,7 @@ logpm_distribution_signfor lds JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id - lds.is_deleted = 0 and lds.delivery_id = #{id} and ldr.reservation_status != 40 + lds.is_deleted = 0 and lds.delivery_id = #{id} and ldr.reservation_status != 40 AND (ldr.reservation_num + ldr.reservation_stock_list_num) > 0 + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStorageServicesService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStorageServicesService.java index 4416f9441..21c1af991 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStorageServicesService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStorageServicesService.java @@ -55,4 +55,6 @@ public interface IBasicdataStorageServicesService extends BaseService pageList(IPage page, Map basicdataStorageServices); + + BasicdataStorageServicesEntity findEntityBySendWarehouseIdIsNullAndClientId(Long clientId); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java index cdb1dac88..4b881368c 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java @@ -146,7 +146,7 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService { bladeRedis.expireAt(key,CommonUtil.getDayEnd()); } - return warehouseCode+f+dateShort+CommonUtil.geFourNumber(incr,5); + return warehouseCode+f+CommonUtil.geFourNumber(incr,5); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java index d3188e31e..c23ddafcb 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java @@ -153,4 +153,9 @@ public class BasicdataStorageServicesServiceImpl extends BaseServiceImpl set = distributionParcelListService.updateEntityByOpenOrder(advanceId, warehouseId, waybillId); + + for (String orderCode : set) { + distributionStockArticleService.updateOrderInfo(orderCode,warehouseId); + } + + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java index 28f749d30..0d0474983 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java @@ -29,6 +29,7 @@ import org.springblade.core.tool.api.R; import java.util.List; import java.util.Map; +import java.util.Set; /** * 在库订单包件清单 服务类 @@ -171,4 +172,7 @@ public interface IDistributionParcelListService extends BaseService updateEntityByOpenOrder(Long advanceId, Long warehouseId, Long waybillId); + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index 01eea1e19..d8c200cee 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -25,7 +25,9 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.basic.entity.BasicMaterialEntity; import com.logpm.basic.feign.IBasicMaterialClient; +import com.logpm.basicdata.entity.BasicdataClientEntity; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; +import com.logpm.basicdata.feign.IBasicdataClientClient; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.distribution.dto.DistributionParcelListDTO; import com.logpm.distribution.dto.app.StockupDTO; @@ -39,12 +41,15 @@ import com.logpm.distribution.vo.DistributionParcelListVO; import com.logpm.distribution.vo.DistributionParcelListZeroVO; import com.logpm.distribution.vo.PackageStockupVO; import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity; +import com.logpm.warehouse.entity.WarehouseWaybillEntity; import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient; import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient; +import com.logpm.warehouse.feign.IWarehouseWaybillClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.DictBizConstant; import org.springblade.common.constant.order.OrderStockupStatusConstant; +import org.springblade.common.exception.CustomerException; import org.springblade.common.utils.CommonUtil; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; @@ -95,6 +100,9 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl selectDistributionParcelListPage(IPage page, DistributionParcelListVO distributionParcelList) { @@ -640,6 +648,66 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl updateEntityByOpenOrder(Long advanceId, Long warehouseId, Long waybillId) { + WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId); + if(Objects.isNull(waybillEntity)){ + log.warn("############updateEntityByOpenOrder: 运单信息不存在 waybillId={}",waybillId); + throw new CustomerException(405,"运单信息不存在"); + } + Long departureWarehouseId = waybillEntity.getDepartureWarehouseId(); + String departureWarehouseName = waybillEntity.getDepartureWarehouseName(); + Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId(); + String destinationWarehouseName = waybillEntity.getDestinationWarehouseName(); + String waybillNo = waybillEntity.getWaybillNo(); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("advance_id",advanceId) + .eq("warehouse_id",warehouseId) + .eq("is_deleted",0); + List listEntityList = baseMapper.selectList(queryWrapper); + Set orderCodes = new TreeSet<>(); + for (DistributionParcelListEntity parcelListEntity : listEntityList) { + parcelListEntity.setWaybillId(waybillId+""); + parcelListEntity.setWaybillNumber(waybillNo); + parcelListEntity.setSendWarehouseId(departureWarehouseId); + parcelListEntity.setSendWarehouseName(departureWarehouseName); + parcelListEntity.setAcceptWarehouseId(destinationWarehouseId); + parcelListEntity.setAcceptWarehouseName(destinationWarehouseName); + if(departureWarehouseId.equals(destinationWarehouseId)){ + parcelListEntity.setIsTransfer(0); + }else{ + parcelListEntity.setIsTransfer(1); + } + orderCodes.add(parcelListEntity.getOrderCode()); + } + updateBatchById(listEntityList); + + + for (String orderCode : orderCodes) { + QueryWrapper stockArticleEntityQueryWrapper = new QueryWrapper<>(); + stockArticleEntityQueryWrapper.eq("order_code",orderCode) + .eq("warehouse_id",warehouseId) + .eq("is_deleted",0); + DistributionStockArticleEntity stockArticleEntity = distributionStockArticleMapper.selectOne(stockArticleEntityQueryWrapper); + if(Objects.isNull(stockArticleEntity)){ + log.error("############updateEntityByOpenOrder: 未找到订单信息 orderCode={}",orderCode); + continue; + } + Long consigneeId = waybillEntity.getConsigneeId(); + BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(consigneeId); + stockArticleEntity.setMallId(consigneeId); + stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode()); + stockArticleEntity.setMallName(basicdataClientEntity.getClientName()); + stockArticleEntity.setConsigneePerson(waybillEntity.getConsigneeName()); + stockArticleEntity.setConsigneeMobile(waybillEntity.getConsigneeMobile()); + stockArticleEntity.setConsigneeAddress(waybillEntity.getConsigneeAddress()); + stockArticleEntity.setConsigneeUnit(basicdataClientEntity.getClientName()); + distributionStockArticleMapper.updateById(stockArticleEntity); + } + return orderCodes; + } + /** * @param distributionParcelList 包件信息 * @return diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index a73d3c38e..ce50109ae 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -54,7 +54,6 @@ import org.springblade.common.constant.order.OrderStatusConstant; import org.springblade.common.constant.orderpackage.OrderPackageLoadingStatusConstant; import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant; import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant; -import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant; import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant; import org.springblade.common.exception.CustomerException; import org.springblade.common.utils.CommonUtil; @@ -1317,7 +1316,10 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl pages = billladingService.billladingList(billladingDTO); + + return R.data(pages); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error("############sendOrders: 系统异常",e); + return R.fail(500,"############sendOrders: 系统异常"); + } + } + + + @ResponseBody + @PostMapping("/findAdvanceDetailList") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "查询暂存单明细列表", notes = "传入billladingDTO") + public R findAdvanceDetailList(@RequestBody BillladingDTO billladingDTO) { + String method = "############findAdvanceDetailList: "; + log.info(method+"请求参数{}",billladingDTO); + String orderCode = billladingDTO.getOrderCode(); + try{ + + //当前登录人选择的仓库 + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(Objects.isNull(myCurrentWarehouse)){ + log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); + return R.fail(403,"仓库信息为空"); + } + billladingDTO.setWarehouseId(myCurrentWarehouse.getId()); + + if(StringUtil.isBlank(orderCode)){ + log.warn(method+"订单号为空 orderCode={}",orderCode); + return R.fail(403,"订单号为空"); + } + + IPage pages = billladingService.findAdvanceDetailList(billladingDTO); + + return R.data(pages); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error("############sendOrders: 系统异常",e); + return R.fail(500,"############sendOrders: 系统异常"); + } + } + + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java index 0be4cb655..8b87e659e 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java @@ -417,7 +417,7 @@ public class CarsLoadController { public R removeCarsOrderByCarsOrderId(@RequestBody LoadCarsDTO loadCarsDTO) { String method = "############removeCarsOrderByCarsOrderId: "; log.info(method+"请求参数{}",loadCarsDTO); - Long carsOrderId = loadCarsDTO.getCarsOrderId(); + String carsOrderIds = loadCarsDTO.getCarsOrderIds(); try{ //当前登录人选择的仓库 @@ -427,8 +427,8 @@ public class CarsLoadController { return R.fail(400,"仓库信息为空"); } loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId()); - if(Objects.isNull(carsOrderId)){ - log.warn(method+"节点订单id为空 carsOrderId={}",carsOrderId); + if(StringUtil.isBlank(carsOrderIds)){ + log.warn(method+"节点订单id为空 carsOrderIds={}",carsOrderIds); return R.fail(400,"节点订单id为空"); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java index 7885d6d7d..599377cc9 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java @@ -27,4 +27,6 @@ public interface TrunklineAdvanceDetailMapper extends BaseMapper findBillladingPackageByAdvanceIdsAnd(@Param("list") List advanceIds); IPage advanceDetailPageList(IPage page, @Param("param") AdvanceDetailDTO advanceDetailDTO); + + Integer getIncomingNum(@Param("advanceId") Long advanceId); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml index 9093cbbbc..f7f50f5af 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml @@ -117,4 +117,12 @@ order by ltad.create_time desc + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.java index 49d83dce5..4299100db 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.java @@ -4,11 +4,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.trunkline.dto.BillladingDTO; import com.logpm.trunkline.entity.TrunklineBillladingEntity; +import com.logpm.trunkline.vo.TrunklineBillladingDetailListVO; +import com.logpm.trunkline.vo.TrunklineBillladingDetailVO; import com.logpm.trunkline.vo.TrunklineBillladingVO; import com.logpm.warehouse.vo.WarehouseWaybillVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; @Mapper @@ -19,4 +22,8 @@ public interface TrunklineBillladingMapper extends BaseMapper pageInfoList(IPage page, @Param("param") BillladingDTO billladingDTO); IPage findWaybillListNotBillladingId(IPage page,@Param("list") List waybillNos); + + IPage billladingList(IPage page, @Param("warehouseId") Long warehouseId, @Param("startByDateStr") Date startByDateStr, @Param("endByDateStr") Date endByDateStr); + + IPage findAdvanceDetailList(IPage page, @Param("orderCode") String orderCode); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml index 1a517af53..50a7852c0 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml @@ -4,16 +4,34 @@ @@ -86,4 +105,22 @@ + + + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingPackageMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingPackageMapper.xml index 20a4b352d..8251fdcf0 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingPackageMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingPackageMapper.xml @@ -24,12 +24,10 @@ ltbp.create_time createTime from logpm_trunkline_billlading_package ltbp left join logpm_trunkline_billlading ltb on ltb.id = ltbp.billlading_id - left join logpm_trunkline_billlading_waybill ltbw on ltbw.billlading_id = ltb.id left join logpm_distribution_parcel_list ldpl on ldpl.order_package_code = ltbp.order_package_code left join logpm_warehouse_tray_goods lwtg on lwtg.association_value = ldpl.order_package_code left join logpm_warehouse_tray lwt on lwt.id = lwtg.tray_id - left join logpm_trunkline_waybill_order ltwo on ltwo.order_code = ldpl.order_code and ltwo.waybill_id = ltbw.waybill_id - left join logpm_warehouse_waybill lww on lww.id = ltwo.waybill_id + left join logpm_warehouse_waybill lww on lww.waybill_no = ldpl.waybill_number where ltbp.billlading_id = #{param.id} and ldpl.warehouse_id = #{param.warehouseId} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index fa98ed02e..27e520ab0 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -117,37 +117,44 @@