From 9c8449ee91f8009ffdd56cabfcda28ee9ce869da Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Fri, 20 Oct 2023 10:35:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90?= =?UTF-8?q?=E9=9B=B6=E6=8B=85=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionStockListInfoEntity.java | 2 +- .../DistributionBillLadingAppController.java | 2 +- .../DistributionStockupAppController.java | 33 +++++++++-------- .../DistributionStockArticleController.java | 5 --- .../mapper/DistrilbutionBillLadingMapper.xml | 2 +- .../DistributionStockArticleServiceImpl.java | 3 +- .../impl/DistributionStockServiceImpl.java | 4 ++- .../impl/DistributionStockupServiceImpl.java | 14 +++++--- .../DistrilbutionBillLadingServiceImpl.java | 35 +++++++++++++------ 9 files changed, 62 insertions(+), 38 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListInfoEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListInfoEntity.java index 20848da07..23b1dad84 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListInfoEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListInfoEntity.java @@ -171,7 +171,7 @@ public class DistributionStockListInfoEntity extends TenantEntity { * 在库订单ID */ @ApiModelProperty(value = "在库订单ID") - private String stockArticleId; + private Long stockArticleId; /** * 工厂车次 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java index 004240d09..03e6aaf05 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java @@ -166,7 +166,7 @@ public class DistributionBillLadingAppController extends BladeController { if (ObjectUtils.isNull(billLadingAppDTO.getBillLadingId())) { return R.fail(3002, "自提id不能为空 !"); } - if(billLadingAppDTO.getList().isEmpty()){ + if(ObjectUtils.isNull(billLadingAppDTO.getBillLadingZeroVO())){ return R.fail(3002, "零担数据不能为空 !"); } 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 6208e705d..63655901f 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 @@ -210,17 +210,20 @@ public class DistributionStockupAppController extends BladeController { map = convertObjectToMap(distributionStockupSelfVO); //客户订单 List list = distributionStockupService.selectStockupOrderList(stockupDTO); - List collect = list.stream().filter(i -> { - if (ObjectUtils.isNotNull(i.getTrayId()) && !i.getPallet().contains(",") && !i.isCompleteStact() && ObjectUtils.isNotNull( i.getAllocationId()) ) { - i.setTrayLean(true); + if(!list.isEmpty()){ + List collect = list.stream().filter(i -> { + if (ObjectUtils.isNotNull(i.getTrayId()) && !i.getPallet().contains(",") && !i.isCompleteStact() && ObjectUtils.isNotNull( i.getAllocationId()) ) { + i.setTrayLean(true); + } + return true; + }).collect(Collectors.toList()); + if(collect.isEmpty()){ + map.put("planNum",0); + map.put("scanNum",0); } - return true; - }).collect(Collectors.toList()); - if(collect.isEmpty()){ - map.put("planNum",0); - map.put("scanNum",0); + map.put("orderList", collect); } - map.put("orderList", collect); + } else { //查询备货区信息 DistributionStockupSelfVO distributionStockupSelfVO = distributionStockupService.selectStockupStockListDetails(reservationId); @@ -242,14 +245,16 @@ public class DistributionStockupAppController extends BladeController { //根据list列表统计计划件数 Integer planNum = 0; Integer scanNum = 0; - for (DistributionStockupOrderListVO vo : list) { - planNum = planNum + vo.getPlanNum(); - scanNum = scanNum + vo.getScanNum(); + if(!list.isEmpty()){ + for (DistributionStockupOrderListVO vo : list) { + planNum = planNum + vo.getPlanNum(); + scanNum = scanNum + vo.getScanNum(); // Boolean aBoolean = distributionStockupService.getClientStockupTray(reservationId, vo.getAllocationId()); // Boolean aBoolean = distributionReservationPackageService.selectClientStockupState(reservationId, vo.getStockArticleId()); // vo.setTrayLean(aBoolean); - if (ObjectUtils.isNotNull(vo.getTrayId()) && !vo.getPallet().contains(",") && !vo.isCompleteStact() && ObjectUtils.isNotNull( vo.getAllocationId()) ) { - vo.setTrayLean(true); + if (ObjectUtils.isNotNull(vo.getTrayId()) && !vo.getPallet().contains(",") && !vo.isCompleteStact() && ObjectUtils.isNotNull( vo.getAllocationId()) ) { + vo.setTrayLean(true); + } } } map.put("planNum", planNum); 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 eacc36aff..03f76f312 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 @@ -85,11 +85,6 @@ public class DistributionStockArticleController extends BladeController { // private final IBasicdataWarehouseClient warehouseClient; - final String[] list = new String[]{"10","20","30","40","50","60","70"}; - - - final String[] aaa = new String[]{"10","20","30"}; - /** * 配送在库订单 详情 */ 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 874e3d8f5..43e82413c 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 @@ -127,7 +127,7 @@ from logpm_distribution_parcel_list ldpl left join logpm_distribution_bill_lading_scan ldbls on ldbls.parcel_list_id = ldpl.id and ldbls.is_deleted = 0 - and ldpl.is_deleted = 0 and ldpl.order_package_code is not null + ldpl.is_deleted = 0 and ldpl.order_package_code is not null and ldpl.stock_article_id = #{stockArticleId} and ldpl.order_code = ${orderCode} 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 53497911e..a2b8d7c25 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 @@ -370,7 +370,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl list = distrilbutionBillStockService.selectDistrilbutionBillSelf(reservationId,stockupDTO.getIsZero()); + if(!list.isEmpty() && ObjectUtils.isNull(list.get(0))){ + return new ArrayList<>(); + } //获取有货位的数据 List collect11 = list.stream().filter(o -> ObjectUtils.isNotNull(o.getAllocationId())).collect(Collectors.toList()); Set listYou = new HashSet<>(); @@ -685,11 +688,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list = distributionReservationService.selectStockupOrderList(reservationId,stockupDTO.getIsZero()); + if(!list.isEmpty() && ObjectUtils.isNull(list.get(0))){ + return new ArrayList<>(); + } List collect11 = list.stream().filter(o -> ObjectUtils.isNotNull(o.getAllocationId())).collect(Collectors.toList()); //有货位 Set listYou = new HashSet<>(); // collect11.forEach( p ->{ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index 8bab7dd73..a795365f1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -786,6 +786,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl list1 = distributionZeroPackageService.list(Wrappers.query().lambda() .eq(DistributionReservationZeroPackageEntity::getReservationId, main.getBillLadingId()) .eq(DistributionReservationZeroPackageEntity::getIsDeleted, 0) @@ -1563,6 +1565,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl list = distributionZeroPackageService.list(Wrappers.query().lambda() .eq(DistributionReservationZeroPackageEntity::getReservationId, billLadingAppDTO.getBillLadingId()) @@ -1571,16 +1574,18 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl billLadingZeroOrderVOS = new ArrayList<>(); if(!list.isEmpty()){ + list.stream().collect(Collectors.groupingBy(DistributionReservationZeroPackageEntity::getStockArticleId)). + forEach((k,v) ->{ + int sum = v.stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum(); + int sum1 = v.stream().mapToInt(DistributionReservationZeroPackageEntity::getRealityQuantity).sum(); + DistributionStockArticleEntity byId = distributionStockArticleService.getById(k); + DistrilbutionAppBillLadingZeroOrderVO zeroOrderVO = new DistrilbutionAppBillLadingZeroOrderVO(); + BeanUtils.copyProperties(byId,zeroOrderVO); + zeroOrderVO.setReservationQuantity(sum); + zeroOrderVO.setRealityQuantity(sum1); + billLadingZeroOrderVOS.add(zeroOrderVO); - //查询订单信息 - list.forEach( i ->{ - DistributionStockArticleEntity byId = distributionStockArticleService.getById(i.getStockArticleId()); - DistrilbutionAppBillLadingZeroOrderVO zeroOrderVO = new DistrilbutionAppBillLadingZeroOrderVO(); - BeanUtils.copyProperties(byId,zeroOrderVO); - zeroOrderVO.setReservationQuantity(i.getQuantity()); - zeroOrderVO.setRealityQuantity(i.getRealityQuantity()); - billLadingZeroOrderVOS.add(zeroOrderVO); - }); + }); } return R.data(billLadingZeroOrderVOS); } @@ -1591,6 +1596,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImplquery().lambda() + .eq(DistributionBillLadingScanEntity::getBillLadingId, billLadingAppDTO.getBillLadingId()) + .eq(DistributionBillLadingScanEntity::getParcelListId, i.getId()) + ); + if(ObjectUtils.isNotNull(one1)){ + return Resp.scanFail("当前物料已签收！","当前物料已签收！"); + } + //修改包件签收状态 DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity(); //判断是否大于总件数的数量 From a6fd571ba99337e4c3ffabd4d5f68349d7b0ad26 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 20 Oct 2023 11:15:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E5=90=8C=E6=AD=A5=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=95=B0=E6=8D=AE=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SyncInventoryController.java | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 blade-service/logpm-patch/src/main/java/com/logpm/patch/controller/SyncInventoryController.java diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/controller/SyncInventoryController.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/controller/SyncInventoryController.java new file mode 100644 index 000000000..cd16ee25e --- /dev/null +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/controller/SyncInventoryController.java @@ -0,0 +1,71 @@ +/* + * 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.patch.controller; + +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 库存品条码记录表 控制器 + * + * @author TJJ + * @since 2023-09-04 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/syncInventory") +@Api(value = "库存品条码记录表", tags = "库存品条码记录表接口") +public class SyncInventoryController extends BladeController { + + /** + * 库存品条码记录表 详情 + */ +// @GetMapping("/detail") +// @ApiOperationSupport(order = 1) +// @ApiOperation(value = "详情", notes = "传入disStockListDetail") +// public R detail(DisStockListDetailEntity disStockListDetail) { +// DisStockListDetailEntity detail = disStockListDetailService.getOne(Condition.getQueryWrapper(disStockListDetail)); +// return R.data(detail); +// } + /** + * 库存品条码记录表 分页 + */ +// @GetMapping("/list") +// @ApiOperationSupport(order = 2) +// @ApiOperation(value = "分页", notes = "传入disStockListDetail") +// public R> list(@ApiIgnore @RequestParam Map disStockListDetail, Query query) { +// IPage pages = disStockListDetailService.page(Condition.getPage(query), Condition.getQueryWrapper(disStockListDetail, DisStockListDetailEntity.class)); +// return R.data(pages); +// } + + + + /** + * 库存品条码记录表 新增或修改 + */ +// @PostMapping("/submit") +// @ApiOperationSupport(order = 6) +// @ApiOperation(value = "新增或修改", notes = "传入disStockListDetail") +// public R submit(@Valid @RequestBody DisStockListDetailEntity disStockListDetail) { +// return R.status(disStockListDetailService.saveOrUpdate(disStockListDetail)); +// } + + +}