BA模块 Controller PREFIX。

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/FlowConst.java

@@ -0,0 +1,57 @@
+package org.springblade.desk.basic.constant;
+
+/**
+ * mes v1: copy from IFlowBusinessBean
+ */
+public interface FlowConst {
+
+    /**
+     * 初始状态(未发送审批)
+     */
+    public static final short STATUS_NEW = -1;
+
+    /**
+     * 审批中(审批中)
+     */
+    public static final short STATUS_CHECKING = 0;
+
+    /**
+     * 审批完毕(审批通过)
+     */
+    public static final short STATUS_CHECKED = 1;
+
+    /**
+     * 变更待审中
+     */
+    public static final short STATUS_CHANGE_WAITING_FOR_CHECKUP = 2;
+
+    /**
+     * 变更中
+     */
+    public static final short STATUS_CHANGING = 3;
+
+    /**
+     * 打回
+     */
+    public static final short STATUS_RETURN = 4;
+
+    /**
+     * 审批未通过
+     */
+    public static final short STATUS_UNPASS = 10;
+
+    /**
+     * 已完成
+     */
+    public static final short STATUS_COMPLETE = 20;
+
+    /**
+     * 已作废
+     */
+    public static final short STATUS_CANCEL = 21;
+
+    /**
+     * 已变更
+     */
+    public static final short STATUS_CHANGE_OK = 22;
+}

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

@@ -24,6 +24,7 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 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.BatConfigExcel;
 import org.springblade.desk.basic.pojo.entity.BatConfig;
 import org.springblade.desk.basic.pojo.vo.BatConfigVO;
@@ -45,7 +46,7 @@ import java.util.stream.Collectors;
  * @since 2025-12-22
  */
 @RestController
-@RequestMapping("/BA/BatConfig")
+@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/BatConfig")
 @Data
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)

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

@@ -23,6 +23,7 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 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.FormulaExcel;
 import org.springblade.desk.basic.pojo.entity.Formula;
 import org.springblade.desk.basic.pojo.vo.FormulaVO;
@@ -43,7 +44,7 @@ import java.util.Map;
  * @since 2025-12-16
  */
 @RestController
-@RequestMapping("/BA/Formula")
+@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/Formula")
 @Data
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)

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

@@ -3,50 +3,51 @@
  */
 package org.springblade.desk.basic.controller;
 
-import io.swagger.v3.oas.annotations.tags.Tag;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
-
-import lombok.Data;
 import lombok.AllArgsConstructor;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.secure.annotation.IsAdmin;
+import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springframework.http.ResponseEntity;
+import org.springblade.desk.basic.constant.BAModuleConst;
-import org.springframework.web.bind.annotation.*;
+import org.springblade.desk.basic.excel.OemExcel;
-import org.springframework.web.multipart.MultipartFile;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.desk.basic.util.ExcelExtUtil;
 import org.springblade.desk.basic.pojo.entity.Oem;
 import org.springblade.desk.basic.pojo.vo.OemVO;
-import org.springblade.desk.basic.excel.OemExcel;
-import org.springblade.desk.basic.wrapper.OemWrapper;
 import org.springblade.desk.basic.service.IOemService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.desk.basic.util.ExcelExtUtil;
-import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.desk.basic.wrapper.OemWrapper;
-import org.springblade.core.excel.util.ExcelUtil;
+import org.springframework.http.ResponseEntity;
-import org.springblade.core.tool.constant.BladeConstant;
+import org.springframework.web.bind.annotation.*;
-import java.util.Map;
+import org.springframework.web.multipart.MultipartFile;
+
 import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * [外协厂家] 控制器
+ * mes v1: bs_oem_customer
  *
  * @author Tom Shuo
  * @since 2026-01-04
  */
 @RestController
-@RequestMapping("/Oem")
+@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/Oem")
 @Data
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
@@ -203,7 +204,7 @@ public class OemController extends BladeController {
         //}
         //queryWrapper.lambda().eq(OemEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
         List<OemExcel> list = service.exportOem(qw);
-		ExcelUtil.export(response, "[外协厂家]数据" + org.springblade.core.tool.utils.DateUtil.time(),
+        ExcelUtil.export(response, "[外协厂家]数据" + DateUtil.time(),
                 "[外协厂家]数据表", list, OemExcel.class);
     }
 

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

@@ -24,6 +24,7 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 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.ProcessAbilityExcel;
 import org.springblade.desk.basic.pojo.entity.ProcessAbility;
 import org.springblade.desk.basic.pojo.vo.ProcessAbilityVO;
@@ -45,7 +46,7 @@ import java.util.stream.Collectors;
  * @since 2025-12-22
  */
 @RestController
-@RequestMapping("/ProcessAbility")
+@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/ProcessAbility")
 @Data
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)

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

@@ -24,6 +24,7 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 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.ProdMarkExcel;
 import org.springblade.desk.basic.pojo.entity.ProdMark;
 import org.springblade.desk.basic.pojo.vo.ProdMarkVO;
@@ -45,7 +46,7 @@ import java.util.stream.Collectors;
  * @since 2025-12-22
  */
 @RestController
-@RequestMapping("/BA/ProdMark")
+@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/ProdMark")
 @Data
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)

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

@@ -23,6 +23,7 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 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.TeamSetExcel;
 import org.springblade.desk.basic.pojo.entity.TeamSet;
 import org.springblade.desk.basic.pojo.vo.TeamSetVO;
@@ -43,7 +44,7 @@ import java.util.Map;
  * @since 2025-12-16
  */
 @RestController
-@RequestMapping("/BA/TeamSet")
+@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/TeamSet")
 @Data
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)

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

@@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.desk.basic.constant.BAModuleConst;
 import org.springblade.desk.basic.service.TestPowerJobService;
 import org.springblade.desk.quality.service.CycleTestTaskService2;
 import org.springblade.desk.quality.service.TestService;
@@ -21,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.time.LocalDateTime;
 
 @RestController
-@RequestMapping("/BA/TestPowerJob")
+@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/TestPowerJob")
 @Data
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)

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

@@ -23,6 +23,7 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 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.WorkCenter;
 import org.springblade.desk.basic.pojo.vo.WorkCenterVO;
@@ -43,7 +44,7 @@ import java.util.Map;
  * @since 2025-12-16
  */
 @RestController
-@RequestMapping("/BA/WorkCenter")
+@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/WorkCenter")
 @Data
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)

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

@@ -23,6 +23,7 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 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.WorkTankExcel;
 import org.springblade.desk.basic.pojo.entity.WorkTank;
 import org.springblade.desk.basic.pojo.vo.WorkTankVO;
@@ -43,7 +44,7 @@ import java.util.Map;
  * @since 2025-12-16
  */
 @RestController
-@RequestMapping("/BA/WorkTank")
+@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/WorkTank")
 @Data
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/OemExcel.java

@@ -4,15 +4,14 @@
 package org.springblade.desk.basic.excel;
 
 
-import lombok.Data;
-
-import java.io.Serializable;
-import org.springblade.core.mp.base.BaseEntity;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
 import java.io.Serial;
+import java.io.Serializable;
 
 
 /**

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java

@@ -3,13 +3,14 @@
  */
 package org.springblade.desk.basic.mapper;
 
-import org.springblade.desk.basic.pojo.entity.Oem;
-import org.springblade.desk.basic.pojo.vo.OemVO;
-import org.springblade.desk.basic.excel.OemExcel;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
+import org.springblade.desk.basic.excel.OemExcel;
+import org.springblade.desk.basic.pojo.entity.Oem;
+import org.springblade.desk.basic.pojo.vo.OemVO;
+
 import java.util.List;
 
 /**

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

@@ -3,9 +3,10 @@
  */
 package org.springblade.desk.basic.pojo.dto;
 
-import org.springblade.desk.basic.pojo.entity.Oem;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springblade.desk.basic.pojo.entity.Oem;
+
 import java.io.Serial;
 
 /**

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

@@ -3,11 +3,12 @@
  */
 package org.springblade.desk.basic.pojo.entity;
 
-import lombok.Data;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.springblade.core.mp.base.BaseEntity;
+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;
 
 /**

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

@@ -3,9 +3,10 @@
  */
 package org.springblade.desk.basic.pojo.vo;
 
-import org.springblade.desk.basic.pojo.entity.Oem;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springblade.desk.basic.pojo.entity.Oem;
+
 import java.io.Serial;
 
 /**

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

@@ -4,11 +4,12 @@
 package org.springblade.desk.basic.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import org.springblade.desk.basic.pojo.entity.Oem;
-import org.springblade.desk.basic.pojo.vo.OemVO;
-import org.springblade.desk.basic.excel.OemExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.desk.basic.excel.OemExcel;
+import org.springblade.desk.basic.pojo.entity.Oem;
+import org.springblade.desk.basic.pojo.vo.OemVO;
+
 import java.util.List;
 
 /**

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java

@@ -3,22 +3,23 @@
  */
 package org.springblade.desk.basic.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import jakarta.annotation.Resource;
-import lombok.Data;
 import lombok.AllArgsConstructor;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
-import org.springblade.desk.basic.pojo.entity.Oem;
+import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.desk.basic.pojo.vo.OemVO;
 import org.springblade.desk.basic.excel.OemExcel;
 import org.springblade.desk.basic.mapper.OemMapper;
+import org.springblade.desk.basic.pojo.entity.Oem;
+import org.springblade.desk.basic.pojo.vo.OemVO;
 import org.springblade.desk.basic.service.IOemService;
-import org.springblade.system.feign.IUserClient;
 import org.springblade.system.feign.IDictClient;
+import org.springblade.system.feign.IUserClient;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
+
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.mp.base.BaseServiceImpl;
 import java.util.List;
 
 /**

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/OemWrapper.java

@@ -7,6 +7,7 @@ import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.desk.basic.pojo.entity.Oem;
 import org.springblade.desk.basic.pojo.vo.OemVO;
+
 import java.util.Objects;
 
 /**

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTemplateConst.java

@@ -1,6 +1,6 @@
 package org.springblade.desk.quality.constant;
 
-public class InspectionTemplateConst {
+public interface InspectionTemplateConst {
 
     String DICT_CATEGORY = "";
 

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java

@@ -42,7 +42,7 @@ import java.util.stream.Collectors;
 
 /**
  * [工艺文件] 控制器
- * mes v1:
+ * mes v1: ds_audit_file
  *
  * @author Tom Shuo
  * @since 2025-12-22
@@ -81,12 +81,18 @@ public class AuditFileController extends BladeController {
     @Operation(summary = "list分页", description = "传入AuditFile Obj")
     public R<IPage<AuditFileVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> map,
                                       Query query) {
-        QueryWrapper<AuditFile> qw = Condition.getQueryWrapper(map, AuditFile.class);
+        // QueryWrapper<AuditFile> qw = Condition.getQueryWrapper(map, AuditFile.class);
         AuditFileSearch search = new AuditFileSearch();
         // todo: Func 用法
+        if (map.containsKey(AuditFile.COL_PPS_ID)) {
             search.setPpsId(Func.toLong(map.get(AuditFile.COL_PPS_ID)));
+        }
+        if (map.containsKey(AuditFile.COL_PQ_ID)) {
             search.setPqId(Func.toLong(map.get(AuditFile.COL_PQ_ID)));
+        }
+        if (map.containsKey(BaseRequest.KEEP_USER_REAL_NAME)) {
             search.setKeepUserRealName(Func.toStr(map.get(BaseRequest.KEEP_USER_REAL_NAME)));
+        }
         IPage<AuditFile> pages = service.listSearch(Condition.getPage(query), search);
         IPage<AuditFileVO> pagesVO = AuditFileWrapper.build().pageVO(pages);
         pagesVO.getRecords()

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java

@@ -41,6 +41,7 @@ import java.util.stream.Collectors;
 
 /**
  * [过程记录模板] 控制器
+ * mes v1: ds_rb_file_preserve
  *
  * @author Tom Shuo
  * @since 2025-12-22
@@ -122,9 +123,9 @@ public class ProReTemplateController extends BladeController {
     @ApiOperationSupport(order = 30)
     @Operation(summary = "新增一条", description = "传入ProReTemplate Obj")
     public R save(@Valid @RequestBody ProReTemplate addOne) {
-        addOne.setId(null);
         addOne.setStatus(ProReTemplateConst.STATUS_NEW);
-        addOne.setApprovalStatus(1);
+        addOne.setApprovalStatus(ProReTemplateConst.APPROVAL_STATUS_1);
+        addOne.setId(null);
         return R.status(service.save(addOne));
     }
 
@@ -136,6 +137,8 @@ public class ProReTemplateController extends BladeController {
     @Operation(summary = "新增批量", description = "传入ProReTemplate List")
     public R saveBat(@Valid @RequestBody List<ProReTemplate> addList) {
         addList.forEach(one -> {
+            one.setStatus(ProReTemplateConst.STATUS_NEW);
+            one.setApprovalStatus(ProReTemplateConst.APPROVAL_STATUS_1);
             one.setId(null);
         });
         return R.status(service.saveBatch(addList));

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml

@@ -29,16 +29,16 @@
     </select>
 
     <select id="listSearch" resultMap="auditFileResultMap">
-        SELECT DISTINCT t.*
+        SELECT DISTINCT f.*
         FROM QA_AUDIT_FILE f
         LEFT JOIN BLADE_USER u
         ON (f.CREATE_USER = u.ID OR f.UPDATE_USER = u.ID)
-        WHERE (t.IS_DELETED = 0 AND u.IS_DELETED = 0)
+        WHERE (f.IS_DELETED = 0 AND u.IS_DELETED = 0)
         <if test="q.ppsId != null">
-            AND t.PPS_ID = #{q.ppsId}
+            AND f.PPS_ID = #{q.ppsId}
         </if>
         <if test="q.pqId != null">
-            AND t.PQ_ID = #{q.pqId}
+            AND f.PQ_ID = #{q.pqId}
         </if>
         <if test="q.keepUserRealName != null and q.keepUserRealName != ''">
             AND u.REAL_NAME LIKE '%' || #{q.keepUserRealName} || '%'

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java

@@ -125,8 +125,9 @@ public class ProReTemplateServiceImpl extends EnBaseServiceImpl<ProReTemplateMap
         ProReTemplate find = getById(id);
         ProReTemplate copy = new ProReTemplate();
         BeanUtil.copyProperties(find, copy, true);
-        copy.setId(null);
         copy.setStatus(ProReTemplateConst.STATUS_NEW);
+        copy.setApprovalStatus(ProReTemplateConst.APPROVAL_STATUS_1);
+        copy.setId(null);
         return R.status(save(copy));
     }