diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/WarehouseLeasingController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/WarehouseLeasingController.java index 6ab8e4b3c..658f7396c 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/WarehouseLeasingController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/WarehouseLeasingController.java @@ -65,7 +65,7 @@ import java.util.Map; */ @RestController @AllArgsConstructor -@RequestMapping("logpm-basicdata/warehouseLeasing") +@RequestMapping("/warehouseLeasing") @Api(value = "仓库租用管理", tags = "仓库租用管理接口") public class WarehouseLeasingController extends BladeController { diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index 6c064993a..5b746142e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -161,7 +161,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { public Boolean getSelfPickup(Long id) { DistributionParcelListEntity entity = new DistributionParcelListEntity(); entity.setId(id); - entity.setOrderPackageStatus(OrderStatusConstant.bufenqianshou.getValue()); + entity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue()); return distributionParcelListService.updateById(entity); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index b7e7036b9..1a6384862 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -1089,7 +1089,15 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl deliverySelfInfo = distributionDeliverySelfMapper.getDeliverySelfInfo(deliveryListEntity.getId()); + + + List deliverySelfInfo = null; + if (deliveryListEntity.getKind().equals(ServiceConstant.DELIVERLIST_KIND_SELF)) { + deliverySelfInfo = distributionDeliverySelfMapper.getDeliverySelfInfo(deliveryListEntity.getId()); + } else { + DistributionDeliveryTripartiteVO deliveryTripartiteInfo = distributionDeliveryTripartiteMapper.getDeliveryTripartiteInfo(deliveryListEntity.getId()); + BeanUtils.copyProperties(deliverySelfInfo, deliveryTripartiteInfo); + } //查询该车次负责司机 for (DistributionReservationZeroPackageEntity reservationZeroPackageEntity : reservationZeroPackageEntities) { //查询订单 @@ -6511,6 +6519,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl userR = userClient.userInfoById(delivery.getAdministratorsId()); if (Func.isNotEmpty(delivery)) { if ("1".equals(delivery.getKind())) { //自主配送 @@ -6529,13 +6538,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl userR = userClient.userInfoById(delivery.getAdministratorsId()); if (Func.isNotEmpty(userR)) { User user = userR.getData(); delivery.setAdministratorsName(user.getName()); delivery.setAdministratorsPhone(user.getPhone()); + } DistributionStockupEntity distributionStockupEntity = distributionReservationMapper.selectStockup(distributionSignforEntity.getReservationId()); if (Func.isNotEmpty(distributionStockupEntity)) { @@ -6548,6 +6558,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl customer = distributionReservationMapper.selectPushOldCustomer(distributionSignforEntity.getReservationId()); + if (customer.size()>1){ + resultMap.put("result", false); + resultMap.put("msg", "存在多个signfor信息 >>>ReservationId():"+distributionSignforEntity.getReservationId()); + } if (Func.isNotEmpty(customer)) { //查询客户订单 List signPushDataUnitDTOS = new ArrayList<>(); @@ -6599,6 +6613,16 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl signforUser = userClient.userInfoById(signUserId); + if (Objects.equals(signforUser.getCode() , 200)){ + delivery.setOutPhone(signforUser.getData().getPhone()); + }else { + resultMap.put("result", false); + resultMap.put("msg", "外协查询签收人电话失败:"+customer.get(0).getSignUserId()); + } + } } } 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 1af746af2..8abe6fdc6 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 @@ -305,7 +305,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl userR = userClient.userInfoById(distributionStockupVO.getCreateUser()); - if(userR.isSuccess()&& userR.getData()!=null){ + if (userR.isSuccess() && userR.getData() != null) { distributionStockupVO.setCreateUserName(userR.getData().getName()); } } @@ -708,9 +708,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl result = baseMapper.selectClientListPage(page, distributionStockArticle,warehouseIds); + List result = baseMapper.selectClientListPage(page, distributionStockArticle, warehouseIds); return page.setRecords(result); } @@ -874,7 +874,6 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl handlePackage(IPage pageVO) { @@ -1012,15 +1011,15 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl warehouseIdList = new ArrayList<>(); BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Func.isEmpty(myCurrentWarehouse)){ + if (Func.isEmpty(myCurrentWarehouse)) { List myWarehouseList = warehouseClient.getMyWarehouseList(); List collect = myWarehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); warehouseIdList.addAll(collect); - }else{ + } else { warehouseIdList.add(myCurrentWarehouse.getId()); } - IPage distributionStockArticleEntityIPage = baseMapper.pageListOwe(page, stockArticleEntity,warehouseIdList); + IPage distributionStockArticleEntityIPage = baseMapper.pageListOwe(page, stockArticleEntity, warehouseIdList); return distributionStockArticleEntityIPage; } @@ -1133,7 +1132,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl map = new HashMap<>(); map.put("id", orderId); - map.put("orderCode",orderCode); + map.put("orderCode", orderCode); String filename = QRCodeUtil.createCodeToFile(orderCode); map.put("orderCodeImage", QRCodeUtil.getEmpAutograph(filename)); - if(!Objects.isNull(warehouseWaybill)){ + if (!Objects.isNull(warehouseWaybill)) { String consignee = warehouseWaybill.getConsignee(); String consigneeName = warehouseWaybill.getConsigneeName(); String consigneeMobile = warehouseWaybill.getConsigneeMobile(); String remark = warehouseWaybill.getRemark(); - map.put("consigneeUnit", StringUtil.isBlank(consignee)?"":consignee); - map.put("consigneePerson",StringUtil.isBlank(consigneeName)?"":consigneeName); - map.put("consigneeMobile",StringUtil.isBlank(consigneeMobile)?"":consigneeMobile); + map.put("consigneeUnit", StringUtil.isBlank(consignee) ? "" : consignee); + map.put("consigneePerson", StringUtil.isBlank(consigneeName) ? "" : consigneeName); + map.put("consigneeMobile", StringUtil.isBlank(consigneeMobile) ? "" : consigneeMobile); map.put("product", warehouseWaybill.getGoodsName() + "（" + warehouseWaybill.getTotalCount() + "）"); - map.put("remark",StringUtil.isBlank(remark)?"":remark); + map.put("remark", StringUtil.isBlank(remark) ? "" : remark); } String customerName = stockArticleEntity.getCustomerName(); String customerTelephone = stockArticleEntity.getCustomerTelephone(); String customerAddress = stockArticleEntity.getCustomerAddress(); - map.put("customerName",StringUtil.isBlank(customerName)?"":customerName); - map.put("customerTelephone",StringUtil.isBlank(customerTelephone)?"":customerTelephone); - map.put("customerAddress",StringUtil.isBlank(customerAddress)?"":customerAddress); + map.put("customerName", StringUtil.isBlank(customerName) ? "" : customerName); + map.put("customerTelephone", StringUtil.isBlank(customerTelephone) ? "" : customerTelephone); + map.put("customerAddress", StringUtil.isBlank(customerAddress) ? "" : customerAddress); // 订单号 生成二维码 String fileTypeName = QRCodeUtil.createCodeToFile(orderCode); map.put("imgType", QRCodeUtil.getEmpAutograph(fileTypeName)); @@ -2641,7 +2641,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl collect = null; - if(ObjectUtils.isNotNull(currentWarehouse)){ + if (ObjectUtils.isNotNull(currentWarehouse)) { collect = new ArrayList<>(); collect.add(currentWarehouse.getId()); - }else{ + } else { collect = myWarehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); } - log.info(">>>>>>>>>>>>>当前仓库:{}",collect); - IPage distributionStockArticleEntityIPage = baseMapper.pageSignforListOwe(page, stockArticleEntity,collect); + log.info(">>>>>>>>>>>>>当前仓库:{}", collect); + IPage distributionStockArticleEntityIPage = baseMapper.pageSignforListOwe(page, stockArticleEntity, collect); //处理创建人 distributionStockArticleEntityIPage.getRecords().forEach(a -> { if (Func.isNotEmpty(a.getCreateUser())) { @@ -2759,11 +2759,11 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl warehouseIdList = null; - if (ObjectUtils.isNotNull(currentWarehouse)){ + if (ObjectUtils.isNotNull(currentWarehouse)) { warehouseIdList = new ArrayList<>(); warehouseIdList.add(currentWarehouse.getId()); - }else{ - warehouseIdList=myWarehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); + } else { + warehouseIdList = myWarehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); } // if (collect.size() > 1) { @@ -2775,7 +2775,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl list = baseMapper.listSignforListOwe(stockArticleEntity,warehouseIdList); + List list = baseMapper.listSignforListOwe(stockArticleEntity, warehouseIdList); //处理创建人 List signForStockArticleExcels = new ArrayList<>(); list.forEach(a -> { @@ -2793,10 +2793,6 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl orderCodes,Long warehouseId) { - return baseMapper.findOrderTotalNumByOrderCodes(orderCodes,warehouseId); + public Integer findOrderTotalNumByOrderCodes(List orderCodes, Long warehouseId) { + return baseMapper.findOrderTotalNumByOrderCodes(orderCodes, warehouseId); } @Override public Integer findOrderTotalNumByOrderPackageCodes(List orderPackageCodes, Long warehouseId) { - List orderCodes = distributionParcelListService.findOrderCodesByOrderPackageCodes(orderPackageCodes,warehouseId); + List orderCodes = distributionParcelListService.findOrderCodesByOrderPackageCodes(orderPackageCodes, warehouseId); - return baseMapper.findOrderTotalNumByOrderCodes(orderCodes,warehouseId); + return baseMapper.findOrderTotalNumByOrderCodes(orderCodes, warehouseId); } @Override diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java index fbd284ab7..c68b9a189 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java @@ -25,6 +25,7 @@ import com.logpm.warehouse.dto.TaskQuestDTO; import com.logpm.warehouse.dto.TaskSearchDTO; import com.logpm.warehouse.entity.TaskQuestEntity; import com.logpm.warehouse.excel.QuestContrastExcel; +import com.logpm.warehouse.excel.QuestContrastPackageExcelVO; import com.logpm.warehouse.excel.TaskQueryDataExcel; import com.logpm.warehouse.excel.TaskQuestExcel; import com.logpm.warehouse.service.ITaskQuestService; @@ -210,6 +211,18 @@ public class TaskQuestController extends BladeController { } + + @GetMapping("/export-allDataWithPackage") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "导出全部数据明细维度", notes = "传入questDetailDTO") + public void exportAllDataWithPackage(QuestDetailDTO questDetailDTO, HttpServletResponse response){ + String questNum = questDetailDTO.getQuestNum(); + List list = taskQuestService.exportAllDataWithPackage(questDetailDTO); + ExcelUtil.export(response, "盘点任务【"+questNum+"】数据" + DateUtil.time(), "盘点明细数据表", list, QuestContrastPackageExcelVO.class); + + } + + /** * 导出数据 */ diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/excel/QuestContrastPackageExcelVO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/excel/QuestContrastPackageExcelVO.java new file mode 100644 index 000000000..6f8436874 --- /dev/null +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/excel/QuestContrastPackageExcelVO.java @@ -0,0 +1,105 @@ +package com.logpm.warehouse.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class QuestContrastPackageExcelVO implements Serializable { + + @ColumnWidth(20) + @ExcelProperty(value = "订单号") + private String orderCode; + + @ColumnWidth(20) + @ExcelProperty(value = "运单号") + private String waybillNumber; + + @ColumnWidth(20) + @ExcelProperty(value = "盘点方式") + private String questType; + + @ColumnWidth(20) + @ExcelProperty(value = "盘点对象") + private String questTarget; + + @ColumnWidth(20) + @ExcelProperty(value = "盘点状态") + private String questStatus; + + @ColumnWidth(20) + @ExcelProperty(value = "包件码") + private String orderPackageCode; + + @ColumnWidth(20) + @ExcelProperty(value = "品类名称") + private String categoryName; + + @ColumnWidth(20) + @ExcelProperty(value = "在库数量") + private Integer stockNum; + + @ColumnWidth(20) + @ExcelProperty(value = "物料编码") + private String materialCode; + + @ColumnWidth(20) + @ExcelProperty(value = "物料名称") + private String materialName; + + @ColumnWidth(20) + @ExcelProperty(value = "一级品类") + private String firsts; + + @ColumnWidth(20) + @ExcelProperty(value = "二级品类") + private String seconds; + + @ColumnWidth(20) + @ExcelProperty(value = "三级品类") + private String thirdProduct; + + @ColumnWidth(20) + @ExcelProperty(value = "商场名称") + private String marketName; + + @ColumnWidth(20) + @ExcelProperty(value = "批次号") + private String incomingBatch; + + @ColumnWidth(20) + @ExcelProperty(value = "发站仓名称") + private String sendWarehouseName; + + @ColumnWidth(20) + @ExcelProperty(value = "品牌") + private String brandName; + + @ColumnWidth(20) + @ExcelProperty(value = "原有托盘") + private String trayName; + + @ColumnWidth(20) + @ExcelProperty(value = "原有库位") + private String positionCode; + + @ColumnWidth(20) + @ExcelProperty(value = "新托盘") + private String newTrayName; + + @ColumnWidth(20) + @ExcelProperty(value = "新库位") + private String groundingPositionCode; + + @ColumnWidth(20) + @ExcelProperty(value = "盘点时间") + private Date inventoryTime; + + @ColumnWidth(20) + @ExcelProperty(value = "盘点人") + private String inventoryUser; + +} diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java index b860c9ac5..524065ca7 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java @@ -23,6 +23,7 @@ import com.logpm.warehouse.entity.QuestDetailChildEntity; import com.logpm.warehouse.entity.QuestDetailEntity; import com.logpm.warehouse.entity.TaskQuestEntity; import com.logpm.warehouse.entity.WarehouseTrayEntity; +import com.logpm.warehouse.excel.QuestContrastPackageExcelVO; import com.logpm.warehouse.excel.TaskQueryDataExcel; import com.logpm.warehouse.vo.*; import com.logpm.warehouse.excel.TaskQuestExcel; @@ -198,4 +199,6 @@ public interface TaskQuestMapper extends BaseMapper { List findIsChangeData(@Param("questNum") String questNum); Integer findStockNum(@Param("questDetailId") Long questDetailId, @Param("tableName") String tableName); + + List exportAllDataWithPackage(@Param("param") QuestDetailDTO questDetailDTO); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml index a05695860..f51798213 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml @@ -707,4 +707,44 @@ + + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java index 873e6b5d4..7fb18f3a6 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java @@ -26,6 +26,7 @@ import com.logpm.warehouse.entity.QuestDetailChildEntity; import com.logpm.warehouse.entity.QuestDetailEntity; import com.logpm.warehouse.entity.TaskQuestEntity; import com.logpm.warehouse.excel.QuestContrastExcel; +import com.logpm.warehouse.excel.QuestContrastPackageExcelVO; import com.logpm.warehouse.excel.TaskQueryDataExcel; import com.logpm.warehouse.excel.TaskQuestExcel; import com.logpm.warehouse.vo.*; @@ -305,4 +306,7 @@ public interface ITaskQuestService extends BaseService { List findIsChangeData(String questNum); Integer findStockNum(Long questDetailId, String tableName); + + List exportAllDataWithPackage(QuestDetailDTO questDetailDTO); + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java index f07e674b0..8e145f135 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java @@ -39,6 +39,7 @@ import com.logpm.warehouse.dto.TaskQuestDTO; import com.logpm.warehouse.dto.TaskSearchDTO; import com.logpm.warehouse.entity.*; import com.logpm.warehouse.excel.QuestContrastExcel; +import com.logpm.warehouse.excel.QuestContrastPackageExcelVO; import com.logpm.warehouse.excel.TaskQueryDataExcel; import com.logpm.warehouse.excel.TaskQuestExcel; import com.logpm.warehouse.mapper.TaskQuestMapper; @@ -49,7 +50,6 @@ import com.logpm.warehouse.vo.*; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; import org.jetbrains.annotations.Nullable; -import org.mapstruct.factory.Mappers; import org.springblade.common.cache.CacheNames; import org.springblade.common.constant.RedisKeyConstant; import org.springblade.common.constant.common.IsOrNoConstant; @@ -3492,6 +3492,11 @@ public class TaskQuestServiceImpl extends BaseServiceImpl exportAllDataWithPackage(QuestDetailDTO questDetailDTO) { + return baseMapper.exportAllDataWithPackage(questDetailDTO); + } + private String getQuestNum(String warehouseCode) { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd"); // return "PDRW_" + warehouseCode + "_" + simpleDateFormat.format(new Date()) + String.format("%03d", new Random().nextInt(900) + 100);