修复视图类统一应用

blade-service-api/blade-factory-api/src/main/java/org/springblade/factory/entity/ViewShipSel.java

@@ -16,128 +16,120 @@ public class ViewShipSel extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
 
-	@Data
-	@TableName("zcrm_view_ship_sel")
-	public class ZcrmViewShipSel extends BaseEntity {
+	@JsonProperty("Org_ID")
+	@TableField("Org_ID")
+	private Long orgId;
 
-		private static final long serialVersionUID = 1L;
+	@JsonProperty("Org_Code")
+	@TableField("Org_Code")
+	private String orgCode;
 
-		@JsonProperty("Org_ID")
-		@TableField("Org_ID")
-		private Long orgId;
+	@JsonProperty("Org_Name")
+	@TableField("Org_Name")
+	private String orgName;
 
-		@JsonProperty("Org_Code")
-		@TableField("Org_Code")
-		private String orgCode;
+	@JsonProperty("DocType_ID")
+	@TableField("DocType_ID")
+	private Long docTypeId;
 
-		@JsonProperty("Org_Name")
-		@TableField("Org_Name")
-		private String orgName;
+	@JsonProperty("DocType_Code")
+	@TableField("DocType_Code")
+	private String docTypeCode;
 
-		@JsonProperty("DocType_ID")
-		@TableField("DocType_ID")
-		private Long docTypeId;
+	@JsonProperty("DocType_Name")
+	@TableField("DocType_Name")
+	private String docTypeName;
 
-		@JsonProperty("DocType_Code")
-		@TableField("DocType_Code")
-		private String docTypeCode;
+	@JsonProperty("DocNo")
+	@TableField("DocNo")
+	private String docNo;
 
-		@JsonProperty("DocType_Name")
-		@TableField("DocType_Name")
-		private String docTypeName;
+	@JsonProperty("BusinessDate")
+	@TableField("BusinessDate")
+	private LocalDateTime businessDate;
 
-		@JsonProperty("DocNo")
-		@TableField("DocNo")
-		private String docNo;
+	@JsonProperty("Status")
+	@TableField("Status")
+	private Integer status;
 
-		@JsonProperty("BusinessDate")
-		@TableField("BusinessDate")
-		private LocalDateTime businessDate;
+	@JsonProperty("Customer_ID")
+	@TableField("Customer_ID")
+	private Long customerId;
 
-		@JsonProperty("Status")
-		@TableField("Status")
-		private Integer status;
+	@JsonProperty("Customer_Code")
+	@TableField("Customer_Code")
+	private String customerCode;
 
-		@JsonProperty("Customer_ID")
-		@TableField("Customer_ID")
-		private Long customerId;
+	@JsonProperty("Customer_Name")
+	@TableField("Customer_Name")
+	private String customerName;
 
-		@JsonProperty("Customer_Code")
-		@TableField("Customer_Code")
-		private String customerCode;
+	@JsonProperty("Item_ID")
+	@TableField("Item_ID")
+	private Long itemId;
 
-		@JsonProperty("Customer_Name")
-		@TableField("Customer_Name")
-		private String customerName;
+	@JsonProperty("Item_Code")
+	@TableField("Item_Code")
+	private String itemCode;
 
-		@JsonProperty("Item_ID")
-		@TableField("Item_ID")
-		private Long itemId;
+	@JsonProperty("Item_Name")
+	@TableField("Item_Name")
+	private String itemName;
 
-		@JsonProperty("Item_Code")
-		@TableField("Item_Code")
-		private String itemCode;
+	@JsonProperty("SPECS")
+	@TableField("SPECS")
+	private String specs;
 
-		@JsonProperty("Item_Name")
-		@TableField("Item_Name")
-		private String itemName;
+	@JsonProperty("Qty")
+	@TableField("Qty")
+	private BigDecimal qty;
 
-		@JsonProperty("SPECS")
-		@TableField("SPECS")
-		private String specs;
+	@JsonProperty("OrderPrice")
+	@TableField("OrderPrice")
+	private BigDecimal orderPrice;
 
-		@JsonProperty("Qty")
-		@TableField("Qty")
-		private BigDecimal qty;
+	@JsonProperty("FinallyPrice")
+	@TableField("FinallyPrice")
+	private BigDecimal finallyPrice;
 
-		@JsonProperty("OrderPrice")
-		@TableField("OrderPrice")
-		private BigDecimal orderPrice;
+	@JsonProperty("TotalMoneyTC")
+	@TableField("TotalMoneyTC")
+	private BigDecimal totalMoneyTc;
 
-		@JsonProperty("FinallyPrice")
-		@TableField("FinallyPrice")
-		private BigDecimal finallyPrice;
+	@JsonProperty("TotalNetMoneyTC")
+	@TableField("TotalNetMoneyTC")
+	private BigDecimal totalNetMoneyTc;
 
-		@JsonProperty("TotalMoneyTC")
-		@TableField("TotalMoneyTC")
-		private BigDecimal totalMoneyTc;
+	@JsonProperty("TotalTaxTC")
+	@TableField("TotalTaxTC")
+	private BigDecimal totalTaxTc;
 
-		@JsonProperty("TotalNetMoneyTC")
-		@TableField("TotalNetMoneyTC")
-		private BigDecimal totalNetMoneyTc;
+	@JsonProperty("WH_ID")
+	@TableField("WH_ID")
+	private Long whId;
 
-		@JsonProperty("TotalTaxTC")
-		@TableField("TotalTaxTC")
-		private BigDecimal totalTaxTc;
+	@JsonProperty("WH_Code")
+	@TableField("WH_Code")
+	private String whCode;
 
-		@JsonProperty("WH_ID")
-		@TableField("WH_ID")
-		private Long whId;
+	@JsonProperty("WH_Name")
+	@TableField("WH_Name")
+	private String whName;
 
-		@JsonProperty("WH_Code")
-		@TableField("WH_Code")
-		private String whCode;
+	@JsonProperty("LineStatus")
+	@TableField("LineStatus")
+	private Integer lineStatus;
 
-		@JsonProperty("WH_Name")
-		@TableField("WH_Name")
-		private String whName;
+	@JsonProperty("SoDocNo")
+	@TableField("SoDocNo")
+	private String soDocNo;
 
-		@JsonProperty("LineStatus")
-		@TableField("LineStatus")
-		private Integer lineStatus;
+	@JsonProperty("SoDocLineNo")
+	@TableField("SoDocLineNo")
+	private Integer soDocLineNo;
 
-		@JsonProperty("SoDocNo")
-		@TableField("SoDocNo")
-		private String soDocNo;
-
-		@JsonProperty("SoDocLineNo")
-		@TableField("SoDocLineNo")
-		private Integer soDocLineNo;
-
-		@JsonProperty("ShipAddress")
-		@TableField("ShipAddress")
-		private String shipAddress;
-
-	}
+	@JsonProperty("ShipAddress")
+	@TableField("ShipAddress")
+	private String shipAddress;
 }
 

