Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java

@@ -399,8 +399,8 @@ public class DistributionDeliveryListController extends BladeController {
 	@GetMapping("/getDeliveryZeroOrderDetail")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "customArgs")
-	public R<List<DistributionParcelNumberVO>> getDeliveryZeroOrderDetail(@ApiIgnore @RequestParam Long deliveryId,@RequestParam Long orderId) {
-		List<DistributionParcelNumberVO> parcelNumberVOS = distributionDeliveryListService.getDeliveryZeroOrderDetail(deliveryId, orderId);
+	public R getDeliveryZeroOrderDetail(@ApiIgnore @RequestParam Long deliveryId,@RequestParam Long orderId) {
+		R parcelNumberVOS = distributionDeliveryListService.getDeliveryZeroOrderDetail(deliveryId, orderId);
 		return R.data(parcelNumberVOS);
 	}
 

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

@@ -285,7 +285,7 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
 	 * @param orderId
 	 * @return
 	 */
-	List<DistributionParcelNumberVO> getDeliveryZeroOrderDetail(Long deliveryId, Long orderId);
+	R getDeliveryZeroOrderDetail(Long deliveryId, Long orderId);
 
 	/**
 	 * 零担装车

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

@@ -5653,7 +5653,15 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	}
 
 	@Override
-	public List<DistributionParcelNumberVO> getDeliveryZeroOrderDetail(Long deliveryId, Long orderId) {
+	public R getDeliveryZeroOrderDetail(Long deliveryId, Long orderId) {
+		List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
+			.eq(DistributionLoadscanEntity::getDeliveryId, deliveryId)
+			.eq(DistributionLoadscanEntity::getOrderId, orderId)
+			.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
+		);
+		if (!Func.isEmpty(loadscanEntityList)){
+			return R.fail("此订单已进行装车操作,请滞留后编辑");
+		}
 		List<DistributionParcelNumberVO> zeroOrderDetail = distributionStockArticleService.getZeroOrderDetail(orderId);
 		List<DistributionParcelNumberVO> parcelNumberVOS = baseMapper.selectDeliveryZeroOrderDetail(orderId, deliveryId);
 		Map<Long, DistributionParcelNumberVO> reservationNum = parcelNumberVOS.stream().collect(Collectors.toMap(DistributionParcelNumberVO::getParcelListId, Function.identity(), (k1, k2) -> k2));
@@ -5662,7 +5670,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				z.setReservationNum(reservationNum.get(z.getParcelListId()).getReservationNum());
 			}
 		});
-		return zeroOrderDetail;
+		return R.data(zeroOrderDetail);
 	}
 
 	@Override

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

@@ -31,11 +31,13 @@ import com.logpm.distribution.service.IDistributionParcelNumberService;
 import com.logpm.distribution.service.IDistributionReservationZeroPackageService;
 import com.logpm.distribution.service.IDistributionStockArticleService;
 import com.logpm.distribution.vo.DistributionReservationZeroPackageVO;
+import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant;
 import org.springblade.common.constant.reservation.ReservationPackageStatusConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -106,6 +108,7 @@ public class DistributionReservationZeroPackageServiceImpl extends BaseServiceIm
 	 * @param collect
 	 */
 	@Override
+	@Transactional
 	public void recoverZeroPackage(Long reservationId, List<Long> collect) {
 		String method = "###################DistributionReservationZeroPackageServiceImpl.recoverZeroPackage";
 		List<DistributionReservationZeroPackageEntity> reservationZeroPackageEntities = this.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
@@ -120,16 +123,17 @@ public class DistributionReservationZeroPackageServiceImpl extends BaseServiceIm
 			//进行预约数量的扣减
 			int i = distributionParcelNumberEntity.getDeliveryQuantity() - distributionParcelNumberEntity.getQuantity();
 			distributionParcelNumberEntity.setDeliveryQuantity(i);
+			if (i == 0){
+				parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
+				distributionParcelListMapper.updateById(parcelListEntity);
+			}
 			distributionParcelNumberService.updateById(distributionParcelNumberEntity);
 			reservationZeroPackageEntity.setQuantity(0);
 			reservationZeroPackageEntity.setZeroPackageStatus(ReservationPackageStatusConstant.quxiao.getValue());
 			distributionStockArticleService.maintenanceOrderInfo(parcelListEntity.getOrderCode(),parcelListEntity.getWarehouseId());
 			this.updateById(reservationZeroPackageEntity);
-
 		}
 
-
-
 	}
 
 }

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

@@ -1763,7 +1763,10 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			List<Long> longs = new ArrayList<>();
 			//存在的
 			list.forEach(i -> {
-				boolean b = parcelLisList.stream().anyMatch(ii -> ii.getId().equals(i.getParcelListId()));
+				boolean b = false;
+				if (!Func.isEmpty(parcelLisList)){
+					 b = parcelLisList.stream().anyMatch(ii -> ii.getId().equals(i.getParcelListId()));
+				}
 				if (b) {
 					//有数据
 					Iterator<DistributionParcelListDTO> iterator = parcelLisList.iterator();
@@ -1810,8 +1813,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						}
 					}
 				}
