APS二开服务业务数据转换模型数据

cx-aps/cx-aps-common/pom.xml

@@ -18,7 +18,7 @@
     <dependencies>
         <dependency>
             <groupId>com.rongwei</groupId>
-            <artifactId>business-entity</artifactId>
+            <artifactId>cx-aps-entity</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 

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

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.ApsBlankOrderDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 生产订单_坯料计划 Mapper 接口
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-03-01
+ */
+public interface ApsBlankOrderDao extends BaseMapper<ApsBlankOrderDo> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.ApsProcessOperationDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 生产订单_坯料计划_工序作业 Mapper 接口
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-03-01
+ */
+public interface ApsProcessOperationDao extends BaseMapper<ApsProcessOperationDo> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.AspCheckItemsDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 设备子系统——设备档案（检查对象表） Mapper 接口
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-03-01
+ */
+public interface AspCheckItemsDao extends BaseMapper<AspCheckItemsDo> {
+
+}

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

@@ -0,0 +1,21 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.domain.ApsBlankOrderDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.vo.ProductionScheduleVo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 生产订单_坯料计划 服务类
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-03-01
+ */
+public interface ApsBlankOrderService extends IService<ApsBlankOrderDo> {
+
+    ProductionScheduleVo apsPlanModelSet(List<ApsBlankOrderDo> apsBlankOrderDos);
+
+}

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

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.domain.ApsProcessOperationDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 生产订单_坯料计划_工序作业 服务类
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-03-01
+ */
+public interface ApsProcessOperationService extends IService<ApsProcessOperationDo> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.domain.AspCheckItemsDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 设备子系统——设备档案（检查对象表） 服务类
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-03-01
+ */
+public interface AspCheckItemsService extends IService<AspCheckItemsDo> {
+
+}

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

@@ -0,0 +1,56 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.rongwei.bscommon.sys.dao.ApsBlankOrderDao;
+import com.rongwei.bscommon.sys.service.ApsBlankOrderService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.service.ApsProcessOperationService;
+import com.rongwei.bsentity.domain.ApsBlankOrderDo;
+import com.rongwei.bsentity.domain.ApsProcessOperationDo;
+import com.rongwei.bsentity.vo.ProductionProcesses;
+import com.rongwei.bsentity.vo.ProductionScheduleVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 生产订单_坯料计划 服务实现类
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-03-01
+ */
+@Service
+public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsBlankOrderDo> implements ApsBlankOrderService {
+
+    @Autowired
+    private ApsProcessOperationService apsProcessOperationService;
+
+    /**
+     * 原始订单表数据转换APS平台模型数据
+     * @param apsBlankOrderDos
+     * @return
+     */
+    @Override
+    public ProductionScheduleVo apsPlanModelSet(List<ApsBlankOrderDo> apsBlankOrderDos){
+        ProductionScheduleVo productionScheduleVo = new ProductionScheduleVo();
+        Long id = 0L;
+        if(apsBlankOrderDos != null && apsBlankOrderDos.size()>0){
+            for (ApsBlankOrderDo apsBlankOrderDo : apsBlankOrderDos) {
+                // 获取所有订单工序
+                List<ApsProcessOperationDo> operationDos = apsProcessOperationService.list(new LambdaQueryWrapper<ApsProcessOperationDo>()
+                        .eq(ApsProcessOperationDo::getBlankid, apsBlankOrderDo.getId()));
+                // 转换工序模型数据
+                for (ApsProcessOperationDo operationDo : operationDos) {
+                    id++;
+//                    ProductionProcesses processes = new ProductionProcesses(id,);
+                }
+            }
+        }
+
+        return productionScheduleVo;
+    }
+
+}

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

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.rongwei.bsentity.domain.ApsProcessOperationDo;
+import com.rongwei.bscommon.sys.dao.ApsProcessOperationDao;
+import com.rongwei.bscommon.sys.service.ApsProcessOperationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 生产订单_坯料计划_工序作业 服务实现类
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-03-01
+ */
+@Service
+public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperationDao, ApsProcessOperationDo> implements ApsProcessOperationService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.rongwei.bsentity.domain.AspCheckItemsDo;
+import com.rongwei.bscommon.sys.dao.AspCheckItemsDao;
+import com.rongwei.bscommon.sys.service.AspCheckItemsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 设备子系统——设备档案（检查对象表） 服务实现类
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-03-01
+ */
+@Service
+public class AspCheckItemsServiceImpl extends ServiceImpl<AspCheckItemsDao, AspCheckItemsDo> implements AspCheckItemsService {
+
+}

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/utils/CodeGeneration.java

