diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationZeroPackageEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationZeroPackageEntity.java index 06939aeaa..6fead3e88 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationZeroPackageEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationZeroPackageEntity.java @@ -66,15 +66,21 @@ public class DistributionReservationZeroPackageEntity extends TenantEntity { */ @ApiModelProperty(value = "订单ID") private Long stockArticleId; + + /** + * 包件ID + */ + @ApiModelProperty(value = "包件ID") + private Long parcelListId; /** * 数量 */ @ApiModelProperty(value = "数量") private Integer quantity; /** - * 数量 + * 备货数量 */ - @ApiModelProperty(value = "数量") + @ApiModelProperty(value = "备货数量") private Integer realityQuantity; /** * 预约ID diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockEntity.java index 07f4a88ac..87afb70ee 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockEntity.java @@ -106,6 +106,11 @@ public class DistributionStockEntity extends TenantEntity { */ @ApiModelProperty(value = "拆包数") private Integer unpackingQuantity; + /** + * 备货数 + */ + @ApiModelProperty(value = "备货数") + private Integer stockQuantity; /** * 包件id */ diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TrayTypeDataListVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TrayTypeDataListVO.java index 7d87669ac..e25f2bb8e 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TrayTypeDataListVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TrayTypeDataListVO.java @@ -22,6 +22,7 @@ public class TrayTypeDataListVO implements Serializable { private Integer isFleeing;//是否串货 1是0否 private Integer orderTotalNum;//订单总件数 + private Integer residueNum;//剩余件数 private List positionList = new ArrayList<>(); diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsVO.java index e3b75c029..3c473d9c0 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsVO.java @@ -11,4 +11,7 @@ public class WarehouseUpdownGoodsVO extends WarehouseUpdownGoodsEntity { private String orderCode; private String waybillNumber; + private String warehouseName; + private String materialName; + } 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 3400d170b..6f9e6efa0 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 @@ -412,9 +412,9 @@ public class DistributionStockupAppController extends BladeController { if (ObjectUtils.isNull(stockupDTO.getTypeService())) { return R.fail(3002, "备货业务类型不能为空 !"); } - if (ObjectUtils.isNull(stockupDTO.getAllocationId())) { +/* if (ObjectUtils.isNull(stockupDTO.getAllocationId())) { return R.fail(3002, "库位信息不能为空 !"); - } + }*/ R b = distributionStockupService.zeroStockUp(stockupDTO); return b; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationZeroPackageController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationZeroPackageController.java index ed475d230..4fcaf6a27 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationZeroPackageController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationZeroPackageController.java @@ -69,6 +69,17 @@ public class DistributionReservationZeroPackageController extends BladeControlle DistributionReservationZeroPackageEntity detail = distributionReservationZeroPackageService.getOne(Condition.getQueryWrapper(distributionReservationZeroPackage)); return R.data(DistributionReservationZeroPackageWrapper.build().entityVO(detail)); } + + /** + * 预约零担包件中间表 查询预约的品类信息 + */ + @GetMapping("/ownZeroPackage") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "查询预约的品类信息", notes = "传入distributionReservationZeroPackage") + public R> ownZeroPackage(DistributionReservationZeroPackageEntity distributionReservationZeroPackage) { + List list = distributionReservationZeroPackageService.list(Condition.getQueryWrapper(distributionReservationZeroPackage)); + return R.data(list); + } /** * 预约零担包件中间表 分页 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockArticleExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockArticleExcel.java index 76130f046..2438c4892 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockArticleExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockArticleExcel.java @@ -167,6 +167,12 @@ public class DistributionStockArticleExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("顾客名字") private String customerName; + /** + * 运单号 + */ + @ColumnWidth(20) + @ExcelProperty("运单号") + private String waybillNumber; /** * 顾客电话 */ @@ -179,6 +185,18 @@ public class DistributionStockArticleExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("顾客地址") private String customerAddress; + /** + * 收货人 + */ + @ColumnWidth(20) + @ExcelProperty("收货人") + private String consigneePerson; + /** + * 收货单位 + */ + @ColumnWidth(20) + @ExcelProperty("收货单位") + private String consigneeUnit; /** * 类型;1 预约单 2库存单 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelNumberService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelNumberService.java index d4cab9557..01840e56b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelNumberService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelNumberService.java @@ -49,4 +49,9 @@ public interface IDistributionParcelNumberService extends BaseService exportDistributionParcelNumber(Wrapper queryWrapper); + /** + * 修改配送数量 + */ + void updateBillNum(Long parcelListId, int i1, int i); + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index db055e845..7463d6919 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -845,12 +845,15 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { @Override public void stockZero(StockupZeroDTO stockupDTO) { log.debug("修改备货数据》》》",stockupDTO); - - List list = reservationZeroPackageService.list(Wrappers.query().lambda() - .eq(ObjectUtils.isNotNull(stockupDTO.getStockArticleId()), DistributionReservationZeroPackageEntity::getStockArticleId, stockupDTO.getStockArticleId()) - .in(ObjectUtils.isNotNull(stockupDTO.getStockArticleIdList()), DistributionReservationZeroPackageEntity::getStockArticleId, stockupDTO.getStockArticleIdList()) - .eq(DistributionReservationZeroPackageEntity::getReservationId, stockupDTO.getReservationId()) - ); + QueryWrapper queryWrapper = new QueryWrapper(); + if(ObjectUtils.isNotNull(stockupDTO.getStockArticleId())){ + queryWrapper.eq("stock_article_id",stockupDTO.getStockArticleId()); + } + if(stockupDTO.getStockArticleIdList() != null && !stockupDTO.getStockArticleIdList().equals(null)){ + queryWrapper.in("stock_article_id",stockupDTO.getStockArticleIdList()); + } + queryWrapper.eq("reservation_id",stockupDTO.getReservationId()); + List list = reservationZeroPackageService.list(queryWrapper); AtomicBoolean pian = new AtomicBoolean(true); DistributionStockupEntity stockupEntity = new DistributionStockupEntity(); list.stream().forEach(i -> { diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelNumberServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelNumberServiceImpl.java index dd1b5d613..0aa39e9b9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelNumberServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelNumberServiceImpl.java @@ -16,11 +16,13 @@ */ package com.logpm.distribution.service.impl; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.distribution.entity.DistributionParcelNumberEntity; import com.logpm.distribution.vo.DistributionParcelNumberVO; import com.logpm.distribution.excel.DistributionParcelNumberExcel; import com.logpm.distribution.mapper.DistributionParcelNumberMapper; import com.logpm.distribution.service.IDistributionParcelNumberService; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -51,4 +53,28 @@ public class DistributionParcelNumberServiceImpl extends BaseServiceImplquery().lambda().eq(DistributionParcelNumberEntity::getParcelListId, parcelListId)); + DistributionParcelNumberEntity parcelEntity = new DistributionParcelNumberEntity(); + switch (i){ + case 1: + //减 + parcelEntity.setId(parcelNumberEntity.getId()); + parcelEntity.setDeliveryQuantity(parcelNumberEntity.getDeliveryQuantity() - i1); + case 2: + //加 + parcelEntity.setId(parcelNumberEntity.getId()); + parcelEntity.setDeliveryQuantity(parcelNumberEntity.getDeliveryQuantity() + i1); + } + baseMapper.updateById(parcelEntity); + } + } 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 8f182e531..d8dbbb21c 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 @@ -50,7 +50,6 @@ import com.logpm.distribution.wrapper.DistributionStockArticleWrapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.DictBizConstant; -import org.springblade.common.constant.orderpackage.OrderPackageFreezeStatusConstant; import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant; import org.springblade.common.utils.CommonUtil; import org.springblade.common.utils.FileUtil; @@ -81,7 +80,6 @@ import java.io.IOException; import java.util.*; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.function.Function; import java.util.stream.Collectors; /** @@ -978,6 +976,10 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl> distriType = dictBizClient.getList("distribution_type"); if(ObjectUtils.isNotNull(distriType)){ List data1 = distriType.getData(); @@ -1037,7 +1039,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.like("order_code",orderCode) + queryWrapper.eq("order_code",orderCode) .eq("warehouse_id",warehouseId) .eq("is_zero",1) .eq("is_deleted",0); @@ -1047,7 +1049,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.like("order_code",orderCode) + queryWrapper.eq("order_code",orderCode) .eq("warehouse_id",warehouseId) // .eq("is_zero",1) .eq("is_deleted",0); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 17740ccc4..fa67d95e4 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -1981,6 +1981,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl printEntityList = distributionPrintService.list(Wrappers.query().lambda().eq(DistributionPrintEntity::getBillLadingId, distrilbutionBillLading.getId())); if (!printEntityList.isEmpty()) { @@ -370,6 +374,88 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl list = distributionZeroPackageService.list(Wrappers.query().lambda() + .eq(DistributionReservationZeroPackageEntity::getReservationId, distrilbutionBillLadingDTO.getId()) + ); //数据库的品分类数据 + List parcelLisList = distrilbutionBillLadingDTO.getParcelLisList();//品类信息 + if(!list.isEmpty()){ + List longs = new ArrayList<>(); + //存在的 + list.forEach(i ->{ + boolean b = parcelLisList.stream().anyMatch(ii -> ii.getId().equals(i.getParcelListId())); + if(b){ + //有数据 + Iterator iterator = parcelLisList.iterator(); + while (iterator.hasNext()){ + DistributionParcelListDTO next = iterator.next(); + if(next.getId().equals(i.getParcelListId())){ + if(i.getRealityQuantity() > 0){ + throw new ServiceException("已备货无法修改备货数量！"); + } + //获取修改的数量 + Integer quantity = i.getQuantity();//原预约数量 + Integer quantity1 = next.getQuantity();//改变的数量 + int i1 = quantity - quantity1; + if(i1 > 0 ){ + //减少了 + distributionParcelNumberService.updateBillNum(i.getParcelListId(),i1,1); + }else if(i1 < 0){ + //增加了 + distributionParcelNumberService.updateBillNum(i.getParcelListId(),i1,2); + }else if(i1 == 0){ + //不做操作！ + continue; + } + //修改预约数量 + DistributionReservationZeroPackageEntity zeroPackage = new DistributionReservationZeroPackageEntity(); + zeroPackage.setId(i.getId()); + zeroPackage.setQuantity(next.getQuantity()); + distributionZeroPackageService.updateById(zeroPackage); + iterator.remove(); + } + } + }else{ + //不存在 + longs.add(i.getId()); + + } + }); + if(!longs.isEmpty()){ + distributionZeroPackageService.deleteLogic(longs); + } + // TODo 添加新的品类 + List packageEntityList = new ArrayList<>(); + parcelLisList.forEach( w ->{ + DistributionReservationZeroPackageEntity zeroPackageEntity = new DistributionReservationZeroPackageEntity(); + zeroPackageEntity.setParcelListId(w.getId()); + zeroPackageEntity.setStockArticleId(w.getStockArticleId()); + zeroPackageEntity.setReservationId(distrilbutionBillLadingDTO.getId()); + zeroPackageEntity.setQuantity(w.getQuantity()); + zeroPackageEntity.setZeroPackageStatus("3"); + zeroPackageEntity.setCategoryName(w.getFirsts()); + zeroPackageEntity.setType("3"); + zeroPackageEntity.setRealityQuantity(0); + packageEntityList.add(zeroPackageEntity); + }); + if(!packageEntityList.isEmpty()){ distributionZeroPackageService.saveBatch(packageEntityList); } + + }else{ + log.warn("没有品类数据"); + return 0; + } + + return 1; + } + + + + /** * 修改操作订单数据 * @@ -469,9 +555,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl list = distributionDeliveryChargeService.list(Wrappers.query().lambda() .eq(DistributionDeliveryChargeEntity::getBillLading, i.getId()) ); - list.forEach(ii -> { - ii.setCostName(DictBizCache.getValue(DictBizConstant.DELIVERY_COST, ii.getCost())); - }); + list.forEach(ii -> ii.setCostName(DictBizCache.getValue(DictBizConstant.DELIVERY_COST, ii.getCost()))); i.setList(list); }); distrilbutionBillLadingVOIPage.setRecords(records); @@ -1203,27 +1287,47 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl zeroPackageEntityList = new ArrayList<>(); + List parcelNumberEntityList = new ArrayList<>(); + AtomicInteger nu = new AtomicInteger(); //是 添加物料信息 list.forEach(i -> { - DistributionReservationZeroPackageEntity zeroPackageEntity = new DistributionReservationZeroPackageEntity(); - zeroPackageEntity.setQuantity(i.getQuantity()); - zeroPackageEntity.setReservationId(distrilbutionBillLading.getId()); - zeroPackageEntity.setType("3"); - zeroPackageEntity.setCategoryName(i.getFirsts()); - zeroPackageEntity.setZeroPackageStatus("1"); - zeroPackageEntity.setStockArticleId(i.getStockArticleId()); - zeroPackageEntity.setRealityQuantity(0); - //修改包件配送数量 - //查询 - DistributionParcelNumberEntity one = distributionParcelNumberService.getOne(Wrappers.query().lambda().eq(DistributionParcelNumberEntity::getParcelListId, i.getId())); - if(ObjectUtils.isNotNull(one)) { - DistributionParcelNumberEntity parcelNumberEntity = new DistributionParcelNumberEntity(); - parcelNumberEntity.setId(one.getId()); - parcelNumberEntity.setDeliveryQuantity(one.getDeliveryQuantity()+i.getQuantity()); - distributionParcelNumberService.updateById(parcelNumberEntity); + if(i.getQuantity() != 0){ + DistributionReservationZeroPackageEntity zeroPackageEntity = new DistributionReservationZeroPackageEntity(); + zeroPackageEntity.setQuantity(i.getQuantity()); + zeroPackageEntity.setReservationId(distrilbutionBillLading.getId()); + zeroPackageEntity.setType("3"); + zeroPackageEntity.setCategoryName(i.getFirsts()); + zeroPackageEntity.setZeroPackageStatus("1"); + zeroPackageEntity.setStockArticleId(i.getStockArticleId()); + zeroPackageEntity.setRealityQuantity(0); + //修改包件配送数量 + //查询 + DistributionStockArticleEntity byId = distributionStockArticleService.getById(i.getStockArticleId()); + DistributionParcelNumberEntity one = distributionParcelNumberService.getOne(Wrappers.query().lambda().eq(DistributionParcelNumberEntity::getParcelListId, i.getId())); + if(ObjectUtils.isNotNull(one)) { + nu.addAndGet(i.getQuantity()); + DistributionParcelNumberEntity parcelNumberEntity = new DistributionParcelNumberEntity(); + parcelNumberEntity.setId(one.getId()); + parcelNumberEntity.setDeliveryQuantity(one.getDeliveryQuantity()+i.getQuantity()); + parcelNumberEntity.setHandQuantity(byId.getHandQuantity()); + parcelNumberEntityList.add(parcelNumberEntity); + zeroPackageEntity.setParcelListId(one.getParcelListId()); + } + zeroPackageEntityList.add(zeroPackageEntity); } - zeroPackageEntityList.add(zeroPackageEntity); }); + if(!parcelNumberEntityList.isEmpty()){ + parcelNumberEntityList.forEach( p ->{ + if(nu.get() <= p.getHandQuantity()){ + p.setHandQuantity(null); + distributionParcelNumberService.updateById(p); + }else{ + throw new ServiceException("预约数量大于在库数量！！"); + } + }); + }else{ + throw new ServiceException("数据异常，请联系管理员！！"); + } distributionZeroPackageService.saveBatch(zeroPackageEntityList); } // 创建备货任务 diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java index 82e7c8689..a0a5f8693 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java @@ -82,7 +82,7 @@ public interface WarehouseUpdownGoodsMapper extends BaseMapper getUpdownGoodsByStock(@Param("marketId") Long marketId, @Param("materialCode") String materialCode, @Param("incomingBatch") String incomingBatch,@Param("warehouseId") Long warehouseId); - List findUpdownStockByMaterialName(@Param("materialName") String materialName, @Param("marketId") Long marketId,@Param("warehouseId") Long warehouseId); + List findUpdownStockByMaterialName(@Param("materialName") String materialName, @Param("marketId") Long marketId,@Param("warehouseId") Long warehouseId); List getZeroOrderList(@Param("orderCode") String orderCode,@Param("warehouseId") Long warehouseId); @@ -94,6 +94,8 @@ public interface WarehouseUpdownGoodsMapper extends BaseMapper findUpdownStockByMaterialCode(@Param("materialCode") String materialCode, @Param("marketId") Long marketId, @Param("warehouseId") Long warehouseId); + // /** // * 根据货位查询货物 diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml index dea5050fd..4ea07e0c8 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml @@ -236,8 +236,10 @@ and lwug.warehouse_id = #{warehouseId} - + select lwug.*, + ldsl.description_goods materialName, + ldsl.warehouse_name warehouseName from logpm_warehouse_updown_goods lwug left join logpm_distribution_stock_list ldsl on ldsl.market_id = lwug.market_id and ldsl.incoming_batch = lwug.incoming_batch and ldsl.material_id = lwug.association_id and lwug.is_deleted = 0 where ldsl.description_goods like concat('%',#{materialName},'%') @@ -282,4 +284,15 @@ + + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java index 73e54bd7d..a3c95792b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java @@ -117,7 +117,7 @@ public interface IWarehouseUpdownGoodsService extends BaseService getUpdownGoodsByStock(Long marketId, String materialCode, String incomingBatch,Long warehouseId); - List findUpdownStockByMaterialName(String materialName, Long marketId,Long warehouseId); + List findUpdownStockByMaterialName(String materialName, Long marketId,Long warehouseId); List getZeroOrderList(String orderCode,Long warehouseId); @@ -128,4 +128,6 @@ public interface IWarehouseUpdownGoodsService extends BaseService findUpdownStockByMaterialCode(String materialCode, Long marketId, Long warehouseId); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java index 129a796a5..d0919a2b9 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java @@ -693,15 +693,17 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl updownGoodsEntities = warehouseUpdownGoodsService.getUpdownGoodsByZeroOrderId(orderId,warehouseId); List trayGoodsEntities = warehouseTrayGoodsService.getTrayGoodsByZeroOrderIdNoAllocationId(orderId,warehouseId); updownGoodsEntities.addAll(trayGoodsEntities); for (PositionVO positionVO:updownGoodsEntities){ Integer num = positionVO.getNum(); - orderTotalNum = orderTotalNum - num; + residueNum = residueNum - num; } trayTypeDataListVO.setOrderTotalNum(orderTotalNum); + trayTypeDataListVO.setResidueNum(residueNum); trayTypeDataListVO.setPositionList(updownGoodsEntities); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java index 750e7dacc..ab7a3bf56 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java @@ -195,7 +195,7 @@ public class WarehouseUpdownGoodsServiceImpl extends BaseServiceImpl findUpdownStockByMaterialName(String materialName, Long marketId,Long warehouseId) { + public List findUpdownStockByMaterialName(String materialName, Long marketId,Long warehouseId) { return baseMapper.findUpdownStockByMaterialName(materialName,marketId,warehouseId); } @@ -224,4 +224,9 @@ public class WarehouseUpdownGoodsServiceImpl extends BaseServiceImpl findUpdownStockByMaterialCode(String materialCode, Long marketId, Long warehouseId) { + return baseMapper.findUpdownStockByMaterialCode(materialCode,marketId,warehouseId); + } + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java index 167778b6a..d0b926aff 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java @@ -1129,16 +1129,16 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.like("association_value",materialCode) - .eq("warehouse_id",warehouseId) - .eq("market_id",marketId); - List list = warehouseUpdownGoodsService.list(queryWrapper); +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// queryWrapper.like("association_value",materialCode) +// .eq("warehouse_id",warehouseId) +// .eq("market_id",marketId); + List list = warehouseUpdownGoodsService.findUpdownStockByMaterialCode(materialCode,marketId,warehouseId); return R.data(list); }else if (2==stockType){ //2物料名称 String materialName = code; - List list = warehouseUpdownGoodsService.findUpdownStockByMaterialName(materialName,marketId,warehouseId); + List list = warehouseUpdownGoodsService.findUpdownStockByMaterialName(materialName,marketId,warehouseId); return R.data(list); }else{ log.warn("#################getZeroOrderByCode: 未知的订单查询类型"); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java index 30685ad9b..9db2ffea4 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java @@ -172,7 +172,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl ls = new ArrayList<>(); + for (WarehouseWayBillDetail warehouseWayBillDetail : details) { + DistributionParcelListEntity entity = new DistributionParcelListEntity(); + entity.setMaterialName(warehouseWayBillDetail.getProductName()); + entity.setQuantity(warehouseWayBillDetail.getNum()); + entity.setConditions(3); + entity.setStockArticleId(id); + ls.add(entity); + } + boolean b = distributionParcelListClient.addBatch(ls); + if (!b) { + log.warn("#################createStockArticle: 保存包件信息失败 orderSelfNum={}", waybillNo); + throw new CustomerException(405, "保存包件信息失败"); + } + } else { id = distributionStockArticleEntity.getId(); @@ -247,7 +264,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl details = warehouseWayBillDetailService.findByWaybillId(waybillId); // //