oem相关。

3 months ago · c63df34f87
parent d0c3dc24d7
commit c63df34f87
15 changed files with 294 additions and 175 deletions
--- a/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IAttachClient.java
+++ b/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IAttachClient.java
@ -20,6 +20,8 @@ public interface IAttachClient {

    String DETAIL_BY_ID = API_PREFIX + "/detail-by-id";

+    String COPY_FROM_TEMP_TO_BIZ_PREFIX = API_PREFIX + "/copy-from-temp-to-biz-prefix";
+
    /**
     *
     * @param attach
@ -29,10 +31,19 @@ public interface IAttachClient {
    R<Attach> detail(@RequestBody Attach attach);

    /**
-     * todo:改成get
     * @param id
     * @return
     */
    @GetMapping(DETAIL_BY_ID)
    R<Attach> detailById(@RequestParam("id") Long id);
+
+    /**
+     *
+     * @param id
+     * @param bizPrefix
+     * @return
+     */
+    @GetMapping(COPY_FROM_TEMP_TO_BIZ_PREFIX)
+    R<Attach> copyFromTempToBizPrefix(@RequestParam("id") Long id,
+                                      @RequestParam("bizPrefix") String bizPrefix);
 }
--- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java
+++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java
@ -25,7 +25,6 @@ import org.springframework.web.bind.annotation.*;
 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.quality.pojo.entity.Ng;
 import org.springblade.desk.quality.pojo.vo.NgVO;
 import org.springblade.desk.quality.excel.NgExcel;
@ -35,8 +34,11 @@ import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.tool.constant.BladeConstant;
+
 import java.util.Map;
 import java.util.List;
+import java.util.stream.Collectors;
+
 import jakarta.servlet.http.HttpServletResponse;

 /**
@ -214,9 +216,10 @@ public class NgController extends BladeController {
    @ApiOperationSupport(order = 71)
    @Operation(summary = "下载Excel模板", description = "")
    public ResponseEntity<org.springframework.core.io.Resource> downloadExcelTemplate() {
-            return ExcelExtUtil.downloadXlsTemplate(
-                    "Excel/QA/ImportTemplate-CycleTestItem.xls",
-                    "导入模版-周期试验项目.xls");
+//            return ExcelExtUtil.downloadXlsTemplate(
+//                    "Excel/QA/ImportTemplate-CycleTestItem.xls",
+//                    "导入模版-周期试验项目.xls");
+        return null;
    }

    /**
@ -226,13 +229,14 @@ public class NgController extends BladeController {
    @ApiOperationSupport(order = 72)
    @Operation(summary = "导入Excel", description = "MultipartFile")
    public R importExcel(@RequestParam("file") MultipartFile file) {
-          R checkR = ExcelExtUtil.importExcelCheck(file);
-          if (checkR != null) {
-              return checkR;
-          }
-          List<Ng> importList = ExcelUtil.read(
-                     file, 0, 1, Ng.class
-          );
-          return R.status(service.saveBatch(importList));
+//          R checkR = ExcelExtUtil.importExcelCheck(file);
+//          if (checkR != null) {
+//              return checkR;
+//          }
+//          List<Ng> importList = ExcelUtil.read(
+//                     file, 0, 1, Ng.class
+//          );
+//          return R.status(service.saveBatch(importList));
+        return null;
    }
 }
--- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java
+++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java
@ -13,7 +13,6 @@ import org.springblade.desk.quality.pojo.vo.NgVO;
 import org.springblade.desk.quality.excel.NgExcel;
 import org.springblade.desk.quality.mapper.NgMapper;
 import org.springblade.desk.quality.service.INgService;
-import org.springblade.system.feign.IUserClient;
 import org.springblade.system.feign.IDictClient;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@ -34,8 +33,8 @@ import java.util.List;
@Slf4j
 public class NgServiceImpl extends BaseServiceImpl<NgMapper, Ng> implements INgService {

-    @Resource
-    private IUserClient userClient;
+//    @Resource
+//    private IUserClient userClient;
    @Resource
    private IDictClient dictClient;

--- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/AttachClient.java
+++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/AttachClient.java
@ -30,4 +30,10 @@ public class AttachClient implements IAttachClient {
        Attach detail = attachService.getById(id);
        return R.data(detail);
    }
+
+    @Override
+    public R<Attach> copyFromTempToBizPrefix(Long id, String bizPrefix) {
+        // todo:有temp桶,成功以后移动到具体业务桶中.
+        return null;
+    }
 }
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/OemConst.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/OemConst.java
@ -0,0 +1,44 @@
+package org.springblade.desk.basic.constant;
+
+public interface OemConst {
+
+    /**
+     * 正常供货
+     */
+    Integer S_OK = 0;
+    /**
+     * 暂停供货
+     */
+    Integer S_STOP = 1;
+    /**
+     * 暂停新物料采购
+     */
+    Integer S_STOP_NEW_MAT = 2;
+
+
+    /**
+     * 民品&普军
+     */
+    Integer QUALIFICATION_0 = 0;
+    /**
+     * 军标线
+     */
+    Integer QUALIFICATION_1 = 1;
+    /**
+     * 民品&普军&航军
+     */
+    Integer QUALIFICATION_2 = 2;
+    /**
+     * 民品&普军&军标线
+     */
+    Integer QUALIFICATION_3 = 3;
+    /**
+     * 民品&普军&航军&军标线
+     */
+    Integer QUALIFICATION_4 = 4;
+
+
+
+
+    String DICT_QUALIFICATION = "Oem-Qualification";
+}
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java
@ -25,8 +25,10 @@ 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.constant.BaseCol;
 import org.springblade.desk.basic.excel.OemExcel;
 import org.springblade.desk.basic.pojo.entity.Oem;
