零担装车BUG修复

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java

@@ -19,6 +19,7 @@ package com.logpm.basicdata.feign;
 
 import com.alibaba.fastjson.JSONObject;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.vo.BasicdataWarehouseVO;
 import org.springblade.common.constant.ModuleNameConstant;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.tool.api.R;

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java

@@ -26,6 +26,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.service.IBasicdataWarehouseService;
+import com.logpm.basicdata.vo.BasicdataWarehouseVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.support.BladePage;

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml

@@ -2657,7 +2657,7 @@
         SELECT
         lddl.id AS deliveryListId,
         ldrzp.reservation_id AS reservationId,
-        2 AS AbnormalType,
+        1 AS AbnormalType,
         lddl.type AS deliveryType,
         ldrzp.parcel_list_id AS packageId,
         ldrzp.quantity - (SELECT IFNULL(SUM(package_nub),0) FROM logpm_distribution_loadscan WHERE delivery_id = lddl.id AND reservation_id = ldrzp.reservation_id AND package_id = ldrzp.parcel_list_id AND is_zero = 1 AND scan_status != 1 AND is_deleted = 0) AS loadingQuantity,

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -9405,7 +9405,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	public R createdRetentionEntity(String orderPackageCode) {
 		//查询目标包件的配送信息
 		//查询此包件属于哪个车次
-		BasicdataWarehouseEntity myCurrentWarehouseAndConfig = warehouseClient.getMyCurrentWarehouseAndConfig();
+		BasicdataWarehouseEntity myCurrentWarehouseAndConfig = warehouseClient.getMyCurrentWarehouse();
 		if (Objects.isNull(myCurrentWarehouseAndConfig)) {
 			return R.fail(403, "未授权!!!");
 		}
@@ -9874,6 +9874,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		loadscanEntity.setPackageNub(parcelListDTO.getLoadingNum());
 		loadscanEntity.setWarehouseId(myCurrentWarehouse.getId());
 		loadscanEntity.setWarehouseName(myCurrentWarehouse.getName());
+		loadscanEntity.setIsZero(Integer.parseInt(IsOrNoConstant.yes.getValue()));
 		distributionLoadscanService.updateById(loadscanEntity);
 		//维护零担订单装车状态
 		distributionAsyncService.checkZeroStockArticleLoadingStatus(parcelNumberEntity, loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId());
@@ -9888,6 +9889,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 									  BladeUser user,
 									  Map<Long, DistributionParcelNumberEntity> zeroPackageMap) {
 		DistributionLoadscanEntity zeroLoadscanEntity = createdDistributionZeroLoadscanEntity(distributionDeliverySelfEntity, deliveryListEntity, distrilbutionloadingscanDTO.getReservationId(), parcelNumberDTO, myCurrentWarehouse, user);
+		zeroLoadscanEntity.setIsZero(Integer.parseInt(IsOrNoConstant.yes.getValue()));
 		distributionLoadscanService.save(zeroLoadscanEntity);
 		//更新装车时间
 		Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());