diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistrilbutionAppBillLadingOrderMainVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistrilbutionAppBillLadingOrderMainVO.java index 85de5eb50..938cd786e 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistrilbutionAppBillLadingOrderMainVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistrilbutionAppBillLadingOrderMainVO.java @@ -35,6 +35,7 @@ public class DistrilbutionAppBillLadingOrderMainVO implements Serializable { private Integer orderNum;//订单总数 private Integer completeNum;//订单总数 private Integer planNum;//自提件数 +// private Integer assembleNum;//库存总数件数 private Integer signedNum;//签收总数 private List list = new ArrayList<>(); diff --git a/blade-service-api/logpm-warehouse-api/pom.xml b/blade-service-api/logpm-warehouse-api/pom.xml index 3d1d13bdd..eb9b2bdce 100644 --- a/blade-service-api/logpm-warehouse-api/pom.xml +++ b/blade-service-api/logpm-warehouse-api/pom.xml @@ -3,6 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + + org.springblade + logpm-distribution-api + 3.1.0.RELEASE + compile + + org.springblade @@ -14,5 +22,5 @@ logpm-warehouse-api 3.1.0.RELEASE - + diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockListEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockListEntity.java index 1f88731fc..5ddff69b7 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockListEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockListEntity.java @@ -18,6 +18,7 @@ package com.logpm.warehouse.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.logpm.distribution.entity.DistributionStockEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseStockClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseStockClient.java index f29cb2094..e262ef479 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseStockClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseStockClient.java @@ -17,6 +17,7 @@ package com.logpm.warehouse.feign; +import com.logpm.distribution.entity.DistributionStockEntity; import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockListVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockListVO.java index 7d9947385..89d42cba7 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockListVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockListVO.java @@ -17,6 +17,7 @@ package com.logpm.warehouse.vo; import com.logpm.distribution.entity.DistributionStockListEntity; +import com.logpm.warehouse.entity.WarehouseStockListEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; 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 aea0c76fc..487010b64 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 @@ -110,11 +110,11 @@ public class DistributionBillLadingAppController extends BladeController { } @ApiOperation(value = "自提扫描id") - @PutMapping("/scan") + @GetMapping("/scan") @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "自提单ID", required = true), @ApiImplicitParam(name = "coding", value = "包条码", required = true), - @ApiImplicitParam(name = "type", value = "类型 4 订单 3 库存品", required = true) + @ApiImplicitParam(name = "type", value = "类型 2 订单 1 库存品", required = true) }) public R getScan(@ApiIgnore @RequestParam Map distrilbutionBillLading){ R scan = distrilbutionBillLadingService.getScan(distrilbutionBillLading); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java index 679957b32..8089f4170 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java @@ -16,6 +16,10 @@ */ package com.logpm.distribution.controller; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.logpm.basic.entity.BasicMaterialEntity; +import com.logpm.basic.feign.IBasicMaterialClient; +import com.logpm.distribution.dto.DistributionParcelListDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -59,6 +63,7 @@ import javax.servlet.http.HttpServletResponse; public class DistributionParcelListController extends BladeController { private final IDistributionParcelListService distributionParcelListService; + private final IBasicMaterialClient basicMaterialClient; /** * 在库订单包件清单 详情 @@ -127,8 +132,20 @@ public class DistributionParcelListController extends BladeController { @PostMapping("/update") @ApiOperationSupport(order = 5) @ApiOperation(value = "修改", notes = "传入distributionParcelList") - public R update(@Valid @RequestBody DistributionParcelListEntity distributionParcelList) { - return R.status(distributionParcelListService.updateById(distributionParcelList)); + public R update(@Valid @RequestBody DistributionParcelListDTO distributionParcelListDTO) { + + if(ObjectUtils.isNotNull(distributionParcelListDTO.getMaterialId())){ + BasicMaterialEntity materialOwnId = basicMaterialClient.getMaterialOwnId(distributionParcelListDTO.getMaterialId()); + if(ObjectUtils.isNotNull(materialOwnId)){ + distributionParcelListDTO.setMaterialCode(materialOwnId.getProductCode()); + distributionParcelListDTO.setMaterialName(materialOwnId.getName()); + distributionParcelListDTO.setMaterialUnit(materialOwnId.getLogpmUnit()); + distributionParcelListDTO.setSku(materialOwnId.getSku()); + }else{ + return R.fail("操作失败！！"); + } + } + return R.status(distributionParcelListService.updateById(distributionParcelListDTO)); } /** diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionParcelListDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionParcelListDTO.java index eb5f0c1ca..38dfd8e9d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionParcelListDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionParcelListDTO.java @@ -31,4 +31,10 @@ import lombok.EqualsAndHashCode; public class DistributionParcelListDTO extends DistributionParcelListEntity { private static final long serialVersionUID = 1L; + private Long materialId; + private String materialName; + private String materialCode; + private String materialUnit; + private String sku; + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml index 9a0764b18..3bbbbe904 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml @@ -44,7 +44,7 @@ where lddd.bill_lading_id = #{id} and lddd.is_deleted = 0 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 078eb4be1..4479c33a4 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 @@ -37,8 +37,11 @@ import com.logpm.distribution.vo.app.DistrilbutionAppBillLadingOrderMainVO; import com.logpm.distribution.vo.app.DistrilbutionAppBillLadingOrderVO; import com.logpm.distribution.vo.app.DistrilbutionBillLadingInventoryAppVO; import lombok.AllArgsConstructor; +import org.springblade.common.constant.order.OrderReservationStatusConstant; +import org.springblade.common.constant.order.OrderStatusConstant; import org.springblade.common.constant.stockup.StockAssignStatusConstant; import org.springblade.common.constant.stockup.StockupStatusConstant; +import org.springblade.common.serviceConstant.ServiceConstant; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; @@ -207,6 +210,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl list = distributionDeliveryDetailsService.list(Wrappers.query().lambda() + .eq(DistributionDeliveryDetailsEntity::getBillLadingId, billLadingId) + ); + //查询是否签收完成 + List list1 = distributionDeliveryDetailsService.list(Wrappers.query().lambda() + .eq(DistributionDeliveryDetailsEntity::getBillLadingId, billLadingId) + ); + if(list1.size() > 0){ + long count = list1.stream().filter(i -> i.getConditions().equals("2")).count(); + signedNum += (int) count; + } + //查询签收件数 + List list2 = distributionBillLadingScanService.list(Wrappers.query().lambda() + .eq(DistributionBillLadingScanEntity::getBillLadingId, billLadingId) + .eq(DistributionBillLadingScanEntity::getMaterialType, "1") + ); + if(list2.size() > 0){ + signedNum += list2.size(); + } + planNum += list.stream().mapToInt( DistributionDeliveryDetailsEntity::getQuantity ).sum(); DistrilbutionAppBillLadingOrderMainVO mainVO = new DistrilbutionAppBillLadingOrderMainVO(); mainVO.setOrderNum(orderNum); mainVO.setPlanNum(planNum); mainVO.setSignedNum(signedNum); mainVO.setCompleteNum(conpleteNum); +// mainVO.setAssembleNum(list.stream().mapToInt( DistributionDeliveryDetailsEntity::getQuantity ).sum()); mainVO.setList(l); return mainVO; } @@ -677,6 +701,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl inventory = baseMapper.getInventory(page, distrilbutionBillLadingEntity); inventory.getRecords().forEach( i ->{ + if(i.getQuantity().equals(i.getDeliveryNum())){ //已备货 List list = distributionBillLadingScanService.list(Wrappers.query().lambda() @@ -686,7 +711,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl distrilbutionBillLading) { Object billLadingId = distrilbutionBillLading.get("id"); //提货ID Object coding = distrilbutionBillLading.get("coding"); //包条码 - Object type = distrilbutionBillLading.get("type"); //类型 4 订单 3 库存品 + Object type = distrilbutionBillLading.get("type"); //类型 2 订单 1 库存品 if(Func.isNull(billLadingId) || Func.isNull(coding ) || Func.isNull(type) ){ return R.fail(3000,"参数不完整,你干啥呢！！"); }else{ @@ -719,7 +745,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl list= distrilbutionBillStockService.list(Wrappers.query().lambda() .eq(DistrilbutionBillStockEntity::getBillLadingId, billLadingId) ); - if(list.size()> 0){ - R.fail(3000,"当前提货任务，订单不存在！"); + if(list.size() < 1){ + return R.fail(3000,"当前提货任务，订单不存在！"); }else{ AtomicBoolean n = new AtomicBoolean(false); list.forEach(so ->{ @@ -792,7 +818,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl