diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java
index bbe36eb46..9f9aa5682 100644
--- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java
+++ b/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;
}
diff --git a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java
index ac0603cb5..bb787fb6d 100644
--- a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java
+++ b/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;
+
}
diff --git a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java
index 7076379bc..354bdefb4 100644
--- a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java
+++ b/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;
+
}
diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml
index b73f09df8..e4dad59ca 100644
--- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml
@@ -58,75 +58,76 @@
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})
-
diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql
index 9aa1cff3d..81ebaad1b 100644
--- a/src/main/resources/schemas/schema_v2.1.sql
+++ b/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);