From d4dd027f95cbedeeeeac4996af5ca14494d5cfb2 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 8 Mar 2023 10:53:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/thread/IoTransInoutService.java | 4 + .../sale/admin/util/BusTypeCheckUtils.java | 4 + .../mybatis/mapper/basic/BussinessTypeDao.xml | 88 +++++++++++-------- 3 files changed, 58 insertions(+), 38 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java index 3068fc1..38efafa 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java @@ -1016,6 +1016,10 @@ public class IoTransInoutService { if (bussinessTypeEntity.isSecCheckBalacne()) { 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) { if (bussinessTypeEntity.isSecCheckCopy()) { stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECKED); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/BusTypeCheckUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/util/BusTypeCheckUtils.java index 15c82eb..f7b9295 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/util/BusTypeCheckUtils.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/BusTypeCheckUtils.java @@ -91,6 +91,10 @@ public class BusTypeCheckUtils { if (bussinessTypeEntity.isSecCheckBalacne()) { return true; } + }else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDIWMS) { + if (bussinessTypeEntity.isSecCheckUdiwms()) { + return true; + } } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_COPY) { if (bussinessTypeEntity.isSecCheckCopy()) { return true; diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml index 3c36f6d..e9903b2 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -21,12 +21,14 @@ basic_bussiness_type.checkPc, basic_bussiness_type.checkWebNew, basic_bussiness_type.checkChange, + basic_bussiness_type.checkUdiwms, basic_bussiness_type.codeFillCheck, basic_bussiness_type.secCheckUdims, basic_bussiness_type.secCheckPdaEd, basic_bussiness_type.secCheckPdaUn, basic_bussiness_type.secCheckWebNew, basic_bussiness_type.secCheckChange, + basic_bussiness_type.secCheckUdiwms, basic_bussiness_type.ullageFill, basic_bussiness_type.scanPreIn, basic_bussiness_type.vailInv, @@ -58,9 +60,9 @@ checkCopy, secCheckCopy FROM basic_bussiness_type - LEFT JOIN basic_bustype_local - 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_local + on basic_bussiness_type.localAction = basic_bustype_local.action + left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action AND basic_bussiness_type.name LIKE concat('%', #{name}, '%') @@ -130,11 +132,11 @@ orderVisibleType, supplementAll from basic_bussiness_type - LEFT JOIN - basic_third_sys on basic_bussiness_type.thirdSysFk = - basic_third_sys.thirdId - LEFT JOIN basic_bustype_local on basic_bussiness_type.localAction = - basic_bustype_local.action + LEFT JOIN + basic_third_sys on basic_bussiness_type.thirdSysFk = + basic_third_sys.thirdId + LEFT JOIN basic_bustype_local on basic_bussiness_type.localAction = + basic_bustype_local.action AND basic_bussiness_type.name LIKE concat('%', #{name}, '%') @@ -187,6 +189,8 @@ basic_bussiness_type.checkPc, basic_bussiness_type.checkWebNew, basic_bussiness_type.checkChange, + basic_bussiness_type.checkUdiwms, + basic_bussiness_type.secCheckUdiwms, basic_bussiness_type.codeFillCheck, basic_bussiness_type.secCheckUdims, basic_bussiness_type.secCheckPdaEd, @@ -226,15 +230,15 @@ checkCopy, secCheckCopy FROM basic_bussiness_type - LEFT JOIN basic_bustype_local - on basic_bussiness_type.localAction = basic_bustype_local.action - left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action - INNER JOIN inv_warehouse_bussiness_type - 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 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_bustype_user on inv_warehouse_bussiness_type.action = inv_bustype_user.scAction + LEFT JOIN basic_bustype_local + on basic_bussiness_type.localAction = basic_bustype_local.action + left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action + INNER JOIN inv_warehouse_bussiness_type + 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 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_bustype_user on inv_warehouse_bussiness_type.action = inv_bustype_user.scAction AND basic_bussiness_type.name LIKE concat('%', #{name}, '%') @@ -270,15 +274,16 @@ replace - INTO basic_bussiness_type - (`action`, `name`, enable, remark, mainAction, localAction, thirdSysFk, - checkEnable, genUnit, innerOrder, secCheckEnable, - checkUdims, checkPdaEd, checkPdaUn, checkPc, checkWebNew, checkChange - , secCheckUdims, secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew, - secCheckChange, corpType, basic_bussiness_type.storageCode, checkBalacne, - secCheckBalacne, supplementOrderType, defaultUnit, useDyCount, expireTip, updateTime, prefix - , ullageFill, scanPreIn, vailInv, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType, checkCopy, - secCheckCopy, vailDispatch, vailGroupBuy) + INTO basic_bussiness_type + (`action`, `name`, enable, remark, mainAction, localAction, thirdSysFk, + checkEnable, genUnit, innerOrder, secCheckEnable, + checkUdims, checkPdaEd, checkPdaUn, checkPc, checkWebNew, checkChange + , secCheckUdims, secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew, + secCheckChange, corpType, basic_bussiness_type.storageCode, checkBalacne, + secCheckBalacne, supplementOrderType, defaultUnit, useDyCount, expireTip, updateTime, prefix + , ullageFill, scanPreIn, vailInv, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType, + checkCopy, + secCheckCopy, vailDispatch, vailGroupBuy, checkUdiwms, secCheckUdiwms) values (#{action}, #{name}, #{enable}, @@ -320,23 +325,24 @@ #{defaultInv}, #{orderVisibleType}, #{checkCopy}, - #{secCheckCopy}, #{vailDispatch}, #{vailGroupBuy}) + #{secCheckCopy}, #{vailDispatch}, #{vailGroupBuy}, #{checkUdiwms}, #{secCheckUdiwms}) insert - ignore + ignore INTO basic_bussiness_type - (`index`, action, name, enable, remark, mainAction, localAction, thirdSysFk, - checkEnable, genUnit, innerOrder, secCheckEnable, - checkUdims, checkPdaEd, checkPdaUn, checkPc, checkWebNew, checkChange - , secCheckUdims, secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew, - secCheckChange, corpType, storageCode, checkBalacne, secCheckBalacne, supplementOrderType, defaultUnit, - useDyCount, expireTip, updateTime, prefix - , ullageFill, scanPreIn, vailInv, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType, checkCopy, - secCheckCopy, vailDispatch, vailGroupBuy) + (`index`, action, name, enable, remark, mainAction, localAction, thirdSysFk, + checkEnable, genUnit, innerOrder, secCheckEnable, + checkUdims, checkPdaEd, checkPdaUn, checkPc, checkWebNew, checkChange + , secCheckUdims, secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew, + secCheckChange, corpType, storageCode, checkBalacne, secCheckBalacne, supplementOrderType, defaultUnit, + useDyCount, expireTip, updateTime, prefix + , ullageFill, scanPreIn, vailInv, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType, + checkCopy, + secCheckCopy, vailDispatch, vailGroupBuy, checkUdiwms, secCheckUdiwms) values (#{index}, #{action}, #{name}, @@ -379,7 +385,7 @@ #{defaultInv}, #{orderVisibleType}, #{checkCopy}, - #{secCheckCopy}, #{vailDispatch}, #{vailGroupBuy}) + #{secCheckCopy}, #{vailDispatch}, #{vailGroupBuy}, #{checkUdiwms}, #{secCheckUdiwms}) @@ -518,6 +524,12 @@ vailGroupBuy=#{vailGroupBuy}, + + checkUdiwms=#{checkUdiwms}, + + + secCheckUdiwms=#{secCheckUdiwms}, + thirdSysFk=#{thirdSysFk}, @@ -557,7 +569,7 @@ from basic_bussiness_type where mainAction = #{mainAction} and (supplementOrderType is null - or supplementOrderType = '') + or supplementOrderType = '') and corpType = 1