@@ -54,8 +54,8 @@ public class CodeGeneration {
         dsc.setDbType(DbType.MYSQL);   //设置数据库类型，我是postgresql
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
-        dsc.setPassword("rootfpy");
-        dsc.setUrl("jdbc:mysql://localhost:3306/incontrol?characterEncoding=utf8&failOverReadOnly=false&autoReconnect=true&roundRobinLoadBalance=true&serverTimezone=GMT%2B8&useSSL=false&allowMultiQueries=true&databaseTerm=SCHEMA");  //指定数据库
+        dsc.setPassword("Irongwei@1");
+        dsc.setUrl("jdbc:mysql://192.168.0.201:3306/cx_dev?characterEncoding=utf8&failOverReadOnly=false&autoReconnect=true&roundRobinLoadBalance=true&serverTimezone=GMT%2B8&useSSL=false&allowMultiQueries=true&databaseTerm=SCHEMA");  //指定数据库
         autoGenerator.setDataSource(dsc);
 
         // 3、包的配置
@@ -83,7 +83,7 @@ public class CodeGeneration {
         strategy.setSuperEntityClass(BaseDo.class);
         strategy.setRestControllerStyle(true);
         // 设置要映射的表名（重要，需要修改的地方）
-        strategy.setInclude("srm_balance");
+        strategy.setInclude("asp_check_items");
         strategy.setNaming(NamingStrategy.underline_to_camel); // 自动转换表名的驼峰命名法
         strategy.setColumnNaming(NamingStrategy.no_change); // 自动转换列名的驼峰命名法
         strategy.setEntityLombokModel(true); // 是否使用lombox
@@ -109,9 +109,9 @@ public class CodeGeneration {
         };
         //自定义输出配置
         List<FileOutConfig> focList = new ArrayList<>();
-        String controllerParentPath = projectPath + "\\business-server\\src\\main\\java\\com\\rongwei\\bsserver\\controller\\";
-        String entityParentPath = projectPath + "\\business-entity\\src\\main\\java\\com\\rongwei\\bsentity\\domain\\";
-        String commonPath = projectPath + "\\business-common\\src\\main\\java\\com\\rongwei\\bscommon\\sys\\";
+        String controllerParentPath = projectPath + "\\cx-aps\\cx-aps-server\\src\\main\\java\\com\\rongwei\\bsserver\\controller\\";
+        String entityParentPath = projectPath + "\\cx-aps\\cx-aps-entity\\src\\main\\java\\com\\rongwei\\bsentity\\domain\\";
+        String commonPath = projectPath + "\\cx-aps\\cx-aps-common\\src\\main\\java\\com\\rongwei\\bscommon\\sys\\";
         // 自定义配置会被优先输出
         focList.add(new FileOutConfig("/gentemplates/controller.java.vm") {
             @Override

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

@@ -0,0 +1,132 @@
+package com.rongwei.bsentity.domain;
+
+import java.math.BigDecimal;
+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-03-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("aps_blank_order")
+public class ApsBlankOrderDo extends BaseDo {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableId("ID")
+    private String id;
+    /**
+     * 生产订单ID
+     */
+    @TableField("PRODUCTIONORDERID")
+    private String productionorderid;
+    /**
+     * 物料名称
+     */
+    @TableField("MATERIALNAME")
+    private String materialname;
+    /**
+     * 物料编码
+     */
+    @TableField("MATERIALCODE")
+    private String materialcode;
+    /**
+     * 坯料类型
+     */
+    @TableField("BLANKTYPE")
+    private String blanktype;
+    /**
+     * 产品类型
+     */
+    @TableField("PRODUCTTYPE")
+    private String producttype;
+    /**
+     * 合金
+     */
+    @TableField("ALLOY")
+    private String alloy;
+    /**
+     * 合金状态
+     */
+    @TableField("ALLOYSTATUS")
+    private String alloystatus;
+    /**
+     * 厚度
+     */
+    @TableField("THICKNESS")
+    private BigDecimal thickness;
+    /**
+     * 宽度
+     */
+    @TableField("PROWIDTH")
+    private BigDecimal prowidth;
+    /**
+     * 长度
+     */
+    @TableField("PROLENGTH")
+    private BigDecimal prolength;
+    /**
+     * 单卷重
+     */
+    @TableField("SINGLEROLLWEIGHT")
+    private BigDecimal singlerollweight;
+    /**
+     * 数量单位
+     */
+    @TableField("NUMBERUNIT")
+    private String numberunit;
+    /**
+     * 卷数
+     */
+    @TableField("ROLLNUM")
+    private Integer rollnum;
+    /**
+     * 总重量
+     */
+    @TableField("TOTALWEIGHT")
+    private BigDecimal totalweight;
+    /**
+     * 是否备料
+     */
+    @TableField("PREPAREMATERIAL")
+    private String preparematerial;
+    /**
+     * 是否不良品
+     */
+    @TableField("DEFECTIVEPRODUCT")
+    private String defectiveproduct;
+    /**
+     * 备料批次号
+     */
+    @TableField("PREPAREMATERIALBATCHNO")
+    private String preparematerialbatchno;
+    /**
+     * 所属租户ID
+     */
+    @TableField("TENANTID")
+    private String tenantid;
+    /**
+     * 扩展json格式配置
+     */
+    @TableField("ROPTION")
+    private String roption;
+
+
+}

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

@@ -0,0 +1,168 @@
+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-03-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("aps_process_operation")
+public class ApsProcessOperationDo extends BaseDo {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId("ID")
+    private String id;
+    @TableField("TENANTID")
+    private String tenantid;
+    /**
+     * 扩展json格式配置
+     */
+    @TableField("ROPTION")
+    private String roption;
+    /**
+     * 所属工厂
+     */
+    @TableField("OWNEDFACTORY")
+    private String ownedfactory;
+    /**
+     * 坯料计划ID
+     */
+    @TableField("BLANKID")
+    private String blankid;
+    /**
+     * 工序
+     */
+    @TableField("PRODUCTPROCESS")
+    private String productprocess;
+    /**
+     * 工序显示名
+     */
+    @TableField("PRODUCTPROCESSNAME")
+    private String productprocessname;
+    /**
+     * 前道工序作业
+     */
+    @TableField("PREVIOUSPROCESS")
+    private String previousprocess;
+    /**
+     * 后道工序作业
+     */
+    @TableField("NEXTPROCESS")
+    private String nextprocess;
+    /**
+     * 是否坯料工序
+     */
+    @TableField("ISBLANKPROCESS")
+    private String isblankprocess;
+    /**
+     * 可选设备
+     */
+    @TableField("CANCHOOSEDEVICE")
+    private String canchoosedevice;
+    /**
+     * 计划输入物料
+     */
+    @TableField("PLANINPUT")
+    private String planinput;
+    /**
+     * 计划输出物料
+     */
+    @TableField("PLANOUTPUT")
+    private String planoutput;
+    /**
+     * 计划备料卷数
+     */
+    @TableField("PLANBLANKRALL")
+    private Integer planblankrall;
+    /**
+     * 计划加工卷数
+     */
+    @TableField("PLANPROCESSRALL")
+    private Integer planprocessrall;
+    /**
+     * 加工车间
+     */
+    @TableField("PROCESSWORKSHOP")
+    private String processworkshop;
+    /**
+     * 加工设备
+     */
+    @TableField("PROCESSDEVICE")
+    private String processdevice;
+    /**
+     * 计划开工时间
+     */
+    @TableField("PLANSTARTDATE")
+    private Date planstartdate;
+    /**
+     * 计划完工时间
+     */
+    @TableField("PLANENDDATE")
+    private Date planenddate;
+    /**
+     * 实际可输入卷数
+     */
+    @TableField("ACTUALIMPUTROLL")
+    private Integer actualimputroll;
+    /**
+     * 输入不合格卷数
+     */
+    @TableField("INPUTUNQUALIFIEDROLL")
+    private Integer inputunqualifiedroll;
+    /**
+     * 实际可加工卷数
+     */
+    @TableField("ACTUALCANPROCESSROLL")
+    private Integer actualcanprocessroll;
+    /**
+     * 已开工卷数
+     */
+    @TableField("STARTINGROLL")
+    private Integer startingroll;
+    /**
+     * 已报工卷数
+     */
+    @TableField("REPORTROLL")
+    private Integer reportroll;
+    /**
+     * 已检验卷数
+     */
+    @TableField("CHECKOUTROLL")
+    private Integer checkoutroll;
+    /**
+     * 未完工卷数
+     */
+    @TableField("UNFINISHROLL")
+    private Integer unfinishroll;
+    /**
+     * 作业状态
+     */
+    @TableField("WORKSTATUS")
+    private String workstatus;
+    /**
+     * 生产状态
+     */
+    @TableField("PROCESSSTATUS")
+    private String processstatus;
+
+
+}

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

@@ -0,0 +1,374 @@
+package com.rongwei.bsentity.domain;
+
+import java.math.BigDecimal;
+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-03-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("asp_check_items")
+public class AspCheckItemsDo extends BaseDo {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableId("ID")
+    private String id;
+    /**
+     * 检查项名称
+     */
+    @TableField("CHECKITEMNAME")
+    private String checkitemname;
+    /**
+     * 检查项编号
+     */
+    @TableField("CHECKITEMCODE")
+    private String checkitemcode;
+    /**
+     * 检查项类型
+     */
+    @TableField("CHECKITEMTYPE")
+    private String checkitemtype;
+    /**
+     * 检查项所属区域ID
+     */
+    @TableField("CHECKITEMAREAID")
+    private String checkitemareaid;
+    /**
+     * 年检日期
+     */
+    @TableField("YEARLYINSPECTIONDATE")
+    private Date yearlyinspectiondate;
+    /**
+     * 提前预警天数
+     */
+    @TableField("EARLYWARNDAYS")
+    private Integer earlywarndays;
+    /**
+     * 设备用途
+     */
+    @TableField("EQUIPMENTUSAGE")
+    private String equipmentusage;
+    /**
+     * 检查对象负责人IDS
+     */
+    @TableField("CHARGEUSERID")
+    private String chargeuserid;
+    /**
+     * 检查对象负责人名称
+     */
+    @TableField("CHARGEUSERNAME")
+    private String chargeusername;
+    /**
+     * 检查对象负责组织二级机构ID
+     */
+    @TableField("CHARGEORGPID")
+    private String chargeorgpid;
+    /**
+     * 检查对象负责组织二级机构名称
+     */
+    @TableField("CHARGEORGPNAME")
+    private String chargeorgpname;
+    /**
+     * 检查对象负责组织一级机构ID
+     */
+    @TableField("CHARGEORGCID")
+    private String chargeorgcid;
+    /**
+     * 检查对象负责组织一级机构名称
+     */
+    @TableField("CHARGEORGCNAME")
+    private String chargeorgcname;
+    /**
+     * 检查对象负责组织机构ID
+     */
+    @TableField("CHARGEORGID")
+    private String chargeorgid;
+    /**
+     * 检查对象负责组织机构名称
+     */
+    @TableField("CHARGEORGNAME")
+    private String chargeorgname;
+    /**
+     * 排序
+     */
+    @TableField("SORT")
+    private Integer sort;
+    /**
+     * 启用/禁用
+     */
+    @TableField("ENABLED")
+    private String enabled;
+    @TableField("TENANTID")
+    private String tenantid;
+    /**
+     * 所属工厂
+     */
+    @TableField("OWNEDFACTORY")
+    private String ownedfactory;
+    /**
+     * 扩展json格式配置
+     */
+    @TableField("ROPTION")
+    private String roption;
+    /**
+     * 是否备用
+     */
+    @TableField("STANDBY")
+    private String standby;
+    /**
+     * 规格型号
+     */
+    @TableField("DEVICEMODEL")
+    private String devicemodel;
+    /**
+     * 出厂编号
+     */
+    @TableField("DEVICEOUTCODE")
+    private String deviceoutcode;
+    /**
+     * 安装地点
+     */
+    @TableField("DEVICEADDRESS")
+    private String deviceaddress;
+    /**
+     * 制造单位名称
+     */
+    @TableField("DEVICENAKEDNAME")
+    private String devicenakedname;
+    /**
+     * 设备代码
+     */
+    @TableField("DEVICECODE")
+    private String devicecode;
+    /**
+     * 注册代码
+     */
+    @TableField("SIGNUPCODE")
+    private String signupcode;
+    /**
+     * 设备制造日期
+     */
+    @TableField("DEVICECREATEDATE")
+    private Date devicecreatedate;
+    /**
+     * 检验日期
+     */
+    @TableField("DEVICECHECKDATE")
+    private Date devicecheckdate;
+    /**
+     * 下次检验日期
+     */
+    @TableField("NEXTCHECKDATE")
+    private Date nextcheckdate;
+    /**
+     * 环保号
+     */
+    @TableField("ENVIRONMENTALPROTECTIONNO")
+    private String environmentalprotectionno;
+    /**
+     * 备案号
+     */
+    @TableField("FILINGNO")
+    private String filingno;
+    /**
+     * 使用登记证编号
+     */
+    @TableField("REGISTRATIONNO")
+    private String registrationno;
+    /**
+     * 设备状态
+     */
+    @TableField("DEVICESTATUS")
+    private String devicestatus;
+    /**
+     * 设备分类
+     */
+    @TableField("DEVICESORT")
+    private String devicesort;
+    /**
+     * 类别
+     */
+    @TableField("CATEGORY")
+    private String category;
+    /**
+     * 年限
+     */
+    @TableField("LIFE")
+    private Integer life;
+    /**
+     * 预计提醒日期
+     */
+    @TableField("WARNDATE")
+    private Date warndate;
+    /**
+     * 公称直径（mm）
+     */
+    @TableField("NOMINALDIAMETER")
+    private String nominaldiameter;
+    /**
+     * 公称壁厚（mm）
+     */
+    @TableField("NOMINALWALLTHICKNESS")
+    private String nominalwallthickness;
+    /**
+     * 管道长度(m)
+     */
+    @TableField("PIPELINELENGTH")
+    private String pipelinelength;
+    /**
+     * 管道总长度(m)
+     */
+    @TableField("PIPELINELENGTHSUM")
+    private String pipelinelengthsum;
+    /**
+     * 压力（Mpa）
+     */
+    @TableField("PRESSURE")
+    private String pressure;
+    /**
+     * 温度（°C）
+     */
+    @TableField("TEMPERATURE")
+    private String temperature;
+    /**
+     * 介质
+     */
+    @TableField("MEDIUM")
+    private String medium;
+    /**
+     * 备注
+     */
+    @TableField("DEVICEREMARK")
+    private String deviceremark;
+    /**
+     * 设备图
+     */
+    @TableField("DEVICEPHOTO")
+    private String devicephoto;
+    /**
+     * 设备其他资料
+     */
+    @TableField("DEVICEOTHERINFORMATION")
+    private String deviceotherinformation;
+    /**
+     * 设备安装日期
+     */
+    @TableField("DEVICEINSTALLDATE")
+    private Date deviceinstalldate;
+    /**
+     * 设备开始使用日期
+     */
+    @TableField("DEVICESTARTDATE")
+    private Date devicestartdate;
+    /**
+     * 检验结论
+     */
+    @TableField("INSPECTRESULT")
+    private String inspectresult;
+    /**
+     * 检验机构名称
+     */
+    @TableField("INSPECTBY")
+    private String inspectby;
+    /**
+     * 数据来源(0-普通设备 1-特种设备)
+     */
+    @TableField("SOURCE")
+    private String source;
+    /**
+     * 移交设备ID
+     */
+    @TableField("TRANSFERID")
+    private String transferid;
+    /**
+     * 使用部门车间id
+     */
+    @TableField("USEDEPTID")
+    private String usedeptid;
+    /**
+     * 使用部门车间名称
+     */
+    @TableField("USEDEPTNAME")
+    private String usedeptname;
+    /**
+     * 所属部分
+     */
+    @TableField("BELONGPART")
+    private String belongpart;
+    /**
+     * 设备原价值(万元)
+     */
+    @TableField("RAWVALUE")
+    private BigDecimal rawvalue;
+    /**
+     * 设备性能
+     */
+    @TableField("PROPERTY")
+    private String property;
+    /**
+     * 实际报废时间
+     */
+    @TableField("FACTOBSOLEDATE")
+    private Date factobsoledate;
+    /**
+     * 设备代号
+     */
+    @TableField("EQUIPMENTCODE")
+    private String equipmentcode;
+    /**
+     * 宽度
+     */
+    @TableField("EQUIPMENTWIDTH")
+    private Float equipmentwidth;
+    /**
+     * 长度
+     */
+    @TableField("EQUIPMENTLENGTH")
+    private Float equipmentlength;
+    /**
+     * 高度
+     */
+    @TableField("EQUIPMENTHEIGHT")
+    private Float equipmentheight;
+    /**
+     * 长宽高单位
+     */
+    @TableField("EQUIPMENTUNIT")
+    private String equipmentunit;
+    /**
+     * 容量
+     */
+    @TableField("EQUIPMENTCAPACITY")
+    private Float equipmentcapacity;
+    /**
+     * 承重
+     */
+    @TableField("EQUIPMENTBEARING")
+    private Float equipmentbearing;
+    /**
+     * 承重单位
+     */
+    @TableField("BEARINGUNIT")
+    private String bearingunit;
+
+
+}

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

@@ -0,0 +1,53 @@
+package com.rongwei.bsentity.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * 设备
+ */
+@NoArgsConstructor
+@Data
+public class Equipment{
+
+    private Long id;
+
+    /**
+     * 设备类型
+     */
+    private String equipmentType;
+
+    /**
+     * 设备优先级
+     */
+    private Integer eqOrder;
+
+    /**
+     * 设备所属工厂
+     */
+    private String factory;
+
+    /**
+     * 设备所属车间
+     */
+    private String workshop;
+
+    /**
+     * 设备满负荷物料
+     */
+    private BigDecimal fullMaterial;
+
+    /**
+     * 单位时间生产产品的时间
+     */
+    private Integer unitProductTime;
+
+    public Equipment(long id, String equipmentType) {
+        this.id = id;
+        this.equipmentType = equipmentType;
+    }
+
+}

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

@@ -0,0 +1,41 @@
+package com.rongwei.bsentity.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 生产订单,即输出一种产品
+ */
+@Data
+public class ProduceOrder {
+
+    public ProduceOrder(String id, String orderName, Date deliveryDate){
+        this.id = id;
+        this.orderName = orderName;
+        this.deliveryDate = deliveryDate;
+    }
+
+    /**
+     * 通用标识属性
+     */
+    private String id;
+
+    /**
+     * 订单名称
+     */
+    private String orderName;
+
+    /**
+     * 交货日期
+     */
+    private Date deliveryDate;
+
+    /**
+     * 生产订单的工步集合，有序的
+     */
+    private List<ProductionProcesses> processes;
+
+
+}

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

@@ -0,0 +1,245 @@
+package com.rongwei.bsentity.vo;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 工步，工艺路线里的工步
+ */
+public class ProductionProcesses{
+
+    private Long id;
+
+    public ProductionProcesses(){
+
+    }
+
+    public ProductionProcesses(long id, String equipmentType, List<ProduceOrder> produceOrder, Integer produceTime) {
+        this.id = id;
+        this.equipmentType = equipmentType;
+        this.produceOrder = produceOrder;
+        this.produceTime = produceTime;
+    }
+
+    /**
+     * 业务表订单工序ID
+     */
+    private String bsProcessesId;
+
+    /**
+     * 设备类型
+     */
+    private String equipmentType;
+
+    /**
+     * 工步生产时的设备
+     */
+    private Long equipmentId;
+
+    /**
+     * 工步生产时的设备
+     */
+    private Equipment equipment;
+
+    /**
+     * 所属的生产订单
+     */
+    private List<ProduceOrder> produceOrder;
+
+    /**
+     * 是否瓶颈工序
+     */
+    private Boolean bottleneck;
+
+    /**
+     * 合并生产标识，同样的合并生产标识，尽量一起生产
+     */
+    private String mergeProcessMark;
+
+    /**
+     * 工序流转时间
+     */
+    private Integer circulationTime;
+
+    /**
+     * 下一步工序最小等待生产时间
+     */
+    private Integer minWaitTime;
+
+    /**
+     * 下一步工序最大等待生产时间
+     */
+    private Integer maxWaitTime;
+
+    /**
+     * 当前工步的生产时间(单位是分钟)
+     */
+    private Integer produceTime;
+
+    /**
+     * 开始时间
+     */
+    private LocalDateTime startTime;
+
+    /**
+     * 结束时间
+     */
+    private LocalDateTime endTime;
+
+    /**
+     * 上一个工步
+     */
+    private List<ProductionProcesses> previousProcesses;
+    /**
+     * 上一个工步ID
+     */
+    private List<Long> previousProcessesIds;
+
+    /**
+     * 下一个工步
+     */
+    private List<ProductionProcesses> nextProcesses;
+    /**
+     * 下一个工步ID
+     */
+    private List<Long> nextProcessesIds;
+
+    public String getEquipmentType() {
+        return equipmentType;
+    }
+
+    public void setEquipmentType(String equipmentType) {
+        this.equipmentType = equipmentType;
+    }
+
+    public Equipment getEquipment() {
+        return equipment;
+    }
+
+    public void setEquipment(Equipment equipment) {
+        this.equipment = equipment;
+    }
+
+    public Long getEquipmentId() {
+        return equipmentId;
+    }
+
+    public void setEquipmentId(Long equipmentId) {
+        this.equipmentId = equipmentId;
+    }
+
+    public Integer getProduceTime() {
+        return produceTime;
+    }
+
+    public void setProduceTime(Integer produceTime) {
+        this.produceTime = produceTime;
+    }
+
+    public LocalDateTime getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(LocalDateTime startTime) {
+        this.startTime = startTime;
+        if(startTime != null){
+            this.endTime = startTime.plusMinutes(produceTime);
+        }
+    }
+
+    public LocalDateTime getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(LocalDateTime endTime) {
+        this.endTime = endTime;
+    }
+
+    public List<ProductionProcesses> getPreviousProcesses() {
+        return previousProcesses;
+    }
+
+    public void setPreviousProcesses(List<ProductionProcesses> previousProcesses) {
+        this.previousProcesses = previousProcesses;
+    }
+
+    public List<ProductionProcesses> getNextProcesses() {
+        return nextProcesses;
+    }
+
+    public void setNextProcesses(List<ProductionProcesses> nextProcesses) {
+        this.nextProcesses = nextProcesses;
+    }
+
+    public List<ProduceOrder> getProduceOrder() {
+        return produceOrder;
+    }
+
+    public void setProduceOrder(List<ProduceOrder> produceOrder) {
+        this.produceOrder = produceOrder;
+    }
+
+    public Integer getCirculationTime() {
+        return circulationTime;
+    }
+
+    public void setCirculationTime(Integer circulationTime) {
+        this.circulationTime = circulationTime;
+    }
+
+    public Integer getMinWaitTime() {
+        return minWaitTime;
+    }
+
+    public void setMinWaitTime(Integer minWaitTime) {
+        this.minWaitTime = minWaitTime;
+    }
+
+    public Integer getMaxWaitTime() {
+        return maxWaitTime;
+    }
+
+    public void setMaxWaitTime(Integer maxWaitTime) {
+        this.maxWaitTime = maxWaitTime;
+    }
+
+    public Boolean getBottleneck() {
+        return bottleneck;
+    }
+
+    public void setBottleneck(Boolean bottleneck) {
+        this.bottleneck = bottleneck;
+    }
+
+    public String getMergeProcessMark() {
+        return mergeProcessMark;
+    }
+
+    public void setMergeProcessMark(String mergeProcessMark) {
+        this.mergeProcessMark = mergeProcessMark;
+    }
+
+    public List<Long> getPreviousProcessesIds() {
+        return previousProcessesIds;
+    }
+
+    public void setPreviousProcessesIds(List<Long> previousProcessesIds) {
+        this.previousProcessesIds = previousProcessesIds;
+    }
+
+    public List<Long> getNextProcessesIds() {
+        return nextProcessesIds;
+    }
+
+    public void setNextProcessesIds(List<Long> nextProcessesIds) {
+        this.nextProcessesIds = nextProcessesIds;
+    }
+
+    public String getBsProcessesId() {
+        return bsProcessesId;
+    }
+
+    public void setBsProcessesId(String bsProcessesId) {
+        this.bsProcessesId = bsProcessesId;
+    }
+}

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

@@ -0,0 +1,17 @@
+package com.rongwei.bsentity.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ProductionScheduleRetVo {
+
+    private String scoreResult;
+
+    /**
+     * 排程后的生产工序集合
+     */
+    private List<ProductionProcesses> processes;
+
+}

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

@@ -0,0 +1,26 @@
+package com.rongwei.bsentity.vo;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ProductionScheduleVo {
+
+    /**
+     * 排程标识ID
+     */
+    private String productionScheduleId;
+
+    /**
+     * 生产工序集合
+     */
+    private List<ProductionProcesses> processes;
+
+    /**
+     * 生产设备集合
+     */
+    private List<Equipment> equipmentList;
+
+}

cx-aps/cx-aps-server/pom.xml

@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>com.rongwei</groupId>
-            <artifactId>business-common</artifactId>
+            <artifactId>cx-aps-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 

cx-aps/cx-aps-server/src/main/java/com/rongwei/bsserver/controller/ApsBlankOrderController.java

@@ -0,0 +1,20 @@
+package com.rongwei.bsserver.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 生产订单_坯料计划 前端控制器
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-03-01
+ */
+@RestController
+@RequestMapping("/apsBlankOrder")
+public class ApsBlankOrderController {
+
+}
+

cx-aps/cx-aps-server/src/main/java/com/rongwei/bsserver/controller/ApsProcessOperationController.java

@@ -0,0 +1,20 @@
+package com.rongwei.bsserver.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 生产订单_坯料计划_工序作业 前端控制器
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-03-01
+ */
+@RestController
+@RequestMapping("/apsProcessOperation")
+public class ApsProcessOperationController {
+
+}
+

cx-aps/cx-aps-server/src/main/java/com/rongwei/bsserver/controller/AspCheckItemsController.java

@@ -0,0 +1,20 @@
+package com.rongwei.bsserver.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 设备子系统——设备档案（检查对象表） 前端控制器
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-03-01
+ */
+@RestController
+@RequestMapping("/aspCheckItems")
+public class AspCheckItemsController {
+
+}
+

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/HiddenDangerTrackServiceImpl.java

@@ -56,6 +56,7 @@ public class HiddenDangerTrackServiceImpl extends ServiceImpl<HiddenDangerTrackD
     public IPage<HiddenDangerTrackVo> checkTaskList(QueryPar<Map<String,Object>> queryMap){
         // userid:当前登录用户ID  status:任务状态（10：已关闭；20：未关闭）
         Map<String,Object> map = queryMap.getParameter();
+        StringUtils
         return hiddenDangerTrackDao.checkTaskList(queryMap.getPage(),map.get("userid").toString(), map.get("status").toString());
     }