Merge remote-tracking branch 'origin/master'

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

@@ -31,8 +31,8 @@ public interface LauncherConstant {
     /**
      * nacos dev 地址
      */
+//    String NACOS_DEV_ADDR = "192.168.249.27:8848";
     String NACOS_DEV_ADDR = "127.0.0.1:8848";
-//    String NACOS_DEV_ADDR = "127.0.0.1:8848";
 
     /**
      * nacos prod 地址

blade-ops/blade-job/src/main/java/org/springblade/job/processor/dashboard/TaskingProcessor.java

@@ -0,0 +1,29 @@
+package org.springblade.job.processor.dashboard;
+
+import jakarta.annotation.Resource;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.desk.dashboard.feign.IPartClient;
+import org.springframework.stereotype.Component;
+import tech.powerjob.worker.core.processor.ProcessResult;
+import tech.powerjob.worker.core.processor.TaskContext;
+import tech.powerjob.worker.core.processor.sdk.BasicProcessor;
+
+/**
+ * 工艺模块-正常任务
+ * @author liweidong
+ */
+@Component
+@Data
+@Slf4j
+public class TaskingProcessor implements BasicProcessor {
+
+    @Resource
+    private IPartClient client;
+
+    @Override
+    public ProcessResult process(TaskContext context) throws Exception {
+        client.syncTasking();
+        return new ProcessResult(true);
+    }
+}

blade-ops/blade-job/src/main/java/org/springblade/job/processor/logistics/OrderBoxRefinement.java

@@ -1,7 +1,10 @@
 package org.springblade.job.processor.logistics;
 
+import jakarta.annotation.Resource;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.desk.dashboard.feign.IOrderBoxClient;
+import org.springblade.desk.dashboard.feign.IPartClient;
 import org.springframework.stereotype.Component;
 import tech.powerjob.worker.core.processor.ProcessResult;
 import tech.powerjob.worker.core.processor.TaskContext;
@@ -14,10 +17,13 @@ import tech.powerjob.worker.core.processor.sdk.BasicProcessor;
 @Data
 @Slf4j
 public class OrderBoxRefinement implements BasicProcessor {
+    @Resource
+    private IOrderBoxClient client;
+
     @Override
-    public ProcessResult process(TaskContext taskContext) throws Exception {
-        System.out.println("hello world");
-        log.info("hello world");
-        return new ProcessResult(true);
+    public ProcessResult process(TaskContext context) throws Exception {
+        client.monitoringStation();
+        log.info("执行完成了");
+        return new ProcessResult(true,"执行成功");
     }
 }

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

@@ -28,6 +28,74 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class BasicClazz extends BaseEntity {
 
+    /**
+     * 物料标记
+     */
+    public static Short TYPE_FLAG = 1;
+    /**
+     * 出库原因
+     */
+    public static Short TYPE_OUT_STORE = 2;
+    /**
+     * 退库原因
+     */
+    public static Short TYPE_TK_STORE = 3;
+
+    /**
+     * 简单原因
+     */
+    public static Short TYPE_POOR_REASON = 4;
+
+    /**
+     * 镀种分类
+     */
+    public static Short TYPE_PLATING_ASSORT = 5;
+
+    /**
+     * IOT获取挂次号接口保存
+     */
+    public static Short TYPE_SUSPENSION_NO = 6;
+
+    /**
+     * 外协匹配规则
+     */
+    public static Short TYPE_RULE = 7;
+
+    /**
+     * 排除部门
+     */
+    public static Short TYPE_EXCLUDE_DIVISION = 8;
+
+    /**
+     * 异常配置
+     */
+    public static Short TYPE_ABNORMAL_CONFIG = 9;
+
+    /**
+     * 成本类型
+     */
+    public static Short TYPE_COST_TYPE = 10;
+
+    /**
+     * 烧结转试验计划
+     */
+    public static Short TYPE_TEST_TYPE = 11;
+
+    /**
+     * 绩效模板
+     */
+    public static Short TYPE_JXMB = 12;
+
+    /**
+     * 重点工作类型
+     */
+    public static Short TYPE_ZDGZLX = 13;
+
+    /**
+     * 绩效模板
+     */
+    public static Short TYPE_NOTICE = 14;
+
     @Serial
     private static final long serialVersionUID = 1L;
 

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

@@ -0,0 +1,48 @@
+/**
+ * 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-13
+ */
+@Data
+@TableName("BS_CENTER_TEAM")
+@Schema(description = "RelTeamSetUser Entity对象")
+@EqualsAndHashCode(callSuper = true)
+public class CenterTeam extends BaseEntity {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 作业中心id
+	 */
+    public static final String COL_TEAM_SET_ID = "WC_ID";
+	/**
+	 *班组
+	 */
+    public static final String COL_USER_ID = "TS_ID";
+
+	/**
+	 * [班组]id
+	 */
+	@Schema(description = "[班组]id")
+	private Long tsId;
+	/**
+	 * 作业中心id
+	 */
+	@Schema(description = "作业中心id")
+	private Long wcId;
+}

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

@@ -180,5 +180,7 @@ public class TeamSet extends BaseEntity {
 
     @TableField(exist = false)
     private Long  deptId;
+    @TableField(exist = false)
+    private String  teamId;
 
 }

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

@@ -0,0 +1,26 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.basic.pojo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.basic.pojo.entity.CenterTeam;
+import org.springblade.desk.basic.pojo.entity.TeamSet;
+
+import java.io.Serial;
+
+/**
+ * [班组] 视图实体类
+ *
+ * @author Tom Shuo
+ * @since 2025-12-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CenterTeamVO extends CenterTeam {
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/constant/DsPartConstant.java

@@ -4,7 +4,7 @@ package org.springblade.desk.dashboard.constant;
  * @author lqk
  * @date 2025-12-05 16:51
  */
-public interface DsPartConst {
+public interface DsPartConstant {
 	//region 烧结子件种类
 	/**
 	 * 插针

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/feign/IOrderBoxClient.java

@@ -0,0 +1,32 @@
+package org.springblade.desk.dashboard.feign;
+
+import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.desk.dashboard.pojo.entity.DsPartEntity;
+import org.springblade.desk.dashboard.pojo.entity.DsPartRelationEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * 零件服务Feign客户端
+ * 修正点：所有GET请求参数添加@RequestParam注解，解决Feign多Body参数异常
+ * @author liweidong
+ */
+@FeignClient(
+        value = AppConstant.APPLICATION_DESK_NAME
+)
+public interface IOrderBoxClient {
+
+    String API_PREFIX = "/feign/client/order-box";
+
+    String MONITORING_STATION = API_PREFIX + "/monitoring-station";
+
+
+    /**
+     * 零件同步
+     */
+    @GetMapping(MONITORING_STATION)
+    void monitoringStation();
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/feign/IPartClient.java

@@ -25,7 +25,7 @@ public interface IPartClient {
     String GET_SUB_PART = API_PREFIX + "/getSubPart";
     String BATCH_PARTS = API_PREFIX + "/batchParts";
     String REWORK_TASK = API_PREFIX + "/reworkTask";
-    String SYNC_PART = API_PREFIX + "/syncPart";
+    String SYNC_TASKING = API_PREFIX + "/syncTasking";
 
     /**
      * 获取零件信息
@@ -66,8 +66,8 @@ public interface IPartClient {
     void reworkTask();
 
     /**
-     * 零件同步
+     * 正常任务同步
      */
-    @GetMapping(SYNC_PART)
-    void syncPart();
+    @GetMapping(SYNC_TASKING)
+    void syncTasking();
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsCraftEntity.java

@@ -107,5 +107,11 @@ public class DsCraftEntity extends BaseEntity {
 	@Schema(description = "返工单号")
 	private String reworkOrder;
 
+	/**
+	 * 零件号
+	 */
+	@Schema(description = "零件号")
+	private String partCode;
+
 
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartBasicsEntity.java

@@ -0,0 +1,61 @@
+package org.springblade.desk.dashboard.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
+ * @since
+ */
+@Data
+@TableName("DS_PART_BASICS")
+@Schema(description = "DsPartBasics对象")
+@EqualsAndHashCode(callSuper = true)
+public class DsPartBasicsEntity extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 零件号
+     */
+    @Schema(description = "零件号")
+    private String partCode;
+
+    /**
+     * 零件名称
+     */
+    @Schema(description = "零件名称")
+    private String partName;
+
+    /**
+     * 产品型号
+     */
+    @Schema(description = "产品型号")
+    private String productType;
+
+    /**
+     * 是否烧结产品
+     */
+    @Schema(description = "是否烧结产品")
+    private String isSintering;
+
+    /**
+     * 是否玻璃饼
+     */
+    @Schema(description = "是否玻璃饼")
+    private String isClassCake;
+
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
+    private String remarks;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartEntity.java

@@ -318,4 +318,11 @@ public class DsPartEntity extends BaseEntity {
 	@Schema(description = "是否电镀")
 	private String isElectroplating;
 
+	/**
+	 * 子件类型
+	 * A代表组合件，M代表零件，R代表原材料，B代表外购件，P代表虚拟件，G代表产品
+	 */
+	@Schema(description = "子件类型")
+	private String subType;
+
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartSub.java

@@ -0,0 +1,121 @@
+package org.springblade.desk.dashboard.pojo.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author: 没有这张表 只是查询用于接收
+ * @create: 2026-03-14
+ */
+@Data
+public class DsPartSub {
+
+    /**
+     * 插针
+     */
+    public static Short SIN_TER_TYPE_CZ = 1;
+    /**
+     * 壳体
+     */
+    public static Short SIN_TER_TYPE_KT = 2;
+    /**
+     * 自制玻璃饼
+     */
+    public static Short SIN_TER_TYPE_BLB = 3;
+    /**
+     * 其他
+     */
+    public static Short SIN_TER_TYPE_QT = 4;
+    /**
+     * 石墨模
+     */
+    public static Short SIN_TER_TYPE_SMM = 5;
+    public static Map<String, String> subTypeMap = new HashMap<>(6);
+    public static Map<Short, String> sinTerTypeMap = new HashMap<>(6);
+
+    static {
+        subTypeMap.put("A", "组合件");
+        subTypeMap.put("M", "零件");
+        subTypeMap.put("R", "原材料");
+        subTypeMap.put("B", "外购件");
+        subTypeMap.put("P", "虚拟件");
+        subTypeMap.put("G", "产品");
+
+        sinTerTypeMap.put(SIN_TER_TYPE_CZ, "插针");
+        sinTerTypeMap.put(SIN_TER_TYPE_KT, "壳体");
+        sinTerTypeMap.put(SIN_TER_TYPE_BLB, "自制玻璃饼");
+        sinTerTypeMap.put(SIN_TER_TYPE_QT, "其他");
+        sinTerTypeMap.put(SIN_TER_TYPE_SMM, "石墨模");
+    }
+
+    /**
+     * 流水号
+     */
+    private Long psId;
+    /**
+     * 零件号
+     */
+    private String partCode;
+    /**
+     * 子件号
+     */
+    private String subCode;
+    /**
+     * 子件名称
+     */
+    private String subName;
+    /**
+     * 定额
+     */
+    private Double quota;
+    /**
+     * 子件类型
+     * A代表组合件，M代表零件，R代表原材料，B代表外购件，P代表虚拟件，G代表产品
+     */
+    private String subType;
+    /**
+     * 烧结子件种类
+     * 1插针，2壳体，3自制玻璃饼，4其它，5石墨模
+     */
+    private Integer sinTerType;
+    /**
+     * 材料
+     */
+    private String material;
+    /**
+     * 面积
+     */
+    private Double area;
+    /**
+     * 镀种
+     */
+    private String plate;
+    /**
+     * 产品系列
+     */
+    private String productType;
+    /**
+     * 镀层代号
+     */
+    private String plateCode;
+    /**
+     * 镀层厚度
+     */
+    private String plateThickness;
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    /**
+     * 配置码
+     */
+    private String configNo;
+    /**
+     * 备注
+     */
+    private String memo;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskingEntity.java

@@ -160,11 +160,11 @@ public class DsTaskingEntity extends BaseEntity {
 	@Schema(description = "工艺完成时间")
 	private Date craftTime;
 
-	/**
-	 * 工艺级别
-	 */
-	@Schema(description = "工艺级别")
-	private String rank;
+//	/**
+//	 * 工艺级别
+//	 */
+//	@Schema(description = "工艺级别")
+//	private String rank;
 
 
 	/**

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/enums/PartCraftStatusEnum.java

@@ -0,0 +1,32 @@
+package org.springblade.desk.dashboard.pojo.enums;
+
+/**
+ * @author: liweidong
+ * @create: 2026-03-18
+ */
+public enum PartCraftStatusEnum {
+    SUCCESS("0", "查询成功"),
+    PART_CODE_EMPTY("-6", "partCode不能为空"),
+    ROAM_NO_EMPTY("-7", "roamNo不能为空"),
+    PART_NOT_EXIST("-1", "零件信息为空"),
+    PART_EXPIRED("-2", "零件超期"),
+    NO_CRAFT_INFO("-3", "没有工艺信息,创建维护任务"),
+    NO_PROCEDURE_INFO("-4", "没有工序信息"),
+    NO_CRAFT_RANK_INFO("-5", "没有工艺等级信息");
+
+    private final String code;
+    private final String msg;
+
+    PartCraftStatusEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartBomVO.java

@@ -76,4 +76,10 @@ public class DsPartBomVO   {
 	 */
 	@Schema(description = "子件PDM图纸链接")
 	private String zDocLink;
+
+	/**
+	 * 定额
+	 */
+	@Schema(description = "定额")
+	private Double quota;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartTreeVO.java

@@ -24,6 +24,7 @@
  * Author: Chill Zhuang (bladejava@qq.com)
  */
 package org.springblade.desk.dashboard.pojo.vo;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import java.util.ArrayList;
 import java.util.List;
@@ -39,6 +40,7 @@ public class DsPartTreeVO {
 	private String partCode;
 	private String partName;
 	private String docLink;
+	private Double quota;
 	private List<DsPartTreeVO> children;
 
 	/**
@@ -49,10 +51,11 @@ public class DsPartTreeVO {
 	}
 
 
-	public DsPartTreeVO(String partCode, String partName, String docLink) {
+	public DsPartTreeVO(String partCode, String partName, String docLink,Double quota) {
 		this();
 		this.partCode = partCode;
 		this.partName = partName;
 		this.docLink = docLink;
+		this.quota = quota;
 	}
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsTaskingVO.java

@@ -45,11 +45,17 @@ public class DsTaskingVO extends DsTaskingEntity {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
+//	/**
+//	 * 子件信息
+//	 */
+//	@Schema(description = "子件信息")
+//	private List<DsTaskingIsCompletedVO> children;
+
 	/**
 	 * 子件信息
 	 */
 	@Schema(description = "子件信息")
-	private List<DsTaskingIsCompletedVO> children;
+	private List<DsPartVersionVO> children;
 
 	/**
 	 * 任务状态

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/PartCraftVO.java

@@ -0,0 +1,28 @@
+package org.springblade.desk.dashboard.pojo.vo;
+
+import lombok.Data;
+import org.springblade.desk.dashboard.pojo.entity.DsCraftEntity;
+
+
+@Data
+public class PartCraftVO {
+
+
+    private String code;
+
+    private DsCraftEntity craft;
+
+
+    public static PartCraftVO build(String code, DsCraftEntity craft) {
+        PartCraftVO vo = new PartCraftVO();
+        vo.setCode(code);
+        vo.setCraft(craft);
+        return vo;
+    }
+
+    public static PartCraftVO build(String code) {
+        PartCraftVO vo = new PartCraftVO();
+        vo.setCode(code);
+        return vo;
+    }
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/feign/IotEquipmentTaskClient.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping;
  */
 public interface IotEquipmentTaskClient {
 
-    String API_PREFIX = "/feign/device/iot-task";
+    String API_PREFIX = "/feign/client/iot-task";
 
     String SYNCHRONIZE_EQUIPMENT_TASK = API_PREFIX + "/synchronize-equipment-task";
 

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/feign/LimsMeaToolTaskClient.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping;
  */
 public interface LimsMeaToolTaskClient {
 
-    String API_PREFIX = "/feign/device/lims-task";
+    String API_PREFIX = "/feign/client/lims-task";
 
     String SYNC_MEASUREMENT_RECORDS_TASK = API_PREFIX + "/sync-measurement-records-task";
 

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/feign/JobTransferTaskClient.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping;
  */
 public interface JobTransferTaskClient {
 
-    String API_PREFIX = "/feign/job-transfer/update-task";
+    String API_PREFIX = "/feign/client/job-transfer";
 
     //证书状态更新
     String CERTIFICATE_MAINTENANCE_TASK = API_PREFIX + "/certificate-maintenance-task";

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/OemTaskBillVO.java

@@ -32,6 +32,9 @@ public class OemTaskBillVO extends OemTaskBillEntity {
     private String tbStatusName;
 
     public String getTbStatusName() {
+        if (this.getTbStatus() == null) {
+            return "未处理";  // 或者返回其他默认值，如 "未知"
+        }
         return this.getTbStatus() == 1 ? "已处理" : "未处理";
     }
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IMoldDemandClient.java

@@ -0,0 +1,32 @@
+package org.springblade.desk.order.feign;
+
+import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.desk.order.pojo.entity.MoldDemand;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * 模具计划接口声明
+ *
+ * @author lqk
+ */
+@FeignClient(
+	value = AppConstant.APPLICATION_DESK_NAME
+)
+public interface IMoldDemandClient {
+
+	String API_PREFIX = "/feign/moldDemand/";
+
+	String SAVE = API_PREFIX + "/save";
+
+
+	/**
+	 * 生成模具计划
+	 *
+	 * @param moldDemand
+	 * @return
+	 */
+	@GetMapping(SAVE)
+	Boolean save(MoldDemand moldDemand);
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IOrderClient.java

@@ -0,0 +1,32 @@
+package org.springblade.desk.order.feign;
+
+import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.desk.order.pojo.entity.YieldPlan;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * 模具计划接口声明
+ *
+ * @author lqk
+ */
+@FeignClient(
+	value = AppConstant.APPLICATION_DESK_NAME
+)
+public interface IOrderClient {
+
+	String API_PREFIX = "/feign/order/";
+
+	String SAVE_GLASS_CAKE = API_PREFIX + "/saveGlassCake";
+
+
+	/**
+	 * 生成玻璃饼烧结计划并下达
+	 *
+	 * @param yieldPlan
+	 * @return
+	 */
+	@GetMapping(SAVE_GLASS_CAKE)
+	Boolean saveGlassCake(YieldPlan yieldPlan);
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsApply.java

@@ -2,6 +2,8 @@ package org.springblade.desk.order.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springblade.core.mp.base.BaseEntity;
@@ -21,6 +23,11 @@ public class PlateGoodsApply extends BaseEntity {
 	@TableField(exist = false)
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 申报单号
+	 */
+	@TableField(value = "APPLY_CODE")
+	private String applyCode;
 
 	/**
 	 * 作业中心
@@ -74,6 +81,7 @@ public class PlateGoodsApply extends BaseEntity {
 	/**
 	 * 本次申报添加量 = 班组预添加量
 	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	@Schema(description = "本次申报添加量")
 	@TableField(value = "GOODS_ADD_TOTAL")
 	private BigDecimal goodsAddTotal;
@@ -81,6 +89,7 @@ public class PlateGoodsApply extends BaseEntity {
 	/**
 	 * 本次申报物料需求单总物料需求剩余量 = 可使用定额
 	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	@Schema(description = "本次申报总物料需求剩余量")
 	@TableField(value = "GOODS_DEMAND_TOTAL")
 	private BigDecimal goodsDemandTotal;
@@ -88,6 +97,7 @@ public class PlateGoodsApply extends BaseEntity {
 	/**
 	 * 本次申报物料需求单已申报定额总量(已添加总量） = 累计结余
 	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	@Schema(description = "已申报定额总量")
 	@TableField(value = "DECLARED_QUOTA_TOTAL")
 	private BigDecimal declaredQuotaTotal;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsRecord.java

@@ -129,10 +129,4 @@ public class PlateGoodsRecord extends BaseEntity {
 	 */
 	@TableField(value = "SURPLUS")
 	private BigDecimal surplus;
-
-	/**
-	 * 本次关联订单数量
-	 */
-	@TableField(value = "DETAIL_ORDER_NUM")
-	private Integer detailOrderNum;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrderCraft.java

@@ -32,15 +32,33 @@ public class YieldOrderCraft extends BaseEntity {
 	private String craftNo;
 
 	/**
-	 * 工序排序序号
+	 * 工序Id（DS_PROCESS）
+	 */
+	@TableField(value = "PID")
+	private Long pid;
+
+	/**
+	 * 工序排序序号 - 工序冗余字段
 	 */
 	@TableField(value = "PROCESS_NO")
 	private String processNo;
 
+	/**
+	 * 工序编码 - 工序冗余字段
+	 */
+	@TableField(value = "PROCESS_CODE")
+	private String processCode;
+
+	/**
+	 * 工序名称 - 工序冗余字段
+	 */
+	@TableField(value = "PROCESS_NAME")
+	private String processName;
+
 	/**
 	 * 工序设置ID， bs_procedure_set
 	 */
-	@TableField(value = "PPS_ID")
+	@TableField(value = "BS_PROCESS_SET")
 	private Long ppsId;
 
 	/**
@@ -55,11 +73,6 @@ public class YieldOrderCraft extends BaseEntity {
 	@TableField(value = "HOUR_QUOTA")
 	private Double hourQuota;
 
-	/**
-	 * 工序Id
-	 */
-	@TableField(value = "PID")
-	private Long pid;
 
 	/**
 	 * 计划开始
@@ -92,7 +105,7 @@ public class YieldOrderCraft extends BaseEntity {
 	private Long ocId;
 
 	/**
-	 * 工艺能力 craft_ability
+	 * 工艺能力 BS_CRAFT_ABILITY
 	 */
 	@TableField(value = "CA_ID")
 	private Long caId;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldPlan.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import org.springblade.core.mp.base.BaseEntity;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -110,13 +109,13 @@ public class YieldPlan extends BaseEntity {
 	 * 已交件数量
 	 */
 	@TableField(value = "DELIVERY_QTY")
-	private Long deliveryQty;
+	private Double deliveryQty;
 
 	/**
 	 * 已分批数量
 	 */
 	@TableField(value = "ALREADY_BRANCH_QTY")
-	private Long alreadyBranchQty;
+	private Double alreadyBranchQty;
 
 	/**
 	 * 一级工艺线路

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/YieldOrderEnum.java

@@ -29,6 +29,7 @@ public enum YieldOrderEnum {
 	STATUS_PROCESSING("加工中", 10005),
 	STATUS_PROCESS_ERROR("排产异常", 10006),
 	STATUS_RECOVER("数据恢复", 10007),
+	STATUS_OUTSOURCING_WAITING("外协后待排产", 10008),
 	STATUS_COMPLETED("已完工", 10015),
 	STATUS_CLOSED("已关闭", 10021),
 

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/DeviceBindDTO.java

@@ -0,0 +1,50 @@
+package org.springblade.desk.produce.pojo.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 设备绑定 数据传输对象实体类
+ * @author litao
+ */
+@Data
+public class DeviceBindDTO {
+
+	@Schema(description = "工序ID集合")
+	private String planListIds;
+
+	@Schema(description = "挂具ID")
+	private Long rsId;
+
+	@Schema(description = "挂具ID集合")
+	private String rsList;
+
+	@Schema(description = "飞靶ID")
+	private Long fsId;
+
+	@Schema(description = "飞靶ID集合")
+	private String fsList;
+
+	@Schema(description = "设备ID")
+	private Long ecId;
+
+	@Schema(description = "挂次号")
+	private String hangNum;
+
+	@Schema(description = "挂次号id")
+	private Long hangNumId;
+
+	@Schema(description = "是否解绑")
+	private String unFsBool;
+
+	@Schema(description = "掺镀件面积")
+	private String dopedParts;
+
+	@Schema(description = "网面积")
+	private String net;
+
+	@Schema(description = "挂具面积")
+	private String rack;
+
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/MesRbFilePreserveDetailDTO.java

@@ -43,4 +43,6 @@ public class MesRbFilePreserveDetailDTO extends MesRbFilePreserveDetailEntity {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
+	private Short rfpsType;
+
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrMacTooUseSpec.java

@@ -16,7 +16,7 @@ public class PrMacTooUseSpec implements java.io.Serializable  {
     /**
      * id
      */
-    private String mtuId;
+    private Long mtuId;
     /**
      * 零件号
      */

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintChildCheck.java

@@ -0,0 +1,157 @@
+package org.springblade.desk.produce.pojo.dto;
+
+import java.util.List;
+
+public class PrintChildCheck implements java.io.Serializable {
+
+    /**
+     * @return 序号
+     * @Author dxl
+     * @CreateTime 2022/11/7 10:24
+     */
+    private String testOrders;
+    /**
+    * @return 检验细项
+    * @Author dxl
+    * @CreateTime 2022/11/8 16:22
+    */
+    private List<PrintChildCheckChild> cccList;
+
+    /**
+     * @return 抽样数
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:25
+     */
+    private String checkQty;
+    /**
+     * @return 合格，不合格，NA
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:25
+     */
+    private String checkResult;
+    /**
+     * @return 姓名
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:25
+     */
+    private String checkName;
+    /**
+     * @return 检验日期
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:25
+     */
+    private String checkDate;
+
+    /**
+     * 试验数量
+     */
+    private String testQty;
+    /**
+     * @return 检测项目名称
+     */
+    private String testName;
+    /**
+     * @return 检测项目实验标准
+     */
+    private String trialStandard;
+
+    /**
+     * @return 设备编码
+     */
+    private String deviceCode;
+
+    /**
+     * @return 检验印章URL
+     */
+    private String imgUrl;
+    public String getTestOrders() {
+        return testOrders;
+    }
+
+    public void setTestOrders(String testOrders) {
+        this.testOrders = testOrders;
+    }
+
+    public String getCheckQty() {
+        return checkQty;
+    }
+
+    public void setCheckQty(String checkQty) {
+        this.checkQty = checkQty;
+    }
+
+    public String getCheckName() {
+        return checkName;
+    }
+
+    public void setCheckName(String checkName) {
+        this.checkName = checkName;
+    }
+
+    public String getCheckDate() {
+        return checkDate;
+    }
+
+    public void setCheckDate(String checkDate) {
+        this.checkDate = checkDate;
+    }
+
+    public String getCheckResult() {
+        return checkResult;
+    }
+
+    public void setCheckResult(String checkResult) {
+        this.checkResult = checkResult;
+    }
+
+    public List<PrintChildCheckChild> getCccList() {
+        return cccList;
+    }
+
+    public void setCccList(List<PrintChildCheckChild> cccList) {
+        this.cccList = cccList;
+    }
+
+    public String getTestQty() {
+        return testQty;
+    }
+
+    public void setTestQty(String testQty) {
+        this.testQty = testQty;
+    }
+
+    public String getTestName() {
+        return testName;
+    }
+
+    public void setTestName(String testName) {
+        this.testName = testName;
+    }
+
+    public String getTrialStandard() {
+        return trialStandard;
+    }
+
+    public void setTrialStandard(String trialStandard) {
+        this.trialStandard = trialStandard;
+    }
+
+    public String getDeviceCode() {
+        return deviceCode;
+    }
+
+    public void setDeviceCode(String deviceCode) {
+        this.deviceCode = deviceCode;
+    }
+
+    public PrintChildCheck() {
+    }
+
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintChildCheckChild.java

@@ -0,0 +1,91 @@
+package org.springblade.desk.produce.pojo.dto;
+
+/**
+ * @version V1.0
+ * @Title: PrintChildCheckChild
+ * @Author: dxl
+ * @CreateTime: 2022/11/8 16:18
+ */
+public class PrintChildCheckChild implements java.io.Serializable {
+
+    /**
+     * @return 名称
+     * @Author dxl
+     * @CreateTime 2022/11/7 10:24
+     */
+    private String testName;
+    /**
+     * @return 实验标准
+     * @Author dxl
+     * @CreateTime 2022/11/7 10:34
+     */
+    private String trialStandard;
+    /**
+     * @return 检验值
+     * @Author dxl
+     * @CreateTime 2022/11/7 10:34
+     */
+    private String checkValue;
+    /**
+     * @return 设备量具
+     * @Author dxl
+     * @CreateTime 2022/11/7 10:24
+     */
+    private String emTools;
+    /**
+     * @return 检验项Id
+     * @Author dxl
+     * @CreateTime 2022/11/8 17:09
+     */
+    private Long wpiId;
+
+    public String getTestName() {
+        return testName;
+    }
+
+    public void setTestName(String testName) {
+        this.testName = testName;
+    }
+
+    public String getEmTools() {
+        return emTools;
+    }
+
+    public void setEmTools(String emTools) {
+        this.emTools = emTools;
+    }
+
+    public String getTrialStandard() {
+        return trialStandard;
+    }
+
+    public void setTrialStandard(String trialStandard) {
+        this.trialStandard = trialStandard;
+    }
+
+    public String getCheckValue() {
+        return checkValue;
+    }
+
+    public void setCheckValue(String checkValue) {
+        this.checkValue = checkValue;
+    }
+
+    public Long getWpiId() {
+        return wpiId;
+    }
+
+    public void setWpiId(Long wpiId) {
+        this.wpiId = wpiId;
+    }
+
+    public PrintChildCheckChild(String testName, String trialStandard, String checkValue, Long wpiId) {
+        this.testName = testName;
+        this.trialStandard = trialStandard;
+        this.checkValue = checkValue;
+        this.wpiId = wpiId;
+    }
+
+    public PrintChildCheckChild() {
+    }
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintThicknessChildCraft.java

@@ -0,0 +1,132 @@
+package org.springblade.desk.produce.pojo.dto;
+
+public class PrintThicknessChildCraft implements java.io.Serializable {
+    /**
+     * @return 程式编号
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:29
+     */
+    private String code;
+    /**
+     * @return 名称一
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:29
+     */
+    private String gauge_value1;
+    /**
+     * @return 参数一
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:29
+     */
+
+    private String gauge_value2;
+    /**
+     * @return 名称二
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:29
+     */
+    private String gauge_value3;
+    /**
+     * @return 参数二
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:29
+     */
+    private String gauge_value4;
+    /**
+     * @return 名称三
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:29
+     */
+    private String gauge_value5;
+    /**
+     * @return 参数三
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:29
+     */
+
+    private String gauge_value6;
+    /**
+     * @return 名称设备编码
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:29
+     */
+    private String deviceName;
+    /**
+     * @return 参数检测时间
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:29
+     */
+    private String update_time;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getGauge_value1() {
+        return gauge_value1;
+    }
+
+    public void setGauge_value1(String gauge_value1) {
+        this.gauge_value1 = gauge_value1;
+    }
+
+    public String getGauge_value2() {
+        return gauge_value2;
+    }
+
+    public void setGauge_value2(String gauge_value2) {
+        this.gauge_value2 = gauge_value2;
+    }
+
+    public String getGauge_value3() {
+        return gauge_value3;
+    }
+
+    public void setGauge_value3(String gauge_value3) {
+        this.gauge_value3 = gauge_value3;
+    }
+
+    public String getGauge_value4() {
+        return gauge_value4;
+    }
+
+    public void setGauge_value4(String gauge_value4) {
+        this.gauge_value4 = gauge_value4;
+    }
+
+    public String getGauge_value5() {
+        return gauge_value5;
+    }
+
+    public void setGauge_value5(String gauge_value5) {
+        this.gauge_value5 = gauge_value5;
+    }
+
+    public String getGauge_value6() {
+        return gauge_value6;
+    }
+
+    public void setGauge_value6(String gauge_value6) {
+        this.gauge_value6 = gauge_value6;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public String getUpdate_time() {
+        return update_time;
+    }
+
+    public void setUpdate_time(String update_time) {
+        this.update_time = update_time;
+    }
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintThicknessCraftCard.java

@@ -0,0 +1,121 @@
+package org.springblade.desk.produce.pojo.dto;
+
+import java.util.List;
+
+
+public class PrintThicknessCraftCard implements java.io.Serializable {
+    /**
+     * @Description: 测厚明细
+     * @Author cdl
+     * @CreateTime 2024/3/7 11:08
+     */
+    List<PrintThicknessChildCraft> thicknessList;
+    /**
+     * 主槽流程卡号
+     */
+    private String mainCardNo;
+    /**
+     * 主槽零件号
+     */
+    private String mainPartCode;
+    /**
+     * 主槽批次号
+     */
+    private String mainBatchNo;
+    /**
+     * 主槽车间订单号
+     */
+    private String mainWoCode;
+    /**
+     * 流程卡号
+     */
+    private String cardNo;
+    /**
+     * 零件号
+     */
+    private String partCode;
+    /**
+     * 批次号
+     */
+    private String batchNo;
+    /**
+     * 车间订单号
+     */
+    private String woCode;
+
+    public PrintThicknessCraftCard(List<PrintThicknessChildCraft> thicknessList) {
+        this.thicknessList = thicknessList;
+    }
+
+    public List<PrintThicknessChildCraft> getThicknessList() {
+        return thicknessList;
+    }
+
+    public void setThicknessList(List<PrintThicknessChildCraft> thicknessList) {
+        this.thicknessList = thicknessList;
+    }
+
+    public String getCardNo() {
+        return cardNo;
+    }
+
+    public void setCardNo(String cardNo) {
+        this.cardNo = cardNo;
+    }
+
+    public String getPartCode() {
+        return partCode;
+    }
+
+    public void setPartCode(String partCode) {
+        this.partCode = partCode;
+    }
+
+    public String getBatchNo() {
+        return batchNo;
+    }
+
+    public void setBatchNo(String batchNo) {
+        this.batchNo = batchNo;
+    }
+
+    public String getWoCode() {
+        return woCode;
+    }
+
+    public void setWoCode(String woCode) {
+        this.woCode = woCode;
+    }
+
+    public String getMainCardNo() {
+        return mainCardNo;
+    }
+
+    public void setMainCardNo(String mainCardNo) {
+        this.mainCardNo = mainCardNo;
+    }
+
+    public String getMainPartCode() {
+        return mainPartCode;
+    }
+
+    public void setMainPartCode(String mainPartCode) {
+        this.mainPartCode = mainPartCode;
+    }
+
+    public String getMainBatchNo() {
+        return mainBatchNo;
+    }
+
+    public void setMainBatchNo(String mainBatchNo) {
+        this.mainBatchNo = mainBatchNo;
+    }
+
+    public String getMainWoCode() {
+        return mainWoCode;
+    }
+
+    public void setMainWoCode(String mainWoCode) {
+        this.mainWoCode = mainWoCode;
+    }
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/TaskDataDto.java

@@ -0,0 +1,15 @@
+package org.springblade.desk.produce.pojo.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO;
+
+import java.util.List;
+
+@Data
+public class TaskDataDto {
+    private String cdjArea;
+    private String pdjArea;
+    private String gjArea;
+    private List<ProduceMonitorSlotListVO> slotList;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/BsAdditionalMess.java

@@ -0,0 +1,79 @@
+package org.springblade.desk.produce.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.util.Date;
+
+/**
+ * 额外信息存储 实体类
+ * @author litao
+ */
+@Data
+@TableName("MES_BS_ADDITIONAL_MESS")
+@Schema(description = "BsAdditionalMess对象")
+@EqualsAndHashCode(callSuper = true)
+public class BsAdditionalMess extends BaseEntity {
+	/**
+	 * 同槽增加额外面积
+	 */
+	public static Short TYPE_ONE = 1;
+
+	/**
+	 * 试验项目名称
+	 */
+	public static Short TYPE_TEST_PROJECT_TYPE = 2;
+
+	/**
+	 * 试验项目标准
+	 */
+	public static Short TYPE_TEST_PROJECT_STANDARD_TYPE = 3;
+
+	/**
+	 * 玻璃饼最低库存
+	 */
+	public static Short TYPE_BLB_MIN_STOCK = 4;
+
+	/**
+	 * 模块说明
+	 */
+	public static Short TYPE_MODULE_DETAIL = 5;
+
+	/**
+	 * 年度数据存储
+	 */
+	public static Short TYPE_YEAR_DATA = 6;
+
+	/**
+	 * 班组准时率
+	 */
+	public static Short TYPE_TEAM_PUNCTUALITY = 7;
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@Schema(description = "数据1")
+	private String oneData;
+
+	@Schema(description = "数据2")
+	private String twoData;
+
+	@Schema(description = "数据3")
+	private String threeData;
+
+	@Schema(description = "数据4")
+	private String fourData;
+
+	@Schema(description = "业务类别")
+	private Short type;
+
+	@Schema(description = "小数类型-数据1")
+	private Double douOneData = 0d;
+
+	@Schema(description = "备注")
+	private String memo;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/DsRbFilePreserve.java

@@ -0,0 +1,56 @@
+package org.springblade.desk.produce.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.LocalDate;
+import java.util.Date;
+
+/**
+ *
+ * @author litao
+ */
+@Data
+@TableName("DS_RB_FILE_PRESERVE")
+@Schema(description = "DsRbFilePreserve对象")
+@EqualsAndHashCode(callSuper = true)
+public class DsRbFilePreserve extends BaseEntity {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@Schema(description = "作业中心")
+	private Long wcId;
+
+	@Schema(description = "工序")
+	private Long ppsId;
+
+	@Schema(description = "线上线下")
+	private String line;
+
+	@Schema(description = "维护时间")
+	private LocalDate keepTime;
+
+	@Schema(description = "维护人")
+	private Long keepMan;
+
+	@Schema(description = "名称")
+	private String name;
+
+
+	@Schema(description = "审批状态")
+	private Short approvalStatus = -1;
+
+	@Schema(description = "状态")
+	private Short rfpStatus = 1;
+
+	@Schema(description = "升版ID")
+	private String versionId;
+
+
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/HandoverRecord.java

@@ -0,0 +1,114 @@
+package org.springblade.desk.produce.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;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 移交记录 实体类
+ * @author BladeX
+ */
+@Data
+@TableName("MES_HANDOVER_RECORD")
+@Schema(description = "HandoverRecord对象")
+@EqualsAndHashCode(callSuper = true)
+public class HandoverRecord extends BaseEntity {
+
+	/**
+	 * 入库单
+	 */
+	public static Short HR_TYPE_IN_WAREHOUSE = 0;
+	/**
+	 * 转工单
+	 */
+	public static Short HR_TYPE_TRANSFER = 1;
+	/**
+	 * 待移交
+	 */
+	public static Integer RUN_STATUS_WAIT = 1;
+	/**
+	 * 完成
+	 */
+	public static Integer RUN_STATUS_COMPLETE = 2;
+	public static Map<Short, String> hrTypeMap = new HashMap<Short, String>(2);
+	public static Map<Integer, String> runStatusMap = new HashMap<Integer, String>(2);
+
+	static {
+		hrTypeMap.put(HR_TYPE_IN_WAREHOUSE, "入库单");
+		hrTypeMap.put(HR_TYPE_TRANSFER, "转工单");
+	}
+
+	static {
+		runStatusMap.put(RUN_STATUS_WAIT, "待移交");
+		runStatusMap.put(RUN_STATUS_COMPLETE, "完成");
+	}
+
+	@Schema(description = "单号")
+	private String hrCode;
+
+	@Schema(description = "移交类型")
+	private Short hrType;
+
+	@Schema(description = "车间Id")
+	private Long woId;
+
+	@Schema(description = "车间订单号")
+	private String woCode;
+
+	@Schema(description = "零件号")
+	private String partCode;
+
+	@Schema(description = "路线卡号")
+	private String cardNo;
+
+	@Schema(description = "生产标识")
+	private String prodIdent;
+
+	@Schema(description = "批次号")
+	private String batchNo;
+
+	@Schema(description = "移交部门")
+	private String handoverUnit;
+
+	@Schema(description = "移交数量")
+	private Double handoverQty;
+
+	@Schema(description = "一级工序（B号）")
+	private String roamNo;
+
+	@Schema(description = "接收部门")
+	private String recDept;
+
+	@Schema(description = "备注")
+	private String memo;
+
+	@Schema(description = "打印时间")
+	private Date printTime;
+
+	@Schema(description = "打印标记")
+	private Integer printFlag;
+
+	@Schema(description = "外协交件单号")
+	private String deliverKey;
+
+	@TableField(exist = false)
+	@Schema(description = "移交类型")
+	private String hrTypeName;
+
+	@TableField(exist = false)
+	@Schema(description = "状态")
+	private String statusName;
+
+	@TableField(exist = false)
+	@Schema(description = "移交人员")
+	private String createName;
+
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/MesRbFilePreserveDetailEntity.java

@@ -29,7 +29,7 @@ public class MesRbFilePreserveDetailEntity extends BaseEntity {
 	 * 热表电子档案维护-槽子明细
 	 */
 	@Schema(description = "热表电子档案维护-槽子明细")
-	private BigDecimal rfpsId;
+	private Long rfpsId;
 	/**
 	 * 明细名称
 	 */

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/MesRbFilePreserveSlotEntity.java

@@ -1,14 +1,17 @@
 package org.springblade.desk.produce.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;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
+import org.springblade.desk.produce.pojo.dto.MesRbFilePreserveDetailDTO;
 
 import java.io.Serial;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 热表电子档案维护-槽子明细 实体类
@@ -29,7 +32,7 @@ public class MesRbFilePreserveSlotEntity extends BaseEntity {
 	 * 热表电子档案维护
 	 */
 	@Schema(description = "热表电子档案维护")
-	private BigDecimal rfpId;
+	private Long rfpId;
 	/**
 	 * 槽号名称
 	 */
@@ -60,5 +63,8 @@ public class MesRbFilePreserveSlotEntity extends BaseEntity {
 	 */
 	@Schema(description = "维护人")
 	private String keepMan;
-
+	@TableField(exist = false)
+	private List<MesRbFilePreserveDetailDTO> childrenList;
+//	@TableField(exist = false)
+//	List<MesRbFilePreserveDetailEntity> childrenListNew;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java

@@ -6,6 +6,10 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
+import org.springblade.desk.produce.pojo.dto.PrintChildCheck;
+import org.springblade.desk.produce.pojo.dto.TaskDataDto;
+import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO;
+import org.springblade.desk.quality.pojo.entity.AuditFile;
 import org.springblade.desk.quality.pojo.entity.InspectionTask;
 import org.springblade.desk.quality.pojo.entity.WorkPlanItem;
 
@@ -289,5 +293,52 @@ public class WorkPlan extends BaseEntity {
 	@Schema(description = "返工工艺Id")
 	@TableField(exist = false)
 	public Long rpId;
+//	@TableField(exist = false)
+//	private List<ProduceMonitorSlotListVO> slotList;
+	@TableField(exist = false)
+	private List<MesQcProduceRunEntity> prList;
+	@TableField(exist = false)
+	private String gjCode;
+	@TableField(exist = false)
+	private String fbCode;
+	@TableField(exist = false)
+	private String deviceCode;
+	@TableField(exist = false)
+	private String createMan;
+	@TableField(exist = false)
+	private Double flagQty;
+	@TableField(exist = false)
+    private String flagColourOne;
+	@TableField(exist = false)
+    private String flagColourTwo;
+	@TableField(exist = false)
+    private String flagInk;
+	@TableField(exist = false)
+    private String flagMatter;
+	// 色带数据
+	@TableField(exist = false)
+    private Double beltQty;
+	@TableField(exist = false)
+    private String beltColourOne;
+	@TableField(exist = false)
+    private String beltColourTwo;
+	@TableField(exist = false)
+    private String beltInk;
+	@TableField(exist = false)
+    private String beltMatter;
+	@TableField(exist = false)
+	private List<MesQcProduceRunEntity> qcProduceRunsList;
+	@TableField(exist = false)
+	private Integer totalPreserve = 0;
+	@TableField(exist = false)
+	private MesBsAdditionalMessEntity bsAdditionalMess;
+	@TableField(exist = false)
+	private List<MesRbFilePreserveSlotEntity> dsRbFilePreserveSlotList;
+	@TableField(exist = false)
+	private List<PrintChildCheck> printChildCheck;
+	@TableField(exist = false)
+	private AuditFile auditFile;
+	@TableField(exist = false)
+	private TaskDataDto taskData;
 
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/BindModelVO.java

@@ -0,0 +1,95 @@
+package org.springblade.desk.produce.pojo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 当前工序和挂具、飞拔、设备绑定数据模型 视图实体类
+ *
+ * @author BladeX
+ * @since 2026-02-04
+ */
+@Data
+public class BindModelVO {
+
+	/**
+	 * id
+	 */
+	@Schema(description = "id")
+	private Long id;
+	/**
+	 * 车间订单号
+	 */
+	@Schema(description = "车间订单号")
+	private String woCode;
+	/**
+	 * 镀种
+	 */
+	@Schema(description = "镀种")
+	private String plate;
+	/**
+	 * 计划员
+	 */
+	@Schema(description = "计划员")
+	private String planUser;
+	/**
+	 * 加工状态
+	 */
+	@Schema(description = "加工状态")
+	private String runStatus;
+	/**
+	 * 批次号
+	 */
+	@Schema(description = "批次号")
+	private String batchNo;
+	/**
+	 * 加工数量
+	 */
+	@Schema(description = "加工数量")
+	private Double makeQty;
+	/**
+	 * 零件号
+	 */
+	@Schema(description = "零件号")
+	private String partCode;
+	/**
+	 * 产品名称
+	 */
+	@Schema(description = "产品名称")
+	private String partName;
+	/**
+	 * 班组
+	 */
+	@Schema(description = "班组")
+	private String makeTeam;
+	/**
+	 * 当前工序号
+	 */
+	@Schema(description = "当前工序号")
+	private String orders;
+	/**
+	 * 当前工序名称
+	 */
+	@Schema(description = "当前工序名称")
+	private String ppsName;
+	/**
+	 * 下序工序号
+	 */
+	@Schema(description = "下序工序号")
+	private String nextOrders;
+	/**
+	 * 下序名称
+	 */
+	@Schema(description = "下序名称")
+	private String nextPpsName;
+	/**
+	 * 生产标识
+	 */
+	@Schema(description = "生产标识")
+	private String prodIdent;
+	/**
+	 * 面积
+	 */
+	@Schema(description = "面积")
+	private Double area;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/DsRbFilePreserveVO.java

@@ -0,0 +1,18 @@
+package org.springblade.desk.produce.pojo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springblade.desk.produce.pojo.entity.DsRbFilePreserve;
+
+import java.util.Date;
+
+/**
+ * 加工记录 视图实体类
+ *
+ * @author BladeX
+ * @since 2026-02-04
+ */
+@Data
+public class DsRbFilePreserveVO extends DsRbFilePreserve {
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/MacToolUseVO.java

@@ -0,0 +1,44 @@
+package org.springblade.desk.produce.pojo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 设备，工装使用记录 视图实体类
+ *
+ * @author BladeX
+ * @since 2026-02-04
+ */
+@Data
+public class MacToolUseVO {
+
+	@Schema(description = "使用记录ID")
+	private Long mtuId;
+	/**
+	 * 零件号
+	 */
+	@Schema(description = "零件号")
+	private String partCode;
+	/**
+	 * 批次号
+	 */
+	@Schema(description = "批次号")
+	private String batchNo;
+	/**
+	 * 数量
+	 */
+	@Schema(description = "数量")
+	private String quantity;
+	/**
+	 * 时间
+	 */
+	@Schema(description = "时间")
+	private String createTime;
+	/**
+	 * 设备
+	 */
+	@Schema(description = "设备编号")
+	private String deviceCode;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/PrintWarehousingVO.java

@@ -0,0 +1,152 @@
+package org.springblade.desk.produce.pojo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 入库单打印模型 视图实体类
+ *
+ * @author litao
+ * @since 2026-2-27
+ */
+@Data
+public class PrintWarehousingVO {
+
+	/**
+	 * 入库单号
+	 */
+	@Schema(description = "入库单号")
+	private String hrCode;
+	/**
+	 * 工作单号 生产订单计划单号
+	 */
+	@Schema(description = "工作单号 生产订单计划单号")
+	private String poCode;
+	/**
+	 * 车间单号
+	 */
+	@Schema(description = "车间单号")
+	private String woCode;
+	/**
+	 * 计划部门 生产订单使用部门
+	 */
+	@Schema(description = "计划部门 生产订单使用部门")
+	private String useDept;
+	/**
+	 * 镀钟 生产订单
+	 */
+	@Schema(description = "镀钟 生产订单")
+	private String plate;
+	/**
+	 * 生产标识 生产订单
+	 */
+	@Schema(description = "生产标识")
+	private String prodIdent;
+	/**
+	 * 型别 生产订单产品型号
+	 */
+	@Schema(description = "产品型号")
+	private String productTypePart;
+	/**
+	 * 零件号 生产订单
+	 */
+	@Schema(description = "零件号")
+	private String partCode;
+	/**
+	 * 名称 生产订单
+	 */
+	@Schema(description = "名称")
+	private String partName;
+	/**
+	 * 产品系列 pj_bom
+	 */
+	@Schema(description = "产品系列")
+	private String productType;
+	/**
+	 * 原编码 pj_bom
+	 */
+	@Schema(description = "原编码")
+	private String oldCode;
+	/**
+	 * 计划数量 生产订单加工数量
+	 */
+	@Schema(description = "计划数量")
+	private String makeQty;
+	/**
+	 * 重量 镀前镀后
+	 */
+	@Schema(description = "重量")
+	private Double weight;
+	/**
+	 * 批次号 车间订单
+	 */
+	@Schema(description = "批次号")
+	private String batchNo;
+	/**
+	 * 提交数量 移交记录移交数量
+	 */
+	@Schema(description = "提交数量")
+	private String handoverQty;
+	/**
+	 * 车间提交人 移交记录移交人
+	 */
+	@Schema(description = "车间提交人")
+	private String createMan;
+	/**
+	 * 计划员 生产订单
+	 */
+	@Schema(description = "计划员")
+	private String planUser;
+	/**
+	 * 使用部门
+	 */
+	@Schema(description = "使用部门")
+	private String recDept;
+	/**
+	 * 制表日期
+	 */
+	@Schema(description = "制表日期")
+	private String tableDate;
+	/**
+	 * 备注
+	 */
+	@Schema(description = "备注")
+	private String memo;
+	/**
+	 * 保管员
+	 */
+	@Schema(description = "保管员")
+	private String custodian;
+	/**
+	 * 委托车间
+	 */
+	@Schema(description = "委托车间")
+	private String entrustDept;
+	/**
+	 * 废品数
+	 */
+	@Schema(description = "废品数")
+	private String scrapQty = "0";
+	/**
+	 * 试验数
+	 */
+	@Schema(description = "试验数")
+	private String testQty = "0";
+	/**
+	 * 消耗数
+	 */
+	@Schema(description = "消耗数")
+	private String useQty = "0";
+	/**
+	 * 类型
+	 */
+	@Schema(description = "类型")
+	private Short hrType;
+	/**
+	 * 工艺路线
+	 */
+	@Schema(description = "工艺路线")
+	private String primaryCraft;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorSlotListVO.java

@@ -28,6 +28,7 @@ public class ProduceMonitorSlotListVO {
 	@Schema(description = "数量")
 	private String qua;
 	private String poQty;
+	private String workQty;
 
 	@Schema(description = "生产标识")
 	private String prodIdent;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/SjEcBingCardVo.java

@@ -1,25 +1,59 @@
 package org.springblade.desk.produce.pojo.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;
 
+/**
+ * @author litao
+ */
 @Data
 public class SjEcBingCardVo {
+
+    @Schema(description = "设备ID")
     private Long ecId;
+
+    @Schema(description = "")
     private String operate;
+
+    @Schema(description = "此次绑定数量")
     private String bindNum;
+
+    @Schema(description = "此次绑定设定的温度")
     private String heat;
+
+    @Schema(description = "工序名称")
     private String ppsName;
+
+    @Schema(description = "工序ID集合")
     private List<Long> planList;
+
+    @Schema(description = "")
     private String rsName;
+
+    @Schema(description = "")
     private String oneData;
+
+    @Schema(description = "")
     private String twoData;
+
+    @Schema(description = "")
     private String threeData;
+
+    @Schema(description = "")
     private String fourData;
+
+    @Schema(description = "")
     private String fiveData;
+
+    @Schema(description = "")
     private String sixData;
+
+    @Schema(description = "")
     private String sevenData;
+
+    @Schema(description = "")
     private String eightData;
 
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/UnBingDeviceVo.java

@@ -11,13 +11,13 @@ public class UnBingDeviceVo {
 
     private List<PrMacTooUseSpec> list;
 
-    private String oneData;
+    private Date oneData;
     private String twoData;
-    private String threeData;
-    private String fourData;
-    private String fiveData;
-    private String sixData;
-    private String sevenData;
+    private Date threeData;
+    private Date fourData;
+    private Date fiveData;
+    private Date sixData;
+    private Date sevenData;
     private String dataFourteen;
     private String tempSlot;
 

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/UnBingVo.java

@@ -1,5 +1,6 @@
 package org.springblade.desk.produce.pojo.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;
@@ -7,8 +8,11 @@ import java.util.List;
 @Data
 public class UnBingVo {
 
+    @Schema(description = "挂具编号")
     private String rsCode;
+    @Schema(description = "飞靶编号")
     private String fsCode;
+    @Schema(description = "设备编号")
     private String deviceCode;
 
 }

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

@@ -0,0 +1,162 @@
+package org.springblade.desk.quality.pojo.dto;
+
+import lombok.Data;
+
+/**
+ * @ClassName PpmReportDetailModel
+ * @Description: 出厂不合格率明细模型
+ * @Author cdl
+ * @Date 2023/12/08 13:37
+ * @Version 1.0
+ * 注意：本内容仅限于内部传阅，禁止外泄及用于其他的商业目的
+ */
+@Data
+public class PpmReportDetailDTO {
+    /**
+     * 班组
+     */
+    private String tsName;
+    /**
+     * 审理单号
+     */
+    private String sheetNo;
+    /**
+     * 审理单类型
+     */
+    private String billmodel;
+    /**
+     * 审理单状态
+     */
+    private String status;
+    /**
+     * 发生单位
+     */
+    private String deptcode;
+    /**
+     * 物料号
+     */
+    private String prtno;
+    /**
+     * 物料名称
+     */
+    private String name;
+    /**
+     * 型号
+     */
+    private String type;
+    /**
+     * 质量等级
+     */
+    private String qstandno;
+    /**
+     * 批次号
+     */
+    private String lotno;
+    /**
+     * 总数量
+     */
+    private String cntt;
+    /**
+     * 不合格数
+     */
+    private String cntn;
+    /**
+     * 检验员
+     */
+    private String checker;
+    /**
+     * 检验日期
+     */
+    private String checkdate;
+    /**
+     * 归档日期
+     */
+    private String finishdate;
+    /**
+     * 责任部门
+     */
+    private String layer1;
+    /**
+     * 审理单开始时间
+     */
+    private String judgestart;
+    /**
+     *
+     */
+    private String opinion;
+    /**
+     * 审理级别
+     */
+    private String userlevel;
+    /**
+     * 审理意见
+     */
+    private String dispose;
+    /**
+     * 审理人
+     */
+    private String usercode;
+    /**
+     * 返修数
+     */
+    private String p6layer3;
+    /**
+     * 返工数
+     */
+    private String p6layer4;
+    /**
+     * 报废数
+     */
+    private String p6layer5;
+    /**
+     * 订单号
+     */
+    private String sono;
+    /**
+     * 完工数
+     */
+    private String avlqty;
+    /**
+     * 完工日期
+     */
+    private String date1;
+    /**
+     * 责任零件
+     */
+    private String p5layer1;
+    /**
+     * 责任批次
+     */
+    private String p5layer3;
+    /**
+     * 发生工序
+     */
+    private String process;
+    /**
+     * 发生工序名称
+     */
+    private String processName;
+    /**
+     * 上级编号
+     */
+    private String precode;
+    /**
+     * 返修路线
+     */
+    private String reworkLine;
+    /**
+     * 故障描述
+     */
+    private String memo;
+
+    private String code;
+    private String useproc;
+    private String useseq;
+    private String redodeptcode;
+    private String p1remark;
+    private String disposename;
+    private String p2layer1;
+    private String chker;
+
+
+}

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

@@ -20,5 +20,48 @@ import java.io.Serial;
 public class ReviewDutyDTO extends ReviewDuty {
 	@Serial
 	private static final long serialVersionUID = 1L;
+	/**
+	 * 审理单Id
+	 */
+	private String trialId;
 
+	/**
+	 * 序号
+	 */
+	private String trialSeq;
+
+	/**
+	 * 物料号
+	 */
+	private String mdsItemCode;
+
+	/**
+	 * 批次号
+	 */
+	private String batchNo;
+
+	/**
+	 * 相关物料号
+	 */
+	private String corrMdsItemCode;
+
+	/**
+	 * 相关批次号
+	 */
+	private String corrBatchNo;
+
+	/**
+	 * 备注
+	 */
+	private String note;
+
+	/**
+	 * 数量
+	 */
+	private Short reqQty;
+
+	/**
+	 * 单位
+	 */
+	private String unit;
 }

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

@@ -20,5 +20,44 @@ import java.io.Serial;
 public class ReviewFaultDTO extends ReviewFault {
 	@Serial
 	private static final long serialVersionUID = 1L;
+	/**
+	 * 审理单Id
+	 */
+	private String trialId;
+
+	/**
+	 * 序号
+	 */
+	private String trialSeq;
+
+	/**
+	 * 故障类别
+	 */
+	private String faultType;
+
+	/**
+	 * 问题大类
+	 */
+	private String questClass;
+
+	/**
+	 * 问题小类
+	 */
+	private String questSubclass;
+
+	/**
+	 * 比例
+	 */
+	private Double proportion;
+
+	/**
+	 * 数量
+	 */
+	private Long faultQty;
+
+	/**
+	 * 描述
+	 */
+	private String describe;
 
 }

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

@@ -21,4 +21,97 @@ public class ReviewSheetDTO extends ReviewSheet {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 批次号
+	 */
+	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 Double proporTion;
+
+	/**
+	 * 不合格数量
+	 */
+	private Double 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;
+
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHand.java

@@ -71,5 +71,11 @@ public class RaiseHand extends BaseEntity {
 	@Schema(description = "免责金额")
 	private BigDecimal amount;
 
+	/**
+	 * raisHand文件
+	 */
+	@Schema(description = "文件路径")
+	private String fileUrl;
+
 
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java

@@ -423,4 +423,6 @@ public class ReviewSheet extends BaseEntity {
 
     //当前工序id
     private Long ppsId;
+
+    private Integer submitType;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java

@@ -3,10 +3,12 @@
  */
 package org.springblade.desk.quality.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;
 import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.StringUtils;
 import org.springblade.core.mp.base.BaseEntity;
 
 import java.io.Serial;
@@ -149,4 +151,32 @@ public class WorkPlanItemDetail extends BaseEntity {
      */
     @Schema(description = "实际[量具]id")
     private Long actMtId;
+
+
+	@TableField(exist = false)
+	private String trialItem;
+	@TableField(exist = false)
+	private String trialStandard;
+	@TableField(exist = false)
+	private Long wpiId;
+
+
+	public String getGaugeValueNotNUll() {
+		StringBuffer sb = new StringBuffer();
+
+		if(StringUtils.isNotBlank(this.gaugeValue2) && this.gaugeValue6 != "/"){
+			sb.append(this.gaugeValue1+"/"+this.gaugeValue2+"/");
+
+		}
+
+		if(StringUtils.isNotBlank(this.gaugeValue4) && this.gaugeValue4 != "/"){
+			sb.append(this.gaugeValue3+"/"+this.gaugeValue4+"/");
+
+		}
+		if(StringUtils.isNotBlank(this.gaugeValue6) && this.gaugeValue6 != "/"){
+			sb.append(this.gaugeValue5+"/"+this.gaugeValue6+"/");
+
+		}
+		return  sb.toString();
+	}
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java

@@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
 import org.springblade.desk.quality.pojo.entity.InspectionTask;
 
 import java.io.Serial;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -111,4 +112,17 @@ public class InspectionTaskListVO extends InspectionTask {
     private String partVersion;
 //工单id
     private Long yoId;
+    //完成时间
+    private LocalDate finishDate;
+
+    private String currentProcessCode;
+
+    private Long ppsId;
+
+    private String ppsCode;
+
+    private String ppsName;
+
+    private Integer yieldType;
+
 }

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java

@@ -9,6 +9,7 @@ import org.springblade.erpdata.pojo.vo.QueryBatchVO;
 import org.springblade.erpdata.pojo.vo.ReworkProcessVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.Map;
 
@@ -28,6 +29,7 @@ public interface IErpDataProduceClient {
 	String REWORK_ORDER = API_PREFIX + "/loadReworkOrder";
 	String PRODUCT_APP_AREA = API_PREFIX + "/productAppArea";
 	String VERSION = API_PREFIX + "/version";
+	String CUSTODIAN = API_PREFIX + "/getCustodian";
 
 	/**
 	 * 缺件申报-通过零件号获取批次号
@@ -52,4 +54,10 @@ public interface IErpDataProduceClient {
 	 */
 	@GetMapping(VERSION)
 	R<String> getVersionByPartCode(String partCode);
+
+	/**
+	 * 获取保管员
+	 */
+	@GetMapping(CUSTODIAN)
+	R<String> getCustodianByRecDept(@RequestParam("partCode") String partCode, @RequestParam("recDept") String recDept);
 }

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClientFallback.java

@@ -37,4 +37,9 @@ public class IErpDataProduceClientFallback implements IErpDataProduceClient {
 	public R<String> getVersionByPartCode(String partCode) {
 		return R.fail("获取数据失败");
 	}
+
+	@Override
+	public R<String> getCustodianByRecDept(String partCode, String recDept) {
+		return R.fail("获取数据失败");
+	}
 }

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpYieldOrderClient.java

@@ -0,0 +1,52 @@
+package org.springblade.erpdata.feign;
+
+
+import org.springblade.common.constant.LauncherConstant;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Date;
+
+/**
+ * 外协相关erp操作Feign接口类
+ *
+ * @author qyl
+ * @since 2026-02-27
+ */
+@FeignClient(
+	value = LauncherConstant.APPLICATION_ERP_DATA_NAME,
+	fallback = IErpDataOemClientFallback.class
+)
+public interface IErpYieldOrderClient {
+
+	String API_PREFIX = "/feign/erp/yieldOrder";
+	String SAVE_GLASS_CAKE = API_PREFIX + "/saveGlassCake";
+
+	/**
+	 * 生成玻璃饼订单
+	 *
+	 * @param yoCode
+	 * @param cardNo
+	 * @param batchNo
+	 * @param prodIdent
+	 * @param demandDate
+	 * @param planUser
+	 * @param ypCode
+	 * @param poQty
+	 * @param partCode
+	 * @param quota
+	 */
+	@GetMapping(SAVE_GLASS_CAKE)
+	void saveGlassCake(@RequestParam("yoCode") String yoCode,
+					   @RequestParam("cardNo") String cardNo,
+					   @RequestParam("batchNo") String batchNo,
+					   @RequestParam("prodIdent") String prodIdent,
+					   @RequestParam("demandDate") Date demandDate,
+					   @RequestParam("planUser") String planUser,
+					   @RequestParam("ypCode") String ypCode,
+					   @RequestParam("poQty") Long poQty,
+					   @RequestParam("partCode") String partCode,
+					   @RequestParam("quota") Double quota);
+
+}

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpYieldOrderClientFallback.java

@@ -0,0 +1,18 @@
+package org.springblade.erpdata.feign;
+
+
+import java.util.Date;
+
+/**
+ * Feign接口类
+ *
+ * @author liuqingkun
+ */
+public class IErpYieldOrderClientFallback implements IErpYieldOrderClient {
+
+
+	@Override
+	public void saveGlassCake(String yoCode, String cardNo, String batchNo, String prodIdent, Date demandDate, String planUser, String ypCode, Long poQty, String partCode, Double quota) {
+
+	}
+}

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClient.java

@@ -50,8 +50,6 @@ public interface IWorkOrderClient {
     @GetMapping(INIT_RESOURCE)
     R<Void> initResource();
 
-    @GetMapping(GLASS_CAKE_ORDER)
-    R<IPage<WorkOrderVO>> selectGlassCakeOrderPage(GlassCakeOrderPageQuery glassCakeOrderPageQuery);
     @PostMapping(GLASS_CAKE_QUALITY)
     R<QualityGradeEntity> getById(@RequestBody Long id);
 

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClientFallback.java

@@ -25,12 +25,8 @@
  */
 package org.springblade.scheduling.feign;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.scheduling.pojo.entity.QualityGradeEntity;
-import org.springblade.scheduling.pojo.vo.GlassCakeOrderPageQuery;
-import org.springblade.scheduling.pojo.vo.WorkOrderVO;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -53,10 +49,6 @@ public class IWorkOrderClientFallback implements IWorkOrderClient {
 		return R.fail("初始化资源失败");
 	}
 
-	@Override
-	public R<IPage<WorkOrderVO>> selectGlassCakeOrderPage(GlassCakeOrderPageQuery glassCakeOrderPageQuery) {
-		return R.fail("获取玻璃饼订单失败");
-	}
 
 	@Override
 	public R<QualityGradeEntity> getById(Long id) {

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipAbilityEntity.java

@@ -28,7 +28,6 @@ package org.springblade.scheduling.pojo.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.NullSerializer;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -99,8 +98,7 @@ public class EquipAbilityEntity extends BaseEntity {
 	 * 额定加工能力
 	 */
 	@Schema(description = "额定加工能力")
-	@JsonSerialize(nullsUsing = NullSerializer.class)
-	private BigDecimal standardProcessAbility;
+	private String standardProcessAbility;
 
 	/**
 	 * 额定工时（分钟）
@@ -141,4 +139,22 @@ public class EquipAbilityEntity extends BaseEntity {
 	@Schema(description = "备注")
 	private String remarks;
 
+	/**
+	 * 工序编码
+	 */
+	@Schema(description = "工序编码")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	private Long processId;
+
+	/**
+	 * 工序名称
+	 */
+	@Schema(description = "工序名称")
+	private String processName;
+
+	/**
+	 * 零件类型
+	 */
+	private Integer partType;
+
 }

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipResourceEntity.java

@@ -27,6 +27,8 @@ package org.springblade.scheduling.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -159,7 +161,28 @@ public class EquipResourceEntity extends BaseEntity {
 
 	private Integer isDeleted;
 
+	/**
+	 * 工序编码
+	 */
+	@Schema(description = "工序编码")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	private Long processId;
+
+	/**
+	 * 工序名称
+	 */
+	@Schema(description = "工序名称")
+	private String processName;
 
+	/**
+	 * 开始值
+	 */
+	private Integer startNum;
+
+	/**
+	 * 结束值
+	 */
+	private Integer endNum;
 
 
 }

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PartEntity.java

@@ -25,15 +25,15 @@
  */
 package org.springblade.scheduling.pojo.entity;
 
-import lombok.Data;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-import java.math.BigDecimal;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.core.tenant.mp.TenantEntity;
+
 import java.io.Serial;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 零件信息表 实体类
@@ -291,4 +291,14 @@ public class PartEntity extends BaseEntity {
 	@Schema(description = "审核人")
 	private String reviewUser;
 
+
+	@Schema(name = "玻璃饼直径")
+	private Double blbDiameter;
+
+	@Schema(name = "壳体最大外径")
+	private Double externalDiameter;
+
+	@Schema(name = "定额")
+	private Double quota;
+
 }

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PartRelationEntity.java

@@ -25,14 +25,12 @@
  */
 package org.springblade.scheduling.pojo.entity;
 
-import lombok.Data;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.math.BigDecimal;
-import java.util.Date;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.core.tenant.mp.TenantEntity;
+
 import java.io.Serial;
 
 /**
@@ -54,7 +52,7 @@ public class PartRelationEntity extends BaseEntity {
 	 * 部件ID
 	 */
 	@Schema(description = "部件ID")
-	private BigDecimal partId;
+	private Long partId;
 	/**
 	 * 部件号
 	 */
@@ -64,7 +62,7 @@ public class PartRelationEntity extends BaseEntity {
 	 * 子件ID
 	 */
 	@Schema(description = "子件ID")
-	private BigDecimal childPartId;
+	private Long childPartId;
 	/**
 	 * 子件号
 	 */

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PersonAbilityEntity.java

@@ -94,7 +94,7 @@ public class PersonAbilityEntity extends BaseEntity {
 	 * 额定工时（分钟/每人每个）
 	 */
 	@Schema(description = "额定工时（分钟/每人每个）")
-	private BigDecimal standardTime;
+	private String standardTime;
 
 	/**
 	 * 准备工时（分钟）
@@ -123,4 +123,7 @@ public class PersonAbilityEntity extends BaseEntity {
 	 */
 	private String productIdent;
 
+	private Integer partType;
+
+
 }

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/ProcessSetEntity.java

@@ -87,7 +87,7 @@ public class ProcessSetEntity extends BaseEntity {
 	@Schema(description = "标准周期")
 	private BigDecimal cycle;
 	/**
-	 * 是否主工序
+	 * 是否主工序 0否 1是
 	 */
 	@Schema(description = "是否主工序")
 	private String isMain;

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/WorkPlanEntity.java

@@ -34,7 +34,6 @@ import org.springblade.core.mp.base.BaseEntity;
 import java.io.Serial;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * 车间作业计划 实体类
@@ -97,7 +96,7 @@ public class WorkPlanEntity extends BaseEntity {
 	 * 工时定额
 	 */
 	@Schema(description = "工时定额")
-	private BigDecimal hourQuota;
+	private Double hourQuota;
 	/**
 	 * 计划开始
 	 */

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderEntity.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.tenant.mp.TenantEntity;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -61,6 +60,12 @@ public class YieldOrderEntity extends TenantEntity {
 	@TableField(value = "PART_NAME")
 	private String partName;
 
+	/**
+	 * 零件号版本号
+	 */
+	@TableField(value = "PART_VERSION")
+	private String partVersion;
+
 	/**
 	 * 镀种
 	 */

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/enums/WorkOrderEnum.java

@@ -27,10 +27,17 @@ public enum WorkOrderEnum {
 	STATUS_COMPLETED("已完工", 4),
 	STATUS_ADJUDICATING("审理中", 5),
 	STATUS_SCRAP("已报废", 6),
-	STATUS_REWORK("已返工", 7)
+	STATUS_REWORK("已返工", 7),
+
+	/**
+	 * 烧结订单人工工时统计类型
+	 */
+	STATUS_PART_TYPE_1("壳体最大外径", 1),
+	STATUS_PART_TYPE_2("玻璃饼直径", 2),
+	STATUS_PART_TYPE_3("芯数", 3),
 	;
 	final String name;
-	final int category;
+	final int code;
 
 	/**
 	 * 匹配枚举值
@@ -54,7 +61,7 @@ public enum WorkOrderEnum {
 	 */
 	public static String getName(int category) {
 		WorkOrderEnum item = Arrays.stream(WorkOrderEnum.values())
-			.filter(enumItem -> enumItem.getCategory() == category)
+			.filter(enumItem -> enumItem.getCode() == category)
 			.findFirst()
 			.orElse(null);
 		return ObjectUtil.isEmpty(item) ? StringPool.EMPTY : item.getName();

blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StGlassCakeOutClient.java

@@ -6,6 +6,7 @@ import org.springblade.wms.pojo.entity.StGlassCakeOut;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -29,9 +30,9 @@ public interface StGlassCakeOutClient {
 	String GLASS_OUT_ORDER = API_PREFIX + "/generateOrder";
 	String GLASS_BATCH_OUT_ORDER = API_PREFIX + "/batchGenerateOrder";
 
-	@PostMapping("GLASS_OUT_ORDER")
+	@PostMapping(GLASS_OUT_ORDER)
 	R<List<StGlassCakeOut>> callGeneratePreOutOrder(@SpringQueryMap StGlassCakeOutDTO dto);
 
-	@PostMapping("GLASS_BATCH_OUT_ORDER")
-	R<Map<String, Object>> batchGeneratePreOutOrder(@SpringQueryMap List<StGlassCakeOutDTO> dtoList);
+	@PostMapping(GLASS_BATCH_OUT_ORDER)
+	R<Map<String, Object>> batchGeneratePreOutOrder(@RequestBody List<StGlassCakeOutDTO> dtoList);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BasicClazzController.java

@@ -21,6 +21,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.CommonConstant;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -184,6 +185,7 @@ public class BasicClazzController extends BladeController {
      */
     @PostMapping("/save")
     @ApiOperationSupport(order = 30)
+    @ApiLog("新增基础分类")
     @Operation(summary = "新增一条", description = "传入BasicClazz Obj")
     public R save(@Valid @RequestBody BasicClazz addOne) {
         addOne.setId(null);
@@ -195,6 +197,7 @@ public class BasicClazzController extends BladeController {
      */
     @PostMapping("/saveBat")
     @ApiOperationSupport(order = 31)
+    @ApiLog("新增基础分类")
     @Operation(summary = "新增批量", description = "传入BasicClazz List")
     public R saveBat(@Valid @RequestBody List<BasicClazz> addList) {
         addList.forEach(one -> {
@@ -208,6 +211,7 @@ public class BasicClazzController extends BladeController {
      */
     @PostMapping("/update")
     @ApiOperationSupport(order = 40)
+    @ApiLog("修改基础分类")
     @Operation(summary = "修改一条", description = "传入BasicClazz Obj")
     public R update(@Valid @RequestBody BasicClazz updateOne) {
         return R.status(service.updateById(updateOne));
@@ -218,6 +222,7 @@ public class BasicClazzController extends BladeController {
      */
     @PostMapping("/updateBat")
     @ApiOperationSupport(order = 41)
+    @ApiLog("修改基础分类")
     @Operation(summary = "修改批量", description = "传入BasicClazz List")
     public R updateBat(@Valid @RequestBody List<BasicClazz> updateList) {
         return R.status(service.updateBatchById(updateList));
@@ -248,6 +253,7 @@ public class BasicClazzController extends BladeController {
      */
     @PostMapping("/remove")
     @ApiOperationSupport(order = 61)
+    @ApiLog("删除基础分类")
     @Operation(summary = "逻辑删除", description = "传入ids")
     public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
         return R.status(service.deleteLogic(Func.toLongList(ids)));

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BatConfigController.java

@@ -18,6 +18,7 @@ import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -121,6 +122,7 @@ public class BatConfigController extends BladeController {
      */
     @PostMapping("/save")
     @ApiOperationSupport(order = 30)
+    @ApiLog("新增批量配置")
     @Operation(summary = "新增一条", description = "传入BatConfig Obj")
     public R save(@Valid @RequestBody BatConfig addOne) {
         addOne.setId(null);
@@ -145,6 +147,7 @@ public class BatConfigController extends BladeController {
      */
     @PostMapping("/update")
     @ApiOperationSupport(order = 40)
+    @ApiLog("批量配置修改")
     @Operation(summary = "修改一条", description = "传入BatConfig Obj")
     public R update(@Valid @RequestBody BatConfig updateOne) {
         return R.status(service.updateById(updateOne));
@@ -155,6 +158,7 @@ public class BatConfigController extends BladeController {
      */
     @PostMapping("/updateBat")
     @ApiOperationSupport(order = 41)
+    @ApiLog("批量配置修改批量")
     @Operation(summary = "修改批量", description = "传入BatConfig List")
     public R updateBat(@Valid @RequestBody List<BatConfig> updateList) {
         return R.status(service.updateBatchById(updateList));
@@ -185,6 +189,7 @@ public class BatConfigController extends BladeController {
      */
     @PostMapping("/remove")
     @ApiOperationSupport(order = 61)
+    @ApiLog("批量配置逻辑删除")
     @Operation(summary = "逻辑删除", description = "传入ids")
     public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
         return R.status(service.deleteLogic(Func.toLongList(ids)));

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BsAssignController.java

@@ -39,6 +39,7 @@ import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -141,6 +142,7 @@ public class BsAssignController extends BladeController {
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
+	@ApiLog("分派规则维护新增")
 	@Operation(summary = "新增", description  = "传入bsAssign")
 	public R save(@Valid @RequestBody BsAssignEntity bsAssign) {
 		return R.status(bsAssignService.save(bsAssign));
@@ -164,6 +166,7 @@ public class BsAssignController extends BladeController {
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
+	@ApiLog("分派规则维护修改")
 	@Operation(summary = "修改", description  = "传入bsAssign")
 	public R update(@Valid @RequestBody BsAssignEntity bsAssign) {
 
@@ -282,6 +285,7 @@ public class BsAssignController extends BladeController {
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
+	@ApiLog("分派规则维护删除")
 	@Operation(summary = "逻辑删除", description  = "传入ids")
 	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(bsAssignService.deleteLogic(Func.toLongList(ids)));

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CoatingThicknessController.java

@@ -18,6 +18,7 @@ import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -124,6 +125,7 @@ public class CoatingThicknessController extends BladeController {
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 30)
+	@ApiLog("镀层厚度新增")
 	@Operation(summary = "新增一条", description  = "传入CoatingThickness Obj")
 	public R save(@Valid @RequestBody CoatingThickness addOne) {
 	    addOne.setId(null);
@@ -148,6 +150,7 @@ public class CoatingThicknessController extends BladeController {
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 40)
+	@ApiLog("镀层厚度修改")
 	@Operation(summary = "修改一条", description  = "传入CoatingThickness Obj")
 	public R update(@Valid @RequestBody CoatingThickness updateOne) {
 		return R.status(service.updateById(updateOne));
@@ -206,6 +209,7 @@ public class CoatingThicknessController extends BladeController {
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 61)
+	@ApiLog("镀层厚度逻辑删除")
 	@Operation(summary = "逻辑删除", description  = "传入ids")
 	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(service.deleteLogic(Func.toLongList(ids)));

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java

@@ -36,6 +36,7 @@ import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -168,6 +169,7 @@ public class CraftAbilityController extends BladeController {
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
+	@ApiLog("工艺能力新增")
 	@Operation(summary = "新增", description  = "传入CraftAbility")
 	public R save(@Valid @RequestBody CraftAbilityEntity craftAbility) {
 		return R.status(craftAbilityService.save(craftAbility));
@@ -178,6 +180,7 @@ public class CraftAbilityController extends BladeController {
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
+	@ApiLog("工艺能力修改")
 	@Operation(summary = "修改", description  = "传入CraftAbility")
 	public R update(@Valid @RequestBody CraftAbilityEntity craftAbility) {
 		return R.status(craftAbilityService.updateById(craftAbility));
@@ -198,6 +201,7 @@ public class CraftAbilityController extends BladeController {
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
+	@ApiLog("工艺能力删除")
 	@Operation(summary = "逻辑删除", description  = "传入ids")
 	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(craftAbilityService.deleteLogic(Func.toLongList(ids)));

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java

@@ -19,6 +19,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -118,6 +119,7 @@ public class FormulaController extends BladeController {
      */
     @PostMapping("/save")
     @ApiOperationSupport(order = 30)
+    @ApiLog("计算公式新增")
     @Operation(summary = "新增一条", description = "传入Formula Obj")
     public R save(@Valid @RequestBody Formula addOne) {
         addOne.setId(null);
@@ -142,6 +144,7 @@ public class FormulaController extends BladeController {
      */
     @PostMapping("/update")
     @ApiOperationSupport(order = 40)
+    @ApiLog("计算公式修改")
     @Operation(summary = "修改一条", description = "传入Formula Obj")
     public R update(@Valid @RequestBody Formula updateOne) {
         return R.status(service.updateById(updateOne));
@@ -182,6 +185,7 @@ public class FormulaController extends BladeController {
      */
     @PostMapping("/remove")
     @ApiOperationSupport(order = 61)
+    @ApiLog("计算公式删除")
     @Operation(summary = "逻辑删除", description = "传入ids")
     public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
         return R.status(service.deleteLogic(Func.toLongList(ids)));

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/LocallyPlatedPartController.java

@@ -18,6 +18,7 @@ import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -124,6 +125,7 @@ public class LocallyPlatedPartController extends BladeController {
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 30)
+	@ApiLog(value = "局部镀零件新增")
 	@Operation(summary = "新增一条", description  = "传入LocallyPlatedPart Obj")
 	public R save(@Valid @RequestBody LocallyPlatedPart addOne) {
 	    addOne.setId(null);
@@ -148,6 +150,7 @@ public class LocallyPlatedPartController extends BladeController {
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 40)
+	@ApiLog(value = "局部镀零件修改")
 	@Operation(summary = "修改一条", description  = "传入LocallyPlatedPart Obj")
 	public R update(@Valid @RequestBody LocallyPlatedPart updateOne) {
 		return R.status(service.updateById(updateOne));
@@ -188,6 +191,7 @@ public class LocallyPlatedPartController extends BladeController {
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 61)
+	@ApiLog(value = "局部镀零件逻辑删除")
 	@Operation(summary = "逻辑删除", description  = "传入ids")
 	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(service.deleteLogic(Func.toLongList(ids)));

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java

@@ -20,6 +20,7 @@ import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -134,6 +135,7 @@ public class MaterialQuotaController extends BladeController {
      */
     @PostMapping("/save")
     @ApiOperationSupport(order = 30)
+    @ApiLog(value = "物料定额新增")
     @Operation(summary = "新增一条", description = "传入MaterialQuota Obj")
     public R save(@Valid @RequestBody MaterialQuota addOne) {
         addOne.setId(null);
@@ -158,6 +160,7 @@ public class MaterialQuotaController extends BladeController {
      */
     @PostMapping("/update")
     @ApiOperationSupport(order = 40)
+    @ApiLog(value = "物料定额修改")
     @Operation(summary = "修改一条", description = "传入MaterialQuota Obj")
     public R update(@Valid @RequestBody MaterialQuota updateOne) {
         return R.status(service.updateById(updateOne));
@@ -198,6 +201,7 @@ public class MaterialQuotaController extends BladeController {
      */
     @PostMapping("/remove")
     @ApiOperationSupport(order = 61)
+    @ApiLog(value = "物料定额逻辑删除")
     @Operation(summary = "逻辑删除", description = "传入ids")
     public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
         return R.status(service.deleteLogic(Func.toLongList(ids)));

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java

@@ -18,6 +18,7 @@ import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -254,6 +255,7 @@ public class OemController extends BladeController {
      */
     @PostMapping("/save")
     @ApiOperationSupport(order = 30)
+    @ApiLog("新增外协厂家")
     @Operation(summary = "新增一条", description = "传入Oem Obj")
     public R save(@Valid @RequestBody Oem addOne) {
         addOne.setId(null);
@@ -278,6 +280,7 @@ public class OemController extends BladeController {
      */
     @PostMapping("/update")
     @ApiOperationSupport(order = 40)
+    @ApiLog("修改外协厂家")
     @Operation(summary = "修改一条", description = "传入Oem Obj")
     public R update(@Valid @RequestBody Oem updateOne) {
         return R.status(service.updateById(updateOne));
@@ -318,6 +321,7 @@ public class OemController extends BladeController {
      */
     @PostMapping("/remove")
     @ApiOperationSupport(order = 61)
+    @ApiLog("逻辑删除外协厂家")
     @Operation(summary = "逻辑删除", description = "传入ids")
     public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
         return R.status(service.deleteLogic(Func.toLongList(ids)));

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlanAssignSteerController.java

@@ -18,6 +18,7 @@ import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -139,6 +140,7 @@ public class PlanAssignSteerController extends BladeController {
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 30)
+	@ApiLog(value = "外协分派新增")
 	@Operation(summary = "新增一条", description  = "传入PlanAssignSteer Obj")
 	public R save(@Valid @RequestBody PlanAssignSteer addOne) {
 	    addOne.setId(null);
@@ -163,6 +165,7 @@ public class PlanAssignSteerController extends BladeController {
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 40)
+	@ApiLog(value = "外协分派修改")
 	@Operation(summary = "修改一条", description  = "传入PlanAssignSteer Obj")
 	public R update(@Valid @RequestBody PlanAssignSteer updateOne) {
 		return R.status(service.updateById(updateOne));
@@ -203,6 +206,7 @@ public class PlanAssignSteerController extends BladeController {
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 61)
+	@ApiLog(value = "外协分派逻辑删除")
 	@Operation(summary = "逻辑删除", description  = "传入ids")
 	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(service.deleteLogic(Func.toLongList(ids)));

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java

@@ -21,6 +21,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.CommonConstant;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -156,6 +157,7 @@ public class PlatingController extends BladeController {
      */
     @PostMapping("/save")
     @ApiOperationSupport(order = 30)
+    @ApiLog("[镀种] 新增")
     @Operation(summary = "新增一条", description = "传入Plating Obj")
     public R save(@Valid @RequestBody Plating addOne) {
 
@@ -187,6 +189,7 @@ public class PlatingController extends BladeController {
      */
     @PostMapping("/update")
     @ApiOperationSupport(order = 40)
+    @ApiLog("[镀种] 修改")
     @Operation(summary = "修改一条", description = "传入Plating Obj")
     public R update(@Valid @RequestBody Plating updateOne) {
 
@@ -237,6 +240,7 @@ public class PlatingController extends BladeController {
      */
     @PostMapping("/remove")
     @ApiOperationSupport(order = 61)
+    @ApiLog("[镀种] 逻辑删除")
     @Operation(summary = "逻辑删除", description = "传入ids")
     public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
         return R.status(service.deleteLogic(Func.toLongList(ids)));

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingSmallController.java

@@ -18,6 +18,7 @@ import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -136,6 +137,7 @@ public class PlatingSmallController extends BladeController {
      */
     @PostMapping("/save")
     @ApiOperationSupport(order = 30)
+    @ApiLog("镀种小类新增")
     @Operation(summary = "新增一条", description = "传入PlatingSmall Obj")
     public R save(@Valid @RequestBody PlatingSmall addOne) {
         addOne.setId(null);
@@ -160,6 +162,7 @@ public class PlatingSmallController extends BladeController {
      */
     @PostMapping("/update")
     @ApiOperationSupport(order = 40)
+    @ApiLog("镀种小类修改")
     @Operation(summary = "修改一条", description = "传入PlatingSmall Obj")
     public R update(@Valid @RequestBody PlatingSmall updateOne) {
         return R.status(service.updateById(updateOne));
@@ -200,6 +203,7 @@ public class PlatingSmallController extends BladeController {
      */
     @PostMapping("/remove")
     @ApiOperationSupport(order = 61)
+    @ApiLog("镀种小类逻辑删除")
     @Operation(summary = "逻辑删除", description = "传入ids")
     public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
         return R.status(service.deleteLogic(Func.toLongList(ids)));

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProcessAbilityController.java

@@ -18,6 +18,7 @@ import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -120,6 +121,7 @@ public class ProcessAbilityController extends BladeController {
      */
     @PostMapping("/save")
     @ApiOperationSupport(order = 30)
+    @ApiLog("工艺能力新增")
     @Operation(summary = "新增一条", description = "传入ProcessAbility Obj")
     public R save(@Valid @RequestBody ProcessAbility addOne) {
         addOne.setId(null);
@@ -144,6 +146,7 @@ public class ProcessAbilityController extends BladeController {
      */
     @PostMapping("/update")
     @ApiOperationSupport(order = 40)
+    @ApiLog("工艺能力修改")
     @Operation(summary = "修改一条", description = "传入ProcessAbility Obj")
     public R update(@Valid @RequestBody ProcessAbility updateOne) {
         return R.status(service.updateById(updateOne));
@@ -184,6 +187,7 @@ public class ProcessAbilityController extends BladeController {
      */
     @PostMapping("/remove")
     @ApiOperationSupport(order = 61)
+    @ApiLog("工艺能力逻辑删除")
     @Operation(summary = "逻辑删除", description = "传入ids")
     public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
         return R.status(service.deleteLogic(Func.toLongList(ids)));

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java

@@ -18,6 +18,7 @@ import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -145,6 +146,7 @@ public class ProdMarkController extends BladeController {
      */
     @PostMapping("/save")
     @ApiOperationSupport(order = 30)
+    @ApiLog(value = "生产标识新增")
     @Operation(summary = "新增一条", description = "传入ProdMark Obj")
     public R save(@Valid @RequestBody ProdMark addOne) {
         addOne.setId(null);
@@ -169,6 +171,7 @@ public class ProdMarkController extends BladeController {
      */
     @PostMapping("/update")
     @ApiOperationSupport(order = 40)
+    @ApiLog(value = "生产标识修改")
     @Operation(summary = "修改一条", description = "传入ProdMark Obj")
     public R update(@Valid @RequestBody ProdMark updateOne) {
         return R.status(service.updateById(updateOne));
@@ -209,6 +212,7 @@ public class ProdMarkController extends BladeController {
      */
     @PostMapping("/remove")
     @ApiOperationSupport(order = 61)
+    @ApiLog(value = "生产标识逻辑删除")
     @Operation(summary = "逻辑删除", description = "传入ids")
     public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
         return R.status(service.deleteLogic(Func.toLongList(ids)));

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/RelTeamSetUserController.java

@@ -18,6 +18,7 @@ import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -121,6 +122,7 @@ public class RelTeamSetUserController extends BladeController {
      */
     @PostMapping("/save")
     @ApiOperationSupport(order = 30)
+    @ApiLog("班组用户关联新增")
     @Operation(summary = "新增一条", description = "传入RelTeamSetUser Obj")
     public R save(@Valid @RequestBody RelTeamSetUser addOne) {
         addOne.setId(null);
@@ -145,6 +147,7 @@ public class RelTeamSetUserController extends BladeController {
      */
     @PostMapping("/update")
     @ApiOperationSupport(order = 40)
+    @ApiLog("班组用户关联修改")
     @Operation(summary = "修改一条", description = "传入RelTeamSetUser Obj")
     public R update(@Valid @RequestBody RelTeamSetUser updateOne) {
         return R.status(service.updateById(updateOne));
@@ -185,6 +188,7 @@ public class RelTeamSetUserController extends BladeController {
      */
     @PostMapping("/remove")
     @ApiOperationSupport(order = 61)
+    @ApiLog("班组用户关联逻辑删除")
     @Operation(summary = "逻辑删除", description = "传入ids")
     public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
         return R.status(service.deleteLogic(Func.toLongList(ids)));

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java

@@ -18,6 +18,7 @@ import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -124,6 +125,7 @@ public class ShiftsController extends BladeController {
      */
     @PostMapping("/save")
     @ApiOperationSupport(order = 30)
+    @ApiLog(value = "班次新增一条")
     @Operation(summary = "新增一条", description = "传入Shifts Obj")
     public R save(@Valid @RequestBody Shifts addOne) {
         addOne.setId(null);
@@ -148,6 +150,7 @@ public class ShiftsController extends BladeController {
      */
     @PostMapping("/update")
     @ApiOperationSupport(order = 40)
+    @ApiLog(value = "班次修改一条")
     @Operation(summary = "修改一条", description = "传入Shifts Obj")
     public R update(@Valid @RequestBody Shifts updateOne) {
         return R.status(service.updateById(updateOne));
@@ -188,6 +191,7 @@ public class ShiftsController extends BladeController {
      */
     @PostMapping("/remove")
     @ApiOperationSupport(order = 61)
+    @ApiLog(value = "班次逻辑删除")
     @Operation(summary = "逻辑删除", description = "传入ids")
     public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
         return R.status(service.deleteLogic(Func.toLongList(ids)));

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java

@@ -17,6 +17,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -29,6 +30,7 @@ import org.springblade.desk.basic.excel.PlatingSmallExcel;
 import org.springblade.desk.basic.excel.TeamSetExcel;
 import org.springblade.desk.basic.pojo.entity.*;
 import org.springblade.desk.basic.pojo.vo.TeamSetVO;
+import org.springblade.desk.basic.service.IRelTeamSetUserService;
 import org.springblade.desk.basic.service.IShiftsService;
 import org.springblade.desk.basic.service.ITeamSetService;
 import org.springblade.desk.basic.service.ITeamTimeService;
@@ -72,6 +74,9 @@ public class TeamSetController extends BladeController {
     @Resource
     private IShiftsService shiftService;
 
+    @Resource
+    private IRelTeamSetUserService relTeamSetUserService;
+
     /**
      * [班组] 详情
      */
@@ -92,14 +97,25 @@ public class TeamSetController extends BladeController {
         List<User> teams = new ArrayList<>();
         QueryWrapper<TeamSet> qw = Condition.getQueryWrapper(teamSet);
         TeamSet detail = service.getOne(qw);
-        if(detail != null){
-            String teamId = detail.getTeamMemberId();
-            if(null != teamId && !"".equals(teamId)){
-                teams = iUserClient.userUNListByIds(teamId);
-            }else{
-                teams = iUserClient.userUNListByIds("");
-            }
+
+        QueryWrapper<RelTeamSetUser> qwuser = new QueryWrapper<>();
+        qwuser.eq("TEAM_SET_ID", detail.getId());
+        List<RelTeamSetUser> users = relTeamSetUserService.list(qwuser);
+        if(null != users && users.size() > 0){
+            List<Long> userIds = users.stream().map(RelTeamSetUser::getUserId).collect(Collectors.toList());
+            String userId = Func.toStr(userIds);
+            teams = iUserClient.userUNListByIds(userId);
+        }else{
+            teams = iUserClient.userUNListByIds("");
         }
+//        if(detail != null){
+//            String teamId = detail.getTeamMemberId();
+//            if(null != teamId && !"".equals(teamId)){
+//                teams = iUserClient.userUNListByIds(teamId);
+//            }else{
+//                teams = iUserClient.userUNListByIds("");
+//            }
+//        }
         return R.data(teams);
     }
 
@@ -110,12 +126,22 @@ public class TeamSetController extends BladeController {
         List<User> teams = new ArrayList<>();
         QueryWrapper<TeamSet> qw = Condition.getQueryWrapper(teamSet);
         TeamSet detail = service.getOne(qw);
-        if(detail != null){
-            String teamId = detail.getTeamMemberId();
-            if(null != teamId && !"".equals(teamId)){
-                teams = iUserClient.userListByIds(teamId);
-            }
+
+        QueryWrapper<RelTeamSetUser> qwuser = new QueryWrapper<>();
+        qwuser.eq("TEAM_SET_ID", detail.getId());
+        List<RelTeamSetUser> users = relTeamSetUserService.list(qwuser);
+        if(null != users && users.size() > 0){
+            List<Long> userIds = users.stream().map(RelTeamSetUser::getUserId).collect(Collectors.toList());
+            String userId = Func.toStr(userIds);
+            teams = iUserClient.userListByIds(userId);
         }
+
+//        if(detail != null){
+//            String teamId = detail.getTeamMemberId();
+//            if(null != teamId && !"".equals(teamId)){
+//                teams = iUserClient.userListByIds(teamId);
+//            }
+//        }
         return R.data(teams);
     }
 
@@ -155,6 +181,7 @@ public class TeamSetController extends BladeController {
     }
 
 
+
     @PostMapping("/updateUserId")
     @ApiOperationSupport(order = 31)
     @Operation(summary = "设置人员Id保存", description = "传入WorkCenter List")
@@ -166,16 +193,22 @@ public class TeamSetController extends BladeController {
         String result = null;
         String team = null;
         if(null != teamIds){
-            result = teamIds.stream()
-                    .map(Object::toString) // 或者直接使用String::valueOf，效果相同
-                    .collect(Collectors.joining(","));
-
-
-            List<User> teams = iUserClient.userListByIds(result);
-
-            team= teams.stream()
-                    .map(user -> String.valueOf(user.getRealName()))
-                    .collect(Collectors.joining(","));
+            for(Long teamId:teamIds){
+                RelTeamSetUser relTeamSetUser = new RelTeamSetUser();
+                relTeamSetUser.setTeamSetId(detail.getId());
+                relTeamSetUser.setUserId(teamId);
+                relTeamSetUserService.save(relTeamSetUser);
+            }
+//            result = teamIds.stream()
+//                    .map(Object::toString) // 或者直接使用String::valueOf，效果相同
+//                    .collect(Collectors.joining(","));
+//
+//
+//            List<User> teams = iUserClient.userListByIds(result);
+//
+//            team= teams.stream()
+//                    .map(user -> String.valueOf(user.getRealName()))
+//                    .collect(Collectors.joining(","));
         }
 
         detail.setTeamMemberId(result);
@@ -354,6 +387,7 @@ public class TeamSetController extends BladeController {
      */
     @PostMapping("/save")
     @ApiOperationSupport(order = 30)
+    @ApiLog("班组新增")
     @Operation(summary = "新增一条", description = "传入TeamSet Obj")
     public R save(@Valid @RequestBody TeamSet addOne) {
         addOne.setId(null);
@@ -382,6 +416,7 @@ public class TeamSetController extends BladeController {
      */
     @PostMapping("/update")
     @ApiOperationSupport(order = 40)
+    @ApiLog("班组修改")
     @Operation(summary = "修改一条", description = "传入TeamSet Obj")
     public R update(@Valid @RequestBody TeamSet updateOne) {
         R<User> user= iUserClient.userInfoById(updateOne.getDispatcher());
@@ -429,6 +464,7 @@ public class TeamSetController extends BladeController {
      */
     @PostMapping("/remove")
     @ApiOperationSupport(order = 61)
+    @ApiLog("班组逻辑删除")
     @Operation(summary = "逻辑删除", description = "传入ids")
     public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
         return R.status(service.deleteLogic(Func.toLongList(ids)));

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java

@@ -17,6 +17,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -25,15 +26,9 @@ import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.constant.BAModuleConst;
 import org.springblade.desk.basic.excel.WorkCenterExcel;
-import org.springblade.desk.basic.pojo.entity.OemCraftAbilityEntity;
-import org.springblade.desk.basic.pojo.entity.PlatingSmall;
-import org.springblade.desk.basic.pojo.entity.TeamSet;
-import org.springblade.desk.basic.pojo.entity.WorkCenter;
+import org.springblade.desk.basic.pojo.entity.*;
 import org.springblade.desk.basic.pojo.vo.WorkCenterVO;
-import org.springblade.desk.basic.service.ICraftAbilityService;
-import org.springblade.desk.basic.service.IOemCraftAbilityService;
-import org.springblade.desk.basic.service.ITeamSetService;
-import org.springblade.desk.basic.service.IWorkCenterService;
+import org.springblade.desk.basic.service.*;
 import org.springblade.desk.basic.util.ExcelExtUtil;
 import org.springblade.desk.basic.wrapper.WorkCenterWrapper;
 import org.springblade.scheduling.pojo.entity.CraftAbilityEntity;
@@ -75,6 +70,8 @@ public class WorkCenterController extends BladeController {
     private IOemCraftAbilityService oemCraftAbilityService;
     @Resource
     private IUserClient iUserClient;
+    @Resource
+    private ICenterTeamService teamCenterService;
     /**
      * [作业中心] 详情
      */
@@ -155,6 +152,7 @@ public class WorkCenterController extends BladeController {
      */
     @PostMapping("/save")
     @ApiOperationSupport(order = 30)
+    @ApiLog("作业中心新增")
     @Operation(summary = "新增一条", description = "传入WorkCenter Obj")
     public R save(@Valid @RequestBody WorkCenter addOne) {
         addOne.setId(null);
@@ -181,19 +179,35 @@ public class WorkCenterController extends BladeController {
         List<TeamSet> teams = new ArrayList<>();
         QueryWrapper<WorkCenter> qw = Condition.getQueryWrapper(workCenter);
         WorkCenter detail = service.getOne(qw);
-        if(detail != null){
-            String teamId = detail.getTeamId();
-            if(null != teamId && !"".equals(teamId)){
-                List<Long> ids = Func.toLongList(teamId);
-                QueryWrapper<TeamSet> queryWrapper = new QueryWrapper<>();
-                queryWrapper.notIn("id",ids);
-                teams = teamService.list(queryWrapper);
-            }else{
-                QueryWrapper<TeamSet> queryWrapper = new QueryWrapper<>();
-                teams = teamService.list(queryWrapper);
-            }
 
+        QueryWrapper<CenterTeam> qwteam = new QueryWrapper<>();
+        qwteam.eq("WC_ID",detail.getId());
+        List<CenterTeam> teamList = teamCenterService.list(qwteam);
+        List<Long> ids = new ArrayList<>();
+        if(null != teamList && teamList.size() > 0){
+            ids = teamList.stream().map(CenterTeam::getTsId).collect(Collectors.toList());
+            QueryWrapper<TeamSet> queryWrapper = new QueryWrapper<>();
+            queryWrapper.notIn("id",ids);
+            teams = teamService.list(queryWrapper);
+        }else{
+            QueryWrapper<TeamSet> queryWrapper = new QueryWrapper<>();
+            teams = teamService.list(queryWrapper);
         }
+
+
+//        if(detail != null){
+//            String teamId = detail.getTeamId();
+//            if(null != teamId && !"".equals(teamId)){
+//                List<Long> ids = Func.toLongList(teamId);
+//                QueryWrapper<TeamSet> queryWrapper = new QueryWrapper<>();
+//                queryWrapper.notIn("id",ids);
+//                teams = teamService.list(queryWrapper);
+//            }else{
+//                QueryWrapper<TeamSet> queryWrapper = new QueryWrapper<>();
+//                teams = teamService.list(queryWrapper);
+//            }
+//
+//        }
         return R.data(teams);
     }
 
@@ -204,15 +218,27 @@ public class WorkCenterController extends BladeController {
         List<TeamSet> teams = new ArrayList<>();
         QueryWrapper<WorkCenter> qw = Condition.getQueryWrapper(workCenter);
         WorkCenter detail = service.getOne(qw);
-        if(detail != null){
-            String teamId = detail.getTeamId();
-            if(null != teamId && !"".equals(teamId)){
-                List<Long> ids = Func.toLongList(teamId);
-                QueryWrapper<TeamSet> queryWrapper = new QueryWrapper<>();
-                queryWrapper.in("id",ids);
-                teams = teamService.list(queryWrapper);
-            }
+
+        QueryWrapper<CenterTeam> qwteam = new QueryWrapper<>();
+        qwteam.eq("WC_ID",detail.getId());
+        List<CenterTeam> teamList = teamCenterService.list(qwteam);
+        List<Long> ids = new ArrayList<>();
+        if(null != teamList && teamList.size() > 0){
+            ids = teamList.stream().map(CenterTeam::getTsId).collect(Collectors.toList());
+            QueryWrapper<TeamSet> queryWrapper = new QueryWrapper<>();
+            queryWrapper.in("id",ids);
+            teams = teamService.list(queryWrapper);
         }
+
+//        if(detail != null){
+//            String teamId = detail.getTeamId();
+//            if(null != teamId && !"".equals(teamId)){
+//                List<Long> ids = Func.toLongList(teamId);
+//                QueryWrapper<TeamSet> queryWrapper = new QueryWrapper<>();
+//                queryWrapper.in("id",ids);
+//                teams = teamService.list(queryWrapper);
+//            }
+//        }
         return R.data(teams);
     }
 
@@ -249,7 +275,6 @@ public class WorkCenterController extends BladeController {
 		return R.data(teams);
 	}
 
-
     @PostMapping("/updateTeamId")
     @ApiOperationSupport(order = 31)
     @Operation(summary = "设置班组Id保存", description = "传入WorkCenter List")
@@ -261,17 +286,25 @@ public class WorkCenterController extends BladeController {
         String result = null;
         String team = null;
         if(null != teamIds){
-            result = teamIds.stream()
-                    .map(Object::toString) // 或者直接使用String::valueOf，效果相同
-                    .collect(Collectors.joining(","));
 
-            QueryWrapper<TeamSet> queryWrapper = new QueryWrapper<>();
-            queryWrapper.in("id",teamIds);
-            List<TeamSet> teams = teamService.list(queryWrapper);
+            for(Long teamId:teamIds){
+                CenterTeam centerteam = new CenterTeam();
+                centerteam.setWcId(detail.getId());
+                centerteam.setTsId(teamId);
+                teamCenterService.save(centerteam);
+            }
 
-            team= teams.stream()
-                    .map(user -> String.valueOf(user.getTsName()))
-                    .collect(Collectors.joining(","));
+//            result = teamIds.stream()
+//                    .map(Object::toString) // 或者直接使用String::valueOf，效果相同
+//                    .collect(Collectors.joining(","));
+//
+//            QueryWrapper<TeamSet> queryWrapper = new QueryWrapper<>();
+//            queryWrapper.in("id",teamIds);
+//            List<TeamSet> teams = teamService.list(queryWrapper);
+//
+//            team= teams.stream()
+//                    .map(user -> String.valueOf(user.getTsName()))
+//                    .collect(Collectors.joining(","));
         }
 
         detail.setTeamId(result);
@@ -349,6 +382,7 @@ public class WorkCenterController extends BladeController {
      */
     @PostMapping("/update")
     @ApiOperationSupport(order = 40)
+    @ApiLog("作业中心修改")
     @Operation(summary = "修改一条", description = "传入WorkCenter Obj")
     public R update(@Valid @RequestBody WorkCenter updateOne) {
         return R.status(service.updateById(updateOne));
@@ -389,6 +423,7 @@ public class WorkCenterController extends BladeController {
      */
     @PostMapping("/remove")
     @ApiOperationSupport(order = 61)
+    @ApiLog("作业中心逻辑删除")
     @Operation(summary = "逻辑删除", description = "传入ids")
     public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
         return R.status(service.deleteLogic(Func.toLongList(ids)));

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java

@@ -17,6 +17,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -143,6 +144,7 @@ public class WorkTankController extends BladeController {
      */
     @PostMapping("/save")
     @ApiOperationSupport(order = 30)
+    @ApiLog("作业槽新增")
     @Operation(summary = "新增一条", description = "传入WorkTank Obj")
     public R save(@Valid @RequestBody WorkTank addOne) {
 
@@ -175,6 +177,7 @@ public class WorkTankController extends BladeController {
      */
     @PostMapping("/update")
     @ApiOperationSupport(order = 40)
+    @ApiLog("作业槽修改")
     @Operation(summary = "修改一条", description = "传入WorkTank Obj")
     public R update(@Valid @RequestBody WorkTank updateOne) {
 
@@ -227,6 +230,7 @@ public class WorkTankController extends BladeController {
      */
     @PostMapping("/remove")
     @ApiOperationSupport(order = 61)
+    @ApiLog("作业槽逻辑删除")
     @Operation(summary = "逻辑删除", description = "传入ids")
     public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
         return R.status(service.deleteLogic(Func.toLongList(ids)));

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/feign/WorkCenterClient.java

@@ -1,19 +1,25 @@
 package org.springblade.desk.basic.feign;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.v3.oas.annotations.Hidden;
 import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.desk.basic.pojo.entity.BasicClazz;
+import org.springblade.desk.basic.pojo.entity.RelTeamSetUser;
 import org.springblade.desk.basic.pojo.entity.TeamSet;
 import org.springblade.desk.basic.pojo.entity.WorkCenter;
 import org.springblade.desk.basic.service.IBasicClazzService;
+import org.springblade.desk.basic.service.IRelTeamSetUserService;
 import org.springblade.desk.basic.service.ITeamSetService;
 import org.springblade.desk.basic.service.IWorkCenterService;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 作业中心 Feign接口类
  *
@@ -30,6 +36,8 @@ public class WorkCenterClient implements IWorkCenterClient {
 	private ITeamSetService service;
 	@Resource
 	private IBasicClazzService clazzService;
+	@Resource
+	private IRelTeamSetUserService relTeamSetUserService;
 	@Override
 	public R<WorkCenter> getById(Long workCenterId) {
 		WorkCenter workCenter = workCenterService.getById(workCenterId);
@@ -38,7 +46,20 @@ public class WorkCenterClient implements IWorkCenterClient {
 
 	@Override
 	public R<TeamSet> getTeamSetById(Long id) {
-		return R.data(service.getById(id));
+		TeamSet teamSet =service.getById(id);
+		QueryWrapper<RelTeamSetUser> qwuser = new QueryWrapper<>();
+		qwuser.eq("TEAM_SET_ID", id);
+		List<RelTeamSetUser> users = relTeamSetUserService.list(qwuser);
+		if(null != users && users.size() > 0){
+			String userIds = users.stream()
+					.map(RelTeamSetUser::getUserId)
+					.map(Object::toString) // 或者直接使用String::valueOf，效果相同
+					.collect(Collectors.joining(","));
+			teamSet.setTeamId(userIds);
+		}
+
+
+		return R.data(teamSet);
 	}
 
 	@Override