-				List<DistributionStockArticleEntity> distributionStockArticleEntities = collect.get(i.getStockArticleId());
-				if (!Func.isEmpty(distributionStockArticleEntities)) {
+				if (!Func.isEmpty(collect.get(i.getStockArticleId()))) {
+					List<DistributionStockArticleEntity> distributionStockArticleEntities = collect.get(i.getStockArticleId());
 					String orderCode = distributionStockArticleEntities.get(0).getOrderCode();
 					Long warehouseId = distributionStockArticleEntities.get(0).getWarehouseId();
 					log.info("#############维护零担订单信息:{},:{}", orderCode, warehouseId);
@@ -1828,18 +1831,22 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			}
 			// TODo 添加新的品类
 			List<DistributionReservationZeroPackageEntity> packageEntityList = new ArrayList<>();
-			parcelLisList.forEach(w -> {
-				DistributionReservationZeroPackageEntity zeroPackageEntity = new DistributionReservationZeroPackageEntity();
-				zeroPackageEntity.setParcelListId(w.getId());
-				zeroPackageEntity.setStockArticleId(w.getStockArticleId());
-				zeroPackageEntity.setReservationId(distrilbutionBillLadingDTO.getId());
-				zeroPackageEntity.setQuantity(w.getQuantity());
-				zeroPackageEntity.setZeroPackageStatus("3");
-				zeroPackageEntity.setCategoryName(w.getFirsts());
-				zeroPackageEntity.setType("3");
-				zeroPackageEntity.setRealityQuantity(0);
-				packageEntityList.add(zeroPackageEntity);
-			});
+			if (Func.isNotEmpty(parcelLisList)){
+				parcelLisList.forEach(w -> {
+					DistributionReservationZeroPackageEntity zeroPackageEntity = new DistributionReservationZeroPackageEntity();
+					zeroPackageEntity.setParcelListId(w.getId());
+					zeroPackageEntity.setStockArticleId(w.getStockArticleId());
+					zeroPackageEntity.setReservationId(distrilbutionBillLadingDTO.getId());
+					zeroPackageEntity.setQuantity(w.getQuantity());
+					zeroPackageEntity.setZeroPackageStatus("3");
+					zeroPackageEntity.setCategoryName(w.getFirsts());
+					zeroPackageEntity.setType("3");
+					zeroPackageEntity.setRealityQuantity(0);
+					packageEntityList.add(zeroPackageEntity);
+				});
+
+			}
+
 			if (!packageEntityList.isEmpty()) {
 				distributionZeroPackageService.saveBatch(packageEntityList);
 			}
@@ -3925,6 +3932,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		if (redis.exists(lockKey)) {
 			throw new ServiceException("请勿重复提交！！！");
 		}
+		DistrilbutionBillLadingEntity billLadingEntity = this.getById(billLadingAppDTO.getBillLadingId());
+		if (Func.isEmpty(billLadingEntity)) {
+			log.error("自提签收零担异常:{}",billLadingAppDTO.getBillLadingId());
+			throw new ServiceException("请勿重复提交！！！");
+		}
 		redis.setEx(lockKey, billLadingAppDTO.getBillLadingId(), 5L);
 		List<DistributionReservationZeroPackageEntity> list = distributionZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
 			.eq(DistributionReservationZeroPackageEntity::getReservationId, billLadingAppDTO.getBillLadingId())
@@ -3998,6 +4010,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			distributionAsyncService.getStockUPstate(billLadingAppDTO.getBillLadingId());
 			return Resp.scanSuccess("签收成功！", "签收成功！");
 		}
+		billLadingEntity.setConditions(BillLadingStatusConstant.yitihuo.getValue());
+		this.updateById(billLadingEntity);
 
 		return Resp.scanSuccess("签收失败！", "签收失败！");
 	}

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java

@@ -710,15 +710,23 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 		mtOrderLogEntity.setResBody(result);
 		mtOrderLogEntity.setType(type);
 		mtOrderLogEntity.setRefCode(refCode);
-		mtOrderLogService.save(mtOrderLogEntity);
 
-		//把结果字符串转为json对象
+		Integer PUSH_STATUS_SUCCESS = 1;
+		Integer PUSH_STATUS_FAIL    = 2;
 		JSONObject jsonObject = JSONObject.parseObject(result);
 
+		if (jsonObject == null || jsonObject.isEmpty() || 0 != jsonObject.getInteger("code")) {
+			mtOrderLogEntity.setPushStatus(PUSH_STATUS_FAIL);
+		} else {
+			mtOrderLogEntity.setPushStatus(PUSH_STATUS_SUCCESS);
+		}
+
+		mtOrderLogService.save(mtOrderLogEntity);
+
 		if (!Objects.isNull(jsonObject)) {
-			Integer code = jsonObject.getInteger("Result");
+			Integer code   = mtOrderLogEntity.getPushStatus();
 			String message = jsonObject.getString("Message");
-			if (0==code) {
+			if (PUSH_STATUS_SUCCESS.equals(code)) {
 				logger.info("##########sendMtFactoryData: 物流状态传递成功");
 				return Resp.success("物流状态传递成功");
 			} else {