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

代码备份

Browse Source
busUser
anthonywj 3 years ago
parent 3a924e64ed
commit d4dd027f95
3 changed files with 58 additions and 38 deletions
Show Stats Download Patch File Download Diff File

4
api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java
Unescape Escape View File

@ -1016,6 +1016,10 @@ public class IoTransInoutService {
if (bussinessTypeEntity.isSecCheckBalacne()) { if (bussinessTypeEntity.isSecCheckBalacne()) {
stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECKED); stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECKED);
} }
} else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDIWMS) {
if (bussinessTypeEntity.isSecCheckUdiwms()) {
stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECKED);
}
} else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_COPY) { } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_COPY) {
if (bussinessTypeEntity.isSecCheckCopy()) { if (bussinessTypeEntity.isSecCheckCopy()) {
stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECKED); stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECKED);

4
api-admin/src/main/java/com/glxp/sale/admin/util/BusTypeCheckUtils.java
Unescape Escape View File

@ -91,6 +91,10 @@ public class BusTypeCheckUtils {
if (bussinessTypeEntity.isSecCheckBalacne()) { if (bussinessTypeEntity.isSecCheckBalacne()) {
return true; return true;
} }
}else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDIWMS) {
if (bussinessTypeEntity.isSecCheckUdiwms()) {
return true;
}
} else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_COPY) { } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_COPY) {
if (bussinessTypeEntity.isSecCheckCopy()) { if (bussinessTypeEntity.isSecCheckCopy()) {
return true; return true;

88
api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
Unescape Escape View File

@ -21,12 +21,14 @@
basic_bussiness_type.checkPc, basic_bussiness_type.checkPc,
basic_bussiness_type.checkWebNew, basic_bussiness_type.checkWebNew,
basic_bussiness_type.checkChange, basic_bussiness_type.checkChange,
basic_bussiness_type.checkUdiwms,
basic_bussiness_type.codeFillCheck, basic_bussiness_type.codeFillCheck,
basic_bussiness_type.secCheckUdims, basic_bussiness_type.secCheckUdims,
basic_bussiness_type.secCheckPdaEd, basic_bussiness_type.secCheckPdaEd,
basic_bussiness_type.secCheckPdaUn, basic_bussiness_type.secCheckPdaUn,
basic_bussiness_type.secCheckWebNew, basic_bussiness_type.secCheckWebNew,
basic_bussiness_type.secCheckChange, basic_bussiness_type.secCheckChange,
basic_bussiness_type.secCheckUdiwms,
basic_bussiness_type.ullageFill, basic_bussiness_type.ullageFill,
basic_bussiness_type.scanPreIn, basic_bussiness_type.scanPreIn,
basic_bussiness_type.vailInv, basic_bussiness_type.vailInv,
@ -58,9 +60,9 @@
checkCopy, checkCopy,
secCheckCopy secCheckCopy
FROM basic_bussiness_type FROM basic_bussiness_type
LEFT JOIN basic_bustype_local LEFT JOIN basic_bustype_local
on basic_bussiness_type.localAction = basic_bustype_local.action on basic_bussiness_type.localAction = basic_bustype_local.action
left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.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}, '%')
@ -130,11 +132,11 @@
orderVisibleType, orderVisibleType,
supplementAll supplementAll
from basic_bussiness_type from basic_bussiness_type
LEFT JOIN LEFT JOIN
basic_third_sys on basic_bussiness_type.thirdSysFk = basic_third_sys on basic_bussiness_type.thirdSysFk =
basic_third_sys.thirdId basic_third_sys.thirdId
LEFT JOIN basic_bustype_local on basic_bussiness_type.localAction = LEFT JOIN basic_bustype_local on basic_bussiness_type.localAction =
basic_bustype_local.action basic_bustype_local.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}, '%')
@ -187,6 +189,8 @@
basic_bussiness_type.checkPc, basic_bussiness_type.checkPc,
basic_bussiness_type.checkWebNew, basic_bussiness_type.checkWebNew,
basic_bussiness_type.checkChange, basic_bussiness_type.checkChange,
basic_bussiness_type.checkUdiwms,
basic_bussiness_type.secCheckUdiwms,
basic_bussiness_type.codeFillCheck, basic_bussiness_type.codeFillCheck,
basic_bussiness_type.secCheckUdims, basic_bussiness_type.secCheckUdims,
basic_bussiness_type.secCheckPdaEd, basic_bussiness_type.secCheckPdaEd,
@ -226,15 +230,15 @@
checkCopy, checkCopy,
secCheckCopy secCheckCopy
FROM basic_bussiness_type FROM basic_bussiness_type
LEFT JOIN basic_bustype_local LEFT JOIN basic_bustype_local
on basic_bussiness_type.localAction = basic_bustype_local.action on basic_bussiness_type.localAction = basic_bustype_local.action
left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action
INNER JOIN inv_warehouse_bussiness_type INNER JOIN inv_warehouse_bussiness_type
on basic_bussiness_type.action = inv_warehouse_bussiness_type.action on basic_bussiness_type.action = inv_warehouse_bussiness_type.action
INNER JOIN inv_warehouse_sub on inv_warehouse_sub.`code` = inv_warehouse_bussiness_type.code INNER JOIN inv_warehouse_sub on inv_warehouse_sub.`code` = inv_warehouse_bussiness_type.code
INNER JOIN inv_warehouse on inv_warehouse_sub.parentId = inv_warehouse.`code` INNER JOIN inv_warehouse on inv_warehouse_sub.parentId = inv_warehouse.`code`
INNER JOIN inv_warehouse_user on inv_warehouse_sub.`code` = inv_warehouse_user.`code` INNER JOIN inv_warehouse_user on inv_warehouse_sub.`code` = inv_warehouse_user.`code`
INNER JOIN inv_bustype_user on inv_warehouse_bussiness_type.action = inv_bustype_user.scAction INNER JOIN inv_bustype_user on inv_warehouse_bussiness_type.action = inv_bustype_user.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}, '%')
@ -270,15 +274,16 @@
<insert id="insertBussinessType" keyProperty="id" <insert id="insertBussinessType" keyProperty="id"
parameterType="com.glxp.sale.admin.entity.basic.BussinessTypeEntity"> parameterType="com.glxp.sale.admin.entity.basic.BussinessTypeEntity">
replace replace
INTO basic_bussiness_type INTO basic_bussiness_type
(`action`, `name`, enable, remark, mainAction, localAction, thirdSysFk, (`action`, `name`, enable, remark, mainAction, localAction, thirdSysFk,
checkEnable, genUnit, innerOrder, secCheckEnable, checkEnable, genUnit, innerOrder, secCheckEnable,
checkUdims, checkPdaEd, checkPdaUn, checkPc, checkWebNew, checkChange checkUdims, checkPdaEd, checkPdaUn, checkPc, checkWebNew, checkChange
, secCheckUdims, secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew, , secCheckUdims, secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew,
secCheckChange, corpType, basic_bussiness_type.storageCode, checkBalacne, secCheckChange, corpType, basic_bussiness_type.storageCode, checkBalacne,
secCheckBalacne, supplementOrderType, defaultUnit, useDyCount, expireTip, updateTime, prefix secCheckBalacne, supplementOrderType, defaultUnit, useDyCount, expireTip, updateTime, prefix
, ullageFill, scanPreIn, vailInv, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType, checkCopy, , ullageFill, scanPreIn, vailInv, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType,
secCheckCopy, vailDispatch, vailGroupBuy) checkCopy,
secCheckCopy, vailDispatch, vailGroupBuy, checkUdiwms, secCheckUdiwms)
values (#{action}, values (#{action},
#{name}, #{name},
#{enable}, #{enable},
@ -320,23 +325,24 @@
#{defaultInv}, #{defaultInv},
#{orderVisibleType}, #{orderVisibleType},
#{checkCopy}, #{checkCopy},
#{secCheckCopy}, #{vailDispatch}, #{vailGroupBuy}) #{secCheckCopy}, #{vailDispatch}, #{vailGroupBuy}, #{checkUdiwms}, #{secCheckUdiwms})
</insert> </insert>
<insert id="insertIgnoreBussinessType" keyProperty="id" <insert id="insertIgnoreBussinessType" keyProperty="id"
parameterType="com.glxp.sale.admin.entity.basic.BussinessTypeEntity"> parameterType="com.glxp.sale.admin.entity.basic.BussinessTypeEntity">
insert insert
ignore ignore
INTO basic_bussiness_type INTO basic_bussiness_type
(`index`, action, name, enable, remark, mainAction, localAction, thirdSysFk, (`index`, action, name, enable, remark, mainAction, localAction, thirdSysFk,
checkEnable, genUnit, innerOrder, secCheckEnable, checkEnable, genUnit, innerOrder, secCheckEnable,
checkUdims, checkPdaEd, checkPdaUn, checkPc, checkWebNew, checkChange checkUdims, checkPdaEd, checkPdaUn, checkPc, checkWebNew, checkChange
, secCheckUdims, secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew, , secCheckUdims, secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew,
secCheckChange, corpType, storageCode, checkBalacne, secCheckBalacne, supplementOrderType, defaultUnit, secCheckChange, corpType, storageCode, checkBalacne, secCheckBalacne, supplementOrderType, defaultUnit,
useDyCount, expireTip, updateTime, prefix useDyCount, expireTip, updateTime, prefix
, ullageFill, scanPreIn, vailInv, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType, checkCopy, , ullageFill, scanPreIn, vailInv, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType,
secCheckCopy, vailDispatch, vailGroupBuy) checkCopy,
secCheckCopy, vailDispatch, vailGroupBuy, checkUdiwms, secCheckUdiwms)
values (#{index}, values (#{index},
#{action}, #{action},
#{name}, #{name},
@ -379,7 +385,7 @@
#{defaultInv}, #{defaultInv},
#{orderVisibleType}, #{orderVisibleType},
#{checkCopy}, #{checkCopy},
#{secCheckCopy}, #{vailDispatch}, #{vailGroupBuy}) #{secCheckCopy}, #{vailDispatch}, #{vailGroupBuy}, #{checkUdiwms}, #{secCheckUdiwms})
</insert> </insert>
@ -518,6 +524,12 @@
<if test="vailGroupBuy != null"> <if test="vailGroupBuy != null">
vailGroupBuy=#{vailGroupBuy}, vailGroupBuy=#{vailGroupBuy},
</if> </if>
<if test="checkUdiwms != null">
checkUdiwms=#{checkUdiwms},
</if>
<if test="secCheckUdiwms != null">
secCheckUdiwms=#{secCheckUdiwms},
</if>
thirdSysFk=#{thirdSysFk}, thirdSysFk=#{thirdSysFk},
</trim> </trim>
@ -557,7 +569,7 @@
from basic_bussiness_type from basic_bussiness_type
where mainAction = #{mainAction} where mainAction = #{mainAction}
and (supplementOrderType is null and (supplementOrderType is null
or supplementOrderType = '') or supplementOrderType = '')
and corpType = 1 and corpType = 1
</select> </select>

Write Preview
Loading…
Cancel
Save