From 7cdac6315d7d9fb09cee8ecf7f2ed4c600d529d8 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Thu, 7 Sep 2023 20:27:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7=E7=89=88?=
 =?UTF-8?q?=E4=B8=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/DistributionStockListSelfNumVO.java    |  1 +
 .../mapper/DistributionReservationMapper.java |  2 ++
 .../mapper/DistributionReservationMapper.xml  |  5 ++++
 .../mapper/DistributionStockupInfoMapper.xml  |  2 +-
 .../mapper/DistributionStockupMapper.xml      | 10 +++----
 .../IDistributionReservationService.java      |  7 +++++
 .../DistributionReservationServiceImpl.java   | 11 +++++++
 .../impl/DistributionStockupServiceImpl.java  | 29 +++++++++++++++----
 8 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockListSelfNumVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockListSelfNumVO.java
index ef12f40db..50cf5ef4f 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockListSelfNumVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockListSelfNumVO.java
@@ -15,6 +15,7 @@ public class DistributionStockListSelfNumVO {
 	private String  sku; // sku
 	private Long  warehouseId; // 仓库id
 	private Long  materialId; // 物料id
+	private Long  billLadingId; // 自提ID
 	private Integer  quantity; // 数量
 
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
index c1fff319f..2abd9cbcd 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
@@ -156,4 +156,6 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 	 * @return
 	 */
 	List<DistributionParcelListEntity> selectPackageListByReservationId(@Param("reservationId")Long id);
+
+	Integer getReservationNumStockSelf(@Param("reservationId") Long reservationId,@Param("stockListId") Long stockListId);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
index 185b4f706..8a3bbd3d2 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
@@ -640,5 +640,10 @@
         WHERE
             ldrs.packet_bar_status IN ('1','3') and reservation_id = #{reservationId}
     </select>
+    <select id="getReservationNumStockSelf" resultType="Integer">
+        select SUM(lddd.quantity)
+        from logpm_distribution_delivery_details lddd
+        where lddd.inventory_status in (1,2) and  lddd.bill_lading_id = #{reservationId} and lddd.stock_list_id = #{stockListId}
+    </select>
 
 </mapper>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupInfoMapper.xml
index be4a66c49..e5fe0baa4 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupInfoMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupInfoMapper.xml
@@ -34,7 +34,7 @@
     </select>
 
     <select id="selectStockListSelfNum" resultType="com.logpm.distribution.vo.DistributionStockListSelfNumVO">
-        select DISTINCT ldsl.material_id materialId,ldsl.sku,ldsl. warehouse_id warehouseId,ldsl.warehouse_name warehouseName,lddd.stock_list_id stockListId,lddd.quantity
+        select DISTINCT lddd.bill_lading_id billLadingId, ldsl.material_id materialId,ldsl.sku,ldsl. warehouse_id warehouseId,ldsl.warehouse_name warehouseName,lddd.stock_list_id stockListId,lddd.quantity
         from logpm_distribution_stockup_info ldsi
                  LEFT JOIN logpm_distribution_delivery_details lddd on lddd.bill_lading_id = ldsi.reservation_id
                  LEFT JOIN logpm_distribution_stock_list ldsl on ldsl.id = lddd.stock_list_id
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
index 182fede0e..cdc64c54f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
@@ -57,13 +57,12 @@
         select DISTINCT lds.id,lds.stockup_date stockupDate, lds.stockup_user stockupUser, lds.stockup_status stockupStatus, lds.stockup_area stockupArea,
                lds.assign_status assignStatus, lds.goods_area_id goodsAreaId, lds.forklift_name forkliftName,
                lds.loader_name loaderName, lds.forklift_id forkliftId,lds.loader_id loaderId,lds.fix_time fixTime,lds.assign_time assignTime,
-               btg.group_name groupName,lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode,
+               lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode,
         (GROUP_CONCAT(lwug.position_code)) stockipAllocation
         from logpm_distribution_stockup lds
         LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id =lds.id
         LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.reservation_id = ldsi.reservation_id
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldrp.parce_list_id
-        LEFT JOIN logpm_basicdata_team_group btg ON lds.loader_id = btg.id
         <where>
            lds.is_deleted = 0
            <!-- lds.tenant_id = #{param.tenantId} -->
@@ -79,7 +78,7 @@
             <if test="param.assignStatus != null and param.assignStatus != '' "> and lds.assign_status = #{param.assignStatus}</if>
             <if test="param.forkliftName != null and param.forkliftName != '' "> and lds.forklift_name like concat('%', #{param.forkliftName},'%')</if>
             <if test="param.loaderName != null and param.loaderName != '' "> and lds.loader_name like concat('%', #{param.loaderName},'%')</if>
-            <if test="param.groupName != null and param.groupName != '' "> and btg.group_name like concat('%', #{param.groupName},'%')</if>
+<!--             <if test="param.groupName != null and param.groupName != '' "> and btg.group_name like concat('%', #{param.groupName},'%')</if>-->
             <if test="param.typeService != null and param.typeService != '' "> and lds.type_service = #{param.typeService}</if>
         </where>
         GROUP BY lds.id
@@ -88,13 +87,12 @@
         select DISTINCT lds.id,lds.stockup_date stockupDate, lds.stockup_user stockupUser, lds.stockup_status stockupStatus, lds.stockup_area stockupArea,
         lds.assign_status assignStatus, lds.goods_area_id goodsAreaId, lds.forklift_name forkliftName,
         lds.loader_name loaderName, lds.forklift_id forkliftId,lds.loader_id loaderId,lds.fix_time fixTime,lds.assign_time assignTime,
-        btg.group_name groupName,lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode,(GROUP_CONCAT(lwtg.tray_code)) stockipAllocation
+        lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode,(GROUP_CONCAT(lwtg.tray_code)) stockipAllocation
         from logpm_distribution_stockup lds
         LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id = lds.id
         LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldbs.bill_lading_id = ldsi.reservation_id
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
-        LEFT JOIN logpm_basicdata_team_group btg ON lds.loader_id = btg.id
         <where>
             lds.is_deleted = 0
             <!-- lds.tenant_id = #{param.tenantId} -->
@@ -111,7 +109,7 @@
             <if test="param.forkliftName != null and param.forkliftName != '' "> and lds.forklift_name like concat('%', #{param.forkliftName},'%')</if>
             <if test="param.loaderName != null and param.loaderName != '' "> and lds.loader_name like concat('%', #{param.loaderName},'%')</if>
             <if test="param.typeService != null and param.typeService != '' "> and lds.type_service = #{param.typeService}</if>
-            <if test="param.groupName != null and param.groupName != '' "> and btg.group_name like concat('%', #{param.groupName},'%')</if>
+            <!--<if test="param.groupName != null and param.groupName != '' "> and btg.group_name like concat('%', #{param.groupName},'%')</if> -->
         </where>
         GROUP BY   lds.id
     </select>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java
index 95dc7bf8a..fbb5841f6 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java
@@ -186,4 +186,11 @@ public interface IDistributionReservationService extends BaseService<Distributio
 	 */
 	R insertAutonomouslyReservation(DistributionReservationDTO distributionReservationDTO);
 
+	/**
+	 * 自提查询库存数量
+	 * @param reservationId
+	 * @param stockListId
+	 * @return
+	 */
+	Integer getReservationNumStockSelf(Long reservationId, Long stockListId);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
index a35d070e7..84eddcd01 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
@@ -2076,4 +2076,15 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		distributionReservationMapper.updateById(reservationEntity);
 		return R.status(true);
 	}
+
+	/**
+	 * 自提查询库存数量
+	 * @param reservationId
+	 * @param stockListId
+	 * @return
+	 */
+	@Override
+	public Integer getReservationNumStockSelf(Long reservationId, Long stockListId) {
+		return baseMapper.getReservationNumStockSelf(reservationId,stockListId);
+	}
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
index db4985b66..876b70cdb 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@@ -170,6 +170,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				if(stockupEntity.getTypeService().equals("3")){
 					//自提
 					List<DistributionStockListSelfNumVO> distributionStockListSelfNumVOS = distributionStockupInfoService.selectStockListSelfNum(s);
+
 					if(distributionStockListSelfNumVOS.size() > 0){
 						List<DisStockListDetailEntity> listDetailEntities = new ArrayList<>();
 
@@ -182,6 +183,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 									disStockListDetail.setSku(i.getSku());
 									disStockListDetail.setWarehouseId(i.getWarehouseId());
 									disStockListDetail.setWarehouseName(i.getWarehouseName());
+									disStockListDetail.setReservationId(i.getBillLadingId());
+									disStockListDetail.setStockPackageCode("1");
 									disStockListDetail.setStockListId(i.getStockListId());
 									disStockListDetail.setStockLockingStatus(StockLockingStatusConstant.wuzhuangche.getValue());
 									disStockListDetail.setStockStatus(StockStatusConstant.daibangding.getValue());
@@ -689,12 +692,27 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 	@Override
 	public List<String> createPackageCode(Long reservationId, Long stockListId, Integer packageNum) {
+		//判断任务类型
+		DistributionStockupInfoEntity one = distributionStockupInfoService.getOne(Wrappers.<DistributionStockupInfoEntity>query().lambda()
+			.eq(DistributionStockupInfoEntity::getReservationId, reservationId)
+		);
+
+		if(ObjectUtils.isNotNull(one) && one.getStockUpType().equals("3")){
+			//自提
+			//通过预约单id和订单
+			Integer num = distributionReservationService.getReservationNumStockSelf(reservationId, stockListId);
+			if (packageNum.compareTo(num) > 0) {
+				log.warn("###################createPackageCode: 包条数量与预约数量不正确");
+				throw new CustomerException(405, "包条数量与预约数量不正确");
+			}
+		}else{
+			//通过预约单id和订单
+			Integer num = distributionReservationService.getReservationNumByReservationIdAndStockListId(reservationId, stockListId);
+			if (packageNum.compareTo(num) > 0) {
+				log.warn("###################createPackageCode: 包条数量与预约数量不正确");
+				throw new CustomerException(405, "包条数量与预约数量不正确");
+			}
 
-		//通过预约单id和订单
-		Integer num = distributionReservationService.getReservationNumByReservationIdAndStockListId(reservationId, stockListId);
-		if (packageNum.compareTo(num) > 0) {
-			log.warn("###################createPackageCode: 包条数量与预约数量不正确");
-			throw new CustomerException(405, "包条数量与预约数量不正确");
 		}
 
 		String deptId = AuthUtil.getDeptId();
@@ -716,7 +734,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			disStockOrdercodeRecoService.save(disStockOrdercodeReco);
 			ls.add(packageCode);
 		}
-
 		return ls;
 	}