From ab86096a7946e9c98b3131f2374e9dda5ad42570 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 8 Jul 2024 13:45:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E6=BB=9E=E7=95=99=E6=8E=A5=E5=8F=A3=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryListController.java | 18 +++ .../DistributionStockArticleController.java | 113 +++++++++--------- .../mapper/DistrilbutionBillLadingMapper.xml | 2 +- .../IDistributionDeliveryListService.java | 9 +- .../DistributionDeliveryListServiceImpl.java | 16 +++ .../impl/DistributionSignforServiceImpl.java | 1 + 6 files changed, 102 insertions(+), 57 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java index c632b2029..361755503 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java @@ -35,6 +35,8 @@ import com.logpm.distribution.service.IDistributionSignforService; import com.logpm.distribution.vo.*; import com.logpm.distribution.vo.print.PrintPreviewVO; import com.logpm.distribution.wrapper.DistributionDeliveryListWrapper; +import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity; +import com.logpm.warehouse.entity.WarehouseRetentionScanEntity; import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -539,6 +541,22 @@ public class DistributionDeliveryListController extends BladeController { } + @PostMapping("/retentionScan") + @ApiOperationSupport(order = 11) + public R retentionScan(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) { + R r = distributionDeliveryListService.retentionScan(distrilbutionloadingscanDTO); + return r; + } + + @PostMapping("/retentionSave") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "PC取消配送任务") + public R retentionSave(@Valid @RequestBody WarehouseRetentionScanEntity warehouseRetentionScanEntity) { + R r = distributionDeliveryListService.retentionSave(warehouseRetentionScanEntity); + return r; + } + + /** * 导出数据 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java index 17ea78f67..7ed5051a6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java @@ -36,6 +36,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; @@ -98,6 +99,7 @@ public class DistributionStockArticleController extends BladeController { DistributionStockArticleEntity detail = distributionStockArticleService.getOne(Condition.getQueryWrapper(distributionStockArticle)); return R.data(detail); } + /** * 配送在库订单 分页 */ @@ -150,8 +152,8 @@ public class DistributionStockArticleController extends BladeController { @GetMapping("/getPackageListByStockArticleId") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入distributionStockArticle") - public R> getPackageListByStockArticleId(@ApiIgnore @RequestParam Map packageDTO, Query query) { - if (Func.isEmpty(packageDTO.get("id"))){ + public R> getPackageListByStockArticleId(@ApiIgnore @RequestParam Map packageDTO, Query query) { + if (Func.isEmpty(packageDTO.get("id"))) { return null; } IPage pages = distributionStockArticleService.getPackageListByStockArticleId(Condition.getPage(query), packageDTO); @@ -171,9 +173,6 @@ public class DistributionStockArticleController extends BladeController { } - - - // BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); // if (Func.isEmpty(myCurrentWarehouse)){ // return R.fail("无仓库信息!!!"); @@ -262,14 +261,13 @@ public class DistributionStockArticleController extends BladeController { // } - /** * 配送在库订单--客户版本 分页 */ @GetMapping("/clientList") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入distributionStockArticle") - public R> clientList(@ApiIgnore DistributionStockArticleVO distributionStockArticle, Query query) { + public R> clientList(@ApiIgnore DistributionStockArticleVO distributionStockArticle, Query query) { // BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); // if (Func.isEmpty(myCurrentWarehouse)){ // return R.fail("无仓库信息!!!"); @@ -282,20 +280,18 @@ public class DistributionStockArticleController extends BladeController { // distributionStockArticle.setWarehouseIdList(collect); // 得到当前登录用户的Id List basicdataClientUserEntityListByUserIds = basicdataClientClient.getBasicdataClientUserEntityListByUserId(AuthUtil.getUserId()); - List clientIds =null; - if(Func.isNotEmpty(basicdataClientUserEntityListByUserIds)){ + List clientIds = null; + if (Func.isNotEmpty(basicdataClientUserEntityListByUserIds)) { clientIds = basicdataClientUserEntityListByUserIds.stream().map(BasicdataClientUserEntity::getClientId).collect(Collectors.toList()); distributionStockArticle.setClientIds(clientIds); - }else { + } else { return null; } - IPage pages = distributionStockArticleService.selectClientListPage(Condition.getPage(query), distributionStockArticle); + IPage pages = distributionStockArticleService.selectClientListPage(Condition.getPage(query), distributionStockArticle); return R.data(DistributionStockArticleWrapper.build().pageVO(pages)); } - - /** * 配送在库订单 自定义分页 */ @@ -354,22 +350,25 @@ public class DistributionStockArticleController extends BladeController { public R updateClient(@Valid @RequestBody DistributionStockArticleEntity distributionStockArticle) { Long id = distributionStockArticle.getId(); DistributionStockArticleEntity oldStockArticle = distributionStockArticleService.getById(id); + if (!OrderPackageReservationStatusConstant.daiyuyue.getValue().equals(oldStockArticle)) { + return R.fail(oldStockArticle.getOrderCode() + "存在预约信息"); + } DistributionStockArticleEntity newStockArticle = new DistributionStockArticleEntity(); - BeanUtil.copy(oldStockArticle,newStockArticle); + BeanUtil.copy(oldStockArticle, newStockArticle); String consigneePerson = distributionStockArticle.getConsigneePerson(); String customerName = distributionStockArticle.getCustomerName(); - if(StringUtil.isNotBlank(consigneePerson)){ + if (StringUtil.isNotBlank(consigneePerson)) { newStockArticle.setConsigneePerson(consigneePerson); newStockArticle.setConsigneeMobile(distributionStockArticle.getConsigneeMobile()); newStockArticle.setConsigneeAddress(distributionStockArticle.getConsigneeAddress()); - }else{ + } else { newStockArticle.setCustomerName(customerName); newStockArticle.setCustomerTelephone(distributionStockArticle.getCustomerTelephone()); newStockArticle.setCustomerAddress(distributionStockArticle.getCustomerAddress()); } String content = oldStockArticle.compareCustomerInfo(newStockArticle); - if(StringUtil.isNotBlank(content)){ - distributionOrderCustomerLogService.saveLog(content,1,id); + if (StringUtil.isNotBlank(content)) { + distributionOrderCustomerLogService.saveLog(content, 1, id); } return R.status(distributionStockArticleService.updateById(distributionStockArticle)); } @@ -379,30 +378,37 @@ public class DistributionStockArticleController extends BladeController { @ApiOperation(value = "修改", notes = "传入distributionStockArticle") public R updateBatchClient(@Valid @RequestBody DistributionStockArticleDTO distributionStockArticleDTO) { List entityList = distributionStockArticleDTO.getEntityList(); + if (!entityList.isEmpty()) { + boolean flag = entityList.stream().anyMatch(a -> !OrderPackageReservationStatusConstant.daiyuyue.getValue().equals(a.getReservationStatus())); + if (flag) { + String orderCode = entityList.stream().filter(f -> !OrderPackageReservationStatusConstant.daiyuyue.getValue().equals(f.getReservationStatus())).map(DistributionStockArticleEntity::getOrderCode).distinct().collect(Collectors.joining(",")); + return R.fail(orderCode + "存在预约信息"); + } + } for (DistributionStockArticleEntity stockArticleEntity : entityList) { Long id = stockArticleEntity.getId(); DistributionStockArticleEntity oldStockArticle = distributionStockArticleService.getById(id); DistributionStockArticleEntity newStockArticle = new DistributionStockArticleEntity(); - BeanUtil.copy(oldStockArticle,newStockArticle); + BeanUtil.copy(oldStockArticle, newStockArticle); String consigneePerson = stockArticleEntity.getConsigneePerson(); String customerName = stockArticleEntity.getCustomerName(); String mallName = stockArticleEntity.getMallName(); String consigneeUnit = stockArticleEntity.getConsigneeUnit(); - if(StringUtil.isNotBlank(consigneePerson)){ + if (StringUtil.isNotBlank(consigneePerson)) { newStockArticle.setConsigneePerson(consigneePerson); newStockArticle.setConsigneeMobile(stockArticleEntity.getConsigneeMobile()); newStockArticle.setConsigneeAddress(stockArticleEntity.getConsigneeAddress()); - }else if (StringUtil.isNotBlank(customerName)){ + } else if (StringUtil.isNotBlank(customerName)) { newStockArticle.setCustomerName(customerName); newStockArticle.setCustomerTelephone(stockArticleEntity.getCustomerTelephone()); newStockArticle.setCustomerAddress(stockArticleEntity.getCustomerAddress()); - }else { + } else { newStockArticle.setMallName(mallName); newStockArticle.setConsigneeUnit(consigneeUnit); } String content = oldStockArticle.compareCustomerInfo(newStockArticle); - if(StringUtil.isNotBlank(content)){ - distributionOrderCustomerLogService.saveLog(content,2,id); + if (StringUtil.isNotBlank(content)) { + distributionOrderCustomerLogService.saveLog(content, 2, id); } } @@ -414,9 +420,9 @@ public class DistributionStockArticleController extends BladeController { @ApiOperation(value = "修改客户信息日志", notes = "传入distributionStockArticle") public R findEditCustomerLog(@Valid @RequestBody DistributionStockArticleDTO distributionStockArticleDTO) { Long orderId = distributionStockArticleDTO.getOrderId(); - if(Objects.isNull(orderId)){ - log.warn("##############findEditCustomerLog: 订单id不能为空 orderId={}",orderId); - return R.fail(405,"订单id不能为空"); + if (Objects.isNull(orderId)) { + log.warn("##############findEditCustomerLog: 订单id不能为空 orderId={}", orderId); + return R.fail(405, "订单id不能为空"); } return distributionStockArticleService.findEditCustomerLog(orderId); } @@ -483,11 +489,11 @@ public class DistributionStockArticleController extends BladeController { @GetMapping("/selectStockArticleAndParcel") @ApiOperationSupport(order = 7) @ApiOperation(value = "查询订单和订单的包件信息", notes = "传入ids") - public R selectStockArticleAndParcel(@RequestParam(required = false) String typeService,@RequestParam(required = false) String genre,@RequestParam(required = false)String id) { + public R selectStockArticleAndParcel(@RequestParam(required = false) String typeService, @RequestParam(required = false) String genre, @RequestParam(required = false) String id) { HashMap query = new HashMap<>(); - query.put("typeService",typeService); - query.put("genre",genre); - query.put("id",id); + query.put("typeService", typeService); + query.put("genre", genre); + query.put("id", id); R> result = distributionStockArticleService.selectStockArticleAndParcel(query); return result; } @@ -499,20 +505,20 @@ public class DistributionStockArticleController extends BladeController { @GetMapping("/getShowTemplate") @ApiOperationSupport(order = 2) @ApiOperation(value = "生成二维码图片返回前端渲染") - public void getShowTemplate(@ApiIgnore @RequestParam Map params,HttpServletResponse response) throws IllegalAccessException { + public void getShowTemplate(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws IllegalAccessException { // boolean result = basicdataGoodsShelfService.getTemplate(params,response); - distributionStockArticleService.getShowTemplate(params,response); + distributionStockArticleService.getShowTemplate(params, response); } @GetMapping("/showOrderPackgeCode") @ApiOperationSupport(order = 2) @ApiOperation(value = "返回模板和模板内容") - public R showOrderPackgeCode(@ApiIgnore @RequestParam Map params){ + public R showOrderPackgeCode(@ApiIgnore @RequestParam Map params) { - OrderPackgeCodeDataVO orderPackgeCodeDataVo= null; + OrderPackgeCodeDataVO orderPackgeCodeDataVo = null; try { - orderPackgeCodeDataVo = distributionStockArticleService.showOrderPackgeCode(params ); + orderPackgeCodeDataVo = distributionStockArticleService.showOrderPackgeCode(params); } catch (Exception e) { return R.fail(e.getMessage()); } @@ -528,9 +534,9 @@ public class DistributionStockArticleController extends BladeController { @ApiOperationSupport(order = 12) @ApiOperation(value = "导入物料基础信息", notes = "传入excel") public R importStockArticleEntry(MultipartFile file) { - log.info("传入>>>>>>>{}",file); + log.info("传入>>>>>>>{}", file); DistributionStockArticleImporter materialImporter = new DistributionStockArticleImporter(distributionStockArticleService); - ExcelUtil.save(file,materialImporter,DistributionStockArticleExcel.class); + ExcelUtil.save(file, materialImporter, DistributionStockArticleExcel.class); return R.success("操作成功"); } @@ -541,19 +547,18 @@ public class DistributionStockArticleController extends BladeController { @GetMapping("deliveryInfo") @ApiOperationSupport(order = 12) @ApiOperation(value = "导入物料基础信息", notes = "传入excel") - public R getdeliveryInfo(@RequestParam Integer type,@RequestParam String code) { + public R getdeliveryInfo(@RequestParam Integer type, @RequestParam String code) { - return distributionStockArticleService.getdeliveryInfo(type,code); + return distributionStockArticleService.getdeliveryInfo(type, code); } - @GetMapping("/showOrderCode") @ApiOperationSupport(order = 2) @ApiOperation(value = "展示订单码") - public R showOrderCode(@ApiIgnore @RequestParam Map params){ + public R showOrderCode(@ApiIgnore @RequestParam Map params) { - OrderCodeDataVO orderCodeDataVO= null; + OrderCodeDataVO orderCodeDataVO = null; try { orderCodeDataVO = distributionStockArticleService.showOrderCode(params); } catch (Exception e) { @@ -567,16 +572,16 @@ public class DistributionStockArticleController extends BladeController { @GetMapping("/showOrderCodeByCode") @ApiOperationSupport(order = 2) @ApiOperation(value = "展示订单码") - public R showOrderCodeByCode(@ApiIgnore @RequestParam Map params){ + public R showOrderCodeByCode(@ApiIgnore @RequestParam Map params) { - OrderCodeDataVO orderCodeDataVO= null; + OrderCodeDataVO orderCodeDataVO = null; try { BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ + if (Objects.isNull(myCurrentWarehouse)) { log.warn("##########showOrderCodeByCode: 仓库信息不存在"); - return R.fail(405,"仓库信息不存在"); + return R.fail(405, "仓库信息不存在"); } - params.put("warehouseId",myCurrentWarehouse.getId()); + params.put("warehouseId", myCurrentWarehouse.getId()); orderCodeDataVO = distributionStockArticleService.showOrderCodeByCode(params); } catch (Exception e) { @@ -587,8 +592,6 @@ public class DistributionStockArticleController extends BladeController { } - - /** * 已签收订单 */ @@ -600,10 +603,10 @@ public class DistributionStockArticleController extends BladeController { IPage pages = distributionStockArticleService.pageSignforListtOwe(Condition.getPage(query), distributionStockArticle); return R.data(pages); - }catch (Exception e){ - log.error("已签订单错误e:{}",e); + } catch (Exception e) { + log.error("已签订单错误e:{}", e); } - return R.data(null); + return R.data(null); } @@ -625,8 +628,8 @@ public class DistributionStockArticleController extends BladeController { @GetMapping("/export-signforDistributionStockArticleList") @ApiOperationSupport(order = 2) @ApiOperation(value = "已签收订单 导出", notes = "传入distributionStockArticle") - public void exportSignforDistributionStockArticleList(@ApiIgnore @RequestParam Map distributionStockArticle, Query query,HttpServletResponse response) { - List list = distributionStockArticleService.exportSignforDistributionStockArticleList(distributionStockArticle,Condition.getPage(query)); + public void exportSignforDistributionStockArticleList(@ApiIgnore @RequestParam Map distributionStockArticle, Query query, HttpServletResponse response) { + List list = distributionStockArticleService.exportSignforDistributionStockArticleList(distributionStockArticle, Condition.getPage(query)); ExcelUtil.export(response, "在库订单明细" + DateUtil.time(), "在库订单明细", list, DistributionSignForStockArticleExcel.class); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml index e91c7b1c4..80ec6dd2f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml @@ -929,7 +929,7 @@ LEFT JOIN logpm_distrilbution_bill_lading AS ldbl ON ldbls.bill_lading_id = ldbl.id AND ldbl.is_deleted = 0 LEFT JOIN logpm_distribution_stock_article AS ldsa ON ldbls.stock_article_id = ldsa.id AND ldsa.is_deleted = 0 LEFT JOIN logpm_warehouse_warehouse AS lww ON ldbl.warehouse_id = lww.id - LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldbls.parce_list_id = ldpl.id + LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldbls.parcel_list_id = ldpl.id WHERE bill_lading_id = #{id} AND ldbls.is_deleted = 0 AND ldbls.scan_type = 1 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java index cf7f57ef1..87cfc2746 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java @@ -31,6 +31,8 @@ import com.logpm.distribution.excel.DistributionDeliveryListExcel; import com.logpm.distribution.vo.*; import com.logpm.distribution.vo.app.*; import com.logpm.distribution.vo.print.PrintPreviewVO; +import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity; +import com.logpm.warehouse.entity.WarehouseRetentionScanEntity; import org.springblade.core.mp.base.BaseService; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -461,7 +463,12 @@ public interface IDistributionDeliveryListService extends BaseService Date: Mon, 8 Jul 2024 13:59:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=BB=9E=E7=95=99=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=AF=AD=E9=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionDeliveryListServiceImpl.java | 2 +- .../service/impl/DistributionSignforServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 d83b6d329..c8cbcbba2 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 @@ -690,7 +690,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl