Merge branch 'dev' into pre-production

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

@@ -37,11 +37,13 @@ public class DistributionStockupOrderListVO implements Serializable {
 	private String trayId; //托盘id
 	private String customerAddress; //客户地址
 	private String firstsNumber; //品类数量
+	private String descriptionGoods; //订单货物名称
 	private Long shelfId; //货架id
 	private Long parcelListId; //包件id
 	private Long stockId; //备货id
 	private Long allocationId; //货位id
 	private Integer stockQuantity; //备货数量
 	private Integer allocationNumber; //货位数量
+	private Integer num; //货位数量
 
 }

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownGoodsClient.java

@@ -105,4 +105,8 @@ public interface IWarehouseUpdownGoodsClient {
 
 	@GetMapping(API_PREFIX+"/findEntityByOrderPackageCode")
     WarehouseUpdownGoodsEntity findEntityByOrderPackageCode(@RequestParam String unitNo);
+
+	@GetMapping(API_PREFIX+"/getBatchLocationStockListInformation")
+	List<WarehouseUpdownGoodsEntity> getBatchLocationStockListInformation(WarehouseUpdownGoodsEntity updownGoodsEntity);
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/app/BasicdataGoodsAllocationPDAlController.java

@@ -31,6 +31,7 @@ public class BasicdataGoodsAllocationPDAlController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "查询货位接口列表", notes = "查询货位接口列表")
 	public R<List<GoodsAllocationSelectDTO>> list(@RequestParam Map<String, Object> basicdataGoodsAllocation) {
+		basicdataGoodsAllocation.put("appEnableStatus", "1");
 		List<BasicdataGoodsAllocationVO> records = goodsAllocationService.selectGoodsAllocationList(basicdataGoodsAllocation);
 		List<GoodsAllocationSelectDTO> ls = new ArrayList<>();
 		Map<String, List<GoodsAllocationSelectDTO>> map = new HashMap<>();

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml

@@ -105,6 +105,9 @@
         LEFT JOIN logpm_warehouse_warehouse AS  warehouse  ON goods_area.warehouse_id = warehouse.id
         <where>
             goods_allocation.is_deleted = 0
+            <if test="po.appEnableStatus!=null and po.appEnableStatus!=''">
+                and goods_allocation.enable_status = 1
+            </if>
             <if test="po.goodsAreaId!=null and po.goodsAreaId!=''">
                 AND  goods_allocation.goods_area_id=#{po.goodsAreaId}
             </if>
@@ -123,8 +126,8 @@
             <if test="po.layerNum != null and po.layerNum!= ''">
                 and goods_allocation.layer_num = #{po.layerNum}
             </if>
-            <if test="po.goods_allocation_name != null and po.goods_allocation_name!= ''">
-                and goods_allocation.goods_allocation_name  like concat('%', #{po.goodsAllocationName},'%')
+            <if test="po.goodsAllocationName != null and po.goodsAllocationName!= ''">
+                and goods_allocation.qr_code  like concat('%', #{po.goodsAllocationName},'%')
             </if>
             <if test="po.goodsShelfId!=null and po.goodsShelfId!=''">
                 AND  goods_allocation.goods_shelf_id=#{po.goodsShelfId}

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

@@ -49,6 +49,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.RabbitConstant;
+import org.springblade.common.constant.common.IsOrNoConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageFreezeStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageStockupStatusConstant;
 import org.springblade.common.constant.pda.PdaAudioLingoStatus;
@@ -121,6 +122,7 @@ public class DistributionStockupAppController extends BladeController {
 
 
 	private final IDisStockOrdercodeRecoService disStockOrdercodeRecoService;
+	private final IDistributionReservationStockarticleService distributionReservationStockarticleService;
 
 	private final BladeRedis redis;
 
@@ -259,11 +261,9 @@ public class DistributionStockupAppController extends BladeController {
 				DistributionStockupSelfVO distributionStockupSelfVO = distributionStockupService.selectStockupStockListDetails(reservationId);
 				map = convertObjectToMap(distributionStockupSelfVO);
 				//库存品
-
 				List<DistributionStockupStockListVO> list = distributionStockupService.selectStockupStockList(stockupDTO);
 				map.put("stockList", list);
 			}
-
 		} else {
 			//商，市
 			DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId);
@@ -278,6 +278,7 @@ public class DistributionStockupAppController extends BladeController {
 				//根据list列表统计计划件数
 				Integer planNum = 0;
 				Integer scanNum = 0;
+
 				if (!list.isEmpty()) {
 					for (DistributionStockupOrderListVO vo : list) {
 						planNum = planNum + vo.getPlanNum();
@@ -295,9 +296,26 @@ public class DistributionStockupAppController extends BladeController {
 							vo.setTrayLean(distributionStockupService.getTrayBoot(vo, stockupDTO.getTypeService()));
 						}
 					}
+					if (IsOrNoConstant.yes.getValue().equals(stockupDTO.getIsZero())){
+						//查询客户零担计划数量
+						List<DistributionReservationStockarticleEntity> reservationStockarticleEntities = distributionReservationStockarticleService.list(Wrappers.<DistributionReservationStockarticleEntity>query().lambda()
+							.eq(DistributionReservationStockarticleEntity::getReservationId, reservationId)
+							.eq(DistributionReservationStockarticleEntity::getIsZero, IsOrNoConstant.yes.getValue())
+							.ne(DistributionReservationStockarticleEntity::getStockArticleStatus, ReservationOrderStatusConstant.quxiao.getValue())
+						);
+						planNum = reservationStockarticleEntities.stream().mapToInt(DistributionReservationStockarticleEntity::getReservationNum).sum();
+						List<Long> collect = list.stream().map(DistributionStockupOrderListVO::getParcelListId).collect(Collectors.toList());
+						List<DistributionStockEntity> stockEntityList = distributionStockService.list(Wrappers.<DistributionStockEntity>query().lambda()
+							.eq(DistributionStockEntity::getReservationId, reservationId)
+							.eq(DistributionStockEntity::getOutboundType, "3")
+							.in(DistributionStockEntity::getParcelListId, collect)
+						);
+						scanNum = stockEntityList.stream().mapToInt(DistributionStockEntity::getStockQuantity).sum();
+					}
 				}
 				map.put("planNum", planNum);
 				map.put("scanNum", scanNum);
+				list.stream().forEach(f->f.setCompleteStact(false));
 				map.put("orderList", list);
 			} else if (orderStatus==2) {
 
@@ -306,10 +324,10 @@ public class DistributionStockupAppController extends BladeController {
 				List<DistributionStockupStockListVO> list = distributionStockupService.selectStockupStockList(stockupDTO);
 				//根据list列表统计计划件数
 				//查询结果为null，判定为当前库存品未进行上架操作
-				if (Func.isEmpty(list)){
-					log.info("##################库存品库位信息:{}",list);
-					return R.fail("该库存品未上架");
-				}
+//				if (Func.isEmpty(list)){
+//					log.info("##################库存品库位信息:{}",list);
+//					return R.fail("该库存品未上架");
+//				}
 				Integer planNum = 0;
 				Integer scanNum = 0;
 				for (DistributionStockupStockListVO vo : list) {

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

@@ -373,4 +373,11 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 	 * @return
 	 */
 	IPage<DistributionReservationZeroPackageVO> selectZeroPackageByReservationInfo(@Param("param")Map<String, Object> reservationPackageDTO, IPage<DistributionReservationZeroPackageVO> page);
+
+	/**
+	 * 查询零担订单
+	 * @param reservationId
+	 * @return
+	 */
+	List<DistributionStockupOrderListVO> selectStockupZeroOrderList(Long reservationId);
 }

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

@@ -235,7 +235,7 @@
           <!–  and lwug.association_type = '3' and lwtg.association_type = '3' –>
         </where>-->
 
-        select DISTINCT  CONCAT(lwug.position_code ) allocation ,  lwtg.tray_code pallet,lwug.area_id areaId,ldpl.id parcelListId,lds.id stockId,
+        select DISTINCT  CONCAT(lwug.position_code ) allocation ,lwug.num AS num,  lwtg.tray_code pallet,lwug.area_id areaId,ldpl.id parcelListId,lds.id stockId,
         lwug.shelf_id shelfId,lwug.allocation_id allocationId,lwtg.tray_id  trayId,ldpl.order_code orderCode,ldpl.stock_article_id stockArticleId
         from logpm_distribution_reservation_package ldrp
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldrp.parce_list_id = ldpl.id and ldpl.order_package_status != '70'
@@ -246,7 +246,6 @@
         <where>
         ldrp.reservation_id = #{reservationId}  and ldrp.packet_bar_status in (1,3) and ldsa.is_zero = #{isZero}
         </where>
-
         <!--select DISTINCT  CONCAT(lwug.position_code ) allocation ,  lwtg.tray_code pallet,lwug.area_id areaId,ldpl.id parcelListId,lds.id stockId,
         lwug.shelf_id shelfId,lwug.allocation_id allocationId,lwtg.tray_id  trayId,ldpl.order_code orderCode,ldpl.stock_article_id stockArticleId
         from logpm_distribution_reservation_stockarticle ldrs
@@ -1782,4 +1781,22 @@
        </where>
 
     </select>
+    <select id="selectStockupZeroOrderList"
+            resultType="com.logpm.distribution.vo.DistributionStockupOrderListVO">
+        SELECT DISTINCT
+        ldrzp.parcel_list_id AS parcelListId,
+        lds.id AS stockId,
+        ldsa.order_code AS orderCode,
+        ldsa.description_goods AS descriptionGoods,
+        ldsa.id AS stockArticleId
+        FROM
+        logpm_distribution_reservation_stockarticle ldrs
+        LEFT JOIN logpm_distribution_reservation_zero_package ldrzp ON ldrs.reservation_id = ldrzp.reservation_id AND ldrs.stock_article_id = ldrzp.stock_article_id
+        LEFT JOIN logpm_distribution_stock_article ldsa ON ldrzp.stock_article_id = ldsa.id
+        LEFT JOIN logpm_distribution_stock lds ON lds.parcel_list_id = ldrzp.parcel_list_id
+        AND lds.reservation_id = ldrzp.reservation_id
+        WHERE
+        ldrzp.reservation_id = #{reservationId}
+        GROUP BY ldsa.id
+    </select>
 </mapper>

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

@@ -90,7 +90,7 @@
         </where>
     </select>
     <select id="getZeroStockUpDataYou" resultType="com.logpm.distribution.vo.app.StockupZeroVO">
-        elect DISTINCT ldrzp.id,ldrzp.quantity,ldrzp.category_name,ldrzp.stock_article_id,ldrzp.reality_quantity
+        Select DISTINCT ldrzp.id,ldrzp.quantity,ldrzp.category_name,ldrzp.stock_article_id,ldrzp.reality_quantity
         realityQuantity,ldrzp.parcel_list_id parcelListId
         from logpm_distribution_stockup_info ldsi
         LEFT JOIN logpm_distribution_reservation_stockarticle ldrs on ldsi.reservation_id = ldrs.reservation_id

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

@@ -282,4 +282,12 @@ public interface IDistributionReservationService extends BaseService<Distributio
 	 * @return
 	 */
     R maintenanceReservationInfoByWarehouseId(String warehouseId);
+
+	/**
+	 * 查询备货零担订单
+	 * @param reservationId
+	 * @return
+	 */
+	List<DistributionStockupOrderListVO> selectStockupZeroOrderList(Long reservationId);
+
 }

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

@@ -541,6 +541,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		if (Objects.isNull(myCurrentWarehouse)) {
 			throw new CustomerException(403, "仓库信息不能为空");
 		}
+
+		DistributionReservationEntity distributionReservation = distributionReservationService.getById(distrilbutionloadingscanDTO.getReservationId());
+		if (ReservationStatusConstant.yiquexiao.getValue().equals(distributionReservation.getReservationStatus())){
+			throw new CustomerException(403, "预约单已取消");
+		}
+
 //		-----------------------------------2023-09-25  签收调整----------------------------------------------------------------
 //		首先这里需要查看该包件是否属于该配送任务
 //					属于该配送任务需要进行是否属于该客户进行判断

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

@@ -3567,9 +3567,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 					}
 				}
 			}
-			if (signStatus){
-				reservationEntity.setSigningStatus(ReservationSigningStatusConstant.yiqianshou.getValue());
-			}else {
+
 				//判断是否都为完成签收
 				Integer signingNum =  distributionLoadscanMapper.selectSigningNumByReservationId(reservationId);
 				//判断当前客户是否签收完成了
@@ -3579,7 +3577,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				if (signingNum == 0){
 					reservationEntity.setSigningStatus(ReservationSigningStatusConstant.daiqianshou.getValue());
 				}
-			}
+
 			if (stockUpStatus){
 				reservationEntity.setStockStatus(ReservationStockupStatusConstant.yibeihuo.getValue());
 			}else {
@@ -3740,4 +3738,13 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		}
 		return R.success("操作成功");
 	}
