feature 代码提交

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

@@ -99,9 +99,9 @@
             ACTUALWIDTHEND,ACTUALLENGTHSTR,ACTUALLENGTHEND,ACTUALOUTMATERREQUEST)
             SELECT TENANTID, UUID(), ROPTION, DELETED, REMARK, NOW(), CREATEUSERID, NOW(), MODIFYUSERID, CREATEUSERNAME,
             MODIFYUSERNAME, DATANO, #{routeId}, #{data.id} , #{data.outputmaterialcode},#{data.outputmaterialname},
-            #{data.actualoutputthickrule}, #{data.actualoutputthickchange}, #{data.actualoutputthickoffset}, #{data.actualoutputthickstr}, #{data.actualoutputthickend},  THICKREMARK,
-            #{data.actualoutputwidthrule}, #{data.actualoutputwidthchange}, #{data.actualoutputwidthoffset},#{data.actualoutputwidthstr}, #{data.actualoutputwidthend}, WIDTHREMARK,
-            #{data.actualoutputlengthrule}, #{data.actualoutputlengthchange}, #{data.actualoutputlengthoffset},  #{data.actualoutputlengthstr}, #{data.actualoutputlengthend}, LENGTHREMARK,
+            #{data.actualoutputthickrule}, #{data.actualoutputthickchange}, #{data.actualoutputthickoffset}, #{data.actualoutputthickstr}, #{data.actualoutputthickend},  #{data.actualoutputthickremark},
+            #{data.actualoutputwidthrule}, #{data.actualoutputwidthchange}, #{data.actualoutputwidthoffset},#{data.actualoutputwidthstr}, #{data.actualoutputwidthend}, #{data.actualoutputwidthremark},
+            #{data.actualoutputlengthrule}, #{data.actualoutputlengthchange}, #{data.actualoutputlengthoffset},  #{data.actualoutputlengthstr}, #{data.actualoutputlengthend}, #{data.actualoutputlengthremark},
             OUTVAL,
             OUTMATERREQUEST, PRODUCTTYPERULEID, PRODUCTTYPERULE, #{data.outputproducttypeid}, #{data.outputproducttype}, METALRULE, #{data.outputmetal},
             METALSTATERULE,

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

@@ -56,14 +56,16 @@ public class UpdateApsRouteAboutVo extends ApsCraftRouteStepDo {
     private String actualoutputthickrule;
     private String actualoutputthickchange;
     private String actualoutputthickoffset;
+    private String actualoutputthickremark;
 
     private String actualoutputwidthrule;
     private String actualoutputwidthchange;
     private String actualoutputwidthoffset;
+    private String actualoutputwidthremark;
 
     private String actualoutputlengthrule;
     private String actualoutputlengthchange;
     private String actualoutputlengthoffset;
-
+    private String actualoutputlengthremark;
 
 }