feature 代码提交

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

@@ -39,6 +39,10 @@
             <artifactId>mysql-connector-java</artifactId>
             <version>${mysql.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+        </dependency>
 
     </dependencies>
-</project>
+</project>

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

@@ -0,0 +1,15 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.ApsCraftEquDo;
+
+/**
+ * @Entity com.rongwei.training.domain.ApsCraftEqu
+ */
+public interface ApsCraftEquDao extends BaseMapper<ApsCraftEquDo> {
+
+}
+
+
+
+

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

@@ -0,0 +1,15 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.ApsCraftRouteDo;
+
+/**
+ * @Entity com.rongwei.training.domain.ApsCraftRoute
+ */
+public interface ApsCraftRouteDao extends BaseMapper<ApsCraftRouteDo> {
+
+}
+
+
+
+

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

@@ -0,0 +1,23 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.ApsCraftRouteOutMaterRequestDo;
+import com.rongwei.bsentity.vo.UpdateApsRouteAboutVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Entity com.rongwei.training.domain.ApsCraftRouteOutMaterRequest
+ */
+public interface ApsCraftRouteOutMaterRequestDao extends BaseMapper<ApsCraftRouteOutMaterRequestDo> {
+
+
+    void removeByIdList(@Param("ids") List<String> ids, @Param("routeId") String routeId);
+
+    void copyDataById(@Param("datas") List<UpdateApsRouteAboutVo> datas, @Param("routeId") String routeId);
+}
+
+
+
+

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

@@ -0,0 +1,15 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.ApsCraftRouteStepDo;
+
+/**
+ * @Entity com.rongwei.training.domain.ApsCraftRouteStep
+ */
+public interface ApsCraftRouteStepDao extends BaseMapper<ApsCraftRouteStepDo> {
+
+}
+
+
+
+

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

@@ -0,0 +1,22 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.ApsCraftRouteStepEquDo;
+import com.rongwei.bsentity.vo.UpdateApsRouteAboutVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Entity com.rongwei.training.domain.ApsCraftRouteStepEqu
+ */
+public interface ApsCraftRouteStepEquDao extends BaseMapper<ApsCraftRouteStepEquDo> {
+
+    void removeByIdList(@Param("ids") List<String> ids,@Param("routeId") String routeId);
+
+    void copyDataById(@Param("datas") List<UpdateApsRouteAboutVo> datas, @Param("routeId") String routeId);
+}
+
+
+
+

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

@@ -0,0 +1,15 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.ApsCraftStepDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Entity com.rongwei.training.domain.ApsCraftStep
+ */
+public interface ApsCraftStepDao extends BaseMapper<ApsCraftStepDo> {
+
+}
+
+
+
+

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

@@ -0,0 +1,15 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.ApsOutMaterRequestDo;
+
+/**
+ * @Entity com.rongwei.training.domain.ApsOutMaterRequest
+ */
+public interface ApsOutMaterRequestDao extends BaseMapper<ApsOutMaterRequestDo> {
+
+}
+
+
+
+

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

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ApsCraftEquDo;
+
+/**
+ *
+ */
+public interface ApsCraftEquService extends IService<ApsCraftEquDo> {
+
+}

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

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ApsCraftRouteOutMaterRequestDo;
+
+/**
+ *
+ */
+public interface ApsCraftRouteOutMaterRequestService extends IService<ApsCraftRouteOutMaterRequestDo> {
+
+}

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

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ApsCraftRouteDo;
+
+/**
+ *
+ */
+public interface ApsCraftRouteService extends IService<ApsCraftRouteDo> {
+
+}

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

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ApsCraftRouteStepEquDo;
+
+/**
+ *
+ */
+public interface ApsCraftRouteStepEquService extends IService<ApsCraftRouteStepEquDo> {
+
+}

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

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ApsCraftRouteStepDo;
+
+/**
+ *
+ */
+public interface ApsCraftRouteStepService extends IService<ApsCraftRouteStepDo> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ApsCraftStepDo;
+import com.rongwei.bsentity.vo.UpdateApsRouteAboutVo;
+import com.rongwei.rwcommon.base.R;
+
+import java.util.List;
+
+/**
+ *
+ */
+public interface ApsCraftStepService extends IService<ApsCraftStepDo> {
+
+    R updateApsRouteAboutVos(List<UpdateApsRouteAboutVo> updateApsRouteAboutVos,String routeId);
+
+}

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

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ApsOutMaterRequestDo;
+
+/**
+ *
+ */
+public interface ApsOutMaterRequestService extends IService<ApsOutMaterRequestDo> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.ApsCraftEquDao;
+import com.rongwei.bscommon.sys.service.ApsCraftEquService;
+import com.rongwei.bsentity.domain.ApsCraftEquDo;
+
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class ApsCraftEquServiceImpl extends ServiceImpl<ApsCraftEquDao, ApsCraftEquDo> implements ApsCraftEquService {
+
+}
+
+
+
+

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

@@ -0,0 +1,24 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.ApsCraftRouteOutMaterRequestDao;
+import com.rongwei.bscommon.sys.service.ApsCraftRouteOutMaterRequestService;
+import com.rongwei.bsentity.domain.ApsCraftRouteOutMaterRequestDo;
+
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class ApsCraftRouteOutMaterRequestServiceImpl extends ServiceImpl<ApsCraftRouteOutMaterRequestDao, ApsCraftRouteOutMaterRequestDo>
+        implements ApsCraftRouteOutMaterRequestService {
+
+
+
+
+}
+
+
+
+

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

@@ -0,0 +1,21 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.ApsCraftRouteDao;
+import com.rongwei.bscommon.sys.service.ApsCraftRouteService;
+import com.rongwei.bsentity.domain.ApsCraftRouteDo;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class ApsCraftRouteServiceImpl extends ServiceImpl<ApsCraftRouteDao, ApsCraftRouteDo>
+        implements ApsCraftRouteService {
+
+}
+
+
+
+

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

@@ -0,0 +1,21 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import com.rongwei.bscommon.sys.dao.ApsCraftRouteStepEquDao;
+import com.rongwei.bscommon.sys.service.ApsCraftRouteStepEquService;
+import com.rongwei.bsentity.domain.ApsCraftRouteStepEquDo;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class ApsCraftRouteStepEquServiceImpl extends ServiceImpl<ApsCraftRouteStepEquDao, ApsCraftRouteStepEquDo>
+implements ApsCraftRouteStepEquService {
+
+}
+
+
+
+

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

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.ApsCraftRouteStepDao;
+import com.rongwei.bscommon.sys.service.ApsCraftRouteStepService;
+import com.rongwei.bsentity.domain.ApsCraftRouteStepDo;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class ApsCraftRouteStepServiceImpl extends ServiceImpl<ApsCraftRouteStepDao, ApsCraftRouteStepDo>
+        implements ApsCraftRouteStepService {
+
+}
+
+
+
+

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

@@ -0,0 +1,76 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.ApsCraftRouteOutMaterRequestDao;
+import com.rongwei.bscommon.sys.dao.ApsCraftRouteStepEquDao;
+import com.rongwei.bscommon.sys.dao.ApsCraftStepDao;
+import com.rongwei.bscommon.sys.service.ApsCraftStepService;
+import com.rongwei.bsentity.domain.ApsCraftRouteStepDo;
+import com.rongwei.bsentity.domain.ApsCraftStepDo;
+import com.rongwei.bsentity.vo.UpdateApsRouteAboutVo;
+import com.rongwei.rwcommon.base.R;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ *
+ */
+@Service
+public class ApsCraftStepServiceImpl extends ServiceImpl<ApsCraftStepDao, ApsCraftStepDo>
+        implements ApsCraftStepService {
+    private final Logger log = LoggerFactory.getLogger(this.getClass().getName());
+    @Autowired
+    private ApsCraftRouteStepEquDao apsCraftRouteStepEquDao;
+    @Autowired
+    private ApsCraftRouteOutMaterRequestDao apsCraftRouteOutMaterRequestDao;
+
+    // 删除标识
+    public static final String DELTED_ROW_STATUS = "delete";
+    // 更新标识
+    public static final String ADD_ROW_STATUS = "add";
+    // 修改标识
+    public static final String EDIT_ROW_STATUS = "edit";
+
+
+    /**
+     * 保存工艺路线时 更新相关数据
+     *
+     * @param updateApsRouteAboutVos
+     * @return
+     */
+    @Override
+    public R updateApsRouteAboutVos(List<UpdateApsRouteAboutVo> updateApsRouteAboutVos, String routeId) {
+        log.debug("开始更新该工艺路线相关信息");
+        if (updateApsRouteAboutVos == null || updateApsRouteAboutVos.isEmpty()) {
+            return R.ok();
+        }
+        // 获取需要删除工艺步骤ID 数据更新先删除在更新
+        List<String> deletedIds = updateApsRouteAboutVos.stream()
+                .filter(info -> DELTED_ROW_STATUS.equals(info.getRowStatus()) || EDIT_ROW_STATUS.equals(info.getRowStatus()))
+                .map(ApsCraftRouteStepDo::getId).collect(Collectors.toList());
+        if (!deletedIds.isEmpty()) {
+            apsCraftRouteStepEquDao.removeByIdList(deletedIds, routeId);
+            apsCraftRouteOutMaterRequestDao.removeByIdList(deletedIds, routeId);
+        }
+        // 如下工艺步骤需要新增对应的  步骤设备和步骤输出规则
+        List<UpdateApsRouteAboutVo> addStepAboutData = updateApsRouteAboutVos.stream()
+                .filter(info -> ADD_ROW_STATUS.equals(info.getRowStatus()) || EDIT_ROW_STATUS.equals(info.getRowStatus()))
+                .collect(Collectors.toList());
+
+        if(addStepAboutData.isEmpty()){
+            apsCraftRouteStepEquDao.copyDataById(addStepAboutData,routeId);
+            apsCraftRouteOutMaterRequestDao.copyDataById(addStepAboutData,routeId);
+        }
+
+        return R.ok();
+    }
+}
+
+
+
+

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

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.ApsOutMaterRequestDao;
+import com.rongwei.bscommon.sys.service.ApsOutMaterRequestService;
+import com.rongwei.bsentity.domain.ApsOutMaterRequestDo;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class ApsOutMaterRequestServiceImpl extends ServiceImpl<ApsOutMaterRequestDao, ApsOutMaterRequestDo>
+        implements ApsOutMaterRequestService {
+
+}
+
+
+
+

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsCraftEquMapper.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rongwei.bscommon.sys.dao.ApsCraftEquDao">
+
+    <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.ApsCraftEquDo">
+            <id property="id" column="ID" jdbcType="VARCHAR"/>
+            <result property="tenantid" column="TENANTID" jdbcType="VARCHAR"/>
+            <result property="roption" column="ROPTION" jdbcType="VARCHAR"/>
+            <result property="deleted" column="DELETED" jdbcType="VARCHAR"/>
+            <result property="remark" column="REMARK" jdbcType="VARCHAR"/>
+            <result property="createdate" column="CREATEDATE" jdbcType="TIMESTAMP"/>
+            <result property="createuserid" column="CREATEUSERID" jdbcType="VARCHAR"/>
+            <result property="modifydate" column="MODIFYDATE" jdbcType="TIMESTAMP"/>
+            <result property="modifyuserid" column="MODIFYUSERID" jdbcType="VARCHAR"/>
+            <result property="createusername" column="CREATEUSERNAME" jdbcType="VARCHAR"/>
+            <result property="modifyusername" column="MODIFYUSERNAME" jdbcType="VARCHAR"/>
+            <result property="mainid" column="MAINID" jdbcType="VARCHAR"/>
+            <result property="resourceid" column="RESOURCEID" jdbcType="VARCHAR"/>
+            <result property="resourcetype" column="RESOURCETYPE" jdbcType="VARCHAR"/>
+            <result property="equparames" column="EQUPARAMES" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,TENANTID,ROPTION,
+        DELETED,REMARK,CREATEDATE,
+        CREATEUSERID,MODIFYDATE,MODIFYUSERID,
+        CREATEUSERNAME,MODIFYUSERNAME,MAINID,
+        RESOURCEID,RESOURCETYPE,EQUPARAMES
+    </sql>
+</mapper>

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsCraftRouteMapper.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rongwei.bscommon.sys.dao.ApsCraftRouteDao">
+
+    <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.ApsCraftRouteDo">
+        <id property="id" column="ID" jdbcType="VARCHAR"/>
+        <result property="tenantid" column="TENANTID" jdbcType="VARCHAR"/>
+        <result property="roption" column="ROPTION" jdbcType="VARCHAR"/>
+        <result property="deleted" column="DELETED" jdbcType="VARCHAR"/>
+        <result property="remark" column="REMARK" jdbcType="VARCHAR"/>
+        <result property="createdate" column="CREATEDATE" jdbcType="TIMESTAMP"/>
+        <result property="createuserid" column="CREATEUSERID" jdbcType="VARCHAR"/>
+        <result property="modifydate" column="MODIFYDATE" jdbcType="TIMESTAMP"/>
+        <result property="modifyuserid" column="MODIFYUSERID" jdbcType="VARCHAR"/>
+        <result property="createusername" column="CREATEUSERNAME" jdbcType="VARCHAR"/>
+        <result property="modifyusername" column="MODIFYUSERNAME" jdbcType="VARCHAR"/>
+        <result property="ownedfactory" column="OWNEDFACTORY" jdbcType="VARCHAR"/>
+        <result property="routenum" column="ROUTENUM" jdbcType="VARCHAR"/>
+        <result property="routename" column="ROUTENAME" jdbcType="VARCHAR"/>
+        <result property="blanktype" column="BLANKTYPE" jdbcType="VARCHAR"/>
+        <result property="materialcode" column="MATERIALCODE" jdbcType="VARCHAR"/>
+        <result property="materialname" column="MATERIALNAME" jdbcType="VARCHAR"/>
+        <result property="producttype" column="PRODUCTTYPE" jdbcType="VARCHAR"/>
+        <result property="producttypename" column="PRODUCTTYPENAME" jdbcType="VARCHAR"/>
+        <result property="metal" column="METAL" jdbcType="VARCHAR"/>
+        <result property="metalstate" column="METALSTATE" jdbcType="VARCHAR"/>
+        <result property="thickstr" column="THICKSTR" jdbcType="DECIMAL"/>
+        <result property="thickend" column="THICKEND" jdbcType="DECIMAL"/>
+        <result property="widthstr" column="WIDTHSTR" jdbcType="DECIMAL"/>
+        <result property="widthend" column="WIDTHEND" jdbcType="DECIMAL"/>
+        <result property="lengthstr" column="LENGTHSTR" jdbcType="DECIMAL"/>
+        <result property="lengthend" column="LENGTHEND" jdbcType="DECIMAL"/>
+        <result property="inmatercondition" column="INMATERCONDITION" jdbcType="VARCHAR"/>
+        <result property="outmaterrequest" column="OUTMATERREQUEST" jdbcType="VARCHAR"/>
+        <result property="firststepid" column="FIRSTSTEPID" jdbcType="VARCHAR"/>
+        <result property="laststepids" column="LASTSTEPIDS" jdbcType="VARCHAR"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        ID,TENANTID,ROPTION,
+        DELETED,REMARK,CREATEDATE,
+        CREATEUSERID,MODIFYDATE,MODIFYUSERID,
+        CREATEUSERNAME,MODIFYUSERNAME,OWNEDFACTORY,
+        ROUTENUM,ROUTENAME,BLANKTYPE,
+        MATERIALCODE,MATERIALNAME,PRODUCTTYPE,
+        PRODUCTTYPENAME,METAL,METALSTATE,
+        THICKSTR,THICKEND,WIDTHSTR,
+        WIDTHEND,LENGTHSTR,LENGTHEND,
+        INMATERCONDITION,OUTMATERREQUEST,FIRSTSTEPID,
+        LASTSTEPIDS
+    </sql>
+</mapper>

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsCraftRouteOutMaterRequestMapper.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rongwei.bscommon.sys.dao.ApsCraftRouteOutMaterRequestDao">
+
+    <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.ApsCraftRouteOutMaterRequestDo">
+            <id property="id" column="ID" jdbcType="VARCHAR"/>
+            <result property="tenantid" column="TENANTID" jdbcType="VARCHAR"/>
+            <result property="roption" column="ROPTION" jdbcType="VARCHAR"/>
+            <result property="deleted" column="DELETED" jdbcType="VARCHAR"/>
+            <result property="remark" column="REMARK" jdbcType="VARCHAR"/>
+            <result property="createdate" column="CREATEDATE" jdbcType="TIMESTAMP"/>
+            <result property="createuserid" column="CREATEUSERID" jdbcType="VARCHAR"/>
+            <result property="modifydate" column="MODIFYDATE" jdbcType="TIMESTAMP"/>
+            <result property="modifyuserid" column="MODIFYUSERID" jdbcType="VARCHAR"/>
+            <result property="createusername" column="CREATEUSERNAME" jdbcType="VARCHAR"/>
+            <result property="modifyusername" column="MODIFYUSERNAME" jdbcType="VARCHAR"/>
+            <result property="datano" column="DATANO" jdbcType="INTEGER"/>
+            <result property="craftrouteid" column="CRAFTROUTEID" jdbcType="VARCHAR"/>
+            <result property="craftstepid" column="CRAFTSTEPID" jdbcType="VARCHAR"/>
+            <result property="materialcode" column="MATERIALCODE" jdbcType="VARCHAR"/>
+            <result property="materialname" column="MATERIALNAME" jdbcType="VARCHAR"/>
+            <result property="thickrule" column="THICKRULE" jdbcType="VARCHAR"/>
+            <result property="thickchange" column="THICKCHANGE" jdbcType="DECIMAL"/>
+            <result property="thickoffset" column="THICKOFFSET" jdbcType="VARCHAR"/>
+            <result property="thickstr" column="THICKSTR" jdbcType="DECIMAL"/>
+            <result property="thickend" column="THICKEND" jdbcType="DECIMAL"/>
+            <result property="thickremark" column="THICKREMARK" jdbcType="VARCHAR"/>
+            <result property="widthrule" column="WIDTHRULE" jdbcType="VARCHAR"/>
+            <result property="widthchange" column="WIDTHCHANGE" jdbcType="DECIMAL"/>
+            <result property="widthoffset" column="WIDTHOFFSET" jdbcType="VARCHAR"/>
+            <result property="widthstr" column="WIDTHSTR" jdbcType="DECIMAL"/>
+            <result property="widthend" column="WIDTHEND" jdbcType="DECIMAL"/>
+            <result property="widthremark" column="WIDTHREMARK" jdbcType="VARCHAR"/>
+            <result property="lengthrule" column="LENGTHRULE" jdbcType="VARCHAR"/>
+            <result property="lengthchange" column="LENGTHCHANGE" jdbcType="DECIMAL"/>
+            <result property="lengthoffset" column="LENGTHOFFSET" jdbcType="VARCHAR"/>
+            <result property="lengthstr" column="LENGTHSTR" jdbcType="DECIMAL"/>
+            <result property="lengthend" column="LENGTHEND" jdbcType="DECIMAL"/>
+            <result property="lengthremark" column="LENGTHREMARK" jdbcType="VARCHAR"/>
+            <result property="outval" column="OUTVAL" jdbcType="DECIMAL"/>
+            <result property="outmaterrequest" column="OUTMATERREQUEST" jdbcType="VARCHAR"/>
+            <result property="producttyperuleid" column="PRODUCTTYPERULEID" jdbcType="VARCHAR"/>
+            <result property="producttyperule" column="PRODUCTTYPERULE" jdbcType="VARCHAR"/>
+            <result property="producttypeid" column="PRODUCTTYPEID" jdbcType="VARCHAR"/>
+            <result property="producttype" column="PRODUCTTYPE" jdbcType="VARCHAR"/>
+            <result property="metalrule" column="METALRULE" jdbcType="VARCHAR"/>
+            <result property="metal" column="METAL" jdbcType="VARCHAR"/>
+            <result property="metalstaterule" column="METALSTATERULE" jdbcType="VARCHAR"/>
+            <result property="metalstate" column="METALSTATE" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,TENANTID,ROPTION,
+        DELETED,REMARK,CREATEDATE,
+        CREATEUSERID,MODIFYDATE,MODIFYUSERID,
+        CREATEUSERNAME,MODIFYUSERNAME,DATANO,
+        CRAFTROUTEID,CRAFTSTEPID,MATERIALCODE,
+        MATERIALNAME,THICKRULE,THICKCHANGE,
+        THICKOFFSET,THICKSTR,THICKEND,
+        THICKREMARK,WIDTHRULE,WIDTHCHANGE,
+        WIDTHOFFSET,WIDTHSTR,WIDTHEND,
+        WIDTHREMARK,LENGTHRULE,LENGTHCHANGE,
+        LENGTHOFFSET,LENGTHSTR,LENGTHEND,
+        LENGTHREMARK,OUTVAL,OUTMATERREQUEST,
+        PRODUCTTYPERULEID,PRODUCTTYPERULE,PRODUCTTYPEID,
+        PRODUCTTYPE,METALRULE,METAL,
+        METALSTATERULE,METALSTATE
+    </sql>
+    <delete id="removeByIdList">
+        DELETE FROM aps_craft_route_out_mater_request
+        <where>
+            CRAFTROUTEID = #{routeId} AND CRAFTSTEPID IN
+            <foreach collection="ids" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </where>
+    </delete>
+    <insert id="copyDataById">
+        <foreach collection="datas" item="data" open="" close="" separator=";">
+            INSERT INTO aps_craft_route_out_mater_request (TENANTID, ID, ROPTION, DELETED, REMARK, CREATEDATE, CREATEUSERID,
+            MODIFYDATE, MODIFYUSERID, CREATEUSERNAME, MODIFYUSERNAME, DATANO, CRAFTROUTEID, CRAFTSTEPID, MATERIALCODE,
+            MATERIALNAME, THICKRULE, THICKCHANGE, THICKOFFSET, THICKSTR, THICKEND, THICKREMARK, WIDTHRULE, WIDTHCHANGE,
+            WIDTHOFFSET, WIDTHSTR, WIDTHEND, WIDTHREMARK, LENGTHRULE, LENGTHCHANGE, LENGTHOFFSET, LENGTHSTR, LENGTHEND,
+            LENGTHREMARK, OUTVAL, OUTMATERREQUEST, PRODUCTTYPERULEID, PRODUCTTYPERULE, PRODUCTTYPEID, PRODUCTTYPE, METALRULE,
+            METAL, METALSTATERULE, METALSTATE)
+            SELECT TENANTID, UUID(), ROPTION, DELETED, REMARK, NOW(), CREATEUSERID, NOW(), MODIFYUSERID, CREATEUSERNAME,
+            MODIFYUSERNAME, DATANO,   #{routeId}, #{data.ID} , MATERIALCODE,
+            MATERIALNAME, THICKRULE, THICKCHANGE, THICKOFFSET, THICKSTR, THICKEND, THICKREMARK, WIDTHRULE, WIDTHCHANGE, WIDTHOFFSET,
+            WIDTHSTR, WIDTHEND, WIDTHREMARK, LENGTHRULE, LENGTHCHANGE, LENGTHOFFSET, LENGTHSTR, LENGTHEND, LENGTHREMARK, OUTVAL,
+            OUTMATERREQUEST, PRODUCTTYPERULEID, PRODUCTTYPERULE, PRODUCTTYPEID, PRODUCTTYPE, METALRULE, METAL, METALSTATERULE,
+            METALSTATE FROM aps_out_mater_request WHERE MAINID = #{data.CRAFTSTEPID} and deleted='0'
+        </foreach>
+    </insert>
+</mapper>

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsCraftRouteStepEquMapper.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rongwei.bscommon.sys.dao.ApsCraftRouteStepEquDao">
+
+    <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.ApsCraftRouteStepEquDo">
+            <id property="id" column="ID" jdbcType="VARCHAR"/>
+            <result property="tenantid" column="TENANTID" jdbcType="VARCHAR"/>
+            <result property="roption" column="ROPTION" jdbcType="VARCHAR"/>
+            <result property="deleted" column="DELETED" jdbcType="VARCHAR"/>
+            <result property="remark" column="REMARK" jdbcType="VARCHAR"/>
+            <result property="createdate" column="CREATEDATE" jdbcType="TIMESTAMP"/>
+            <result property="createuserid" column="CREATEUSERID" jdbcType="VARCHAR"/>
+            <result property="modifydate" column="MODIFYDATE" jdbcType="TIMESTAMP"/>
+            <result property="modifyuserid" column="MODIFYUSERID" jdbcType="VARCHAR"/>
+            <result property="createusername" column="CREATEUSERNAME" jdbcType="VARCHAR"/>
+            <result property="modifyusername" column="MODIFYUSERNAME" jdbcType="VARCHAR"/>
+            <result property="craftrouteid" column="CRAFTROUTEID" jdbcType="VARCHAR"/>
+            <result property="craftstepid" column="CRAFTSTEPID" jdbcType="VARCHAR"/>
+            <result property="resourceid" column="RESOURCEID" jdbcType="VARCHAR"/>
+            <result property="resourcetype" column="RESOURCETYPE" jdbcType="VARCHAR"/>
+            <result property="equparames" column="EQUPARAMES" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,TENANTID,ROPTION,
+        DELETED,REMARK,CREATEDATE,
+        CREATEUSERID,MODIFYDATE,MODIFYUSERID,
+        CREATEUSERNAME,MODIFYUSERNAME,CRAFTROUTEID,
+        CRAFTSTEPID,RESOURCEID,RESOURCETYPE,
+        EQUPARAMES
+    </sql>
+    <delete id="removeByIdList">
+        DELETE FROM aps_craft_route_step_equ
+        <where>
+            CRAFTROUTEID = #{routeId} AND CRAFTSTEPID IN
+            <foreach collection="ids" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </where>
+    </delete>
+    <insert id="copyDataById">
+        <foreach collection="datas" item="data" open="" close="" separator=";">
+            INSERT INTO aps_craft_route_step_equ (ID, TENANTID, ROPTION, DELETED, REMARK, CREATEDATE, CREATEUSERID,
+            MODIFYDATE, MODIFYUSERID, CREATEUSERNAME, MODIFYUSERNAME, CRAFTROUTEID, CRAFTSTEPID, RESOURCEID, RESOURCETYPE,
+            EQUPARAMES)
+            SELECT UUID()  , TENANTID, ROPTION, DELETED, REMARK, NOW(), CREATEUSERID, NOW(), MODIFYUSERID, CREATEUSERNAME,
+            MODIFYUSERNAME, #{routeId},#{data.ID} ,RESOURCEID , RESOURCETYPE, EQUPARAMES
+            FROM aps_craft_equ  WHERE MAINID = #{data.CRAFTSTEPID}
+        </foreach>
+    </insert>
+</mapper>

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsCraftRouteStepMapper.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rongwei.bscommon.sys.dao.ApsCraftRouteStepDao">
+
+    <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.ApsCraftRouteStepDo">
+        <id property="id" column="ID" jdbcType="VARCHAR"/>
+        <result property="tenantid" column="TENANTID" jdbcType="VARCHAR"/>
+        <result property="roption" column="ROPTION" jdbcType="VARCHAR"/>
+        <result property="deleted" column="DELETED" jdbcType="VARCHAR"/>
+        <result property="remark" column="REMARK" jdbcType="VARCHAR"/>
+        <result property="createdate" column="CREATEDATE" jdbcType="TIMESTAMP"/>
+        <result property="createuserid" column="CREATEUSERID" jdbcType="VARCHAR"/>
+        <result property="modifydate" column="MODIFYDATE" jdbcType="TIMESTAMP"/>
+        <result property="modifyuserid" column="MODIFYUSERID" jdbcType="VARCHAR"/>
+        <result property="createusername" column="CREATEUSERNAME" jdbcType="VARCHAR"/>
+        <result property="modifyusername" column="MODIFYUSERNAME" jdbcType="VARCHAR"/>
+        <result property="ownedfactory" column="OWNEDFACTORY" jdbcType="VARCHAR"/>
+        <result property="craftstepid" column="CRAFTSTEPID" jdbcType="VARCHAR"/>
+        <result property="craftrouteid" column="CRAFTROUTEID" jdbcType="VARCHAR"/>
+        <result property="stepnum" column="STEPNUM" jdbcType="VARCHAR"/>
+        <result property="process" column="PROCESS" jdbcType="VARCHAR"/>
+        <result property="processname" column="PROCESSNAME" jdbcType="VARCHAR"/>
+        <result property="processway" column="PROCESSWAY" jdbcType="VARCHAR"/>
+        <result property="numunit" column="NUMUNIT" jdbcType="VARCHAR"/>
+        <result property="onceprocessval" column="ONCEPROCESSVAL" jdbcType="DECIMAL"/>
+        <result property="onceprocessmin" column="ONCEPROCESSMIN" jdbcType="DECIMAL"/>
+        <result property="pertimecapacity" column="PERTIMECAPACITY" jdbcType="DECIMAL"/>
+        <result property="timeunit" column="TIMEUNIT" jdbcType="VARCHAR"/>
+        <result property="prepressworkmin" column="PREPRESSWORKMIN" jdbcType="DECIMAL"/>
+        <result property="loadingmin" column="LOADINGMIN" jdbcType="DECIMAL"/>
+        <result property="cuttingmin" column="CUTTINGMIN" jdbcType="DECIMAL"/>
+        <result property="cutfinishmin" column="CUTFINISHMIN" jdbcType="DECIMAL"/>
+        <result property="minflowbatch" column="MINFLOWBATCH" jdbcType="DECIMAL"/>
+        <result property="minflowwaitmin" column="MINFLOWWAITMIN" jdbcType="DECIMAL"/>
+        <result property="maxflowwaitmin" column="MAXFLOWWAITMIN" jdbcType="DECIMAL"/>
+        <result property="ifblankprocess" column="IFBLANKPROCESS" jdbcType="VARCHAR"/>
+        <result property="materialcode" column="MATERIALCODE" jdbcType="VARCHAR"/>
+        <result property="materialname" column="MATERIALNAME" jdbcType="VARCHAR"/>
+        <result property="producttypeid" column="PRODUCTTYPEID" jdbcType="VARCHAR"/>
+        <result property="producttype" column="PRODUCTTYPE" jdbcType="VARCHAR"/>
+        <result property="metal" column="METAL" jdbcType="VARCHAR"/>
+        <result property="metalstate" column="METALSTATE" jdbcType="VARCHAR"/>
+        <result property="thickstr" column="THICKSTR" jdbcType="DECIMAL"/>
+        <result property="thickend" column="THICKEND" jdbcType="DECIMAL"/>
+        <result property="widthstr" column="WIDTHSTR" jdbcType="DECIMAL"/>
+        <result property="widthend" column="WIDTHEND" jdbcType="DECIMAL"/>
+        <result property="lengthstr" column="LENGTHSTR" jdbcType="DECIMAL"/>
+        <result property="lengthend" column="LENGTHEND" jdbcType="DECIMAL"/>
+        <result property="inmatercondition" column="INMATERCONDITION" jdbcType="VARCHAR"/>
+        <result property="outmaterrequest" column="OUTMATERREQUEST" jdbcType="VARCHAR"/>
+        <result property="chooseequ" column="CHOOSEEQU" jdbcType="VARCHAR"/>
+        <result property="previousstepid" column="PREVIOUSSTEPID" jdbcType="VARCHAR"/>
+        <result property="nextstepid" column="NEXTSTEPID" jdbcType="VARCHAR"/>
+        <result property="previousstepname" column="PREVIOUSSTEPNAME" jdbcType="VARCHAR"/>
+        <result property="nextstepname" column="NEXTSTEPNAME" jdbcType="VARCHAR"/>
+        <result property="level" column="LEVEL" jdbcType="INTEGER"/>
+        <result property="inputmaterid" column="INPUTMATERID" jdbcType="VARCHAR"/>
+        <result property="inputvolume" column="INPUTVOLUME" jdbcType="OTHER"/>
+        <result property="oldinputmaterid" column="OLDINPUTMATERID" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,TENANTID,ROPTION,
+        DELETED,REMARK,CREATEDATE,
+        CREATEUSERID,MODIFYDATE,MODIFYUSERID,
+        CREATEUSERNAME,MODIFYUSERNAME,OWNEDFACTORY,
+        CRAFTSTEPID,CRAFTROUTEID,STEPNUM,
+        PROCESS,PROCESSNAME,PROCESSWAY,
+        NUMUNIT,ONCEPROCESSVAL,ONCEPROCESSMIN,
+        PERTIMECAPACITY,TIMEUNIT,PREPRESSWORKMIN,
+        LOADINGMIN,CUTTINGMIN,CUTFINISHMIN,
+        MINFLOWBATCH,MINFLOWWAITMIN,MAXFLOWWAITMIN,
+        IFBLANKPROCESS,MATERIALCODE,MATERIALNAME,
+        PRODUCTTYPEID,PRODUCTTYPE,METAL,
+        METALSTATE,THICKSTR,THICKEND,
+        WIDTHSTR,WIDTHEND,LENGTHSTR,
+        LENGTHEND,INMATERCONDITION,OUTMATERREQUEST,
+        CHOOSEEQU,PREVIOUSSTEPID,NEXTSTEPID,
+        PREVIOUSSTEPNAME,NEXTSTEPNAME,LEVEL,
+        INPUTMATERID,INPUTVOLUME,OLDINPUTMATERID
+    </sql>
+</mapper>

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsCraftStepMapper.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rongwei.bscommon.sys.dao.ApsCraftStepDao">
+
+    <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.ApsCraftStepDo">
+            <id property="id" column="ID" jdbcType="VARCHAR"/>
+            <result property="tenantid" column="TENANTID" jdbcType="VARCHAR"/>
+            <result property="roption" column="ROPTION" jdbcType="VARCHAR"/>
+            <result property="deleted" column="DELETED" jdbcType="VARCHAR"/>
+            <result property="remark" column="REMARK" jdbcType="VARCHAR"/>
+            <result property="createdate" column="CREATEDATE" jdbcType="TIMESTAMP"/>
+            <result property="createuserid" column="CREATEUSERID" jdbcType="VARCHAR"/>
+            <result property="modifydate" column="MODIFYDATE" jdbcType="TIMESTAMP"/>
+            <result property="modifyuserid" column="MODIFYUSERID" jdbcType="VARCHAR"/>
+            <result property="createusername" column="CREATEUSERNAME" jdbcType="VARCHAR"/>
+            <result property="modifyusername" column="MODIFYUSERNAME" jdbcType="VARCHAR"/>
+            <result property="ownedfactory" column="OWNEDFACTORY" jdbcType="VARCHAR"/>
+            <result property="stepnum" column="STEPNUM" jdbcType="VARCHAR"/>
+            <result property="process" column="PROCESS" jdbcType="VARCHAR"/>
+            <result property="processname" column="PROCESSNAME" jdbcType="VARCHAR"/>
+            <result property="processway" column="PROCESSWAY" jdbcType="VARCHAR"/>
+            <result property="numunit" column="NUMUNIT" jdbcType="VARCHAR"/>
+            <result property="onceprocessval" column="ONCEPROCESSVAL" jdbcType="DECIMAL"/>
+            <result property="onceprocessmin" column="ONCEPROCESSMIN" jdbcType="DECIMAL"/>
+            <result property="pertimecapacity" column="PERTIMECAPACITY" jdbcType="DECIMAL"/>
+            <result property="timeunit" column="TIMEUNIT" jdbcType="VARCHAR"/>
+            <result property="prepressworkmin" column="PREPRESSWORKMIN" jdbcType="DECIMAL"/>
+            <result property="loadingmin" column="LOADINGMIN" jdbcType="DECIMAL"/>
+            <result property="cuttingmin" column="CUTTINGMIN" jdbcType="DECIMAL"/>
+            <result property="cutfinishmin" column="CUTFINISHMIN" jdbcType="DECIMAL"/>
+            <result property="minflowbatch" column="MINFLOWBATCH" jdbcType="DECIMAL"/>
+            <result property="minflowwaitmin" column="MINFLOWWAITMIN" jdbcType="DECIMAL"/>
+            <result property="maxflowwaitmin" column="MAXFLOWWAITMIN" jdbcType="DECIMAL"/>
+            <result property="ifblankprocess" column="IFBLANKPROCESS" jdbcType="VARCHAR"/>
+            <result property="materialcode" column="MATERIALCODE" jdbcType="VARCHAR"/>
+            <result property="materialname" column="MATERIALNAME" jdbcType="VARCHAR"/>
+            <result property="producttypeid" column="PRODUCTTYPEID" jdbcType="VARCHAR"/>
+            <result property="producttype" column="PRODUCTTYPE" jdbcType="VARCHAR"/>
+            <result property="metal" column="METAL" jdbcType="VARCHAR"/>
+            <result property="metalstate" column="METALSTATE" jdbcType="VARCHAR"/>
+            <result property="thickstr" column="THICKSTR" jdbcType="DECIMAL"/>
+            <result property="thickend" column="THICKEND" jdbcType="DECIMAL"/>
+            <result property="widthstr" column="WIDTHSTR" jdbcType="DECIMAL"/>
+            <result property="widthend" column="WIDTHEND" jdbcType="DECIMAL"/>
+            <result property="lengthstr" column="LENGTHSTR" jdbcType="DECIMAL"/>
+            <result property="lengthend" column="LENGTHEND" jdbcType="DECIMAL"/>
+            <result property="inmatercondition" column="INMATERCONDITION" jdbcType="VARCHAR"/>
+            <result property="outmaterrequest" column="OUTMATERREQUEST" jdbcType="VARCHAR"/>
+            <result property="chooseequ" column="CHOOSEEQU" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,TENANTID,ROPTION,
+        DELETED,REMARK,CREATEDATE,
+        CREATEUSERID,MODIFYDATE,MODIFYUSERID,
+        CREATEUSERNAME,MODIFYUSERNAME,OWNEDFACTORY,
+        STEPNUM,PROCESS,PROCESSNAME,
+        PROCESSWAY,NUMUNIT,ONCEPROCESSVAL,
+        ONCEPROCESSMIN,PERTIMECAPACITY,TIMEUNIT,
+        PREPRESSWORKMIN,LOADINGMIN,CUTTINGMIN,
+        CUTFINISHMIN,MINFLOWBATCH,MINFLOWWAITMIN,
+        MAXFLOWWAITMIN,IFBLANKPROCESS,MATERIALCODE,
+        MATERIALNAME,PRODUCTTYPEID,PRODUCTTYPE,
+        METAL,METALSTATE,THICKSTR,
+        THICKEND,WIDTHSTR,WIDTHEND,
+        LENGTHSTR,LENGTHEND,INMATERCONDITION,
+        OUTMATERREQUEST,CHOOSEEQU
+    </sql>
+</mapper>

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsOutMaterRequestMapper.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rongwei.bscommon.sys.dao.ApsOutMaterRequestDao">
+
+    <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.ApsOutMaterRequestDo">
+            <id property="id" column="ID" jdbcType="VARCHAR"/>
+            <result property="tenantid" column="TENANTID" jdbcType="VARCHAR"/>
+            <result property="roption" column="ROPTION" jdbcType="VARCHAR"/>
+            <result property="deleted" column="DELETED" jdbcType="VARCHAR"/>
+            <result property="remark" column="REMARK" jdbcType="VARCHAR"/>
+            <result property="createdate" column="CREATEDATE" jdbcType="TIMESTAMP"/>
+            <result property="createuserid" column="CREATEUSERID" jdbcType="VARCHAR"/>
+            <result property="modifydate" column="MODIFYDATE" jdbcType="TIMESTAMP"/>
+            <result property="modifyuserid" column="MODIFYUSERID" jdbcType="VARCHAR"/>
+            <result property="createusername" column="CREATEUSERNAME" jdbcType="VARCHAR"/>
+            <result property="modifyusername" column="MODIFYUSERNAME" jdbcType="VARCHAR"/>
+            <result property="datano" column="DATANO" jdbcType="INTEGER"/>
+            <result property="mainid" column="MAINID" jdbcType="VARCHAR"/>
+            <result property="materialcode" column="MATERIALCODE" jdbcType="VARCHAR"/>
+            <result property="materialname" column="MATERIALNAME" jdbcType="VARCHAR"/>
+            <result property="producttyperuleid" column="PRODUCTTYPERULEID" jdbcType="VARCHAR"/>
+            <result property="producttyperule" column="PRODUCTTYPERULE" jdbcType="VARCHAR"/>
+            <result property="producttypeid" column="PRODUCTTYPEID" jdbcType="VARCHAR"/>
+            <result property="producttype" column="PRODUCTTYPE" jdbcType="VARCHAR"/>
+            <result property="metalrule" column="METALRULE" jdbcType="VARCHAR"/>
+            <result property="metal" column="METAL" jdbcType="VARCHAR"/>
+            <result property="metalstaterule" column="METALSTATERULE" jdbcType="VARCHAR"/>
+            <result property="metalstate" column="METALSTATE" jdbcType="VARCHAR"/>
+            <result property="thickrule" column="THICKRULE" jdbcType="VARCHAR"/>
+            <result property="thickchange" column="THICKCHANGE" jdbcType="DECIMAL"/>
+            <result property="thickoffset" column="THICKOFFSET" jdbcType="VARCHAR"/>
+            <result property="thickstr" column="THICKSTR" jdbcType="DECIMAL"/>
+            <result property="thickend" column="THICKEND" jdbcType="DECIMAL"/>
+            <result property="thickremark" column="THICKREMARK" jdbcType="VARCHAR"/>
+            <result property="widthrule" column="WIDTHRULE" jdbcType="VARCHAR"/>
+            <result property="widthchange" column="WIDTHCHANGE" jdbcType="DECIMAL"/>
+            <result property="widthoffset" column="WIDTHOFFSET" jdbcType="VARCHAR"/>
+            <result property="widthstr" column="WIDTHSTR" jdbcType="DECIMAL"/>
+            <result property="widthend" column="WIDTHEND" jdbcType="DECIMAL"/>
+            <result property="widthremark" column="WIDTHREMARK" jdbcType="VARCHAR"/>
+            <result property="lengthrule" column="LENGTHRULE" jdbcType="VARCHAR"/>
+            <result property="lengthchange" column="LENGTHCHANGE" jdbcType="DECIMAL"/>
+            <result property="lengthoffset" column="LENGTHOFFSET" jdbcType="VARCHAR"/>
+            <result property="lengthstr" column="LENGTHSTR" jdbcType="DECIMAL"/>
+            <result property="lengthend" column="LENGTHEND" jdbcType="DECIMAL"/>
+            <result property="lengthremark" column="LENGTHREMARK" jdbcType="VARCHAR"/>
+            <result property="outval" column="OUTVAL" jdbcType="INTEGER"/>
+            <result property="outmaterrequest" column="OUTMATERREQUEST" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,TENANTID,ROPTION,
+        DELETED,REMARK,CREATEDATE,
+        CREATEUSERID,MODIFYDATE,MODIFYUSERID,
+        CREATEUSERNAME,MODIFYUSERNAME,DATANO,
+        MAINID,MATERIALCODE,MATERIALNAME,
+        PRODUCTTYPERULEID,PRODUCTTYPERULE,PRODUCTTYPEID,
+        PRODUCTTYPE,METALRULE,METAL,
+        METALSTATERULE,METALSTATE,THICKRULE,
+        THICKCHANGE,THICKOFFSET,THICKSTR,
+        THICKEND,THICKREMARK,WIDTHRULE,
+        WIDTHCHANGE,WIDTHOFFSET,WIDTHSTR,
+        WIDTHEND,WIDTHREMARK,LENGTHRULE,
+        LENGTHCHANGE,LENGTHOFFSET,LENGTHSTR,
+        LENGTHEND,LENGTHREMARK,OUTVAL,
+        OUTMATERREQUEST
+    </sql>
+</mapper>

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

@@ -0,0 +1,58 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 工艺步骤可选设备
+ *
+ * @TableName aps_craft_equ
+ */
+@TableName(value = "aps_craft_equ")
+@Data
+public class ApsCraftEquDo extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    @TableId
+    private String id;
+
+    /**
+     *
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 主表ID
+     */
+    private String mainid;
+
+    /**
+     * 资源ID
+     */
+    private String resourceid;
+
+    /**
+     * 资源类型
+     */
+    private String resourcetype;
+
+    /**
+     * 设备参数
+     */
+    private String equparames;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,138 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 工艺路线管理
+ * @TableName aps_craft_route
+ */
+@TableName(value ="aps_craft_route")
+@Data
+public class ApsCraftRouteDo extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 所属工厂
+     */
+    private String ownedfactory;
+
+    /**
+     * 工艺路线编号
+     */
+    private String routenum;
+
+    /**
+     * 工序路线名称
+     */
+    private String routename;
+
+    /**
+     * 坯料类型
+     */
+    private String blanktype;
+
+    /**
+     * 物料编号
+     */
+    private String materialcode;
+
+    /**
+     * 物料名称
+     */
+    private String materialname;
+
+    /**
+     * 产品类型
+     */
+    private String producttype;
+
+    /**
+     * 产品类型名称
+     */
+    private String producttypename;
+
+    /**
+     * 合金
+     */
+    private String metal;
+
+    /**
+     * 合金状态
+     */
+    private String metalstate;
+
+    /**
+     * 厚度-起（mm）
+     */
+    private BigDecimal thickstr;
+
+    /**
+     * 厚度-止（mm）
+     */
+    private BigDecimal thickend;
+
+    /**
+     * 宽度-起（mm）
+     */
+    private BigDecimal widthstr;
+
+    /**
+     * 宽度-止（mm）
+     */
+    private BigDecimal widthend;
+
+    /**
+     * 长度-起（mm）
+     */
+    private BigDecimal lengthstr;
+
+    /**
+     * 长度-止（mm）
+     */
+    private BigDecimal lengthend;
+
+    /**
+     * 输入物料
+     */
+    private String inmatercondition;
+
+    /**
+     * 输出物料
+     */
+    private String outmaterrequest;
+
+    /**
+     * 第一个工艺步骤ID
+     */
+    private String firststepid;
+
+    /**
+     * 最后一个工艺步骤的ID
+     */
+    private String laststepids;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,204 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 工艺路线对应中工艺步骤输出物料要求
+ *
+ * @TableName aps_craft_route_out_mater_request
+ */
+@TableName(value = "aps_craft_route_out_mater_request")
+@Data
+public class ApsCraftRouteOutMaterRequestDo extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    @TableId
+    private String id;
+
+    /**
+     *
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 序号
+     */
+    private Integer datano;
+
+    /**
+     * 工艺路线ID
+     */
+    private String craftrouteid;
+
+    /**
+     * 工艺步骤ID
+     */
+    private String craftstepid;
+
+    /**
+     * 物料编号
+     */
+    private String materialcode;
+
+    /**
+     * 物料名称
+     */
+    private String materialname;
+
+    /**
+     * 厚度输出规则
+     */
+    private String thickrule;
+
+    /**
+     * 厚度变化（mm）
+     */
+    private BigDecimal thickchange;
+
+    /**
+     * 厚度偏差要求
+     */
+    private String thickoffset;
+
+    /**
+     * 厚度-起（mm）
+     */
+    private BigDecimal thickstr;
+
+    /**
+     * 厚度-止（mm）
+     */
+    private BigDecimal thickend;
+
+    /**
+     * 厚度输出描述
+     */
+    private String thickremark;
+
+    /**
+     * 宽度输出规则
+     */
+    private String widthrule;
+
+    /**
+     * 宽度变化（mm）
+     */
+    private BigDecimal widthchange;
+
+    /**
+     * 宽度偏差要求
+     */
+    private String widthoffset;
+
+    /**
+     * 宽度-起（mm）
+     */
+    private BigDecimal widthstr;
+
+    /**
+     * 宽度-止（mm）
+     */
+    private BigDecimal widthend;
+
+    /**
+     * 宽度输出描述
+     */
+    private String widthremark;
+
+    /**
+     * 长度输出规则
+     */
+    private String lengthrule;
+
+    /**
+     * 长度变化（mm）
+     */
+    private BigDecimal lengthchange;
+
+    /**
+     * 长度偏差要求
+     */
+    private String lengthoffset;
+
+    /**
+     * 长度-起（mm）
+     */
+    private BigDecimal lengthstr;
+
+    /**
+     * 长度-止（mm）
+     */
+    private BigDecimal lengthend;
+
+    /**
+     * 长度输出描述
+     */
+    private String lengthremark;
+
+    /**
+     * 输出卷数
+     */
+    private BigDecimal outval;
+
+    /**
+     * 输出物料要求
+     */
+    private String outmaterrequest;
+
+    /**
+     * 产品类型输出规则ID
+     */
+    private String producttyperuleid;
+
+    /**
+     * 产品类型输出规则
+     */
+    private String producttyperule;
+
+    /**
+     * 产品类型ID
+     */
+    private String producttypeid;
+
+    /**
+     * 产品类型
+     */
+    private String producttype;
+
+    /**
+     * 合金输出规则
+     */
+    private String metalrule;
+
+    /**
+     * 合金
+     */
+    private String metal;
+
+    /**
+     * 合金状态输出规则
+     */
+    private String metalstaterule;
+
+    /**
+     * 合金状态
+     */
+    private String metalstate;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,254 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 工艺路线对应的步骤信息
+ *
+ * @TableName aps_craft_route_step
+ */
+@TableName(value = "aps_craft_route_step")
+@Data
+public class ApsCraftRouteStepDo extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    @TableId
+    private String id;
+
+    /**
+     *
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 所属工厂
+     */
+    private String ownedfactory;
+
+    /**
+     * 工艺步骤管理表ID
+     */
+    private String craftstepid;
+
+    /**
+     * 工艺路线管理表ID
+     */
+    private String craftrouteid;
+
+    /**
+     * 工艺步骤编号
+     */
+    private String stepnum;
+
+    /**
+     * 工序
+     */
+    private String process;
+
+    /**
+     * 工序显示名
+     */
+    private String processname;
+
+    /**
+     * 加工方式
+     */
+    private String processway;
+
+    /**
+     * 数量单位
+     */
+    private String numunit;
+
+    /**
+     * 单次加工量
+     */
+    private BigDecimal onceprocessval;
+
+    /**
+     * 单次加工时长
+     */
+    private BigDecimal onceprocessmin;
+
+    /**
+     * 单位时间产能
+     */
+    private BigDecimal pertimecapacity;
+
+    /**
+     * 加工时间单位
+     */
+    private String timeunit;
+
+    /**
+     * 上机准备时间（分钟）
+     */
+    private BigDecimal prepressworkmin;
+
+    /**
+     * 上料时间（分钟）
+     */
+    private BigDecimal loadingmin;
+
+    /**
+     * 下料时间（分钟）
+     */
+    private BigDecimal cuttingmin;
+
+    /**
+     * 下机收尾时间（分钟）
+     */
+    private BigDecimal cutfinishmin;
+
+    /**
+     * 最小流转批次
+     */
+    private BigDecimal minflowbatch;
+
+    /**
+     * 流转等待最小时长（分钟）
+     */
+    private BigDecimal minflowwaitmin;
+
+    /**
+     * 流转等待最大时长（分钟）
+     */
+    private BigDecimal maxflowwaitmin;
+
+    /**
+     * 是否坯料工序
+     */
+    private String ifblankprocess;
+
+    /**
+     * 物料编号
+     */
+    private String materialcode;
+
+    /**
+     * 物料名称
+     */
+    private String materialname;
+
+    /**
+     * 产品类型ID
+     */
+    private String producttypeid;
+
+    /**
+     * 产品类型
+     */
+    private String producttype;
+
+    /**
+     * 合金
+     */
+    private String metal;
+
+    /**
+     * 合金状态
+     */
+    private String metalstate;
+
+    /**
+     * 厚度-起（mm）
+     */
+    private BigDecimal thickstr;
+
+    /**
+     * 厚度-止（mm）
+     */
+    private BigDecimal thickend;
+
+    /**
+     * 宽度-起（mm）
+     */
+    private BigDecimal widthstr;
+
+    /**
+     * 宽度-止（mm）
+     */
+    private BigDecimal widthend;
+
+    /**
+     * 长度-起（mm）
+     */
+    private BigDecimal lengthstr;
+
+    /**
+     * 长度-止（mm）
+     */
+    private BigDecimal lengthend;
+
+    /**
+     * 输入物料条件
+     */
+    private String inmatercondition;
+
+    /**
+     * 输出物料要求
+     */
+    private String outmaterrequest;
+
+    /**
+     * 可选设备
+     */
+    private String chooseequ;
+
+    /**
+     * 上一个工艺步骤ID
+     */
+    private String previousstepid;
+
+    /**
+     * 下一个工艺步骤ID
+     */
+    private String nextstepid;
+
+    /**
+     * 上一个工艺步骤名称
+     */
+    private String previousstepname;
+
+    /**
+     * 下一个工艺步骤名称
+     */
+    private String nextstepname;
+
+    /**
+     * 顺序
+     */
+    private Integer level;
+
+    /**
+     * 输入物料ID(aps_craft_route_out_mater_request 的ID)
+     */
+    private String inputmaterid;
+
+    /**
+     * 输入卷数
+     */
+    private Object inputvolume;
+
+    /**
+     * 上一个工艺步骤对应的输出物料ID
+     */
+    private String oldinputmaterid;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,62 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 工艺路线对应工艺步骤可选设备
+ *
+ * @TableName aps_craft_route_step_equ
+ */
+@TableName(value = "aps_craft_route_step_equ")
+@Data
+public class ApsCraftRouteStepEquDo extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    @TableId
+    private String id;
+
+    /**
+     *
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 工艺路线ID
+     */
+    private String craftrouteid;
+
+    /**
+     * 工艺步骤ID
+     */
+    private String craftstepid;
+
+    /**
+     * 资源ID
+     */
+    private String resourceid;
+
+    /**
+     * 资源类型
+     */
+    private String resourcetype;
+
+    /**
+     * 设备参数
+     */
+    private String equparames;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,203 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 工艺步骤管理
+ * @TableName aps_craft_step
+ */
+@TableName(value ="aps_craft_step")
+@Data
+public class ApsCraftStepDo extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 所属工厂
+     */
+    private String ownedfactory;
+
+    /**
+     * 工艺步骤编号
+     */
+    private String stepnum;
+
+    /**
+     * 工序
+     */
+    private String process;
+
+    /**
+     * 工序显示名
+     */
+    private String processname;
+
+    /**
+     * 加工方式
+     */
+    private String processway;
+
+    /**
+     * 数量单位
+     */
+    private String numunit;
+
+    /**
+     * 单次加工量
+     */
+    private BigDecimal onceprocessval;
+
+    /**
+     * 单次加工时长
+     */
+    private BigDecimal onceprocessmin;
+
+    /**
+     * 单位时间产能
+     */
+    private BigDecimal pertimecapacity;
+
+    /**
+     * 加工时间单位
+     */
+    private String timeunit;
+
+    /**
+     * 上机准备时间（分钟）
+     */
+    private BigDecimal prepressworkmin;
+
+    /**
+     * 上料时间（分钟）
+     */
+    private BigDecimal loadingmin;
+
+    /**
+     * 下料时间（分钟）
+     */
+    private BigDecimal cuttingmin;
+
+    /**
+     * 下机收尾时间（分钟）
+     */
+    private BigDecimal cutfinishmin;
+
+    /**
+     * 最小流转批次
+     */
+    private BigDecimal minflowbatch;
+
+    /**
+     * 流转等待最小时长（分钟）
+     */
+    private BigDecimal minflowwaitmin;
+
+    /**
+     * 流转等待最大时长（分钟）
+     */
+    private BigDecimal maxflowwaitmin;
+
+    /**
+     * 是否坯料工序
+     */
+    private String ifblankprocess;
+
+    /**
+     * 物料编号
+     */
+    private String materialcode;
+
+    /**
+     * 物料名称
+     */
+    private String materialname;
+
+    /**
+     * 产品类型ID
+     */
+    private String producttypeid;
+
+    /**
+     * 产品类型
+     */
+    private String producttype;
+
+    /**
+     * 合金
+     */
+    private String metal;
+
+    /**
+     * 合金状态
+     */
+    private String metalstate;
+
+    /**
+     * 厚度-起（mm）
+     */
+    private BigDecimal thickstr;
+
+    /**
+     * 厚度-止（mm）
+     */
+    private BigDecimal thickend;
+
+    /**
+     * 宽度-起（mm）
+     */
+    private BigDecimal widthstr;
+
+    /**
+     * 宽度-止（mm）
+     */
+    private BigDecimal widthend;
+
+    /**
+     * 长度-起（mm）
+     */
+    private BigDecimal lengthstr;
+
+    /**
+     * 长度-止（mm）
+     */
+    private BigDecimal lengthend;
+
+    /**
+     * 输入物料条件
+     */
+    private String inmatercondition;
+
+    /**
+     * 输出物料要求
+     */
+    private String outmaterrequest;
+
+    /**
+     * 可选设备
+     */
+    private String chooseequ;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,198 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 工艺步骤输出物料要求
+ * @TableName aps_out_mater_request
+ */
+@TableName(value ="aps_out_mater_request")
+@Data
+public class ApsOutMaterRequestDo extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 序号
+     */
+    private Integer datano;
+
+    /**
+     * 主表ID
+     */
+    private String mainid;
+
+    /**
+     * 物料编号
+     */
+    private String materialcode;
+
+    /**
+     * 物料名称
+     */
+    private String materialname;
+
+    /**
+     * 产品类型输出规则ID
+     */
+    private String producttyperuleid;
+
+    /**
+     * 产品类型输出规则
+     */
+    private String producttyperule;
+
+    /**
+     * 产品类型ID
+     */
+    private String producttypeid;
+
+    /**
+     * 产品类型
+     */
+    private String producttype;
+
+    /**
+     * 合金输出规则
+     */
+    private String metalrule;
+
+    /**
+     * 合金
+     */
+    private String metal;
+
+    /**
+     * 合金状态输出规则
+     */
+    private String metalstaterule;
+
+    /**
+     * 合金状态
+     */
+    private String metalstate;
+
+    /**
+     * 厚度输出规则
+     */
+    private String thickrule;
+
+    /**
+     * 厚度变化（mm）
+     */
+    private BigDecimal thickchange;
+
+    /**
+     * 厚度偏差要求
+     */
+    private String thickoffset;
+
+    /**
+     * 厚度-起（mm）
+     */
+    private BigDecimal thickstr;
+
+    /**
+     * 厚度-止（mm）
+     */
+    private BigDecimal thickend;
+
+    /**
+     * 厚度输出描述
+     */
+    private String thickremark;
+
+    /**
+     * 宽度输出规则
+     */
+    private String widthrule;
+
+    /**
+     * 宽度变化（mm）
+     */
+    private BigDecimal widthchange;
+
+    /**
+     * 宽度偏差要求
+     */
+    private String widthoffset;
+
+    /**
+     * 宽度-起（mm）
+     */
+    private BigDecimal widthstr;
+
+    /**
+     * 宽度-止（mm）
+     */
+    private BigDecimal widthend;
+
+    /**
+     * 宽度输出描述
+     */
+    private String widthremark;
+
+    /**
+     * 长度输出规则
+     */
+    private String lengthrule;
+
+    /**
+     * 长度变化（mm）
+     */
+    private BigDecimal lengthchange;
+
+    /**
+     * 长度偏差要求
+     */
+    private String lengthoffset;
+
+    /**
+     * 长度-起（mm）
+     */
+    private BigDecimal lengthstr;
+
+    /**
+     * 长度-止（mm）
+     */
+    private BigDecimal lengthend;
+
+    /**
+     * 长度输出描述
+     */
+    private String lengthremark;
+
+    /**
+     * 输出卷数
+     */
+    private Integer outval;
+
+    /**
+     * 输出物料要求
+     */
+    private String outmaterrequest;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,15 @@
+package com.rongwei.bsentity.vo;
+
+import com.rongwei.bsentity.domain.ApsCraftRouteStepDo;
+import lombok.Data;
+
+/**
+ * UpdateApsRouteAboutVo class
+ *
+ * @author XH
+ * @date 2024/03/13
+ */
+@Data
+public class UpdateApsRouteAboutVo extends ApsCraftRouteStepDo {
+    private String rowStatus;
+}

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

@@ -0,0 +1,35 @@
+package com.rongwei.bsserver.controller;
+
+
+import com.rongwei.bscommon.sys.service.ApsCraftStepService;
+import com.rongwei.bsentity.vo.UpdateApsRouteAboutVo;
+import com.rongwei.rwcommon.base.R;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author xh
+ * @since 2024-03-13
+ */
+@RestController
+@RequestMapping("/route")
+public class ApsRouteController {
+
+    private final Logger log = LoggerFactory.getLogger(this.getClass().getName());
+
+    @Autowired
+    private ApsCraftStepService apsCraftStepService;
+
+    @PostMapping("/update/about/data")
+    public R update(@RequestBody List<UpdateApsRouteAboutVo> updateApsRouteAboutVos,
+                    @RequestParam(name = "routeId",required = true)String routeId) {
+        apsCraftStepService.updateApsRouteAboutVos(updateApsRouteAboutVos, routeId);
+        return R.ok();
+    }
+
+}
+