修改备货查询

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java

@@ -67,7 +67,7 @@ public class DistributionStockupVO extends DistributionStockupEntity {
 	private String stockArticleId;
 	private String orderCode; //订单自编号
 	private String descriptionGoods;
-	private String reservationNum;
+	private Integer reservationNum; //预约数量
 	private Date stockupDate;
 	private Integer number;
 	private String goodsAllocation; //货位

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java

@@ -46,6 +46,7 @@ import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.codec.Charsets;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
@@ -210,6 +211,12 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 
 	@Override
 	public List<BasicdataGoodsAreaVO> stockUp(BasicdataGoodsAreaEntity warehouseWarehouse) {
+		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseService.getMyCurrentWarehouse();
+		Optional<BasicdataWarehouseEntity> warehouseOptional = Optional.ofNullable(myCurrentWarehouse);
+		if(!warehouseOptional.isPresent()){
+			throw new ServiceException("仓库信息未选择，请选择！");
+		}
+		warehouseWarehouse.setDepartment(String.valueOf(myCurrentWarehouse.getDepartment()));
 		return baseMapper.stockUp(warehouseWarehouse);
 	}
 

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

@@ -532,9 +532,7 @@ public class DistributionStockupAppController extends BladeController {
 //		try{
 		//设置lockey
 		String lockKey = stockupDTO.getPacketBarCode()+stockupDTO.getStockupId();
-		RLock lock =
+		RLock lock = new RedissonConfig().redisson().getLock(lockKey);
-
-			new RedissonConfig().redisson().getLock(lockKey);
 		if(lock.isLocked()){
 			String audioValue2 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "2");
 			return Resp.scanFail("重复扫描！", audioValue2);

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

@@ -62,6 +62,11 @@ public interface DistributionStockMapper extends BaseMapper<DistributionStockEnt
 	 */
     List<DistributionStockVO> selectReservationDelivery(@Param("stockupId")String stockupId);
 
+	/**
+	 * 根据包件id查询有多少包件
+	 * @param pageId
+	 * @return
+	 */
 	DistributionStockVO selectParcelList(@Param("pageId")Long pageId);
 
 	/**

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

@@ -85,7 +85,7 @@
                 where ldbs.bill_lading_id = (
                     select reservation_id
                     from logpm_distribution_stockup_info
-                    where stockup_id =  '1693559371180425218'
+                    where stockup_id = #{pageId}
                 ) ) whole
         from logpm_distrilbution_bill_stock ldbs
                  LEFT JOIN logpm_distribution_parcel_list ldpl on ldbs.stock_article_id = ldpl.stock_article_id

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

@@ -230,6 +230,7 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 			stockEntity.setStockupArea(distributionStocks.getStockupArea()); //自编码
 			stockEntity.setStockupId(distributionStocks.getStockupId()); //自编码
 			stockEntity.setType(1);
+			stockEntity.setStockQuantity(1);
 			stockEntity.setOutboundType(byId1.getTypeService());//类型
 			list.add(stockEntity);
 			//修改备货状态
@@ -237,10 +238,15 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 			parcelListEntity.setId(Long.parseLong(i));
 			parcelListEntity.setOrderPackageStockupStatus(OrderPackageStockupStatusConstant.yibeihu.getValue());
 			distributionParcelListService.updateById(parcelListEntity);
+//			distributionStockService.list(Wrappers.<S>query().lambda().eq());
+
+
+
+
 
 		});
 		if(ObjectUtils.isNotNull(distributionStocks.getStockupType()) && distributionStocks.getStockupType().equals("ZT")){
-			//修改备货状态
+			//修改备货状态 自提
 			getUpdateOrderState(distributionStocks.getStockupId(),3 );
 		}else{
 			//修改备货状态
@@ -258,9 +264,11 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 	@Override
 	public void getUpdateOrderState(Long pageId,int type) {
 		switch (type){
-			case 1: //订单
+			case 1: //修改订单备货状态
-				DistributionStockVO distributionStockVO =  baseMapper.selectParcelList(pageId);
+				DistributionStockVO distributionStockVO =  baseMapper.selectParcelList(pageId); //查询有多少待备货的包件
-				if(ObjectUtils.isNotNull(distributionStockVO) && ObjectUtils.isNotNull(distributionStockVO.getScanned())){
+				Optional<DistributionStockVO> stockVOptional = Optional.ofNullable(distributionStockVO);
+				if(stockVOptional.isPresent()){
+					//已经备货完成
 					if(distributionStockVO.getScanned() == 0){
 						//修改
 						DistributionStockArticleEntity distributionStockArticle = new DistributionStockArticleEntity();
@@ -274,18 +282,18 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 				DistributionStockVO distributionStockVO1 = baseMapper.selectStockupInfo(pageId);
 				//查询库存品
 				DistributionDeliveryDetailsVO distributionOrder = distributionDeliveryDetailsService.selectOrderCount(pageId);
-				if(ObjectUtils.isNotNull(distributionStockVO1.getScanned()) && distributionStockVO1.getScanned() == 0 ){
+				if(ObjectUtils.isNotNull(distributionStockVO1.getScanned()) && distributionStockVO1.getScanned() == 0 ){ //已扫数为o
 					//修改备货任务
 					if(ObjectUtils.isNotNull(distributionOrder)){
 						int i = ObjectUtils.isNotNull(distributionOrder.getEsauNum()) ? distributionOrder.getEsauNum() : 0;
 						int ii = ObjectUtils.isNotNull(distributionOrder.getWholeNum()) ? distributionOrder.getWholeNum() : 0;
 						if(i == ii){
-							//查询库存品
+							//查询备货状态
-							getUpdateStockup(pageId);
+							getUpdateStockup(pageId,2);
 						}
 					}else{
-						//查询库存品
+						//查询备货状态
-						getUpdateStockup(pageId);
+						getUpdateStockup(pageId,2);
 					}
 				}
 			break;
@@ -301,11 +309,14 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 							int ii = ObjectUtils.isNotNull(distributionSelf.getWholeNum()) ? distributionSelf.getWholeNum() : 0;
 							if(i == ii){
 								//修改备货任务
-								getUpdateStockup(pageId);
+								getUpdateStockup(pageId,2);
+							}else{
+								//没有完成
+								getUpdateStockup(pageId,1);
 							}
 						}else{
 							//修改备货任务
-							getUpdateStockup(pageId);
+							getUpdateStockup(pageId,2);
 						}
 					}
 				}
@@ -315,10 +326,23 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 		}
 
 	}
-	private void getUpdateStockup(Long pageId){
+
+	/**
+	 * 修改备货状态
+	 * @param pageId
+	 * @param type
+	 */
+	private void getUpdateStockup(Long pageId,int type){
 		DistributionStockupEntity distributionStockupEntity = new DistributionStockupEntity();
 		distributionStockupEntity.setId(pageId);
-		distributionStockupEntity.setStockupStatus(StockupStatusConstant.yibeihuo.getValue());
+		switch (type){
+			case 1: //备货中
+				distributionStockupEntity.setStockupStatus(StockupStatusConstant.beihuozhong.getValue());
+				break;
+			case 2: // 已备货
+				distributionStockupEntity.setStockupStatus(StockupStatusConstant.yibeihuo.getValue());
+				break;
+		}
 		distributionStockupMapper.updateById(distributionStockupEntity);
 	}
 

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

@@ -1498,6 +1498,17 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	public IPage<DistributionStockupVO> detailOrderOwnSelf(IPage<Object> page, Long parseLong) {
 		IPage<DistributionStockupVO> distributionStockupVOIPage = baseMapper.detailOrderOwnSelf(page, parseLong);
 		distributionStockupVOIPage.getRecords().forEach(o -> {
+			//查询有没有零担的数据
+			List<DistributionReservationZeroPackageEntity> list = reservationZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
+					.eq(DistributionReservationZeroPackageEntity::getStockArticleId, o.getStockArticleId())
+					.eq(DistributionReservationZeroPackageEntity::getIsDeleted, 0)
+//					.apply("zero_package_status in (1,3)")
+					.in(DistributionReservationZeroPackageEntity::getZeroPackageStatus, "1", "3")
+			);
+			if(!list.isEmpty()){
+				int sum = list.stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum();
+				o.setReservationNum(sum);
+			}
 			if (ObjectUtils.isNotNull(o.getStockArticleId())) {
 				Integer integer = distributionStockService.selectCount(Long.parseLong(o.getStockArticleId()),parseLong);
 				o.setNumber(integer);