自提扫描BUG、取消预约取消备货

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

@@ -40,6 +40,11 @@ import java.util.Map;
 public class DistributionSignforStockArticleVO implements Serializable {
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * Id
+	 */
+	@ApiModelProperty(value = "Id")
+	private Long id;
 	/**
 	 * 运单号
 	 */

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

@@ -1107,11 +1107,11 @@
     </select>
     <select id="pageSignforListOwe" resultType="com.logpm.distribution.vo.DistributionSignforStockArticleVO">
         SELECT
+        ldsa.id AS id,
         ldsa.waybill_number AS waybillNumber,
         ldsa.service_number AS serviceNumber,
         ldsa.order_code orderCode,
         ldsa.mall_name mallName,
-
         ldsa.warehouse warehouseName,
         ldsa.warehouse_entry_time warehouseEntryTime,
         ldsa.consignee_unit consigneeUnit,

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

@@ -278,4 +278,7 @@ public interface DistributionStockupMapper extends BaseMapper<DistributionStocku
 	 * @return
 	 */
     List<DistributionStockupInventoryDetailVO> selectInventoryDetailByBillLadingIdAndStockListId(@Param("billLadingId") Long billLadingId,@Param("stockListId") Long stockListId);
+
+
+	Integer cancelStockUpTasks(@Param("reservationIds")List<Long> reservationIds,@Param("stockUpId") Long stockUpId);
 }

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

@@ -39,6 +39,19 @@
         FROM logpm_distribution_stockup
         WHERE id = #{id}
     </delete>
+    <update id="cancelStockUpTasks">
+        UPDATE logpm_distribution_stockup_info SET stock_status = 4
+        <where>
+            stockup_id = #{stockUpId}
+            <if test="reservationIds != null">
+                AND  reservation_id in
+                <foreach collection="reservationIds" item="item" close=")" separator="," open="(">
+                    #{item}
+                </foreach>
+            </if>
+
+        </where>
+    </update>
 
     <select id="selectPackageExist" resultType="Integer">
         select COUNT(ldpl.id)
@@ -245,8 +258,18 @@
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldrp.parce_list_id
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldrp.parce_list_id
         LEFT JOIN logpm_warehouse_tray lwt on lwtg.tray_id = lwt.id
+        LEFT JOIN (
+        SELECT
+        IFNULL(COUNT( b.reservation_id ),0 )AS aaa,
+        b.stockup_id AS stockup_id
+        FROM
+        logpm_distribution_stockup AS a
+        LEFT JOIN logpm_distribution_stockup_info AS b ON a.id = b.stockup_id
+        WHERE b.stock_status != 4
+        GROUP BY b.stockup_id
+        ) AS aa ON aa.stockup_id = lds.id
         <where>
-            lds.is_deleted = 0
+            lds.is_deleted = 0 AND aa.aaa > 0 AND ldsi.stock_status != 4
             <!-- lds.tenant_id = #{param.tenantId} -->
             <if test="param.typeService != null and param.typeService != '' ">and lds.type_service =  #{param.typeService}
             </if>
@@ -408,7 +431,7 @@
         from logpm_distribution_stockup ds
         LEFT JOIN logpm_distribution_stockup_info ldsi on ds.id = ldsi.stockup_id
         LEFT JOIN logpm_distribution_reservation ldr on ldr.id = ldsi.reservation_id
-        where ds.id = lds.id
+        where ds.id = lds.id AND ldsi.stock_status != 4
         ) customer,
         (
         select GROUP_CONCAT(DISTINCT lwug.position_code )
@@ -418,7 +441,7 @@
         ldrp.packet_bar_status in (1,3)
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.id = ldrp.parce_list_id
         LEFT JOIN logpm_warehouse_updown_goods lwug on ldpl.id = lwug.association_id
-        where ds.id = lds.id
+        where ds.id = lds.id AND ldsi.stock_status != 4
         ) warehouseArea ,
         (
         select GROUP_CONCAT(DISTINCT lwtg.tray_code)
@@ -428,7 +451,7 @@
         ldrp.packet_bar_status in (1,3)
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.id = ldrp.parce_list_id
         LEFT JOIN logpm_warehouse_tray_goods lwtg on ldpl.id = lwtg.association_id
-        where ds.id = lds.id
+        where ds.id = lds.id AND ldsi.stock_status != 4
         ) trays,
         (
         select COUNT(ldrs.id)
@@ -436,7 +459,7 @@
         LEFT JOIN logpm_distribution_stockup_info ldsi on ds.id = ldsi.stockup_id
         LEFT JOIN logpm_distribution_reservation_stockarticle ldrs on ldrs.reservation_id = ldsi.reservation_id and
         ldrs.stock_article_status in (1,3)
-        where ds.id = lds.id
+        where ds.id = lds.id AND ldsi.stock_status != 4
         ) orderNum ,
         (
         select COUNT(DISTINCT ldrp.id)
@@ -444,7 +467,7 @@
         LEFT JOIN logpm_distribution_stockup_info ldsi on ds.id = ldsi.stockup_id
         LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.reservation_id = ldsi.reservation_id and
         ldrp.packet_bar_status in (1,3)
-        where ds.id = lds.id
+        where ds.id = lds.id AND ldsi.stock_status != 4
         )planNum,
         (
         select IFNULL(SUM(ldrs.reservation_num),0)
@@ -452,14 +475,14 @@
         LEFT JOIN logpm_distribution_stockup_info ldsi on ds.id = ldsi.stockup_id
         LEFT JOIN logpm_distribution_reservation_stocklist ldrs on ldrs.reservation_id = ldsi.reservation_id and
         ldrs.stock_list_status in (1,3)
-        where ds.id = lds.id
+        where ds.id = lds.id AND ldsi.stock_status != 4
         ) inventoryNub
         from logpm_distribution_stockup lds
         LEFT JOIN logpm_distribution_stockup_info ldsi on lds.id = ldsi.stockup_id
         LEFT JOIN logpm_distribution_reservation_stockarticle ldrs on ldrs.reservation_id = ldsi.reservation_id
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldrs.stock_article_id
         <where>
