1.bug修复

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/OrderCodeDataVO.java

@@ -19,5 +19,6 @@ public class OrderCodeDataVO {
 
 	@ApiModelProperty(value = "模板填充内容")
 	private List<Map<String,Object>> dataList;
+	private List<String> moldList;
 
 }

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

@@ -2480,6 +2480,18 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		}
 		orderCodeDataVO.setDataList(data);
 
+		List<String> moldList = new ArrayList<>();
+		data.forEach(map -> {
+			try {
+				String popHtml = TemplateUtil.popTemplate("订单码", map, html);
+				moldList.add(popHtml);
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+		});
+		orderCodeDataVO.setMoldList(moldList);
+
+
 		return orderCodeDataVO;
 	}
 
@@ -2545,6 +2557,16 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		}
 		orderCodeDataVO.setDataList(data);
 
+		List<String> moldList = new ArrayList<>();
+		data.forEach(map -> {
+			try {
+				String popHtml = TemplateUtil.popTemplate("订单码", map, html);
+				moldList.add(popHtml);
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+		});
+
 		return orderCodeDataVO;
 	}
 

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

@@ -4517,6 +4517,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			List<TrunklineCarsOrderEntity> carsOrderEntityList = trunklineCarsOrderService.listByIds(carsOrderIdList);
 			//移除carsOrderEntityList中signNum不为0的元素
 			carsOrderEntityList.removeIf(e -> e.getSignNum() != 0);
+			if(CollUtil.isNotEmpty(carsOrderEntityList)){
 				//把carsOrderEntityList通过signOrderId进行分组
 				Map<Long, List<TrunklineCarsOrderEntity>> collect = carsOrderEntityList.stream().collect(Collectors.groupingBy(TrunklineCarsOrderEntity::getSignOrderId));
 				Set<Long> signOrderIds = collect.keySet();
@@ -4588,6 +4589,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						trunklineCarsLoadScanService.clearSignOrderIdByLoadIdAndWarehouseIdAndOrderCodeAndWaybillNo(finalLoadId1,nodeId,orderCode,waybillNo);
 					});
 				}
+			}else{
+				log.warn("###############updateWaybillOrderIsCustemer: 订单已有签收数据不能移除");
+				return R.fail(405,"订单已有签收数据，不能移除");
+			}
 		}
 
 		List<TrunklineLoadSignOrderEntity> signOrderList =trunklineLoadSignOrderService.findSignOrderListByLoadId(loadId);