From ff8d35003896d36952300c04db907a528a2bcf5c Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Thu, 28 Sep 2023 10:48:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=B8=E6=9C=BA=E7=AD=BE?= =?UTF-8?q?=E6=94=B6=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/DistributionSignPrintEntity.java | 85 ++++++++++ .../feign/IDistributionSignPrintClient.java | 49 ++++++ .../vo/DistributionSignPrintVO.java | 35 ++++ .../vo/DistributionStockListAllocationVO.java | 20 +++ .../DistributionSignforAppController.java | 27 +++- .../DistributionSignPrintController.java | 150 ++++++++++++++++++ .../DistributionStockListController.java | 12 ++ .../dto/DistributionSignPrintDTO.java | 34 ++++ .../dto/DistributionSignforDTO.java | 8 + .../excel/DistributionSignPrintExcel.java | 111 +++++++++++++ .../feign/DistributionSignPrintClient.java | 53 +++++++ .../mapper/DistributionSignPrintMapper.java | 54 +++++++ .../mapper/DistributionSignPrintMapper.xml | 37 +++++ .../mapper/DistributionStockListMapper.java | 9 ++ .../mapper/DistributionStockListMapper.xml | 15 ++ .../IDistributionSignPrintService.java | 52 ++++++ .../service/IDistributionSignforService.java | 20 ++- .../IDistributionStockListService.java | 12 +- .../DistributionSignPrintServiceImpl.java | 54 +++++++ .../impl/DistributionSignforServiceImpl.java | 59 ++++++- .../DistributionStockArticleServiceImpl.java | 79 ++++++--- .../DistributionStockListServiceImpl.java | 16 +- 22 files changed, 950 insertions(+), 41 deletions(-) create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignPrintEntity.java create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionSignPrintClient.java create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignPrintVO.java create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockListAllocationVO.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignPrintController.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSignPrintDTO.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignPrintExcel.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignPrintClient.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignPrintMapper.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignPrintMapper.xml create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignPrintService.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignPrintServiceImpl.java diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignPrintEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignPrintEntity.java new file mode 100644 index 000000000..d2a332749 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignPrintEntity.java @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 签收图片 实体类 + * + * @author cyz + * @since 2023-09-28 + */ +@Data +@TableName("logpm_distribution_sign_print") +@ApiModel(value = "DistributionSignPrint对象", description = "签收图片") +@EqualsAndHashCode(callSuper = true) +public class DistributionSignPrintEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + /** + * 类型 + */ + @ApiModelProperty(value = "类型") + private String type; + /** + * 名称 + */ + @ApiModelProperty(value = "名称") + private String name; + /** + * 路径 + */ + @ApiModelProperty(value = "路径") + private String urlRoute; + /** + * 预约id + */ + @ApiModelProperty(value = "预约id") + private Long reservationId; + +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionSignPrintClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionSignPrintClient.java new file mode 100644 index 000000000..b4fffb43a --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionSignPrintClient.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.feign; + +import org.springblade.core.mp.support.BladePage; +import com.logpm.distribution.entity.DistributionSignPrintEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 签收图片 Feign接口类 + * + * @author cyz + * @since 2023-09-28 + */ +@FeignClient( + value = "blade-distributionSignPrint" +) +public interface IDistributionSignPrintClient { + + String API_PREFIX = "/client"; + String TOP = API_PREFIX + "/top"; + + /** + * 获取签收图片列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignPrintVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignPrintVO.java new file mode 100644 index 000000000..636332837 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignPrintVO.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.vo; + +import com.logpm.distribution.entity.DistributionSignPrintEntity; +import org.springblade.core.tool.node.INode; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 签收图片 视图实体类 + * + * @author cyz + * @since 2023-09-28 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class DistributionSignPrintVO extends DistributionSignPrintEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockListAllocationVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockListAllocationVO.java new file mode 100644 index 000000000..b8bfd4831 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockListAllocationVO.java @@ -0,0 +1,20 @@ +package com.logpm.distribution.vo; + +import lombok.Data; + +import java.util.Date; + +@Data +public class DistributionStockListAllocationVO { + + private String allocationTitle; // 货位 + private String marketName; //商场名称 + private Integer num; //托盘数量 + private Date createTime; // 上架时间 + private String cargoUnit; // 单位 + private Boolean unpack; // 是否拆包 + private Integer quantityStock; // 在库数量 + private Integer unpackingQuantity; // 拆包数量 + private String descriptionGoods; // 物料名称 + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java index a9924b842..1edc8f909 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java @@ -7,6 +7,7 @@ import com.logpm.distribution.bean.Resp; import com.logpm.distribution.dto.DistributionSignforDTO; import com.logpm.distribution.dto.DistrilbutionAppsignforDTO; import com.logpm.distribution.dto.app.DistributionAppDeliveryListDTO; +import com.logpm.distribution.entity.DistributionSignPrintEntity; import com.logpm.distribution.entity.DistributionSignforEntity; import com.logpm.distribution.service.IDistributionDeliveryListService; import com.logpm.distribution.service.IDistributionReservationService; @@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -192,17 +194,28 @@ public class DistributionSignforAppController { @ApiOperation(value = "回显照片", notes = "回显照片") public R prices(@Valid @RequestBody DistributionSignforDTO distributionSignfor) { if(ObjectUtil.isNotEmpty(distributionSignfor.getReservationId())){ - DistributionSignforEntity one = distributionSignforService.getOne(Wrappers.query().lambda() - .eq(DistributionSignforEntity::getReservationId, distributionSignfor.getReservationId()) - ); - Map map = new HashMap<>(); - map.put("deliverySignPictures",one.getDeliverySignPictures()); //司机签收图片 - map.put("driverRemarks",one.getDriverRemarks()); //driverRemarks - return R.data(map); + Map> one = distributionSignforService.prices(distributionSignfor); +// Map map = new HashMap<>(); +// map.put("deliverySignPictures",one.getDeliverySignPictures()); //司机签收图片 +// map.put("driverRemarks",one.getDriverRemarks()); //driverRemarks + return R.data(one); }else { return R.fail(3002,"参数不能为空不对！！"); } + } + /** + * 签收管理 修改签收照片信息 + */ + @PostMapping("/updatePicture") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "修改签收照片信息", notes = "修改签收照片信息") + public R updatePicture(@Valid @RequestBody DistributionSignforDTO distributionSignfor) { + if(ObjectUtil.isNotEmpty(distributionSignfor.getReservationId())){ + return R.data(distributionSignforService.updatePicture(distributionSignfor)); + }else { + return R.fail(3002,"参数不能为空不对！！"); + } } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignPrintController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignPrintController.java new file mode 100644 index 000000000..000596d73 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignPrintController.java @@ -0,0 +1,150 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.distribution.entity.DistributionSignPrintEntity; +import com.logpm.distribution.vo.DistributionSignPrintVO; +import com.logpm.distribution.excel.DistributionSignPrintExcel; +import com.logpm.distribution.service.IDistributionSignPrintService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +/** + * 签收图片 控制器 + * + * @author cyz + * @since 2023-09-28 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/distributionSignPrint") +@Api(value = "签收图片", tags = "签收图片接口") +public class DistributionSignPrintController extends BladeController { + + private final IDistributionSignPrintService distributionSignPrintService; + + /** + * 签收图片 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入distributionSignPrint") + public R detail(DistributionSignPrintEntity distributionSignPrint) { + DistributionSignPrintEntity detail = distributionSignPrintService.getOne(Condition.getQueryWrapper(distributionSignPrint)); + return R.data(detail); + } + /** + * 签收图片 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入distributionSignPrint") + public R> list(@ApiIgnore @RequestParam Map distributionSignPrint, Query query) { + IPage pages = distributionSignPrintService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionSignPrint, DistributionSignPrintEntity.class)); + return R.data(pages); + } + + /** + * 签收图片 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入distributionSignPrint") + public R> page(DistributionSignPrintVO distributionSignPrint, Query query) { + IPage pages = distributionSignPrintService.selectDistributionSignPrintPage(Condition.getPage(query), distributionSignPrint); + return R.data(pages); + } + + /** + * 签收图片 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入distributionSignPrint") + public R save(@Valid @RequestBody DistributionSignPrintEntity distributionSignPrint) { + return R.status(distributionSignPrintService.save(distributionSignPrint)); + } + + /** + * 签收图片 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入distributionSignPrint") + public R update(@Valid @RequestBody DistributionSignPrintEntity distributionSignPrint) { + return R.status(distributionSignPrintService.updateById(distributionSignPrint)); + } + + /** + * 签收图片 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入distributionSignPrint") + public R submit(@Valid @RequestBody DistributionSignPrintEntity distributionSignPrint) { + return R.status(distributionSignPrintService.saveOrUpdate(distributionSignPrint)); + } + + /** + * 签收图片 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(distributionSignPrintService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-distributionSignPrint") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入distributionSignPrint") + public void exportDistributionSignPrint(@ApiIgnore @RequestParam Map distributionSignPrint, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionSignPrint, DistributionSignPrintEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(DistributionSignPrint::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(DistributionSignPrintEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = distributionSignPrintService.exportDistributionSignPrint(queryWrapper); + ExcelUtil.export(response, "签收图片数据" + DateUtil.time(), "签收图片数据表", list, DistributionSignPrintExcel.class); + } + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java index 4a9b79b7b..413f5a1b9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java @@ -25,6 +25,7 @@ import com.logpm.distribution.excel.DistributionStockListExcel; import com.logpm.distribution.excel.StockListImporter; import com.logpm.distribution.service.IDistributionStockListService; import com.logpm.distribution.vo.DistributionStockArticleVO; +import com.logpm.distribution.vo.DistributionStockListAllocationVO; import com.logpm.distribution.vo.DistributionStockListVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -83,6 +84,17 @@ public class DistributionStockListController extends BladeController { return R.data(pages); } + /** + * 库存品管理 分页货位查询 + */ + @GetMapping("/listAllocation") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入distributionStockList") + public R> listAllocation(@ApiIgnore @RequestParam Map distributionStockList, Query query) { + IPage pages = distributionStockListService.listAllocation(Condition.getPage(query), distributionStockList); + return R.data(pages); + } + /** * 库存品管理 分页自己 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSignPrintDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSignPrintDTO.java new file mode 100644 index 000000000..6a8949189 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSignPrintDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.dto; + +import com.logpm.distribution.entity.DistributionSignPrintEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 签收图片 数据传输对象实体类 + * + * @author cyz + * @since 2023-09-28 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class DistributionSignPrintDTO extends DistributionSignPrintEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSignforDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSignforDTO.java index 082af2ff5..a302809ab 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSignforDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSignforDTO.java @@ -21,6 +21,9 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; +import java.util.Map; + /** * 签收管理 数据传输对象实体类 * @@ -49,4 +52,9 @@ public class DistributionSignforDTO extends DistributionSignforEntity { */ @ApiModelProperty(value = "离线数据Json") private String offlineJson; + /** + * 签收图片类型集合 + */ + Map> map; + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignPrintExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignPrintExcel.java new file mode 100644 index 000000000..b72537e21 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignPrintExcel.java @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.excel; + + +import lombok.Data; + +import java.util.Date; +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 java.io.Serializable; + + +/** + * 签收图片 Excel实体类 + * + * @author cyz + * @since 2023-09-28 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class DistributionSignPrintExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 租户号 + */ + @ColumnWidth(20) + @ExcelProperty("租户号") + private String tenantId; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Integer isDeleted; + /** + * 预留1 + */ + @ColumnWidth(20) + @ExcelProperty("预留1") + private String reserve1; + /** + * 预留2 + */ + @ColumnWidth(20) + @ExcelProperty("预留2") + private String reserve2; + /** + * 预留3 + */ + @ColumnWidth(20) + @ExcelProperty("预留3") + private String reserve3; + /** + * 预留4 + */ + @ColumnWidth(20) + @ExcelProperty("预留4") + private String reserve4; + /** + * 预留5 + */ + @ColumnWidth(20) + @ExcelProperty("预留5") + private String reserve5; + /** + * 类型 + */ + @ColumnWidth(20) + @ExcelProperty("类型") + private Integer type; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * 路径 + */ + @ColumnWidth(20) + @ExcelProperty("路径") + private String urlRoute; + /** + * 预约id + */ + @ColumnWidth(20) + @ExcelProperty("预约id") + private String reservationId; + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignPrintClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignPrintClient.java new file mode 100644 index 000000000..94fd4e8fe --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignPrintClient.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.feign; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.BladePage; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import com.logpm.distribution.entity.DistributionSignPrintEntity; +import com.logpm.distribution.service.IDistributionSignPrintService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 签收图片 Feign实现类 + * + * @author cyz + * @since 2023-09-28 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class DistributionSignPrintClient implements IDistributionSignPrintClient { + + private final IDistributionSignPrintService distributionSignPrintService; + + @Override + @GetMapping(TOP) + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = distributionSignPrintService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignPrintMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignPrintMapper.java new file mode 100644 index 000000000..3192005c2 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignPrintMapper.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.mapper; + +import com.logpm.distribution.entity.DistributionSignPrintEntity; +import com.logpm.distribution.vo.DistributionSignPrintVO; +import com.logpm.distribution.excel.DistributionSignPrintExcel; +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.List; + +/** + * 签收图片 Mapper 接口 + * + * @author cyz + * @since 2023-09-28 + */ +public interface DistributionSignPrintMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param distributionSignPrint + * @return + */ + List selectDistributionSignPrintPage(IPage page, DistributionSignPrintVO distributionSignPrint); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportDistributionSignPrint(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignPrintMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignPrintMapper.xml new file mode 100644 index 000000000..8e2e76a2f --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignPrintMapper.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java index 96b6fceef..a62af7f36 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java @@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.entity.DistributionStockListEntity; import com.logpm.distribution.excel.DistributionStockListExcel; +import com.logpm.distribution.vo.DistributionStockListAllocationVO; import com.logpm.distribution.vo.DistributionStockListVO; import com.logpm.distribution.vo.DistributionStockupStockListInfoVO; import com.logpm.distribution.vo.StockListInfoListVO; @@ -85,4 +86,12 @@ public interface DistributionStockListMapper extends BaseMapper getListByMarketIdAndMaterialName(@Param("marketId") Long marketId, @Param("materialName") String materialName, @Param("warehouseId") Long warehouseId); + + /** + * + * @param page + * @param distributionStockListEntity + * @return + */ + IPage listAllocation(IPage page, @Param("param") DistributionStockListEntity distributionStockListEntity); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml index 07cbda102..e16ae3acc 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml @@ -347,5 +347,20 @@ and ldsl.market_id = #{marketId} and ldsl.warehouse_id = #{warehouseId} + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignPrintService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignPrintService.java new file mode 100644 index 000000000..224287d91 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignPrintService.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.logpm.distribution.entity.DistributionSignPrintEntity; +import com.logpm.distribution.vo.DistributionSignPrintVO; +import com.logpm.distribution.excel.DistributionSignPrintExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * 签收图片 服务类 + * + * @author cyz + * @since 2023-09-28 + */ +public interface IDistributionSignPrintService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param distributionSignPrint + * @return + */ + IPage selectDistributionSignPrintPage(IPage page, DistributionSignPrintVO distributionSignPrint); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportDistributionSignPrint(Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java index 88fc06078..8d4c32b68 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java @@ -20,10 +20,10 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.logpm.distribution.bean.Resp; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.dto.DistributionAddvalueDTO; -import com.logpm.distribution.dto.DistributionReservationStocklistDTO; import com.logpm.distribution.dto.DistributionSignforDTO; import com.logpm.distribution.dto.DistrilbutionAppsignforDTO; import com.logpm.distribution.dto.app.DistributionAppDeliveryListDTO; +import com.logpm.distribution.entity.DistributionSignPrintEntity; import com.logpm.distribution.entity.DistributionSignforEntity; import com.logpm.distribution.excel.DistributionSignforExcel; import com.logpm.distribution.vo.*; @@ -35,6 +35,7 @@ import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; import java.util.List; +import java.util.Map; /** * 签收管理 服务类 @@ -83,7 +84,7 @@ public interface IDistributionSignforService extends BaseService> prices(DistributionSignforDTO distributionSignfor); + + /** + * 修改签收图片 + * + * @param distributionSignfor + * @return + */ + Boolean updatePicture(DistributionSignforDTO distributionSignfor); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java index 5d3039f41..72b0882a3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java @@ -21,10 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.dto.DistributionStockListDTO; import com.logpm.distribution.entity.DistributionStockListEntity; import com.logpm.distribution.excel.DistributionStockListExcel; -import com.logpm.distribution.vo.DistributionStockArticleVO; -import com.logpm.distribution.vo.DistributionStockListVO; -import com.logpm.distribution.vo.DistributionStockupStockListInfoVO; -import com.logpm.distribution.vo.StockListInfoListVO; +import com.logpm.distribution.vo.*; import com.logpm.distribution.vo.app.StockMallVO; import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; @@ -134,6 +131,13 @@ public interface IDistributionStockListService extends BaseService getListByMarketIdAndMaterialName(Long marketId, String materialName, Long warehouseId); + /** + * @param page + * @param distributionStockList + * @return + */ + IPage listAllocation(IPage page, Map distributionStockList); + // /** // * 查询库存品详情 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignPrintServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignPrintServiceImpl.java new file mode 100644 index 000000000..73c5bb30a --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignPrintServiceImpl.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.service.impl; + +import com.logpm.distribution.entity.DistributionSignPrintEntity; +import com.logpm.distribution.vo.DistributionSignPrintVO; +import com.logpm.distribution.excel.DistributionSignPrintExcel; +import com.logpm.distribution.mapper.DistributionSignPrintMapper; +import com.logpm.distribution.service.IDistributionSignPrintService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import java.util.List; + +/** + * 签收图片 服务实现类 + * + * @author cyz + * @since 2023-09-28 + */ +@Service +public class DistributionSignPrintServiceImpl extends BaseServiceImpl implements IDistributionSignPrintService { + + @Override + public IPage selectDistributionSignPrintPage(IPage page, DistributionSignPrintVO distributionSignPrint) { + return page.setRecords(baseMapper.selectDistributionSignPrintPage(page, distributionSignPrint)); + } + + + @Override + public List exportDistributionSignPrint(Wrapper queryWrapper) { + List distributionSignPrintList = baseMapper.exportDistributionSignPrint(queryWrapper); + //distributionSignPrintList.forEach(distributionSignPrint -> { + // distributionSignPrint.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionSignPrint.getType())); + //}); + return distributionSignPrintList; + } + +} 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 2a3fd8a74..2847dac31 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 @@ -54,7 +54,6 @@ import org.springblade.common.constant.reservation.ReservationInventorySigningSt import org.springblade.common.constant.reservation.ReservationLoadingStatusConstant; import org.springblade.common.constant.reservation.ReservationSigningStatusConstant; import org.springblade.common.constant.signing.SignforDriverSigningStatusConstant; -import org.springblade.common.constant.signing.SignforStatusConstant; import org.springblade.common.serviceConstant.ServiceConstant; import org.springblade.common.utils.GaoDeApiUtil; import org.springblade.core.mp.base.BaseServiceImpl; @@ -69,8 +68,6 @@ import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; import java.util.*; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; /** @@ -106,6 +103,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl selectDistributionSignforPage(IPage page, DistributionSignforVO distributionSignfor) { @@ -386,14 +384,27 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl distributionSignPrintList = new ArrayList<>(); + distributionSignfor.getMap().forEach((k,v)->{ + v.stream().forEach(i ->{ + DistributionSignPrintEntity distributionSignPrint = new DistributionSignPrintEntity(); + BeanUtils.copyProperties(i,distributionSignPrint); + distributionSignPrint.setReservationId(distributionSignfor.getReservationId()); + distributionSignPrintList.add(distributionSignPrint); + }); + }); + iDistributionSignPrintService.saveBatch(distributionSignPrintList); + } //修改签收表司机签收数量 boolean update = this.update(new UpdateWrapper().lambda() .eq(DistributionSignforEntity::getReservationId, distributionSignfor.getReservationId()) .eq(DistributionSignforEntity::getDeliveryId, distributionSignfor.getDeliveryId()) .set(DistributionSignforEntity::getSjsigningTime, simpleDateFormat.format(new Date())) - .set(StringUtils.isNotBlank(distributionSignfor.getDeliverySignPictures()), DistributionSignforEntity::getDeliverySignPictures, distributionSignfor.getDeliverySignPictures()) +// .set(StringUtils.isNotBlank(distributionSignfor.getDeliverySignPictures()), DistributionSignforEntity::getDeliverySignPictures, distributionSignfor.getDeliverySignPictures()) .set(DistributionSignforEntity::getDriverSigning, "2") .set(StringUtils.isNotBlank(distributionSignfor.getDriverRemarks()), DistributionSignforEntity::getDriverRemarks, distributionSignfor.getDriverRemarks()) .set(StringUtils.isNotBlank(distributionSignfor.getSigneeName()), DistributionSignforEntity::getSigneeName, distributionSignfor.getSigneeName()) @@ -1574,5 +1585,43 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl> prices(DistributionSignforDTO distributionSignfor) { + log.info("==========回显图片的值：{}",distributionSignfor); + List list = iDistributionSignPrintService.list(Wrappers.query().lambda() + .eq(DistributionSignPrintEntity::getReservationId, distributionSignfor.getReservationId()) + .eq(DistributionSignPrintEntity::getIsDeleted, "0") + ); + Map> collect = list.stream().collect(Collectors.groupingBy(DistributionSignPrintEntity::getType)); + return collect; + } + + @Override + public Boolean updatePicture(DistributionSignforDTO distributionSignfor) { + if(ObjectUtils.isNotNull(distributionSignfor.getMap())){ + List distributionSignPrintList = new ArrayList<>(); + distributionSignfor.getMap().forEach((k,v) ->{ + + List list = iDistributionSignPrintService.list(Wrappers.query().lambda() + .eq(DistributionSignPrintEntity::getReservationId, distributionSignfor.getReservationId()) + .eq(DistributionSignPrintEntity::getType, k) + .eq(DistributionSignPrintEntity::getIsDeleted, "0") + ); + //删除 + iDistributionSignPrintService.deleteLogic(list.stream().map(DistributionSignPrintEntity::getId).collect(Collectors.toList())); + v.stream().forEach( i -> { + DistributionSignPrintEntity distributionSignPrint = new DistributionSignPrintEntity(); + BeanUtils.copyProperties(i,distributionSignPrint); + distributionSignPrint.setReservationId(distributionSignfor.getReservationId()); + distributionSignPrintList.add(distributionSignPrint); + }); + + }); + //添加 + return iDistributionSignPrintService.saveBatch(distributionSignPrintList); + } + return false; + } + } 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 52eccc819..cfa40cc29 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 @@ -148,28 +148,66 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl 0) { - list1.forEach(i -> { - //查询包件有没有物料 - List list = distributionParcelDetailsService.list(Wrappers.query().lambda() - .eq(DistributionParcelDetailsEntity::getParcelListId, i.getId()) - ); - if (list.size() > 0) { - //有 - list.forEach(a -> { + list1.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getMaterialId)) + .forEach((k ,v) ->{ + int sum = v.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum(); + v.stream().forEach( i -> { + //查询包件有没有物料 + List list = distributionParcelDetailsService.list(Wrappers.query().lambda() + .eq(DistributionParcelDetailsEntity::getParcelListId, i.getId()) + ); + if (list.size() > 0) { + //有 + list.stream().collect(Collectors.groupingBy(DistributionParcelDetailsEntity::getEncoded)) + .forEach((kk,vv) ->{ + DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity(); + BeanUtil.copyProperties(vv.get(0),parcelListEntity); + parcelListEntity.setQuantity(sum); + parcelListEntity.setMaterialName(vv.get(0).getName()); + parcelListEntity.setMaterialCode(vv.get(0).getEncoded()); + parcelListEntity.setMaterialUnit(vv.get(0).getUnit()); + // 添加库存品信息 + addStockList(parcelListEntity, 1); + }); + } + DistributionParcelListEntity parcelList = new DistributionParcelListEntity(); + parcelList.setId(i.getId()); + parcelList.setConditions(2); + distributionParcelListService.updateById(parcelList); + + }); DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity(); - BeanUtil.copyProperties(i, parcelListEntity); - parcelListEntity.setMaterialName(a.getName()); - parcelListEntity.setMaterialCode(a.getEncoded()); - parcelListEntity.setMaterialUnit(a.getUnit()); + BeanUtil.copyProperties(v.get(0),parcelListEntity); + parcelListEntity.setQuantity(sum); // 添加库存品信息 addStockList(parcelListEntity, 1); }); - } else { - // 添加库存品信息 - addStockList(i, 1); - } - }); + + + +// list1.forEach(i -> { +// //查询包件有没有物料 +// List list = distributionParcelDetailsService.list(Wrappers.query().lambda() +// .eq(DistributionParcelDetailsEntity::getParcelListId, i.getId()) +// ); +// if (list.size() > 0) { +// //有 +// list.forEach(a -> { +// DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity(); +// BeanUtil.copyProperties(i, parcelListEntity); +// parcelListEntity.setMaterialName(a.getName()); +// parcelListEntity.setMaterialCode(a.getEncoded()); +// parcelListEntity.setMaterialUnit(a.getUnit()); +// // 添加库存品信息 +// addStockList(parcelListEntity, 1); +// }); +// } else { +// // 添加库存品信息 +// addStockList(i, 1); +// } +// +// }); String[] split = ids.split(","); for (int i = 0; i < split.length; i++) { //修改订单状态 @@ -305,7 +343,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl listAllocation(IPage page, Map distributionStockList) { + DistributionStockListEntity distributionStockListEntity = JSONObject.parseObject(JSONObject.toJSONString(distributionStockList), DistributionStockListEntity.class); + return baseMapper.listAllocation(page,distributionStockListEntity); + } + // @Override // public R selectInventoryDetail(Map params, IPage page) { // String reservationId = (String) params.get("reservationId");