签收状态调整

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java

@@ -2,21 +2,17 @@ package com.logpm.distribution.appcontroller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.logpm.distribution.bean.Resp;
 import com.logpm.distribution.dto.app.DistributionAppDeliveryListDTO;
 import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO;
-import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.service.IDistributionDeliveryInfoService;
 import com.logpm.distribution.service.IDistributionDeliveryListService;
 import com.logpm.distribution.vo.DisStockListDetailVO;
-import com.logpm.distribution.vo.DistributionParcelListVO;
 import com.logpm.distribution.vo.app.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
@@ -208,8 +204,7 @@ public class DistributionDeliveryAppController {
 		if (null == distrilbutionloadingscanDTO.getDeliveryId() || null == distrilbutionloadingscanDTO.getLoadingId()){
 			return R.fail("参数不全");
 		}
-		R msg	= distributionDeliveryListService.loadingStart(distrilbutionloadingscanDTO);
-		return msg;
+        return distributionDeliveryListService.loadingStart(distrilbutionloadingscanDTO);
 	}
 
 

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

@@ -710,9 +710,9 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 			if (Func.isNotEmpty(deliveryLoadingNum)){
 				int deliveryLoadingQuantity = deliveryLoadingNum.getPackageLoadingQuantity()+deliveryLoadingNum.getInventoryLoadingQuantity();
 				if (deliveryPackageTotal == deliveryLoadingQuantity){
-					distributionReservationEntity.setLoadingStatus(DeliveryLoadingStatusConstant.yizhuangche.getValue());
+					distributionDeliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.yizhuangche.getValue());
 				}else {
-					distributionReservationEntity.setLoadingStatus(DeliveryLoadingStatusConstant.bunfenzhuangche.getValue());
+					distributionDeliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.bunfenzhuangche.getValue());
 				}
 				distributionDeliveryListMapper.updateById(distributionDeliveryListEntity);
 			}
@@ -1164,7 +1164,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 					}else {
 						distributionDeliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.peisongzhong.getValue());
 					}
-					distributionReservationMapper.updateById(distributionReservationEntity);
+					distributionDeliveryListMapper.updateById(distributionDeliveryListEntity);
 				}
 			}
 		}