Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java

@@ -32,10 +32,7 @@ import com.logpm.distribution.excel.DistributionSignforExcel;
 import com.logpm.distribution.excel.DistributionSignforOrderExcel;
 import com.logpm.distribution.excel.DistributionSignforOwnExcel;
 import com.logpm.distribution.excel.DistributionSignforPackageExcel;
-import com.logpm.distribution.service.IDistributionAsyncService;
-import com.logpm.distribution.service.IDistributionDeliveryListService;
-import com.logpm.distribution.service.IDistributionReservationService;
-import com.logpm.distribution.service.IDistributionSignforService;
+import com.logpm.distribution.service.*;
 import com.logpm.distribution.service.impl.DistributionAddvalueServiceImpl;
 import com.logpm.distribution.vo.*;
 import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient;
@@ -82,6 +79,8 @@ public class DistributionSignforController extends BladeController {
 
 	private final DistributionAddvalueServiceImpl distributionAddvalueService;
 
+	private final IDistributionStockupInfoService distributionStockupInfoService;
+
 	private final IWarehouseUpdownTypeClient updownTypeClient;
 
 	private final IBasicdataWarehouseClient warehouseClient;
@@ -320,6 +319,8 @@ public class DistributionSignforController extends BladeController {
 			DistributionSignforDTO distributionSignforDTO = new DistributionSignforDTO();
 			distributionSignforDTO.setId(distributionSignfor.getId());
 			distributionSignforService.updateSign(distributionSignforDTO);
+			distributionStockupInfoService.maintenanceStockUp(distributionSignfor.getReservationId(),1);
+
 		}
 //		return R.status(distributionSignforService.updateById(distributionSignfor));
 		return r;

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupInfoService.java

@@ -64,4 +64,11 @@ public interface IDistributionStockupInfoService extends BaseService<Distributio
 	 * @param s
 	 */
 	List<DistributionStockListSelfNumVO> selectStockListSelfNum(String s);
+
+	/**
+	 * 维护备货任务
+	 * @param reservationId
+	 * @param type
+	 */
+    void maintenanceStockUp(Long reservationId, Integer type);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java

@@ -301,10 +301,5 @@ public interface IDistributionStockupService extends BaseService<DistributionSto
 	 */
 	R detailOwnSelfInventoryDetail(Long billLadingId, Long stockListId);
 
-	/**
-	 * 维护备货任务
-	 * @param reservationId
-	 */
-	void maintenanceStockUp(Long reservationId,Integer type);
 
 }

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

@@ -569,7 +569,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		boolean flag = this.judgmentSignIsHavePackage(distributionSignfor.getReservationId());
 		if (!flag) {
 			distributionAsyncService.releaseSource(distributionSignfor.getReservationId(), myCurrentWarehouse.getId());
-			distributionStockupService.maintenanceStockUp(distributionSignfor.getReservationId(),1);
 		}
 		return R.success("操作成功");
 	}

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

@@ -1589,6 +1589,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 							stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue());
 						}
 					}
