Merge remote-tracking branch 'origin/dev' into pre-production

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml

@@ -93,7 +93,6 @@
     <select id="selectInfoByIds" resultType="com.logpm.trunkline.vo.OpenOrderVO">
         select GROUP_CONCAT(DISTINCT brand) brand,
         GROUP_CONCAT(DISTINCT train_number) trainNumber,
-        GROUP_CONCAT(DISTINCT order_code) orderCode,
         GROUP_CONCAT(DISTINCT dealer_code) dealerCode,
         GROUP_CONCAT(DISTINCT dealer_name) dealerName
         from logpm_trunkline_advance

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

@@ -320,6 +320,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		String dealerName = null;
 		String dealerCode = null;
 		String brand = null;
+		Set<String> orderCodeSet = new HashSet<>();
 		for (TrunklineAdvanceEntity advanceEntity : list) {
 			if (StringUtil.isBlank(dealerName)) {
 				dealerName = advanceEntity.getDealerName();
@@ -328,11 +329,13 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			if (StringUtil.isBlank(brand)) {
 				brand = advanceEntity.getBrand();
 			}
+			orderCodeSet.add(advanceEntity.getOrderCode());
 		}
 		OpenOrderVO openOrderVO = new OpenOrderVO();
 		//查询品牌 客户车次号 订单自编码
 		OpenOrderVO infoByIds = advanceService.selectInfoByIds(advanceIds);
 		BeanUtil.copy(infoByIds, openOrderVO);
+		openOrderVO.setOrderCode(String.join(",", orderCodeSet));
 		openOrderVO.setAdvanceIds(advanceIds);
 		BasicdataBrandEntity basicdataBrandEntity = basicdataBrandClient.findEntityByName(brand);
 		if (!Objects.isNull(basicdataBrandEntity)) {
@@ -4051,6 +4054,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		String dealerName = null;
 		String brand = null;
 		Integer totalNum = 0;
+		Set<String> orderCodeSet = new HashSet<>();
 		for (TrunklineAdvanceEntity advanceEntity : list) {
 			if (StringUtil.isBlank(dealerName)) {
 				dealerName = advanceEntity.getDealerName();
@@ -4060,11 +4064,15 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			}
 
 			totalNum = totalNum + advanceEntity.getTotalNum();
+
+			orderCodeSet.add(advanceEntity.getOrderCode());
+
 		}
 		OpenOrderVO openOrderVO = new OpenOrderVO();
 		//查询品牌 客户车次号 订单自编码
 		OpenOrderVO infoByIds = advanceService.selectInfoByIds(advanceIds);
 		BeanUtil.copy(infoByIds, openOrderVO);
+		openOrderVO.setOrderCode(String.join(",", orderCodeSet));
 		openOrderVO.setAdvanceIds(advanceIds);
 		//发站仓-----目前登录人的仓库
 		openOrderVO.setDepartureWarehouseName(basicdataWarehouseEntity.getName());