feature 代码提交

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

@@ -98,11 +98,10 @@
             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, #{data.actualoutputthickstr}, #{data.actualoutputthickend},  THICKREMARK,
-            WIDTHRULE, WIDTHCHANGE, WIDTHOFFSET,#{data.actualoutputwidthstr}, #{data.actualoutputwidthend}, WIDTHREMARK,
-            LENGTHRULE, LENGTHCHANGE, LENGTHOFFSET,  #{data.actualoutputlengthstr}, #{data.actualoutputlengthend}, LENGTHREMARK,
+            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,
             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

@@ -49,4 +49,21 @@ public class UpdateApsRouteAboutVo extends ApsCraftRouteStepDo {
     private String outputmetal;
 
     private String outputmetalstate;
+
+    private String outputmaterialname;
+    private String outputmaterialcode;
+
+    private String actualoutputthickrule;
+    private String actualoutputthickchange;
+    private String actualoutputthickoffset;
+
+    private String actualoutputwidthrule;
+    private String actualoutputwidthchange;
+    private String actualoutputwidthoffset;
+
+    private String actualoutputlengthrule;
+    private String actualoutputlengthchange;
+    private String actualoutputlengthoffset;
+
+
 }