排程数据组装优化

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsNochangeRollerDao.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.ApsNochangeRollerDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 铸轧不换辊兼容 Mapper 接口
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-10-30
+ */
+public interface ApsNochangeRollerDao extends BaseMapper<ApsNochangeRollerDo> {
+
+}

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/ApsNochangeRollerService.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.domain.ApsNochangeRollerDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 铸轧不换辊兼容 服务类
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-10-30
+ */
+public interface ApsNochangeRollerService extends IService<ApsNochangeRollerDo> {
+
+}

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsNochangeRollerServiceImpl.java

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.rongwei.bsentity.domain.ApsNochangeRollerDo;
+import com.rongwei.bscommon.sys.dao.ApsNochangeRollerDao;
+import com.rongwei.bscommon.sys.service.ApsNochangeRollerService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 铸轧不换辊兼容 服务实现类
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-10-30
+ */
+@Service
+public class ApsNochangeRollerServiceImpl extends ServiceImpl<ApsNochangeRollerDao, ApsNochangeRollerDo> implements ApsNochangeRollerService {
+
+}

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsNochangeRollerDo.java

@@ -0,0 +1,63 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 铸轧不换辊兼容
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-10-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("aps_nochange_roller")
+public class ApsNochangeRollerDo extends BaseDo {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableId("ID")
+    private String id;
+    @TableField("TENANTID")
+    private String tenantid;
+    /**
+     * 扩展json格式配置
+     */
+    @TableField("ROPTION")
+    private String roption;
+    /**
+     * 主表id
+     */
+    @TableField("MAINID")
+    private String mainid;
+    /**
+     * 作业产品类型（多选）
+     */
+    @TableField("JOBPRODUCTTYPE")
+    private String jobproducttype;
+    /**
+     * 作业合金（多选）
+     */
+    @TableField("WORKINGALLOY")
+    private String workingalloy;
+    /**
+     * 产品类型兼容规则
+     */
+    @TableField("COMPATIBILITYRULES")
+    private String compatibilityrules;
+
+
+}

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/ApsBlankOrderVo.java

@@ -14,4 +14,7 @@ public class ApsBlankOrderVo extends ApsBlankOrderDo {
 
     private Integer cdbs;
 
+    // 合金加合金状态
+    private String volumeMetalAndState;
+
 }

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/ProductionScheduleVo.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.rongwei.bsentity.domain.ApsAnnealingDifferenceDo;
 import com.rongwei.bsentity.domain.ApsFurnaceInstallationDo;
 import com.rongwei.bsentity.domain.ApsMergeFurnaceDo;
+import com.rongwei.bsentity.domain.ApsNochangeRollerDo;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -73,6 +74,11 @@ public class ProductionScheduleVo {
      */
     private List<ApsAnnealingDifferenceDo> apsAnnealingDifferences;
 
+    /**
+     * 铸轧兼容配置表
+     */
+    private List<ApsNochangeRollerDo> apsNochangeRollerDos;
+
     /**
      * 洗炉时间（小时）
      */