+					if (inWarehouseQuantity > 0){
+						stockArticleEntity.setGenre(1);
+					}
 					this.updateById(stockArticleEntity);
 				}
 			} else if (IsOrNoConstant.yes.getValue().equals(stockArticleEntity.getIsZero())) {
@@ -1602,6 +1605,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 				int deliveryQuantity = 0;
 				//签收件数
 				int signingQuantity = 0;
+
 				if (Func.isNotEmpty(parcelNumberEntities)) {
 					//在库数量
 					inWarehouseQuantity = parcelNumberEntities.stream().mapToInt(DistributionParcelNumberEntity::getHandQuantity).sum();

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

@@ -19,14 +19,23 @@ package com.logpm.distribution.service.impl;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.logpm.distribution.entity.DistributionStockupEntity;
 import com.logpm.distribution.entity.DistributionStockupInfoEntity;
 import com.logpm.distribution.excel.DistributionStockupInfoExcel;
 import com.logpm.distribution.mapper.DistributionStockupInfoMapper;
 import com.logpm.distribution.service.IDistributionStockupInfoService;
+import com.logpm.distribution.service.IDistributionStockupService;
 import com.logpm.distribution.vo.DistributionStockListSelfNumVO;
 import com.logpm.distribution.vo.DistributionStockupInfoVO;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.constant.stockup.StockupStatusConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -38,8 +47,13 @@ import java.util.List;
  * @since 2023-06-14
  */
 @Service
+@Slf4j
 public class DistributionStockupInfoServiceImpl extends BaseServiceImpl<DistributionStockupInfoMapper, DistributionStockupInfoEntity> implements IDistributionStockupInfoService {
 
+	@Autowired
+	@Lazy
+	private IDistributionStockupService distributionStockupService;
+
 	@Override
 	public IPage<DistributionStockupInfoVO> selectReservationStockupPage(IPage<DistributionStockupInfoVO> page, DistributionStockupInfoVO reservationStockup) {
 		return page.setRecords(baseMapper.selectDistributionStockupInfoPage(page, reservationStockup));
@@ -85,4 +99,75 @@ public class DistributionStockupInfoServiceImpl extends BaseServiceImpl<Distribu
 		return baseMapper.selectStockListSelfNum(s);
 	}
 
+	/**
+	 * @param reservationId
+	 * @param type
+	 */
+	@Override
+	@Transactional
+	public void maintenanceStockUp(Long reservationId, Integer type) {
+		String method = "########################DistributionStockupInfoServiceImpl.maintenanceStockUp";
+		DistributionStockupInfoEntity stockupInfoEntity = null;
+		DistributionStockupInfoEntity distributionStockupInfoEntity = null;
+		switch (type){
+			case 1:
+				//商配。市配备货任务
+				List<DistributionStockupInfoEntity> entityList = this.list(Wrappers.<DistributionStockupInfoEntity>query().lambda()
+					.eq(DistributionStockupInfoEntity::getReservationId, reservationId)
+					.ne(DistributionStockupInfoEntity::getStockUpType, 3)
+					.ne(DistributionStockupInfoEntity::getStockStatus, "4")
+				);
+				if (entityList.size()==1){
+					 distributionStockupInfoEntity = entityList.get(0);
+
+					//可进行备货任务的完结标识
+					distributionStockupInfoEntity.setStockStatus("3");
+					this.updateById(distributionStockupInfoEntity);
+					//查询备货任务是否都完成
+				}else {
+					//查询备货任务错误的原因
+					log.error(method+"预约单关联备货任务错误reservationId:{}",reservationId);
+				}
+				break;
+			case 2:
+				List<DistributionStockupInfoEntity> billLadingentityList = this.list(Wrappers.<DistributionStockupInfoEntity>query().lambda()
+					.eq(DistributionStockupInfoEntity::getReservationId, reservationId)
+					.eq(DistributionStockupInfoEntity::getStockUpType, 3)
+					.ne(DistributionStockupInfoEntity::getStockStatus, "4")
+				);
+				if (billLadingentityList.size() == 1){
+					 distributionStockupInfoEntity = billLadingentityList.get(0);
+                    //可进行备货任务的完结标识
+					distributionStockupInfoEntity.setStockStatus("3");
+					this.updateById(distributionStockupInfoEntity);
+				}else {
+					log.error(method+"预约单关联备货任务错误reservationId:{}",reservationId);
+				}
+				break;
+			default:
+				List<DistributionStockupInfoEntity> stockupInfoEntityList = this.list(Wrappers.<DistributionStockupInfoEntity>query().lambda()
+					.eq(DistributionStockupInfoEntity::getStockupId, distributionStockupInfoEntity.getStockupId())
+					.ne(DistributionStockupInfoEntity::getStockStatus, "4")
+				);
+				if (Func.isNotEmpty(stockupInfoEntityList)){
+					DistributionStockupEntity distributionStockupEntity = new DistributionStockupEntity();
+					distributionStockupEntity.setId(distributionStockupInfoEntity.getStockupId());
+					boolean flag = stockupInfoEntityList.stream().allMatch(f -> "3".equals(f.getStockStatus()));
+					if (flag){
+						distributionStockupEntity.setStockupStatus(StockupStatusConstant.yibeihuo.getValue());
+					}else {
+						//查询是否存在完结
+						boolean anyMatch = stockupInfoEntityList.stream().anyMatch(f -> "3".equals(f.getStockStatus()));
+						if (anyMatch){
+							distributionStockupEntity.setStockupStatus(StockupStatusConstant.beihuozhong.getValue());
+						}else {
+							distributionStockupEntity.setStockupStatus(StockupStatusConstant.daibeihuo.getValue());
+						}
+					}
+					distributionStockupService.updateById(distributionStockupEntity);
+				}
+				break;
+		}
+	}
+
 }

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

@@ -3368,35 +3368,4 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		return R.data(detailVOS);
 	}
 
-	/**
-	 * @param reservationId
-	 * @param type
-	 */
-	@Override
-	public void maintenanceStockUp(Long reservationId, Integer type) {
-		String method = "###############DistributionStockServiceImpl.maintenanceStockUp";
-		switch (type){
-			case 1:
-				//维护商配、市配问题
-				List<DistributionStockupInfoEntity> entityList = distributionStockupInfoService.list(Wrappers.<DistributionStockupInfoEntity>query().lambda()
-					.eq(DistributionStockupInfoEntity::getReservationId, reservationId)
-					.ne(DistributionStockupInfoEntity::getStockUpType, "3")
-				);
-				if (Func.isNotEmpty(entityList)){
-					if (entityList.size() == 1){
-						//进行备货任务
-
-					} else {
-						//一个预约任务对应了多个备货任务
-					}
-				}else {
-					//查询预约任务错误
-
-				}
-				break;
-			case 2:
-				//自提备货
-				break;
-		}
-	}
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/IncomingController.java

@@ -13,6 +13,7 @@ import org.springblade.common.exception.CustomerException;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Objects;
 
 @Slf4j
@@ -67,11 +68,12 @@ public class IncomingController {
 	@ResponseBody
 	@PostMapping("/incomingBatchOrder")
 	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "查询入库订单明细", notes = "传入inComingDTO")
+	@ApiOperation(value = "批量入库", notes = "传入inComingDTO")
 	public R incomingBatchOrder(@RequestBody InComingDTO inComingDTO) {
 		String method = "############incomingBatchOrder: ";
 		log.info(method+"请求参数{}",inComingDTO);
-		Integer incomingType = inComingDTO.getIncomingType();
+		List<Long> advanceIds = inComingDTO.getAdvanceIds();
+
 
 		try{
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
@@ -82,15 +84,11 @@ public class IncomingController {
 			inComingDTO.setWarehouseId(myCurrentWarehouse.getId());
 			inComingDTO.setWarehouseName(myCurrentWarehouse.getName());
 
-			if(Objects.isNull(incomingType)){
-				log.warn(method+"入库方式不能为空 incomingType={}",incomingType);
-				return R.fail(405,"入库方式不能为空");
+			if(advanceIds.isEmpty() || advanceIds.size() == 0){
+				log.warn(method+"处理订单数据为空");
+				return R.fail(405,"处理订单数据为空");
 			}
 
-			if(incomingType < 4){
-				log.warn(method+"入库方式不正确 incomingType={}",incomingType);
-				return R.fail(405,"入库方式不正确");
-			}
 			return inComingService.incomingBatchOrder(inComingDTO);
 		}catch (CustomerException e){
 			log.error(e.message,e);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

@@ -469,6 +469,12 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			log.warn("##############orderScanOrderPackageCode: 包件不存在 orderPackageCode={} warehouseId={}",orderPackageCode,warehouseId);
 			return Resp.scanFail(2001,"包件不存在","系统无编码");
 		}
+		String orderPackageStatus = parcelListEntity.getOrderPackageStatus();
+		if("20".equals(orderPackageStatus)){
+			log.warn("##############orderScanOrderPackageCode: 包件已不在库 orderPackageCode={} warehouseId={}",orderPackageCode,warehouseId);
+			return Resp.scanFail(2001,"包件已不在库","包件已不在库");
+		}
+
 		String orderCode = parcelListEntity.getOrderCode();//订单自编码
 		Long wid = parcelListEntity.getWarehouseId();
 		Integer conditions = parcelListEntity.getConditions();
@@ -731,6 +737,11 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			log.warn("##############orderScanOrderPackageCode: 包件不在当前仓 orderPackageCode={} wid={} warehouseId={}",orderPackageCode,wid,warehouseId);
 			return Resp.scanFail(2001,"包件不在当前仓","包件不在当前仓");
 		}
+		String orderPackageStatus = parcelListEntity.getOrderPackageStatus();
+		if("20".equals(orderPackageStatus)){
+			log.warn("##############orderScanOrderPackageCode: 包件已不在库 orderPackageCode={} warehouseId={}",orderPackageCode,warehouseId);
+			return Resp.scanFail(2001,"包件已不在库","包件已不在库");
+		}
 
 //		if(conditions.equals(2)){
 //			log.warn("##############orderScanOrderPackageCode: 包件已转库存品 orderPackageCode={} conditions={}",orderPackageCode,conditions);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java

@@ -1000,6 +1000,11 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,warehouseId);
 				Integer conditions = parcelListEntity.getConditions();
 				Integer quantity = parcelListEntity.getQuantity();
+				String orderPackageStatus = parcelListEntity.getOrderPackageStatus();
+				if("20".equals(orderPackageStatus)){
+					log.warn("##############upShelfPackage: 包件已不在库 orderPackageCode={} warehouseId={}",orderPackageCode,warehouseId);
+					return Resp.scanFail(403,"包件已不在库","包件已不在库");
+				}
 //				if(conditions != 1){
 //					log.warn("##############upShelfPackage: 包件已转库存品 orderPackageCode={}",orderPackageCode);
 //					continue;