订单模块-镀层物料申报

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

@@ -0,0 +1,34 @@
+package org.springblade.desk.dashboard.pojo.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 零件加工所需工装信息表 视图实体类
+ *
+ * @author BladeX
+ * @since 2025-11-12
+ */
+@Data
+public class DsPartToolVO implements Serializable {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 名称
+	 */
+	private String name;
+
+	/**
+	 * 编码
+	 */
+	private String code;
+
+	/**
+	 * 备注
+	 */
+	private String memo;
+
+}

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

@@ -347,6 +347,11 @@ public class YieldOrder extends BaseEntity {
 	@TableField(value = "RECEIVE_TIME")
 	private Date receiveTime;
 
+	/**
+	 * 需求镀层物料编码
+	 */
+	@TableField(value = "PLATE_GOODS_CODE")
+	private String plateGoodsCode;
 	/**
 	 * 物料需求数量
 	 */

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsCraftController.java

@@ -1,61 +1,35 @@
-/**
- * BladeX Commercial License Agreement
- * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
- * <p>
- * Use of this software is governed by the Commercial License Agreement
- * obtained after purchasing a license from BladeX.
- * <p>
- * 1. This software is for development use only under a valid license
- * from BladeX.
- * <p>
- * 2. Redistribution of this software's source code to any third party
- * without a commercial license is strictly prohibited.
- * <p>
- * 3. Licensees may copyright their own code but cannot use segments
- * from this software for such purposes. Copyright of this software
- * remains with BladeX.
- * <p>
- * Using this software signifies agreement to this License, and the software
- * must not be used for illegal purposes.
- * <p>
- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
- * not liable for any claims arising from secondary or illegal development.
- * <p>
- * Author: Chill Zhuang (bladejava@qq.com)
- */
 package org.springblade.desk.dashboard.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 lombok.AllArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
-
+import lombok.AllArgsConstructor;
-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.secure.annotation.IsAdmin;
 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.dashboard.pojo.vo.DsCraftExpireVO;
+import org.springblade.desk.dashboard.excel.DsCraftExcel;
-import org.springblade.desk.dashboard.pojo.vo.DsPartSynthesisVO;
-import org.springblade.desk.dashboard.pojo.vo.DsProcessSynthesisVO;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.desk.dashboard.pojo.entity.DsCraftEntity;
+import org.springblade.desk.dashboard.pojo.vo.DsCraftExpireVO;
 import org.springblade.desk.dashboard.pojo.vo.DsCraftVO;
-import org.springblade.desk.dashboard.excel.DsCraftExcel;
+import org.springblade.desk.dashboard.pojo.vo.DsProcessSynthesisVO;
-import org.springblade.desk.dashboard.wrapper.DsCraftWrapper;
 import org.springblade.desk.dashboard.service.IDsCraftService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.desk.dashboard.wrapper.DsCraftWrapper;
-import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.desk.oldv1.pojo.ResultInfo;
-import org.springblade.core.excel.util.ExcelUtil;
+import org.springframework.web.bind.annotation.*;
-import org.springblade.core.tool.constant.BladeConstant;
+
-import java.util.Map;
 import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
+import java.util.Map;
 
 /**
  * 零件工艺信息表 控制器
@@ -71,8 +45,6 @@ public class DsCraftController extends BladeController {
 
 	private final IDsCraftService dsCraftService;
 
-
-
 	/**
 	 * 工序详情
 	 */
@@ -84,8 +56,6 @@ public class DsCraftController extends BladeController {
 		return R.data(detail);
 	}
 
-
-
 	/**
 	 * 零件工艺信息表 分页
 	 */
@@ -166,7 +136,6 @@ public class DsCraftController extends BladeController {
 		ExcelUtil.export(response, "零件工艺信息表数据" + DateUtil.time(), "零件工艺信息表数据表", list, DsCraftExcel.class);
 	}
 
-
 	/**
 	 * 根据零件ID查询工艺版本号
 	 */
@@ -188,5 +157,10 @@ public class DsCraftController extends BladeController {
 	}
 
 
+	@PostMapping(value = "/getToolsByPartId")
+	@Operation(summary = "根据零件ID查询需要的工装列表", description = "零件ID")
+	public ResultInfo getToolsByPartId(@Parameter(description = "零件号", required = true) Long partId) {
+		return ResultInfo.ok(dsCraftService.getToolsByPartId(partId));
+	}
 
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsProcessMoldToolController.java

@@ -25,34 +25,33 @@
  */
 package org.springblade.desk.dashboard.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 lombok.AllArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
-
+import lombok.AllArgsConstructor;
-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.secure.annotation.IsAdmin;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
+import org.springblade.desk.dashboard.excel.DsProcessMoldToolExcel;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.desk.dashboard.pojo.entity.DsProcessMoldToolEntity;
 import org.springblade.desk.dashboard.pojo.vo.DsProcessMoldToolVO;
-import org.springblade.desk.dashboard.excel.DsProcessMoldToolExcel;
-import org.springblade.desk.dashboard.wrapper.DsProcessMoldToolWrapper;
 import org.springblade.desk.dashboard.service.IDsProcessMoldToolService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.desk.dashboard.wrapper.DsProcessMoldToolWrapper;
-import org.springblade.core.tool.utils.DateUtil;
+import org.springframework.web.bind.annotation.*;
-import org.springblade.core.excel.util.ExcelUtil;
+
-import org.springblade.core.tool.constant.BladeConstant;
-import java.util.Map;
 import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
+import java.util.Map;
 
 /**
  * 工序工装模具表 控制器

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/CraftMapper.xml

@@ -36,13 +36,26 @@
     </select>
 
     <select id="selectDsCraftByIds" resultType="org.springblade.desk.dashboard.pojo.entity.DsCraftEntity">
-        select * from DS_CRAFT where is_deleted = 0
+        select * from DS_CRAFT
+		where is_deleted = 0
         AND ID IN
         <foreach collection="craftIds" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
     </select>
 
+	<select id = "listByPartCode" resultType="org.springblade.desk.dashboard.pojo.entity.DsCraftEntity">
+		SELECT *
+		FROM(
+			SELECT craft.*
+			FROM DS_CRAFT craft
+			LEFT JOIN ds_part part ON craft.part_id = part.id
+			WHERE is_deleted = 0 and
+		) t
+		WHERE rownum = 1
+		ORDER BY craft.PART_VERSIONS desck
+	</select>
+
     <select id="selectDsCraftByPartId" resultType="org.springblade.desk.dashboard.pojo.vo.DsCraftExpireVO">
         select * from DS_CRAFT where is_deleted = 0  and PART_ID = #{partId}
     </select>

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsCraftMapper.java

@@ -63,6 +63,8 @@ public interface DsCraftMapper extends BaseMapper<DsCraftEntity> {
 
     List<DsCraftEntity> selectDsCraftByIds(@Param("craftIds")List<Long> craftIds);
 
+	List<DsCraftEntity> listByPartCode(@Param("partCode")String partCode);
+
 	List<DsCraftExpireVO> selectDsCraftByPartId(@Param("partId")Long partId);
 
 	List<DsCraftVO> selectCraftByPartId(@Param("partId")Long partId);

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsCraftService.java

@@ -32,6 +32,7 @@ import org.springblade.desk.dashboard.excel.DsCraftExcel;
 import org.springblade.desk.dashboard.pojo.entity.DsCraftEntity;
 import org.springblade.desk.dashboard.pojo.vo.DsCraftExpireVO;
 import org.springblade.desk.dashboard.pojo.vo.DsCraftVO;
+import org.springblade.desk.dashboard.pojo.vo.DsPartToolVO;
 import org.springblade.desk.dashboard.pojo.vo.DsProcessSynthesisVO;
 
 import java.util.List;
@@ -92,7 +93,6 @@ public interface IDsCraftService extends BaseService<DsCraftEntity> {
 	 */
 	List<DsCraftEntity> listByPartId(Long partId);
 
-
 	/**
 	 * 根据零件号查询工艺信息
 	 * @param partId
@@ -140,5 +140,10 @@ public interface IDsCraftService extends BaseService<DsCraftEntity> {
 	 */
 	DsCraftEntity getReworkCraft(Long partId, String changeNo);
 
-
+	/**
+	 * 根据零件ID查询需要的工装列表
+	 * @param partId
+	 * @return
+	 */
+	List<DsPartToolVO> getToolsByPartId(Long partId);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java

@@ -28,21 +28,20 @@ package org.springblade.desk.dashboard.service.impl;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.desk.dashboard.excel.DsCraftExcel;
 import org.springblade.desk.dashboard.mapper.DsCraftMapper;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.desk.dashboard.pojo.entity.*;
 import org.springblade.desk.dashboard.pojo.vo.DsCraftExpireVO;
 import org.springblade.desk.dashboard.pojo.vo.DsCraftVO;
+import org.springblade.desk.dashboard.pojo.vo.DsPartToolVO;
 import org.springblade.desk.dashboard.pojo.vo.DsProcessSynthesisVO;
 import org.springblade.desk.dashboard.service.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
-import java.util.List;
+
-import java.util.Objects;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -53,27 +52,18 @@ import java.util.stream.Collectors;
  * @since 2025-11-12
  */
 @Service
+@RequiredArgsConstructor
 public class DsCraftServiceImpl extends BaseServiceImpl<DsCraftMapper, DsCraftEntity> implements IDsCraftService {
 
-	@Autowired
+	private final IDsPartService partService;
-	DsCraftMapper craftMapper;
-
-	@Autowired
-	@Lazy
-	IDsPartService partService;
 
-	@Autowired
+	private final IDsProcessService processService;
-	@Lazy
-	IDsProcessService processService;
 
-	@Autowired
+	private final IDsProcessProjectService processProjectService;
-	IDsProcessProjectService processProjectService;
 
-	@Autowired
+	private final IDsProcessMeasuringToolService processMeasuringToolService;
-	IDsProcessMeasuringToolService processMeasuringToolService;
 
-	@Autowired
+	private final IDsProcessMoldToolService processMoldToolService;
-	IDsProcessMoldToolService processMoldToolService;
 
 
 	@Override
@@ -123,12 +113,12 @@ public class DsCraftServiceImpl extends BaseServiceImpl<DsCraftMapper, DsCraftEn
 
 	@Override
 	public List<DsCraftEntity> selectDsCraftByIds(List<Long> craftIds) {
-		return craftMapper.selectDsCraftByIds(craftIds);
+		return baseMapper.selectDsCraftByIds(craftIds);
 	}
 
 	@Override
 	public List<DsCraftExpireVO> getVersion(Long partId) {
-		return craftMapper.selectDsCraftByPartId(partId);
+		return baseMapper.selectDsCraftByPartId(partId);
 	}
 
 	@Override
@@ -140,17 +130,16 @@ public class DsCraftServiceImpl extends BaseServiceImpl<DsCraftMapper, DsCraftEn
 
 	@Override
 	public List<DsCraftVO> selectDsCraftByPartId(Long partId) {
-		return craftMapper.selectCraftByPartId(partId);
+		return baseMapper.selectCraftByPartId(partId);
 	}
 
 	@Override
 	public List<DsCraftVO> selectDsCraftByPartId(Long partId, String version, String rank) {
-		return craftMapper.selectCraft(partId,version,rank);
+		return baseMapper.selectCraft(partId, version, rank);
 	}
 
 	@Override
 	public boolean addOrEdit(DsCraftEntity craft) {
-
 		if(null != craft.getId()){
 			updateById(craft);
 		}else {
@@ -169,7 +158,7 @@ public class DsCraftServiceImpl extends BaseServiceImpl<DsCraftMapper, DsCraftEn
 
 	@Override
 	public String getNewestVersion(Long partId) {
-		List<DsCraftVO> craftVOList = craftMapper.selectCraftByPartId(partId);
+		List<DsCraftVO> craftVOList = baseMapper.selectCraftByPartId(partId);
 		Optional<String> latestVersion = craftVOList.stream()
 			.map(DsCraftVO::getPartVersions)
 			.max(Comparator.naturalOrder());
@@ -183,11 +172,49 @@ public class DsCraftServiceImpl extends BaseServiceImpl<DsCraftMapper, DsCraftEn
 
 	@Override
 	public DsCraftEntity getPartCraft(Long partId, String rank, String newestVersion) {
-		return craftMapper.getPartCraft(partId,rank,newestVersion);
+		return baseMapper.getPartCraft(partId, rank, newestVersion);
 	}
 
 	@Override
 	public DsCraftEntity getReworkCraft(Long partId, String changeNo) {
-		return craftMapper.getReworkCraft(partId,changeNo);
+		return baseMapper.getReworkCraft(partId, changeNo);
+	}
+
+	@Override
+	public List<DsPartToolVO> getToolsByPartId(Long partId) {
+		// 从零件工艺的工艺中拿取工装
+		List<DsPartToolVO> dartAllModelList = new ArrayList<>();
+		DsPartToolVO dartAllModel;
+		DsPartToolVO dartAllModel1;
+		List<DsCraftEntity> dsCraftList = this.listByPartId(partId);
+		if (dsCraftList != null && dsCraftList.size() > 0) {
+			for (DsCraftEntity dsCraft : dsCraftList) {
+				List<DsProcessEntity> dsProcessList = processService.selectDsProcessByCraftId(dsCraft.getId());
+				if (dsProcessList != null && dsProcessList.size() > 0) {
+					for (DsProcessEntity dsProcess : dsProcessList) {
+						List<DsProcessMoldToolEntity> dsToolsInfos = processMoldToolService.selectDsProcessMoldToolByProcessId(dsProcess.getId());
+						if (dsToolsInfos != null && dsToolsInfos.size() > 0) {
+							for (DsProcessMoldToolEntity dsToolsInfo : dsToolsInfos) {
+								dartAllModel = new DsPartToolVO();
+								dartAllModel.setCode(dsToolsInfo.getMoldCode());
+								dartAllModel.setName(dsToolsInfo.getMoldName());
+								dartAllModelList.add(dartAllModel);
+								//周新昊 20240920 增加查询工装的子件
+								List<DsPartEntity> dsPartSubs = partService.selectDsPartByPatCode(dsToolsInfo.getMoldCode(), null);
+								if (dsPartSubs != null && dsPartSubs.size() > 0) {
+									for (DsPartEntity dsPartSub : dsPartSubs) {
+										dartAllModel1 = new DsPartToolVO();
+										dartAllModel1.setCode(dsPartSub.getPartCode());
+										dartAllModel1.setName(dsPartSub.getPartName());
+										dartAllModelList.add(dartAllModel1);
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		return dartAllModelList;
 	}
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java

@@ -1,47 +1,23 @@
-/**
- * BladeX Commercial License Agreement
- * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
- * <p>
- * Use of this software is governed by the Commercial License Agreement
- * obtained after purchasing a license from BladeX.
- * <p>
- * 1. This software is for development use only under a valid license
- * from BladeX.
- * <p>
- * 2. Redistribution of this software's source code to any third party
- * without a commercial license is strictly prohibited.
- * <p>
- * 3. Licensees may copyright their own code but cannot use segments
- * from this software for such purposes. Copyright of this software
- * remains with BladeX.
- * <p>
- * Using this software signifies agreement to this License, and the software
- * must not be used for illegal purposes.
- * <p>
- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
- * not liable for any claims arising from secondary or illegal development.
- * <p>
- * Author: Chill Zhuang (bladejava@qq.com)
- */
 package org.springblade.desk.dashboard.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.dashboard.constant.TaskingConstant;
-import org.springblade.desk.dashboard.pojo.entity.*;
-import org.springblade.desk.dashboard.pojo.vo.*;
 import org.springblade.desk.dashboard.excel.DsPartExcel;
 import org.springblade.desk.dashboard.mapper.DsPartMapper;
+import org.springblade.desk.dashboard.pojo.entity.*;
+import org.springblade.desk.dashboard.pojo.vo.*;
 import org.springblade.desk.dashboard.service.*;
 import org.springblade.system.feign.IUserClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 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 org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -159,9 +135,13 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
 
 	@Override
 	public List<DsPartEntity> selectDsPartByPatCode(String partCode, Integer sinTerType) {
-		Wrapper<DsPartEntity> queryWrapper = Wrappers.lambdaQuery(DsPartEntity.class)
+		LambdaQueryWrapper<DsPartEntity> queryWrapper =  Wrappers.lambdaQuery(DsPartEntity.class)
-			.eq(DsPartEntity::getPartCode, partCode)
+			.eq(DsPartEntity::getPartCode, partCode);
-			.eq(DsPartEntity::getSinTerType, sinTerType);
+
+		if (Func.isNotEmpty(sinTerType)) {
+			queryWrapper.eq(DsPartEntity::getSinTerType, sinTerType);
+		}
+
 		return baseMapper.selectList(queryWrapper);
 	}
 

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessMoldToolServiceImpl.java

@@ -1,42 +1,17 @@
-/**
- * BladeX Commercial License Agreement
- * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
- * <p>
- * Use of this software is governed by the Commercial License Agreement
- * obtained after purchasing a license from BladeX.
- * <p>
- * 1. This software is for development use only under a valid license
- * from BladeX.
- * <p>
- * 2. Redistribution of this software's source code to any third party
- * without a commercial license is strictly prohibited.
- * <p>
- * 3. Licensees may copyright their own code but cannot use segments
- * from this software for such purposes. Copyright of this software
- * remains with BladeX.
- * <p>
- * Using this software signifies agreement to this License, and the software
- * must not be used for illegal purposes.
- * <p>
- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
- * not liable for any claims arising from secondary or illegal development.
- * <p>
- * Author: Chill Zhuang (bladejava@qq.com)
- */
 package org.springblade.desk.dashboard.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.RequiredArgsConstructor;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.desk.dashboard.excel.DsProcessMoldToolExcel;
+import org.springblade.desk.dashboard.mapper.DsProcessMoldToolMapper;
 import org.springblade.desk.dashboard.pojo.entity.DsProcessEntity;
 import org.springblade.desk.dashboard.pojo.entity.DsProcessMoldToolEntity;
 import org.springblade.desk.dashboard.pojo.vo.DsProcessMoldToolVO;
-import org.springblade.desk.dashboard.excel.DsProcessMoldToolExcel;
-import org.springblade.desk.dashboard.mapper.DsProcessMoldToolMapper;
 import org.springblade.desk.dashboard.pojo.vo.PrReworkProcessVO;
 import org.springblade.desk.dashboard.service.IDsProcessMoldToolService;
-import org.springframework.beans.factory.annotation.Autowired;
 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 org.springframework.util.CollectionUtils;
 
 import java.util.List;
@@ -48,11 +23,9 @@ import java.util.List;
  * @since 2025-11-12
  */
 @Service
+@RequiredArgsConstructor
 public class DsProcessMoldToolServiceImpl extends BaseServiceImpl<DsProcessMoldToolMapper, DsProcessMoldToolEntity> implements IDsProcessMoldToolService {
 
-	@Autowired
-	DsProcessMoldToolMapper processMoldToolMapper;
-
 	@Override
 	public IPage<DsProcessMoldToolVO> selectDsProcessMoldToolPage(IPage<DsProcessMoldToolVO> page, DsProcessMoldToolVO dsProcessMoldTool) {
 		return page.setRecords(baseMapper.selectDsProcessMoldToolPage(page, dsProcessMoldTool));
@@ -70,12 +43,12 @@ public class DsProcessMoldToolServiceImpl extends BaseServiceImpl<DsProcessMoldT
 
 	@Override
 	public List<DsProcessMoldToolEntity> selectDsProcessMoldToolByProcessIds(List<Long> processIds) {
-		return processMoldToolMapper.selectDsProcessMoldToolByProcessIds(processIds);
+		return baseMapper.selectDsProcessMoldToolByProcessIds(processIds);
 	}
 
 	@Override
 	public List<DsProcessMoldToolEntity> selectDsProcessMoldToolByProcessId(Long processId) {
-		return processMoldToolMapper.selectDsProcessMoldToolByProcessId(processId);
+		return baseMapper.selectDsProcessMoldToolByProcessId(processId);
 	}
 
 	@Override

blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java

@@ -25,41 +25,36 @@
  */
 package org.springblade.desk.device.controller;
 
+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 io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletResponse;
-import io.swagger.v3.oas.annotations.Parameter;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import jakarta.annotation.PostConstruct;
-import lombok.AllArgsConstructor;
 import jakarta.validation.Valid;
-
+import lombok.AllArgsConstructor;
-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.springblade.desk.device.pojo.entity.EquipmentEntity;
 import org.springblade.desk.device.pojo.excel.EquipmentExcel;
 import org.springblade.desk.device.pojo.vo.EquipmentStatusStatisticsVO;
-import org.springblade.desk.order.wrapper.AssayContentWrapper;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.desk.device.pojo.entity.EquipmentEntity;
 import org.springblade.desk.device.pojo.vo.EquipmentVO;
-import org.springblade.desk.device.wrapper.EquipmentWrapper;
 import org.springblade.desk.device.service.IEquipmentService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.desk.device.wrapper.EquipmentWrapper;
-import org.springblade.core.tool.utils.DateUtil;
+import org.springframework.web.bind.annotation.*;
-import org.springblade.core.excel.util.ExcelUtil;
+
-import org.springblade.core.tool.constant.BladeConstant;
-import java.util.Map;
 import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
+import java.util.Map;
 
 /**
  * 设备信息表 控制器

blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/FeiBaSetController.java

@@ -1,41 +1,36 @@
 package org.springblade.desk.device.controller;
 
+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 io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import jakarta.annotation.PostConstruct;
-import lombok.AllArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
-
+import lombok.AllArgsConstructor;
-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.springblade.desk.device.pojo.entity.FeiBaSetEntity;
 import org.springblade.desk.device.pojo.excel.FeiBaSetExcel;
 import org.springblade.desk.device.pojo.vo.FeiBaSetVO;
 import org.springblade.desk.device.service.IFeiBaSetService;
-import org.springblade.desk.device.wrapper.EquipmentWrapper;
 import org.springblade.desk.device.wrapper.FeiBaSetWrapper;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-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.Map;
-import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * 飞靶设置 控制器

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml

@@ -3,17 +3,22 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace = "org.springblade.desk.order.mapper.YieldOrderMapper">
+	<!-- 定义基础公共字段 -->
+	<sql id = "baseCommonFields">
+		yo.ID, yo.TENANT_ID, yo.CREATE_USER, yo.CREATE_DEPT, yo.CREATE_TIME, yo.UPDATE_USER, yo.UPDATE_TIME, yo.STATUS, yo.IS_DELETED,
+		YO_CODE, yo.YP_CODE, yo.PART_CODE, yo.PRODUCT_TYPE, yo.PART_NAME, yo.PLATE, yo.PRODUCT_IDENT, yo.USE_DEPT, yo.YP_AREA, yo.DEMAND_DATE,
+		PLAN_USER, yo.RELEASE_DATE, yo.MEMO, yo.CARD_NO, yo.BATCH_NO, yo.SITE_WORK, yo.YP_QTY, yo.ROAM_NO, yo.PRIMARY_CRAFT, yo.ROAM_NO_NEXT,
+		PDM_URL, yo.CUSTODIAN, yo.REWORK_CODE, yo.REWORK_NO, yo.ENTRUST_DEPT, yo.REWORK_MEMO, yo.BUSINESS_TYPE, yo.ASSIGN_MAN, yo.ASSIGN_TIME,
+		RECSEQ_NO, yo.MANUAL_INCREASE, yo.YIELD_TYPE, yo.FATHER_YO_ID, yo.NEW_LEV_FLAG, yo.PRODUCE_BOOL, yo.USE_DEPT_CODE, yo.YP_PRODUCT_LINE,
+		YP_MEMO, yo.SJ_MOLD_PREPARATION, yo.SJ_KIT_PREPARATION, yo.PK_USERNAME, yo.PK_DATE, yo.KIT_PREPARATION_MAN, yo.KIT_PREPARATION_TIME,
+		PRIORITY_APS, yo.PRIORITY_ERP, yo.VALIDATION_RESULT, yo.VALIDATION_MOMO, yo.VALIDATION_TIME, yo.VALIDATION_USER, yo.RECEIVE_STATUS,
+		WORK_CENTER_ID, yo.ERROR_INFO, yo.RECEIVE_USER, yo.RECEIVE_TIME, yo.GOODS_DEMAND, yo.TOOLS_DEMAND, yo.PLATE_GOODS_CODE
+	</sql>
+
 
     <select id = "selectPage" resultType = "org.springblade.desk.order.pojo.entity.YieldOrder">
-		SELECT ID, TENANT_ID, CREATE_USER, CREATE_DEPT, CREATE_TIME, UPDATE_USER, UPDATE_TIME, STATUS, IS_DELETED,
+		SELECT <include refid="baseCommonFields" />
-			YO_CODE, YP_CODE, PART_CODE, PRODUCT_TYPE, PART_NAME, PLATE, PRODUCT_IDENT, USE_DEPT, YP_AREA, DEMAND_DATE,
+		FROM MES_YIELD_ORDER yo
-			PLAN_USER, RELEASE_DATE, MEMO, CARD_NO, BATCH_NO, SITE_WORK, YP_QTY, ROAM_NO, PRIMARY_CRAFT, ROAM_NO_NEXT, PDM_URL,
-			CUSTODIAN, REWORK_CODE, REWORK_NO, ENTRUST_DEPT, REWORK_MEMO, BUSINESS_TYPE, ASSIGN_MAN, ASSIGN_TIME, RECSEQ_NO,
-			MANUAL_INCREASE, YIELD_TYPE, FATHER_YO_ID, NEW_LEV_FLAG, PRODUCE_BOOL, USE_DEPT_CODE, YP_PRODUCT_LINE, YP_MEMO,
-			SJ_MOLD_PREPARATION, SJ_KIT_PREPARATION, PK_USERNAME, PK_DATE, KIT_PREPARATION_MAN, KIT_PREPARATION_TIME, PRIORITY_APS,
-			PRIORITY_ERP, VALIDATION_RESULT, VALIDATION_MOMO, VALIDATION_TIME, VALIDATION_USER, RECEIVE_STATUS, WORK_CENTER_ID,
-			ERROR_INFO, RECEIVE_USER, RECEIVE_TIME, GOODS_DEMAND
-		FROM MES_YIELD_ORDER
 		WHERE IS_DELETED = 0
         <if test = "yieldTypeList != null and yieldTypeList.size() > 0">
             AND YIELD_TYPE IN
@@ -54,14 +59,7 @@
     </select>
 
     <select id = "pageMaterialApply" resultType = "org.springblade.desk.order.pojo.entity.YieldOrder">
-		SELECT yo.ID, yo.TENANT_ID, yo.CREATE_USER, yo.CREATE_DEPT, yo.CREATE_TIME, yo.UPDATE_USER, yo.UPDATE_TIME, yo.STATUS, yo.IS_DELETED,
+		SELECT <include refid="baseCommonFields" />
-            YO_CODE, YP_CODE, PART_CODE, PRODUCT_TYPE, PART_NAME, PLATE, PRODUCT_IDENT, USE_DEPT, YP_AREA, DEMAND_DATE,
-            PLAN_USER, RELEASE_DATE, MEMO, CARD_NO, BATCH_NO, SITE_WORK, YP_QTY, ROAM_NO, PRIMARY_CRAFT, ROAM_NO_NEXT, PDM_URL,
-            CUSTODIAN, REWORK_CODE, REWORK_NO, ENTRUST_DEPT, REWORK_MEMO, BUSINESS_TYPE, ASSIGN_MAN, ASSIGN_TIME, RECSEQ_NO,
-            MANUAL_INCREASE, YIELD_TYPE, FATHER_YO_ID, NEW_LEV_FLAG, PRODUCE_BOOL, USE_DEPT_CODE, YP_PRODUCT_LINE, YP_MEMO,
-            SJ_MOLD_PREPARATION, SJ_KIT_PREPARATION, PK_USERNAME, PK_DATE, KIT_PREPARATION_MAN, KIT_PREPARATION_TIME, PRIORITY_APS,
-            PRIORITY_ERP, VALIDATION_RESULT, VALIDATION_MOMO, VALIDATION_TIME, VALIDATION_USER, RECEIVE_STATUS, WORK_CENTER_ID,
-            ERROR_INFO, RECEIVE_USER, RECEIVE_TIME, GOODS_DEMAND
         FROM MES_YIELD_ORDER yo
         LEFT JOIN MES_PLATE_GOODS_RECORD_DETAIL grd ON yo.id = grd.YO_ID
         WHERE yo.IS_DELETED = 0 AND grd.ID IS NULL

doc/sql/mes/increase-260120.sql

@@ -68,13 +68,17 @@ ALTER TABLE mes_assay_content_detail
 COMMENT ON COLUMN mes_assay_content_detail.add_val IS '添加量值';
 
 ALTER TABLE mes_yield_order
-	ADD goods_demand DECIMAL(20, 10) NULL;
+	ADD goods_demand NUMBER(20,10) NULL;
 COMMENT ON COLUMN mes_yield_order.goods_demand IS '物料需求数量';
 
 ALTER TABLE mes_yield_order
-	ADD tools_demand DATE NULL;
+	ADD tools_demand NUMBER(20,10) NULL;
 COMMENT ON COLUMN mes_yield_order.tools_demand IS '工装需求数量';
 
+ALTER TABLE mes_yield_order
+	ADD PLATE_GOODS_CODE NVARCHAR2(255) NULL;
+COMMENT ON COLUMN mes_yield_order.PLATE_GOODS_CODE IS '需求镀层物料编码';
+
 CREATE TABLE mes_mold_apply
 (
 	id             NUMBER(20, 0)   NOT NULL ENABLE,
@@ -90,7 +94,7 @@ CREATE TABLE mes_mold_apply
 	part_name      VARCHAR2(255)   NULL,
 	tool_code      VARCHAR2(255)   NULL,
 	tool_name      VARCHAR2(255)   NULL,
-	apply_num      DECIMAL(20, 10) NULL,
+	apply_num      NUMBER(20,10) NULL,
 	plan_type_code VARCHAR2(255)   NULL,
 	plan_type_name VARCHAR2(255)   NULL,
 	need_date      DATE            NULL,
@@ -140,7 +144,7 @@ CREATE TABLE mes_mold_demand
 	part_name      VARCHAR2(255)   NULL,
 	tool_code      VARCHAR2(255)   NULL,
 	tool_name      VARCHAR2(255)   NULL,
-	demand_num     DECIMAL(20, 10) NULL,
+	demand_num     NUMBER(20,10) NULL,
 	plan_type_code VARCHAR2(255)   NULL,
 	plan_type_name VARCHAR2(255)   NULL,
 	need_date      DATE            NULL,
@@ -150,12 +154,12 @@ CREATE TABLE mes_mold_demand
 	releaser       VARCHAR2(255)   NULL,
 	memo           VARCHAR2(255)   NULL,
 	"SOURCE"       DECIMAL(8, 0)   NULL,
-	stock_num      DECIMAL(20, 10) NULL,
+	stock_num      NUMBER(20,10) NULL,
-	occupy_num     DECIMAL(20, 10) NULL,
+	occupy_num     NUMBER(20,10) NULL,
 	link_order_ids VARCHAR2(255)   NULL,
 	mo_code        VARCHAR2(100)   NULL,
 	mo_name        VARCHAR2(100)   NULL,
-	quantity       DECIMAL(20, 10) NULL,
+	quantity       NUMBER(20,10) NULL,
 	yp_id          DECIMAL(20, 0)  NULL,
 	erp_id         DECIMAL(20, 0)  NULL,
 	erp_wo_code    VARCHAR2(100)   NULL,