新增根据货品明细id和二维码id查询二维码和货品明细对象的接口

src/main/java/com/jeeplus/modules/warehouse/goods/service/GoodsService.java

@@ -212,7 +212,9 @@ public class GoodsService extends CrudService<GoodsMapper, Goods> {
 	public QrCode getGIAndQCByTwoId(String goodsInfoId, String qrCodeId) {
 		GoodsInfo goodsInfo = goodsInfoMapper.get(new GoodsInfo(goodsInfoId));
 		QrCode qrCode = qrCodeMapper.get(new QrCode(qrCodeId));
-		qrCode.setGoodsInfo(goodsInfo);
+		if (null != qrCode) {
+            qrCode.setGoodsInfo(goodsInfo);
+        }
 		return qrCode;
 	}
 }
\ No newline at end of file