From fa15d2cb2d055684af956e90732e12b7ee4bc10e Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 30 Jul 2024 18:10:34 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/BillladingWaybillExportVO.java | 78 +++++++++++++++++++ .../trunkline/vo/LoadingDetailExportVO.java | 17 +++- .../vo/TrunklineBillladingExportVO.java | 78 +++++++++++++++++++ .../controller/BillladingController.java | 34 ++++++++ .../controller/CarsLoadController.java | 35 +++++++++ .../mapper/TrunklineBillladingMapper.java | 3 + .../mapper/TrunklineBillladingMapper.xml | 66 ++++++++++++++++ .../TrunklineBillladingWaybillMapper.java | 3 + .../TrunklineBillladingWaybillMapper.xml | 40 ++++++++++ .../mapper/TrunklineCarsLoadMapper.java | 1 + .../mapper/TrunklineCarsLoadMapper.xml | 53 +++++++++++++ .../mapper/TrunklineCarsLoadScanMapper.xml | 12 ++- .../ITrunklineAdvanceDetailService.java | 3 +- .../service/ITrunklineBillladingService.java | 6 ++ .../ITrunklineBillladingWaybillService.java | 3 + .../service/ITrunklineCarsLoadService.java | 2 + .../service/impl/InComingServiceImpl.java | 15 ++++ .../TrunklineAdvanceDetailServiceImpl.java | 8 ++ .../impl/TrunklineBillladingServiceImpl.java | 13 ++++ ...TrunklineBillladingWaybillServiceImpl.java | 6 ++ .../impl/TrunklineCarsLoadServiceImpl.java | 14 +++- .../TrunklineWaybillPackageServiceImpl.java | 24 ++++++ 22 files changed, 506 insertions(+), 8 deletions(-) create mode 100644 blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/BillladingWaybillExportVO.java create mode 100644 blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingExportVO.java diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/BillladingWaybillExportVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/BillladingWaybillExportVO.java new file mode 100644 index 000000000..d311eca44 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/BillladingWaybillExportVO.java @@ -0,0 +1,78 @@ +package com.logpm.trunkline.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@Data +public class BillladingWaybillExportVO implements Serializable { + + @ExcelProperty(value = "提货批次") + private String billadingCode; + + @ExcelProperty(value = "运单号") + private String waybillNo; + + @ExcelProperty(value = "开单时间") + @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date openOrderTime; + + @ExcelProperty(value = "货物名称") + private String goodsName; + + @ExcelProperty(value = "扫描件数") + private Integer scanNum; + + @ExcelProperty(value = "提货件数") + private Integer realNum; + + @ExcelProperty(value = "提货重量") + private BigDecimal realWeight; + + @ExcelProperty(value = "提货体积") + private BigDecimal realVolume; + + @ExcelProperty(value = "到站") + private String destination; + + @ExcelProperty(value = "目的仓") + private String destinationWarehouseName; + + @ExcelProperty(value = "发货人") + private String shipperName; + + @ExcelProperty(value = "发货单位") + private String shipper; + + @ExcelProperty(value = "发货手机") + private String shipperMobile; + + @ExcelProperty(value = "收货人") + private String consigneeName; + + @ExcelProperty(value = "收货单位") + private String consignee; + + @ExcelProperty(value = "收货电话") + private String consigneeMobile; + + @ExcelProperty(value = "收货地址") + private String consigneeAddress; + + @ExcelProperty(value = "备注") + private String remark; + + @ExcelProperty(value = "支付方式") + private BigDecimal collectPay; + + @ExcelProperty(value = "提货费用") + private BigDecimal billladingFee; + + @ExcelProperty(value = "运输费用") + private BigDecimal totalFreight; + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingDetailExportVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingDetailExportVO.java index 15a0ebc82..5aa4353c6 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingDetailExportVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingDetailExportVO.java @@ -34,6 +34,9 @@ public class LoadingDetailExportVO implements Serializable { @ExcelProperty(value = "装卸状态") private String scanStatus; + @ExcelProperty(value = "运单目的仓") + private String destinationWarehouseName; + @ExcelProperty(value = "托盘名称") private String trayName; @@ -46,12 +49,19 @@ public class LoadingDetailExportVO implements Serializable { @ExcelProperty(value = "卸车人") private String unloadUserName; + @ExcelProperty(value = "卸车时间") + @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date unloadTime; + @ExcelProperty(value = "类型") private String type; @ExcelProperty(value = "数量") private String num; + @ExcelProperty(value = "卸车数") + private String unloadNum; + @ExcelProperty(value = "有无数据") private String isData; @@ -68,8 +78,11 @@ public class LoadingDetailExportVO implements Serializable { @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date loadingTime; - @ExcelProperty(value = "卸车时间") + @ExcelProperty(value = "签收人") + private String signUserName; + + @ExcelProperty(value = "签收时间") @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - private Date unloadTime; + private Date signTime; } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingExportVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingExportVO.java new file mode 100644 index 000000000..7ec305d95 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingExportVO.java @@ -0,0 +1,78 @@ +package com.logpm.trunkline.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@Data +public class TrunklineBillladingExportVO implements Serializable { + + @ExcelProperty(value = "提货批次") + private String billladingCode ; + + @ExcelProperty(value = "车牌号") + private String carNumber ; + + @ExcelProperty(value = "司机名称") + private String driverName ; + + @ExcelProperty(value = "司机电话") + private String driverPhone ; + + @ExcelProperty(value = "仓库名称") + private String warehouseName ; + + @ExcelProperty(value = "线路名称") + private String lineNameTitle ; + + @ExcelProperty(value = "提货开始时间") + @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date startTime ; + @ExcelProperty(value = "提货完成时间") + @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date endTime ; + + @ExcelProperty(value = "状态") + private String billladingStatus ; + + @ExcelProperty(value = "计费模式") + private String chargeType ; + + @ExcelProperty(value = "提货费用") + private BigDecimal totalFee ; + + @ExcelProperty(value = "备注") + private String remark ; + + @ExcelProperty(value = "承运商") + private String carrierName ; + + @ExcelProperty(value = "单数") + private Integer orderNum; + + @ExcelProperty(value = "件数") + private Integer realNum; + + @ExcelProperty(value = "预计件数") + private Integer planNum ; + + @ExcelProperty(value = "重量") + private BigDecimal realWeight ; + + @ExcelProperty(value = "计划重量") + private BigDecimal planWeight ; + + @ExcelProperty(value = "体积") + private BigDecimal realVolume ; + + @ExcelProperty(value = "计划体积") + private BigDecimal planVolume ; + + @ExcelProperty(value = "创建人") + private String createUserName ; + +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/BillladingController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/BillladingController.java index df2534141..a4fb827f5 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/BillladingController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/BillladingController.java @@ -7,6 +7,8 @@ import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.trunkline.dto.BillladingDTO; import com.logpm.trunkline.dto.BillladingWaybillDTO; import com.logpm.trunkline.service.ITrunklineBillladingService; +import com.logpm.trunkline.vo.BillladingWaybillExportVO; +import com.logpm.trunkline.vo.TrunklineBillladingExportVO; import com.logpm.trunkline.vo.TrunklineBillladingVO; import com.logpm.warehouse.feign.IWarehouseWaybillClient; import io.swagger.annotations.Api; @@ -15,12 +17,14 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.DictBizConstant; import org.springblade.common.exception.CustomerException; +import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.StringUtil; import org.springblade.system.cache.DictBizCache; import org.springblade.system.entity.DictBiz; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.List; import java.util.Objects; @@ -67,6 +71,20 @@ public class BillladingController { } } + @ResponseBody + @PostMapping("/pageListExport") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "提货单列表导出", notes = "传入waybillDTO") + public void pageListExport(@RequestBody BillladingDTO billladingDTO, HttpServletResponse response) { + String method = "############pageListExport: "; + log.info(method+"请求参数{}",billladingDTO); + List ls = trunklineBillladingService.pageListExport(billladingDTO); + //导出ls + ExcelUtil.export(response, "提货数据列表", "提货数据", ls, TrunklineBillladingExportVO.class); + } + + + @ResponseBody @PostMapping("/findChargeTypeList") @ApiOperationSupport(order = 1) @@ -312,6 +330,22 @@ public class BillladingController { } } + @ResponseBody + @PostMapping("/billladingDetailExport") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "提货单详情导出", notes = "传入waybillDTO") + public void billladingDetailExport(@RequestBody BillladingDTO billladingDTO,HttpServletResponse response) { + + String method = "############billladingDetailExport: "; + log.info(method+"请求参数{}",billladingDTO); + List list = trunklineBillladingService.billladingDetailExport(billladingDTO.getBillladingId()); + //导出ls + ExcelUtil.export(response, "提货单运单数据", "提货运单数据", list, BillladingWaybillExportVO.class); + + } + + + @ResponseBody @PostMapping("/billladingPackageDetail") @ApiOperationSupport(order = 1) 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 572ba0690..fef0f47e4 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 @@ -1303,6 +1303,41 @@ public class CarsLoadController { } } + @ResponseBody + @PostMapping("/signOrderZeroSuppleList") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "签收单零担补录列表", notes = "传入loadCarsDTO") + public R signOrderZeroSuppleList(@RequestBody LoadCarsDTO loadCarsDTO) { + String method = "############signOrderZeroSuppleList: "; + log.info(method+"请求参数{}",loadCarsDTO); + try{ + + Long signOrderId = loadCarsDTO.getSignOrderId(); + if(Objects.isNull(signOrderId)){ + log.warn(method+"签收单id不能为空 signOrderId={}",signOrderId); + return R.fail(400,"签收单id不能为空"); + } + + //当前登录人选择的仓库 + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(Objects.isNull(myCurrentWarehouse)){ + log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); + return R.fail(400,"多仓权限无法操作，请选择仓库"); + } + loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId()); + + return carsLoadService.signOrderZeroSuppleList(loadCarsDTO); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常",e); + return R.fail(500,"系统异常"); + } + } + + + @ResponseBody @PostMapping("/useZeroList") @ApiOperationSupport(order = 1) 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 b1ba3672d..8c4ea9bf0 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 @@ -7,6 +7,7 @@ import com.logpm.trunkline.entity.TrunklineBillladingEntity; import com.logpm.trunkline.entity.TrunklineBillladingLogEntity; import com.logpm.trunkline.vo.TrunklineBillladingDetailListVO; import com.logpm.trunkline.vo.TrunklineBillladingDetailVO; +import com.logpm.trunkline.vo.TrunklineBillladingExportVO; import com.logpm.trunkline.vo.TrunklineBillladingVO; import com.logpm.warehouse.vo.WarehouseWaybillVO; import org.apache.ibatis.annotations.Mapper; @@ -32,4 +33,6 @@ public interface TrunklineBillladingMapper extends BaseMapper billladingNum(@Param("warehouseId") Long warehouseId, @Param("startByDateStr") Date startByDateStr, @Param("endByDateStr") Date endByDateStr, @Param("customerTrain") String customerTrain); List findBillladingLogList(@Param("billladingId") Long billladingId); + + List pageListExport(@Param("param") BillladingDTO billladingDTO); } 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 60364c065..0472cf240 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 @@ -65,6 +65,72 @@ order by ltb.create_time desc + + + + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java index 340b96c30..92a13f4bb 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java @@ -39,6 +39,7 @@ public interface TrunklineCarsLoadMapper extends BaseMapper findUseOrderListNoPage(@Param("param") LoadCarsDTO loadCarsDTO); IPage findZeroListByWarehouseId(IPage page, @Param("param") LoadCarsDTO loadCarsDTO); + IPage findSignOrderZeroListByWarehouseId(IPage page, @Param("param") LoadCarsDTO loadCarsDTO); IPage useZeroList(IPage page, @Param("param") LoadCarsDTO loadCarsDTO); 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 137ddb195..661b5cef1 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 @@ -685,4 +685,57 @@ + + + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml index 26aa4719c..218da08e1 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml @@ -679,24 +679,30 @@ when '2' then '卸车' when '3' then '签收' end scanStatus, + lww.destination_warehouse_name destinationWarehouseName, ltcls.tray_name trayName, ltcls.tray_code trayCode, ltcls.unload_node_name unloadNodeName, ltcls.unload_user_name unloadUserName, + ltcls.unload_time unloadTime, case ltcls.type when 1 then '订制品' when 2 then '零担' end type, ltcls.num num, - IF(ltcls.is_data = 1,'有','无') isData, + ltcls.unload_num unloadNum, + IF(ltcls.is_data = 1,'有数据','无数据') isData, IF(ltcls.loading_abnormal = 1,'是','否') loadingAbnormal, IF(ltcls.unload_abnormal = 1,'是','否') unloadAbnormal, IF(ltcls.is_supple = 1,'是','否') isSupple, ltcls.create_time loadingTime, - ltcls.unload_time unloadTime + ltcls.sign_user_name signUserName, + ltcls.sign_time signTime from logpm_trunkline_cars_load_scan ltcls + left join logpm_warehouse_waybill lww on ltcls.waybill_id = lww.id where ltcls.load_id = #{param.loadId} - order by ltcls.create_time asc + order by ltcls.loading_abnormal desc,ltcls.unload_abnormal desc,ltcls.create_time asc +