feat(process): 新增工序机台字段及关联机台校验

buhuazhen

8 小时以前 ca9c106255ff6283286c78ce621251839eb98189

feat(process): 新增工序机台字段及关联机台校验

- 在ProductProcess实体中添加deviceName字段，标记为Excel及ApiModelProperty属性
- 废弃原有工序编号Excel注解，调整设备名称字段定义位置
- 在ProductProcessServiceImpl中注入DeviceLedgerMapper用于设备信息查询
- 列表保存前校验工序机台名称非空，确保机台关联有效
- 根据机台名称批量查询设备信息，关联设定deviceLeaderId字段
- 保存工序后生成并更新工序编号，格式为"GX"+8位ID编号
- 优化保存逻辑，逐条保存并更新工序编号，避免批量保存遗漏关联字段

 src/main/java/com/ruoyi/production/pojo/ProductProcess.java

@@ -36,10 +36,15 @@
    @Excel(name = "工序名称")
    private String name;

    @ApiModelProperty(value ="工序机台")
    @TableField(value = "device_name")
    @Excel(name = "工序机台")
    private String deviceName;

    /**
     * 工序编号
     */
    @Excel(name = "工序编号")
//    @Excel(name = "工序编号")
    private String no;

    /**
@@ -57,6 +62,7 @@
    private BigDecimal salaryQuota;

    @ApiModelProperty("类型 区分是计时还是计件 0 计时 1计件")
    @Excel(name = "类型 0 计时 1计件")
    private Long type;

    /**
@@ -82,12 +88,10 @@
    private Long tenantId;

    @ApiModelProperty(value ="是否质检")
    @Excel(name = "是否质检")
    private Boolean isQuality;

    @ApiModelProperty(value ="设备名称")
    @TableField(value = "device_name")
    @Excel(name = "设备名称")
    private String deviceName;


    @ApiModelProperty(value ="设备id")
    @TableField(value = "device_id")

 src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java

@@ -7,6 +7,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.mapper.DeviceLedgerMapper;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.production.dto.ProductProcessDto;
import com.ruoyi.production.mapper.ProcessRouteItemMapper;
@@ -23,6 +25,8 @@
import org.springframework.web.multipart.MultipartFile;

import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

@Service
public class ProductProcessServiceImpl extends ServiceImpl<ProductProcessMapper, ProductProcess> implements ProductProcessService {
@@ -32,6 +36,8 @@
    private ProcessRouteItemMapper processRouteItemMapper;
    @Autowired
    private ProductProcessRouteItemMapper productProcessRouteItemMapper;
    @Autowired
    private DeviceLedgerMapper deviceLedgerMapper;

    @Override
    public IPage<ProductProcessDto> listPage(Page page, ProductProcessDto productProcessDto) {
@@ -69,8 +75,26 @@
                if (ObjectUtils.isEmpty(productProcess.getName())) {
                    throw new RuntimeException("工序名称不能为空");
                }
                if (ObjectUtils.isEmpty(productProcess.getDeviceName())) {
                    throw new RuntimeException("工序机台不能为空");
                }
            });
            this.saveOrUpdateBatch(productProcessList);
            // 通过机台名称查询机台信息
            List<String> deviceNames = productProcessList.stream().map(ProductProcess::getDeviceName).collect(Collectors.toList());
            List<DeviceLedger> deviceLedgerList = deviceLedgerMapper.selectList(Wrappers.<DeviceLedger>lambdaQuery().in(DeviceLedger::getDeviceName, deviceNames));
            if(CollectionUtils.isEmpty(deviceLedgerList)){
                throw new RuntimeException("工序机台不能为空");
            }
            Map<String, DeviceLedger> deviceNameMap = deviceLedgerList.stream().collect(Collectors.toMap(DeviceLedger::getDeviceName, deviceLedger -> deviceLedger));
            productProcessList.forEach(productProcess -> {
                DeviceLedger deviceLedger = deviceNameMap.get(productProcess.getDeviceName());
                productProcess.setDeviceLeaderId(deviceLedger.getId());
                this.save(productProcess);
                String no = "GX" + String.format("%08d", productProcess.getId());
                productProcess.setNo(no);
                productProcessMapper.updateById(productProcess);
            });

            return AjaxResult.success(true);
        }catch (Exception e){
            e.printStackTrace();