Merge branch 'dev' into pre-production

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

@@ -65,4 +65,13 @@ public interface DistributionParcelNumberMapper extends BaseMapper<DistributionP
 	 * @return
 	 */
 	List<DistributionParcelNumberEntity> selectParcelNumber(String orderCode, Long warehouseId);
+
+	/**
+	 * 维护零担品类出库信息
+	 * @param id
+	 * @param stockArticleId
+	 * @param quantity
+	 * @return
+	 */
+    Integer augmentSignForNum(@Param("packageId") Long id,@Param("stockArticleId") Long stockArticleId,@Param("quantity") Integer quantity);
 }

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

@@ -25,6 +25,18 @@
         <result column="delivery_quantity" property="deliveryQuantity"/>
         <result column="signin_quantity" property="signinQuantity"/>
     </resultMap>
+    <update id="augmentSignForNum">
+        UPDATE
+        logpm_distribution_parcel_number
+        SET
+        delivery_quantity = delivery_quantity - #{quantity},
+        hand_quantity = hand_quantity - #{quantity},
+        outbound_quantity = outbound_quantity + #{quantity},
+        signin_quantity = signin_quantity + #{quantity}
+        WHERE
+        parcel_list_id = #{packageId}
+        AND stock_article_id = #{stockArticleId}
+    </update>
 
 
     <select id="selectDistributionParcelNumberPage" resultMap="distributionParcelNumberResultMap">

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

@@ -71,4 +71,11 @@ public interface IDistributionParcelNumberService extends BaseService<Distributi
 	 */
 	R updateEntryNum(List<DistributionParcelNumberDTO> distributionParcelNumberDTO);
 
+	/**
+	 * 扣减零担在库数量，增加签收、出库数量
+	 * @param id
+	 * @param stockArticleId
+	 * @param quantity
+	 */
+	Integer augmentSignForNum(Long id, Long stockArticleId, Integer quantity);
 }

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

@@ -376,12 +376,14 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 			BeanUtils.copyProperties(i, parcelListVO);
 			parcelListVO.setLibraryQuantity(parcelNumber.getHandQuantity());
 			parcelListVO.setDeliveryQuantity(parcelNumber.getDeliveryQuantity());
+			parcelListVO.setTiQuantity((parcelNumber.getHandQuantity() - parcelNumber.getDeliveryQuantity()));
+
 			if (Func.isNotEmpty(reservationId)){
 				if (Func.isNotEmpty(one)){
 					parcelListVO.setDeliveryQuantity(parcelNumber.getDeliveryQuantity() - one.getQuantity());
+					parcelListVO.setTiQuantity(one.getQuantity());
 				}
 			}
-			parcelListVO.setTiQuantity((parcelNumber.getHandQuantity() - parcelNumber.getDeliveryQuantity()));
 			if (ObjectUtils.isNotNull(one)) {
 				parcelListVO.setReservationQuantity(one.getQuantity());
 			} else {

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

@@ -86,17 +86,21 @@ public class DistributionParcelNumberServiceImpl extends BaseServiceImpl<Distrib
 	@Async
 	@Override
 	public void updateBillNum(Long parcelListId, int i1, int i) {
+		log.info("updateBillNum>>>>>>>>>>>>>>>>>>>>>>判定零担修改参数parcelListId:{},i1:{},i:{}",parcelListId,i1,i);
 		DistributionParcelNumberEntity parcelNumberEntity = baseMapper.selectOne(Wrappers.<DistributionParcelNumberEntity>query().lambda().eq(DistributionParcelNumberEntity::getParcelListId, parcelListId));
 		DistributionParcelNumberEntity parcelEntity = new DistributionParcelNumberEntity();
 		switch (i){
 			case 1:
 				//加
 				parcelEntity.setId(parcelNumberEntity.getId());
-				parcelEntity.setDeliveryQuantity(parcelNumberEntity.getDeliveryQuantity() - i1);
+				parcelEntity.setDeliveryQuantity(parcelNumberEntity.getDeliveryQuantity() + i1);
 			case 2:
 				//减
 				parcelEntity.setId(parcelNumberEntity.getId());
-				parcelEntity.setDeliveryQuantity(parcelNumberEntity.getDeliveryQuantity() + i1);
+				parcelEntity.setDeliveryQuantity(parcelNumberEntity.getDeliveryQuantity() - i1);
+			default:
+				log.info(">>>>>>>>>>>>>>>>>>>>>>判定零担修改未知类型:{}",i);
+				break;
 		}
 		baseMapper.updateById(parcelEntity);
 	}
@@ -159,4 +163,15 @@ public class DistributionParcelNumberServiceImpl extends BaseServiceImpl<Distrib
 		return R.status(true);
 	}
 
+	/**
+	 * @param id
+	 * @param stockArticleId
+	 * @param quantity
+	 * @return
+	 */
+	@Override
+	public Integer augmentSignForNum(Long id, Long stockArticleId, Integer quantity) {
+		return baseMapper.augmentSignForNum(id,stockArticleId,quantity);
+	}
+
 }

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

@@ -727,7 +727,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 										);
 										int num = distributionParcelNumberEntity.getDeliveryQuantity() + distributionParcelListDTO.getTiQuantity();
 										distributionParcelNumberEntity.setDeliveryQuantity(num);
-										if (distributionParcelListDTO.getTiQuantity() > (distributionParcelNumberEntity.getHandQuantity() - distributionParcelNumberEntity.getDeliveryQuantity())){
+										if ( (distributionParcelNumberEntity.getHandQuantity() - num) < 0){
 											throw new ServiceException(stockArticleEntity.getOrderCode()+"订单在库数量不足！！！");
 										}
 										distributionParcelNumberService.updateById(distributionParcelNumberEntity);
@@ -1221,6 +1221,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 								distributionParcelNumberService.updateBillNum(i.getParcelListId(), i1, 2);
 							} else {
 								//不做操作！
+								iterator.remove();
 								continue;
 							}
 							//修改预约数量
@@ -2811,6 +2812,12 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					billLadingScan.setMaterialType("3");
 					billLadingScan.setQuantity(i.getQuantity());
 					billLadingScanList.add(billLadingScan);
+					//维护零担品类的出库数量
+
+					Integer integer = distributionParcelNumberService.augmentSignForNum(i.getId(), i.getStockArticleId(), i.getQuantity());
+					log.info("###############维护零担品类出库数量packageId:{},stockArticleId:{},",i.getId(),i.getStockArticleId());
+					log.info("###############维护零担品类出库数量维护品类行数:{}",integer);
+
 				});
 				int sum = v.stream().mapToInt(DistrilbutionAppBillLadingZeroVO::getQuantity).sum(); //填写的签收数量
 				//修改订单签收钻状态
@@ -3088,7 +3095,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			return distrilbutionBillStockService.update(Wrappers.<DistrilbutionBillStockEntity>update()
 				.eq("bill_lading_id", billLadingId)
 				.eq("stock_article_id", stockArticleId)
-				.set("conditions", 2)
+				.set("conditions", 20)
 			);
 		}
 		return false;