+import org.springblade.desk.basic.pojo.request.OemSearch;
 import org.springblade.desk.basic.pojo.vo.OemVO;
 import org.springblade.desk.basic.service.IOemService;
 import org.springblade.desk.basic.util.ExcelExtUtil;
@ -78,16 +80,40 @@ public class OemController extends BladeController {
    @GetMapping("/list")
    @ApiOperationSupport(order = 20)
    @Operation(summary = "list分页", description = "传入Oem Obj")
-    public R<IPage<OemVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> oem,
+    public R<IPage<OemVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> map,
                                Query query) {
-        QueryWrapper<Oem> qw = Condition.getQueryWrapper(oem, Oem.class);
-        IPage<Oem> pages = service.page(Condition.getPage(query), qw);
-        IPage<OemVO> pagesVO = OemWrapper.build().pageVO(pages);
-        pagesVO.getRecords()
-                .stream()
-                .peek(service::setVOValue)
-                .collect(Collectors.toList());
-        return R.data(pagesVO);
+        // 构建search对象。
+        OemSearch search = new OemSearch();
+
+//        if (map.containsKey(Oem.COL_CODE)) {
+//            search.setCode((Func.toStr(map.get(OemSearch.COL_CODE))));
+//        }
+//        if (map.containsKey(Oem.COL_OC_NAME)) {
+//            search.setOcName((Func.toStr(map.get(OemSearch.COL_OC_NAME))));
+//        }
+//        if (map.containsKey(Oem.COL_ABBREVIATION)) {
+//            search.setAbbreviation((Func.toStr(map.get(OemSearch.COL_ABBREVIATION))));
+//        }
+//        if (map.containsKey(OemSearch.COL_QUALIFICATION)) {
+//            search.setQualification((Func.toInt(map.get(OemSearch.COL_QUALIFICATION))));
+//        }
+//        if (map.containsKey(BaseCol.STATUS)) {
+//            search.setStatus((Integer) map.get(BaseCol.STATUS));
+//        }
+//        if (map.containsKey(OemSearch.COL_CONTACT_MAN)) {
+//            search.setContactMan((Func.toStr(map.get(OemSearch.COL_CONTACT_MAN))));
+//        }
+
+
+//        IPage<Oem> pages = service.page(Condition.getPage(query), qw);
+//        IPage<OemVO> pagesVO = OemWrapper.build().pageVO(pages);
+
+//        pagesVO.getRecords()
+//                .stream()
+//                .peek(service::setVOValue)
+//                .collect(Collectors.toList());
+//        return R.data(pagesVO);
+        return null;
    }


--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java
@ -9,7 +9,10 @@ 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.request.OemSearch;
 import org.springblade.desk.basic.pojo.vo.OemVO;
+import org.springblade.desk.quality.pojo.entity.AuditFile;
+import org.springblade.desk.quality.pojo.request.AuditFileSearch;

 import java.util.List;

--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java
@ -112,7 +112,7 @@ public class Oem extends BaseEntity {
 	 * 资质
 	 */
 	@Schema(description = "资质")
-	private Short qualification;
+	private Integer qualification;
 	/**
 	 * 联系人
 	 */
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java
@ -0,0 +1,11 @@
+package org.springblade.desk.basic.pojo.request;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.basic.pojo.entity.Oem;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OemSearch extends Oem {
+
+}
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java
@ -9,7 +9,10 @@ import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
 import org.springblade.desk.basic.excel.OemExcel;
 import org.springblade.desk.basic.pojo.entity.Oem;
+import org.springblade.desk.basic.pojo.request.OemSearch;
 import org.springblade.desk.basic.pojo.vo.OemVO;
+import org.springblade.desk.quality.pojo.entity.AuditFile;
+import org.springblade.desk.quality.pojo.request.AuditFileSearch;

 import java.util.List;

@ -44,5 +47,7 @@ public interface IOemService extends BaseService<Oem> {
     */
    void setVOValue(OemVO vo);

+    IPage<Oem> listSearch(IPage<Oem> page, OemSearch search);
+
    R setPassword(Oem updateOne);
 }
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java
@ -5,16 +5,19 @@ package org.springblade.desk.basic.service.impl;

 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import jakarta.annotation.Resource;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.api.R;
 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.request.OemSearch;
 import org.springblade.desk.basic.pojo.vo.OemVO;
 import org.springblade.desk.basic.service.IOemService;
 import org.springblade.system.feign.IDictClient;
@ -60,6 +63,14 @@ public class OemServiceImpl extends BaseServiceImpl<OemMapper, Oem> implements I

    }

+    @Override
+    public IPage<Oem> listSearch(IPage<Oem> page, OemSearch search) {
+        // todo:
+        // Wrapper<Oem> qw = Wrappers.<Oem>query().lambda();
+        // qw.lambda().eq(CycleTestItem::getTenantId, bladeUser.getTenantId()); // todo:
+        return null;
+    }
+
    @Override
    public R setPassword(Oem updateOne) {
        Oem find = getById(updateOne.getId());
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java
@ -9,7 +9,6 @@ public interface LiquidTankTaskConst {
     * 来源类型-[2]:周期自动生成;
     */
    Integer FROM_TYPE_PERIODIC = 2;
-
    /**
     * 来源类型-[3]:计算自动生成;
     */
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java
@ -47,7 +47,7 @@ import java.util.stream.Collectors;

 /**
 * [年度指标] 控制器
- *
+ * mes v1: qc_annual_target
 * @author Tom Shuo
 * @since 2025-12-22
 */
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearDetailController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearDetailController.java
@ -41,7 +41,7 @@ import java.util.stream.Collectors;

 /**
 * [年度指标明细] 控制器
- *
+ * mes v1: qc_annual_target_detail
 * @author Tom Shuo
 * @since 2025-12-23
 */
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java
@ -41,7 +41,7 @@ import java.util.stream.Collectors;

 /**
 * [转试记录] 控制器
- * mes v1:
+ * mes v1: pr_plan_test
 * @author Tom Shuo
 * @since 2025-12-24
 */