tips:

1.增加运单报错的问题

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWayBillClient.java

@@ -39,7 +39,7 @@ public interface IWayBillClient {
 	@GetMapping(API_PREFIX + "/getByWaybillNo")
 	WayBillEntity getByWaybillNo(@RequestParam String waybillNo);
 
-
+	@GetMapping(API_PREFIX + "/getByWayBillByAdvanceId")
 	WayBillEntity getByWayBillByAdvanceId(@RequestParam("advId") Integer  advId);
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@@ -193,7 +193,7 @@
     </select>
     <select id="getOrderNoList" resultType="com.logpm.distribution.vo.DistributionStockArticleQRCodeVO">
         select ldsa.id,ldsa.order_code,ldsa.mall_name ,ldsa.customer_name ,ldsa.customer_telephone , ldsa.customer_address ,ldsa.sending,ldsa.waybill_number waybillNumber,
-        ldsa.objective ,ldsa.departure_station departureStation,ldsa.dealer_name dealerName,ldsa.dealer_code  dealerCode,ldsa.total_number totalNumber,
+        ldsa.accept_warehouse_name as objective ,ldsa.send_warehouse_name departureStation,ldsa.dealer_name dealerName,ldsa.dealer_code  dealerCode,ldsa.total_number totalNumber,
         CONCAT_WS('/', IFNULL(ldpl.firsts, ''), IFNULL(ldpl.second, ''), IFNULL(ldpl.third_product, '')) AS category,
         CONCAT_WS( '',IFNULL(ldpl.material_name, '')) AS materialName ,ldpl.order_package_code  qrCode
         from logpm_distribution_parcel_list ldpl

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

@@ -20,6 +20,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
@@ -474,7 +475,6 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	}
 
 
-
 	@Override
 	public R<?> getPrintTemplates(Map<String, Object> params, HttpServletResponse response) {
 		String templateByUrl = null;
@@ -519,16 +519,24 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		String html = TemplateUtil.getTemplateByUrl(template.getTemplateUrl());
 		orderPackgeCodeDataVO.setTemplateHtml(html);
 		orderPackgeCodeDataVO.setTemplateId(template.getId());
+		String ids = (String) params.get("ids");
 
-		String id = (String) params.get("id");
+		String[] idArray = ids.split(",");
+		if(ObjectUtils.isNull(idArray)){
+			throw new ServiceException("参数错误");
+
+		}
+
+		for (String id : idArray) {
 			DistributionStockArticleQRCodeVO orderNoList = baseMapper.getOrderNoList(null, id);
 			Map<String, Object> map = JSONObject.parseObject(JSONObject.toJSONString(orderNoList), Map.class);
-		String qrCode = (String) map.get("qrCode");
-		String filename = QRCodeUtil.createCodeToFile(qrCode);
+			String filename = QRCodeUtil.createCodeToFile(orderNoList.getQrCode());
 			map.put("img", getEmpAutograph(filename));
-		String filetypeName = QRCodeUtil.createCodeToFileType(qrCode);
-		map.put("imgType",getEmpAutograph(filetypeName));
+			String fileTypeName = QRCodeUtil.createCodeToFileType(orderNoList.getQrCode());
+			map.put("imgType", getEmpAutograph(fileTypeName));
 			data.add(map);
+		}
+
 		orderPackgeCodeDataVO.setDataList(data);
 
 		return orderPackgeCodeDataVO;

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java

@@ -414,14 +414,19 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 					// 发站
 					String warehouseName = wayBillEntity.getStartSite();
 					BasicdataWarehouseEntity t = basicdataWarehouseClient.findByName(warehouseName);
+					if(ObjectUtils.isNotNull(t)){
 						distributionStockArticleEntity.setSendWarehouseName(t.getName());
 						distributionStockArticleEntity.setSendWarehouseId(t.getId());
+					}
 
 					//收货仓库
 					warehouseName = wayBillEntity.getArriveSite();
 					t = basicdataWarehouseClient.findByName(warehouseName);
+					if(ObjectUtils.isNotNull(t)){
 						distributionStockArticleEntity.setAcceptWarehouseName(t.getName());
 						distributionStockArticleEntity.setAcceptWarehouseId(t.getId());
+					}
+
 
 				}
 

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/WayBillClient.java

@@ -44,6 +44,7 @@ public class WayBillClient implements IWayBillClient {
 	}
 
 	@Override
+	@GetMapping(API_PREFIX + "/getByWayBillByAdvanceId")
 	public WayBillEntity getByWayBillByAdvanceId(Integer advId) {
 		return wayBillService.getByWayBillByAdvanceId(advId);
 	}