blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/platform/dto/PlatformAppVersionDetail.java

@@ -0,0 +1,39 @@
+package org.springblade.salesPart.platform.dto;
+
+import lombok.Data;
+
+/**
+ * @author Rain
+ */
+@Data
+public class PlatformAppVersionDetail {
+
+
+	private Long id;
+	/**
+	 * 属于的app的id
+	 */
+	private Long appId;
+	/**
+	 * 版本名称
+	 */
+	private String versionName;
+	/**
+	 * 最低版本号
+	 */
+	private String versionCode;
+	/**
+	 * 最新版本号
+	 */
+	private String lastVersionCode;
+	/**
+	 * 版本更新描述
+	 */
+	private String versionDesc;
+	/**
+	 * 下载地址
+	 */
+	private String downloadUrl;
+
+
+}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/platform/controller/PlatformGoodsController.java

@@ -38,4 +38,10 @@ public class PlatformGoodsController {
 	}
 
 
+	@PostMapping("/getPlatformAppVersion")
+	public R getPlatformAppVersion() {
+		return R.data(platformGoodsService.getPlatformAppVersion());
+	}
+
+
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/platform/mapper/PlatformGoodsMapper.java

@@ -4,6 +4,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springblade.salesPart.entity.PjCorpsDesc;
 import org.springblade.salesPart.platform.dto.PlatformAppGoodsDTO;
 import org.springblade.salesPart.platform.dto.PlatformAppGoodsDetailDTO;
+import org.springblade.salesPart.platform.dto.PlatformAppVersionDetail;
 import org.springblade.salesPart.platform.vo.PlatformAppGoodsSelectVO;
 import org.springblade.system.entity.Tenant;
 
@@ -55,4 +56,12 @@ public interface PlatformGoodsMapper {
 	 * @return 公司描述
 	 */
 	PjCorpsDesc selectCorpsDescByUserId(@Param("id") Long id);
+
+	/**
+	 * 获取app版本信息
+	 *
+	 * @param tenantId 仓库id
+	 * @return app版本信息
+	 */
+    PlatformAppVersionDetail getPlatformAppVersion(@Param("tenantId") String tenantId);
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/platform/mapper/PlatformGoodsMapper.xml

@@ -293,6 +293,25 @@
           AND pca.is_deleted = 0
           AND pcd.enable_or_not = 1
     </select>
+    <select id="getPlatformAppVersion" resultType="org.springblade.salesPart.platform.dto.PlatformAppVersionDetail">
+        SELECT
+            bav.id,
+            bav.appId,
+            bav.version_name as versionName,
+            bav.version_code as versionCode,
+            bav.last_version_code as lastVersionCode,
+            bav.version_desc as versionDesc,
+            bav.download_url as downloadUrl
+        FROM
+            blade_app ba
+                INNER JOIN blade_app_version bav ON ba.id = bav.appId
+        WHERE
+            ba.package_name = 'com.ecp.tire'
+          AND bav.is_release = 1
+        ORDER BY
+            bav.last_version_code DESC
+            LIMIT 1
+    </select>
 
 
 </mapper>

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/platform/service/IPlatformGoodsService.java

@@ -5,6 +5,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.salesPart.platform.dto.PlatformAppGoodsDTO;
 import org.springblade.salesPart.platform.dto.PlatformAppGoodsDetailDTO;
+import org.springblade.salesPart.platform.dto.PlatformAppVersionDetail;
 import org.springblade.salesPart.platform.vo.PlatformAppGoodsSelectVO;
 
 
@@ -39,4 +40,11 @@ public interface IPlatformGoodsService {
 	 * @return 获取平台用户信息
 	 */
 	R getPlatformUserInfo();
+
+	/**
+	 * 获取平台app版本信息
+	 *
+	 * @return 获取平台app版本信息
+	 */
+	PlatformAppVersionDetail getPlatformAppVersion();
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/platform/service/impl/PlatformGoodsServiceImpl.java

@@ -16,6 +16,7 @@ import org.springblade.salesPart.entity.PjGoodsFiles;
 import org.springblade.salesPart.goods.mapper.GoodsFilesMapper;
 import org.springblade.salesPart.platform.dto.PlatformAppGoodsDTO;
 import org.springblade.salesPart.platform.dto.PlatformAppGoodsDetailDTO;
+import org.springblade.salesPart.platform.dto.PlatformAppVersionDetail;
 import org.springblade.salesPart.platform.dto.PlatformUserInfoDTO;
 import org.springblade.salesPart.platform.entity.TireUserCompany;
 import org.springblade.salesPart.platform.mapper.PlatformGoodsMapper;
@@ -133,4 +134,9 @@ public class PlatformGoodsServiceImpl implements IPlatformGoodsService {
 		}
 		return R.data(platformUserInfoVO);
 	}
+
+	@Override
+	public PlatformAppVersionDetail getPlatformAppVersion() {
+		return platformGoodsMapper.getPlatformAppVersion(AuthUtil.getTenantId());
+	}
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -600,6 +600,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 		insertPlatformCorpsDesc.setCode(String.valueOf(corpsDesc.getId()));
 		insertPlatformCorpsDesc.setTel(corpsDesc.getTel());
 		insertPlatformCorpsDesc.setAttn(Objects.isNull(corpsDesc.getPjCorpsAttn()) ? null : corpsDesc.getPjCorpsAttn().getCname());
+		insertPlatformCorpsDesc.setCorpType("KH");
 		insertPlatformCorpsDesc.setTenantId(PlatformConstant.PLATFORM_CODE);
 		boolean success = corpsDescClient.insertCorpsDataByUser(insertPlatformCorpsDesc);
 		if (!success) {

blade-service/tire-center-warehouse/src/main/java/com/ecp/tire/center/warehouse/plan/impl/CenterOrderPlanServiceImpl.java

@@ -353,9 +353,9 @@ public class CenterOrderPlanServiceImpl extends ServiceImpl<CenterOrderPlanMappe
 				.in(CenterStockDesc::getGoodsId, centerOrderPlanItemList.stream().map(CenterOrderPlanItem::getGoodsId).distinct().collect(Collectors.toList())));
 			List<CenterStockDesc> insertOrUpdateList = new ArrayList<>();
 			Map<String, List<CenterOrderPlanItem>> mapList = centerOrderPlanItemList.stream().filter(item -> !NumberEnum.ONE.number.equals(item.getIsDeleted()))
-				.collect(Collectors.groupingBy(plan -> plan.getBillId() + "-" + plan.getGoodsId() + "-" + plan.getDot() + "-" + plan.getRegionId()));
+				.collect(Collectors.groupingBy(plan -> plan.getBillId() + "(~!)" + plan.getGoodsId() + "(~!)" + plan.getDot() + "(~!)" + plan.getRegionId()));
 			for (Map.Entry<String, List<CenterOrderPlanItem>> mapData : mapList.entrySet()) {
-				String[] params = mapData.getKey().split("-");
+				String[] params = mapData.getKey().split("(~!)");
 				Long planId = Long.valueOf(params[0]);
 				Long goodsId = Long.valueOf(params[1]);
 				String dot = params[2];