Merge branch 'dev' into pre-production

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

@@ -355,9 +355,9 @@ public class DistributionStockupAppController extends BladeController {
 				return R.fail("未知的查询类型");
 			}
 		}
-		return Resp.scanFail("零担备货维护中!!!","零担备货维护中!!!");
+//		return Resp.scanFail("零担备货维护中!!!","零担备货维护中!!!");
 
-//		return R.data(map);
+		return R.data(map);
 	}
 
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/BillLadingAppDTO.java

@@ -21,6 +21,7 @@ public class BillLadingAppDTO implements Serializable {
 	private Integer orderStatus;//订单状态
 
 	private Long billLadingId;//自提单id
+	private Long stockArticleId;//自提单id
 
 	private Integer scanStatus;//扫码类型
 

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

@@ -115,10 +115,11 @@
     </select>
     <select id="getBillOrderDetail" resultType="com.logpm.distribution.vo.DistributionBillOrderVO">
 
-        select DISTINCT ldsa.order_code orderCode,ldsa.total_number,ldsa.description_goods descriptionGoods,ldsa.stockup_status stockupStatus,
+        select DISTINCT ldsa.order_code orderCode,ldsa.total_number,
+        ldsa.description_goods descriptionGoods,ldsa.stockup_status stockupStatus,
         (select COUNT(id) from  logpm_distrilbution_bill_package
-        where  stock_article_id = ldsa.id and packet_bar_status in (1,3)  and  bill_lading_id =   #{param.billLadingId}  ) handQuantity,
-        (select COUNT(id) from  logpm_distribution_bill_lading_scan
+        where  stock_article_id = ldsa.id and packet_bar_status in (1,3)  and  bill_lading_id =   #{param.billLadingId}  ) + (SELECT IFNULL(SUM(quantity),0) FROM logpm_distribution_reservation_zero_package WHERE stock_article_id = ldsa.id AND zero_package_status IN ( 1, 3 ) AND reservation_id = #{param.billLadingId}) handQuantity,
+        (select IFNULL(SUM(quantity),0) from  logpm_distribution_bill_lading_scan
         where  stock_article_id = ldsa.id ) pick_up_quantity,
         CASE
         WHEN ( SELECT count( id ) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id )  = 0 THEN 10

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

@@ -1994,7 +1994,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 							distributionStockArticleVO.setReservationNum(list3.size());
 						}else {
 							distributionStockArticleVO.setReservationNum(0);
-
 						}
 					}else {
 						List<DistributionReservationZeroPackageEntity> reservationZeroPackageEntities = distributionZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
@@ -2762,6 +2761,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		List<DistributionReservationZeroPackageEntity> list = distributionZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
 			.eq(DistributionReservationZeroPackageEntity::getReservationId, billLadingAppDTO.getBillLadingId())
 			.eq(DistributionReservationZeroPackageEntity::getIsDeleted, 0)
+			.eq(DistributionReservationZeroPackageEntity::getStockArticleId, billLadingAppDTO.getStockArticleId())
 			.in(DistributionReservationZeroPackageEntity::getZeroPackageStatus, "1", "3")
 		);
 		List<DistrilbutionAppBillLadingZeroVO> parcelListEntityList = new ArrayList<>();
@@ -2916,6 +2916,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					BeanUtils.copyProperties(byId, zeroOrderVO);
 					zeroOrderVO.setReservationQuantity(sum);
 					zeroOrderVO.setRealityQuantity(sum1);
+					zeroOrderVO.setId(k);
 					//查询签收订单数量
 					List<DistributionBillLadingScanEntity> list1 = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
 						.eq(DistributionBillLadingScanEntity::getBillLadingId, billLadingAppDTO.getBillLadingId())

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java

@@ -69,6 +69,7 @@ public class DistributionStockArticleWrapper extends BaseEntityWrapper<Distribut
 					break;
 			}
 		}
+		distributionStockupVO.setReservationNum(entity.getHandQuantity()-entity.getDeliveryQuantity());
 		buildVoInfor(distributionStockupVO);
 		return distributionStockupVO;
 	}