+
+	/**
+	 * @param reservationId
+	 * @return
+	 */
+	@Override
+	public List<DistributionStockupOrderListVO> selectStockupZeroOrderList(Long reservationId) {
+		return baseMapper.selectStockupZeroOrderList(reservationId);
+	}
 }

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

@@ -685,10 +685,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 					stockupOrderListVO.setAllocationId(q.getAllocationId());
 					stockupOrderListVO.setAllocationNumber(q.getNum());
 					listStockup.add(stockupOrderListVO);
-					iterator.remove();
 				});
+				iterator.remove();
 			}
-
 		}
 		list.addAll(listStockup);
 		return list;
@@ -917,9 +916,12 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		}
 		//零担查询货位，托盘信息
 		if (stockupDTO.getIsZero().equals("1")) {
-			List<DistributionStockupOrderListVO> zeroTrayInfo = getZeroTrayInfo(list);
-			if (!zeroTrayInfo.isEmpty()) {
-				list = zeroTrayInfo;
+			List<DistributionStockupOrderListVO> zeroOrderList = distributionReservationService.selectStockupZeroOrderList(reservationId);
+			if (Func.isNotEmpty(zeroOrderList)){
+				List<DistributionStockupOrderListVO> zeroTrayInfo = getZeroTrayInfo(zeroOrderList);
+				if (!zeroTrayInfo.isEmpty()) {
+					list = zeroTrayInfo;
+				}
 			}
 		}
 		//有货位

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTaryAllocationClient.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.warehouse.entity.WarehouseTaryAllocationEntity;
 import com.logpm.warehouse.service.IWarehouseTaryAllocationService;
 import lombok.AllArgsConstructor;
+import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -23,9 +24,9 @@ public class WarehouseTaryAllocationClient implements IWarehouseTaryAllocationCl
 
 	@Override
 	@PostMapping(GETALLOCATIONID)
-	public List<WarehouseTaryAllocationEntity> getAllocationId(Long allocationId) {
+	public List<WarehouseTaryAllocationEntity> getAllocationId(Long allocationIds) {
 		return warehouseTaryAllocationService.list(Wrappers.<WarehouseTaryAllocationEntity>query().lambda()
-			.eq(WarehouseTaryAllocationEntity::getAllocationId,allocationId)
+			.eq(WarehouseTaryAllocationEntity::getAllocationId, allocationIds)
 			.eq(WarehouseTaryAllocationEntity::getBindStatus , "1")
 		);
 	}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java

@@ -1,6 +1,7 @@
 package com.logpm.warehouse.feign;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -8,6 +9,7 @@ import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity;
 import com.logpm.warehouse.service.IWarehouseUpdownGoodsService;
 import lombok.AllArgsConstructor;
 import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
@@ -110,4 +112,13 @@ public class WarehouseUpdownGoodsClient implements IWarehouseUpdownGoodsClient {
 
 		return warehouseUpdownGoodsService.getOne(queryWrapper);
 	}
+
+	/**
+	 * @param updownGoodsEntity
+	 * @return
+	 */
+	@Override
+	public List<WarehouseUpdownGoodsEntity> getBatchLocationStockListInformation(WarehouseUpdownGoodsEntity updownGoodsEntity) {
+		return null;
+	}
 }