Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java

@@ -39,6 +39,11 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class DistributionStockListEntity extends TenantEntity {
 
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private Long id;
 	/**
 	 * 预留1
 	 */

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java

@@ -37,28 +37,28 @@ public class DistributionAppDeliveryListVO extends DistributionDeliveryListEntit
 	/**
 	 * 装车件数
 	 */
-	@ApiModelProperty(value = "装车件数")
+	@ApiModelProperty(value = "计划装车件数")
 	private Integer loadingNub;
 
 	/**
 	 * 装车订单数
 	 */
-	@ApiModelProperty(value = "装车订单数")
+	@ApiModelProperty(value = "完成装车订单数")
 	private Integer loadOrdNub;
 	/**
 	 * 签收件数
 	 */
-	@ApiModelProperty(value = "签收件数")
+	@ApiModelProperty(value = "实际装车件数")
 	private Integer signNub;
 	/**
 	 * 签收完成件数
 	 */
-	@ApiModelProperty(value = "签收完成件数")
+	@ApiModelProperty(value = "装车完成件数")
 	private Integer signNubSr;
 	/**
 	 * 装车客户数
 	 */
-	@ApiModelProperty(value = "装车客户数")
+	@ApiModelProperty(value = "完成装车客户数")
 	private Integer loadCusNub;
 
 	/**
@@ -136,6 +136,8 @@ public class DistributionAppDeliveryListVO extends DistributionDeliveryListEntit
 	private List<DistributionAppReservationVO> reservationList;
 
 
+
+
 	/**
 	 * 包条数据
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java

@@ -241,7 +241,6 @@ public class BasicdataWarehouseController extends BladeController {
 	 */
 	@GetMapping("/getInfo")
 	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "分页", notes = "传入BasicdataGoodsShelf")
 	public R<List<BasicdataWarehouseVO>> getWarehouseAndGoodsAreaInfo() {
 		List<BasicdataWarehouseVO> basicdataGoodsShelfVOList = warehouseService.getWarehouseAndGoodsAreaInfo();
 		return R.data(basicdataGoodsShelfVOList);
@@ -252,7 +251,6 @@ public class BasicdataWarehouseController extends BladeController {
 	 */
 	@GetMapping("/warehouseList")
 	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "分页", notes = "传入BasicdataGoodsShelf")
 	public R<List<BasicdataWarehouseEntity>> getWarehouseList() {
 		List<BasicdataWarehouseEntity> basicdataGoodsShelfVOList = warehouseService.getWarehouseList();
 		return R.data(basicdataGoodsShelfVOList);
@@ -263,7 +261,6 @@ public class BasicdataWarehouseController extends BladeController {
 	 */
 	@GetMapping("/warehouseListqx")
 	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "分页", notes = "传入BasicdataGoodsShelf")
 	public R<List<BasicdataWarehouseEntity>> warehouseListqx() {
 		List<BasicdataWarehouseEntity> basicdataGoodsShelfVOList = warehouseService.warehouseListqx();
 		return R.data(basicdataGoodsShelfVOList);
@@ -276,7 +273,6 @@ public class BasicdataWarehouseController extends BladeController {
 	 */
 	@GetMapping("/getMyWarehouseList")
 	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "分页", notes = "传入BasicdataGoodsShelf")
 	public R<List<BasicdataWarehouseEntity>> getMyWarehouseList() {
 		List<BasicdataWarehouseEntity> basicdataGoodsShelfVOList = warehouseService.getMyWarehouseList();
 		return R.data(basicdataGoodsShelfVOList);
@@ -288,7 +284,7 @@ public class BasicdataWarehouseController extends BladeController {
 	 */
 	@PostMapping("/preserveCurrentWarehouse")
 	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "分页", notes = "传入BasicdataGoodsShelf")
+	@ApiOperation(value = "warehouseDTO", notes = "传入BasicdataGoodsShelf")
 	public R<?> preserveCurrentWarehouse(@RequestBody BasicdataWarehouseDTO warehouseDTO) {
 		R<?> r = warehouseService.preserveCurrentMyWarehouse(warehouseDTO);
 		return r;
@@ -301,7 +297,6 @@ public class BasicdataWarehouseController extends BladeController {
 	 */
 	@GetMapping("/getCurrentWarehouse")
 	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "分页", notes = "传入BasicdataGoodsShelf")
 	public R<?> getCurrentWarehouse() {
 		BasicdataWarehouseEntity obj = warehouseService.getMyCurrentWarehouse();
 		return R.data(obj);

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

@@ -112,8 +112,8 @@ public class DistributionDeliveryAppController {
 	@GetMapping("/wrap")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "查看配送明细", notes = "DistributionAppDeliveryListDTO")
-	public R<IPage<DistributionAppParcelListVO>> wrap(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO, Query query) {
-		IPage<DistributionAppParcelListVO> page = distributionDeliveryListService.selectDistributionAppDeliverywrap(Condition.getPage(query), distributionAppDeliveryListDTO);
+	public R<DistributionAppDeliveryListVO> wrap(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
+		DistributionAppDeliveryListVO page = distributionDeliveryListService.selectDistributionAppDeliverywrap(distributionAppDeliveryListDTO);
 		return R.data(page);
 	}
 
@@ -123,8 +123,8 @@ public class DistributionDeliveryAppController {
 	@GetMapping("/wrapIn")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "查看配送明细", notes = "DistributionAppDeliveryListDTO")
-	public R<IPage<DistributionAppStockArticleVO>> wrapIn(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO, Query query) {
-		IPage<DistributionAppStockArticleVO> page = distributionDeliveryListService.selectDistributionAppDeliverywrapIn(Condition.getPage(query), distributionAppDeliveryListDTO);
+	public R<List<DisStockListDetailVO>> wrapIn(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
+		List<DisStockListDetailVO> page = distributionDeliveryListService.selectDistributionAppDeliverywrapIn(distributionAppDeliveryListDTO);
 		return R.data(page);
 	}
 

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

@@ -139,7 +139,7 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
 	 * @param distributionAppDeliveryListDTO
 	 * @return
 	 */
-	IPage<DistributionAppParcelListVO> selectDistributionAppDeliverywrap(IPage<DistributionAppParcelListVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO);
+	DistributionAppDeliveryListVO selectDistributionAppDeliverywrap( DistributionAppDeliveryListDTO distributionAppDeliveryListDTO);
 	/**
 	 * 查询配送任务详情
 	 * @param id
@@ -151,7 +151,7 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
 	 */
 	IPage<DistributionAppReservationVO> getAppDeliveryreservationListPage(IPage<DistributionAppReservationVO> page,DistributionAppDeliveryListDTO distributionDeliveryList);
 
-	IPage<DistributionAppStockArticleVO> selectDistributionAppDeliverywrapIn(IPage<DistributionAppStockArticleVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO);
+	List<DisStockListDetailVO> selectDistributionAppDeliverywrapIn( DistributionAppDeliveryListDTO distributionAppDeliveryListDTO);
 
 	/**
 	 * 修改配送任务

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

@@ -75,6 +75,8 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
 
 	private IDistributionStockArticleService distributionStockArticleService;
 
+	private IDistributionStockListService distributionStockListService;
+
 	@Override
 	public IPage<DistributionDeliveryInfoVO> selectDistributionDeliveryInfoPage(IPage<DistributionDeliveryInfoVO> page, DistributionDeliveryInfoVO distributionDeliveryInfo) {
 		List<DistributionDeliveryInfoVO> distributionDeliveryInfoVOS = baseMapper.selectDistributionDeliveryInfoPage(page, distributionDeliveryInfo);
@@ -393,8 +395,24 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
 	@Override
 	public List<DisStockListDetailVO> selectDistributionAppDeliveryInventory( DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
 		List<DisStockListDetailEntity> inventoryList = distributionReservationMapper.selectInventoryListByReservation(Long.parseLong(distributionAppDeliveryListDTO.getReservationId()));
+		if (Func.isEmpty(inventoryList)){
+			log.error("##########查询该客户库存品信息为null");
+			return null;
+		}
+		List<Long> stockListIds = inventoryList.stream().map(DisStockListDetailEntity::getStockListId).distinct().collect(Collectors.toList());
+		List<DistributionStockListEntity> distributionStockListEntities = distributionStockListService.listByIds(stockListIds);
+		Map<Long, DistributionStockListEntity> stockListMap = distributionStockListEntities.stream().collect(Collectors.toMap(DistributionStockListEntity::getId, Function.identity(), (k1, k2) -> k2));
 		List<DisStockListDetailVO> disStockListDetailVOS = DistributionDisStockListWrapper.build().listVO(inventoryList);
-
+		disStockListDetailVOS.stream().forEach(sd->{
+			if (Func.isNotEmpty(stockListMap.get(sd.getStockListId()))){
+				DistributionStockListEntity distributionStockListEntity = stockListMap.get(sd.getStockListId());
+				sd.setMarketName(distributionStockListEntity.getMarketName());
+				sd.setDescriptionGoods(distributionStockListEntity.getDescriptionGoods());
+				sd.setCargoUnit(distributionStockListEntity.getCargoUnit());
+				sd.setCargoNorms(distributionStockListEntity.getCargoNorms());
+				sd.setCargoNumber(distributionStockListEntity.getCargoNumber());
+			}
+		});
 //		List<DistributionAppStockArticleVO> distributionAppStockArticleVOS = baseMapper.selectDistributionAppDeliveryInventoryPage(page, distributionAppDeliveryListDTO);
 		return disStockListDetailVOS;
 	}

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

@@ -41,10 +41,7 @@ import com.logpm.distribution.service.*;
 import com.logpm.distribution.vo.*;
 import com.logpm.distribution.vo.app.*;
 import com.logpm.distribution.vo.print.PrintPreviewVO;
-import com.logpm.distribution.wrapper.DistributionDeliveryListWrapper;
-import com.logpm.distribution.wrapper.DistributionParcelListWrapper;
-import com.logpm.distribution.wrapper.DistributionReservationWrapper;
-import com.logpm.distribution.wrapper.DistributionStockArticleWrapper;
+import com.logpm.distribution.wrapper.*;
 import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity;
 import com.logpm.warehouse.feign.IWarehouseTrayTypeClient;
 import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient;
@@ -89,6 +86,7 @@ import org.springframework.data.redis.connection.ReactiveListCommands;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
@@ -141,6 +139,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	private final IBasicdataWarehouseClient warehouseClient;
 	private final IDisStockListDetailService disStockListDetailService;
 	private final DistributionStockListMapper distributionStockListMapper;
+	private final IDistributionStockListService distributionStockListService;
 	private final IWarehouseUpdownTypeClient warehouseUpdownTypeClient;
 	private final IBasicPrintTemplateClient basicPrintTemplateClient;
 	private final IWarehouseTrayTypeClient warehouseTrayTypeClient;
@@ -1249,6 +1248,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		if (Func.isEmpty(reservationStockarticleEntityList)) {
 			log.error("####################reservationStockarticleEntityList维护数据异常,reservationID:{}", distrilbutionloadingscanDTO.getReservationId());
 		}
+		List<DisStockListDetailEntity> stockListDetailEntityList = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
+			.eq(DisStockListDetailEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId())
+			.ne(DisStockListDetailEntity::getStockPackageStatus, ReservationInventoryStatusConstant.quxiao.getValue()));
+		boolean inventoryLoadingFlag = stockListDetailEntityList.stream().allMatch(i -> i.getStockPackageStatus().equals(InventoryLoadingStatusConstant.yizhuangche.getValue()));
+		boolean inventoryStockUpFlag = stockListDetailEntityList.stream().anyMatch(l -> Func.isEmpty(l.getStockPackageCode()));
+		if (inventoryStockUpFlag) {
+			log.error("##################库存品未备货");
+			return Resp.scanFail("操作失败","存在库存品未备货");
+//			return R.fail("该客户存在库存品暂未备货   一键装车失败!!!");
+		}
 		Map<String, List<DistributionReservationStockarticleEntity>> allStockArticle = reservationStockarticleEntityList.stream().filter(f -> Func.isNotEmpty(f.getIsZero())).collect(Collectors.groupingBy(DistributionReservationStockarticleEntity::getIsZero));
 		DistributionDeliverySelfEntity finalDistributionDeliverySelfEntity = distributionDeliverySelfEntity;
 		allStockArticle.forEach((k, v) -> {
@@ -1443,16 +1452,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					break;
 			}
 		});
-		List<DisStockListDetailEntity> stockListDetailEntityList = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
-			.eq(DisStockListDetailEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId())
-			.ne(DisStockListDetailEntity::getStockPackageStatus, ReservationInventoryStatusConstant.quxiao.getValue()));
-		boolean inventoryLoadingFlag = stockListDetailEntityList.stream().allMatch(i -> i.getStockPackageStatus().equals(InventoryLoadingStatusConstant.yizhuangche.getValue()));
-		boolean inventoryStockUpFlag = stockListDetailEntityList.stream().anyMatch(l -> Func.isEmpty(l.getStockPackageCode()));
-		if (inventoryStockUpFlag) {
-			log.error("##################库存品未备货");
-			throw new RuntimeException("该客户存在库存品暂未备货   一键装车失败!!!");
-//			return R.fail("该客户存在库存品暂未备货   一键装车失败!!!");
-		}
+//		List<DisStockListDetailEntity> stockListDetailEntityList = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
+//			.eq(DisStockListDetailEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId())
+//			.ne(DisStockListDetailEntity::getStockPackageStatus, ReservationInventoryStatusConstant.quxiao.getValue()));
+//		boolean inventoryLoadingFlag = stockListDetailEntityList.stream().allMatch(i -> i.getStockPackageStatus().equals(InventoryLoadingStatusConstant.yizhuangche.getValue()));
+//		boolean inventoryStockUpFlag = stockListDetailEntityList.stream().anyMatch(l -> Func.isEmpty(l.getStockPackageCode()));
+//		if (inventoryStockUpFlag) {
+//			log.error("##################库存品未备货");
+//			return Resp.scanFail("操作失败","存在库存品未备货");
+////			return R.fail("该客户存在库存品暂未备货   一键装车失败!!!");
+//		}
 		if (!inventoryLoadingFlag) {
 			//存在库存品海为进行装车
 			for (DisStockListDetailEntity disStockListDetailEntity : stockListDetailEntityList) {
@@ -2464,9 +2473,27 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	}
 
 	@Override
-	public IPage<DistributionAppStockArticleVO> selectDistributionAppDeliverywrapIn(IPage<DistributionAppStockArticleVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
-		List<DistributionAppStockArticleVO> distributionAppStockListVOS = baseMapper.selectListbyink(page, distributionAppDeliveryListDTO.getId());
-		return page.setRecords(distributionAppStockListVOS);
+	public List<DisStockListDetailVO> selectDistributionAppDeliverywrapIn(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
+		List<DisStockListDetailEntity> detailEntities = baseMapper.selectInventoryListByDeliveryListId(distributionAppDeliveryListDTO.getId());
+		if (Func.isEmpty(detailEntities)){
+			return null;
+		}
+		List<Long> stockListIds = detailEntities.stream().map(DisStockListDetailEntity::getStockListId).distinct().collect(Collectors.toList());
+		List<DistributionStockListEntity> distributionStockListEntities = distributionStockListService.listByIds(stockListIds);
+		Map<Long, DistributionStockListEntity> stockListMap = distributionStockListEntities.stream().collect(Collectors.toMap(DistributionStockListEntity::getId, Function.identity(), (k1, k2) -> k2));
+		List<DisStockListDetailVO> disStockListDetailVOS = DistributionDisStockListWrapper.build().listVO(detailEntities);
+		disStockListDetailVOS.stream().forEach(sd->{
+			if (Func.isNotEmpty(stockListMap.get(sd.getStockListId()))){
+				DistributionStockListEntity distributionStockListEntity = stockListMap.get(sd.getStockListId());
+				sd.setMarketName(distributionStockListEntity.getMarketName());
+				sd.setDescriptionGoods(distributionStockListEntity.getDescriptionGoods());
+				sd.setCargoUnit(distributionStockListEntity.getCargoUnit());
+				sd.setCargoNorms(distributionStockListEntity.getCargoNorms());
+				sd.setCargoNumber(distributionStockListEntity.getCargoNumber());
+			}
+		});
+
+		return disStockListDetailVOS;
 	}
 
 	@Override
@@ -3619,7 +3646,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 
 	@Override
-	public IPage<DistributionAppParcelListVO> selectDistributionAppDeliverywrap(IPage<DistributionAppParcelListVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
+	public DistributionAppDeliveryListVO selectDistributionAppDeliverywrap( DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
 		//查询配送
 //		DistributionDeliveryListEntity distributionDeliveryListEntity = baseMapper.selectById(distributionAppDeliveryListDTO.getId());
 //		DistributionAppDeliveryListVO distributionAppDeliveryListVO = new DistributionAppDeliveryListVO();
@@ -3633,10 +3660,84 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 //		for (DistributionAppStockArticleVO distributionAppStockArticleVO : distributionAppStockArticleVOS) {
 //			if (distributionAppStockArticleVO.getLoadingNub() >=distributionAppStockArticleVO.getReservationNum()) {ordCount +=1;}
 //		}
+
+		DistributionDeliveryListEntity distributionDeliveryListEntity = baseMapper.selectById(distributionAppDeliveryListDTO.getId());
+		DistributionAppDeliveryListVO distributionAppDeliveryListVO = Func.copy(distributionDeliveryListEntity, DistributionAppDeliveryListVO.class);
 		//查询该配送所有包条
-		List<DistributionAppParcelListVO> parcelListVOS = baseMapper.selectListbypack(page, distributionAppDeliveryListDTO);
+		List<DistributionAppParcelListVO> appParcelListVOS = new ArrayList<>();
+		List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = baseMapper.selectReservationStockByDeliveryId(distributionAppDeliveryListDTO.getId());
+		List<DistributionReservationEntity> reservationEntityList = baseMapper.selectReservationByDeliveryListId(distributionAppDeliveryListDTO.getId());
+		if (Func.isEmpty(reservationEntityList)){
+			log.error("###################查询配送预约信息异常，deliveryID:{}",distributionAppDeliveryListDTO.getId());
+			return null;
+		}
+		if (Func.isEmpty(reservationStockarticleEntityList)){
+			return null;
+		}
+		//计划客户数
+		Long customersNumber = reservationStockarticleEntityList.stream().map(DistributionReservationStockarticleEntity::getReservationId).count();
+		Long orderNumber = reservationStockarticleEntityList.stream().map(DistributionReservationStockarticleEntity::getStockArticleId).count();
+		int signNub = reservationEntityList.stream().mapToInt(DistributionReservationEntity::getReservationNum).sum() + reservationEntityList.stream().mapToInt(DistributionReservationEntity::getReservationStockListNum).sum();
+		//维护计划数量
+		distributionAppDeliveryListVO.setCustomersNumber(customersNumber.intValue());
+		distributionAppDeliveryListVO.setOrderNumber(orderNumber.intValue());
+		distributionAppDeliveryListVO.setSignNub(signNub);
+		//维护完成情况
+		Long loadCusNub = reservationEntityList.stream().filter(r -> r.getLoadingStatus().equals(ReservationLoadingStatusConstant.yizhuangche.getValue())).count();
+		distributionAppDeliveryListVO.setLoadCusNub(loadCusNub.intValue());
+		AtomicInteger loadOrdNub = new AtomicInteger();
+		AtomicInteger signNubSr = new AtomicInteger();
+//		distributionLoadscanService.list(Wrappers.query().lambda().eq(DistributionLoadscanEntity::get))
+
+		reservationStockarticleEntityList.forEach(rs->{
+			if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())){
+
+				List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.selectPackageByReservationAndStockArticle(rs.getReservationId(), rs.getStockArticleId());
+				List<DistributionLoadscanEntity> packageLoadingList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
+					.eq(DistributionLoadscanEntity::getDeliveryId, distributionAppDeliveryListDTO.getId())
+					.eq(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
+					.eq(DistributionLoadscanEntity::getReservationId, rs.getReservationId())
+					.in(DistributionLoadscanEntity::getPackageId, parcelListEntityList.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList())));
+				if (Func.isNotEmpty(packageLoadingList)){
+					signNubSr.getAndAdd(packageLoadingList.stream().mapToInt(DistributionLoadscanEntity::getLoadedNub).sum());
+				}
+				boolean packageFlag = parcelListEntityList.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue()));
+				if (packageFlag){
+					//完成订单累加
+					loadOrdNub.getAndIncrement();
+				}
+				for (DistributionParcelListEntity parcelListEntity : parcelListEntityList) {
+					DistributionAppParcelListVO appParcelListVO = Func.copy(parcelListEntity, DistributionAppParcelListVO.class);
+					appParcelListVOS.add(appParcelListVO);
+				}
+			}else if (rs.getIsZero().equals(IsOrNoConstant.yes.getValue())){
+				List<DistributionParcelNumberVO> parcelNumberVOS = distributionReservationMapper.selectReservationZeroOrderDetail(rs.getStockArticleId(), rs.getReservationId());
+				List<DistributionLoadscanEntity> loadscanEntities = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
+					.eq(DistributionLoadscanEntity::getDeliveryId, distributionAppDeliveryListDTO.getId())
+					.eq(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
+					.eq(DistributionLoadscanEntity::getReservationId, rs.getReservationId())
+					.in(DistributionLoadscanEntity::getPackageId, parcelNumberVOS.stream().map(DistributionParcelNumberVO::getParcelListId).collect(Collectors.toList())));
+				if (Func.isNotEmpty(loadscanEntities)){
+					//统计装车数量
+					signNubSr.getAndAdd(loadscanEntities.stream().mapToInt(DistributionLoadscanEntity::getLoadedNub).sum());
+					int zeroPackageLoadingNum = loadscanEntities.stream().mapToInt(DistributionLoadscanEntity::getLoadedNub).sum();
+					if (rs.getReservationNum() == zeroPackageLoadingNum){
+						loadOrdNub.getAndIncrement();
+					}
+				}
+				parcelNumberVOS.forEach(p->{
+					DistributionAppParcelListVO appParcelListVO = Func.copy(p, DistributionAppParcelListVO.class);
+					appParcelListVOS.add(appParcelListVO);
+				});
+			}else {
+				log.error("############reservation_stockarticle表isZero字段维护错误,reservationId:{}",rs.getReservationId());
+			}
+		});
 
-		return page.setRecords(parcelListVOS);
+		distributionAppDeliveryListVO.setLoadOrdNub(loadOrdNub.get());
+		distributionAppDeliveryListVO.setSignNubSr(signNubSr.get());
+//		List<DistributionAppParcelListVO> parcelListVOS = baseMapper.selectListbypack(page, distributionAppDeliveryListDTO);
+		return distributionAppDeliveryListVO;
 	}
 
 	@Override

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java

@@ -23,6 +23,7 @@ import com.logpm.factory.oupai.service.IReceivingOrderService;
 import com.logpm.factory.pan.service.IPanFactoryOrderService;
 import com.logpm.factory.pan.service.IPanPackageInfoService;
 import com.logpm.factory.pan.service.IPanPackageListService;
+import com.logpm.factory.props.OuPaiProperties;
 import com.logpm.factory.snm.constant.PanFactoryEnum;
 import com.logpm.factory.snm.entity.PanFactoryOrder;
 import com.logpm.factory.snm.entity.PanPackageInfo;
@@ -104,10 +105,11 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 
 	private final ZbCategoryContrastMapper zbCategoryContrastMapper;
 
+	private final OuPaiProperties ouPaiProperties;
+
 	/**
 	 * 目前推送的基地
 	 */
-	private String[] jidiCanshu = {"双流基地", "无锡基地"};
 
 	/**
 	 * 处理皮阿诺数据推送到汇通老库
@@ -394,6 +396,11 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		// 查询需要处理的派车单 查询没有转发的shuju
 		List<ReceivingOrderEntity> list = receivingOrderService.lambdaQuery().eq(ReceivingOrderEntity::getCode, code).eq(ReceivingOrderEntity::getTurnStatus, 0).list();
 		for (ReceivingOrderEntity receivingOrderEntity : list) {
+
+			if (!ArrayUtil.contains(ouPaiProperties.getJidiCanshu(), receivingOrderEntity.getFromWarehouseName())) {
+				log.info(FactoryConstant.OUPAI,"推送老系统失败，当前仓库不是双流仓，推送失败 {}", receivingOrderEntity.getCurrentWarehouseName());
+				continue;
+			}
 			// 查询这个派车单下面的订单
 			List<FactoryOrderEntity> factoryOrderEntities = factoryOrderService.lambdaQuery().eq(FactoryOrderEntity::getReceivingId, receivingOrderEntity.getId()).eq(FactoryOrderEntity::getTurnStatus, 0).list();
 			addAdvanceEntityBtOuPai(receivingOrderEntity, factoryOrderEntities);
@@ -410,19 +417,23 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 	private void addAdvanceEntityBtOuPai(ReceivingOrderEntity receivingOrderEntity, List<FactoryOrderEntity> factoryOrderEntities) {
 
 		String carNumber = receivingOrderEntity.getCarNumber();
+
+		if(Objects.isNull(ouPaiProperties.getJidiWarehouseMapper())){
+			return ;
+		}
+
+		// 通过发货基地得到仓库ID
+		String warehourseIdString = ouPaiProperties.getJidiWarehouseMapper().get(receivingOrderEntity.getFromWarehouseName());
+		Integer warehourseId = Integer.parseInt(warehourseIdString);
+
 		for (FactoryOrderEntity factoryOrderEntity : factoryOrderEntities) {
 			// 需要从老系统进行订单数据查询
 			AdvanceEntity advanceEntity = findAdvanceEntityUseCacheByOrderSelfNum(factoryOrderEntity.getSelfCode(), carNumber);
 			if (ObjectUtils.isNull(advanceEntity)) {
-				//todo 先阶段值推送老系统的双流和无锡
-				if (!ArrayUtil.contains(jidiCanshu, receivingOrderEntity.getCurrentWarehouseName())) {
-					log.info("推送老系统失败，当前仓库不是双流和无锡，推送失败 {}", receivingOrderEntity.getCurrentWarehouseName());
-					continue;
-				}
 
 				advanceEntity = new AdvanceEntity();
 				advanceEntity.setOrderSelfNum(StringUtil.isBlank(factoryOrderEntity.getSelfCode()) ? "" : factoryOrderEntity.getSelfCode()); //订单自编号
-				advanceEntity.setSiteName(receivingOrderEntity.getCurrentWarehouseName()); // 基地 TODO 需要映射
+				advanceEntity.setSiteName(receivingOrderEntity.getFromWarehouseName()); // 基地 TODO 需要映射
 				advanceEntity.setArea(""); // 区域
 				advanceEntity.setOrderTypeName(""); //订单类型名称 可以为空
 				advanceEntity.setOrderClassName("工厂"); //订单类型 可以为空
@@ -433,8 +444,8 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 				advanceEntity.setMctsTruckNo(receivingOrderEntity.getPlate());// 车牌//字段没有了
 				advanceEntity.setFirstPackName(""); //一级品类
 				advanceEntity.setFirstPackCode(""); //一级品类
-				advanceEntity.setDealerName(factoryOrderEntity.getShopReceiver()); //商场名称
-				advanceEntity.setDealerCode(""); //商场编码
+				advanceEntity.setDealerName(factoryOrderEntity.getShopName()); //商场名称
+				advanceEntity.setDealerCode(factoryOrderEntity.getShopCode()); //商场编码
 				advanceEntity.setDueDate(""); // 交期
 				advanceEntity.setIsOpai(0); //是否干仓配
 				advanceEntity.setOrderNum("");//MSCS订单号 可以为空
@@ -444,7 +455,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 				advanceEntity.setCustomerRoad(StringUtil.isBlank(factoryOrderEntity.getCustomerAddress()) ? "" : factoryOrderEntity.getCustomerAddress());//顾客地址
 				advanceEntity.setSystemType("线上"); //订单类型
 				advanceEntity.setStoreNo(StringUtil.isBlank(factoryOrderEntity.getStoreCode()) ? "" : factoryOrderEntity.getStoreCode()); //门店编码
-				advanceEntity.setStoreName(StringUtil.isBlank(factoryOrderEntity.getStoreName()) ? "" : factoryOrderEntity.getStoreCode()); //门店名称
+				advanceEntity.setStoreName(StringUtil.isBlank(factoryOrderEntity.getStoreName()) ? "" : factoryOrderEntity.getStoreName()); //门店名称
 				advanceEntity.setSerialKey(""); //序列号
 				advanceEntity.setServiceNum(StringUtil.isBlank(factoryOrderEntity.getServiceNumber()) ? "" : factoryOrderEntity.getServiceNumber()); //服务号
 				advanceEntity.setMatingCode("");//齐套模式 可以为空
@@ -460,9 +471,8 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 				advanceEntity.setWaybillNo("");//运单号  可以为空
 //			Integer id = PanFactoryEnum.getId(panFactoryOrder.getPlantId());
 
-
-				advanceEntity.setWarehouseId(141); //导入人仓库id TODO 需要提供映射
-
+				// 获取基地对应的ID
+				advanceEntity.setWarehouseId(warehourseId); //导入人仓库id TODO 需要提供映射
 
 				advanceEntity.setWaybillStatus(Byte.parseByte("1"));//开单状态：1=未开单，2=已开单
 				advanceEntity.setOldId(0);//

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

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.logpm.factory.comfac.constant.FactoryConstant;
 import com.logpm.factory.comfac.dto.*;
 import com.logpm.factory.mt.dto.*;
 import com.logpm.factory.mt.entity.*;
@@ -283,25 +284,24 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 
 	@Override
 	public R handleStatusData(OrderStatusDTO orderStatusDTO) throws CustomerException, JsonProcessingException, NoSuchAlgorithmException {
-		logger.info("#############handleStatusData: orderStatusDTO={}", orderStatusDTO);
+		logger.info("TAG {} #############handleStatusData: orderStatusDTO={}", FactoryConstant.MENGT,orderStatusDTO);
 
 		String status = orderStatusDTO.getStatus();
 
-//		if ("1".equals(status) || "2".equals(status) || "3".equals(status) || "5".equals(status) || "6".equals(status) || "7".equals(status) || "8".equals(status) || "9".equals(status)) {
-//
-//		}
-
 		R rd = null;
-		if("4".equals(status)){
-			rd = shouhuoruku(orderStatusDTO);
-		}else if("7".equals(status)){
-			rd = qianshouScan(orderStatusDTO);
-		}else{
-			logger.info("#############handleStatusData: 当前数据的状态不推送 status={}", status);
-			return Resp.fail(400, "当前数据的状态不推送");
+		try{
+			if("4".equals(status)){
+				rd = shouhuoruku(orderStatusDTO);
+			}else if("7".equals(status)){
+				rd = qianshouScan(orderStatusDTO);
+			}else{
+				return Resp.fail(400, "当前数据的状态不推送");
+			}
+		}catch (Exception e){
+			rd = Resp.fail(401,e.getMessage());
+			logger.error("TAG {} ############# error {}", FactoryConstant.MENGT, e.getMessage());
 		}
 
-		logger.info("##################orderStatusHandler: 异常tag={}", 0);
 
 		return rd;
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java

@@ -92,10 +92,9 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 
 		// 对返回i的数据进行处理 按照 发车单-->订单-->包件 完成保存
 		handleData(code);
-// todo 暂时关闭对老系统的数据推送 需要确认数据的仓库归属后在进行
-//		if (ObjectUtils.isNotNull(code)) {
-//			asyncDataService.handlerOuPaiDataToHt(code);
-//		}
+		if (ObjectUtils.isNotNull(code)) {
+			asyncDataService.handlerOuPaiDataToHt(code);
+		}
 		return code;
 
 	}
@@ -319,7 +318,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 		String unitNo = orderStatusDTO.getUnitNo();
 		String operationTime = orderStatusDTO.getOperationTime();
 		if ("1".equals(status) || "2".equals(status) || "3".equals(status) || "5".equals(status) || "6".equals(status) || "7".equals(status) || "8".equals(status) || "9".equals(status)) {
-			log.warn(FactoryConstant.OUPAI,"#############oupai-handleStatusData: 当前数据的状态不推送 status={}", status);
+			log.warn("#############oupai-handleStatusData: 当前数据的状态不推送 status={}", status);
 			return Resp.fail(400, "当前数据的状态不推送");
 		}
 
@@ -333,12 +332,12 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 		}
 		String destinationWarehouseId = supplyData.get("destinationWarehouseId");//目的仓id
 		if (StringUtil.isBlank(currentWarehouseId) || StringUtil.isBlank(destinationWarehouseId)) {
-			log.warn(FactoryConstant.OUPAI,"##############oupai-handleStatusData: 仓库数据有问题currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId);
+			log.warn("##############oupai-handleStatusData: 仓库数据有问题currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId);
 			return Resp.fail(400, "仓库数据有误");
 		}
 
 		if (!currentWarehouseId.equals(destinationWarehouseId)) {
-			log.info(FactoryConstant.OUPAI,"##############oupai-handleStatusData: 不用处理的状态 currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId);
+			log.info("##############oupai-handleStatusData: 不用处理的状态 currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId);
 			return Resp.fail(400, "不是目的仓");
 		}
 
@@ -351,7 +350,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 		// 如何判断这个包间是非干仓配的数据
 
 		if (!"经销商".equals(factoryOrder.getBusinessModel())) {
-			log.info(FactoryConstant.OUPAI,"oupai- 该包条为干仓配的数据类型 不进行推送  >>> unitNo={}  businessModel:{}", unitNo, factoryOrder.getBusinessModel());
+			log.info("oupai- 该包条为干仓配的数据类型 不进行推送  >>> unitNo={}  businessModel:{}", unitNo, factoryOrder.getBusinessModel());
 			return Resp.fail(400, "包条为干仓配的数据类型");
 		}
 
@@ -359,7 +358,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 		ReceivingOrderEntity receivingOrderEntity = receivingOrderMapper.selectById(factoryOrder.getReceivingId());
 
 		if (Objects.isNull(receivingOrderEntity)) {
-			log.info(FactoryConstant.OUPAI,"oupai- 该订单为没有收货单 不进行推送  >>> receivingId={}  ", factoryOrder.getReceivingId());
+			log.info(" 该订单为没有收货单 不进行推送  >>> receivingId={}  ", factoryOrder.getReceivingId());
 			return Resp.fail(400, "未查询到该单据推送收货单信息");
 		}
 
@@ -368,7 +367,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 		detailObject.put("WarehouseBelong", "oppein");
 		detailObject.put("Creator", orderStatusDTO.getUsername());
 		detailObject.put("PackageCode", unitNo);
-		detailObject.put("Operate", "到货");
+		detailObject.put("Operate", "收货");
 
 		// 查询系统的包件对象
 		LambdaQueryWrapper<FactoryPackageEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -380,9 +379,10 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 			OpPackagePushLogEntity opPackagePushLogEntity = sendPushOuPaiData(factoryPackageEntity.getId(), url, 1, detailObject);
 			// 需要盘点这个对象的
 			String resp = opPackagePushLogEntity.getResp();
+
 			// 转换为json
 			//		JSONObject respJson = JSONObject.parseObject(resp);
-			log.info(FactoryConstant.OUPAI,">>>>>>>>>>>>>>>>>>>>>>> 推送欧派返回数据 {}", resp);
+			log.info(" >>>>>>>>>>>>>>>>>>>>>>> 推送欧派返回数据 {}",resp);
 			//  TODO: 2023/10/25 不知道返回成功的状态是多少
 
 			// 需要修改包件对应的状态
@@ -419,7 +419,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 		try {
 			rabbitTemplate.convertAndSend(RabbitConstant.OUPAI_SIGN_EXCHANGE, RabbitConstant.OUPAI_SIGN_ROUTING, map);
 		} catch (Exception e) {
-			log.error(FactoryConstant.OUPAI,"############handlePackageData: {}", e.getMessage());
+			log.error("############handlePackageData: {}", e.getMessage());
 		}
 
 	}
@@ -522,11 +522,11 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 		try {
 			JSONObject jsonObject = JSONObject.parseObject(opOrderStatusLogEntity.getResponseBody());
 			JSONArray resultArray = jsonObject.getJSONArray("value");
-			log.info(FactoryConstant.OUPAI,"############handleData: 数据处理开始");
+			log.info("############handleData: 数据处理开始");
 			analyzeData(resultArray);
 			opOrderStatusLogEntity.setDataStatus(1);
 		} catch (Exception e) {
-			log.error(FactoryConstant.OUPAI,">>>> error {}", e.getMessage());
+			log.error(">>>> TAG {} error {}",FactoryConstant.OUPAI, e.getMessage());
 			opOrderStatusLogEntity.setDataStatus(2);
 
 		}
@@ -543,7 +543,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 		for (int i = 0; i < resultArray.size(); i++) {
 			JSONObject valueObject = resultArray.getJSONObject(i);
 			if (Objects.isNull(valueObject)) {
-				log.warn(FactoryConstant.OUPAI,"############handleData: value中没有数据");
+				log.warn("############handleData: value中没有数据");
 				throw new CustomerException(403, "value中没有数据");
 			}
 			JSONObject fromWarehouse = valueObject.getJSONObject("FromWarehouse");
@@ -614,7 +614,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 					JSONObject packageEntity = packages.getJSONObject(j);//包件信息
 					JSONObject orderEntity = packageEntity.getJSONObject("Order");//订单信息
 					if(orderEntity==null){
-						log.info(FactoryConstant.OUPAI,"包件数据没有订单信息 packageCode {}",packageEntity.getString("Code"));
+						log.info("包件数据没有订单信息 packageCode {}",packageEntity.getString("Code"));
 						continue;
 					}
 					String selfCode = orderEntity.getString("SelfCode");//订单自编码
@@ -720,7 +720,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 						factoryOrderEntity.setTurnStatus(0);
 						boolean save = factoryOrderService.save(factoryOrderEntity);
 						if (!save) {
-							log.warn(FactoryConstant.OUPAI,"############handleData: 保存订单失败 selfCode={}", selfCode);
+							log.warn("############handleData: 保存订单失败 selfCode={}", selfCode);
 							throw new CustomerException(403, "保存订单失败");
 						}
 					}
@@ -741,6 +741,8 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 						factoryPackageEntity.setSecondClassName(packageEntity.getString("SecondClassName"));
 						factoryPackageEntity.setThirdClassCode(packageEntity.getString("ThirdClassCode"));
 						factoryPackageEntity.setThirdClassName(packageEntity.getString("ThirdClassName"));
+						factoryPackageEntity.setPackageDetailNames(packageEntity.getString("PackageDetailNames"));
+						factoryPackageEntity.setCarNumber(packageEntity.getString("CarNumber"));
 						Boolean buyIn = packageEntity.getBoolean("BuyIn");
 						if (buyIn) {
 							factoryPackageEntity.setBuyin(1);
@@ -825,19 +827,19 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 							}
 						}
 					} else {
-						log.info(FactoryConstant.OUPAI,"############handleData: 包件码已存在 packageCode={}", packageCode);
+						log.info("############handleData: 包件码已存在 packageCode={}", packageCode);
 						throw new CustomerException(403, "包件码已存在");
 					}
 				}
 			} else {
-				log.error(FactoryConstant.OUPAI,"############handleData: 保存发货单数据失败 code={}", code);
+				log.error("############handleData: 保存发货单数据失败 code={}", code);
 				throw new CustomerException(403, "保存发货单数据失败");
 			}
 			Date end = new Date();
 			long startLong = start.getTime();
 			long endLong = end.getTime();
 			long l = endLong - startLong;
-			log.info(FactoryConstant.OUPAI,"############handleData: 数据处理完成 耗时 {} 毫秒", l);
+			log.info("############handleData: 数据处理完成 耗时 {} 毫秒", l);
 		}
 
 	}

blade-service/logpm-factory/src/main/java/com/logpm/factory/props/OuPaiProperties.java

@@ -5,6 +5,8 @@ import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+
 @Data
 @ConfigurationProperties(prefix = "oupai")
 @Component
@@ -16,6 +18,14 @@ public class OuPaiProperties {
 
 	private String uri;
 
+	/**
+	 * 基地和老系统仓库的映射
+	 */
+	private Map<String,String> jidiWarehouseMapper;
+
+
+	private String [] jidiCanshu;
+
 
 
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java

@@ -9,7 +9,6 @@ import com.logpm.factory.zb.service.IZbFactoryDataService;
 import com.logpm.oldproject.entity.AdvanceEntity;
 import com.logpm.oldproject.feign.IAdvanceClient;
 import com.rabbitmq.client.Channel;
-import lombok.Builder;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.RabbitConstant;
 import org.springblade.common.exception.CustomerException;
@@ -49,7 +48,6 @@ public class OrderStatusHandler {
 	@Autowired
 	private IOuPaiFactoryService ouPaiFactoryService;
 
-	private Integer retryCount = 1;
 
 	@RabbitHandler
 	public void orderStatusHandler(Map map, Message message, Channel channel) throws IOException, NoSuchAlgorithmException {
@@ -72,39 +70,26 @@ public class OrderStatusHandler {
 		switch (type) {
 			case FactoryConstant.PIANO:
 				r = panFactoryDataService.handleStatusData(orderStatusDTO);
-				int code = r.getCode();
-				if (code == 400 || code == 200) {
-					log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}", orderSelfNum);
+				if (r.getCode() == 400 || r.getCode() == 200) {
+					log.info("TAG {} ##################orderStatusHandler: 该条数据不用处理 orderNo={}", FactoryConstant.PIANO, orderSelfNum);
 //					channel.basicAck(deliveryTag,true);
 				} else {
-					throw new CustomerException(code, r.getMsg());
+					throw new CustomerException(r.getCode(), r.getMsg());
 				}
 				break;
 			case FactoryConstant.MENGT:
-				try {
-
-					r = mtFactoryDataService.handleStatusData(orderStatusDTO);
-					log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}", orderSelfNum);
-
-				} catch (CustomerException rc) {
-					rc.printStackTrace();
-					if (200 != rc.code || 400 != rc.code) {
-						throw new CustomerException("程序异常，需要重试");
-					}
-				}
-				code = r.getCode();
-				if (code == 400 || code == 200) {
-					log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}", orderSelfNum);
-//					channel.basicAck(deliveryTag,true);
+				r = mtFactoryDataService.handleStatusData(orderStatusDTO);
+				if (r.getCode() == 400 || r.getCode() == 200) {
+					log.info("TAG {} ##################orderStatusHandler: 该条数据不用处理 orderNo={}", FactoryConstant.MENGT, orderSelfNum);
 				} else {
-					throw new CustomerException(code, r.getMsg());
+					throw new CustomerException(r.getCode(), r.getMsg());
 				}
 				break;
 			case FactoryConstant.ZHIBANG:
 				r = zbFactoryDataService.handleStatusData(orderStatusDTO);
 				int resultCode = r.getCode();
 				if (resultCode == 400 || resultCode == 200) {
-					log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}", orderSelfNum);
+					log.info("TAG {} ##################orderStatusHandler: 该条数据不用处理 orderNo={}", FactoryConstant.ZHIBANG, orderSelfNum);
 //					channel.basicAck(deliveryTag,true);
 				} else {
 					throw new CustomerException(resultCode, r.getMsg());
@@ -113,7 +98,12 @@ public class OrderStatusHandler {
 
 			case FactoryConstant.OUPAI:
 				r = ouPaiFactoryService.handleStatusData(orderStatusDTO);
-
+				if (r.getCode() == 400 || r.getCode() == 200) {
+					log.info("TAG {} ##################orderStatusHandler: 该条数据不用处理 orderNo={}", FactoryConstant.OUPAI, orderSelfNum);
+//					channel.basicAck(deliveryTag,true);
+				} else {
+					throw new CustomerException(r.getCode(), r.getMsg());
+				}
 
 
 			default: