From 4fc006c1e5b00d13230a327d8681cd4ccdd18781 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 11 Dec 2023 21:58:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E8=B4=A7=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/constant/Constant.java | 3 +++ .../com/glxp/api/controller/sync/SpsSyncBasicController.java | 2 +- .../service/basic/impl/BasicBussinessTypeServiceImpl.java | 5 ++++- .../com/glxp/api/service/inout/impl/IoOrderServiceImpl.java | 5 +++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/constant/Constant.java b/src/main/java/com/glxp/api/constant/Constant.java index 5e03eeed..144483de 100644 --- a/src/main/java/com/glxp/api/constant/Constant.java +++ b/src/main/java/com/glxp/api/constant/Constant.java @@ -238,6 +238,9 @@ public class Constant { public static final String ORDER_STATUS_INCODE = "supInCode"; + + public static final String ORDER_STATUS_RETURN = "supReturned"; + /**前端页面查询相关单据类型标识*/ diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java index a296d689..6e432d11 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java @@ -37,7 +37,7 @@ public class SpsSyncBasicController { @Log(title = "内网同步修改基础数据", businessType = BusinessType.UPDATE) public BaseResponse udiRlUpdate(@RequestBody UdiRelevanceEntity udiRelevanceEntity) { - if (udiRelevanceEntity.getId() != null) { + if (udiRelevanceEntity.getId() == null) { return ResultVOUtils.error(500, "缺少唯一标识"); } int b = udiRelevanceDao.updateById(udiRelevanceEntity); diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java index 4315391a..14c7bf59 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java @@ -257,7 +257,10 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl() .gt("spUse", 0).eq("enable", true).eq("corpType", ConstantStatus.CORP_TYPE_OUT).eq("actionType", 2)); - + case Constant.ORDER_STATUS_RETURN: + bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper() + .gt("spUse", 0).eq("enable", true).eq("corpType", ConstantStatus.CORP_TYPE_OUT).eq("mainAction", ConstantType.TYPE_OUT)); + break; default: break; } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index a988b716..7f0b407f 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -691,6 +691,11 @@ public class IoOrderServiceImpl implements IoOrderService { case Constant.ORDER_STATUS_UN_ALLOCATE: filterOrderRequest.setStatuses(Arrays.asList(ConstantStatus.ORDER_STATUS_ALLOCATE)); filterOrderRequest.setDealStatuses(Arrays.asList(2)); + + case Constant.ORDER_STATUS_RETURN: + filterOrderRequest.setStatuses(Arrays.asList(10, 7)); + filterOrderRequest.setDealStatuses(Arrays.asList(3, 4)); + break; default: break; }