-            lds.is_deleted = 0 and lds.type_service in (1,2)
+            lds.is_deleted = 0 and lds.type_service in (1,2) AND ldsi.stock_status != 4
             <if test="param.stockupDateStart != null and param.stockupDateStart">and lds.stockup_date between
                 #{param.stockupDateStart} and #{param.stockupDateEnd}
             </if>
@@ -511,7 +534,7 @@
         LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldbs.bill_lading_id = ldsi.reservation_id and ldbs.order_status
         in (1,2)
         <where>
-            lds.is_deleted = 0 and lds.type_service = 3
+            lds.is_deleted = 0 and lds.type_service = 3 AND ldsi.stock_status != 4
             <if test="param.stockupDateStart != null and param.stockupDateStart">and lds.stockup_date between
                 #{param.stockupDateStart} and #{param.stockupDateEnd}
             </if>
@@ -735,7 +758,7 @@
         from logpm_distribution_stockup lds
         LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id = lds.id
         <where>
-            lds.id = #{param.stockupId}
+            lds.id = #{param.stockupId} AND ldsi.stock_status != 4
         </where>
     </select>
 
@@ -886,6 +909,7 @@
             from logpm_distribution_stockup_info )
             and ldsi.stockup_id = #{param.id}
             and ldr.is_deleted = 0
+            and ldsi.stock_status != 4
         <if test="param.stockupStatus != null and param.stockupStatus !=''"> and ldr.stockup_status = #{param.stockupStatus} </if>
         <if test="param.mallName != null and param.mallName !=''"> and ldr.mall_name = #{param.mallName} </if>
         <if test="param.goodsAllocation != null and param.goodsAllocation !=''"> and lwug.position_code like concat('%', #{param.goodsAllocation},'%' )</if>
@@ -915,6 +939,7 @@
         <where>
             ldsi.stockup_id = #{ id }
             AND ldsi.is_deleted = 0
+            AND ldsi.stock_status != 4
         </where>
 
     </select>
@@ -957,7 +982,7 @@
         LEFT JOIN logpm_distribution_reservation ldr on ldsi.reservation_id = ldr.id
         LEFT JOIN logpm_distribution_reservation_stockarticle ldrs on ldsi.reservation_id = ldrs.reservation_id
         <where>
-            ldsi.stockup_id =#{id}
+            ldsi.stockup_id =#{id} AND ldsi.stock_status != 4
         </where>
 
     </select>

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

@@ -300,4 +300,11 @@ public interface IDistributionStockupService extends BaseService<DistributionSto
 	 * @return
 	 */
 	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/DistributionReservationServiceImpl.java

@@ -2727,6 +2727,12 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 					}
 					//这里直接进行物理删除即可，但是在删除前需要将数据状态进行维护
 					//处理预约的包件信息
+				}else {
+					//取消备货任务
+					List<Long> reservationIds = new ArrayList<>();
+					reservationIds.add(reservationEntity.getId());
+					Integer row = distributionStockupMapper.cancelStockUpTasks(reservationIds,stockupEntity.getId());
+					log.info("#################取消预约，取消备货任务:{}",reservationEntity.getReservationCode());
 				}
 				reservationEntity.setReservationStatus(ReservationStatusConstant.yiquexiao.getValue());
 				this.updateById(reservationEntity);

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

@@ -569,6 +569,7 @@ 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/DistributionStockupServiceImpl.java

@@ -3367,4 +3367,36 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		List<DistributionStockupInventoryDetailVO> detailVOS = baseMapper.selectInventoryDetailByBillLadingIdAndStockListId(billLadingId,stockListId);
 		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-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

@@ -1826,6 +1826,12 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			return Resp.scanFail("3000", "参数不完整！！");
 		} else {
 			DistrilbutionBillLadingEntity billLadingEntity1 = baseMapper.selectById((Serializable) billLadingId);
+			DistrilbutionAppBillLadingOrderMainVO billLadingOrderMainVO = baseMapper.getBillLadingOrderMainVO(Long.parseLong((String) billLadingId));
+			Integer planNum = billLadingOrderMainVO.getPlanNum();
+			Integer signedNum = billLadingOrderMainVO.getSignedNum();
+			if (planNum == signedNum){
+				return Resp.scanFail("提货任务扫描已完成！", "提货任务扫描已完成！");
+			}
 			if (ObjectUtils.isNotNull(billLadingEntity1) && "30".equals(billLadingEntity1.getConditions())) {
 				return Resp.scanFail("提货任务已完成！", "提货任务已完成！");
 			}