1.干线bug修复

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java

@@ -148,6 +148,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 
 	@Override
 	public OrderPackgeCodeDataVO showAdvancePackgeCode(Map<String, Object> params) throws Exception {
+		log.info("----------------------------------------111111111");
 		OrderPackgeCodeDataVO orderPackgeCodeDataVO = new OrderPackgeCodeDataVO();
 		List<Map> data = new ArrayList<>();
 		List<String> values = new ArrayList<>();
@@ -155,7 +156,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 		if (ObjectUtil.isEmpty(template)) {
 			throw new ServiceException("模板内容未找到");
 		}
-
+		log.info("----------------------------------------2222222222");
 		String html = TemplateUtil.getTemplateByUrl(template.getTemplateUrl());
 		orderPackgeCodeDataVO.setTemplateHtml(html);
 		orderPackgeCodeDataVO.setTemplateId(template.getId());
@@ -166,11 +167,14 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 			throw new ServiceException("参数错误");
 
 		}
+		log.info("----------------------------------------333333333");
 		for (String orderPackageCode : idArray) {
 			DistributionStockArticleQRCodeVO vo = new DistributionStockArticleQRCodeVO();
+			log.info("----------------------------------------444444444444444444");
 			TrunklineAdvanceDetailEntity advanceDetailEntity = baseMapper.findEntityByOrderPackageCodelimit1(orderPackageCode);
 			if (!Objects.isNull(advanceDetailEntity)) {
 				Long advanceId = advanceDetailEntity.getAdvanceId();
+				log.info("----------------------------------------5555555555555555");
 				TrunklineAdvanceEntity advanceEntity = advanceMapper.selectById(advanceId);
 
 				Long waybillId = advanceDetailEntity.getWaybillId();
@@ -181,6 +185,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 
 
 				if (!Objects.isNull(waybillId)) {
+					log.info("----------------------------------------666666666666666666");
 					WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId);
 					if (!Objects.isNull(waybillEntity)) {
 						vo.setShipperName(StringUtil.isBlank(waybillEntity.getShipper()) ? "" : waybillEntity.getShipper());
@@ -214,6 +219,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 				vo.setTotalNumber(advanceEntity.getTotalNum() + "");
 			}
 
+			log.info("----------------------------------------777777777777777777");
 			//把vo转成Map<String, Object>
 			Map<String, Object> map = BeanUtil.beanToMap(vo);
 			if (!Objects.isNull(advanceDetailEntity)) {
@@ -229,6 +235,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 			values.add(tempData);
 		}
 
+		log.info("----------------------------------------88888888888888");
 		orderPackgeCodeDataVO.setDataList(data);
 		orderPackgeCodeDataVO.setMoldList(values);