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,6 +140,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 		for (String orderPackageCode : idArray) {
 			DistributionStockArticleQRCodeVO vo  = new DistributionStockArticleQRCodeVO();
 			TrunklineAdvanceDetailEntity advanceDetailEntity = baseMapper.findEntityByOrderPackageCodelimit1(orderPackageCode);
+			if(!Objects.isNull(advanceDetailEntity)){
 				Long advanceId = advanceDetailEntity.getAdvanceId();
 				TrunklineAdvanceEntity advanceEntity = advanceMapper.selectById(advanceId);
 				if(ObjectUtil.isEmpty(advanceEntity.getSenderName()) || ("/").equals(advanceEntity.getSenderName())){
@@ -159,9 +161,12 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 				vo.setQrCode(orderPackageCode);
 				vo.setDealerName(advanceEntity.getDealerName());
 				vo.setTotalNumber(advanceEntity.getTotalNum()+"");
+			}
 
 			Map<String, Object> map = JSONObject.parseObject(JSONObject.toJSONString(vo), Map.class);
+			if(!Objects.isNull(advanceDetailEntity)){
 				map.put("id",advanceDetailEntity.getId());
+			}
 			String filename = QRCodeUtil.createCodeToFile(vo.getQrCode());
 			map.put("img", QRCodeUtil.getEmpAutograph(filename));
 			// 订单号 生成二维码