blade-service/blade-factory/src/main/java/org/springblade/factory/api/controller/ComprehensiveQueryController.java

@@ -10,6 +10,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.tool.api.R;
 import org.springblade.factory.api.common.U9cloudGetTokenUtil;
+import org.springblade.factory.entity.ViewShipSel;
 import org.springblade.factory.service.ZcrmViewARBillHeadSelService;
 import org.springblade.factory.service.ZcrmViewShipSelService;
 import org.springblade.u9cloud.entity.ZcrmViewARBillHeadSel;
@@ -55,9 +56,9 @@ public class ComprehensiveQueryController {
 		@ApiImplicitParam(name = "pageNum", value = "页码（默认1）", paramType = "query", dataType = "int", defaultValue = "1"),
 		@ApiImplicitParam(name = "pageSize", value = "每页条数（默认10，最大100）", paramType = "query", dataType = "int", defaultValue = "10")
 	})
-	public R<List<ZcrmViewShipSel>> shippingStatusInquiry(
+	public R<List<ViewShipSel>> shippingStatusInquiry(
 		// 基础精准查询字段
-		ZcrmViewShipSel zcrmViewShipSel,
+		ViewShipSel zcrmViewShipSel,
 		// 日期范围查询参数
 		@RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime businessDateStart,
 		@RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime businessDateEnd,
@@ -82,10 +83,10 @@ public class ComprehensiveQueryController {
 			pageSize = Math.max(Math.min(pageSize, 100), 1); // 每页条数限制1-100
 
 			// 构建分页对象
-			Page<ZcrmViewShipSel> page = new Page<>(pageNum, pageSize);
+			Page<ViewShipSel> page = new Page<>(pageNum, pageSize);
 
 			// 调用本地Service查询
-			IPage<ZcrmViewShipSel> resultPage = zcrmViewShipSelService.shippingStatusInquiry(
+			IPage<ViewShipSel> resultPage = zcrmViewShipSelService.shippingStatusInquiry(
 				page,
 				zcrmViewShipSel,
 				businessDateStart,

blade-service/blade-factory/src/main/java/org/springblade/factory/service/ZcrmViewShipSelService.java

@@ -55,9 +55,9 @@ public interface ZcrmViewShipSelService extends BaseService<ViewShipSel> {
 	 * @param lineStatusList 行状态列表（多个用逗号分隔）
 	 * @return 分页结果
 	 */
-	IPage<ZcrmViewShipSel> shippingStatusInquiry(
-		Page<ZcrmViewShipSel> page,
-		ZcrmViewShipSel zcrmViewShipSel,
+	IPage<ViewShipSel> shippingStatusInquiry(
+		Page<ViewShipSel> page,
+		ViewShipSel zcrmViewShipSel,
 		LocalDateTime businessDateStart,
 		LocalDateTime businessDateEnd,
 		BigDecimal qtyMin,

blade-service/blade-factory/src/main/java/org/springblade/factory/service/impl/ZcrmViewARBillHeadSelServiceImpl.java

@@ -45,9 +45,6 @@ import java.util.stream.Collectors;
 public class ZcrmViewARBillHeadSelServiceImpl extends BaseServiceImpl<ZcrmViewARBillHeadSelMapper, ZcrmViewARBillHeadSel>
         implements ZcrmViewARBillHeadSelService {
 
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
 	@Override
 	public IPage<ZcrmViewARBillHeadSel> arBillHeadStatusInquiry(
 		Page<ZcrmViewARBillHeadSel> page,

blade-service/blade-factory/src/main/java/org/springblade/factory/service/impl/ZcrmViewShipSelServiceImpl.java

@@ -8,6 +8,7 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.factory.entity.ViewShipSel;
 import org.springblade.factory.mapper.ZcrmViewShipSelMapper;
 import org.springblade.factory.service.ZcrmViewShipSelService;
+import org.springblade.u9cloud.entity.ZcrmViewARBillHeadSel;
 import org.springblade.u9cloud.entity.ZcrmViewShipSel;
 import org.springframework.stereotype.Service;
 
@@ -41,13 +42,10 @@ public class ZcrmViewShipSelServiceImpl extends BaseServiceImpl<ZcrmViewShipSelM
 		return this.updateById(viewShipSel);
 	}
 
-
-
-
 	@Override
-	public IPage<ZcrmViewShipSel> shippingStatusInquiry(
-		Page<ZcrmViewShipSel> page,
-		ZcrmViewShipSel zcrmViewShipSel,
+	public IPage<ViewShipSel> shippingStatusInquiry(
+		Page<ViewShipSel> page,
+		ViewShipSel zcrmViewShipSel,
 		LocalDateTime businessDateStart,
 		LocalDateTime businessDateEnd,
 		BigDecimal qtyMin,
@@ -60,7 +58,7 @@ public class ZcrmViewShipSelServiceImpl extends BaseServiceImpl<ZcrmViewShipSelM
 		String lineStatusList
 	) {
 		// 构建查询条件
-		QueryWrapper<ZcrmViewShipSel> queryWrapper = new QueryWrapper<>();
+		QueryWrapper<ViewShipSel> queryWrapper = new QueryWrapper<>();
 
 		// 1. 精准查询条件
 		appendExactCondition(queryWrapper, "Org_ID", zcrmViewShipSel.getOrgId());
@@ -108,7 +106,7 @@ public class ZcrmViewShipSelServiceImpl extends BaseServiceImpl<ZcrmViewShipSelM
 	/**
 	 * 追加精准查询条件
 	 */
-	private void appendExactCondition(QueryWrapper<ZcrmViewShipSel> wrapper, String column, Object value) {
+	private void appendExactCondition(QueryWrapper<ViewShipSel> wrapper, String column, Object value) {
 		if (value != null) {
 			wrapper.eq(column, value);
 		}
@@ -117,7 +115,7 @@ public class ZcrmViewShipSelServiceImpl extends BaseServiceImpl<ZcrmViewShipSelM
 	/**
 	 * 追加日期范围查询条件
 	 */
-	private void appendDateRangeCondition(QueryWrapper<ZcrmViewShipSel> wrapper, String column,
+	private void appendDateRangeCondition(QueryWrapper<ViewShipSel> wrapper, String column,
 										  LocalDateTime start, LocalDateTime end) {
 		if (start != null) {
 			wrapper.ge(column, start);
@@ -130,7 +128,7 @@ public class ZcrmViewShipSelServiceImpl extends BaseServiceImpl<ZcrmViewShipSelM
 	/**
 	 * 追加数值范围查询条件
 	 */
-	private void appendNumberRangeCondition(QueryWrapper<ZcrmViewShipSel> wrapper, String column,
+	private void appendNumberRangeCondition(QueryWrapper<ViewShipSel> wrapper, String column,
 											BigDecimal min, BigDecimal max) {
 		if (min != null) {
 			wrapper.ge(column, min);
@@ -143,7 +141,7 @@ public class ZcrmViewShipSelServiceImpl extends BaseServiceImpl<ZcrmViewShipSelM
 	/**
 	 * 追加模糊查询条件
 	 */
-	private void appendFuzzyCondition(QueryWrapper<ZcrmViewShipSel> wrapper, String fields, String value) {
+	private void appendFuzzyCondition(QueryWrapper<ViewShipSel> wrapper, String fields, String value) {
 		if (StrUtil.isBlank(fields) || StrUtil.isBlank(value)) {
 			return;
 		}
@@ -160,7 +158,7 @@ public class ZcrmViewShipSelServiceImpl extends BaseServiceImpl<ZcrmViewShipSelM
 	/**
 	 * 追加IN查询条件
 	 */
-	private void appendInCondition(QueryWrapper<ZcrmViewShipSel> wrapper, String column, String values) {
+	private void appendInCondition(QueryWrapper<ViewShipSel> wrapper, String column, String values) {
 		if (StrUtil.isBlank(values)) {
 			return;
 		}

blade-service/blade-u9cloud/src/main/java/org/springblade/u9cloud/Test/TestU9cloudController.java

@@ -7,6 +7,7 @@ import org.apache.poi.ss.formula.functions.T;
 import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.tool.api.R;
+import org.springblade.factory.entity.ViewShipSel;
 import org.springblade.u9cloud.entity.*;
 import org.springblade.u9cloud.feign.IZcrmViewCustomerSel;
 import org.springblade.u9cloud.service.*;
@@ -686,15 +687,15 @@ public class TestU9cloudController {
 
 		// 4. 发送 POST
 		RestTemplate restTemplate = new RestTemplate();
-		ParameterizedTypeReference<ViewApiResponse<ZcrmViewShipSel>> typeRef =
-			new ParameterizedTypeReference<ViewApiResponse<ZcrmViewShipSel>>() {};
+		ParameterizedTypeReference<ViewApiResponse<ViewShipSel>> typeRef =
+			new ParameterizedTypeReference<ViewApiResponse<ViewShipSel>>() {};
 
-		ResponseEntity<ViewApiResponse<ZcrmViewShipSel>> response =
+		ResponseEntity<ViewApiResponse<ViewShipSel>> response =
 			restTemplate.exchange(url, HttpMethod.POST, requestEntity, typeRef);
 
 		// 5. 处理结果
 		ViewApiResponse apiResponse = response.getBody();
-		List<ZcrmViewShipSel> items = apiResponse.getData();
+		List<ViewShipSel> items = apiResponse.getData();
 		if (apiResponse != null && apiResponse.isSuccess()) {
 			if (!items.isEmpty()) {
 				zcrmViewShipSelService.insertBatchShips(items);
@@ -795,15 +796,15 @@ public class TestU9cloudController {
 
 		// 4. 发送 POST
 		RestTemplate restTemplate = new RestTemplate();
-		ParameterizedTypeReference<ViewApiResponse<ZcrmViewShipSel>> typeRef =
-			new ParameterizedTypeReference<ViewApiResponse<ZcrmViewShipSel>>() {};
+		ParameterizedTypeReference<ViewApiResponse<ViewShipSel>> typeRef =
+			new ParameterizedTypeReference<ViewApiResponse<ViewShipSel>>() {};
 
-		ResponseEntity<ViewApiResponse<ZcrmViewShipSel>> response =
+		ResponseEntity<ViewApiResponse<ViewShipSel>> response =
 			restTemplate.exchange(url, HttpMethod.POST, requestEntity, typeRef);
 
 		// 5. 处理结果
 		ViewApiResponse apiResponse = response.getBody();
-		List<ZcrmViewShipSel> items = apiResponse.getData();
+		List<ViewShipSel> items = apiResponse.getData();
 		if (apiResponse != null && apiResponse.isSuccess()) {
 			if (!items.isEmpty()) {
 				zcrmViewShipSelService.insertBatchShips(items);

blade-service/blade-u9cloud/src/main/java/org/springblade/u9cloud/mapper/ZcrmViewRecBillHeadSelMapper.java

@@ -2,7 +2,6 @@ package org.springblade.u9cloud.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springblade.u9cloud.entity.ZcrmViewRecBillHeadSel;
-import org.springblade.u9cloud.entity.ZcrmViewShipSel;
 
 public interface ZcrmViewRecBillHeadSelMapper  extends BaseMapper<ZcrmViewRecBillHeadSel> {
 }

blade-service/blade-u9cloud/src/main/java/org/springblade/u9cloud/mapper/ZcrmViewShipSelMapper.java

@@ -1,6 +1,7 @@
 package org.springblade.u9cloud.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.factory.entity.ViewShipSel;
 import org.springblade.u9cloud.entity.ZcrmViewShipSel;
 import org.springblade.u9cloud.entity.ZcrmViewSupplierSel;
 
@@ -12,5 +13,5 @@ import org.springblade.u9cloud.entity.ZcrmViewSupplierSel;
  * @author your-name
  * @since 2025-07-30
  */
-public interface ZcrmViewShipSelMapper extends BaseMapper<ZcrmViewShipSel> {
+public interface ZcrmViewShipSelMapper extends BaseMapper<ViewShipSel> {
 }

blade-service/blade-u9cloud/src/main/java/org/springblade/u9cloud/service/ZcrmViewShipSelService.java

@@ -3,6 +3,7 @@ package org.springblade.u9cloud.service;
 import cn.hutool.db.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.factory.entity.ViewShipSel;
 import org.springblade.u9cloud.entity.ZcrmViewShipSel;
 import org.springblade.u9cloud.entity.ZcrmViewSupplierSel;
 
@@ -18,21 +19,21 @@ import java.util.List;
  * @author your-name
  * @since 2025-07-30
  */
-public interface ZcrmViewShipSelService extends BaseService<ZcrmViewShipSel> {
+public interface ZcrmViewShipSelService extends BaseService<ViewShipSel> {
 
 	/**
 	 * 料品档案信息
 	 * @param zcrmViewShipSel 客户实体
 	 * @return 是否成功
 	 */
-	boolean insertShip(ZcrmViewShipSel zcrmViewShipSel);
+	boolean insertShip(ViewShipSel zcrmViewShipSel);
 
 	/**
 	 * 批量料品档案信息
 	 * @param zcrmViewShipSels 客户列表
 	 * @return 是否成功
 	 */
-	boolean insertBatchShips(List<ZcrmViewShipSel> zcrmViewShipSels);
+	boolean insertBatchShips(List<ViewShipSel> zcrmViewShipSels);
 
 	boolean insertBatchShips();
 

blade-service/blade-u9cloud/src/main/java/org/springblade/u9cloud/service/impl/ZcrmViewShipSelServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.factory.entity.ViewShipSel;
 import org.springblade.u9cloud.common.U9cloudGetTokenUtil;
 import org.springblade.u9cloud.entity.ViewApiResponse;
 import org.springblade.u9cloud.entity.ZcrmViewShipSel;
@@ -38,7 +39,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @AllArgsConstructor
-public class ZcrmViewShipSelServiceImpl extends BaseServiceImpl<ZcrmViewShipSelMapper, ZcrmViewShipSel>
+public class ZcrmViewShipSelServiceImpl extends BaseServiceImpl<ZcrmViewShipSelMapper, ViewShipSel>
 	implements ZcrmViewShipSelService {
 
 	private U9cloudGetTokenUtil u9cloudGetTokenUtil;
@@ -49,13 +50,13 @@ public class ZcrmViewShipSelServiceImpl extends BaseServiceImpl<ZcrmViewShipSelM
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public boolean insertShip(ZcrmViewShipSel zcrmViewShipSel) {
+	public boolean insertShip(ViewShipSel zcrmViewShipSel) {
 		return this.save(zcrmViewShipSel);
 	}
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public boolean insertBatchShips(List<ZcrmViewShipSel> zcrmViewShipSel) {
+	public boolean insertBatchShips(List<ViewShipSel> zcrmViewShipSel) {
 		return this.saveBatch(zcrmViewShipSel);
 	}
 
@@ -79,18 +80,18 @@ public class ZcrmViewShipSelServiceImpl extends BaseServiceImpl<ZcrmViewShipSelM
 
 		// 2. 发送请求并获取响应
 		RestTemplate restTemplate = new RestTemplate();
-		ParameterizedTypeReference<ViewApiResponse<ZcrmViewShipSel>> typeRef =
-			new ParameterizedTypeReference<ViewApiResponse<ZcrmViewShipSel>>() {};
-		ResponseEntity<ViewApiResponse<ZcrmViewShipSel>> response =
+		ParameterizedTypeReference<ViewApiResponse<ViewShipSel>> typeRef =
+			new ParameterizedTypeReference<ViewApiResponse<ViewShipSel>>() {};
+		ResponseEntity<ViewApiResponse<ViewShipSel>> response =
 			restTemplate.exchange(url, HttpMethod.POST, requestEntity, typeRef);
-		ViewApiResponse<ZcrmViewShipSel> apiResponse = response.getBody();
+		ViewApiResponse<ViewShipSel> apiResponse = response.getBody();
 
 
 		// 3. 校验响应合法性
 		if (apiResponse == null || !apiResponse.isSuccess()) {
 			return false;
 		}
-		List<ZcrmViewShipSel> newShips = apiResponse.getData();
+		List<ViewShipSel> newShips = apiResponse.getData();
 		if (newShips == null || newShips.isEmpty()) {
 			return false;
 		}
@@ -98,11 +99,11 @@ public class ZcrmViewShipSelServiceImpl extends BaseServiceImpl<ZcrmViewShipSelM
 
 		// 4. 提取新数据中的唯一标识（过滤空值）
 		List<String> docNos = newShips.stream()
-			.map(ZcrmViewShipSel::getDocNo)
+			.map(ViewShipSel::getDocNo)
 			.filter(Objects::nonNull)
 			.collect(Collectors.toList());
 		List<Long> itemIds = newShips.stream()
-			.map(ZcrmViewShipSel::getItemId)
+			.map(ViewShipSel::getItemId)
 			.filter(Objects::nonNull)
 			.collect(Collectors.toList());
 
@@ -113,7 +114,7 @@ public class ZcrmViewShipSelServiceImpl extends BaseServiceImpl<ZcrmViewShipSelM
 
 
 		// 5. 用JdbcTemplate查询已存在记录（绕开数据权限拦截器）
-		List<ZcrmViewShipSel> existingShips = new ArrayList<>();
+		List<ViewShipSel> existingShips = new ArrayList<>();
 		try {
 			// 构建查询SQL（联合查询唯一标识）
 			String sql = "SELECT * FROM zcrm_view_ship_sel " +
@@ -123,7 +124,7 @@ public class ZcrmViewShipSelServiceImpl extends BaseServiceImpl<ZcrmViewShipSelM
 			// 执行查询并映射为实体
 			existingShips = jdbcTemplate.query(
 				sql,
-				new BeanPropertyRowMapper<>(ZcrmViewShipSel.class)
+				new BeanPropertyRowMapper<>(ViewShipSel.class)
 			);
 		} catch (Exception e) {
 			throw new RuntimeException("查询已存在发货单记录失败", e);
@@ -131,18 +132,18 @@ public class ZcrmViewShipSelServiceImpl extends BaseServiceImpl<ZcrmViewShipSelM
 
 
 		// 6. 构建已存在记录的映射表（用"DocNo-Item_ID"作为唯一键）
-		Map<String, ZcrmViewShipSel> existingMap = new HashMap<>();
-		for (ZcrmViewShipSel existing : existingShips) {
+		Map<String, ViewShipSel> existingMap = new HashMap<>();
+		for (ViewShipSel existing : existingShips) {
 			String key = existing.getDocNo() + "-" + existing.getItemId();  // 联合唯一键
 			existingMap.put(key, existing);
 		}
 
 
 		// 7. 分离新增和更新列表
-		List<ZcrmViewShipSel> insertList = new ArrayList<>();
-		List<ZcrmViewShipSel> updateList = new ArrayList<>();
+		List<ViewShipSel> insertList = new ArrayList<>();
+		List<ViewShipSel> updateList = new ArrayList<>();
 
-		for (ZcrmViewShipSel newShip : newShips) {
+		for (ViewShipSel newShip : newShips) {
 			String docNo = newShip.getDocNo();
 			Long itemId = newShip.getItemId();
 
@@ -155,7 +156,7 @@ public class ZcrmViewShipSelServiceImpl extends BaseServiceImpl<ZcrmViewShipSelM
 			String key = docNo + "-" + itemId;
 			if (existingMap.containsKey(key)) {
 				// 已存在：更新（拷贝主键ID）
-				ZcrmViewShipSel existing = existingMap.get(key);
+				ViewShipSel existing = existingMap.get(key);
 				newShip.setId(existing.getId());  // 假设主键字段为id
 				updateList.add(newShip);
 			} else {