自提状态维护

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

@@ -256,7 +256,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 											//xiugai
 											DistributionDeliveryDetailsEntity d = new DistributionDeliveryDetailsEntity();
 											d.setId(i.getId());
-											d.setConditions("1");
+											d.setConditions(BillLadingStatusConstant.daitihuo.getValue());
 											distributionDeliveryDetailsService.updateById(d);
 										}
 									} else if (inventoryQuantity < quantity) {
@@ -367,7 +367,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					DistrilbutionBillStockEntity distrilbutionBillStock = new DistrilbutionBillStockVO();
 					distrilbutionBillStock.setBillLadingId(distrilbutionBillLading.getId());
 					distrilbutionBillStock.setStockArticleId(Long.parseLong(s));
-					distrilbutionBillStock.setConditions("1");
+					distrilbutionBillStock.setConditions(BillLadingStatusConstant.daitihuo.getValue());
 					distrilbutionBillStock.setOrderStatus("1");
 					distrilbutionBillStockService.save(distrilbutionBillStock);
 					List<DistrilbutionBillPackageEntity> packageEntityList = new ArrayList<>();
@@ -469,7 +469,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				details.setBillLadingId(distrilbutionBillLading.getId());
 				details.setStockListId(i.getId());
 				details.setQuantity(i.getInventoryQuantity());
-				details.setConditions("1");
+				details.setConditions(BillLadingStatusConstant.daitihuo.getValue());
 				details.setRealityQuantity(0);
 				if (finalLas) {
 					details.setInventoryStatus("2");
@@ -903,6 +903,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 //					List<DistributionParcelListEntity> list = distributionParcelListService.list(queryWrapper);
 					List<DistrilbutionBillPackageEntity> list = distrilbutionBillPackageService.list(Wrappers.<DistrilbutionBillPackageEntity>query().lambda()
 						.eq(DistrilbutionBillPackageEntity::getBillLadingId,vo.getBillLadingId())
+						.eq(DistrilbutionBillPackageEntity::getStockArticleId,s)
 						.apply("packet_bar_status in (1,3)")
 					);
 					int pn = list.size(); //包件数量