diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/Inventory/InventoryStockTypeStatusConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/Inventory/InventoryStockTypeStatusConstant.java new file mode 100644 index 000000000..54a337743 --- /dev/null +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/Inventory/InventoryStockTypeStatusConstant.java @@ -0,0 +1,45 @@ +package org.springblade.common.constant.Inventory; + +/** + * 订单包件状态 + * 关联码表 order_package_status + * + * @author pref + */ +public enum InventoryStockTypeStatusConstant { + + shengcheng("生成", "10"), + caiji("采集", "20"); + + /** + * 状态 + */ + private String name; + + /** + * 值 + */ + private String value; + + + private InventoryStockTypeStatusConstant(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java index d0f195276..ecb9b0952 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java @@ -102,6 +102,13 @@ public class OldSystemDataPushConfig { //自贡仓 warehourseIds.add("44"); + + //新都仓 + warehourseIds.add("144"); + + //仁寿欧派大家居 + warehourseIds.add("127"); + } diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/factorydata/FactoryDataConstants.java b/blade-biz-common/src/main/java/org/springblade/common/constant/factorydata/FactoryDataConstants.java index 69078511f..107f16589 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/factorydata/FactoryDataConstants.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/factorydata/FactoryDataConstants.java @@ -83,6 +83,7 @@ public abstract class FactoryDataConstants { /** * 曼好家工厂订单 */ + String MWH_NODE_DATA_PUSH = "factory.data.queue.mwh.nodeDataPush" + DEVAUTH; String MWH_FACTORY_ORDER = "factory.data.queue.mwh.factoryOrder" + DEVAUTH; /** * 金牌工厂订单 @@ -134,6 +135,7 @@ public abstract class FactoryDataConstants { /** * 曼好家工厂订单 */ + String MWH_NODE_DATA_PUSH = "mwh.nodeDataPush" + DEVAUTH; String MWH_FACTORY_ORDER = "mwh.factoryOrder" + DEVAUTH; /** * 金牌工厂订单 diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java index 5e4e16492..ec786854c 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java @@ -21,6 +21,7 @@ import com.logpm.distribution.dto.FindParamterDTO; import com.logpm.distribution.dto.OrderPackageDTO; import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.vo.DistributionParcelListVO; +import com.logpm.distribution.vo.UpdateOrderDTO; import com.logpm.distribution.vo.ZeroPackageSupplyVO; import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; @@ -167,6 +168,9 @@ public interface IDistributionParcelListClient { @GetMapping(API_PREFIX + "/updateEntityByOpenOrder") void updateEntityByOpenOrder(@RequestParam Long advanceId, @RequestParam Long waybillId); + @PostMapping(API_PREFIX + "/updateEntityByOpenOrderByAdvanceIds") + void updateEntityByOpenOrderByAdvanceIds(@RequestBody UpdateOrderDTO updateOrderDTO); + @GetMapping(API_PREFIX + "/findByWaybillNumber") List findByWaybillNumber(@RequestParam String waybillNumber); diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/UpdateOrderDTO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/UpdateOrderDTO.java new file mode 100644 index 000000000..784b58282 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/UpdateOrderDTO.java @@ -0,0 +1,15 @@ +package com.logpm.distribution.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class UpdateOrderDTO implements Serializable { + + private List advanceIds; + + private Long waybillId; + +} diff --git a/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/util/FactoryDataUtil.java b/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/util/FactoryDataUtil.java index 30a338e54..526e31648 100644 --- a/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/util/FactoryDataUtil.java +++ b/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/util/FactoryDataUtil.java @@ -27,6 +27,13 @@ public class FactoryDataUtil { factorys.put(BrandEnums.OLO.getValue(), FactoryDataConstants.Mq.RoutingKeys.OLO_NODE_DATA_PUSH); factorys.put(BrandEnums.SFY.getValue(), FactoryDataConstants.Mq.RoutingKeys.SFY_NODE_DATA_PUSH); factorys.put(BrandEnums.MTMM.getValue(), FactoryDataConstants.Mq.RoutingKeys.MENGTIAN_NODE_DATA_PUSH); + factorys.put(BrandEnums.MHJ.getValue(), FactoryDataConstants.Mq.RoutingKeys.MWH_NODE_DATA_PUSH); + // 皮阿诺 + factorys.put(BrandEnums.PAN.getValue(), FactoryDataConstants.Mq.RoutingKeys.PIANO_NODE_DATA_PUSH); + // 欧派 + factorys.put(BrandEnums.OP.getValue(), FactoryDataConstants.Mq.RoutingKeys.OPPEIN_NODE_DATA_PUSH); + // 金牌 + factorys.put(BrandEnums.JP.getValue(), FactoryDataConstants.Mq.RoutingKeys.JP_NODE_DATA_PUSH); } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java index 209185100..76dda93a3 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java @@ -71,6 +71,8 @@ public class LoadCarsDTO implements Serializable { private String trayCode; private String trayName; + private String unloadTrayName; + private String unloadTrayCode; private String trayType; private Integer isZero; private String scanCode; @@ -189,4 +191,6 @@ public class LoadCarsDTO implements Serializable { private List addUrlList = new ArrayList<>(); private List removeUrlList = new ArrayList<>(); + private Long endWarehouseId; + } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java index 005a6b889..6ab3eb6dc 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java @@ -117,6 +117,7 @@ public class OpenOrderDTO implements Serializable { private Integer trunklineCompleteOrNot;//干线是否整车 0否 1是 + private Long trunklineVehicleTypeId;//提货车型id private String trunklineVehicleType;//提货车型 private String pickupVehicleType;//提货车型 diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java index a3ac3b560..e0eac6929 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java @@ -130,6 +130,9 @@ public class TrunklineCarsLoadEntity extends TenantEntity { /** 卸车件数 */ @ApiModelProperty(name = "卸车件数",notes = "") private Integer unloadNumber ; + /** 卸车件数 */ + @ApiModelProperty(name = "在车件数",notes = "") + private Integer stockNumber ; /** 异常件数 */ @ApiModelProperty(name = "异常件数",notes = "") private Integer abnormalNum ; diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadPackageVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadPackageVO.java index 52e15fb7c..d640d8839 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadPackageVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadPackageVO.java @@ -15,6 +15,8 @@ public class UnloadPackageVO implements Serializable { private Integer unloadNum; private String trayName; private String trayCode; + private String unloadTrayName; + private String unloadTrayCode; private String scanStatus; private String unloadNodeName; private String orderCode; diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java index 89846f789..01ef13cea 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java @@ -468,6 +468,9 @@ public class WarehouseWaybillEntity extends TenantEntity { @ApiModelProperty(value = "干线是否整车 0否 1是") private Integer trunklineCompleteOrNot; + @ApiModelProperty(value = "干线车型 ") + private Long trunklineVehicleTypeId; + @ApiModelProperty(value = "干线车型 ") private String trunklineVehicleType; diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderExcel.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderExcel.java index 53f62e955..15b1889c4 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderExcel.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderExcel.java @@ -174,8 +174,14 @@ public class AftersalesWorkOrderExcel implements Serializable { * 异常问题描述 */ @ColumnWidth(20) - @ExcelProperty("异常问题描述") - private String problemDescription; + @ExcelProperty("调查经过") + private String investigationProcess; +// /** +// * 异常问题描述 +// */ +// @ColumnWidth(20) +// @ExcelProperty("异常问题描述") +// private String problemDescription; /** * 审核人 */ diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCompletionRecordMapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCompletionRecordMapper.java index 4faaa6d96..6816fc219 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCompletionRecordMapper.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCompletionRecordMapper.java @@ -52,5 +52,5 @@ public interface AftersalesCompletionRecordMapper extends BaseMapper exportAftersalesCompletionRecord(@Param("ew") Wrapper queryWrapper); - String getTotalMoney(@Param("param") AftersalesWorkOrderVO aftersalesWorkOrderVO, @Param("warehouseId") Long id); + String getTotalMoney(@Param("param") AftersalesWorkOrderVO aftersalesWorkOrderVO); } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCompletionRecordMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCompletionRecordMapper.xml index e89c32155..dfeeef183 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCompletionRecordMapper.xml +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCompletionRecordMapper.xml @@ -41,11 +41,6 @@ and work_order_id = #{param.id} - - and warehouse_id = #{warehouseId} - - - diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml index 42b91cd6c..3e3bde05d 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml @@ -87,6 +87,7 @@ lawo.process_number, lawo.customer_service_name customerServiceName, lawo.warehouse_id warehouseId, + lawo.investigation_process investigationProcess, lawo.customer_service_id customerServiceId FROM logpm_aftersales_work_order lawo @@ -195,8 +196,9 @@ lawo.waybill_number, lawo.order_code, lawo.train_number, - lawo.FIRST, - lawo.secondary, + GROUP_CONCAT(DISTINCT laap.`first`) AS first, + GROUP_CONCAT(DISTINCT laap.secondary) AS secondary, + GROUP_CONCAT(DISTINCT laap.brand_name) AS brandName, lawo.vehicle_route, lawo.deliver_goods_time, lawo.discovery_time, @@ -219,17 +221,18 @@ lawo.process_number, lawo.customer_service_name customerServiceName, lawo.warehouse_id warehouseId, - lawo.brand_name brandName, + lawo.investigation_process investigationProcess, lawo.customer_service_id customerServiceId FROM logpm_aftersales_work_order lawo LEFT JOIN logpm_aftersales_processor lap ON lawo.id = lap.work_order_id - AND lap.types_of = '2' - AND lap.conditions IN ( 1, 2 ) LEFT JOIN logpm_aftersales_completion_record lacr ON lacr.work_order_id = lawo.id - AND lacr.is_deleted = '0' + LEFT JOIN logpm_aftersales_abnormal_package AS laap ON laap.work_order_id = lawo.id lawo.is_deleted = 0 + AND lap.types_of = '2' + AND lap.conditions IN ( 1, 2 ) + AND lacr.is_deleted = '0' and lawo.id IN diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesCompletionRecordService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesCompletionRecordService.java index 30648845f..14750ac3d 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesCompletionRecordService.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesCompletionRecordService.java @@ -53,5 +53,5 @@ public interface IAftersalesCompletionRecordService extends BaseService aftersalesCompletionRecipientEntities = collect.get(workOrder.getId()); if(ObjectUtils.isNotNull(aftersalesCompletionRecipientEntities)){ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java index e807b80ea..711134592 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java @@ -37,6 +37,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.jetbrains.annotations.NotNull; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.log.exception.ServiceException; @@ -198,15 +199,7 @@ public class BasicdataDriverArteryController extends BladeController { boolean save = basicdataDriverArteryService.save(basicdataDriverArtery); if (save) { - Long driverId = basicdataDriverArtery.getId(); - List warehouseIds = basicdataDriverArtery.getWarehouseIds(); - List driverWarehouseList = new ArrayList<>(); - for (Long warehouseId : warehouseIds) { - BasicdataDriverWarehouseEntity basicdataDriverWarehouseEntity = new BasicdataDriverWarehouseEntity(); - basicdataDriverWarehouseEntity.setWarehouseId(warehouseId); - basicdataDriverWarehouseEntity.setDriverId(driverId); - driverWarehouseList.add(basicdataDriverWarehouseEntity); - } + List driverWarehouseList = getBasicdataDriverWarehouseEntities(basicdataDriverArtery); basicdataDriverWarehouseService.saveBatch(driverWarehouseList); } @@ -217,6 +210,20 @@ public class BasicdataDriverArteryController extends BladeController { return R.status(save); } + @NotNull + private static List getBasicdataDriverWarehouseEntities(BasicdataDriverArteryDTO basicdataDriverArtery) { + Long driverId = basicdataDriverArtery.getId(); + List warehouseIds = basicdataDriverArtery.getWarehouseIds(); + List driverWarehouseList = new ArrayList<>(); + for (Long warehouseId : warehouseIds) { + BasicdataDriverWarehouseEntity basicdataDriverWarehouseEntity = new BasicdataDriverWarehouseEntity(); + basicdataDriverWarehouseEntity.setWarehouseId(warehouseId); + basicdataDriverWarehouseEntity.setDriverId(driverId); + driverWarehouseList.add(basicdataDriverWarehouseEntity); + } + return driverWarehouseList; + } + /** * 司机信息表 修改 */ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java index a9f62399d..486bf922d 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java @@ -133,7 +133,7 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl getWarehouseList() { List myWatchWarehouse = getMyWatchWarehouse(); - if (myWatchWarehouse.size() > 0) { + if (!myWatchWarehouse.isEmpty()) { return myWatchWarehouse; } List basicdataGoodsShelfVOList = warehouseMapper.getWarehouseList(); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionStockupAppController.java index 006b75fda..16fe60315 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionStockupAppController.java @@ -122,6 +122,7 @@ public class DistributionStockupAppController extends BladeController { private final BladeRedis redis; private final ITrunklinePackageTrackLogClient trunklinePackageTrackLogClient; private final IDistributionNodeWorkService distributionNodeWorkService; + private final IDistributionDeliveryDetailsService distributionDeliveryDetailsService; /** @@ -721,28 +722,35 @@ public class DistributionStockupAppController extends BladeController { private int judgmentIsStockUp(Long reservationId, Long stockListId, DistributionParcelListEntity distributionParcelListEntity, Long warehouseId, String cargoNumber) { List distributionReservationStocklistEntities = distributionReservationMapper.selectStockListByReservationId(reservationId); + List stockListIds = new ArrayList<>(); if (Func.isNotEmpty(distributionReservationStocklistEntities)) { //查询库存品信息 - List stockListIds = distributionReservationStocklistEntities.stream().map(DistributionReservationStocklistEntity::getStocklistId).collect(Collectors.toList()); - - List stockListEntityList = distributionStockListService.list(Wrappers.query().lambda() - .in(DistributionStockListEntity::getId, stockListIds) - .eq(DistributionStockListEntity::getWarehouseId, warehouseId) - .eq(DistributionStockListEntity::getCargoNumber, cargoNumber) - ); - - boolean isHave = stockListEntityList.stream().map(DistributionStockListEntity::getCargoNumber).anyMatch(s -> s.contains(distributionParcelListEntity.getMaterialCode())); - if (!isHave) { - //判断包件是否属于计划物料信息 - return 1; - } - //判断该库存品包件是否属于计划的批次 - boolean isHaveIncomingBatch = stockListEntityList.stream().map(DistributionStockListEntity::getIncomingBatch).anyMatch(s -> s.contains(distributionParcelListEntity.getOrderCode())); - if (!isHaveIncomingBatch) { - return 2; - } + stockListIds = distributionReservationStocklistEntities.stream().map(DistributionReservationStocklistEntity::getStocklistId).collect(Collectors.toList()); + } + List detailsEntities = distributionDeliveryDetailsService.list(Wrappers.query().lambda() + .eq(DistributionDeliveryDetailsEntity::getBillLadingId, reservationId) + ); + if (!detailsEntities.isEmpty()) { + stockListIds = detailsEntities.stream().map(DistributionDeliveryDetailsEntity::getStockListId).collect(Collectors.toList()); } + List stockListEntityList = distributionStockListService.list(Wrappers.query().lambda() + .in(DistributionStockListEntity::getId, stockListIds) + .eq(DistributionStockListEntity::getWarehouseId, warehouseId) + .eq(DistributionStockListEntity::getCargoNumber, cargoNumber) + ); + + boolean isHave = stockListEntityList.stream().map(DistributionStockListEntity::getCargoNumber).anyMatch(s -> s.contains(distributionParcelListEntity.getMaterialCode())); + if (!isHave) { + //判断包件是否属于计划物料信息 + return 1; + } + //判断该库存品包件是否属于计划的批次 + boolean isHaveIncomingBatch = stockListEntityList.stream().map(DistributionStockListEntity::getIncomingBatch).anyMatch(s -> s.contains(distributionParcelListEntity.getOrderCode())); + if (!isHaveIncomingBatch) { + return 2; + } + return 3; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java index 8fb48bcd0..18112794f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java @@ -180,7 +180,6 @@ public class DistributionReservationController extends BladeController { public R autonomouslySave(@Valid @RequestBody DistributionReservationDTO distributionReservationDTO) { try{ R result = reservationService.insertAutonomouslyReservation(distributionReservationDTO); - return result; }catch (Exception e){ return R.fail(e.getMessage()); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java index 07b2a590a..8f32ae7da 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java @@ -34,6 +34,7 @@ import com.logpm.distribution.service.IDistributionParcelListService; import com.logpm.distribution.service.IDistributionParcelNumberService; import com.logpm.distribution.service.IDistributionStockArticleService; import com.logpm.distribution.vo.DistributionParcelListVO; +import com.logpm.distribution.vo.UpdateOrderDTO; import com.logpm.distribution.vo.ZeroPackageSupplyVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -333,6 +334,11 @@ public class DistributionParcelListClient implements IDistributionParcelListClie } + @Override + public void updateEntityByOpenOrderByAdvanceIds(UpdateOrderDTO updateOrderDTO) { + distributionParcelListService.updateEntityByOpenOrderByAdvanceIds(updateOrderDTO); + } + @Override public List findByWaybillNumber(String waybillNumber) { return distributionParcelListService.findByWaybillNumber(waybillNumber); 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 01512907a..cb59951c5 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 @@ -131,8 +131,8 @@ public interface DistributionStockListMapper extends BaseMapper select incoming_warehouse_name from logpm_trunkline_advance_detail @@ -517,4 +528,40 @@ and is_deleted = 0 + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index 062663827..7b80290d1 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -8,6 +8,7 @@ ltcl.cars_line_name carsLineName, ltcl.plan_loading_number planLoadingNumber, ltcl.real_loading_number realLoadingNumber, + ltcl.stock_number stockCarsNum, ltcl.unload_number unloadNumber, ltcl.loading_type loadingType, ltcl.full_load_rate fullLoadRate, @@ -42,9 +43,18 @@ where ltcl.is_deleted = 0 and ltcl.load_type != '4' and ltcl.load_status != '100' + + and ltcl.start_warehouse_id in + + #{item} + + and ltcl.start_warehouse_id = #{param.warehouseId} + + and Locate(#{param.endWarehouseId},ltcl.end_warehouse_ids) > 0 + and ltcl.cars_no = #{param.loadCarsNo} @@ -98,6 +108,7 @@ ltcl.cars_no carsNo, ltcl.plan_loading_number planLoadingNumber, ltcl.real_loading_number realLoadingNumber, + ltcl.stock_number stockCarsNum, ltcl.unload_number unloadNumber, ltcl.full_load_rate fullLoadRate, ltcl.is_customer isCustomer, @@ -560,6 +571,7 @@ and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_name) > 0) + order by ltcl.create_time desc diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java index dda64ed39..1c837c4a4 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java @@ -185,4 +185,6 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper findAllIdListByLoadIdAndScanStatus(@Param("loadId") Long loadId, @Param("scanStatus") String scanStatus); CustmoerUnloadNumVO findCarsLoadCustomeNumByLoadIdAndUnloadWarehouseId(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId); + + Integer findStockNumByLoadId(@Param("loadId") Long loadId); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml index 3723792f0..897cd4113 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml @@ -115,6 +115,12 @@ and Locate(#{param.trayCode},cls.tray_code) > 0 + + and Locate(#{param.unloadTrayName},cls.unload_tray_name) > 0 + + + and Locate(#{param.unloadTrayCode},cls.unload_tray_code) > 0 + and Locate(#{param.unloadNodeName},cls.unload_node_name) > 0 @@ -940,6 +946,8 @@ unload_num unloadNum, tray_code trayCode, tray_name trayName, + unload_tray_code unloadTrayCode, + unload_tray_name unloadTrayName, scan_status scanStatus, unload_node_name unloadNodeName, order_code orderCode, @@ -993,5 +1001,12 @@ and sign_order_id is not null + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java index c614fa3a2..3deb213cd 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java @@ -100,4 +100,8 @@ public interface ITrunklineAdvanceDetailService extends BaseService sendAdvanceDetailEntityList, Long warehouseId, String warehouseName,Integer incomingType); void sendReportAdvanceOpenData(String nickName, Long userId, Long warehouseId, String warehouseName, List updateAdvanceDetailList, WarehouseWaybillEntity waybillEntity); + + void updateWaybillNoByAdvanceIds(List advanceIds, String waybillNo, Long waybillId); + + List findListByAdvanceIds(List advanceIds); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java index bd2a2600d..4cf654b4a 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java @@ -181,4 +181,6 @@ public interface ITrunklineCarsLoadScanService extends BaseService findAllIdListByLoadIdAndScanStatus(Long loadId, String scanStatus); CustmoerUnloadNumVO findCarsLoadCustomeNumByLoadIdAndUnloadWarehouseId(Long loadId, Long warehouseId); + + Integer findStockNumByLoadId(Long loadId); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 31b3b8792..9fbb945cb 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -23,6 +23,7 @@ import com.logpm.distribution.feign.IDistributionParcelListClient; import com.logpm.distribution.feign.IDistributionParcelNumberClient; import com.logpm.distribution.feign.IDistributionReservationStockarticleClient; import com.logpm.distribution.feign.IDistributionStockArticleClient; +import com.logpm.distribution.vo.UpdateOrderDTO; import com.logpm.statistics.feign.IOrderInfoClient; import com.logpm.trunkline.dto.*; import com.logpm.trunkline.entity.*; @@ -262,55 +263,57 @@ public class OpenOrderServiceImpl implements IOpenOrderService { //收货单位-----根据三方商场找到对应的clientId Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrandAndCode(dealerName,StringUtil.isBlank(dealerCode)?"":dealerCode, brand); - BasicdataClientVO basicdataClientEntity = basicdataClientClient.findEntityVoById(clientId); - if (!Objects.isNull(basicdataClientEntity)) { - openOrderVO.setConsigneeClientId(clientId); - openOrderVO.setConsignee(basicdataClientEntity.getClientName()); - openOrderVO.setConsigneeName(basicdataClientEntity.getLinkman()); - openOrderVO.setConsigneeMobile(basicdataClientEntity.getPhone()); - openOrderVO.setConsigneeAddress(basicdataClientEntity.getDetailedly()); + if(!Objects.isNull(clientId)){ + BasicdataClientVO basicdataClientEntity = basicdataClientClient.findEntityVoById(clientId); + if (!Objects.isNull(basicdataClientEntity)) { + openOrderVO.setConsigneeClientId(clientId); + openOrderVO.setConsignee(basicdataClientEntity.getClientName()); + openOrderVO.setConsigneeName(basicdataClientEntity.getLinkman()); + openOrderVO.setConsigneeMobile(basicdataClientEntity.getPhone()); + openOrderVO.setConsigneeAddress(basicdataClientEntity.getDetailedly()); - List destinationArray = new ArrayList<>(); - String badeRegionAreaId = basicdataClientEntity.getBladeRegionAreaId(); - String bladeRegionProvinceId = basicdataClientEntity.getBladeRegionProvinceId(); - String bladeRegionCityId = basicdataClientEntity.getBladeRegionCityId(); - destinationArray.add(bladeRegionProvinceId); - destinationArray.add(bladeRegionCityId); - String name = regionFeign.getName(bladeRegionCityId); - String areaId = bladeRegionCityId; - if (!StringUtil.isBlank(badeRegionAreaId)) { - destinationArray.add(badeRegionAreaId); - name = regionFeign.getName(badeRegionAreaId); - areaId = badeRegionAreaId; - } + List destinationArray = new ArrayList<>(); + String badeRegionAreaId = basicdataClientEntity.getBladeRegionAreaId(); + String bladeRegionProvinceId = basicdataClientEntity.getBladeRegionProvinceId(); + String bladeRegionCityId = basicdataClientEntity.getBladeRegionCityId(); + destinationArray.add(bladeRegionProvinceId); + destinationArray.add(bladeRegionCityId); + String name = regionFeign.getName(bladeRegionCityId); + String areaId = bladeRegionCityId; + if (!StringUtil.isBlank(badeRegionAreaId)) { + destinationArray.add(badeRegionAreaId); + name = regionFeign.getName(badeRegionAreaId); + areaId = badeRegionAreaId; + } - openOrderVO.setDefaultDeliveryWay("2"); - String typeService = "1"; - BasicdataStoreBusinessEntity storeBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(clientId, 3); - if(!Objects.isNull(storeBusinessEntity)){ - typeService = storeBusinessEntity.getMold(); - } - if ("1".equals(typeService)){ openOrderVO.setDefaultDeliveryWay("2"); - }else if("2".equals(typeService)){ - openOrderVO.setDefaultDeliveryWay("3"); - }else if("3".equals(typeService)){ - openOrderVO.setDefaultDeliveryWay("1"); - } + String typeService = "1"; + BasicdataStoreBusinessEntity storeBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(clientId, 3); + if(!Objects.isNull(storeBusinessEntity)){ + typeService = storeBusinessEntity.getMold(); + } + if ("1".equals(typeService)){ + openOrderVO.setDefaultDeliveryWay("2"); + }else if("2".equals(typeService)){ + openOrderVO.setDefaultDeliveryWay("3"); + }else if("3".equals(typeService)){ + openOrderVO.setDefaultDeliveryWay("1"); + } - openOrderVO.setDestination(name); - openOrderVO.setDestinationCode(areaId); - openOrderVO.setDestinationArray(destinationArray); + openOrderVO.setDestination(name); + openOrderVO.setDestinationCode(areaId); + openOrderVO.setDestinationArray(destinationArray); - openOrderVO.setDefaultPayWay(basicdataClientEntity.getDefaultPaymentMethods()); + openOrderVO.setDefaultPayWay(basicdataClientEntity.getDefaultPaymentMethods()); - //查询目的仓数据 - BasicdataStorageServicesEntity basicdataStorageServicesEntity = basicdataStorageServicesClient.findEntityBySendWarehouseIdAndClientId(warehouseId, clientId); - if (!Objects.isNull(basicdataStorageServicesEntity)) { - openOrderVO.setDestinationWarehouseId(basicdataStorageServicesEntity.getServeWarehouseId()); - openOrderVO.setDestinationWarehouseName(basicdataStorageServicesEntity.getServeWarehouseName()); + //查询目的仓数据 + BasicdataStorageServicesEntity basicdataStorageServicesEntity = basicdataStorageServicesClient.findEntityBySendWarehouseIdAndClientId(warehouseId, clientId); + if (!Objects.isNull(basicdataStorageServicesEntity)) { + openOrderVO.setDestinationWarehouseId(basicdataStorageServicesEntity.getServeWarehouseId()); + openOrderVO.setDestinationWarehouseName(basicdataStorageServicesEntity.getServeWarehouseName()); + } } } @@ -568,6 +571,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { waybillEntity.setPickupCompleteOrNot(openOrderDTO.getPickupCompleteOrNot()); waybillEntity.setTrunklineCompleteOrNot(openOrderDTO.getTrunklineCompleteOrNot()); waybillEntity.setTrunklineVehicleType(openOrderDTO.getTrunklineVehicleType()); + waybillEntity.setTrunklineVehicleTypeId(openOrderDTO.getTrunklineVehicleTypeId()); waybillEntity.setPickupVehicleType(openOrderDTO.getPickupVehicleType()); waybillEntity.setAbolishStatus(0); waybillEntity.setFreezeStatus(0); @@ -654,12 +658,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService { waybillOrderEntity.setHandleNumber(incomingNum); waybillOrderEntities.add(waybillOrderEntity); - //更新暂存单包件的运单信息 - advanceDetailService.updateWaybillNoByAdvanceId(advanceId, waybillNo, waybillId); - List list = advanceDetailService.findList(advanceId); - trunklineWaybillPackageService.saveList(list, waybillEntity); - trunklineWaybillPackageService.updateWaybillStatus(waybillEntity); - distributionParcelListClient.updateEntityByOpenOrder(advanceId, waybillId); // orderCodes.add(advanceEntity.getOrderCode()); advanceEntity.setWaybillStatus("1"); advanceEntity.setWaybillNo(waybillNo); @@ -669,6 +667,18 @@ public class OpenOrderServiceImpl implements IOpenOrderService { //修改暂存单的状态为已开单 advanceService.updateBatchById(advanceEntityList); + //更新暂存单包件的运单信息 + if(CollUtil.isNotEmpty(advanceIds)){ + advanceDetailService.updateWaybillNoByAdvanceIds(advanceIds, waybillNo, waybillId); + List list = advanceDetailService.findListByAdvanceIds(advanceIds); + trunklineWaybillPackageService.saveList(list, waybillEntity); + UpdateOrderDTO updateOrderDTO = new UpdateOrderDTO(); + updateOrderDTO.setAdvanceIds(advanceIds); + updateOrderDTO.setWaybillId(waybillId); + distributionParcelListClient.updateEntityByOpenOrderByAdvanceIds(updateOrderDTO); + } + trunklineWaybillPackageService.updateWaybillStatus(waybillEntity); + //修改暂存单明细的结算品类 List updateAdvanceDetailList = openOrderDTO.getUpdateAdvanceDetailList(); advanceDetailService.updateBatchById(updateAdvanceDetailList); @@ -746,6 +756,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { waybillEntity.setPickupCompleteOrNot(openOrderDTO.getPickupCompleteOrNot()); waybillEntity.setTrunklineCompleteOrNot(openOrderDTO.getTrunklineCompleteOrNot()); waybillEntity.setTrunklineVehicleType(openOrderDTO.getTrunklineVehicleType()); + waybillEntity.setTrunklineVehicleTypeId(openOrderDTO.getTrunklineVehicleTypeId()); waybillEntity.setPickupVehicleType(openOrderDTO.getPickupVehicleType()); waybillEntity.setDepartureWarehouseId(openOrderDTO.getDepartureWarehouseId()); waybillEntity.setDepartureWarehouseName(openOrderDTO.getDepartureWarehouseName()); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java index 2d667f043..96dd6a9b9 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java @@ -216,7 +216,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl advanceIds, String waybillNo, Long waybillId) { + baseMapper.updateWaybillNoByAdvanceIds(advanceIds, waybillNo, waybillId); + } + + @Override + public List findListByAdvanceIds(List advanceIds) { + return baseMapper.findListByAdvanceIds(advanceIds); + } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java index 60e8313e8..2c798f171 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java @@ -830,6 +830,11 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl advanceDetailEntities1 = orderCodeMap.get(orderCode); + //把advanceDetailEntities1中素有所有元素的incomeCategoryName去重并拼接成一个字符串 + String incomeCategoryName = advanceDetailEntities1.stream().map(TrunklineAdvanceDetailEntity::getIncomeCategoryName).distinct().collect(Collectors.joining(",")); + stockArticleEntity.setDescriptionGoods(incomeCategoryName); + BasicdataClientEntity clientEntity = basicdataClientClient.findByName(consigneeName1); if(!Objects.isNull(clientEntity)){ stockArticleEntity.setMallId(clientEntity.getId()); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java index 3607d9f0c..4c242ea94 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java @@ -464,4 +464,9 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl> brandMap = brands.stream().collect(Collectors.groupingBy(LoadScanBrandDTO::getBrand)); + for (Map.Entry> entry : brandMap.entrySet()) { + List value = entry.getValue(); + LoadScanBrandDTO brand = value.get(0); + String packageCode = value.stream().map(LoadScanBrandDTO::getPackageCode).collect(Collectors.joining(",")); if (StrUtil.isEmpty(packageCode)) { continue; } // 发车 if (ObjectUtil.equal(type, 1)) { if (ObjectUtil.isEmpty(node)) { - if (ObjectUtil.equal(warehouseId, brand.getStartWarehouseId())) { + if (ObjectUtil.equal(warehouseId, Long.parseLong(brand.getStartWarehouseId()))) { node = WorkNodeEnums.INITIAL_WAREHOUSE_DEPART; } else { node = WorkNodeEnums.TRANSFER_WAREHOUSE_DEPART; @@ -505,7 +509,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl{ - return PushData.builder() + return PushData.builder() .packageCode(data) .warehouseName(warehouseEntity.getName()) .orderCode(brand.getOrderCode()) @@ -1481,6 +1485,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl list = trunklineCarsLoadScanService.findNoFinalNodeData(loadId, warehouseId); - if (Objects.isNull(list) || list.size() == 0) { + if (Objects.isNull(list) || list.isEmpty()) { return R.success("未有需要添加目的仓的数据"); } else { return R.data(list); @@ -7895,7 +7903,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl myWatchWarehouse = warehouseClient.getMyWatchWarehouse(); myWatchWarehouse.forEach(warehouseEntity -> warehouseIds.add(warehouseEntity.getId())); } + waybillDTO.setWarehouseIds(warehouseIds); IPage pages = warehouseWaybillService.pageList(waybillDTO); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java index 6cfdecaf2..992e3d208 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java @@ -2974,6 +2974,13 @@ public class TaskQuestServiceImpl extends BaseServiceImpl noDataStockListDTOS = new ArrayList<>(); NoDataStockListDTO noDataStockListDTO = new NoDataStockListDTO(); noDataStockListDTO.setMarketId(entity.getMarketId()); 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 b6aae5988..1e132067e 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 @@ -912,7 +912,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl