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 836c3ffd8..a750ffc92 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 @@ -166,6 +166,22 @@ public class DistributionParcelListVO extends DistributionParcelListEntity { @ApiModelProperty(value = "配送单号") @TableField(exist = false) private String noteNumber; + /** + * 服务类型 + */ + private String typeService; + /** + * 服务类型 名字 + */ + private String typeServiceName; + /** + * 提货批次 + */ + private String pickupBatch; + + + + /** diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesOvertimeFineController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesOvertimeFineController.java index 9e1996c02..c4844ee63 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesOvertimeFineController.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesOvertimeFineController.java @@ -161,17 +161,14 @@ public class AftersalesOvertimeFineController extends BladeController { /** * 导出数据 + * http://localhost:8798/aftersalesOvertimeFine/export-aftersalesOvertimeFine */ @GetMapping("/export-aftersalesOvertimeFine") @ApiOperationSupport(order = 9) @ApiOperation(value = "导出数据", notes = "传入aftersalesOvertimeFine") public void exportAftersalesOvertimeFine(@ApiIgnore @RequestParam Map aftersalesOvertimeFine, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(aftersalesOvertimeFine, AftersalesOvertimeFineEntity.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(AftersalesOvertimeFine::getTenantId, bladeUser.getTenantId()); - //} - queryWrapper.lambda().eq(AftersalesOvertimeFineEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = aftersalesOvertimeFineService.exportAftersalesOvertimeFine(queryWrapper); + + List list = aftersalesOvertimeFineService.exportAftersalesOvertimeFine(aftersalesOvertimeFine); ExcelUtil.export(response, "异常工单超时记录表数据" + DateUtil.time(), "异常工单超时记录表数据表", list, AftersalesOvertimeFineExcel.class); } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java index 1b3583317..89a4f4997 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java @@ -736,6 +736,14 @@ public class AftersalesWorkOrderController extends BladeController { return R.success("操作成功"); } - - + /** + * 写入财务入账时间 + */ + @PostMapping("/updateFinanceTime") + @ApiOperationSupport(order = 13) + @ApiOperation(value = "写入财务入账时间", notes = "传入aftersalesWorkOrder") + public R updateFinanceTime(@Valid @RequestBody String ids ,Date entryTime ) { + log.info("写入财务入账时间{}",entryTime); + return R.data(aftersalesWorkOrderService.updateFinanceTime(ids,entryTime)); + } } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesWorkOrderDTO.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesWorkOrderDTO.java index d82ce9240..b48b831f2 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesWorkOrderDTO.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesWorkOrderDTO.java @@ -144,4 +144,5 @@ public class AftersalesWorkOrderDTO extends AftersalesWorkOrderEntity { private String claimIdentification; + } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesOvertimeFineExcel.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesOvertimeFineExcel.java index c1b113f3d..72ef2ba91 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesOvertimeFineExcel.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesOvertimeFineExcel.java @@ -17,15 +17,16 @@ package com.logpm.aftersales.excel; -import lombok.Data; - -import java.util.Date; -import java.math.BigDecimal; +import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; /** @@ -42,35 +43,41 @@ public class AftersalesOvertimeFineExcel implements Serializable { private static final long serialVersionUID = 1L; - /** - * 异常工单ID - */ + @ColumnWidth(20) @ExcelProperty("异常工单ID") private String workOrderId; - /** - * 金额 - */ + @ColumnWidth(20) @ExcelProperty("金额") private BigDecimal money; - /** - * 超时时间 - */ + @ColumnWidth(20) @ExcelProperty("超时时间") private String timeout; - /** - * 仓库ID - */ + + @ExcelIgnore + private String workOrderNumber; @ColumnWidth(20) - @ExcelProperty("仓库ID") - private String warehouseId; - /** - * 备注 - */ + @ExcelProperty("工单异常类型") + private String workOrderType; + + @ColumnWidth(20) + @ExcelProperty("处理方名称") + private String businessName; + + //发现节点 + @ExcelIgnore + private String discoveryNode; @ColumnWidth(20) - @ExcelProperty("备注") - private String remarks; + @ExcelProperty("发现节点") + private String discoveryNodeName; + @ColumnWidth(20) + @ExcelProperty("超时次数") + private String timeoutRecordNumber; + + @ColumnWidth(20) + @ExcelProperty("超时时间") + private Date createTime; } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.java index c2fb01ee4..a3b099d9c 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.java @@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 异常工单超时记录表 Mapper 接口 @@ -50,7 +51,7 @@ public interface AftersalesOvertimeFineMapper extends BaseMapper exportAftersalesOvertimeFine(@Param("ew") Wrapper queryWrapper); + List exportAftersalesOvertimeFine(@Param("param")AftersalesOvertimeFineDTO queryWrapper); /** * 查询 diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.xml index 0eedcf126..5a7521ea1 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.xml +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.xml @@ -47,7 +47,30 @@ diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.java index de97a64b3..9ed95ae39 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.java @@ -25,6 +25,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; + +import java.util.Date; import java.util.List; /** @@ -84,4 +86,6 @@ public interface AftersalesWorkOrderMapper extends BaseMapper getWholeListSettlement(@Param("param") AftersalesSettlementEntity aftersalesSettlementEntity); + + void updateFinanceTime(@Param("id") String id, @Param("entryTime") Date entryTime); } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml index 70d0a23bd..0da6e13aa 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml @@ -176,10 +176,10 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d WHERE `id` = #{ item.id } - + @@ -337,9 +337,29 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d lap.conditions != '3' and lap.is_deleted = 0 and law.id is not null and lap.processing_status in ('1','3') and lap.types_of = '2' and law.work_order_status in ('10','20','30') and law.work_order_status = #{param.workOrderStatus} and lap.business_id = #{param.warehouseId} - and law.work_order_type = #{param.workOrderTypeNameS} - - + and law.work_order_type = #{param.workOrderType} + and law.discovery_node = #{param.discoveryNode} + and law.work_order_number like concat('%',#{param.workOrderNumber},'%') + and law.waybill_number like concat('%',#{param.waybillNumber},'%') + and law.order_code like concat('%',#{param.orderCode},'%') + and law.first like concat('%',#{param.first},'%') + and law.secondary like concat('%',#{param.secondary},'%') + and law.waybill_mall like concat('%',#{param.waybillMall},'%') + and law.brand_name like concat('%',#{param.brandName},'%') + and law.customer_service_name like concat('%',#{param.customerServiceName},'%') + and law.delivery_driver like concat('%',#{param.deliveryDriver},'%') + and law.train_number like concat('%', #{param.trainNumber },'%') + and law.vehicle_route like concat('%', #{param.vehicleRoute },'%') + and law.problem_description like concat('%',#{param.problemDescription},'%') + and law.reviewed_by like concat('%',#{param.reviewedBy},'%') + and law.remarks like concat('%',#{param.remarks},'%') + and date_format(from_unixtime( lawo.deliver_goods_time),'%Y-%m-%d') = date_format(#{param.deliverGoodsTime },'%Y-%m-%d') + and date_format(from_unixtime(lawo.discovery_time),'%Y-%m-%d') = date_format( #{param.discoveryTime},'%Y-%m-%d') + and date_format(from_unixtime(lawo.warehousing_time),'%Y-%m-%d') = date_format( #{param.warehousingTime},'%Y-%m-%d') + and date_format(from_unixtime( lawo.delivery_time),'%Y-%m-%d') = date_format(#{param.deliveryTime} param.deliveryTime,'%Y-%m-%d') + and date_format(from_unixtime(lawo.audit_time),'%Y-%m-%d') = date_format(#{param.auditTime},'%Y-%m-%d') + and date_format(from_unixtime(lawo.entry_time),'%Y-%m-%d') = date_format(#{param.entryTime},'%Y-%m-%d') + and date_format(from_unixtime(lawo.over_time),'%Y-%m-%d') = date_format(#{param.overTime}),'%Y-%m-%d') @@ -382,4 +402,10 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d + + + update logpm_aftersales_work_order set entry_time = #{entryTime} where id = #{id} + + + diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesOvertimeFineService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesOvertimeFineService.java index aeb8d2184..3b29b4e0c 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesOvertimeFineService.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesOvertimeFineService.java @@ -48,7 +48,7 @@ public interface IAftersalesOvertimeFineService extends BaseService exportAftersalesOvertimeFine(Wrapper queryWrapper); + List exportAftersalesOvertimeFine(Map queryWrapper); /** * 查询超时记录数据 diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java index 9524b9608..00998e8b6 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java @@ -30,6 +30,7 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; import org.springblade.system.entity.User; +import java.util.Date; import java.util.List; import java.util.Map; @@ -280,4 +281,7 @@ public interface IAftersalesWorkOrderService extends BaseService exportAftersalesOvertimeFine(Wrapper queryWrapper) { - List aftersalesOvertimeFineList = baseMapper.exportAftersalesOvertimeFine(queryWrapper); - //aftersalesOvertimeFineList.forEach(aftersalesOvertimeFine -> { - // aftersalesOvertimeFine.setTypeName(DictCache.getValue(DictEnum.YES_NO, AftersalesOvertimeFine.getType())); - //}); + public List exportAftersalesOvertimeFine(Map queryWrapper) { + AftersalesOvertimeFineDTO aftersalesOvertimeFineDTO = JSONObject.parseObject(JSONObject.toJSONString(queryWrapper), AftersalesOvertimeFineDTO.class); + List aftersalesOvertimeFineList = baseMapper.exportAftersalesOvertimeFine(aftersalesOvertimeFineDTO); + for (AftersalesOvertimeFineExcel aftersalesOvertimeFineExcel : aftersalesOvertimeFineList) { + aftersalesOvertimeFineExcel.setWorkOrderType(DictBizCache.getValue(DictBizConstant.PC_WORK_ORDER,aftersalesOvertimeFineExcel.getWorkOrderType())); + aftersalesOvertimeFineExcel.setDiscoveryNodeName(DictBizCache.getValue(DictBizConstant.PC_DISCOVERY_NODE,aftersalesOvertimeFineExcel.getDiscoveryNode())); + } + System.out.println(aftersalesOvertimeFineList); return aftersalesOvertimeFineList; } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java index 472981270..07f9de787 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java @@ -1985,7 +1985,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl aftersalesCustomerMallList = aftersalesCustomerMallMapper.getByWarehouseCode(myCurrentWarehouse.getId().toString()); if (aftersalesCustomerMallList.isEmpty()){ log.info("没有客服信息！！！"); - return; + return ; } AftersalesCustomerMallEntity finalChoice = null; //最终 确定的AftersalesCustomerMallEntity for (AftersalesCustomerMallEntity aftersalesCustomerMallEntity : aftersalesCustomerMallList) { @@ -1994,7 +1994,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl pages = distributionDeliveryDetailsService.getBillOrderInventory(Condition.getPage(query),distributionDeliveryDetails); return R.data(pages); } + /** + * 提货订单明细 库存品 导出 + * http://localhost:8600//distributionDeliveryDetails/billOrderInventoryExcel?billLadingId=174211163815416217 + */ + @GetMapping("/billOrderInventoryExcel") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "库存品查询导出", notes = "传入distributionDeliveryDetails") + public void getBillOrderInventoryExcel(@ApiIgnore @RequestParam Map distributionDeliveryDetails, BladeUser bladeUser, HttpServletResponse response) { + List list = distributionDeliveryDetailsService.getBillOrderInventoryExcel(distributionDeliveryDetails); + ExcelUtil.export(response, "自提库存品列表信息" + DateUtil.time(), "提货单订单信息关联数据表", list, DistributionBillInventoryExcel.class); + + } /** * 提货订单明细 自定义分页 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java index cb8f31e9a..dc018266c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java @@ -29,6 +29,7 @@ import com.logpm.distribution.service.IDistributionParcelListService; import com.logpm.distribution.vo.DistributionParcelListBaseVO; import com.logpm.distribution.vo.DistributionParcelListVO; import com.logpm.distribution.vo.DistributionParcelListZeroVO; +import com.logpm.distribution.wrapper.DistributionParcelListVOWrapper; import com.logpm.distribution.wrapper.DistributionParcelListWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -172,14 +173,14 @@ public class DistributionParcelListController extends BladeController { } /** - * 在库订单包件清单 自定义分页 + * 在库订单包件清单 自定义分页 导出 */ @GetMapping("/page") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "传入distributionParcelList") public R> page(DistributionParcelListVO distributionParcelList, Query query) { - IPage pages = distributionParcelListService.selectDistributionParcelListPage(Condition.getPage(query), distributionParcelList); - return R.data(DistributionParcelListWrapper.build().pageVO(pages)); + IPage pages = distributionParcelListService.selectDistributionParcelListPage(Condition.getPage(query), distributionParcelList); + return R.data(DistributionParcelListVOWrapper.build().pageVO(pages)); } /** diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillStockController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillStockController.java index 3cadc553c..9d5f1006e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillStockController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillStockController.java @@ -20,6 +20,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.distribution.entity.DistrilbutionBillStockEntity; +import com.logpm.distribution.excel.DistributionBillOrderExcel; +import com.logpm.distribution.excel.DistributionBillOrderPackExcel; import com.logpm.distribution.excel.DistrilbutionBillStockExcel; import com.logpm.distribution.service.IDistrilbutionBillStockService; import com.logpm.distribution.vo.DistributionBillOrderPackVO; @@ -81,6 +83,22 @@ public class DistrilbutionBillStockController extends BladeController { IPage detail = distrilbutionBillStockService.getBillOrderDetail(distrilbutionBillStock,Condition.getPage(query)); return R.data(detail); } + + /** + * 提货单详情导出 + * @param distrilbutionBillStock + * @param bladeUser + * @param response + * http://localhost:8600//distrilbutionBillStock/billOrderDetailExcel?billLadingId=1742111638154162178 + */ + @GetMapping("/billOrderDetailExcel") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "订单列表详情Excel", notes = "传入distrilbutionBillLading") + public void getBillOrderDetailExcel(@ApiIgnore @RequestParam Map distrilbutionBillStock, BladeUser bladeUser, HttpServletResponse response) { + List list = distrilbutionBillStockService.distrilbutionBillStock(distrilbutionBillStock); + ExcelUtil.export(response, "自提订单信息" + DateUtil.time(), "提货单订单信息关联数据表", list, DistributionBillOrderExcel.class); + } + /** * 提货单包件 详情 */ @@ -91,6 +109,17 @@ public class DistrilbutionBillStockController extends BladeController { IPage detail = distrilbutionBillStockService.getBillOrderPack(distrilbutionBillStock,Condition.getPage(query)); return R.data(detail); } + /** + * 提货单包件 详情 导出 + * http://localhost:8600//distrilbutionBillStock/billOrderPackExcel?billLadingId=1742111638154162178 + */ + @GetMapping("/billOrderPackExcel") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入distrilbutionBillLading") + public void billOrderPackExcel(@ApiIgnore @RequestParam Map distrilbutionBillStock, BladeUser bladeUser, HttpServletResponse response) { + List list = distrilbutionBillStockService.billOrderPackExcel(distrilbutionBillStock); + ExcelUtil.export(response, "自提包件列表信息" + DateUtil.time(), "提货单订单信息关联数据表", list, DistributionBillOrderPackExcel.class); + } /** * 提货单订单信息关联 分页 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionBillInventoryExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionBillInventoryExcel.java new file mode 100644 index 000000000..8de4bb278 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionBillInventoryExcel.java @@ -0,0 +1,60 @@ +package com.logpm.distribution.excel; + +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +/* + * logisticsplatform-service + * @Author Diss + * @Create 2024/1/26 13:56 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class DistributionBillInventoryExcel { + @ColumnWidth(20) + @ExcelProperty("sku") + private String sku; + @ColumnWidth(20) + @ExcelProperty("物料名称") + private String descriptionGoods; +// @ColumnWidth(20) +// @ExcelProperty("备货数") +// private String quantity; + @ColumnWidth(20) + @ExcelProperty("已备数量") + private String preparedQuantity; + @ColumnWidth(20) + @ExcelProperty("物料编号") + private String cargoNumber; + @ColumnWidth(20) + @ExcelProperty("应提件数") + private String quantity; //数量 + @ColumnWidth(20) + @ExcelProperty("备货状态") + private Integer stockStatus; + @ColumnWidth(20) + @ExcelProperty("提货件数") + private Integer pickUpQuantity; + @ColumnWidth(20) + @ExcelProperty("提货状态") + private Integer pickupStatus; + @ColumnWidth(20) + @ExcelProperty("单位") + private String cargoUnit; //单位 + /**@ColumnWidth(20) + @ExcelProperty("托盘码") +*/ + @ColumnWidth(20) + @ExcelProperty("库位信息") + private String allocation; + + + + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionBillOrderExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionBillOrderExcel.java new file mode 100644 index 000000000..a7756e2b4 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionBillOrderExcel.java @@ -0,0 +1,72 @@ +package com.logpm.distribution.excel; + +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +/* + * logisticsplatform-service + * @Author Diss + * @Create 2024/1/26 11:06 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class DistributionBillOrderExcel { + @ColumnWidth(20) + @ExcelProperty("服务号") + private String serviceNumber; + @ExcelProperty("运单号") + private String waybillNumber; //运单号 + @ColumnWidth(20) + @ExcelProperty("客户车次号") + private String trainNumber; //客户车次号 + @ColumnWidth(20) + @ExcelProperty("始发仓") + private String sendWarehouseName; //始发仓 + @ColumnWidth(20) + @ExcelProperty("订单总数") + private String totalNumber; + @ColumnWidth(20) + @ExcelProperty("应提货件数") + private String handQuantity; + @ColumnWidth(20) + @ExcelProperty("提货件数") + private String pickUpQuantity; + @ColumnWidth(20) + @ExcelProperty("提货状态") + private String conditions; + @ColumnWidth(20) + @ExcelProperty("提货状态") + private String conditionsName; + @ColumnWidth(20) + @ExcelProperty("货物名称") + private String descriptionGoods; + @ColumnWidth(20) + @ExcelProperty("物料名称") + private String materialName; + @ColumnWidth(20) + @ExcelProperty("备货件数") //TODO 和应提货件数 值一样后期可能要改 + private String stockUpQuantity; + @ColumnWidth(20) + @ExcelProperty("已备数量") + private String preparedQuantity; + @ColumnWidth(20) + @ExcelProperty("备货状态") + private String stockupStatusName; + @ExcelIgnore + private String stockupStatus; + @ColumnWidth(20) + @ExcelProperty("托盘码") + private String pallet; + @ColumnWidth(20) + @ExcelProperty("货位信息") + private String goodsAllocation; + + + +} 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 new file mode 100644 index 000000000..bbf7de7f3 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionBillOrderPackExcel.java @@ -0,0 +1,89 @@ +package com.logpm.distribution.excel; +/* + * logisticsplatform-service + * @Author Diss + * @Create 2024/1/26 11:52 + */ + +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.util.Date; +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class DistributionBillOrderPackExcel { + @ColumnWidth(20) + @ExcelProperty("服务号") + private String serviceNumber; //服务号 + @ColumnWidth(20) + @ExcelProperty("运单号") + private String waybillNumber; //运单号 + @ColumnWidth(20) + @ExcelProperty("包件码") + private String orderPackageCode; + @ColumnWidth(20) + @ExcelProperty("客户车次号") + private String trainNumber; //客户车次号 + @ColumnWidth(20) + @ExcelProperty("订单自编号") + private String orderCode; + @ColumnWidth(20) + @ExcelProperty("仓库") + private String sendWarehouseName; + @ColumnWidth(20) + @ExcelProperty("一级品类") + private String firsts; + @ColumnWidth(20) + @ExcelProperty("二级品类") + private String second; + @ColumnWidth(20) + @ExcelProperty("三级品类") + private String thirdProduct; + @ColumnWidth(20) + @ExcelProperty("物料编号") + private String materialCode; + @ColumnWidth(20) + @ExcelProperty("物料名称") + private String materialName; + @ColumnWidth(20) + @ExcelProperty("托盘码") + private String pallet; + @ColumnWidth(20) + @ExcelProperty("库位号") + private String goodsAllocation; + @ColumnWidth(20) + @ExcelProperty("扫描人") + private String stockupCreateUser; //提货扫描人 + @ColumnWidth(20) + @ExcelProperty("扫描时间") + private String stockuppickUpTime; //提货时间 + //************************************ + @ExcelIgnore + private String orderPackageStatus; + @ExcelIgnore + private String warehouse; + @ExcelIgnore + private String stockupStatusName; //备货状态名称 + @ExcelIgnore + private String stockupConsignee; //提货人员 + @ExcelIgnore + private String stockupPickUpPlate; //提货车牌 + @ExcelIgnore + private String stockupConditions; //提货状态 + @ExcelIgnore + private String clerkCheck ; //文员复核人 + @ExcelIgnore + private Date signForCreateTime; //签收时间 + @ExcelIgnore + private Date clerkUpdateTime; //文员签收时间 + @ExcelIgnore + private Date stockupCreateTime; //备货时间名称 + @ExcelIgnore + private String outboundType; //服务类型 +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.java index f743ec7e7..6da36e5de 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.java @@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.entity.DistributionDeliveryDetailsEntity; +import com.logpm.distribution.excel.DistributionBillInventoryExcel; import com.logpm.distribution.excel.DistributionDeliveryDetailsExcel; import com.logpm.distribution.vo.DistributionBillInventoryVO; import com.logpm.distribution.vo.DistributionDeliveryDetailsVO; @@ -78,4 +79,6 @@ public interface DistributionDeliveryDetailsMapper extends BaseMapper getBillOrderInventoryExcel(@Param("param") DistributionDeliveryDetailsEntity deliveryDetails); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml index 327674606..a273c32a7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml @@ -99,5 +99,23 @@ lddd.bill_lading_id = #{param.billLadingId} and lddd.inventory_status in (1,2) + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java index 0e1921e9d..8befcb639 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java @@ -47,7 +47,7 @@ public interface DistributionParcelListMapper extends BaseMapper selectDistributionParcelListPage(IPage page,@Param("param") DistributionParcelListVO distributionParcelList); + List selectDistributionParcelListPage(IPage page,@Param("param") DistributionParcelListVO distributionParcelList); int submitNumByOrderIdAndName(@Param("articleId") Long articleId,@Param("productName") String productName, @Param("num") Integer num); 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 e0722c2ed..66af81800 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 @@ -106,7 +106,7 @@ - SELECT DISTINCT ldpl.warehouse_id warehouseId, ldpl.id id, @@ -144,7 +144,9 @@ ldl.signing_time signingTimes, ldl.signing_user signingUser, ldl.scan_user scanUser, - ldl.vehicle_name vehicleName + ldl.vehicle_name vehicleName, + ldsa.type_service typeService, + ldbl.pickup_batch pickupBatch FROM logpm_distribution_parcel_list ldpl LEFT JOIN logpm_warehouse_updown_goods lwug ON ldpl.id = lwug.association_id @@ -155,6 +157,9 @@ LEFT JOIN logpm_distribution_signfor AS lds ON lds.reservation_id = ldr.id LEFT JOIN logpm_distribution_loadscan ldl on ldl.package_id = ldpl.id and ldl.scan_status !=1 LEFT JOIN logpm_distribution_delivery_list lddl on lddl.id = lds.delivery_id + left join logpm_distribution_stock_article ldsa on ldsa.id = ldpl.stock_article_id + left join logpm_distrilbution_bill_lading ldbl on ldsa.id = ldpl.stock_article_id + ldpl.is_deleted = 0 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.java index 323230bdc..94b8fd26d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.java @@ -21,11 +21,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.dto.app.StockupDTO; import com.logpm.distribution.entity.DistrilbutionBillStockEntity; +import com.logpm.distribution.excel.DistributionBillOrderExcel; +import com.logpm.distribution.excel.DistributionBillOrderPackExcel; import com.logpm.distribution.excel.DistrilbutionBillStockExcel; import com.logpm.distribution.vo.*; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 提货单订单信息关联 Mapper 接口 @@ -66,4 +69,8 @@ public interface DistrilbutionBillStockMapper extends BaseMapper selectDistrilbutionBillOverPackWuSelf(@Param("param")StockupDTO stockupDTO); List listPackageSelf(@Param("reservationId")Long reservationId); + + List distrilbutionBillStock(@Param("param")DistrilbutionBillStockEntity distrilbutionBillStock); + + List billOrderPackExcel(@Param("param")DistrilbutionBillStockEntity billStock); } 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 831493ea0..349ca8b9f 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 @@ -240,5 +240,89 @@ where ldbp.bill_lading_id = #{reservationId} and ldsa.is_zero = #{isZero} and ldbp.packet_bar_status in (1,3) + + + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryDetailsService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryDetailsService.java index e04eaa5b0..89ff094db 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryDetailsService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryDetailsService.java @@ -19,6 +19,7 @@ package com.logpm.distribution.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.entity.DistributionDeliveryDetailsEntity; +import com.logpm.distribution.excel.DistributionBillInventoryExcel; import com.logpm.distribution.excel.DistributionDeliveryDetailsExcel; import com.logpm.distribution.vo.DistributionBillInventoryVO; import com.logpm.distribution.vo.DistributionDeliveryDetailsVO; @@ -82,4 +83,6 @@ public interface IDistributionDeliveryDetailsService extends BaseService getBillOrderInventoryExcel(Map distributionDeliveryDetails); } 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 68af6135a..31277e93a 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 @@ -45,7 +45,7 @@ public interface IDistributionParcelListService extends BaseService selectDistributionParcelListPage(IPage page, DistributionParcelListVO distributionParcelList); + IPage selectDistributionParcelListPage(IPage page, DistributionParcelListVO distributionParcelList); boolean submitNumByOrderIdAndName(Long articleId, String productName, Integer num); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java index 5e47da9ca..2eba69fdc 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java @@ -20,6 +20,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.dto.app.StockupDTO; import com.logpm.distribution.entity.DistrilbutionBillStockEntity; +import com.logpm.distribution.excel.DistributionBillOrderExcel; +import com.logpm.distribution.excel.DistributionBillOrderPackExcel; import com.logpm.distribution.excel.DistrilbutionBillStockExcel; import com.logpm.distribution.vo.*; import org.springblade.core.mp.base.BaseService; @@ -88,4 +90,13 @@ public interface IDistrilbutionBillStockService extends BaseService listPackageSelf(Long reservationId); + + /** + * 导出详情 + * @param distrilbutionBillStock + * @return + */ + List distrilbutionBillStock(Map distrilbutionBillStock); + + List billOrderPackExcel(Map distrilbutionBillStock); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryDetailsServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryDetailsServiceImpl.java index 71d6e3538..f8e5bd3b1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryDetailsServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryDetailsServiceImpl.java @@ -19,7 +19,11 @@ package com.logpm.distribution.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.logpm.distribution.entity.DistributionDeliveryDetailsEntity; +import com.logpm.distribution.entity.DistrilbutionBillStockEntity; +import com.logpm.distribution.excel.DistributionBillInventoryExcel; +import com.logpm.distribution.excel.DistributionBillOrderPackExcel; import com.logpm.distribution.excel.DistributionDeliveryDetailsExcel; import com.logpm.distribution.mapper.DistributionDeliveryDetailsMapper; import com.logpm.distribution.service.IDistributionDeliveryDetailsService; @@ -27,6 +31,8 @@ import com.logpm.distribution.vo.DistributionBillInventoryVO; import com.logpm.distribution.vo.DistributionDeliveryDetailsVO; import com.logpm.distribution.vo.app.DistrilbutionBillLadingInventoryAppVO; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.api.R; +import org.springblade.system.entity.User; import org.springframework.stereotype.Service; import java.util.List; @@ -87,4 +93,9 @@ public class DistributionDeliveryDetailsServiceImpl extends BaseServiceImpl getBillOrderInventoryExcel(Map distributionDeliveryDetails) { + DistributionDeliveryDetailsEntity deliveryDetails = JSON.parseObject(JSON.toJSONString(distributionDeliveryDetails), DistributionDeliveryDetailsEntity.class); + return baseMapper.getBillOrderInventoryExcel(deliveryDetails); + } } 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 6d4a496de..77140be96 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 @@ -106,13 +106,13 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl selectDistributionParcelListPage(IPage page, DistributionParcelListVO distributionParcelList) { + public IPage selectDistributionParcelListPage(IPage page, DistributionParcelListVO distributionParcelList) { List myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse(); List collect = myWatchWarehouse.stream() .map(BasicdataWarehouseEntity::getId) .collect(Collectors.toList()); distributionParcelList.setWarehouseIdList(collect); - List distributionParcelListEntities = baseMapper.selectDistributionParcelListPage(page, distributionParcelList); + List distributionParcelListEntities = baseMapper.selectDistributionParcelListPage(page, distributionParcelList); return page.setRecords(distributionParcelListEntities); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java index c1826e081..1139255d4 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java @@ -23,6 +23,8 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.logpm.distribution.dto.app.StockupDTO; import com.logpm.distribution.entity.DistrilbutionBillStockEntity; +import com.logpm.distribution.excel.DistributionBillOrderExcel; +import com.logpm.distribution.excel.DistributionBillOrderPackExcel; import com.logpm.distribution.excel.DistrilbutionBillStockExcel; import com.logpm.distribution.mapper.DistrilbutionBillStockMapper; import com.logpm.distribution.service.IDistrilbutionBillStockService; @@ -132,4 +134,40 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl distrilbutionBillStock(Map distrilbutionBillStock) { + DistrilbutionBillStockEntity billStock = JSON.parseObject(JSON.toJSONString(distrilbutionBillStock), DistrilbutionBillStockEntity.class); + + + List distributionBillOrderExcels = baseMapper.distrilbutionBillStock(billStock); + + distributionBillOrderExcels.forEach( i ->{ + if(StringUtils.isNotBlank(i.getStockupStatus())){ + i.setStockupStatusName(DictBizCache.getValue(DictBizConstant.STOCKUP_STATUS,i.getStockupStatus())); + } + if(ObjectUtils.isNotNull(i.getConditions())){ + i.setConditionsName(DictBizCache.getValue(DictBizConstant.BILL_CONDITIONS_STATUS,i.getConditions())); + } + if (StringUtils.isNotBlank(i.getHandQuantity())){ + i.setStockUpQuantity(i.getHandQuantity()); //TODO 和应提货件数 值一样后期可能要改 + } + }); + return distributionBillOrderExcels; + } + + @Override + public List billOrderPackExcel(Map distrilbutionBillStock) { + DistrilbutionBillStockEntity billStock = JSON.parseObject(JSON.toJSONString(distrilbutionBillStock), DistrilbutionBillStockEntity.class); + + List distributionBillOrderPackExcels = baseMapper.billOrderPackExcel(billStock); + distributionBillOrderPackExcels.forEach(i -> { + if(ObjectUtils.isNotNull(i.getStockupCreateUser())){ + R userR = userClient.userInfoById(Long.valueOf(i.getStockupCreateUser())); + if(userR.isSuccess() && ObjectUtils.isNotNull(userR.getData())){ + i.setStockupCreateUser(userR.getData().getRealName()); + } + } + }); + return distributionBillOrderPackExcels; + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListVOWrapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListVOWrapper.java new file mode 100644 index 000000000..01f7bc4df --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListVOWrapper.java @@ -0,0 +1,73 @@ +package com.logpm.distribution.wrapper; + +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.logpm.distribution.entity.DistributionParcelListEntity; +import com.logpm.distribution.vo.DistributionParcelListVO; +import org.springblade.common.constant.DictBizConstant; +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.system.cache.DictBizCache; + +import java.text.SimpleDateFormat; +import java.util.Objects; + +/** + * @program: LogisticsPlatform-Service + * @description: 包件包装类 + * @author: cyz + * @create: 2023-08-02 14:35 + **/ + +public class DistributionParcelListVOWrapper extends BaseEntityWrapper { + +// @Autowired +// private IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient; + + public static DistributionParcelListVOWrapper build(){ + return new DistributionParcelListVOWrapper(); + } + + @Override + public DistributionParcelListVO entityVO(DistributionParcelListVO entity) { +// IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient = SpringUtil.getBean(IWarehouseUpdownGoodsClient.class); +// IWarehouseTrayGoodsClient warehouseTrayGoodsClient = SpringUtil.getBean(IWarehouseTrayGoodsClient.class); + + + + DistributionParcelListVO parcelListVO = Objects.requireNonNull(BeanUtil.copy(entity,DistributionParcelListVO.class)); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + if(ObjectUtils.isNotNull(entity.getScanTimes())){ + parcelListVO.setScanTime(format.format(entity.getScanTimes())); + } + if(ObjectUtils.isNotNull(entity.getSigningTimes())){ + parcelListVO.setSigningTime(format.format(entity.getSigningTimes())); + } + parcelListVO.setOrderPackageStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_STATUS, entity.getOrderPackageStatus())); + parcelListVO.setOrderPackageFreezeStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_FREEZE_STATUS, entity.getOrderPackageFreezeStatus())); + parcelListVO.setOrderPackageGroundingStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_GROUNDING_STATUS, entity.getOrderPackageGroundingStatus())); + parcelListVO.setOrderPackageStockupStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_STOCKUP_STATUS, entity.getOrderPackageStockupStatus())); + parcelListVO.setOrderPackageReservationStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_RESERVATION_STATUS, entity.getOrderPackageReservationStatus())); + parcelListVO.setOrderPackageLoadingStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_LOADING_STATUS, entity.getOrderPackageLoadingStatus())); + parcelListVO.setTypeServiceName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, entity.getTypeService())); + //如果有上架选择填充货位信息 +// if (Func.isNotBlank(parcelListVO.getOrderPackageGroundingStatus())){ +// if (parcelListVO.getOrderPackageGroundingStatus().equals("20")){ +// if (Func.isNotEmpty(warehouseUpdownGoodsClient)){ +// String s = warehouseUpdownGoodsClient.selectMsgBywrap(parcelListVO.getId()); +// if (Func.isNotEmpty(s)){ +// parcelListVO.setAllocationMsg(s); +// } +// } +// } +// } +// if(Func.isNotEmpty(warehouseTrayGoodsClient)){ +// String s = warehouseUpdownGoodsClient.selectMsgBywrap(parcelListVO.getId()); +// if (Func.isNotEmpty(s)){ +// parcelListVO.setTrayMsg(s); +// } +// } + +// parcelListVO.setOrderPackageReservationStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_FREEZE_STATUS, entity.getOrderPackageReservationStatus())); + return parcelListVO; + } +}