新增预验收单据类型退回字段

src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java

@@ -396,5 +396,8 @@ public class BasicBussinessTypeEntity {
     @TableField(value = "checkCertExpire")
     private boolean checkCertExpire;
 
-
+    @TableField(value = "preInBackAction")
+    private String preInBackAction;
+    @TableField(value = "backPreinType")
+    private Integer backPreinType;
 }

src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java

@@ -294,10 +294,12 @@ public class BussinessTypeSaveRequest {
     private boolean fillCodeRel;
 
 
-
     private boolean checkVailDate;
     private boolean checkExpire;
     private boolean checkCertExpire;
 
+    private String preInBackAction;
+    private Integer backPreinType;
+
 
 }

src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java

@@ -148,4 +148,7 @@ public class BasicBussinessTypeResponse {
     private boolean checkExpire;
     private boolean checkCertExpire;
 
+    private String preInBackAction;
+    private Integer backPreinType;
+
 }

src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml

@@ -58,75 +58,76 @@
 
     <insert id="insertIgnoreBussinessType" parameterType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
         insert
-        ignore
+                ignore
         into basic_bussiness_type (mainAction, action, name, enable, remark, thirdSysFk, genUnit,
-        innerOrder, secCheckEnable, checkEnable, checkUdims, checkPdaEd,
-        checkPdaUn, checkPc, checkWebNew, checkSp, checkChange, secCheckUdims,
-        secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew,
-        secCheckChange, secCheckSp, corpType, supplementOrderType,
-        checkBalance, secCheckBalance, useDyCount, expireTip, updateTime,
-        defaultUnit, prefix, outToSpms, ullageFill, scanPreIn, vailInv,
-        entrutSpms, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType,
-        checkCopy, secCheckCopy, originAction, changeEnable,
-        spUse, preIn, supplementAll, createUser, createTime, preInBack, vailDispatch,
-        vailGroupBuy, busType, inStock, actionType
-        , thrCheckEnable, thrCheckWebNew, thrCheckPdaUn, thrCheckPdaEd, thrCheckUdims, thrCheckPc, thrCheckSp
-        , thrCheckChange, thrCheckBalance, thrCheckCopy, fillCodeRel, checkVailDate, checkCertExpire)
+                                   innerOrder, secCheckEnable, checkEnable, checkUdims, checkPdaEd,
+                                   checkPdaUn, checkPc, checkWebNew, checkSp, checkChange, secCheckUdims,
+                                   secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew,
+                                   secCheckChange, secCheckSp, corpType, supplementOrderType,
+                                   checkBalance, secCheckBalance, useDyCount, expireTip, updateTime,
+                                   defaultUnit, prefix, outToSpms, ullageFill, scanPreIn, vailInv,
+                                   entrutSpms, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType,
+                                   checkCopy, secCheckCopy, originAction, changeEnable,
+                                   spUse, preIn, supplementAll, createUser, createTime, preInBack, vailDispatch,
+                                   vailGroupBuy, busType, inStock, actionType
+                , thrCheckEnable, thrCheckWebNew, thrCheckPdaUn, thrCheckPdaEd, thrCheckUdims, thrCheckPc, thrCheckSp
+                , thrCheckChange, thrCheckBalance, thrCheckCopy, fillCodeRel, checkVailDate, checkCertExpire,
+                                   preInBackAction, backPreinType)
         values (#{mainAction},
-        #{action},
-        #{name},
-        #{enable},
-        #{remark},
-        #{thirdSysFk},
-        #{genUnit},
-        #{innerOrder},
-        #{secCheckEnable},
-        #{checkEnable},
-        #{checkUdims},
-        #{checkPdaEd},
-        #{checkPdaUn},
-        #{checkPc},
-        #{checkWebNew},
-        #{checkSp},
-        #{checkChange},
-        #{secCheckUdims},
-        #{secCheckPdaEd},
-        #{secCheckPdaUn},
-        #{secCheckPc},
-        #{secCheckWebNew},
-        #{secCheckChange},
-        #{secCheckSp},
-        #{corpType},
-        #{supplementOrderType},
-        #{checkBalance},
-        #{secCheckBalance},
-        #{useDyCount},
-        #{expireTip},
-        #{updateTime},
-        #{defaultUnit},
-        #{prefix},
-        #{outToSpms},
-        #{ullageFill},
-        #{scanPreIn},
-        #{vailInv},
-        #{entrutSpms},
-        #{codeFillCheck},
-        #{defaultSubInv},
-        #{defaultInv},
-        #{orderVisibleType},
-        #{checkCopy},
-        #{secCheckCopy},
-        #{originAction},
-        #{changeEnable},
-        #{spUse},
-        #{preIn},
-        #{supplementAll},
-        #{createUser},
-        #{createTime}, #{preInBack}, #{vailDispatch}, #{vailGroupBuy}, #{busType}, #{inStock}, #{actionType}
-        , #{thrCheckEnable}, #{thrCheckWebNew}, #{thrCheckPdaUn}, #{thrCheckPdaEd}, #{thrCheckUdims},
-        #{thrCheckPc}
-        , #{thrCheckSp}, #{thrCheckChange}, #{thrCheckBalance}, #{thrCheckCopy}, #{fillCodeRel}
-        , #{checkVailDate}, #{checkExpire}, #{checkCertExpire})
+                #{action},
+                #{name},
+                #{enable},
+                #{remark},
+                #{thirdSysFk},
+                #{genUnit},
+                #{innerOrder},
+                #{secCheckEnable},
+                #{checkEnable},
+                #{checkUdims},
+                #{checkPdaEd},
+                #{checkPdaUn},
+                #{checkPc},
+                #{checkWebNew},
+                #{checkSp},
+                #{checkChange},
+                #{secCheckUdims},
+                #{secCheckPdaEd},
+                #{secCheckPdaUn},
+                #{secCheckPc},
+                #{secCheckWebNew},
+                #{secCheckChange},
+                #{secCheckSp},
+                #{corpType},
+                #{supplementOrderType},
+                #{checkBalance},
+                #{secCheckBalance},
+                #{useDyCount},
+                #{expireTip},
+                #{updateTime},
+                #{defaultUnit},
+                #{prefix},
+                #{outToSpms},
+                #{ullageFill},
+                #{scanPreIn},
+                #{vailInv},
+                #{entrutSpms},
+                #{codeFillCheck},
+                #{defaultSubInv},
+                #{defaultInv},
+                #{orderVisibleType},
+                #{checkCopy},
+                #{secCheckCopy},
+                #{originAction},
+                #{changeEnable},
+                #{spUse},
+                #{preIn},
+                #{supplementAll},
+                #{createUser},
+                #{createTime}, #{preInBack}, #{vailDispatch}, #{vailGroupBuy}, #{busType}, #{inStock}, #{actionType}
+                       , #{thrCheckEnable}, #{thrCheckWebNew}, #{thrCheckPdaUn}, #{thrCheckPdaEd}, #{thrCheckUdims},
+                #{thrCheckPc}
+                       , #{thrCheckSp}, #{thrCheckChange}, #{thrCheckBalance}, #{thrCheckCopy}, #{fillCodeRel}
+                       , #{checkVailDate}, #{checkExpire}, #{checkCertExpire}, #{preInBackAction}, #{backPreinType})
     </insert>
 
     <select id="selectBusList" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
@@ -191,15 +192,15 @@
         select name, action
         from basic_bussiness_type
         where mainAction = #{mainAction}
-        and corpType = 3
-        and (supplementOrderType is null
-        or supplementOrderType = '')
+          and corpType = 3
+          and (supplementOrderType is null
+                or supplementOrderType = '')
     </select>
 
     <select id="selectByUser" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
         select basic_bussiness_type.*
         from basic_bussiness_type
-        inner join auth_user_bustype on basic_bussiness_type.action = auth_user_bustype.scAction
+                     inner join auth_user_bustype on basic_bussiness_type.action = auth_user_bustype.scAction
         <where>
             <if test="name != null and name != ''">
                 AND basic_bussiness_type.name like concat('%', #{name}, '%')
@@ -230,7 +231,7 @@
             resultType="com.glxp.api.res.basic.BasicBussinessTypeResponse">
         SELECT basic_bussiness_type.*
         FROM basic_bussiness_type
-        left JOIN auth_user_bustype ON basic_bussiness_type.action = auth_user_bustype.scAction
+                     left JOIN auth_user_bustype ON basic_bussiness_type.action = auth_user_bustype.scAction
         <where>
             <if test="name != ''and name != null">
                 AND basic_bussiness_type.name LIKE concat('%', #{name}, '%')
@@ -268,7 +269,7 @@
             resultType="com.glxp.api.res.basic.BasicBussinessTypeResponse">
         SELECT basic_bussiness_type.*
         FROM basic_bussiness_type
-        left JOIN auth_warehouse_bustype ON basic_bussiness_type.action = auth_warehouse_bustype.action
+                     left JOIN auth_warehouse_bustype ON basic_bussiness_type.action = auth_warehouse_bustype.action
         <where>
             <if test="name != ''and name != null">
                 AND basic_bussiness_type.name LIKE concat('%', #{name}, '%')
@@ -310,7 +311,7 @@
         select *
         from basic_bussiness_type
         <where>
-            <if test="list != null and list.size()!=0">
+            <if test="list != null and list.size() != 0">
                 and action not in
                 <foreach collection="list" item="item" open="(" separator="," close=")">
                     #{item}
@@ -318,5 +319,4 @@
             </if>
         </where>
     </select>
-
 </mapper>

src/main/resources/schemas/schema_v2.1.sql

@@ -58,6 +58,9 @@ CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'fillCodeRel', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkVailDate', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkExpire', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkCertExpire', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'preInBackAction', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'backPreinType', 'tinyint', 1);
+
 
 
 CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'batchNo', 'varchar(255) ', 1);