1.干线-bug修复

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

@@ -34,6 +34,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 @Slf4j
 @Service
@@ -139,29 +140,33 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 		for (String orderPackageCode : idArray) {
 			DistributionStockArticleQRCodeVO vo  = new DistributionStockArticleQRCodeVO();
 			TrunklineAdvanceDetailEntity advanceDetailEntity = baseMapper.findEntityByOrderPackageCodelimit1(orderPackageCode);
-			Long advanceId = advanceDetailEntity.getAdvanceId();
-			TrunklineAdvanceEntity advanceEntity = advanceMapper.selectById(advanceId);
-			if(ObjectUtil.isEmpty(advanceEntity.getSenderName()) || ("/").equals(advanceEntity.getSenderName())){
-				vo.setShipperName("无");
-			}
-			if(ObjectUtil.isEmpty(advanceEntity.getSenderAddress())){
-				vo.setShipperAddress("    ");
+			if(!Objects.isNull(advanceDetailEntity)){
+				Long advanceId = advanceDetailEntity.getAdvanceId();
+				TrunklineAdvanceEntity advanceEntity = advanceMapper.selectById(advanceId);
+				if(ObjectUtil.isEmpty(advanceEntity.getSenderName()) || ("/").equals(advanceEntity.getSenderName())){
+					vo.setShipperName("无");
+				}
+				if(ObjectUtil.isEmpty(advanceEntity.getSenderAddress())){
+					vo.setShipperAddress("    ");
+				}
+				vo.setOrderCode(advanceDetailEntity.getOrderCode());
+				vo.setMallName(advanceEntity.getDealerName());
+				vo.setCustomerName(advanceEntity.getCustomerName());
+				vo.setCustomerTelephone(advanceEntity.getCustomerPhone());
+				vo.setMaterialName(advanceDetailEntity.getMaterialName());
+				vo.setCategory(advanceDetailEntity.getFirstPackName());
+				vo.setWaybillNumber(StringUtil.isBlank(advanceDetailEntity.getWaybillNo())?"":advanceDetailEntity.getWaybillNo());
+				vo.setObjective(advanceEntity.getWarehouseName());
+				vo.setDealerCode(advanceEntity.getDealerCode());
+				vo.setQrCode(orderPackageCode);
+				vo.setDealerName(advanceEntity.getDealerName());
+				vo.setTotalNumber(advanceEntity.getTotalNum()+"");
 			}
-			vo.setOrderCode(advanceDetailEntity.getOrderCode());
-			vo.setMallName(advanceEntity.getDealerName());
-			vo.setCustomerName(advanceEntity.getCustomerName());
-			vo.setCustomerTelephone(advanceEntity.getCustomerPhone());
-			vo.setMaterialName(advanceDetailEntity.getMaterialName());
-			vo.setCategory(advanceDetailEntity.getFirstPackName());
-			vo.setWaybillNumber(StringUtil.isBlank(advanceDetailEntity.getWaybillNo())?"":advanceDetailEntity.getWaybillNo());
-			vo.setObjective(advanceEntity.getWarehouseName());
-			vo.setDealerCode(advanceEntity.getDealerCode());
-			vo.setQrCode(orderPackageCode);
-			vo.setDealerName(advanceEntity.getDealerName());
-			vo.setTotalNumber(advanceEntity.getTotalNum()+"");
 
 			Map<String, Object> map = JSONObject.parseObject(JSONObject.toJSONString(vo), Map.class);
-			map.put("id",advanceDetailEntity.getId());
+			if(!Objects.isNull(advanceDetailEntity)){
+				map.put("id",advanceDetailEntity.getId());
+			}
 			String filename = QRCodeUtil.createCodeToFile(vo.getQrCode());
 			map.put("img", QRCodeUtil.getEmpAutograph(filename));
 			// 订单号 生成二维码