From 0588b23d09da7e9bbafec3c18dba3191cd92bbc8 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 15 May 2024 14:38:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E5=BA=93=E4=BD=8D=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=81=A2=E5=A4=8D=E3=80=81=E8=87=AA=E6=8F=90=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=87=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionStockupAppController.java | 38 +++---- .../logpm/distribution/bean/MyExcelUtil.java | 32 ++++++ .../DistrilbutionBillLadingController.java | 14 +++ .../app/DistributionBillLadingExcelDTO.java | 31 +++++ .../distribution/dto/app/StockupDTO.java | 2 +- .../distribution/dto/app/StockupZeroDTO.java | 2 +- .../DistributionDeliveryDetailsMapper.java | 2 + .../DistributionDeliveryDetailsMapper.xml | 21 +++- .../mapper/DistrilbutionBillStockMapper.java | 9 ++ .../mapper/DistrilbutionBillStockMapper.xml | 106 ++++++++++++++++++ .../IDistributionDeliveryDetailsService.java | 2 + .../IDistrilbutionBillLadingService.java | 8 ++ .../IDistrilbutionBillStockService.java | 10 ++ ...istributionDeliveryDetailsServiceImpl.java | 23 ++++ .../DistributionDeliveryListServiceImpl.java | 2 +- .../impl/DistributionStockupServiceImpl.java | 38 +++---- .../DistrilbutionBillLadingServiceImpl.java | 30 ++++- .../DistrilbutionBillStockServiceImpl.java | 34 ++++++ 18 files changed, 361 insertions(+), 43 deletions(-) create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistributionBillLadingExcelDTO.java diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java index 1c92c0d2d..ee6958b70 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java @@ -1461,15 +1461,15 @@ public class DistributionStockupAppController extends BladeController { String audioValue = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.saomiaochenggong.getValue()); //进行备货库位上架 -// if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){ -// JSONObject jsonObject = new JSONObject(); -// jsonObject.put("warehouseId", myCurrentWarehouse.getId()); -// jsonObject.put("code",packetBarCode); -// jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId()); -// jsonObject.put("type", 2); -// jsonObject.put("num", 1); -// warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject); -// } + if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){ + JSONObject jsonObject = new JSONObject(); + jsonObject.put("warehouseId", myCurrentWarehouse.getId()); + jsonObject.put("code",packetBarCode); + jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId()); + jsonObject.put("type", 2); + jsonObject.put("num", 1); + warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject); + } //扫码成功 return Resp.scanSuccess(PdaAudioLingoStatus.saomiaochenggong.getName(), audioValue); @@ -1650,16 +1650,16 @@ public class DistributionStockupAppController extends BladeController { }); //查询是否货位数据是否该下架 -// if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){ -// JSONObject jsonObject = new JSONObject(); -// jsonObject.put("warehouseId", myCurrentWarehouse.getId()); -// jsonObject.put("code",packetBarCode); -// jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId()); -// jsonObject.put("type", 1); -// jsonObject.put("num", 1); -// //进行了备货库位的选择才进行备货库位的上架 -// warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject); -// } + if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){ + JSONObject jsonObject = new JSONObject(); + jsonObject.put("warehouseId", myCurrentWarehouse.getId()); + jsonObject.put("code",packetBarCode); + jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId()); + jsonObject.put("type", 1); + jsonObject.put("num", 1); + //进行了备货库位的选择才进行备货库位的上架 + warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject); + } //修改包件备货状态 DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity(); parcelListEntity.setId(entity.getParcelListId()); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/bean/MyExcelUtil.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/bean/MyExcelUtil.java index b041896c9..675869c75 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/bean/MyExcelUtil.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/bean/MyExcelUtil.java @@ -6,6 +6,7 @@ import com.alibaba.excel.write.builder.ExcelWriterBuilder; import com.alibaba.excel.write.handler.WriteHandler; import com.alibaba.excel.write.metadata.WriteSheet; import com.logpm.distribution.dto.DistributionDeliveryExcelDTO; +import com.logpm.distribution.dto.app.DistributionBillLadingExcelDTO; import com.logpm.distribution.excel.*; import com.logpm.distribution.vo.DistributionDeliveryInfoVO; import com.logpm.distribution.vo.DistributionParcelListVO; @@ -124,4 +125,35 @@ public class MyExcelUtil extends ExcelUtil { throw new RuntimeException("请稍后再试...."); } } + + public static void exBillLadingDetailedList(HttpServletResponse response, DistributionBillLadingExcelDTO map, String fileName) { + ServletOutputStream outputStream = null; + try { + response.setContentType("application/vnd.ms-excel"); + fileName = URLEncoder.encode(fileName, Charsets.UTF_8.name()); + response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); + response.setHeader("content-Type", "application/vnd.ms-excel"); + response.setCharacterEncoding("UTF-8"); + outputStream = response.getOutputStream(); + ExcelWriter build = EasyExcel.write(outputStream).build(); + + WriteSheet orderList = EasyExcel.writerSheet("订单列表").head(DistributionBillOrderExcel.class).build(); + WriteSheet inventoryList = EasyExcel.writerSheet("库存品列表").head(DistributionBillOrderPackExcel.class).build(); + WriteSheet packageList = EasyExcel.writerSheet("包件列表").head(DistributionBillInventoryExcel.class).build(); + if (Func.isNotEmpty(map.getBillOrderExcelList())){ + build.write(map.getBillOrderExcelList(),orderList); + } + if (Func.isNotEmpty(map.getBillOrderPackExcelList())){ + build.write(map.getBillOrderPackExcelList(),packageList); + } + if (Func.isNotEmpty(map.getBillInventoryExcelList())){ + build.write(map.getBillInventoryExcelList(),inventoryList); + } + + }catch (Exception e) { + + throw new RuntimeException("请稍后再试...."); + } + + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillLadingController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillLadingController.java index ec3097be3..b6e3a32b9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillLadingController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillLadingController.java @@ -20,7 +20,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.logpm.distribution.bean.MyExcelUtil; import com.logpm.distribution.dto.DistrilbutionBillLadingDTO; +import com.logpm.distribution.dto.app.DistributionBillLadingExcelDTO; import com.logpm.distribution.entity.DistrilbutionBillLadingEntity; import com.logpm.distribution.excel.DistributionStockArticleExcel; import com.logpm.distribution.excel.DistrilbutionBillLadingExcel; @@ -165,6 +167,18 @@ public class DistrilbutionBillLadingController extends BladeController { ExcelUtil.export(response, "提货数据" + DateUtil.time(), "提货数据表", list, DistrilbutionBillLadingExcel.class); } + /** + * 导出数据 + */ + @GetMapping("/export-distributionBillLadingDetail") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出提货数据", notes = "传入-distributionBillLading") + public void exportDistributionBillLadingDetail(@ApiIgnore @RequestParam Long id,HttpServletResponse response) { + + DistributionBillLadingExcelDTO map = distrilbutionBillLadingService.exportDistributionBillLadingDetail(id); + MyExcelUtil.exBillLadingDetailedList(response,map,"自提清单"); + } + /** * 提货单 自定义分页 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistributionBillLadingExcelDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistributionBillLadingExcelDTO.java new file mode 100644 index 000000000..eb8930a8b --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistributionBillLadingExcelDTO.java @@ -0,0 +1,31 @@ +package com.logpm.distribution.dto.app; + + +import com.logpm.distribution.excel.DistributionBillInventoryExcel; +import com.logpm.distribution.excel.DistributionBillOrderExcel; +import com.logpm.distribution.excel.DistributionBillOrderPackExcel; +import com.logpm.distribution.vo.DistributionDeliveryInfoVO; +import com.logpm.distribution.vo.DistributionParcelListVO; +import com.logpm.distribution.vo.DistributionStockArticleVO; +import com.logpm.distribution.vo.DistributionStockListVO; +import lombok.Data; + +import java.util.List; + +@Data +public class DistributionBillLadingExcelDTO { + + + private List billOrderExcelList; + + + private List billOrderPackExcelList; + + + private List billInventoryExcelList; + + + + + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java index 47659be92..4c9d87751 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java @@ -13,7 +13,7 @@ public class StockupDTO implements Serializable { private String stockupDateEnd;//备货日期 private Integer status;//0未完成 1已完成 -// private Long stockupAllocationId;//0未完成 1已完成 + private Long stockupAllocationId;//0未完成 1已完成 private String stockupAllocationName;//0未完成 1已完成 /** diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupZeroDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupZeroDTO.java index 836306525..cc4dbfc37 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupZeroDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupZeroDTO.java @@ -22,7 +22,7 @@ public class StockupZeroDTO implements Serializable { private String typeService;//备货类型 3 自提 private Long reservationId;//预约单id private Integer num;//预约单id -// private Long stockupAllocationId;//备货库位Id + private Long stockupAllocationId;//备货库位Id private String stockupAllocationName;//备货库位Id } 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 4d65bdd3c..bdf33e243 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 @@ -81,4 +81,6 @@ public interface DistributionDeliveryDetailsMapper extends BaseMapper getBillOrderInventoryExcel(@Param("param") DistributionDeliveryDetailsEntity deliveryDetails); + + List getBillLadingDetailOrderInventoryExcel(@Param("id")Long id); } 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 ad3645d37..92fe0f51b 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 @@ -135,8 +135,27 @@ LEFT JOIN logpm_distribution_stock_list ldsl on lddd.stock_list_id = ldsl.id LEFT JOIN logpm_distribution_stock lds on lds.bill_lading_id = lddd.bill_lading_id and lddd.stock_list_id = lds.stock_list_id - lddd.bill_lading_id = #{param.billLadingId} and lddd.inventory_status in (1,2) + lddd.bill_lading_id = #{param.billLadingId} and lddd.inventory_status in (1,3) + + + 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 d36fbe8dc..884a4377a 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 @@ -72,5 +72,14 @@ public interface DistrilbutionBillStockMapper extends BaseMapper getBillStockExcel(@Param("param")DistrilbutionBillStockEntity distrilbutionBillStock); + /** + * 查询自提订单导出详情 + * @param id + * @return + */ + List getBillLadingDetailStockExcel(@Param("id")Long id); + List billOrderPackExcel(@Param("param")DistrilbutionBillStockEntity billStock); + + List getBillLadingDetailOrderPackExcel(@Param("id")Long id); } 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 d154c16a8..6358d7356 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 @@ -371,4 +371,110 @@ + + + + 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 44268aa47..5e7920cfd 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 @@ -85,4 +85,6 @@ public interface IDistributionDeliveryDetailsService extends BaseService getBillOrderInventoryExcel(Map distributionDeliveryDetails); + + List getBillLadingDetailOrderInventoryExcel(Long id); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java index 3ed515cfe..adf36dd0c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java @@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.bean.Resp; import com.logpm.distribution.dto.DistrilbutionBillLadingDTO; import com.logpm.distribution.dto.app.BillLadingAppDTO; +import com.logpm.distribution.dto.app.DistributionBillLadingExcelDTO; import com.logpm.distribution.entity.DistrilbutionBillLadingEntity; import com.logpm.distribution.excel.DistrilbutionBillLadingExcel; import com.logpm.distribution.vo.*; @@ -262,4 +263,11 @@ public interface IDistrilbutionBillLadingService extends BaseService distrilbutionBillStock(Map distrilbutionBillStock); + /** + * 查询自提单订单导出详情数据 + * @param id + * @return + */ + List distrilbutionBillDeatilStock(Long id); + List billOrderPackExcel(Map distrilbutionBillStock); + + List billLadingDetailOrderPackExcel(Long id); + /** * 维护自提单订单状态 * @param l 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 23a0d3e48..21deac261 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 @@ -120,4 +120,27 @@ public class DistributionDeliveryDetailsServiceImpl extends BaseServiceImpl getBillLadingDetailOrderInventoryExcel(Long id) { + List billOrderInventoryExcel = baseMapper.getBillLadingDetailOrderInventoryExcel(id); + for (DistributionBillInventoryExcel distributionBillInventoryExcel : billOrderInventoryExcel) { + if (ObjectUtils.isNotEmpty(distributionBillInventoryExcel.getStockStatus()) && distributionBillInventoryExcel.getStockStatus()==1){ + distributionBillInventoryExcel.setStockStatusName(DeliveryStockStatuConstant.daibeihuo.getName()); + }else if (ObjectUtils.isNotEmpty(distributionBillInventoryExcel.getStockStatus()) && distributionBillInventoryExcel.getStockStatus()==2){ + distributionBillInventoryExcel.setStockStatusName(DeliveryStockStatuConstant.beihuozong.getName()); + }else if (ObjectUtils.isNotEmpty(distributionBillInventoryExcel.getStockStatus()) && distributionBillInventoryExcel.getStockStatus()==3){ + distributionBillInventoryExcel.setStockStatusName(DeliveryStockStatuConstant.beihuowanceng.getName()); + } + + //不确定的字段 前端制为空 + if (ObjectUtils.isNotEmpty(distributionBillInventoryExcel.getPickupStatus()) && distributionBillInventoryExcel.getPickupStatus()==10){ + distributionBillInventoryExcel.setPickupStatusName("已提货"); + }else if (ObjectUtils.isNotEmpty(distributionBillInventoryExcel.getPickupStatus()) && distributionBillInventoryExcel.getPickupStatus()==20){ + distributionBillInventoryExcel.setPickupStatusName("未提货"); + } + + } + return billOrderInventoryExcel; + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 84c3cb600..4bcceecd0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -7427,7 +7427,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionDeliveryInfoVOS = distributionDeliveryInfoMapper.selectClientListByDeliveryId(deliveryId); List deliveryInfoVOS = handleClient(distributionDeliveryInfoVOS); distributionDeliveryExcelDTO.setDeliveryInfoVOS(deliveryInfoVOS); -// EXResource.put("client",deliveryInfoVOS); +// EXResource.put("client",deliveryInfoVOS); List distributionStockArticleVOS = distributionDeliveryInfoMapper.selectDistributionDeliveryOrderPageByDeliveryId(deliveryId); distributionDeliveryExcelDTO.setDistributionStockArticleVOS(distributionStockArticleVOS); // EXResource.put("order",distributionStockArticleVOS); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index bb1a3a515..a4793d66e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -1997,15 +1997,15 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl distributionBillOrderExcels = distrilbutionBillStockService.distrilbutionBillDeatilStock(id); + if (!distributionBillOrderExcels.isEmpty()) { + distributionBillLadingExcelDTO.setBillOrderExcelList(distributionBillOrderExcels); + } + List distributionBillOrderPackExcels = distrilbutionBillStockService.billLadingDetailOrderPackExcel(id); + if (!distributionBillOrderPackExcels.isEmpty()) { + distributionBillLadingExcelDTO.setBillOrderPackExcelList(distributionBillOrderPackExcels); + } + List billInventoryExcelList = distributionDeliveryDetailsService.getBillLadingDetailOrderInventoryExcel(id); + if (billInventoryExcelList.isEmpty()) { + distributionBillLadingExcelDTO.setBillInventoryExcelList(billInventoryExcelList); + } + return distributionBillLadingExcelDTO; + } + /** * 转换老系统的ID * @@ -2296,7 +2322,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl billIds = records.stream() .map(DistrilbutionBillLadingVO::getId) // 假设getId()方法返回提货单ID .collect(Collectors.toList()); - + if (billIds.isEmpty()) { + return distrilbutionBillLadingVOIPage; + } List distributionDeliveryChargeEntityList = distributionDeliveryChargeService.list(Wrappers.query().lambda() .in(DistributionDeliveryChargeEntity::getBillLading, billIds) ); 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 70df8b7eb..651cac449 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 @@ -167,6 +167,25 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl distrilbutionBillDeatilStock(Long id) { + List distributionBillOrderExcels = baseMapper.getBillLadingDetailStockExcel(id); + + 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()); +// } + }); + return distributionBillOrderExcels; + } + @Override public List billOrderPackExcel(Map distrilbutionBillStock) { DistrilbutionBillStockEntity billStock = JSON.parseObject(JSON.toJSONString(distrilbutionBillStock), DistrilbutionBillStockEntity.class); @@ -183,6 +202,20 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl billLadingDetailOrderPackExcel(Long id) { + List distributionBillOrderPackExcels = baseMapper.getBillLadingDetailOrderPackExcel(id); + 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; + } + /** * @param l */ @@ -219,4 +252,5 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl