Merge branch 'refs/heads/master' into dev-qinyulong

blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -13,10 +13,10 @@ public interface LauncherConstant {
      * nacos 命名空间
      */
 //	String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e";
-    // 生产环境
-    String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401";
-    // 测试环境
-    // String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8";
+	// 生产环境
+//	String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401";
+	// 测试环境
+	String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8";
 
     /**
      * nacos 用户名

blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IAttachClient.java

@@ -20,6 +20,8 @@ public interface IAttachClient {
 
     String DETAIL_BY_ID = API_PREFIX + "/detail-by-id";
 
+    String COPY_FROM_TEMP_TO_BIZ_PREFIX = API_PREFIX + "/copy-from-temp-to-biz-prefix";
+
     /**
      *
      * @param attach
@@ -29,10 +31,19 @@ public interface IAttachClient {
     R<Attach> detail(@RequestBody Attach attach);
 
     /**
-     * todo:改成get
      * @param id
      * @return
      */
     @GetMapping(DETAIL_BY_ID)
     R<Attach> detailById(@RequestParam("id") Long id);
+
+    /**
+     *
+     * @param id
+     * @param bizPrefix
+     * @return
+     */
+    @GetMapping(COPY_FROM_TEMP_TO_BIZ_PREFIX)
+    R<Attach> copyFromTempToBizPrefix(@RequestParam("id") Long id,
+                                      @RequestParam("bizPrefix") String bizPrefix);
 }

blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGeneratorVer2.java

@@ -65,7 +65,7 @@ public class CodeGeneratorVer2 {
      * 需要生成的表名(两者只能取其一)
      */
     public static String[] INCLUDE_TABLES = {
-            "QA_PLAN_TEST"
+            "QA_NG"
     };
     /**
      * 需要排除的表名(两者只能取其一)

blade-ops/blade-develop/src/test/resources/templates/code.properties

@@ -6,7 +6,7 @@
 
 # CodeGenerator
 spring.datasource.driver-class-name=oracle.jdbc.OracleDriver
-spring.datasource.url=jdbc:oracle:thin:@192.168.0.221:1521/orcl
+spring.datasource.url=jdbc:oracle:thin:@172.31.31.31:1521/orcl
 #spring.datasource.url=jdbc:oracle:thin:@172.18.80.50:1521/orcl
 spring.datasource.username=JONHON_MES
 spring.datasource.password=oracle123456

blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/AttachClient.java

@@ -30,4 +30,10 @@ public class AttachClient implements IAttachClient {
         Attach detail = attachService.getById(id);
         return R.data(detail);
     }
+
+    @Override
+    public R<Attach> copyFromTempToBizPrefix(Long id, String bizPrefix) {
+        // todo:有temp桶,成功以后移动到具体业务桶中.
+        return null;
+    }
 }

blade-service-api/blade-desk-api/pom.xml

@@ -24,6 +24,17 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-excel</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-resource-api</artifactId>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.83</version>
+        </dependency>
     </dependencies>
 
 </project>

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/BasicClazzDTO.java

@@ -0,0 +1,24 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.basic.pojo.entity.BasicClazz;
+
+import java.io.Serial;
+
+/**
+ * [基础分类] 数据传输对象实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicClazzDTO extends BasicClazz {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/CoatingThicknessDTO.java

@@ -0,0 +1,24 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.basic.pojo.entity.CoatingThickness;
+
+import java.io.Serial;
+
+/**
+ * [镀层厚度对应] 数据传输对象实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CoatingThicknessDTO extends CoatingThickness {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/LocallyPlatedPartDTO.java

@@ -0,0 +1,24 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.basic.pojo.entity.LocallyPlatedPart;
+
+import java.io.Serial;
+
+/**
+ * [局部镀零件] 数据传输对象实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class LocallyPlatedPartDTO extends LocallyPlatedPart {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java

@@ -0,0 +1,24 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.basic.pojo.entity.MaterialQuota;
+
+import java.io.Serial;
+
+/**
+ * [物料定额] 数据传输对象实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MaterialQuotaDTO extends MaterialQuota {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java

@@ -0,0 +1,24 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.basic.pojo.entity.Oem;
+
+import java.io.Serial;
+
+/**
+ * [外协厂家] 数据传输对象实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OemDTO extends Oem {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/PlanAssignSteerDTO.java

@@ -0,0 +1,24 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.basic.pojo.entity.PlanAssignSteer;
+
+import java.io.Serial;
+
+/**
+ * [外协分派] 数据传输对象实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PlanAssignSteerDTO extends PlanAssignSteer {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java

@@ -0,0 +1,24 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.basic.pojo.entity.Plating;
+
+import java.io.Serial;
+
+/**
+ * [镀种] 数据传输对象实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PlatingDTO extends Plating {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingSmallDTO.java

@@ -0,0 +1,24 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.basic.pojo.entity.PlatingSmall;
+
+import java.io.Serial;
+
+/**
+ * [镀种小类] 数据传输对象实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PlatingSmallDTO extends PlatingSmall {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/ShiftsDTO.java

@@ -0,0 +1,24 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.basic.pojo.entity.Shifts;
+
+import java.io.Serial;
+
+/**
+ * [班次] 数据传输对象实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ShiftsDTO extends Shifts {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java

@@ -0,0 +1,78 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * [基础分类] 实体类
+ * todo:
+ * 没有插入，单独处理
+ * '302007'
+ *
+ * @author Tom Shuo
+ * @since 2026-01-05
+ */
+@Data
+@TableName("BA_BASIC_CLAZZ")
+@Schema(description = "BasicClazz Entity对象")
+@EqualsAndHashCode(callSuper = true)
+public class BasicClazz extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编码
+     */
+    public static final String COL_CODE = "CODE";
+    /**
+     * 名称
+     */
+    public static final String COL_NAME = "NAME";
+    /**
+     * 业务类别
+     */
+    public static final String COL_BIZ_TYPE = "BIZ_TYPE";
+    /**
+     * 备注
+     */
+    public static final String COL_MEMO = "MEMO";
+    /**
+     * 排序
+     */
+    public static final String COL_SORT = "SORT";
+
+    /**
+     * 编码
+     */
+    @Schema(description = "编码")
+    private String code;
+    /**
+     * 名称
+     */
+    @Schema(description = "名称")
+    private String name;
+    /**
+     * 业务类别
+     */
+    @Schema(description = "业务类别")
+    private Integer bizType;
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
+    private String memo;
+    /**
+     * 排序
+     */
+    @Schema(description = "排序")
+    private Long sort;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java

@@ -10,7 +10,6 @@ import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
 
 import java.io.Serial;
-import java.math.BigDecimal;
 
 /**
  * [批量配置] 实体类
@@ -91,22 +90,22 @@ public class BatConfig extends BaseEntity {
 	 * [工艺能力]id
 	 */
 	@Schema(description = "[工艺能力]id")
-	private BigDecimal caId;
+	private Long caId;
 	/**
 	 * 面积
 	 */
 	@Schema(description = "面积")
-	private BigDecimal area;
+	private Long area;
 	/**
 	 * 单件面积
 	 */
 	@Schema(description = "单件面积")
-	private BigDecimal singletonArea;
+	private Long singletonArea;
 	/**
 	 * [零件]id
 	 */
 	@Schema(description = "[零件]id")
-	private BigDecimal partId;
+	private Long partId;
 	/**
 	 * [零件]编码
 	 */

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java

@@ -0,0 +1,93 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * [镀层厚度对应] 实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-05
+ */
+@Data
+@TableName("BA_COATING_THICKNESS")
+@Schema(description = "CoatingThickness Entity对象")
+@EqualsAndHashCode(callSuper = true)
+public class CoatingThickness extends BaseEntity {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 镀层代号
+	 */
+    public static final String COL_THICKNESS_CODE = "THICKNESS_CODE";
+	/**
+	 * 名称
+	 */
+    public static final String COL_NAME = "NAME";
+	/**
+	 * 质量等级
+	 */
+    public static final String COL_LEVEL_NUM = "LEVEL_NUM";
+	/**
+	 * 是否以21E8-210开头
+	 */
+    public static final String COL_START_F21E8 = "START_F21E8";
+	/**
+	 * 厚度
+	 */
+    public static final String COL_THICKNESS = "THICKNESS";
+	/**
+	 * 排序
+	 */
+    public static final String COL_SORT = "SORT";
+	/**
+	 * 备注
+	 */
+    public static final String COL_REMARK = "REMARK";
+
+	/**
+	 * 镀层代号
+	 */
+	@Schema(description = "镀层代号")
+	private String thicknessCode;
+	/**
+	 * 名称
+	 */
+	@Schema(description = "名称")
+	private String name;
+	/**
+	 * 质量等级
+	 */
+	@Schema(description = "质量等级")
+	private Integer levelNum;
+	/**
+	 * 是否以21E8-210开头
+	 */
+	@Schema(description = "是否以21E8-210开头")
+	private Short startF21e8;
+	/**
+	 * 厚度
+	 */
+	@Schema(description = "厚度")
+	private Long thickness;
+	/**
+	 * 排序
+	 */
+	@Schema(description = "排序")
+	private Long sort;
+	/**
+	 * 备注
+	 */
+	@Schema(description = "备注")
+	private String remark;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java

@@ -0,0 +1,75 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * [局部镀零件] 实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-05
+ */
+@Data
+@TableName("BA_LOCALLY_PLATED_PART")
+@Schema(description = "LocallyPlatedPart Entity对象")
+@EqualsAndHashCode(callSuper = true)
+public class LocallyPlatedPart extends BaseEntity {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 零件编号
+	 */
+    public static final String COL_PART_CODE = "PART_CODE";
+	/**
+	 * 类型
+	 */
+    public static final String COL_PART_TYPE = "PART_TYPE";
+	/**
+	 * 名称
+	 */
+    public static final String COL_NAME = "NAME";
+	/**
+	 * 排序
+	 */
+    public static final String COL_SORT = "SORT";
+	/**
+	 * 备注
+	 */
+    public static final String COL_REMARK = "REMARK";
+
+	/**
+	 * 零件编号
+	 */
+	@Schema(description = "零件编号")
+	private String partCode;
+	/**
+	 * 类型
+	 */
+	@Schema(description = "类型")
+	private Long partType;
+	/**
+	 * 名称
+	 */
+	@Schema(description = "名称")
+	private String name;
+	/**
+	 * 排序
+	 */
+	@Schema(description = "排序")
+	private Long sort;
+	/**
+	 * 备注
+	 */
+	@Schema(description = "备注")
+	private String remark;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java

@@ -0,0 +1,111 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * [物料定额] 实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-05
+ */
+@Data
+@TableName("BA_MATERIAL_QUOTA")
+@Schema(description = "MaterialQuota Entity对象")
+@EqualsAndHashCode(callSuper = true)
+public class MaterialQuota extends BaseEntity {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 类型-[1]:金押定额;[2]:银板定额;
+	 */
+    public static final String COL_QUOTA_TYPE = "QUOTA_TYPE";
+	/**
+	 * 名称
+	 */
+    public static final String COL_NAME = "NAME";
+	/**
+	 * [工艺能力]id
+	 */
+    public static final String COL_PROCESS_ABILITY_ID = "PROCESS_ABILITY_ID";
+	/**
+	 * 镀层厚度
+	 */
+    public static final String COL_THICKNESS = "THICKNESS";
+	/**
+	 * 定额
+	 */
+    public static final String COL_QUOTA = "QUOTA";
+	/**
+	 * 小批量定额
+	 */
+    public static final String COL_SMALL_BAT_QUOTA = "SMALL_BAT_QUOTA";
+	/**
+	 * 大批量定额
+	 */
+    public static final String COL_BIG_BAT_QUOTA = "BIG_BAT_QUOTA";
+	/**
+	 * 排序
+	 */
+    public static final String COL_SORT = "SORT";
+	/**
+	 * 备注
+	 */
+    public static final String COL_REMARK = "REMARK";
+
+	/**
+	 * 类型-[1]:金押定额;[2]:银板定额;
+	 */
+	@Schema(description = "类型-[1]:金押定额;[2]:银板定额;")
+	private Long quotaType;
+	/**
+	 * 名称
+	 */
+	@Schema(description = "名称")
+	private String name;
+	/**
+	 * [工艺能力]id
+	 */
+	@Schema(description = "[工艺能力]id")
+	private Long processAbilityId;
+	/**
+	 * 镀层厚度
+	 */
+	@Schema(description = "镀层厚度")
+	private Long thickness;
+	/**
+	 * 定额
+	 */
+	@Schema(description = "定额")
+	private Long quota;
+	/**
+	 * 小批量定额
+	 */
+	@Schema(description = "小批量定额")
+	private Long smallBatQuota;
+	/**
+	 * 大批量定额
+	 */
+	@Schema(description = "大批量定额")
+	private Long bigBatQuota;
+	/**
+	 * 排序
+	 */
+	@Schema(description = "排序")
+	private Long sort;
+	/**
+	 * 备注
+	 */
+	@Schema(description = "备注")
+	private String remark;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java

@@ -0,0 +1,156 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * [外协厂家] 实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-04
+ */
+@Data
+@TableName("BA_OEM")
+@Schema(description = "Oem Entity对象")
+@EqualsAndHashCode(callSuper = true)
+public class Oem extends BaseEntity {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 编码
+	 */
+    public static final String COL_CODE = "CODE";
+	/**
+	 * 简称
+	 */
+    public static final String COL_ABBREVIATION = "ABBREVIATION";
+	/**
+	 * 工艺能力
+	 */
+    public static final String COL_CRAFT_ABILITY = "CRAFT_ABILITY";
+	/**
+	 * 地区
+	 */
+    public static final String COL_REGION = "REGION";
+	/**
+	 * 地址
+	 */
+    public static final String COL_ADDRESS = "ADDRESS";
+	/**
+	 * 资质
+	 */
+    public static final String COL_QUALIFICATION = "QUALIFICATION";
+	/**
+	 * 联系人
+	 */
+    public static final String COL_CONTACT_MAN = "CONTACT_MAN";
+	/**
+	 * 邮箱
+	 */
+    public static final String COL_EMAIL = "EMAIL";
+	/**
+	 * 联系电话
+	 */
+    public static final String COL_CONTACT_PHONE = "CONTACT_PHONE";
+	/**
+	 * 密码
+	 */
+    public static final String COL_OEM_PASSWORD = "OEM_PASSWORD";
+	/**
+	 * 名称
+	 */
+    public static final String COL_OC_NAME = "OC_NAME";
+	/**
+	 * 类型
+	 */
+    public static final String COL_OEM_TYPE = "OEM_TYPE";
+	/**
+	 * 排序
+	 */
+    public static final String COL_SORT = "SORT";
+	/**
+	 * 备注
+	 */
+    public static final String COL_REMARK = "REMARK";
+
+	/**
+	 * 编码
+	 */
+	@Schema(description = "编码")
+	private String code;
+	/**
+	 * 简称
+	 */
+	@Schema(description = "简称")
+	private String abbreviation;
+	/**
+	 * 工艺能力
+	 */
+	@Schema(description = "工艺能力")
+	private String craftAbility;
+	/**
+	 * 地区
+	 */
+	@Schema(description = "地区")
+	private String region;
+	/**
+	 * 地址
+	 */
+	@Schema(description = "地址")
+	private String address;
+	/**
+	 * 资质
+	 */
+	@Schema(description = "资质")
+	private Integer qualification;
+	/**
+	 * 联系人
+	 */
+	@Schema(description = "联系人")
+	private String contactMan;
+	/**
+	 * 邮箱
+	 */
+	@Schema(description = "邮箱")
+	private String email;
+	/**
+	 * 联系电话
+	 */
+	@Schema(description = "联系电话")
+	private String contactPhone;
+	/**
+	 * 密码
+	 */
+	@Schema(description = "密码")
+	private String oemPassword;
+	/**
+	 * 名称
+	 */
+	@Schema(description = "名称")
+	private String ocName;
+	/**
+	 * 类型
+	 */
+	@Schema(description = "类型")
+	private Long oemType;
+	/**
+	 * 排序
+	 */
+	@Schema(description = "排序")
+	private Long sort;
+	/**
+	 * 备注
+	 */
+	@Schema(description = "备注")
+	private String remark;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java

@@ -0,0 +1,121 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.io.Serial;
+import java.time.LocalDateTime;
+
+/**
+ * [外协分派] 实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-05
+ */
+@Data
+@TableName("BA_PLAN_ASSIGN_STEER")
+@Schema(description = "PlanAssignSteer Entity对象")
+@EqualsAndHashCode(callSuper = true)
+public class PlanAssignSteer extends BaseEntity {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * [外协厂家]id
+	 */
+    public static final String COL_OEM_ID = "OEM_ID";
+	/**
+	 * [工艺能力]id
+	 */
+    public static final String COL_PLATING_ID = "PLATING_ID";
+	/**
+	 * 零件;外键(dsPart)
+	 */
+    public static final String COL_DS_PART = "DS_PART";
+	/**
+	 * 分派比例
+	 */
+    public static final String COL_ASSIGN_SCALE = "ASSIGN_SCALE";
+	/**
+	 * 厂家周累计分派量
+	 */
+    public static final String COL_WEEK_ASSIGN = "WEEK_ASSIGN";
+	/**
+	 * 分类周累计分派量
+	 */
+    public static final String COL_CLASSIFY_ASSIGN = "CLASSIFY_ASSIGN";
+	/**
+	 * 比例偏差因子
+	 */
+    public static final String COL_FACTOR = "FACTOR";
+	/**
+	 * 维护人
+	 */
+    public static final String COL_MAINTAIN_MAN = "MAINTAIN_MAN";
+	/**
+	 * 维护时间
+	 */
+    public static final String COL_MAINTAIN_TIME = "MAINTAIN_TIME";
+	/**
+	 * 日分派量
+	 */
+    public static final String COL_ASSIGN = "ASSIGN";
+
+	/**
+	 * [外协厂家]id
+	 */
+	@Schema(description = "[外协厂家]id")
+	private Long oemId;
+	/**
+	 * [工艺能力]id
+	 */
+	@Schema(description = "[工艺能力]id")
+	private Long platingId;
+	/**
+	 * 零件;外键(dsPart)
+	 */
+	@Schema(description = "零件;外键(dsPart)")
+	private Long dsPart;
+	/**
+	 * 分派比例
+	 */
+	@Schema(description = "分派比例")
+	private Long assignScale;
+	/**
+	 * 厂家周累计分派量
+	 */
+	@Schema(description = "厂家周累计分派量")
+	private Long weekAssign;
+	/**
+	 * 分类周累计分派量
+	 */
+	@Schema(description = "分类周累计分派量")
+	private Long classifyAssign;
+	/**
+	 * 比例偏差因子
+	 */
+	@Schema(description = "比例偏差因子")
+	private Long factor;
+	/**
+	 * 维护人
+	 */
+	@Schema(description = "维护人")
+	private Long maintainMan;
+	/**
+	 * 维护时间
+	 */
+	@Schema(description = "维护时间")
+	private LocalDateTime maintainTime;
+	/**
+	 * 日分派量
+	 */
+	@Schema(description = "日分派量")
+	private String assign;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java

@@ -0,0 +1,157 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.io.Serial;
+import java.math.BigDecimal;
+
+/**
+ * [镀种] 实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-05
+ */
+@Data
+@TableName("BA_PLATING")
+@Schema(description = "Plating Entity对象")
+@EqualsAndHashCode(callSuper = true)
+public class Plating extends BaseEntity {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 配置码
+	 */
+    public static final String COL_CONFIG_NO = "CONFIG_NO";
+	/**
+	 * [镀种分类]id
+	 */
+    public static final String COL_BC_ID = "BC_ID";
+	/**
+	 * 镀种
+	 */
+    public static final String COL_PLATING = "PLATING";
+	/**
+	 * 材料
+	 */
+    public static final String COL_MATERIAL = "MATERIAL";
+	/**
+	 * 硬度
+	 */
+    public static final String COL_HARDNESS = "HARDNESS";
+	/**
+	 * 镀层编码
+	 */
+    public static final String COL_MAT_CODE = "MAT_CODE";
+	/**
+	 * 材料状态
+	 */
+    public static final String COL_MAT_STATE = "MAT_STATE";
+	/**
+	 * 镀种小类
+	 */
+    public static final String COL_SUB_CLASS = "SUB_CLASS";
+	/**
+	 * 其他要求
+	 */
+    public static final String COL_MEMO = "MEMO";
+	/**
+	 * 镀层代号
+	 */
+    public static final String COL_PLATE_CODE = "PLATE_CODE";
+	/**
+	 * 镀层物料
+	 */
+    public static final String COL_PLATE_GOODS_CODE = "PLATE_GOODS_CODE";
+	/**
+	 * 镀层厚度
+	 */
+    public static final String COL_PLATE_THICKNESS = "PLATE_THICKNESS";
+	/**
+	 * 排序
+	 */
+    public static final String COL_SORT = "SORT";
+	/**
+	 * 备注
+	 */
+    public static final String COL_REMARK = "REMARK";
+
+	/**
+	 * 配置码
+	 */
+	@Schema(description = "配置码")
+	private String configNo;
+	/**
+	 * [镀种分类]id
+	 */
+	@Schema(description = "[镀种分类]id")
+	private Long bcId;
+	/**
+	 * 镀种
+	 */
+	@Schema(description = "镀种")
+	private String plating;
+	/**
+	 * 材料
+	 */
+	@Schema(description = "材料")
+	private String material;
+	/**
+	 * 硬度
+	 */
+	@Schema(description = "硬度")
+	private String hardness;
+	/**
+	 * 镀层编码
+	 */
+	@Schema(description = "镀层编码")
+	private String matCode;
+	/**
+	 * 材料状态
+	 */
+	@Schema(description = "材料状态")
+	private String matState;
+	/**
+	 * 镀种小类
+	 */
+	@Schema(description = "镀种小类")
+	private Long subClass;
+	/**
+	 * 其他要求
+	 */
+	@Schema(description = "其他要求")
+	private String memo;
+	/**
+	 * 镀层代号
+	 */
+	@Schema(description = "镀层代号")
+	private String plateCode;
+	/**
+	 * 镀层物料
+	 */
+	@Schema(description = "镀层物料")
+	private String plateGoodsCode;
+	/**
+	 * 镀层厚度
+	 */
+	@Schema(description = "镀层厚度")
+	private String plateThickness;
+	/**
+	 * 排序
+	 */
+	@Schema(description = "排序")
+	private Long sort;
+	/**
+	 * 备注
+	 */
+	@Schema(description = "备注")
+	private String remark;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java

@@ -0,0 +1,76 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.io.Serial;
+import java.math.BigDecimal;
+
+/**
+ * [镀种小类] 实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-05
+ */
+@Data
+@TableName("BA_PLATING_SMALL")
+@Schema(description = "PlatingSmall Entity对象")
+@EqualsAndHashCode(callSuper = true)
+public class PlatingSmall extends BaseEntity {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 名称
+	 */
+    public static final String COL_BPS_NAME = "BPS_NAME";
+	/**
+	 * 日常规生产能力
+	 */
+    public static final String COL_CAPACITY = "CAPACITY";
+	/**
+	 * [作业中心]id
+	 */
+    public static final String COL_WC_ID = "WC_ID";
+	/**
+	 * 排序
+	 */
+    public static final String COL_SORT = "SORT";
+	/**
+	 * 备注
+	 */
+    public static final String COL_REMARK = "REMARK";
+
+	/**
+	 * 名称
+	 */
+	@Schema(description = "名称")
+	private String bpsName;
+	/**
+	 * 日常规生产能力
+	 */
+	@Schema(description = "日常规生产能力")
+	private BigDecimal capacity;
+	/**
+	 * [作业中心]id
+	 */
+	@Schema(description = "[作业中心]id")
+	private Long wcId;
+	/**
+	 * 排序
+	 */
+	@Schema(description = "排序")
+	private Long sort;
+	/**
+	 * 备注
+	 */
+	@Schema(description = "备注")
+	private String remark;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java

@@ -10,7 +10,6 @@ import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
 
 import java.io.Serial;
-import java.math.BigDecimal;
 
 /**
  * [工艺能力] 实体类
@@ -66,12 +65,12 @@ public class ProcessAbility extends BaseEntity {
 	 * 能力分类
 	 */
 	@Schema(description = "能力分类")
-	private BigDecimal wtId;
+	private Long wtId;
 	/**
 	 * [镀种小类]id
 	 */
 	@Schema(description = "[镀种小类]id")
-	private BigDecimal bpsId;
+	private Long bpsId;
 	/**
 	 * 排序
 	 */

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java

@@ -13,7 +13,7 @@ import java.io.Serial;
 
 /**
  * [生产标识] 实体类
- *
+ * mes v1: bs_procedure_qua
  * @author Tom Shuo
  * @since 2025-12-22
  */

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java

@@ -0,0 +1,75 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * [班次] 实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-05
+ */
+@Data
+@TableName("BA_SHIFTS")
+@Schema(description = "Shifts Entity对象")
+@EqualsAndHashCode(callSuper = true)
+public class Shifts extends BaseEntity {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * [班次]编码
+	 */
+    public static final String COL_SHIFT_CODE = "SHIFT_CODE";
+	/**
+	 * [班次]类型
+	 */
+    public static final String COL_SHIFT_TYPE = "SHIFT_TYPE";
+	/**
+	 * [班次]名称
+	 */
+    public static final String COL_NAME = "NAME";
+	/**
+	 * 排序
+	 */
+    public static final String COL_SORT = "SORT";
+	/**
+	 * 备注
+	 */
+    public static final String COL_REMARK = "REMARK";
+
+	/**
+	 * [班次]编码
+	 */
+	@Schema(description = "[班次]编码")
+	private String shiftCode;
+	/**
+	 * [班次]类型
+	 */
+	@Schema(description = "[班次]类型")
+	private Long shiftType;
+	/**
+	 * [班次]名称
+	 */
+	@Schema(description = "[班次]名称")
+	private String name;
+	/**
+	 * 排序
+	 */
+	@Schema(description = "排序")
+	private Long sort;
+	/**
+	 * 备注
+	 */
+	@Schema(description = "备注")
+	private String remark;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java

@@ -3,6 +3,7 @@
  */
 package org.springblade.desk.basic.pojo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -54,10 +55,6 @@ public class TeamSet extends BaseEntity {
 	 * 创建人;外键（人员）
 	 */
     public static final String COL_CREATE_MAN = "CREATE_MAN";
-	/**
-	 * 删除标记;1:删除，0:正常
-	 */
-    public static final String COL_DELETED = "DELETED";
 	/**
 	 * 作业中心
 	 */
@@ -126,11 +123,6 @@ public class TeamSet extends BaseEntity {
 	 */
 	@Schema(description = "创建人;外键（人员）")
 	private Long createMan;
-	/**
-	 * 删除标记;1:删除，0:正常
-	 */
-	@Schema(description = "删除标记;1:删除，0:正常")
-	private String deleted;
 	/**
 	 * 作业中心
 	 */

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java

@@ -0,0 +1,11 @@
+package org.springblade.desk.basic.pojo.request;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.basic.pojo.entity.Oem;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OemSearch extends Oem {
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java

@@ -4,8 +4,10 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
- * todo:
+ * BaseEntity 共用字段对应VO.
  */
 @Data
 @EqualsAndHashCode()
@@ -15,7 +17,7 @@ public class BaseEntityVO {
      * 创建[用户]-真名
      */
     @Schema(description = "创建[用户]-真名")
-    private String createUserRealName = "创建[用户]-真名";
+    private String createUserRealName = "";
     /**
      * 创建[部门]-部门名
      */
@@ -25,17 +27,25 @@ public class BaseEntityVO {
      * 更新[用户]-真名
      */
     @Schema(description = "更新用户-真名")
-    private String updateUserRealName = "更新用户-真名";
+    private String updateUserRealName = "";
     /**
      * 维护[用户]id
      */
     @Schema(description = "维护[用户]id")
     private Long keepUser = 0L;
     /**
-     *
+     * 维护[用户]-真名
      */
     @Schema(description = "维护[用户]-真名")
-    private String keepUserRealName = "维护[用户]-真名";
+    private String keepUserRealName = "";
+    /**
+     * 维护时间
+     */
+    @Schema(description = "维护时间")
+    private Date keepTime;
+    /**
+     * 业务状态 名称
+     */
     @Schema(description = "业务状态 名称")
-    private String statusName = "statusName";
+    private String statusName = "";
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/BasicClazzVO.java

@@ -0,0 +1,24 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.basic.pojo.entity.BasicClazz;
+
+import java.io.Serial;
+
+/**
+ * [基础分类] 视图实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicClazzVO extends BasicClazz {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/CoatingThicknessVO.java

@@ -0,0 +1,24 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.basic.pojo.entity.CoatingThickness;
+
+import java.io.Serial;
+
+/**
+ * [镀层厚度对应] 视图实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CoatingThicknessVO extends CoatingThickness {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/LocallyPlatedPartVO.java

@@ -0,0 +1,24 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.basic.pojo.entity.LocallyPlatedPart;
+
+import java.io.Serial;
+
+/**
+ * [局部镀零件] 视图实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class LocallyPlatedPartVO extends LocallyPlatedPart {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/MaterialQuotaVO.java

@@ -0,0 +1,24 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.basic.pojo.entity.MaterialQuota;
+
+import java.io.Serial;
+
+/**
+ * [物料定额] 视图实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MaterialQuotaVO extends MaterialQuota {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java

@@ -0,0 +1,24 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.basic.pojo.entity.Oem;
+
+import java.io.Serial;
+
+/**
+ * [外协厂家] 视图实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OemVO extends Oem {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java

@@ -0,0 +1,24 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.basic.pojo.entity.PlanAssignSteer;
+
+import java.io.Serial;
+
+/**
+ * [外协分派] 视图实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PlanAssignSteerVO extends PlanAssignSteer {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java

@@ -0,0 +1,24 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.basic.pojo.entity.PlatingSmall;
+
+import java.io.Serial;
+
+/**
+ * [镀种小类] 视图实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PlatingSmallVO extends PlatingSmall {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java

@@ -0,0 +1,24 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.basic.pojo.entity.Plating;
+
+import java.io.Serial;
+
+/**
+ * [镀种] 视图实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PlatingVO extends Plating {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java

@@ -0,0 +1,24 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.basic.pojo.entity.Shifts;
+
+import java.io.Serial;
+
+/**
+ * [班次] 视图实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ShiftsVO extends Shifts {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/common/model/dto/ErpReviewDutyDto.java

@@ -0,0 +1,71 @@
+package org.springblade.desk.oldv1.common.model.dto;
+
+import lombok.Data;
+
+/**
+ * <p>Description: 审理单责任零件 </p>
+ *
+ * @author lyj
+ * @date 2023-02-10 17:09
+ */
+@Data
+public class ErpReviewDutyDto {
+
+    /**
+     * 审理单Id
+     */
+    private String trialId;
+
+    /**
+     * 序号
+     */
+    private String trialSeq;
+
+    /**
+     * 物料号
+     */
+    private String mdsItemCode;
+
+    /**
+     * 批次号
+     */
+    private String batchNo;
+
+    /**
+     * 相关物料号
+     */
+    private String corrMdsItemCode;
+
+    /**
+     * 相关批次号
+     */
+    private String corrBatchNo;
+
+    /**
+     * 备注
+     */
+    private String note;
+
+    /**
+     * 数量
+     */
+    private Integer reqQty;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    public ErpReviewDutyDto(String trialId, String trialSeq, String mdsItemCode, String batchNo, String corrMdsItemCode,
+                            String corrBatchNo, String note, Integer reqQty, String unit) {
+        this.trialId = trialId;
+        this.trialSeq = trialSeq;
+        this.mdsItemCode = mdsItemCode;
+        this.batchNo = batchNo;
+        this.corrMdsItemCode = corrMdsItemCode;
+        this.corrBatchNo = corrBatchNo;
+        this.note = note;
+        this.reqQty = reqQty;
+        this.unit = unit;
+    }
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/common/model/dto/ErpReviewFaultDto.java

@@ -0,0 +1,65 @@
+package org.springblade.desk.oldv1.common.model.dto;
+
+import lombok.Data;
+
+/**
+ * <p>Description: 审理单问题故障 </p>
+ *
+ * @author lyj
+ * @date 2023-02-10 17:10
+ */
+@Data
+public class ErpReviewFaultDto {
+
+    /**
+     * 审理单Id
+     */
+    private String trialId;
+
+    /**
+     * 序号
+     */
+    private String trialSeq;
+
+    /**
+     * 故障类别
+     */
+    private String faultType;
+
+    /**
+     * 问题大类
+     */
+    private String questClass;
+
+    /**
+     * 问题小类
+     */
+    private String questSubclass;
+
+    /**
+     * 比例
+     */
+    private String proportion;
+
+    /**
+     * 数量
+     */
+    private Integer faultQty;
+
+    /**
+     * 描述
+     */
+    private String describe;
+
+    public ErpReviewFaultDto(String trialId, String trialSeq, String faultType, String questClass, String questSubclass,
+                             String proportion, Integer faultQty, String describe) {
+        this.trialId = trialId;
+        this.trialSeq = trialSeq;
+        this.faultType = faultType;
+        this.questClass = questClass;
+        this.questSubclass = questSubclass;
+        this.proportion = proportion;
+        this.faultQty = faultQty;
+        this.describe = describe;
+    }
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/common/model/dto/ErpReviewSheetDto.java

@@ -0,0 +1,138 @@
+package org.springblade.desk.oldv1.common.model.dto;
+
+import lombok.Data;
+
+/**
+ * <p>Description: 审理单主表 </p>
+ *
+ * @author lyj
+ * @date 2023-02-10 14:10
+ */
+@Data
+public class ErpReviewSheetDto {
+
+    /**
+     * 批次号
+     */
+    private String batchNo;
+
+    /**
+     * 车间订单号/外协交件号.业务号
+     */
+    private String businessNo;
+
+    /**
+     * 检验员编码
+     */
+    private String checkUserCode;
+
+    /**
+     * 物料编码
+     */
+    private String mdsItemCode;
+
+    /**
+     * 物料名称
+     */
+    private String mdsItemName;
+
+    /**
+     * 质量等级
+     */
+    private String levels;
+
+    /**
+     * 发现部门
+     */
+    private String findWorkShop;
+
+    /**
+     * 是否质量问题
+     */
+    private Boolean qualityquestion;
+
+    /**
+     * 审理单状态
+     */
+    private String trialStatus = "21";
+
+    /**
+     * 总数量
+     */
+    private Double needQty;
+
+    /**
+     * 上级编号
+     */
+    private String preCode;
+
+    /**
+     * 比例
+     */
+    private String proporTion;
+
+    /**
+     * 不合格数量
+     */
+    private Integer subQty;
+
+    /**
+     * 简单原因
+     */
+    private String easyReason;
+
+    /**
+     * 处置单类型（1-零件模式/2-装配模式/5-售后模式）
+     */
+    private String trialType;
+
+    /**
+     * 工序号
+     */
+    private String seqNo;
+    /**
+     * 工序名称
+     */
+    private String seqName;
+
+    /**
+     * 发现人
+     */
+    private String findUserCode;
+    /**
+     * 处置单类型（1-提交质保/2-提交工艺/3-提交设计）
+     */
+    private String hearDis;
+    /**
+     * 检验时间
+     */
+    private String checkDate;
+
+    public ErpReviewSheetDto(String batchNo, String businessNo, String checkUserCode, String easyReason, String levels,
+                             String mdsItemCode, String mdsItemName, Double needQty, String preCode, String proporTion,
+                             Boolean qualityquestion, Integer subQty, String trialType, String seqNo, String seqName, String findUserCode, String hearDis) { //, String checkDate
+        this.batchNo = batchNo;
+        this.businessNo = businessNo;
+        this.checkUserCode = checkUserCode;
+        this.easyReason = easyReason;
+        this.findWorkShop = "3400";
+        this.levels = levels;
+        this.mdsItemCode = mdsItemCode;
+        this.mdsItemName = mdsItemName;
+        this.needQty = needQty;
+        this.preCode = preCode;
+        this.proporTion = proporTion;
+        this.qualityquestion = qualityquestion;
+        this.subQty = subQty;
+        this.trialType = trialType;
+        this.hearDis = hearDis;
+        this.seqNo = seqNo;
+        this.seqName = seqName;
+        this.findUserCode = findUserCode;
+//        this.checkDate = checkDate;
+    }
+
+    public ErpReviewSheetDto() {
+
+    }
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/constant/Constant.java

@@ -0,0 +1,23 @@
+package org.springblade.desk.oldv1.constant;
+
+/**
+ * copy from
+ * com.videasoft.webframework.model.Constant;
+ */
+public class Constant {
+
+    public static final String LOGIN_INFO = "loginInfo";
+    public static final String CONTEXT_ERROR = "contextError";
+    public static final String LIMITS = "limit";
+    public static final String MENUS = "menu";
+    public static final String WEBAPI_REQUEST_PARAMETERS = "webapi_request_parameters";
+    public static final String JASPER_HEAD_DATA = "jasper_head_data";
+    public static final String CUSTOMER_LOGO_FILE_NAME = "customer_logo";
+    public static final String JASPER_COMPANY_INFO = "companyInfo";
+    public static final String READ_HEADER_KEY = "x-tsessid";
+    public static final String WRITE_HEADER_KEY = "tsessid";
+    public static final String ACCESS_CONTROL_EXPOSE_HEADER = "Access-Control-Expose-Headers";
+    public static final String HEADER_TOKEN = "token";
+    public static final String HEADER_UC_TOKEN = "uc-token";
+    public static final String TENANT_ID = "tenant-id";
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/pojo/ResultInfo.java

@@ -0,0 +1,284 @@
+package org.springblade.desk.oldv1.pojo;
+
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson.serializer.PropertyPreFilter;
+import com.alibaba.fastjson.serializer.SimplePropertyPreFilter;
+
+/**
+ * copy from
+ * com.videasoft.webframework.common.model.ResultInfo
+ */
+public class ResultInfo implements Serializable {
+    private static final long serialVersionUID = -2024858098559225464L;
+    private int code;
+    private String message;
+    private Object data;
+    @JSONField(serialize = false)
+    private String i18n;
+    @JSONField(serialize = false)
+    private Object[] i18nParams;
+    @JSONField(serialize = false)
+    private String language;
+    private Map<Class<?>, PropertyPreFilter> propertyPreFilterMap;
+    public static final int OK = 0;
+    public static final int ERROR = -1;
+    public static final int MODULE_ACCESS = 999;
+    public static final int SESSION_INVALID = 998;
+    public static final int RESULT_CODE_10001 = 10001;
+    public static final int RESULT_CODE_10002 = 10002;
+    public static final int RESULT_CODE_10003 = 10003;
+    public static final int RESULT_CODE_10004 = 10004;
+    public static final int RESULT_CODE_10005 = 10005;
+
+    public ResultInfo() {
+        this.propertyPreFilterMap = new HashMap();
+        this.code = 0;
+    }
+
+    private ResultInfo(Object data) {
+        this();
+        this.data = data;
+    }
+
+    private ResultInfo(int code, String message) {
+        this.propertyPreFilterMap = new HashMap();
+        this.message = message;
+        this.code = code;
+    }
+
+    private ResultInfo(int code, String i18n, Object[] i18nParams) {
+        this.propertyPreFilterMap = new HashMap();
+        this.code = code;
+        this.i18n = i18n;
+        this.i18nParams = i18nParams;
+    }
+
+    private ResultInfo(int code, String i18n, Object[] i18nParams, String language) {
+        this.propertyPreFilterMap = new HashMap();
+        this.code = code;
+        this.i18n = i18n;
+        this.i18nParams = i18nParams;
+        this.language = language;
+    }
+
+    public String getMessage() {
+        return this.message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public int getCode() {
+        return this.code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public Object getData() {
+        return this.data;
+    }
+
+    public void setData(Object data) {
+        this.data = data;
+    }
+
+    @JSONField(serialize = false)
+    public boolean isOk() {
+        return 0 == this.code;
+    }
+
+    @JSONField(serialize = false)
+    public boolean isError() {
+        return 0 != this.code;
+    }
+
+    public String getI18n() {
+        return this.i18n;
+    }
+
+    public Object[] getI18nParams() {
+        return this.i18nParams;
+    }
+
+    public String getLanguage() {
+        return this.language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    public static ResultInfo ok() {
+        return new ResultInfo();
+    }
+
+    public static ResultInfo ok(Object data) {
+        return new ResultInfo(data);
+    }
+
+    public static ResultInfo ok(String i18n, Object[] i18nParams) {
+        return new ResultInfo(0, i18n, i18nParams);
+    }
+
+    public static ResultInfo ok(String i18n, Object[] i18nParams, String language) {
+        return new ResultInfo(0, i18n, i18nParams, language);
+    }
+
+    public static ResultInfo ok(Object data, String i18n, Object[] i18nParams) {
+        ResultInfo resultInfo = new ResultInfo(0, i18n, i18nParams);
+        resultInfo.setData(data);
+        return resultInfo;
+    }
+
+    public static ResultInfo ok(Object data, String i18n, Object[] i18nParams, String language) {
+        ResultInfo resultInfo = new ResultInfo(0, i18n, i18nParams, language);
+        resultInfo.setData(data);
+        return resultInfo;
+    }
+
+    public static ResultInfo error(int code, String message) {
+        return new ResultInfo(code, message);
+    }
+
+    public static ResultInfo error(int code, String i18n, Object[] i18nParams) {
+        return new ResultInfo(code, i18n, i18nParams);
+    }
+
+    public static ResultInfo error(int code, String i18n, Object[] i18nParams, String language) {
+        return new ResultInfo(code, i18n, i18nParams, language);
+    }
+
+    public static ResultInfo error(String message) {
+        return error(-1, message);
+    }
+
+    public static ResultInfo error(String i18n, Object[] i18nParams, String language) {
+        return error(-1, i18n, i18nParams, language);
+    }
+
+    public static ResultInfo error(String i18n, Object[] i18nParams) {
+        return error(-1, i18n, i18nParams);
+    }
+
+    public static ResultInfo parse(String json) {
+        if (json != null && json.trim().length() != 0) {
+            JSONObject jobj = JSONObject.parseObject(json);
+            if (jobj == null) {
+                return null;
+            } else if (!jobj.containsKey("code")) {
+                return null;
+            } else {
+                ResultInfo rtn = new ResultInfo();
+                rtn.setCode(jobj.getIntValue("code"));
+                rtn.setMessage(jobj.getString("message"));
+                rtn.setData(jobj.get("data"));
+                return rtn;
+            }
+        } else {
+            return null;
+        }
+    }
+
+    @JSONField(serialize = false)
+    public Map<Class<?>, PropertyPreFilter> getPropertyPreFilters() {
+        return this.propertyPreFilterMap;
+    }
+
+    public ResultInfo addInclude(Class<?> cls, String... properties) {
+        SimplePropertyPreFilter sp = null;
+        Class<?> subCls = null;
+        String fieldName = null;
+
+        for (String item : properties) {
+            if (item != null) {
+                fieldName = item;
+                int dotIndex = item.indexOf(".");
+                if (dotIndex > 0) {
+                    fieldName = item.substring(0, dotIndex);
+                    subCls = this.getFeildClass(cls, fieldName);
+                    this.addInclude(subCls, item.substring(dotIndex + 1));
+                }
+
+                sp = (SimplePropertyPreFilter) this.propertyPreFilterMap.get(cls);
+                if (sp == null) {
+                    sp = new SimplePropertyPreFilter(cls, new String[0]);
+                    this.propertyPreFilterMap.put(cls, sp);
+                }
+
+                sp.getIncludes().add(fieldName);
+            }
+        }
+
+        return this;
+    }
+
+    public ResultInfo addExclude(Class<?> cls, String... properties) {
+        SimplePropertyPreFilter sp = null;
+
+        for (String item : properties) {
+            String fieldName = null;
+            Class<?> objCls = cls;
+            if (item != null) {
+                fieldName = item;
+                int dotIndex = item.lastIndexOf(".");
+                if (dotIndex > 0) {
+                    fieldName = item.substring(dotIndex + 1);
+                    objCls = this.getFeildClass(cls, item.substring(0, dotIndex));
+                }
+
+                sp = (SimplePropertyPreFilter) this.propertyPreFilterMap.get(objCls);
+                if (sp == null) {
+                    sp = new SimplePropertyPreFilter(objCls, new String[0]);
+                    this.propertyPreFilterMap.put(objCls, sp);
+                }
+
+                sp.getExcludes().add(fieldName);
+            }
+        }
+
+        return this;
+    }
+
+    private Class<?> getFeildClass(Class<?> objCls, String f) {
+        Class<?> cls = null;
+        String ff = f;
+        String lf = null;
+        if (objCls == null) {
+            return null;
+        } else {
+            int dotIndex = f.indexOf(".");
+            if (dotIndex > 0) {
+                ff = f.substring(0, dotIndex);
+                lf = f.substring(dotIndex + 1);
+            }
+
+            try {
+                String getterName = "get" + ff.substring(0, 1).toUpperCase() + (ff.length() == 1 ? "" : ff.substring(1));
+                cls = objCls.getDeclaredMethod(getterName, (Class[]) null).getReturnType();
+                if (lf != null) {
+                    return this.getFeildClass(cls, lf);
+                }
+            } catch (NoSuchMethodException e) {
+                e.printStackTrace();
+            } catch (SecurityException e) {
+                e.printStackTrace();
+            }
+
+            return cls;
+        }
+    }
+
+    public String toString() {
+        return "ResultInfo{code=" + this.code + ", message='" + this.message + '\'' + ", data=" + this.data + ", i18n='" + this.i18n + '\'' + ", i18nParams=" + Arrays.toString(this.i18nParams) + ", language='" + this.language + '\'' + '}';
+    }
+}
+

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IotThicknessDTO.java

@@ -10,7 +10,7 @@ import org.springblade.desk.quality.pojo.entity.IotThickness;
 import java.io.Serial;
 
 /**
- * [IOT硬度] 数据传输对象实体类
+ * [IOT厚度] 数据传输对象实体类
  *
  * @author Tom Shuo
  * @since 2025-12-23

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java

@@ -0,0 +1,24 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.quality.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.quality.pojo.entity.Ng;
+
+import java.io.Serial;
+
+/**
+ * [缺陷] 数据传输对象实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class NgDTO extends Ng {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java

@@ -0,0 +1,24 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.quality.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.quality.pojo.entity.ReviewDuty;
+
+import java.io.Serial;
+
+/**
+ * [生产处置单-责任零件] 数据传输对象实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ReviewDutyDTO extends ReviewDuty {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java

@@ -0,0 +1,24 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.quality.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.quality.pojo.entity.ReviewFault;
+
+import java.io.Serial;
+
+/**
+ * [生产处置单-问题故障] 数据传输对象实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ReviewFaultDTO extends ReviewFault {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java

@@ -0,0 +1,24 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.quality.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.quality.pojo.entity.ReviewSheet;
+
+import java.io.Serial;
+
+/**
+ * [生产处置单] 数据传输对象实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ReviewSheetDTO extends ReviewSheet {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDTO.java

@@ -0,0 +1,24 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.quality.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.quality.pojo.entity.WorkPlanItem;
+
+import java.io.Serial;
+
+/**
+ * [工序检验项] 数据传输对象实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WorkPlanItemDTO extends WorkPlanItem {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDetailDTO.java

@@ -0,0 +1,24 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.quality.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail;
+
+import java.io.Serial;
+
+/**
+ * [工序检验项明细] 数据传输对象实体类
+ *
+ * @author Tom Shuo
+ * @since 2026-01-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WorkPlanItemDetailDTO extends WorkPlanItemDetail {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}