修改自提签收逻辑

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

@@ -440,7 +440,7 @@
                 concat('%',#{param.orderCodeNumLike},'%')
             </if>
             <if test=" param.reservation != '' and param.reservation != null  ">
-             and ldsa.reservation_status in (10,20)
+             and ldsa.reservation_status in (10,20) and ldpl.order_package_reservation_status = 10
             </if>
             <if test=" param.waybillNumList != null  ">
                 and ldpl.waybill_number in

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

@@ -186,6 +186,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						addPrint(distrilbutionBillLading);
 					}
 				}
+			}else{
+				//操作图片
+				if (!distrilbutionBillLading.getPrintList().isEmpty()) {
+					addPrint(distrilbutionBillLading);
+				}
 			}
 			//查询这个费用
 			List<DistributionDeliveryChargeEntity> list = distributionDeliveryChargeService.list(Wrappers.<DistributionDeliveryChargeEntity>query().lambda()
@@ -1653,6 +1658,19 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		String[] split = ids.split(",");
 		for (int i = 0; i < split.length; i++) {
 			String s = split[i];
+			//查询是不是上传图片
+			List<DistributionPrintEntity> list1 = distributionPrintService.list(Wrappers.<DistributionPrintEntity>query().lambda()
+				.eq(DistributionPrintEntity::getBillLadingId, s)
+			);
+			if(list1.isEmpty()){
+				throw new ServiceException("请上传签收图片！！");
+			}
+			int count = (int) list1.stream().filter(ii -> "1".equals(ii.getGenre().toString())).count();
+			int count1 = (int) list1.stream().filter(ii -> "2".equals(ii.getGenre().toString())).count();
+			int count2 = (int) list1.stream().filter(ii -> "3".equals(ii.getGenre().toString())).count();
+			if(count1 < 1 || count < 1 || count2 < 1){
+				throw new ServiceException("请上传完整签收图片！！");
+			}
 			//修改提货状态
 			DistrilbutionBillLadingEntity billLadingEntity = new DistrilbutionBillLadingEntity();
 			billLadingEntity.setConditions(BillLadingStatusConstant.yiqianshou.getValue());
@@ -1742,23 +1760,39 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			}
 
 			//添加包件签收记录
+//			list.stream().forEach(i ->{
+//				distributionParcelListService.lambdaUpdate()
+//					.set(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yiqianshou.getValue())
+//					.eq(DistributionParcelListEntity::getId, i);
+//				DistributionBillLadingScanEntity billLadingScan = new DistributionBillLadingScanEntity();
+//				billLadingScan.setMaterialType("2");
+//				billLadingScan.setScanType(2);
+//				billLadingScan.setParcelListId(i.getParceListId());
+//				billLadingScan.setStockArticleId(i.getStockArticleId());
+//				billLadingScan.setBillLadingId(billId);
+//				billLadingScan.setPacketBarCode( i.getPacketBarCode());
+//				billLadingScan.setQuantity(i.getPacketNumber());
+//				scanEntityList.add(billLadingScan);
+//			});
+			//回退包件信息
 			list.stream().forEach(i ->{
-				distributionParcelListService.lambdaUpdate()
-					.set(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yiqianshou.getValue())
-					.eq(DistributionParcelListEntity::getId, i);
-				DistributionBillLadingScanEntity billLadingScan = new DistributionBillLadingScanEntity();
-				billLadingScan.setMaterialType("2");
-				billLadingScan.setScanType(2);
-				billLadingScan.setParcelListId(i.getParceListId());
-				billLadingScan.setStockArticleId(i.getStockArticleId());
-				billLadingScan.setBillLadingId(billId);
-				billLadingScan.setPacketBarCode( i.getPacketBarCode());
-				billLadingScan.setQuantity(i.getPacketNumber());
-				scanEntityList.add(billLadingScan);
+				DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
+				parcelListEntity.setId(i.getParceListId());
+				parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
+				distributionParcelListService.updateById(parcelListEntity);
+//				DistributionBillLadingScanEntity billLadingScan = new DistributionBillLadingScanEntity();
+//				billLadingScan.setMaterialType("2");
+//				billLadingScan.setScanType(2);
+//				billLadingScan.setParcelListId(i.getParceListId());
+//				billLadingScan.setStockArticleId(i.getStockArticleId());
+//				billLadingScan.setBillLadingId(billId);
+//				billLadingScan.setPacketBarCode( i.getPacketBarCode());
+//				billLadingScan.setQuantity(i.getPacketNumber());
+//				scanEntityList.add(billLadingScan);
 			});
-			if(!scanEntityList.isEmpty()){
-				distributionBillLadingScanService.saveBatch(scanEntityList);
-			}
+//			if(!scanEntityList.isEmpty()){
+//				distributionBillLadingScanService.saveBatch(scanEntityList);
+//			}
 		}
 
 	}