feature 代码提交

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

@@ -29,26 +29,33 @@
             <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"/>
+        <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"/>
+        <result property="actualthickstr" column="ACTUALTHICKSTR" jdbcType="DECIMAL"/>
+        <result property="actualthickend" column="ACTUALTHICKEND" jdbcType="DECIMAL"/>
+        <result property="actualwidthstr" column="ACTUALWIDTHSTR" jdbcType="DECIMAL"/>
+        <result property="actualwidthend" column="ACTUALWIDTHEND" jdbcType="DECIMAL"/>
+        <result property="actuallengthstr" column="ACTUALLENGTHSTR" jdbcType="DECIMAL"/>
+        <result property="actuallengthend" column="ACTUALLENGTHEND" jdbcType="DECIMAL"/>
+        <result property="actualoutmaterrequest" column="ACTUALOUTMATERREQUEST" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -66,7 +73,9 @@
         LENGTHREMARK,OUTVAL,OUTMATERREQUEST,
         PRODUCTTYPERULEID,PRODUCTTYPERULE,PRODUCTTYPEID,
         PRODUCTTYPE,METALRULE,METAL,
-        METALSTATERULE,METALSTATE
+        METALSTATERULE,METALSTATE,ACTUALTHICKSTR,
+        ACTUALTHICKEND, ACTUALWIDTHSTR,ACTUALWIDTHEND,
+        ACTUALLENGTHSTR,ACTUALLENGTHEND,ACTUALOUTMATERREQUEST
     </sql>
     <delete id="removeByIdList">
         DELETE FROM aps_craft_route_out_mater_request
@@ -79,18 +88,34 @@
     </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,
+            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)
+            LENGTHREMARK, OUTVAL, OUTMATERREQUEST, PRODUCTTYPERULEID, PRODUCTTYPERULE, PRODUCTTYPEID, PRODUCTTYPE,
+            METALRULE,
+            METAL, METALSTATERULE, METALSTATE,ACTUALTHICKSTR, ACTUALTHICKEND, ACTUALWIDTHSTR,
+            ACTUALWIDTHEND,ACTUALLENGTHSTR,ACTUALLENGTHEND,ACTUALOUTMATERREQUEST)
             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'
+            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,
+            #{data.actualoutputthickstr},
+            #{data.actualoutputthickend},
+            #{data.actualoutputwidthstr},
+            #{data.actualoutputwidthend},
+            #{data.actualoutputlengthstr},
+            #{data.actualoutputlengthend},
+            #{data.actualoutmaterrequest}
+
+            FROM aps_out_mater_request WHERE MAINID = #{data.CRAFTSTEPID} and deleted='0'
         </foreach>
     </insert>
+
 </mapper>

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

@@ -56,9 +56,7 @@
         <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">
@@ -78,7 +76,12 @@
         WIDTHSTR,WIDTHEND,LENGTHSTR,
         LENGTHEND,INMATERCONDITION,OUTMATERREQUEST,
         CHOOSEEQU,PREVIOUSSTEPID,NEXTSTEPID,
-        PREVIOUSSTEPNAME,NEXTSTEPNAME,LEVEL,
-        INPUTMATERID,INPUTVOLUME,OLDINPUTMATERID
+        PREVIOUSSTEPNAME,NEXTSTEPNAME,LEVEL
     </sql>
+    ,
+    ,
+    ,
+    ,
+    
+
 </mapper>

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

@@ -8,7 +8,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 工艺路线对应中工艺步骤输出物料要求
@@ -198,7 +197,36 @@ public class ApsCraftRouteOutMaterRequestDo extends BaseDo implements Serializab
      * 合金状态
      */
     private String metalstate;
+    /**
+     * 厚度-起（mm）实际
+     */
+    private BigDecimal actualthickstr;
+    /**
+     * 厚度-止（mm）实际
+     */
+    private BigDecimal actualthickend;
+    /**
+     * 宽度-起（mm）实际
+     */
+    private BigDecimal actualwidthstr;
+    /**
+     * 宽度-止（mm）实际
+     */
+    private BigDecimal actualwidthend;
+    /**
+     * 长度-起（mm）实际
+     */
+    private BigDecimal actuallengthstr;
+    /**
+     * 长度-止（mm）实际
+     */
+    private BigDecimal actuallengthend;
 
+    /**
+     * 实际输出物料规则
+     */
+    private String actualoutmaterrequest;
+    
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }

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

@@ -8,7 +8,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 工艺路线对应的步骤信息
@@ -234,20 +233,40 @@ public class ApsCraftRouteStepDo extends BaseDo implements Serializable {
      */
     private Integer level;
 
+
     /**
-     * 输入物料ID(aps_craft_route_out_mater_request 的ID)
+     * 实际输入物料条件
      */
-    private String inputmaterid;
-
+    private String actualinmatercondition;
     /**
-     * 输入卷数
+     * 实际输出物料规则
      */
-    private Object inputvolume;
-
+    private String actualoutmaterrequest;
+    /**
+     * 实际厚度-起（mm）
+     */
+    private BigDecimal actualthickstr;
+    /**
+     * 实际厚度-止（mm）
+     */
+    private BigDecimal actualthickend;
     /**
-     * 上一个工艺步骤对应的输出物料ID
+     * 实际宽度-起（mm）
      */
-    private String oldinputmaterid;
+    private BigDecimal actualwidthstr;
+    /**
+     * 实际宽度-止（mm）
+     */
+    private BigDecimal actualwidthend;
+    /**
+     * 实际长度-起（mm）
+     */
+    private BigDecimal actuallengthstr;
+    /**
+     * 实际长度-止（mm）
+     */
+    private BigDecimal actuallengthend;
+
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

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

@@ -3,6 +3,8 @@ package com.rongwei.bsentity.vo;
 import com.rongwei.bsentity.domain.ApsCraftRouteStepDo;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * UpdateApsRouteAboutVo class
  *
@@ -12,4 +14,60 @@ import lombok.Data;
 @Data
 public class UpdateApsRouteAboutVo extends ApsCraftRouteStepDo {
     private String rowstatus;
+    /**
+     *   实际输入厚起
+     */
+    private BigDecimal actualthickstr;
+    /**
+     *   实际输入厚止
+     */
+    private BigDecimal actualthickend;
+    /**
+     *   实际输入宽起
+     */
+    private BigDecimal actualwidthstr;
+    /**
+     *  实际输入宽止
+     */
+    private BigDecimal actualwidthend;
+    /**
+     * 实际输入长起
+     */
+    private BigDecimal actuallengthstr;
+    /**
+     * 实际输入长止
+     */
+    private BigDecimal actuallengthend;
+    /**
+     * 实际输入规则
+     */
+    private BigDecimal actualinmatercondition;
+    /**
+     * 实际输出厚起
+     */
+    private BigDecimal actualoutputthickstr;
+    /**
+     * 实际输出厚止
+     */
+    private BigDecimal actualoutputthickend;
+    /**
+     * 实际输出宽起
+     */
+    private BigDecimal actualoutputwidthstr;
+    /**
+     * 实际输出宽止
+     */
+    private BigDecimal actualoutputwidthend;
+    /**
+     * 实际输出长起
+     */
+    private BigDecimal actualoutputlengthstr;
+    /**
+     * 实际输出长止
+     */
+    private BigDecimal actualoutputlengthend;
+    /**
+     * 实际输出规则
+     */
+    private BigDecimal actualoutmaterrequest;
 }