UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
master
anthonywj 2 years ago
parent 3a13555c5c
commit f5d87597d6
5 changed files with 88 additions and 77 deletions
Show Stats Download Patch File Download Diff File

5
src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java
Unescape Escape View File

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

4
src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java
Unescape Escape View File

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

3
src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java
Unescape Escape View File

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

150
src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml
Unescape Escape View File

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

3
src/main/resources/schemas/schema_v2.1.sql
Unescape Escape View File

@ -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', 'checkVailDate', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkExpire', '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', '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); CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'batchNo', 'varchar(255) ', 1);

Write Preview
Loading…
Cancel
Save