Merge branch 'dev' into pre-production

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

@@ -2040,7 +2040,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				}
 				return Resp.scanFail("此码不是订制品", "此码不是订制品");
 			}
-
+			List<String> orderPackageCodes = new ArrayList<>();
 			List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.selectPackageListByReservationId(distrilbutionloadingscanDTO.getReservationId());
 			//查询该客户是否存在该包件信息
 			List<DistributionParcelListEntity> collect = parcelListEntityList.stream().filter(p -> p.getOrderPackageCode().equals(distrilbutionloadingscanDTO.getBarcode())).collect(Collectors.toList());
@@ -2153,6 +2153,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				distributionStockArticleService.maintenanceOrderInfo(collect.get(0).getOrderCode(), myCurrentWarehouse.getId());
 				//推送信息至工厂
 				distributionAsyncService.sendFactory(collect.get(0), simpleDateFormat.format(new Date()), distributionReservationEntity.getId(), distributionReservationEntity.getReservationCode(), myCurrentWarehouse.getName(), nickName);
+				orderPackageCodes.add(updatePackage.getOrderPackageCode());
+
 
 			} else if (Func.isEmpty(collect)) {
 				//这里就需要对该包件信息是否属于该配送计划进行判定。如果属于该配送计划则是串货。不是那么则需要提示是否异常签收或者返回的操作
@@ -2193,12 +2195,15 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				//一个客户下出现重复包条码
 				log.error("############出现重复包条码：{}", collect);
 			}
+
+
+
 			String str = checkSignNum(distrilbutionloadingscanDTO);
 			//维护客户
 			distributionReservationService.maintenanceReservationInfo(distrilbutionloadingscanDTO.getReservationId());
 			//维护配送任务
 			distributionDeliveryListService.maintenanceDeliveryInfo(distrilbutionloadingscanDTO.getDeliveryId());
-			return Resp.scanSuccess("签收成功", str);
+			return Resp.scanSuccessWithData("签收成功", str,orderPackageCodes);
 		} catch (Exception e) {
 			log.error(">>>>> 签收异常报错", e);
 			throw new CustomerException("当前登录信息不已失效，请重新登录");

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

@@ -36,6 +36,7 @@ import com.logpm.distribution.dto.DistrilbutionBillLadingDTO;
 import com.logpm.distribution.dto.app.BillLadingAppDTO;
 import com.logpm.distribution.entity.*;
 import com.logpm.distribution.excel.DistrilbutionBillLadingExcel;
+import com.logpm.distribution.mapper.DistributionStockListMapper;
 import com.logpm.distribution.mapper.DistrilbutionBillLadingMapper;
 import com.logpm.distribution.service.*;
 import com.logpm.distribution.vo.*;
@@ -110,6 +111,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	private final IDistributionStockupScanService distributionStockupScanService;
 
 	private final IDistributionStockListService distributionStockListService;
+	private final DistributionStockListMapper distributionStockListMapper;
 	private final IDistributionAsyncService distributionAsyncService;
 	private final IDistributionStockService distributionStockService;
 	private final IDistributionStockupService distributionStockupService;
@@ -1832,6 +1834,10 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 							distributionBillLadingScan.setQuantity(1);
 							distributionBillLadingScanService.save(distributionBillLadingScan);
 							stockListId = collect.get(0).getStockListId();
+							//扣减库存
+							distributionStockListMapper.deductionQuantityStock(collect.get(0).getStockListId(),collect.get(0).getNum());
+
+
 						}else {
 							//不满足签收，记录为什么不满足
 							if (collect.size() > 1){