From b41f27040ef124ff68d674ca8ed41414a624a0eb Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 19 May 2023 12:03:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=B8=80=E4=BA=9B=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/AuthUserController.java | 1 + .../api/controller/auth/DeptController.java | 2 + .../controller/auth/DeptUserController.java | 1 + .../api/controller/auth/LoginController.java | 2 + .../auth/SysDictDataController.java | 2 + .../auth/SysDictTypeController.java | 2 + .../controller/auth/SysMenuController.java | 2 + .../controller/auth/SysRoleController.java | 2 + .../controller/auth/SysUserController.java | 2 + .../purchase/SupCertController.java | 1 + .../controller/sup/UserComanyController.java | 1 + .../system/ClassifyCodeController.java | 2 + .../controller/system/CompanyController.java | 1 + .../system/ConnectTestController.java | 1 + .../system/DeviceKeyController.java | 1 + .../system/SysMenuHelpController.java | 1 + .../system/SysParamConfigController.java | 1 + .../system/SysPdfModuleController.java | 44 +-- .../system/SysPdfTemplateController.java | 1 + .../system/SysRemindMsgController.java | 35 -- .../api/dao/basic/BasicBusTypeChangeDao.java | 26 -- .../api/dao/basic/BasicBusTypePreDao.java | 47 --- .../api/dao/basic/BasicBussinessTypeDao.java | 76 ----- .../glxp/api/dao/basic/EntrustReceDao.java | 31 -- .../glxp/api/dao/purchase/PurApplyDao.java | 25 -- .../api/dao/purchase/PurApplyDetailDao.java | 31 -- .../glxp/api/dao/purchase/PurOrderDao.java | 13 - .../api/dao/purchase/PurOrderDetailDao.java | 29 -- .../com/glxp/api/dao/purchase/PurPlanDao.java | 25 -- .../api/dao/purchase/PurPlanDetailDao.java | 32 -- .../api/dao/system/SysRemindMsgMapper.java | 16 - .../entity/purchase/PurApplyDetailEntity.java | 64 ---- .../api/entity/purchase/PurApplyEntity.java | 171 ---------- .../entity/purchase/PurOrderDetailEntity.java | 64 ---- .../api/entity/purchase/PurOrderEntity.java | 180 ----------- .../entity/purchase/PurPlanDetailEntity.java | 64 ---- .../api/entity/purchase/PurPlanEntity.java | 178 ---------- .../api/req/purchase/PostPurApplyRequest.java | 19 -- .../api/req/purchase/PostPurOrderRequest.java | 26 -- .../api/req/purchase/PostPurPlanRequest.java | 24 -- .../req/purchase/PurApplyDetailRequest.java | 70 ---- .../api/req/purchase/PurApplyRequest.java | 110 ------- .../req/purchase/PurOrderDetailRequest.java | 79 ----- .../api/req/purchase/PurOrderRequest.java | 101 ------ .../req/purchase/PurPlanDetailRequest.java | 79 ----- .../glxp/api/req/purchase/PurPlanRequest.java | 101 ------ .../api/req/purchase/purReceiveRequest.java | 10 - .../basic/IBasicBusTypeChangeService.java | 63 ---- .../basic/IBasicBusTypePreService.java | 87 ----- .../basic/IBasicBussinessTypeService.java | 125 ------- .../impl/BasicBusTypeChangeServiceImpl.java | 99 ------ .../impl/BasicBusTypePreServiceImpl.java | 129 -------- .../impl/BasicBussinessTypeServiceImpl.java | 305 ------------------ .../purchase/PurApplyDetailService.java | 38 --- .../api/service/purchase/PurApplyService.java | 22 -- .../purchase/PurOrderDetailService.java | 35 -- .../purchase/PurPlanDetailService.java | 35 -- .../api/service/purchase/PurPlanService.java | 25 -- .../impl/PurApplyDetailImplService.java | 104 ------ .../purchase/impl/PurApplyServiceImpl.java | 55 ---- .../impl/PurOrderDetailServiceImpl.java | 104 ------ .../impl/PurPlanDetailServiceImpl.java | 105 ------ .../purchase/impl/PurPlanServiceImpl.java | 55 ---- .../service/system/SysRemindMsgService.java | 12 - .../system/impl/SysRemindMsgServiceImpl.java | 33 -- .../mapper/basic/BasicBusTypeChangeDao.xml | 31 -- .../mapper/basic/BasicBusTypePreDao.xml | 150 --------- .../mapper/basic/BasicBussinessTypeDao.xml | 288 ----------------- .../mybatis/mapper/basic/EntrustReceDao.xml | 165 ---------- .../mybatis/mapper/purchase/PurApplyDao.xml | 148 --------- .../mapper/purchase/PurApplyDetailDao.xml | 160 --------- .../mybatis/mapper/purchase/PurOrderDao.xml | 97 ------ .../mapper/purchase/PurOrderDetailDao.xml | 176 ---------- .../mybatis/mapper/purchase/PurPlanDao.xml | 144 --------- .../mapper/purchase/PurPlanDetailDao.xml | 176 ---------- .../mapper/system/SyncDataBustypeDao.xml | 23 -- .../system/SyncDataChangeBustypesDao.xml | 17 - .../system/SyncUploadDataBustypeDao.xml | 35 -- .../mapper/system/SyncUploadDataSetDao.xml | 38 --- .../mybatis/mapper/system/SysErpLogDao.xml | 10 - .../mapper/system/SysRemindMsgMapper.xml | 15 - .../mapper/system/SysRemindSetMapper.xml | 15 - .../mybatis/mapper/system/ThirdSysApiDao.xml | 27 -- 83 files changed, 28 insertions(+), 4914 deletions(-) delete mode 100644 src/main/java/com/glxp/api/controller/system/SysRemindMsgController.java delete mode 100644 src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java delete mode 100644 src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java delete mode 100644 src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java delete mode 100644 src/main/java/com/glxp/api/dao/basic/EntrustReceDao.java delete mode 100644 src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java delete mode 100644 src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java delete mode 100644 src/main/java/com/glxp/api/dao/purchase/PurOrderDao.java delete mode 100644 src/main/java/com/glxp/api/dao/purchase/PurOrderDetailDao.java delete mode 100644 src/main/java/com/glxp/api/dao/purchase/PurPlanDao.java delete mode 100644 src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java delete mode 100644 src/main/java/com/glxp/api/dao/system/SysRemindMsgMapper.java delete mode 100644 src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java delete mode 100644 src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java delete mode 100644 src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java delete mode 100644 src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java delete mode 100644 src/main/java/com/glxp/api/entity/purchase/PurPlanDetailEntity.java delete mode 100644 src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java delete mode 100644 src/main/java/com/glxp/api/req/purchase/PostPurApplyRequest.java delete mode 100644 src/main/java/com/glxp/api/req/purchase/PostPurOrderRequest.java delete mode 100644 src/main/java/com/glxp/api/req/purchase/PostPurPlanRequest.java delete mode 100644 src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java delete mode 100644 src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java delete mode 100644 src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java delete mode 100644 src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java delete mode 100644 src/main/java/com/glxp/api/req/purchase/PurPlanDetailRequest.java delete mode 100644 src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java delete mode 100644 src/main/java/com/glxp/api/req/purchase/purReceiveRequest.java delete mode 100644 src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java delete mode 100644 src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java delete mode 100644 src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java delete mode 100644 src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java delete mode 100644 src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java delete mode 100644 src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java delete mode 100644 src/main/java/com/glxp/api/service/purchase/PurApplyDetailService.java delete mode 100644 src/main/java/com/glxp/api/service/purchase/PurApplyService.java delete mode 100644 src/main/java/com/glxp/api/service/purchase/PurOrderDetailService.java delete mode 100644 src/main/java/com/glxp/api/service/purchase/PurPlanDetailService.java delete mode 100644 src/main/java/com/glxp/api/service/purchase/PurPlanService.java delete mode 100644 src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java delete mode 100644 src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java delete mode 100644 src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailServiceImpl.java delete mode 100644 src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java delete mode 100644 src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java delete mode 100644 src/main/java/com/glxp/api/service/system/SysRemindMsgService.java delete mode 100644 src/main/java/com/glxp/api/service/system/impl/SysRemindMsgServiceImpl.java delete mode 100644 src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml delete mode 100644 src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml delete mode 100644 src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml delete mode 100644 src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml delete mode 100644 src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml delete mode 100644 src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml delete mode 100644 src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml delete mode 100644 src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml delete mode 100644 src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml delete mode 100644 src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml delete mode 100644 src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml delete mode 100644 src/main/resources/mybatis/mapper/system/SyncDataChangeBustypesDao.xml delete mode 100644 src/main/resources/mybatis/mapper/system/SyncUploadDataBustypeDao.xml delete mode 100644 src/main/resources/mybatis/mapper/system/SyncUploadDataSetDao.xml delete mode 100644 src/main/resources/mybatis/mapper/system/SysErpLogDao.xml delete mode 100644 src/main/resources/mybatis/mapper/system/SysRemindMsgMapper.xml delete mode 100644 src/main/resources/mybatis/mapper/system/SysRemindSetMapper.xml delete mode 100644 src/main/resources/mybatis/mapper/system/ThirdSysApiDao.xml diff --git a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java index 9a34983..66e731d 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java @@ -18,6 +18,7 @@ import com.glxp.api.service.auth.*; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import javax.validation.Valid; diff --git a/src/main/java/com/glxp/api/controller/auth/DeptController.java b/src/main/java/com/glxp/api/controller/auth/DeptController.java index 27afbd2..be691aa 100644 --- a/src/main/java/com/glxp/api/controller/auth/DeptController.java +++ b/src/main/java/com/glxp/api/controller/auth/DeptController.java @@ -36,6 +36,8 @@ import com.glxp.api.service.system.SystemParamConfigService; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; +import springfox.documentation.annotations.ApiIgnore; + @ApiIgnore @RestController public class DeptController { diff --git a/src/main/java/com/glxp/api/controller/auth/DeptUserController.java b/src/main/java/com/glxp/api/controller/auth/DeptUserController.java index 91b81ae..4fdaf4e 100644 --- a/src/main/java/com/glxp/api/controller/auth/DeptUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/DeptUserController.java @@ -21,6 +21,7 @@ import com.glxp.api.res.auth.DeptUserResponse; import com.glxp.api.service.auth.DeptService; import com.glxp.api.service.auth.DeptUserService; import com.glxp.api.service.auth.WarehouseUserService; +import springfox.documentation.annotations.ApiIgnore; @ApiIgnore @RestController diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java index 1bdbdfd..4daf6b7 100644 --- a/src/main/java/com/glxp/api/controller/auth/LoginController.java +++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java @@ -53,10 +53,12 @@ import com.glxp.api.util.RsaUtils; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; +import springfox.documentation.annotations.ApiIgnore; /** * 登录相关 */ + @ApiIgnore @RestController @Slf4j diff --git a/src/main/java/com/glxp/api/controller/auth/SysDictDataController.java b/src/main/java/com/glxp/api/controller/auth/SysDictDataController.java index d0f4a3b..fa9e86a 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysDictDataController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysDictDataController.java @@ -12,6 +12,7 @@ import com.glxp.api.common.util.ResultVOUtils; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import java.util.ArrayList; import java.util.List; @@ -19,6 +20,7 @@ import java.util.List; /** * 数据字典信息 */ + @ApiIgnore @Validated @RequiredArgsConstructor diff --git a/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java b/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java index 3ca38cd..beea8ec 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java @@ -13,6 +13,7 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import java.util.List; @@ -20,6 +21,7 @@ import java.util.List; /** * 数据字典信息 */ + @ApiIgnore @RestController @RequestMapping("/system/dict/type") diff --git a/src/main/java/com/glxp/api/controller/auth/SysMenuController.java b/src/main/java/com/glxp/api/controller/auth/SysMenuController.java index bc9d8aa..e255d08 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysMenuController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysMenuController.java @@ -12,6 +12,7 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import java.util.Date; @@ -24,6 +25,7 @@ import java.util.Map; * * @author Lion Li */ + @ApiIgnore @RestController @RequestMapping("/system/menu") diff --git a/src/main/java/com/glxp/api/controller/auth/SysRoleController.java b/src/main/java/com/glxp/api/controller/auth/SysRoleController.java index a14f1aa..4cbc00d 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysRoleController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysRoleController.java @@ -17,11 +17,13 @@ import com.glxp.api.common.util.ResultVOUtils; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import java.util.Date; import java.util.List; import java.util.UUID; + @ApiIgnore @Validated @RequiredArgsConstructor diff --git a/src/main/java/com/glxp/api/controller/auth/SysUserController.java b/src/main/java/com/glxp/api/controller/auth/SysUserController.java index 3ff7a6a..04a74a1 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysUserController.java @@ -34,6 +34,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import javax.validation.Valid; @@ -45,6 +46,7 @@ import java.util.stream.Collectors; * * @author Lion Li */ + @ApiIgnore @Validated @RequiredArgsConstructor diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java index 3c60074..a41d000 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import java.io.File; diff --git a/src/main/java/com/glxp/api/controller/sup/UserComanyController.java b/src/main/java/com/glxp/api/controller/sup/UserComanyController.java index be002a4..f6441bc 100644 --- a/src/main/java/com/glxp/api/controller/sup/UserComanyController.java +++ b/src/main/java/com/glxp/api/controller/sup/UserComanyController.java @@ -11,6 +11,7 @@ import com.glxp.api.service.sup.UserCompanyService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import java.util.List; diff --git a/src/main/java/com/glxp/api/controller/system/ClassifyCodeController.java b/src/main/java/com/glxp/api/controller/system/ClassifyCodeController.java index c151150..d8d6829 100644 --- a/src/main/java/com/glxp/api/controller/system/ClassifyCodeController.java +++ b/src/main/java/com/glxp/api/controller/system/ClassifyCodeController.java @@ -9,9 +9,11 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import java.util.List; + @ApiIgnore @RestController public class ClassifyCodeController { diff --git a/src/main/java/com/glxp/api/controller/system/CompanyController.java b/src/main/java/com/glxp/api/controller/system/CompanyController.java index d692766..3492b9b 100644 --- a/src/main/java/com/glxp/api/controller/system/CompanyController.java +++ b/src/main/java/com/glxp/api/controller/system/CompanyController.java @@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; @ApiIgnore diff --git a/src/main/java/com/glxp/api/controller/system/ConnectTestController.java b/src/main/java/com/glxp/api/controller/system/ConnectTestController.java index 581b6d2..401e47f 100644 --- a/src/main/java/com/glxp/api/controller/system/ConnectTestController.java +++ b/src/main/java/com/glxp/api/controller/system/ConnectTestController.java @@ -8,6 +8,7 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java b/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java index 8d434bb..b3f73af 100644 --- a/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java +++ b/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import javax.validation.Valid; diff --git a/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java b/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java index c8db80a..eb09b72 100644 --- a/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java +++ b/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java @@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import javax.validation.Valid; diff --git a/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java b/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java index 11b7c21..316994c 100644 --- a/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java +++ b/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java @@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import javax.validation.Valid; diff --git a/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java b/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java index e6af2a3..b52196d 100644 --- a/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java +++ b/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java @@ -5,31 +5,28 @@ import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity; -import com.glxp.api.req.basic.FilterBussinessTypeRequest; import com.glxp.api.req.system.FilterPdfModuleRequest; import com.glxp.api.req.system.SysPdfModuleSaveRequest; -import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.system.SystemPDFModuleResponse; import com.glxp.api.res.system.SystemPDFModuleSelectResponse; -import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; -import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.system.SystemPDFModuleService; import com.glxp.api.service.system.SystemPDFTemplateRelevanceService; import com.glxp.api.service.system.SystemPDFTemplateService; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import javax.validation.Valid; import java.util.Date; import java.util.List; import java.util.stream.Collectors; + @ApiIgnore @RestController public class SysPdfModuleController { @@ -74,43 +71,6 @@ public class SysPdfModuleController { } - @Resource - IBasicBussinessTypeService basicBussinessTypeService; - - - @AuthRuleAnnotation("system/pdf/module/detail") - @GetMapping("/system/pdf/module/detail") - public BaseResponse moduleDetail(@Valid FilterPdfTemplateRelevanceRequest systemPDFModuleRequest, - BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - - if (systemPDFModuleRequest.getTemplateType() != null && systemPDFModuleRequest.getTemplateType() == 2) { - FilterBussinessTypeRequest filterBussinessTypeRequest = new FilterBussinessTypeRequest(); - filterBussinessTypeRequest.setEnable(true); - List bussinessLocalTypeEntities = basicBussinessTypeService.findList(filterBussinessTypeRequest); - for (BasicBussinessTypeEntity basicBussinessTypeEntity : bussinessLocalTypeEntities) { - SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity = new SystemPDFTemplateRelevanceEntity(); - systemPDFTemplateRelevanceEntity.setLocalAction(basicBussinessTypeEntity.getAction()); - systemPDFTemplateRelevanceEntity.setModuleId(systemPDFModuleRequest.getModuleId()); - systemPDFTemplateRelevanceService.insert(systemPDFTemplateRelevanceEntity); - } - - List systemPDFTemplateRelevanceEntityList = - systemPDFTemplateRelevanceService.filterList(systemPDFModuleRequest); - PageInfo pageInfo = new PageInfo<>(systemPDFTemplateRelevanceEntityList); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setList(pageInfo.getList()); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - return ResultVOUtils.success(pageSimpleResponse); - } - return ResultVOUtils.success(null); - - - } - @AuthRuleAnnotation("system/pdf/module/updateRl") @PostMapping("/system/pdf/module/updateRl") public BaseResponse updateRl(@RequestBody SystemPDFTemplateRelevanceEntity systemPDFModuleSaveRequest) { diff --git a/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java b/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java index 23800f8..b476c14 100644 --- a/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java +++ b/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java @@ -18,6 +18,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/glxp/api/controller/system/SysRemindMsgController.java b/src/main/java/com/glxp/api/controller/system/SysRemindMsgController.java deleted file mode 100644 index b48e1ce..0000000 --- a/src/main/java/com/glxp/api/controller/system/SysRemindMsgController.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.glxp.api.controller.system; - -import com.github.pagehelper.PageInfo; -import com.glxp.api.annotation.AuthRuleAnnotation; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.entity.system.SysRemindMsgEntity; -import com.glxp.api.entity.system.SysRemindSetEntity; -import com.glxp.api.req.system.FilterSysRemindMsgRequest; -import com.glxp.api.service.system.SysRemindMsgService; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.List; -@ApiIgnore -@RestController -public class SysRemindMsgController { - - - @Resource - SysRemindMsgService sysRemindMsgService; - - - @AuthRuleAnnotation("") - @GetMapping("/system/remind/msg/list") - public BaseResponse list(FilterSysRemindMsgRequest filterSysRemindMsgRequest) { - - List sysRemindMsgEntities = sysRemindMsgService.filterList(filterSysRemindMsgRequest); - PageInfo pageInfo = new PageInfo<>(sysRemindMsgEntities); - return ResultVOUtils.page(pageInfo); - - } - -} diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java deleted file mode 100644 index 576bd48..0000000 --- a/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.glxp.api.dao.basic; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; -import com.glxp.api.req.basic.FilterBusTypeChangeRequest; -import com.glxp.api.res.basic.BasicBusTypeChangeResponse; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 单据转换表查询接口 - */ -@Mapper -public interface BasicBusTypeChangeDao extends BaseMapperPlus { - - /** - * 查询单据转换设置列表 - * - * @param filterBusTypeChangeRequest - * @return - */ - List filterList(FilterBusTypeChangeRequest filterBusTypeChangeRequest); - -} diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java deleted file mode 100644 index 002e478..0000000 --- a/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.glxp.api.dao.basic; - -import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.basic.BasicBusTypePreEntity; -import com.glxp.api.req.basic.FilterBusTypeChangeRequest; -import com.glxp.api.req.basic.FilterBusTypePreRequest; -import com.glxp.api.res.basic.BasicBusTypePreResponse; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 补单单据类型查询接口 - */ -@Mapper -public interface BasicBusTypePreDao extends BaseMapperPlus { - - List filterList(FilterBusTypeChangeRequest busTypeChangeFilterRequest); - - /** - * 根据单据类型删除 - * - * @param action - * @return - */ - boolean deleteByAction(@Param("action") String action); - - /** - * 通过单据类型编码查询补单设置列表 - * - * @param action - * @return - */ - List findByAction(String action); - - /** - * 查询单据流转列表数据 - * - * @param filterBusTypePreRequest - * @return - */ - List selectBusTypePreResList(FilterBusTypePreRequest filterBusTypePreRequest); - - boolean insertOrUpdateEntity(BasicBusTypePreEntity record); - -} diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java deleted file mode 100644 index 3aec53d..0000000 --- a/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.glxp.api.dao.basic; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.req.basic.FilterBussinessTypeRequest; -import com.glxp.api.res.basic.BasicBussinessTypeResponse; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface BasicBussinessTypeDao extends BaseMapperPlus { - - - /** - * 查询单据类型列表 - * - * @return - */ - List filterList(FilterBussinessTypeRequest filterBussinessTypeRequest); - - List filterJoinByUser(FilterBussinessTypeRequest filterBussinessTypeRequest); - - List filterJoinByInv(FilterBussinessTypeRequest filterBussinessTypeRequest); - - /** - * 忽略已存在数据插入单据类型 - * - * @param bussinessTypeEntity - * @return - */ - boolean insertIgnoreBussinessType(BasicBussinessTypeEntity bussinessTypeEntity); - - /** - * 查询单据类型列表 - * - * @param bussinessTypeFilterRequest - * @return - */ - List selectBusList(FilterBussinessTypeRequest bussinessTypeFilterRequest); - - /** - * 查询第三方系统，订单提交接口未绑定的单据类型 - * - * @return - */ - List selectForThirdSys(); - - /** - * 查询平衡补单候选单据类型列表 - * - * @param mainAction - * @return - */ - List selectCandidateBusType(@Param("mainAction") String mainAction); - - /** - * 查询用户关联的单据类型 - * - * @param filterBussinessTypeRequest - * @return - */ - List selectByUser(FilterBussinessTypeRequest filterBussinessTypeRequest); - - /** - * 根据单据类型名称编码查询单据类型名称 - * - * @param action - * @return - */ - String selectNameByAction(@Param("action") String action); - - List selectbyNotAction(@Param("list") List list); -} diff --git a/src/main/java/com/glxp/api/dao/basic/EntrustReceDao.java b/src/main/java/com/glxp/api/dao/basic/EntrustReceDao.java deleted file mode 100644 index b3c98f6..0000000 --- a/src/main/java/com/glxp/api/dao/basic/EntrustReceDao.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.glxp.api.dao.basic; - -import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.basic.DlEntrustReceEntity; -import com.glxp.api.entity.basic.EntrustReceEntity; -import com.glxp.api.req.basic.BasicEntrustRecRequest; -import com.glxp.api.res.basic.EntrustReceResponse; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface EntrustReceDao extends BaseMapperPlus { - - List filterEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest); - - List downloadEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest); - - List filterJoinEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest); - - EntrustReceEntity findByUnique(@Param("action") String action, @Param("entrustUser") Long entrustUser); - - boolean insertEntrustRec(EntrustReceEntity ioOrderStatusEntity); - - boolean deleteById(String id); - - boolean deleteAll(); - - -} diff --git a/src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java b/src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java deleted file mode 100644 index 6c2f1f5..0000000 --- a/src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.glxp.api.dao.purchase; - - -import com.glxp.api.entity.purchase.PurApplyEntity; -import com.glxp.api.req.purchase.PurApplyRequest; -import com.glxp.api.res.purchase.PurApplyResponse; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface PurApplyDao { - - List queryPageList(PurApplyRequest purApplyRequest); - - Integer insert(PurApplyEntity purApplyRequest); - - Boolean update(PurApplyEntity purApplyRequest); - - Boolean deleteByIds(@Param("ids") List ids); - - Boolean deleteById(@Param("id") long id); - -} diff --git a/src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java b/src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java deleted file mode 100644 index 2436121..0000000 --- a/src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.glxp.api.dao.purchase; - - -import com.glxp.api.entity.purchase.PurApplyDetailEntity; -import com.glxp.api.req.purchase.PurApplyDetailRequest; -import com.glxp.api.res.purchase.PurOrderDetailResponse; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface PurApplyDetailDao { - - List queryPageList(PurApplyDetailRequest purApplyRequest); - - List joinQueryList(PurApplyDetailRequest purApplyRequest); - - Boolean insert(PurApplyDetailEntity purApplyDetailEntity); - - Boolean update(PurApplyDetailEntity purApplyRequest); - - Boolean deleteByIds(@Param("ids") List ids); - - Boolean deleteByOrderId(@Param("orderIdFk") String orderIdFk); - - boolean insertPurApplyDetailEntity(@Param("datas") List purApplyDetailEntityList); - - List selectPurApplyDetailList(PurApplyDetailRequest purApplyDetailRequest); - -} diff --git a/src/main/java/com/glxp/api/dao/purchase/PurOrderDao.java b/src/main/java/com/glxp/api/dao/purchase/PurOrderDao.java deleted file mode 100644 index cbf211f..0000000 --- a/src/main/java/com/glxp/api/dao/purchase/PurOrderDao.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.glxp.api.dao.purchase; - -import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.purchase.PurOrderEntity; -import com.glxp.api.req.purchase.PurOrderRequest; -import com.glxp.api.res.purchase.PurOrderResponse; - -import java.util.List; - -public interface PurOrderDao extends BaseMapperPlus { - - List queryPageList(PurOrderRequest purPlanRequest); -} diff --git a/src/main/java/com/glxp/api/dao/purchase/PurOrderDetailDao.java b/src/main/java/com/glxp/api/dao/purchase/PurOrderDetailDao.java deleted file mode 100644 index cdc2de4..0000000 --- a/src/main/java/com/glxp/api/dao/purchase/PurOrderDetailDao.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.glxp.api.dao.purchase; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.purchase.PurOrderDetailEntity; -import com.glxp.api.req.purchase.PurOrderDetailRequest; -import com.glxp.api.res.purchase.PurOrderDetailResponse; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface PurOrderDetailDao extends BaseMapper { - - List queryPageList(PurOrderDetailRequest purOrderDetailRequest); - - List joinQueryList(PurOrderDetailRequest purOrderDetailRequest); - - Boolean update(PurOrderDetailEntity purOrderDetailEntity); - - Boolean deleteByIds(@Param("ids") List ids); - - Boolean deleteByOrderId(@Param("orderIdFk") String orderIdFk); - - boolean insertPurOrderDetailEntity(@Param("datas") List purOrderDetailEntityList); - - BasicProductsEntity selectIoOrderDetailBiz(@Param("id") long id); - - List selectDetailList(PurOrderDetailRequest purOrderDetailRequest); -} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/purchase/PurPlanDao.java b/src/main/java/com/glxp/api/dao/purchase/PurPlanDao.java deleted file mode 100644 index 6bfffbd..0000000 --- a/src/main/java/com/glxp/api/dao/purchase/PurPlanDao.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.glxp.api.dao.purchase; - - -import com.glxp.api.entity.purchase.PurPlanEntity; -import com.glxp.api.req.purchase.PurPlanRequest; -import com.glxp.api.res.purchase.PurPlanResponse; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface PurPlanDao { - - List queryPageList(PurPlanRequest purPlanRequest); - - Boolean insert(PurPlanEntity purPlanRequest); - - Boolean update(PurPlanEntity purPlanRequest); - - Boolean deleteByIds(@Param("ids") List ids); - - Boolean deleteById(@Param("id") long id); - -} diff --git a/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java b/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java deleted file mode 100644 index 23cc6d2..0000000 --- a/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.glxp.api.dao.purchase; - - -import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.purchase.PurPlanDetailEntity; -import com.glxp.api.req.purchase.PurPlanDetailRequest; -import com.glxp.api.res.purchase.PurOrderDetailResponse; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface PurPlanDetailDao { - List queryPageList(PurPlanDetailRequest purApplyRequest); - - List joinQueryList(PurPlanDetailRequest purPlanDetailRequest); - - Boolean insert(PurPlanDetailEntity purPlanDetailRequest); - - Boolean update(PurPlanDetailEntity purPlanDetailRequest); - - Boolean deleteByIds(@Param("ids")List ids); - - Boolean deleteByOrderId(@Param("orderIdFk") String orderIdFk); - - boolean insertPurPlanDetailEntity(@Param("datas") List purPlanDetailEntityList); - - BasicProductsEntity selectIoOrderDetailBiz(@Param("id") long id); - - List seletDetaiList(PurPlanDetailRequest purPlanDetailRequest); -} diff --git a/src/main/java/com/glxp/api/dao/system/SysRemindMsgMapper.java b/src/main/java/com/glxp/api/dao/system/SysRemindMsgMapper.java deleted file mode 100644 index 343138f..0000000 --- a/src/main/java/com/glxp/api/dao/system/SysRemindMsgMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.glxp.api.dao.system; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.system.SysRemindMsgEntity; -import com.glxp.api.entity.system.SysRemindSetEntity; -import com.glxp.api.req.system.FilterSysRemindMsgRequest; -import com.glxp.api.req.system.FilterSysRemindSetRequest; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface SysRemindMsgMapper extends BaseMapper { - - List filterList(FilterSysRemindMsgRequest filterSysRemindMsgRequest); -} diff --git a/src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java deleted file mode 100644 index 26ab1dc..0000000 --- a/src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.glxp.api.entity.purchase; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -@Data -@TableName(value = "pur_apply_detail") -public class PurApplyDetailEntity { - @TableId(value = "id", type = IdType.INPUT) - private Integer id; - - /** - * 订单外键 - */ - @TableField(value = "orderIdFk") - private String orderIdFk; - - /** - * 产品ID - */ - @TableField(value = "productId") - private Integer productId; - - /** - * 产品名称 - */ - @TableField(value = "productName") - private String productName; - - /** - * 数量 - */ - @TableField(value = "`count`") - private Integer count; - - /** - * 供应商ID - */ - @TableField(value = "supId") - private String supId; - - /** - * 注册证备案证号 - */ - @TableField(value = "zczbhhzbapzbh") - private String zczbhhzbapzbh; - - public static final String COL_ID = "id"; - - public static final String COL_ORDERIDFK = "orderIdFk"; - - public static final String COL_PRODUCTID = "productId"; - - public static final String COL_PRODUCTNAME = "productName"; - - public static final String COL_COUNT = "count"; - - public static final String COL_SUPID = "supId"; - - public static final String COL_ZCZBHHZBAPZBH = "zczbhhzbapzbh"; -} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java deleted file mode 100644 index a61c5f6..0000000 --- a/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java +++ /dev/null @@ -1,171 +0,0 @@ -package com.glxp.api.entity.purchase; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; -import lombok.Data; - -@Data -@TableName(value = "pur_apply") -public class PurApplyEntity { - @TableId(value = "id", type = IdType.INPUT) - private Long id; - - /** - * 单据号 - */ - @TableField(value = "billNo") - private String billNo; - - /** - * 单据日期 - */ - @TableField(value = "billDate") - private Date billDate; - - /** - * 状态（1.草稿，2.未审核，3.已审核,4.已拒绝） - */ - @TableField(value = "`status`") - private Integer status; - - /** - * 申购类型 - */ - @TableField(value = "billType") - private Integer billType; - - /** - * 申购说明 - */ - @TableField(value = "remark") - private String remark; - - /** - * 当前仓库 - */ - @TableField(value = "invCode") - private String invCode; - - /** - * 所属部门 - */ - @TableField(value = "deptCode") - private String deptCode; - - /** - * 创建人 - */ - @TableField(value = "`createUser`") - private String createUser; - - /** - * 创建时间 - */ - @TableField(value = "createTime") - private Date createTime; - - /** - * 审核人 - */ - @TableField(value = "auditUser") - private String auditUser; - - /** - * 审核时间 - */ - @TableField(value = "auditTime") - private Date auditTime; - - /** - * 更新人 - */ - @TableField(value = "updateUser") - private String updateUser; - - /** - * 更新时间 - */ - @TableField(value = "updateTime") - private Date updateTime; - - /** - * 审核说明 - */ - @TableField(value = "auditRemark") - private String auditRemark; - - /** - * 目标仓库 - */ - @TableField(value = "targetInvCode") - private String targetInvCode; - - /** - * 目标部门 - */ - @TableField(value = "targetDeptCode") - private String targetDeptCode; - - /** - * 生成采购计划单据号 - */ - @TableField(value = "planBillNo") - private String planBillNo; - - /** - * 是否已生成采购计划 - */ - @TableField(value = "generatePlan") - private boolean generatePlan; - - - @TableField(value = "emergency") - private Integer emergency; - - /** - * 是否已生成采购计划 - */ - @TableField(value = "arrivalTime") - private Date arrivalTime; - - public static final String COL_ID = "id"; - - public static final String COL_BILLNO = "billNo"; - - public static final String COL_BILLDATE = "billDate"; - - public static final String COL_STATUS = "status"; - - public static final String COL_BILLTYPE = "billType"; - - public static final String COL_REMARK = "remark"; - - public static final String COL_INVCODE = "invCode"; - - public static final String COL_DEPTCODE = "deptCode"; - - public static final String COL_CREATEUSER = "createUser"; - - public static final String COL_CREATETIME = "createTime"; - - public static final String COL_AUDITUSER = "auditUser"; - - public static final String COL_AUDITTIME = "auditTime"; - - public static final String COL_UPDATEUSER = "updateUser"; - - public static final String COL_UPDATETIME = "updateTime"; - - public static final String COL_AUDITREMARK = "auditRemark"; - - public static final String COL_TARGETINVCODE = "targetInvCode"; - - public static final String COL_TARGETDEPTCODE = "targetDeptCode"; - - public static final String COL_PLANBILLNO = "planBillNo"; - - public static final String COL_GENERATEPLAN = "generatePlan"; -} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java deleted file mode 100644 index 5879df1..0000000 --- a/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.glxp.api.entity.purchase; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -@Data -@TableName(value = "pur_order_detail") -public class PurOrderDetailEntity { - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - /** - * 订单外键 - */ - @TableField(value = "orderIdFk") - private String orderIdFk; - - /** - * 产品ID - */ - @TableField(value = "productId") - private Integer productId; - - /** - * 产品名称 - */ - @TableField(value = "productName") - private String productName; - - /** - * 数量 - */ - @TableField(value = "`count`") - private Integer count; - - /** - * 供应商ID - */ - @TableField(value = "supId") - private String supId; - - /** - * 注册证备案证号 - */ - @TableField(value = "zczbhhzbapzbh") - private String zczbhhzbapzbh; - - public static final String COL_ID = "id"; - - public static final String COL_ORDERIDFK = "orderIdFk"; - - public static final String COL_PRODUCTID = "productId"; - - public static final String COL_PRODUCTNAME = "productName"; - - public static final String COL_COUNT = "count"; - - public static final String COL_SUPID = "supId"; - - public static final String COL_ZCZBHHZBAPZBH = "zczbhhzbapzbh"; -} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java deleted file mode 100644 index 1c725d3..0000000 --- a/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.glxp.api.entity.purchase; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; - -import java.util.Date; - -import lombok.Data; - -@Data -@TableName(value = "pur_order") -public class PurOrderEntity { - @TableId(value = "id", type = IdType.INPUT) - private Long id; - - /** - * 单据号 - */ - @TableField(value = "billNo") - private String billNo; - - /** - * 单据日期 - */ - @TableField(value = "billDate") - private Date billDate; - - /** - * 状态（1.草稿，2.未审核，3.已审核） - */ - @TableField(value = "`status`") - private Integer status; - - /** - * 订单类型 - */ - @TableField(value = "billType") - private String billType; - - /** - * 订单说明 - */ - @TableField(value = "remark") - private String remark; - - /** - * 当前分库 - */ - @TableField(value = "invCode") - private String invCode; - - /** - * 所属部门 - */ - @TableField(value = "deptCode") - private String deptCode; - - /** - * 创建人 - */ - @TableField(value = "`createUser`") - private String createUser; - - /** - * 创建时间 - */ - @TableField(value = "createTime") - private Date createTime; - - /** - * 审核人 - */ - @TableField(value = "auditUser") - private String auditUser; - - /** - * 审核时间 - */ - @TableField(value = "auditTime") - private Date auditTime; - - /** - * 审核说明 - */ - @TableField(value = "auditRemark") - private String auditRemark; - - /** - * 更新时间 - */ - @TableField(value = "updateTime") - private Date updateTime; - - /** - * 更新人 - */ - @TableField(value = "updateUser") - private String updateUser; - - /** - * 申购人 - */ - @TableField(value = "applyCreateUser") - private String applyCreateUser; - - /** - * 申购审核人 - */ - @TableField(value = "applyAuditUser") - private String applyAuditUser; - - /** - * 申购说明 - */ - @TableField(value = "applyRemark") - private String applyRemark; - - /** - * 申购单据号，多单以逗号隔开 - */ - @TableField(value = "applyBillNo") - private String applyBillNo; - - /** - * 生成采购入库业务单据 - */ - @TableField(value = "stockOrderNo") - private String stockOrderNo; - - @TableField(value = "emergency") - private Integer emergency; - - /** - * 是否已生成采购计划 - */ - @TableField(value = "arrivalTime") - private Date arrivalTime; - - public static final String COL_ID = "id"; - - public static final String COL_BILLNO = "billNo"; - - public static final String COL_BILLDATE = "billDate"; - - public static final String COL_STATUS = "status"; - - public static final String COL_BILLTYPE = "billType"; - - public static final String COL_REMARK = "remark"; - - public static final String COL_INVCODE = "invCode"; - - public static final String COL_DEPTCODE = "deptCode"; - - public static final String COL_CREATEUSER = "createUser"; - - public static final String COL_CREATETIME = "createTime"; - - public static final String COL_AUDITUSER = "auditUser"; - - public static final String COL_AUDITTIME = "auditTime"; - - public static final String COL_AUDITREMARK = "auditRemark"; - - public static final String COL_UPDATETIME = "updateTime"; - - public static final String COL_UPDATEUSER = "updateUser"; - - public static final String COL_APPLYCREATEUSER = "applyCreateUser"; - - public static final String COL_APPLYAUDITUSER = "applyAuditUser"; - - public static final String COL_APPLYREMARK = "applyRemark"; - - public static final String COL_APPLYBILLNO = "applyBillNo"; - - public static final String COL_STOCKORDERNO = "stockOrderNo"; -} diff --git a/src/main/java/com/glxp/api/entity/purchase/PurPlanDetailEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurPlanDetailEntity.java deleted file mode 100644 index 7f0bf46..0000000 --- a/src/main/java/com/glxp/api/entity/purchase/PurPlanDetailEntity.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.glxp.api.entity.purchase; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -@Data -@TableName(value = "pur_plan_detail") -public class PurPlanDetailEntity { - @TableId(value = "id", type = IdType.INPUT) - private Integer id; - - /** - * 订单外键 - */ - @TableField(value = "orderIdFk") - private String orderIdFk; - - /** - * 产品ID - */ - @TableField(value = "productId") - private Integer productId; - - /** - * 产品名称 - */ - @TableField(value = "productName") - private String productName; - - /** - * 数量 - */ - @TableField(value = "`count`") - private Integer count; - - /** - * 供应商ID - */ - @TableField(value = "supId") - private String supId; - - /** - * 注册证备案证号 - */ - @TableField(value = "zczbhhzbapzbh") - private String zczbhhzbapzbh; - - public static final String COL_ID = "id"; - - public static final String COL_ORDERIDFK = "orderIdFk"; - - public static final String COL_PRODUCTID = "productId"; - - public static final String COL_PRODUCTNAME = "productName"; - - public static final String COL_COUNT = "count"; - - public static final String COL_SUPID = "supId"; - - public static final String COL_ZCZBHHZBAPZBH = "zczbhhzbapzbh"; -} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java deleted file mode 100644 index f654c95..0000000 --- a/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java +++ /dev/null @@ -1,178 +0,0 @@ -package com.glxp.api.entity.purchase; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; -import lombok.Data; - -@Data -@TableName(value = "pur_plan") -public class PurPlanEntity { - @TableId(value = "id", type = IdType.INPUT) - private Long id; - - /** - * 单据号 - */ - @TableField(value = "billNo") - private String billNo; - - /** - * 单据日期 - */ - @TableField(value = "billDate") - private Date billDate; - - /** - * 状态（1.草稿，2.未审核，3.已审核） - */ - @TableField(value = "`status`") - private Integer status; - - /** - * 申购类型 - */ - @TableField(value = "billType") - private String billType; - - /** - * 申购说明 - */ - @TableField(value = "remark") - private String remark; - - /** - * 当前分库 - */ - @TableField(value = "invCode") - private String invCode; - - /** - * 所属部门 - */ - @TableField(value = "deptCode") - private String deptCode; - - /** - * 创建人 - */ - @TableField(value = "`createUser`") - private String createUser; - - /** - * 创建时间 - */ - @TableField(value = "createTime") - private Date createTime; - - /** - * 审核人 - */ - @TableField(value = "auditUser") - private String auditUser; - - /** - * 审核时间 - */ - @TableField(value = "auditTime") - private Date auditTime; - - /** - * 审核说明 - */ - @TableField(value = "auditRemark") - private String auditRemark; - - /** - * 更新时间 - */ - @TableField(value = "updateTime") - private Date updateTime; - - /** - * 更新人 - */ - @TableField(value = "updateUser") - private String updateUser; - - /** - * 申购人 - */ - @TableField(value = "applyCreateUser") - private String applyCreateUser; - - /** - * 申购审核人 - */ - @TableField(value = "applyAuditUser") - private String applyAuditUser; - - /** - * 申购说明 - */ - @TableField(value = "applyRemark") - private String applyRemark; - - /** - * 申购单据号，多单以逗号隔开 - */ - @TableField(value = "applyBillNo") - private String applyBillNo; - - /** - * 生成采购入库业务单据 - */ - @TableField(value = "stockOrderNo") - private String stockOrderNo; - - @TableField(value = "emergency") - private Integer emergency; - - /** - * 是否已生成采购计划 - */ - @TableField(value = "arrivalTime") - private Date arrivalTime; - - public static final String COL_ID = "id"; - - public static final String COL_BILLNO = "billNo"; - - public static final String COL_BILLDATE = "billDate"; - - public static final String COL_STATUS = "status"; - - public static final String COL_BILLTYPE = "billType"; - - public static final String COL_REMARK = "remark"; - - public static final String COL_INVCODE = "invCode"; - - public static final String COL_DEPTCODE = "deptCode"; - - public static final String COL_CREATEUSER = "createUser"; - - public static final String COL_CREATETIME = "createTime"; - - public static final String COL_AUDITUSER = "auditUser"; - - public static final String COL_AUDITTIME = "auditTime"; - - public static final String COL_AUDITREMARK = "auditRemark"; - - public static final String COL_UPDATETIME = "updateTime"; - - public static final String COL_UPDATEUSER = "updateUser"; - - public static final String COL_APPLYCREATEUser = "applyCreateUser"; - - public static final String COL_APPLYAUDITUser = "applyAuditUser"; - - public static final String COL_APPLYREMARK = "applyRemark"; - - public static final String COL_APPLYBILLNO = "applyBillNo"; - - public static final String COL_STOCKORDERNO = "stockOrderNo"; -} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/req/purchase/PostPurApplyRequest.java b/src/main/java/com/glxp/api/req/purchase/PostPurApplyRequest.java deleted file mode 100644 index a2b1d79..0000000 --- a/src/main/java/com/glxp/api/req/purchase/PostPurApplyRequest.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.glxp.api.req.purchase; - - -import com.glxp.api.entity.purchase.PurApplyDetailEntity; -import com.glxp.api.entity.purchase.PurApplyEntity; -import lombok.Data; - -import java.util.List; - -@Data -public class PostPurApplyRequest { - - Integer type; - int editStatus; - PurApplyEntity purApplyEntity; - List purApplyDetailEntities; -// List subErpOrders; - -} diff --git a/src/main/java/com/glxp/api/req/purchase/PostPurOrderRequest.java b/src/main/java/com/glxp/api/req/purchase/PostPurOrderRequest.java deleted file mode 100644 index 170118c..0000000 --- a/src/main/java/com/glxp/api/req/purchase/PostPurOrderRequest.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.glxp.api.req.purchase; - - -import com.glxp.api.entity.purchase.PurOrderDetailEntity; -import com.glxp.api.entity.purchase.PurOrderEntity; -import com.glxp.api.entity.purchase.PurPlanDetailEntity; -import com.glxp.api.entity.purchase.PurPlanEntity; -import lombok.Data; - -import java.util.List; - -@Data -public class PostPurOrderRequest { - - int editStatus; - PurOrderEntity purOrderEntity; - List purOrderDetailEntityList; -// List subErpOrders; - Integer type; - boolean autoPurchase; - String targetSubInv; - String targetBillAction; - String targetDeptCode; - - -} diff --git a/src/main/java/com/glxp/api/req/purchase/PostPurPlanRequest.java b/src/main/java/com/glxp/api/req/purchase/PostPurPlanRequest.java deleted file mode 100644 index a236719..0000000 --- a/src/main/java/com/glxp/api/req/purchase/PostPurPlanRequest.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.glxp.api.req.purchase; - - -import com.glxp.api.entity.purchase.PurPlanDetailEntity; -import com.glxp.api.entity.purchase.PurPlanEntity; -import lombok.Data; - -import java.util.List; - -@Data -public class PostPurPlanRequest { - - int editStatus; - PurPlanEntity purPlanEntity; - List purPlanDetailEntities; -// List subErpOrders; - Integer type; - boolean autoPurchase; - String targetSubInv; - String targetBillAction; - String targetDeptCode; - - -} diff --git a/src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java b/src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java deleted file mode 100644 index ac4dda2..0000000 --- a/src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.glxp.api.req.purchase; - -import com.glxp.api.util.page.ListPageRequest; -import lombok.Data; - -/** - * @author anthony.ywj - * @date 2022-10-12 - */ -@Data -public class PurApplyDetailRequest extends ListPageRequest { - - - private Long id; - - /** - * 关联申购单主键 - */ - private String orderIdFk; - - /** - * 申购单号 - */ - private String billNo; - - /** - * 物资编号 - */ - private Long productId; - - /** - * 物资名称 - */ - private String productName; - - /** - * 申购数量 - */ - private Long count; - - /** - * 供应商ID - */ - private String supId; - - /** - * 规格型号 - */ - private String spec; - - /** - * 注册证号 - */ - private String zczbhhzbapzbh; - - /** - * 生产企业 - */ - private String manufactory; - - /** - * 开始时间 - */ - private String startDate; - - /** - * 截止席间 - */ - private String endDate; -} diff --git a/src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java b/src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java deleted file mode 100644 index ca33868..0000000 --- a/src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.glxp.api.req.purchase; - - -import com.glxp.api.util.page.ListPageRequest; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.util.Date; - -/** - * pur业务对象 pur_apply - * - * @author anthony.ywj - * @date 2022-10-12 - */ -@Data -public class PurApplyRequest extends ListPageRequest { - - - - /** - * - */ - @NotNull(message = "不能为空") - private Integer id; - - /** - * 单据号 - */ - @NotBlank(message = "单据号不能为空") - private String billNo; - - /** - * 单据日期 - */ - @NotNull(message = "单据日期不能为空") - private Date billDate; - - /** - * 状态（1.草稿，2.未审核，3.已审核） - */ - @NotNull(message = "状态（1.草稿，2.未审核，3.已审核）不能为空") - private Integer status; - - /** - * 申购类型 - */ - @NotNull(message = "申购类型不能为空") - private String billType; - - /** - * 申购说明 - */ - @NotBlank(message = "申购说明不能为空") - private String remark; - - - /** - * 当前分库 - */ - @NotBlank(message = "当前仓不能为空") - private String invCode; - - /** - * 所属部门 - */ - @NotBlank(message = "所属部门不能为空") - private String deptCode; - - /** - * 审核人 - */ - @NotBlank(message = "审核人不能为空") - private String auditUser; - - /** - * 审核时间 - */ - @NotNull(message = "审核时间不能为空") - private Date auditTime; - - - private Date updateTime; - - private String createUser; - - /** - * 创建时间 - */ - private Date createTime; - - private String auditRemark; - - - private String targetInvCode; - private String targetDeptCode; - private String targetBillType; - - private String startDate; - private String endDate; - private Integer generatePlan; - private boolean audtoPlan; - - private Integer applyType; - private Integer emergency; - private Date arrivalTime; - private String startAuditDate; - private String endAuditDate; -} diff --git a/src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java b/src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java deleted file mode 100644 index 347b3dc..0000000 --- a/src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.glxp.api.req.purchase; - - -import com.glxp.api.util.page.ListPageRequest; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -@Data -public class PurOrderDetailRequest extends ListPageRequest { - - /** - * - */ - @NotNull(message = "不能为空") - private Long id; - - /** - * 订单外键 - */ - @NotBlank(message = "订单外键不能为空") - private String orderIdFk; - - /** - * 产品ID - */ - @NotNull(message = "产品ID不能为空") - private Long productId; - - /** - * 产品名称 - */ - @NotBlank(message = "产品名称不能为空") - private String productName; - - /** - * 数量 - */ - @NotNull(message = "数量不能为空") - private Long count; - - /** - * 供应商ID - */ - @NotBlank(message = "供应商ID不能为空") - private String supId; - - /** - * 采购计划单号 - */ - private String billNo; - - /** - * 规格型号 - */ - private String spec; - - /** - * 开始时间 - */ - private String startDate; - - /** - * 结束时间 - */ - private String endDate; - - /** - * 注册/凭证号 - */ - private String zczbhhzbapzbh; - - /** - * 生产企业 - */ - private String manufactory; - -} diff --git a/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java b/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java deleted file mode 100644 index 6621f8c..0000000 --- a/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.glxp.api.req.purchase; - - -import com.glxp.api.util.page.ListPageRequest; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.util.Date; - -/** - * pur业务对象 pur_plan - * - * @author anthony.ywj - * @date 2022-10-12 - */ - - -@Data -public class PurOrderRequest extends ListPageRequest { - - - /** - * - */ - @NotNull(message = "不能为空") - private Long id; - - /** - * 单据号 - */ - @NotBlank(message = "单据号不能为空") - private String billNo; - - /** - * 单据日期 - */ - @NotNull(message = "单据日期不能为空") - private Date billDate; - - /** - * 状态（1.草稿，2.未审核，3.已审核） - */ - @NotNull(message = "状态（1.草稿，2.未审核，3.已审核）不能为空") - private Integer status; - - /** - * 申购类型 - */ - @NotNull(message = "申购类型不能为空") - private Long billType; - - /** - * 申购说明 - */ - @NotBlank(message = "申购说明不能为空") - private String remark; - - /** - * 当前仓库 - */ - @NotBlank(message = "当前仓库不能为空") - private String invCode; - - /** - * 所属部门 - */ - @NotBlank(message = "所属部门不能为空") - private String deptCode; - - /** - * 审核人 - */ - @NotBlank(message = "审核人不能为空") - private String auditUser; - - /** - * 审核时间 - */ - @NotNull(message = "审核时间不能为空") - private Date auditTime; - - private String createUser; - - /** - * 创建时间 - */ - private Date createTime; - - private String startDate; - private String endDate; - - private Long applyId; - private Integer emergency; - private Date arrivalTime; - private String startAuditDate; - private String endAuditDate; - - - -} diff --git a/src/main/java/com/glxp/api/req/purchase/PurPlanDetailRequest.java b/src/main/java/com/glxp/api/req/purchase/PurPlanDetailRequest.java deleted file mode 100644 index 48a2fed..0000000 --- a/src/main/java/com/glxp/api/req/purchase/PurPlanDetailRequest.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.glxp.api.req.purchase; - - -import com.glxp.api.util.page.ListPageRequest; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -@Data -public class PurPlanDetailRequest extends ListPageRequest { - - /** - * - */ - @NotNull(message = "不能为空") - private Long id; - - /** - * 订单外键 - */ - @NotBlank(message = "订单外键不能为空") - private String orderIdFk; - - /** - * 产品ID - */ - @NotNull(message = "产品ID不能为空") - private Long productId; - - /** - * 产品名称 - */ - @NotBlank(message = "产品名称不能为空") - private String productName; - - /** - * 数量 - */ - @NotNull(message = "数量不能为空") - private Long count; - - /** - * 供应商ID - */ - @NotBlank(message = "供应商ID不能为空") - private String supId; - - /** - * 采购计划单号 - */ - private String billNo; - - /** - * 规格型号 - */ - private String spec; - - /** - * 开始时间 - */ - private String startDate; - - /** - * 结束时间 - */ - private String endDate; - - /** - * 注册/凭证号 - */ - private String zczbhhzbapzbh; - - /** - * 生产企业 - */ - private String manufactory; - -} diff --git a/src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java b/src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java deleted file mode 100644 index ec4d1bc..0000000 --- a/src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.glxp.api.req.purchase; - - -import com.glxp.api.util.page.ListPageRequest; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.util.Date; - -/** - * pur业务对象 pur_plan - * - * @author anthony.ywj - * @date 2022-10-12 - */ - - -@Data -public class PurPlanRequest extends ListPageRequest { - - - /** - * - */ - @NotNull(message = "不能为空") - private Long id; - - /** - * 单据号 - */ - @NotBlank(message = "单据号不能为空") - private String billNo; - - /** - * 单据日期 - */ - @NotNull(message = "单据日期不能为空") - private Date billDate; - - /** - * 状态（1.草稿，2.未审核，3.已审核） - */ - @NotNull(message = "状态（1.草稿，2.未审核，3.已审核）不能为空") - private Integer status; - - /** - * 申购类型 - */ - @NotNull(message = "申购类型不能为空") - private Long billType; - - /** - * 申购说明 - */ - @NotBlank(message = "申购说明不能为空") - private String remark; - - /** - * 当前仓库 - */ - @NotBlank(message = "当前仓库不能为空") - private String invCode; - - /** - * 所属部门 - */ - @NotBlank(message = "所属部门不能为空") - private String deptCode; - - /** - * 审核人 - */ - @NotBlank(message = "审核人不能为空") - private String auditUser; - - /** - * 审核时间 - */ - @NotNull(message = "审核时间不能为空") - private Date auditTime; - - private String createUser; - - /** - * 创建时间 - */ - private Date createTime; - - private String startDate; - private String endDate; - - private Long applyId; - private Integer emergency; - private Date arrivalTime; - private String startAuditDate; - private String endAuditDate; - - - -} diff --git a/src/main/java/com/glxp/api/req/purchase/purReceiveRequest.java b/src/main/java/com/glxp/api/req/purchase/purReceiveRequest.java deleted file mode 100644 index a6d2052..0000000 --- a/src/main/java/com/glxp/api/req/purchase/purReceiveRequest.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.glxp.api.req.purchase; - -import lombok.Data; - -@Data -public class purReceiveRequest { - - private String id; - private String orderId; -} diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java deleted file mode 100644 index 99287ec..0000000 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.glxp.api.service.basic; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; -import com.glxp.api.req.basic.FilterBusTypeChangeRequest; -import com.glxp.api.res.basic.BasicBusTypeChangeResponse; - -import java.util.Date; -import java.util.List; - -/** - * 单据生成设置Service - */ -public interface IBasicBusTypeChangeService extends IService { - - - BasicBusTypeChangeEntity selectByOriginAction(String action); - - /** - * 查询单据生成设置列表 - * - * @param filterBusTypeChangeRequest - * @return - */ - List filterList(FilterBusTypeChangeRequest filterBusTypeChangeRequest); - - /** - * 新增单据生成设置 - * - * @param basicBusTypeChangeEntity - * @return - */ - int insert(BasicBusTypeChangeEntity basicBusTypeChangeEntity); - - /** - * 更新单据生成设置 - * - * @param basicBusTypeChangeEntity - */ - boolean updateBasicBusTypeChange(BasicBusTypeChangeEntity basicBusTypeChangeEntity); - - /** - * 删除单据生成设置 - * - * @param id - */ - boolean deleteById(String id); - - /** - * 校验数据是否存在 - * - * @param basicBusTypeChangeEntity - * @return - */ - boolean verifyExists(BasicBusTypeChangeEntity basicBusTypeChangeEntity); - - - List findByLastTime(Date lastUpdateTime); - - boolean insertVerifyExists(BasicBusTypeChangeEntity basicBusTypeChangeEntity); - - -} diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java deleted file mode 100644 index 5a3094e..0000000 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.glxp.api.service.basic; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.glxp.api.entity.basic.BasicBusTypePreEntity; -import com.glxp.api.req.basic.FilterBusTypeChangeRequest; -import com.glxp.api.req.basic.FilterBusTypePreRequest; -import com.glxp.api.res.basic.BasicBusTypePreResponse; - -import java.util.Date; -import java.util.List; - -/** - * 补单单据类型Service - */ -public interface IBasicBusTypePreService extends IService { - - /** - * 查询补单单据类型数据列表 - * - * @param busTypeChangeFilterRequest - * @return - */ - List filterAll(FilterBusTypeChangeRequest busTypeChangeFilterRequest); - - /** - * 根据ID删除补单单据类型 - * - * @param id - * @return - */ - boolean deleteById(String id); - - /** - * 根据单据类型编码删除补单单据类型 - * - * @param action - * @return - */ - - boolean deleteByAction(String action); - - /** - * 更新补单单据类型 - * - * @param basicBusTypePreEntity - * @return - */ - - boolean updateBusChangeType(BasicBusTypePreEntity basicBusTypePreEntity); - - /** - * 新增补单单据类型 - * - * @param basicBusTypePreEntity - * @return - */ - boolean insertBusChangeType(BasicBusTypePreEntity basicBusTypePreEntity); - - /** - * 通过单据类型编码查询补单设置 - * - * @param action - * @return - */ - List findByAction(String action); - - /** - * 查询单据流转列表数据 - * - * @param filterBusTypePreRequest - * @return - */ - List filterBusTypePreResList(FilterBusTypePreRequest filterBusTypePreRequest); - - - BasicBusTypePreEntity findByOriginAction(String originAction); - - /** - * 校验数据是否重复 - * - * @param basicBusTypePreEntity - * @return - */ - boolean verifyExists(BasicBusTypePreEntity basicBusTypePreEntity); - - List findByLastTime(Date lastUpdateTime); -} diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java b/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java deleted file mode 100644 index f3bc139..0000000 --- a/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.glxp.api.service.basic; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.req.basic.FilterBussinessTypeRequest; -import com.glxp.api.res.basic.BasicBussinessTypeResponse; - -import java.util.Date; -import java.util.List; - -/** - * 单据类型Service - */ -public interface IBasicBussinessTypeService extends IService { - - /** - * 查询单据类型列表 - * - * @param filterBussinessTypeRequest - * @return - */ - List filterList(FilterBussinessTypeRequest filterBussinessTypeRequest); - - List filterJoinByUser(FilterBussinessTypeRequest filterBussinessTypeRequest); - - List filterJoinByInv(FilterBussinessTypeRequest filterBussinessTypeRequest); - - - /** - * 添加单据类型 - * - * @param bussinessTypeEntity - * @return - */ - - boolean insertBussinessType(BasicBussinessTypeEntity bussinessTypeEntity); - - /** - * 更新单据类型 - * - * @param basicBussinessTypeEntity - * @return - */ - boolean updateBussinessType(BasicBussinessTypeEntity basicBussinessTypeEntity); - - /** - * 删除单据类型 - * - * @param id - * @return - */ - boolean deleteBussinessType(String id); - - /** - * 通过单据类型编码查询单据类型数据 - * - * @param action - * @return - */ - BasicBussinessTypeEntity findByAction(String action); - - /** - * 根据ID查询单据类型数据 - * - * @param id - * @return - */ - BasicBussinessTypeEntity selectById(String id); - - /** - * 忽略已存在单据数据进行替换 - * - * @param bussinessTypeEntity - */ - boolean insertIgnoreBussinessType(BasicBussinessTypeEntity bussinessTypeEntity, String id); - - /** - * 查询单据类型实体列表，不分页 - * - * @param bussinessTypeFilterRequest - * @return - */ - List findList(FilterBussinessTypeRequest bussinessTypeFilterRequest); - - /** - * 查询补单候选单据类型 - * - * @param mainAction - * @return - */ - List candidateBussinessType(String mainAction); - - /** - * 第三方系统，单据提交接口，查询未绑定的单据类型 - * - * @return - */ - List filterForThirdSys(); - - /** - * 查询用户关联单据类型 - * - * @param filterBussinessTypeRequest - * @return - */ - List filterByUser(FilterBussinessTypeRequest filterBussinessTypeRequest); - - /** - * 校验单据类型名称是否重复 - * - * @param name 单据类型名称 - * @param id 单据类型ID - * @return - */ - boolean checkBusTypeNameExists(String name, Long id); - - List selectIgnoreSelf(String action); - - - List findByVueType(String vueType); - - List selectbyNotAction(List list); - - List findByLastTime(Date lastUpdateTime); -} diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java deleted file mode 100644 index 716fe8b..0000000 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.glxp.api.service.basic.impl; - -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.basic.BasicBusTypeChangeDao; -import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; -import com.glxp.api.req.basic.FilterBusTypeChangeRequest; -import com.glxp.api.res.basic.BasicBusTypeChangeResponse; -import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.basic.IBasicBusTypeChangeService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.Collections; -import java.util.Date; -import java.util.List; - -@Slf4j -@Service -@Transactional(rollbackFor = Exception.class) -public class BasicBusTypeChangeServiceImpl extends ServiceImpl implements IBasicBusTypeChangeService { - - @Resource - private CustomerService customerService; - @Resource - private BasicBusTypeChangeDao basicBusTypeChangeDao; - - @Override - public BasicBusTypeChangeEntity selectByOriginAction(String action) { - return basicBusTypeChangeDao.selectOne(new QueryWrapper().eq("originAction", action)); - } - - @Override - public List filterList(FilterBusTypeChangeRequest filterBusTypeChangeRequest) { - if (null == filterBusTypeChangeRequest) { - return Collections.emptyList(); - } - if (null != filterBusTypeChangeRequest.getPage() && null != filterBusTypeChangeRequest.getLimit()) { - PageHelper.offsetPage((filterBusTypeChangeRequest.getPage() - 1) * filterBusTypeChangeRequest.getLimit(), filterBusTypeChangeRequest.getLimit()); - } - return basicBusTypeChangeDao.filterList(filterBusTypeChangeRequest); - } - - @Override - public int insert(BasicBusTypeChangeEntity basicBusTypeChangeEntity) { - setUpdateInfo(basicBusTypeChangeEntity); - return basicBusTypeChangeDao.insert(basicBusTypeChangeEntity); - } - - @Override - public boolean updateBasicBusTypeChange(BasicBusTypeChangeEntity basicBusTypeChangeEntity) { - setUpdateInfo(basicBusTypeChangeEntity); - return basicBusTypeChangeDao.updateById(basicBusTypeChangeEntity) != 0; - } - - @Override - public boolean deleteById(String id) { - return basicBusTypeChangeDao.deleteById(id) != 0; - } - - @Override - public boolean verifyExists(BasicBusTypeChangeEntity basicBusTypeChangeEntity) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("originAction", basicBusTypeChangeEntity.getOriginAction()) - .eq("targetAction", basicBusTypeChangeEntity.getTargetAction()) - .eq("originName", basicBusTypeChangeEntity.getOriginName()).ne("id", basicBusTypeChangeEntity.getId()); - return basicBusTypeChangeDao.exists(wrapper); - } - - - @Override - public boolean insertVerifyExists(BasicBusTypeChangeEntity basicBusTypeChangeEntity) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("originAction", basicBusTypeChangeEntity.getOriginAction()) - .eq("targetAction", basicBusTypeChangeEntity.getTargetAction()) - .eq("originName", basicBusTypeChangeEntity.getOriginName()); - return basicBusTypeChangeDao.exists(wrapper); - } - - @Override - public List findByLastTime(Date lastUpdateTime) { - return basicBusTypeChangeDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); - } - - private void setUpdateInfo(BasicBusTypeChangeEntity basicBusTypeChangeEntity) { - Date now = new Date(); - String userId = String.valueOf(customerService.getUserBean().getId()); - basicBusTypeChangeEntity.setUpdateTime(now); - basicBusTypeChangeEntity.setUpdateUser(userId); - if (null == basicBusTypeChangeEntity.getId()) { - basicBusTypeChangeEntity.setCreateTime(now); - basicBusTypeChangeEntity.setCreateUser(userId); - } - } -} diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java deleted file mode 100644 index e549a11..0000000 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.glxp.api.service.basic.impl; - -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.basic.BasicBusTypePreDao; -import com.glxp.api.entity.basic.BasicBusTypePreEntity; -import com.glxp.api.req.basic.FilterBusTypeChangeRequest; -import com.glxp.api.req.basic.FilterBusTypePreRequest; -import com.glxp.api.res.basic.BasicBusTypePreResponse; -import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.basic.IBasicBusTypePreService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.Collections; -import java.util.Date; -import java.util.List; - -@Slf4j -@Service -@Transactional(rollbackFor = Exception.class) -public class BasicBusTypePreServiceImpl extends ServiceImpl implements IBasicBusTypePreService { - - @Resource - private BasicBusTypePreDao basicBusTypePreDao; - @Resource - private CustomerService customerService; - - @Override - public List filterAll(FilterBusTypeChangeRequest busTypeChangeFilterRequest) { - if (null != busTypeChangeFilterRequest.getPage() && null != busTypeChangeFilterRequest.getLimit()) { - PageHelper.offsetPage((busTypeChangeFilterRequest.getPage() - 1) * busTypeChangeFilterRequest.getLimit(), busTypeChangeFilterRequest.getLimit()); - } - return basicBusTypePreDao.filterList(busTypeChangeFilterRequest); - } - - @Override - public boolean deleteById(String id) { - return basicBusTypePreDao.deleteById(id) != 0; - } - - @Override - public boolean deleteByAction(String action) { - return basicBusTypePreDao.deleteByAction(action); - } - - @Override - public boolean updateBusChangeType(BasicBusTypePreEntity basicBusTypePreEntity) { - setUpdateInfo(basicBusTypePreEntity); - return basicBusTypePreDao.updateById(basicBusTypePreEntity) != 0; - } - - @Override - public boolean insertBusChangeType(BasicBusTypePreEntity basicBusTypePreEntity) { - setUpdateInfo(basicBusTypePreEntity); - return basicBusTypePreDao.insert(basicBusTypePreEntity) != 0; - } - - @Override - public List findByAction(String action) { - return basicBusTypePreDao.findByAction(action); - } - - @Override - public List filterBusTypePreResList(FilterBusTypePreRequest filterBusTypePreRequest) { - if (null == filterBusTypePreRequest) { - return Collections.emptyList(); - } - if (null != filterBusTypePreRequest.getPage() && null != filterBusTypePreRequest.getLimit()) { - PageHelper.offsetPage((filterBusTypePreRequest.getPage() - 1) * filterBusTypePreRequest.getLimit(), filterBusTypePreRequest.getLimit()); - } - return basicBusTypePreDao.selectBusTypePreResList(filterBusTypePreRequest); - } - - @Override - public BasicBusTypePreEntity findByOriginAction(String originAction) { - return basicBusTypePreDao.selectOne(new QueryWrapper().eq("originAction", originAction)); - } - - @Override - public boolean verifyExists(BasicBusTypePreEntity basicBusTypePreEntity) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("action", basicBusTypePreEntity.getAction()) - .eq("originAction", basicBusTypePreEntity.getOriginAction()) - .eq("invCode", basicBusTypePreEntity.getInvCode()) - .eq(null != basicBusTypePreEntity.getBeforeTime(), "beforeTime", basicBusTypePreEntity.getBeforeTime()) - .eq(null != basicBusTypePreEntity.getDefaultInvCode(), "defaultInvCode", basicBusTypePreEntity.getDefaultInvCode()) - .eq(null != basicBusTypePreEntity.getSupplementAll(), "supplementAll", basicBusTypePreEntity.getSupplementAll()); - - List list = basicBusTypePreDao.selectList(wrapper); - if (CollUtil.isNotEmpty(list)) { - if (null != basicBusTypePreEntity.getId()) { - for (BasicBusTypePreEntity busTypePreEntity : list) { - if (busTypePreEntity.getId() != basicBusTypePreEntity.getId()) { - return true; - } - } - } else { - return true; - } - } - return false; - } - - @Override - public List findByLastTime(Date lastUpdateTime) { - return basicBusTypePreDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); - } - - /** - * 设置创建/更新信息 - * - * @param basicBusTypePreEntity - */ - private void setUpdateInfo(BasicBusTypePreEntity basicBusTypePreEntity) { - Date now = new Date(); - String userId = customerService.getUserIdStr(); - if (null == basicBusTypePreEntity.getId()) { - basicBusTypePreEntity.setCreateUser(userId); - basicBusTypePreEntity.setCreateTime(now); - } - basicBusTypePreEntity.setUpdateUser(userId); - basicBusTypePreEntity.setUpdateTime(now); - } -} 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 deleted file mode 100644 index 5cdcdf5..0000000 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.glxp.api.service.basic.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.glxp.api.constant.Constant; -import com.glxp.api.constant.ConstantStatus; -import com.glxp.api.constant.ConstantType; -import com.glxp.api.dao.basic.BasicBussinessTypeDao; -import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.req.basic.FilterBussinessTypeRequest; -import com.glxp.api.res.basic.BasicBussinessTypeResponse; -import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.basic.IBasicBussinessTypeService; -import com.glxp.api.service.system.SystemParamConfigService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -@Slf4j -@Service -@Transactional(rollbackFor = Exception.class) -public class BasicBussinessTypeServiceImpl extends ServiceImpl implements IBasicBussinessTypeService { - - @Resource - private CustomerService customerService; - @Resource - private BasicBussinessTypeDao basicBussinessTypeDao; - - @Override - public List filterList(FilterBussinessTypeRequest filterBussinessTypeRequest) { - if (null == filterBussinessTypeRequest) { - return Collections.emptyList(); - } - if (null != filterBussinessTypeRequest.getPage() && null != filterBussinessTypeRequest.getLimit()) { - PageHelper.offsetPage((filterBussinessTypeRequest.getPage() - 1) * filterBussinessTypeRequest.getLimit(), filterBussinessTypeRequest.getLimit()); - } - return basicBussinessTypeDao.filterList(filterBussinessTypeRequest); - } - - @Override - public List filterJoinByUser(FilterBussinessTypeRequest filterBussinessTypeRequest) { - if (null == filterBussinessTypeRequest) { - return Collections.emptyList(); - } - if (null != filterBussinessTypeRequest.getPage() && null != filterBussinessTypeRequest.getLimit()) { - PageHelper.offsetPage((filterBussinessTypeRequest.getPage() - 1) * filterBussinessTypeRequest.getLimit(), filterBussinessTypeRequest.getLimit()); - } - return basicBussinessTypeDao.filterJoinByUser(filterBussinessTypeRequest); - } - - @Override - public List filterJoinByInv(FilterBussinessTypeRequest filterBussinessTypeRequest) { - return basicBussinessTypeDao.filterJoinByInv(filterBussinessTypeRequest); - } - - @Override - public boolean insertBussinessType(BasicBussinessTypeEntity bussinessTypeEntity) { - //设置创建时间和更新时间数据 - setUpdateInfo(bussinessTypeEntity); - setSupplementOrderType(bussinessTypeEntity); - return basicBussinessTypeDao.insert(bussinessTypeEntity) != 0; - } - - @Override - public boolean updateBussinessType(BasicBussinessTypeEntity basicBussinessTypeEntity) { - //设置更新时间等数据 - setUpdateInfo(basicBussinessTypeEntity); - setSupplementOrderType(basicBussinessTypeEntity); - return basicBussinessTypeDao.updateById(basicBussinessTypeEntity) != 0; - } - - /** - * 处理平衡补单单据类型逻辑 - * - * @param basicBussinessTypeEntity - */ - private void setSupplementOrderType(BasicBussinessTypeEntity basicBussinessTypeEntity) { - boolean isExit = basicBussinessTypeDao.exists(new QueryWrapper().eq(basicBussinessTypeEntity.getId() != null, "id", basicBussinessTypeEntity.getId())); - if (null == basicBussinessTypeEntity.getId() || !isExit) { - //处理添加新单据类型时的平衡补单逻辑 - if (StrUtil.isNotBlank(basicBussinessTypeEntity.getSupplementOrderType())) { - //查询平衡补单的单据类型数据是否存在 - BasicBussinessTypeEntity supplementType = findByAction(basicBussinessTypeEntity.getSupplementOrderType()); - if (null != supplementType) { - supplementType.setSupplementOrderType(basicBussinessTypeEntity.getAction()); - basicBussinessTypeDao.updateById(supplementType); - } - } - } else { - //更新时处理补单类型逻辑 - if (StrUtil.isBlank(basicBussinessTypeEntity.getSupplementOrderType())) { - //查询当前单据类型完整数据 - BasicBussinessTypeEntity currentBusType = findByAction(basicBussinessTypeEntity.getAction()); - //查询补单类型的数据 - BasicBussinessTypeEntity supplementType = findByAction(currentBusType.getSupplementOrderType()); - if (null != supplementType) { - supplementType.setSupplementOrderType(""); - basicBussinessTypeDao.updateById(supplementType); - } - } else { - //补单类型不为空,查询出补单类型数据，将对向单据设置为当前单据类型的编码 - BasicBussinessTypeEntity supplementType = findByAction(basicBussinessTypeEntity.getSupplementOrderType()); - supplementType.setSupplementOrderType(basicBussinessTypeEntity.getAction()); - basicBussinessTypeDao.updateById(supplementType); - } - } - } - - @Override - public boolean deleteBussinessType(String id) { - return basicBussinessTypeDao.deleteById(id) == 0 ? false : true; - } - - @Override - public BasicBussinessTypeEntity findByAction(String action) { - if (StrUtil.isNotBlank(action)) { - return basicBussinessTypeDao.selectOne(new QueryWrapper().eq("action", action)); - } - return null; - } - - @Override - public BasicBussinessTypeEntity selectById(String id) { - if (StrUtil.isNotBlank(id)) { - return basicBussinessTypeDao.selectById(id); - } - return null; - } - - @Override - public boolean insertIgnoreBussinessType(BasicBussinessTypeEntity bussinessTypeEntity, String id) { - setUpdateInfoById(bussinessTypeEntity, id); - return basicBussinessTypeDao.insertIgnoreBussinessType(bussinessTypeEntity); - } - - @Override - public List findList(FilterBussinessTypeRequest bussinessTypeFilterRequest) { - //构造查询参数 - return basicBussinessTypeDao.selectBusList(bussinessTypeFilterRequest); - } - - @Override - public List candidateBussinessType(String mainAction) { - if (mainAction.equals(ConstantType.TYPE_OUT)) { - mainAction = ConstantType.TYPE_PUT; - } else { - mainAction = ConstantType.TYPE_OUT; - } - return basicBussinessTypeDao.selectCandidateBusType(mainAction); - } - - @Override - public List filterForThirdSys() { - //查询第三方系统，订单提交接口未绑定的单据类型 - return basicBussinessTypeDao.selectForThirdSys(); - } - - @Override - public List filterByUser(FilterBussinessTypeRequest filterBussinessTypeRequest) { - if (null == filterBussinessTypeRequest) { - return Collections.emptyList(); - } - if (null != filterBussinessTypeRequest.getPage() && null != filterBussinessTypeRequest.getLimit()) { - PageHelper.offsetPage((filterBussinessTypeRequest.getPage() - 1) * filterBussinessTypeRequest.getLimit(), filterBussinessTypeRequest.getLimit()); - } - return basicBussinessTypeDao.selectByUser(filterBussinessTypeRequest); - } - - @Override - public boolean checkBusTypeNameExists(String name, Long id) { - List list = basicBussinessTypeDao.selectList(new QueryWrapper().select("name", "id").eq("name", name)); - if (CollUtil.isEmpty(list)) { - return false; - } else { - //存在同名单据类型，校验ID是否相同，如果不相同则表示存在相同数据 - if (null != id) { - for (BasicBussinessTypeEntity basicBussinessTypeEntity : list) { - if (basicBussinessTypeEntity.getId().equals(id)) { - return false; - } - } - } - } - return true; - } - - @Override - public List selectIgnoreSelf(String action) { - List list = basicBussinessTypeDao.selectList(new QueryWrapper().ne("action", action)); - return list; - } - - - @Resource - SystemParamConfigService systemParamConfigService; - - @Override - public List findByVueType(String vueType) { - - List bussinessTypeEntities = null; - - switch (vueType) { - case Constant.ORDER_ACTION_NOR_DETAIL: - bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper() - .eq("actionType", 1).eq("inStock", true).eq("enable", true)); - break; - - case Constant.ORDER_ACTION_PRE_DETAIL: - bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper() - .eq("actionType", 3).eq("inStock", true).eq("enable", true)); - break; - case Constant.ORDER_ACTION_PREIN_DETAIL: - bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper() - .eq("actionType", 2).eq("inStock", true).eq("enable", true)); - break; - case Constant.ORDER_ACTION_SUP_DELIVERY: - //允许送货单直接入库变更库存,则不判断送货单是否入库 - String deliveryInstock = systemParamConfigService.selectValueByParamKey("deliveryInstock"); - if (StrUtil.isNotEmpty(deliveryInstock) && deliveryInstock.equals("1")) { - bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper() - .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT) - .gt("spUse", 1).eq("enable", true)); - } else { - bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper() - .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT) - .gt("spUse", 1).eq("inStock", false).eq("enable", true)); - } - - break; - case Constant.ORDER_ACTION_SUP_INVOICE: - bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper() - .eq("mainAction", ConstantType.TYPE_PUT) - .gt("spUse", 0).eq("actionType", 1).eq("enable", true)); - break; - - - case Constant.ORDER_ACTION_SUP_DELAUDIT: //供应商审核送货单 - bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper() - .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT) - .gt("spUse", 1).eq("enable", true)); - break; - - case Constant.ORDER_ACTION_SUP_INOUT: //供应商查询出入库单 - bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper() - .gt("spUse", 0).eq("enable", true)); - break; - case Constant.ORDER_ACTION_SUP_PREIN: - bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper() - .gt("spUse", 0).eq("enable", true).eq("corpType", ConstantStatus.CORP_TYPE_OUT).eq("actionType", 2) - .eq("inStock", true)); - - default: - break; - } - - return bussinessTypeEntities; - } - - /** - * 统一设置创建/更新信息 - * - * @param bussinessTypeEntity - */ - private void setUpdateInfo(BasicBussinessTypeEntity bussinessTypeEntity) { - Date now = new Date(); - String userId = String.valueOf(customerService.getUserBean().getId()); - if (null == bussinessTypeEntity.getId()) { - bussinessTypeEntity.setCreateUser(userId); - bussinessTypeEntity.setCreateTime(now); - } - bussinessTypeEntity.setUpdateUser(userId); - bussinessTypeEntity.setUpdateTime(now); - } - - - private void setUpdateInfoById(BasicBussinessTypeEntity bussinessTypeEntity, String id) { - Date now = new Date(); - - - bussinessTypeEntity.setCreateUser(id); - bussinessTypeEntity.setCreateTime(now); - - bussinessTypeEntity.setUpdateUser(id); - bussinessTypeEntity.setUpdateTime(now); - } - - @Override - public List selectbyNotAction(List list) { - return basicBussinessTypeDao.selectbyNotAction(list); - } - - @Override - public List findByLastTime(Date lastUpdateTime) { - return basicBussinessTypeDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); - } -} diff --git a/src/main/java/com/glxp/api/service/purchase/PurApplyDetailService.java b/src/main/java/com/glxp/api/service/purchase/PurApplyDetailService.java deleted file mode 100644 index 269f50b..0000000 --- a/src/main/java/com/glxp/api/service/purchase/PurApplyDetailService.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.glxp.api.service.purchase; - - -import com.glxp.api.entity.purchase.PurApplyDetailEntity; -import com.glxp.api.req.purchase.PurApplyDetailRequest; -import com.glxp.api.res.purchase.PurOrderDetailResponse; - -import java.util.List; - -public interface PurApplyDetailService { - - List queryPageList(PurApplyDetailRequest purApplyRequest); - - List findByOrderId(String orderId); - - List joinQueryList(PurApplyDetailRequest purApplyRequest); - - - Boolean insert(PurApplyDetailEntity purApplyRequest); - - Boolean update(PurApplyDetailEntity purApplyRequest); - - Boolean deleteByIds(List ids); - - Boolean deleteByOrderId(String orderIdfK); - - List selectPurApplyDetailList(PurApplyDetailRequest purApplyRequest); - - boolean insertPurApplyDetailEntity(List purApplyDetailEntityList); - - /** - * 查询申购单据明细列表 - * - * @param purApplyDetailRequest - * @return - */ - List getDetailList(PurApplyDetailRequest purApplyDetailRequest); -} diff --git a/src/main/java/com/glxp/api/service/purchase/PurApplyService.java b/src/main/java/com/glxp/api/service/purchase/PurApplyService.java deleted file mode 100644 index 39e4798..0000000 --- a/src/main/java/com/glxp/api/service/purchase/PurApplyService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.glxp.api.service.purchase; - - - -import com.glxp.api.entity.purchase.PurApplyEntity; -import com.glxp.api.req.purchase.PurApplyRequest; -import com.glxp.api.res.purchase.PurApplyResponse; - -import java.util.List; - -public interface PurApplyService { - - List queryPageList(PurApplyRequest purApplyRequest); - - Integer insert(PurApplyEntity purApplyEntity); - - Boolean update(PurApplyEntity purApplyRequest); - - Boolean deleteByIds(List ids); - - Boolean deleteById(long id); -} diff --git a/src/main/java/com/glxp/api/service/purchase/PurOrderDetailService.java b/src/main/java/com/glxp/api/service/purchase/PurOrderDetailService.java deleted file mode 100644 index 6463f80..0000000 --- a/src/main/java/com/glxp/api/service/purchase/PurOrderDetailService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.glxp.api.service.purchase; - - -import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.purchase.PurOrderDetailEntity; -import com.glxp.api.req.purchase.PurOrderDetailRequest; -import com.glxp.api.res.purchase.PurOrderDetailResponse; - -import java.util.List; - -public interface PurOrderDetailService { - - List joinQueryList(PurOrderDetailRequest purOrderDetailRequest); - - - List findByOrderId(String orderId); - - List queryPageList(PurOrderDetailRequest purOrderDetailRequest); - - List getPurOrderDetailEntityList(PurOrderDetailRequest purOrderDetailRequest); - - Boolean insert(PurOrderDetailEntity purOrderDetailEntity); - - Boolean update(PurOrderDetailEntity purOrderDetailEntity); - - Boolean deleteByIds(List ids); - - Boolean deleteByOrderId(String orderIdfK); - - boolean insertPurOrderDetailEntity(List purOrderDetailEntityList); - - BasicProductsEntity selectIoOrderDetailBiz(long id); - - List getDetailList(PurOrderDetailRequest purOrderDetailRequest); -} diff --git a/src/main/java/com/glxp/api/service/purchase/PurPlanDetailService.java b/src/main/java/com/glxp/api/service/purchase/PurPlanDetailService.java deleted file mode 100644 index 4020566..0000000 --- a/src/main/java/com/glxp/api/service/purchase/PurPlanDetailService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.glxp.api.service.purchase; - - -import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.purchase.PurPlanDetailEntity; -import com.glxp.api.req.purchase.PurPlanDetailRequest; -import com.glxp.api.res.purchase.PurOrderDetailResponse; - -import java.util.List; - -public interface PurPlanDetailService { - - List joinQueryList(PurPlanDetailRequest purApplyRequest); - - - List findByOrderId(String orderId); - - List queryPageList(PurPlanDetailRequest purPlanDetailRequest); - - List getPurPlanDetailEntityList(PurPlanDetailRequest purPlanDetailRequest); - - Boolean insert(PurPlanDetailEntity purPlanDetailRequest); - - Boolean update(PurPlanDetailEntity purPlanDetailRequest); - - Boolean deleteByIds(List ids); - - Boolean deleteByOrderId(String orderIdfK); - - boolean insertPurPlanDetailEntity(List purPlanDetailEntityList); - - BasicProductsEntity selectIoOrderDetailBiz(long id); - - List getDetailList(PurPlanDetailRequest purPlanDetailRequest); -} diff --git a/src/main/java/com/glxp/api/service/purchase/PurPlanService.java b/src/main/java/com/glxp/api/service/purchase/PurPlanService.java deleted file mode 100644 index 8a1bd18..0000000 --- a/src/main/java/com/glxp/api/service/purchase/PurPlanService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.glxp.api.service.purchase; - - - -import com.glxp.api.entity.purchase.PurPlanEntity; -import com.glxp.api.req.purchase.PurPlanRequest; -import com.glxp.api.res.purchase.PurPlanResponse; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface PurPlanService { - - List queryPageList(PurPlanRequest purPlanRequest); - - Boolean insert(PurPlanEntity purPlanRequest); - - Boolean update(PurPlanEntity purPlanRequest); - - Boolean deleteByIds(List ids); - - Boolean deleteById(long id); - - -} diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java deleted file mode 100644 index b5fc16e..0000000 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.glxp.api.service.purchase.impl; - -import com.github.pagehelper.PageHelper; - -import com.glxp.api.dao.purchase.PurApplyDetailDao; -import com.glxp.api.entity.purchase.PurApplyDetailEntity; -import com.glxp.api.req.purchase.PurApplyDetailRequest; -import com.glxp.api.res.purchase.PurOrderDetailResponse; -import com.glxp.api.service.purchase.PurApplyDetailService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.Collections; -import java.util.List; - -@Service -@Transactional(rollbackFor = Exception.class) -public class PurApplyDetailImplService implements PurApplyDetailService { - - - @Resource - PurApplyDetailDao purApplyDetailDao; - - @Override - public List queryPageList(PurApplyDetailRequest purApplyRequest) { - if (purApplyRequest == null) { - return Collections.emptyList(); - } - if (purApplyRequest.getPage() != null) { - int offset = (purApplyRequest.getPage() - 1) * purApplyRequest.getLimit(); - PageHelper.offsetPage(offset, purApplyRequest.getLimit()); - } - List data = purApplyDetailDao.queryPageList(purApplyRequest); - return data; - } - - @Override - public List findByOrderId(String orderId) { - if (orderId == null) { - return null; - } - PurApplyDetailRequest purApplyDetailRequest = new PurApplyDetailRequest(); - purApplyDetailRequest.setOrderIdFk(orderId); - List data = purApplyDetailDao.queryPageList(purApplyDetailRequest); - return data; - } - - @Override - public List joinQueryList(PurApplyDetailRequest purApplyRequest) { - if (purApplyRequest == null) { - return Collections.emptyList(); - } - if (purApplyRequest.getPage() != null) { - int offset = (purApplyRequest.getPage() - 1) * purApplyRequest.getLimit(); - PageHelper.offsetPage(offset, purApplyRequest.getLimit()); - } - List data = purApplyDetailDao.joinQueryList(purApplyRequest); - return data; - } - - @Override - public Boolean insert(PurApplyDetailEntity purApplyRequest) { - return purApplyDetailDao.insert(purApplyRequest); - } - - @Override - public Boolean update(PurApplyDetailEntity purApplyRequest) { - return purApplyDetailDao.update(purApplyRequest); - } - - @Override - public Boolean deleteByIds(List ids) { - return purApplyDetailDao.deleteByIds(ids); - } - - @Override - public Boolean deleteByOrderId(String orderIdfK) { - return purApplyDetailDao.deleteByOrderId(orderIdfK); - } - - @Override - public List selectPurApplyDetailList(PurApplyDetailRequest purApplyRequest) { - return purApplyDetailDao.queryPageList(purApplyRequest); - } - - @Override - public boolean insertPurApplyDetailEntity(List purApplyDetailEntityList) { - return purApplyDetailDao.insertPurApplyDetailEntity(purApplyDetailEntityList); - } - - @Override - public List getDetailList(PurApplyDetailRequest purApplyDetailRequest) { - if (null == purApplyDetailRequest) { - return Collections.emptyList(); - } - if (null == purApplyDetailRequest.getPage() && null != purApplyDetailRequest.getLimit()) { - PageHelper.offsetPage((purApplyDetailRequest.getPage() - 1) * purApplyDetailRequest.getLimit(), purApplyDetailRequest.getLimit()); - } - return purApplyDetailDao.selectPurApplyDetailList(purApplyDetailRequest); - } - - -} diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java deleted file mode 100644 index e6a2717..0000000 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.glxp.api.service.purchase.impl; - -import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.purchase.PurApplyDao; -import com.glxp.api.entity.purchase.PurApplyEntity; -import com.glxp.api.req.purchase.PurApplyRequest; -import com.glxp.api.res.purchase.PurApplyResponse; -import com.glxp.api.service.purchase.PurApplyService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.Collections; -import java.util.List; - -@Service -@Transactional(rollbackFor = Exception.class) -public class PurApplyServiceImpl implements PurApplyService { - - @Resource - PurApplyDao purApplyDao; - - @Override - public List queryPageList(PurApplyRequest purApplyRequest) { - if (purApplyRequest == null) { - return Collections.emptyList(); - } - if (purApplyRequest.getPage() != null) { - int offset = (purApplyRequest.getPage() - 1) * purApplyRequest.getLimit(); - PageHelper.offsetPage(offset, purApplyRequest.getLimit()); - } - List data = purApplyDao.queryPageList(purApplyRequest); - return data; - } - - @Override - public Integer insert(PurApplyEntity purApplyEntity) { - return purApplyDao.insert(purApplyEntity); - } - - @Override - public Boolean update(PurApplyEntity purApplyRequest) { - return purApplyDao.update(purApplyRequest); - } - - @Override - public Boolean deleteByIds(List ids) { - return purApplyDao.deleteByIds(ids); - } - - @Override - public Boolean deleteById(long id) { - return purApplyDao.deleteById(id); - } -} diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailServiceImpl.java deleted file mode 100644 index baaee7b..0000000 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailServiceImpl.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.glxp.api.service.purchase.impl; - -import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.purchase.PurOrderDetailDao; -import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.purchase.PurOrderDetailEntity; -import com.glxp.api.req.purchase.PurOrderDetailRequest; -import com.glxp.api.res.purchase.PurOrderDetailResponse; -import com.glxp.api.service.purchase.PurOrderDetailService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.Collections; -import java.util.List; - -@Service -@Transactional(rollbackFor = Exception.class) -public class PurOrderDetailServiceImpl implements PurOrderDetailService { - - @Resource - PurOrderDetailDao purOrderDetailDao; - - @Override - public List joinQueryList(PurOrderDetailRequest purOrderDetailRequest) { - if (purOrderDetailRequest == null) { - return Collections.emptyList(); - } - if (purOrderDetailRequest.getPage() != null) { - int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit(); - PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit()); - } - List data = purOrderDetailDao.joinQueryList(purOrderDetailRequest); - return data; - } - - @Override - public List findByOrderId(String orderId) { - PurOrderDetailRequest purOrderDetailRequest = new PurOrderDetailRequest(); - purOrderDetailRequest.setOrderIdFk(orderId); - List data = purOrderDetailDao.queryPageList(purOrderDetailRequest); - return data; - } - - @Override - public List queryPageList(PurOrderDetailRequest purOrderDetailRequest) { - if (purOrderDetailRequest == null) { - return Collections.emptyList(); - } - if (purOrderDetailRequest.getPage() != null) { - int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit(); - PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit()); - } - List data = purOrderDetailDao.queryPageList(purOrderDetailRequest); - return data; - } - - @Override - public List getPurOrderDetailEntityList(PurOrderDetailRequest purOrderDetailRequest) { - return purOrderDetailDao.queryPageList(purOrderDetailRequest); - } - - @Override - public Boolean insert(PurOrderDetailEntity purOrderDetailEntity) { - return purOrderDetailDao.insert(purOrderDetailEntity)>0 ? true:false; - } - - @Override - public Boolean update(PurOrderDetailEntity purOrderDetailEntity) { - return purOrderDetailDao.update(purOrderDetailEntity); - } - - @Override - public Boolean deleteByIds(List ids) { - return purOrderDetailDao.deleteByIds(ids); - } - - @Override - public Boolean deleteByOrderId(String orderIdfK) { - return purOrderDetailDao.deleteByOrderId(orderIdfK); - - } - - @Override - public boolean insertPurOrderDetailEntity(List purOrderDetailEntityList) { - return purOrderDetailDao.insertPurOrderDetailEntity(purOrderDetailEntityList); - } - - @Override - public BasicProductsEntity selectIoOrderDetailBiz(long id) { - return purOrderDetailDao.selectIoOrderDetailBiz(id); - } - - @Override - public List getDetailList(PurOrderDetailRequest purOrderDetailRequest) { - if (null == purOrderDetailRequest) { - return Collections.emptyList(); - } - if (null != purOrderDetailRequest.getPage() && null != purOrderDetailRequest.getLimit()) { - PageHelper.offsetPage((purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit(), purOrderDetailRequest.getLimit()); - } - return purOrderDetailDao.selectDetailList(purOrderDetailRequest); - } -} diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java deleted file mode 100644 index 0f67cd6..0000000 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.glxp.api.service.purchase.impl; - -import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.purchase.PurPlanDetailDao; -import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.purchase.PurPlanDetailEntity; -import com.glxp.api.req.purchase.PurPlanDetailRequest; -import com.glxp.api.res.purchase.PurOrderDetailResponse; -import com.glxp.api.service.purchase.PurPlanDetailService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.Collections; -import java.util.List; - -@Service -@Transactional(rollbackFor = Exception.class) -public class PurPlanDetailServiceImpl implements PurPlanDetailService { - - @Resource - PurPlanDetailDao purPlanDetailDao; - - @Override - public List joinQueryList(PurPlanDetailRequest purApplyRequest) { - if (purApplyRequest == null) { - return Collections.emptyList(); - } - if (purApplyRequest.getPage() != null) { - int offset = (purApplyRequest.getPage() - 1) * purApplyRequest.getLimit(); - PageHelper.offsetPage(offset, purApplyRequest.getLimit()); - } - List data = purPlanDetailDao.joinQueryList(purApplyRequest); - return data; - } - - @Override - public List findByOrderId(String orderId) { - PurPlanDetailRequest purPlanDetailRequest = new PurPlanDetailRequest(); - purPlanDetailRequest.setOrderIdFk(orderId); - List data = purPlanDetailDao.queryPageList(purPlanDetailRequest); - return data; - } - - @Override - public List queryPageList(PurPlanDetailRequest purPlanDetailRequest) { - if (purPlanDetailRequest == null) { - return Collections.emptyList(); - } - if (purPlanDetailRequest.getPage() != null) { - int offset = (purPlanDetailRequest.getPage() - 1) * purPlanDetailRequest.getLimit(); - PageHelper.offsetPage(offset, purPlanDetailRequest.getLimit()); - } - List data = purPlanDetailDao.queryPageList(purPlanDetailRequest); - return data; - } - - @Override - public List getPurPlanDetailEntityList(PurPlanDetailRequest purPlanDetailRequest) { - return purPlanDetailDao.queryPageList(purPlanDetailRequest); - } - - @Override - public Boolean insert(PurPlanDetailEntity purPlanDetailRequest) { - return purPlanDetailDao.insert(purPlanDetailRequest); - } - - @Override - public Boolean update(PurPlanDetailEntity purPlanDetailRequest) { - return purPlanDetailDao.update(purPlanDetailRequest); - } - - @Override - public Boolean deleteByIds(List ids) { - return purPlanDetailDao.deleteByIds(ids); - } - - @Override - public Boolean deleteByOrderId(String orderIdfK) { - return purPlanDetailDao.deleteByOrderId(orderIdfK); - - } - - @Override - public boolean insertPurPlanDetailEntity(List purPlanDetailEntityList) { - return purPlanDetailDao.insertPurPlanDetailEntity(purPlanDetailEntityList); - } - - @Override - public BasicProductsEntity selectIoOrderDetailBiz(long id) { - return purPlanDetailDao.selectIoOrderDetailBiz(id); - } - - @Override - public List getDetailList(PurPlanDetailRequest purPlanDetailRequest) { - if (null == purPlanDetailRequest) { - return Collections.emptyList(); - } - if (null != purPlanDetailRequest.getPage() && null != purPlanDetailRequest.getLimit()) { - PageHelper.offsetPage((purPlanDetailRequest.getPage() - 1) * purPlanDetailRequest.getLimit(), purPlanDetailRequest.getLimit()); - } - return purPlanDetailDao.seletDetaiList(purPlanDetailRequest); - } - -} diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java deleted file mode 100644 index 8bf8efb..0000000 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.glxp.api.service.purchase.impl; - -import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.purchase.PurPlanDao; -import com.glxp.api.entity.purchase.PurPlanEntity; -import com.glxp.api.req.purchase.PurPlanRequest; -import com.glxp.api.res.purchase.PurPlanResponse; -import com.glxp.api.service.purchase.PurPlanService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.Collections; -import java.util.List; - -@Service -@Transactional(rollbackFor = Exception.class) -public class PurPlanServiceImpl implements PurPlanService { - - @Resource - PurPlanDao purPlanDao; - - @Override - public List queryPageList(PurPlanRequest purPlanRequest) { - if (purPlanRequest == null) { - return Collections.emptyList(); - } - if (purPlanRequest.getPage() != null) { - int offset = (purPlanRequest.getPage() - 1) * purPlanRequest.getLimit(); - PageHelper.offsetPage(offset, purPlanRequest.getLimit()); - } - List data = purPlanDao.queryPageList(purPlanRequest); - return data; - } - - @Override - public Boolean insert(PurPlanEntity purPlanRequest) { - return purPlanDao.insert(purPlanRequest); - } - - @Override - public Boolean update(PurPlanEntity purPlanRequest) { - return purPlanDao.update(purPlanRequest); - } - - @Override - public Boolean deleteByIds(List ids) { - return purPlanDao.deleteByIds(ids); - } - - @Override - public Boolean deleteById(long id) { - return purPlanDao.deleteById(id); - } -} diff --git a/src/main/java/com/glxp/api/service/system/SysRemindMsgService.java b/src/main/java/com/glxp/api/service/system/SysRemindMsgService.java deleted file mode 100644 index 751865a..0000000 --- a/src/main/java/com/glxp/api/service/system/SysRemindMsgService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.glxp.api.service.system; - -import com.glxp.api.entity.system.SysRemindMsgEntity; -import com.baomidou.mybatisplus.extension.service.IService; -import com.glxp.api.req.system.FilterSysRemindMsgRequest; - -import java.util.List; - -public interface SysRemindMsgService { - - List filterList(FilterSysRemindMsgRequest filterSysRemindMsgRequest); -} diff --git a/src/main/java/com/glxp/api/service/system/impl/SysRemindMsgServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SysRemindMsgServiceImpl.java deleted file mode 100644 index 1202d1f..0000000 --- a/src/main/java/com/glxp/api/service/system/impl/SysRemindMsgServiceImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.glxp.api.service.system.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; -import com.glxp.api.req.system.FilterSysRemindMsgRequest; -import org.springframework.stereotype.Service; - -import com.glxp.api.dao.system.SysRemindMsgMapper; -import com.glxp.api.entity.system.SysRemindMsgEntity; -import com.glxp.api.service.system.SysRemindMsgService; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.List; - -@Service -@Transactional(rollbackFor = Exception.class) -public class SysRemindMsgServiceImpl implements SysRemindMsgService { - - @Resource - SysRemindMsgMapper sysRemindMsgMapper; - - @Override - public List filterList(FilterSysRemindMsgRequest filterSysRemindMsgRequest) { - - if (filterSysRemindMsgRequest.getPage() != null) { - int offset = (filterSysRemindMsgRequest.getPage() - 1) * filterSysRemindMsgRequest.getLimit(); - PageHelper.offsetPage(offset, filterSysRemindMsgRequest.getLimit()); - } - return sysRemindMsgMapper.filterList(filterSysRemindMsgRequest); - - } -} diff --git a/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml deleted file mode 100644 index 9560b4e..0000000 --- a/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - diff --git a/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml deleted file mode 100644 index 9981005..0000000 --- a/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - delete - from basic_bustype_pre - where action = #{action} - - - - - - - - insert into basic_bustype_pre - - - id, - - intro, - `action`, - `index`, - beforeTime, - changeType, - defaultDeptCode, - defaultInvCode, - deptCode, - invCode, - originAction, - changeEnable, - supplementAll, - `createUser`, - updateUser, - createTime, - updateTime, - remark, - targetBusAction, - busBeforeTime, - auditStatus, - busAuditStatus,createType, - - values - - - #{id,jdbcType=INTEGER}, - - #{intro,jdbcType=VARCHAR}, - #{action,jdbcType=VARCHAR}, - #{index,jdbcType=TINYINT}, - #{beforeTime,jdbcType=INTEGER}, - #{changeType,jdbcType=TINYINT}, - #{defaultDeptCode,jdbcType=VARCHAR}, - #{defaultInvCode,jdbcType=VARCHAR}, - #{deptCode,jdbcType=VARCHAR}, - #{invCode,jdbcType=VARCHAR}, - #{originAction,jdbcType=VARCHAR}, - #{changeEnable,jdbcType=TINYINT}, - #{supplementAll,jdbcType=TINYINT}, - #{createUser,jdbcType=VARCHAR}, - #{updateUser,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}, - #{remark,jdbcType=VARCHAR}, - #{targetBusAction,jdbcType=VARCHAR}, - #{busBeforeTime,jdbcType=TINYINT}, - #{auditStatus,jdbcType=TINYINT}, - #{busAuditStatus,jdbcType=TINYINT}, #{createType,jdbcType=TINYINT}, - - on duplicate key update - - - id = #{id,jdbcType=INTEGER}, - - intro = #{intro,jdbcType=VARCHAR}, - `action` = #{action,jdbcType=VARCHAR}, - `index` = #{index,jdbcType=TINYINT}, - beforeTime = #{beforeTime,jdbcType=INTEGER}, - changeType = #{changeType,jdbcType=TINYINT}, - defaultDeptCode = #{defaultDeptCode,jdbcType=VARCHAR}, - defaultInvCode = #{defaultInvCode,jdbcType=VARCHAR}, - deptCode = #{deptCode,jdbcType=VARCHAR}, - invCode = #{invCode,jdbcType=VARCHAR}, - originAction = #{originAction,jdbcType=VARCHAR}, - changeEnable = #{changeEnable,jdbcType=TINYINT}, - supplementAll = #{supplementAll,jdbcType=TINYINT}, - `createUser` = #{createUser,jdbcType=VARCHAR}, - updateUser = #{updateUser,jdbcType=VARCHAR}, - createTime = #{createTime,jdbcType=TIMESTAMP}, - updateTime = #{updateTime,jdbcType=TIMESTAMP}, - remark = #{remark,jdbcType=VARCHAR}, - targetBusAction = #{targetBusAction,jdbcType=VARCHAR}, - busBeforeTime = #{busBeforeTime,jdbcType=TINYINT}, - auditStatus = #{auditStatus,jdbcType=TINYINT}, - busAuditStatus = #{busAuditStatus,jdbcType=TINYINT}, - createType = #{createType,jdbcType=TINYINT}, - - - - diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml deleted file mode 100644 index 204d8ba..0000000 --- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml +++ /dev/null @@ -1,288 +0,0 @@ - - - - - - - - insert - 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, - preInBack, supplementAll, createUser, createTime, updateUser, vailDispatch, - vailGroupBuy, busType, inStock, actionType, thrCheckEnable, thrCheckWebNew, - thrCheckPdaUn, thrCheckPdaEd, thrCheckUdims, thrCheckPc, thrCheckSp, - thrCheckChange, thrCheckBalance, thrCheckCopy, fillCodeRel, checkVailDate, - checkExpire, checkCertExpire, preInBackAction, backPreinType, - sortNum, spaceOut) - 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}, - #{preInBack}, #{supplementAll}, #{createUser}, #{createTime}, #{updateUser}, #{vailDispatch}, - #{vailGroupBuy}, #{busType}, #{inStock}, #{actionType}, #{thrCheckEnable}, #{thrCheckWebNew}, - #{thrCheckPdaUn}, #{thrCheckPdaEd}, #{thrCheckUdims}, #{thrCheckPc}, #{thrCheckSp}, - #{thrCheckChange}, #{thrCheckBalance}, #{thrCheckCopy}, #{fillCodeRel}, #{checkVailDate}, - #{checkExpire}, #{checkCertExpire}, #{preInBackAction}, #{backPreinType}, - #{sortNum}, #{spaceOut}) - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml b/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml deleted file mode 100644 index 6cf3a80..0000000 --- a/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - - - - - - - - - - - - - replace - INTO basic_entrust_accept(`action`, curDept, entrustInv, `entrustUser`, userId, - updateTime, remark, entrustAction, finishRece, curInv, entrustDept, entrustInv, - entrustEnd) - values (#{action}, - #{entrustInv}, - #{entrustUser}, - #{userId}, - #{updateTime}, - #{remark}, - #{entrustAction}, - #{finishRece}, - #{curInv}, - #{entrustDept}, - #{entrustInv}, - #{entrustEnd}) - - - - - DELETE - FROM basic_entrust_accept - WHERE id = #{id} - - - - DELETE - FROM basic_entrust_accept - - diff --git a/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml b/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml deleted file mode 100644 index 3ad289a..0000000 --- a/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - - - replace - INTO pur_apply - ( - billNo,billDate,status,billType,remark,invCode, - deptCode,createUser,createTime,auditUser,auditTime,updateTime,updateUser ,auditRemark, - targetInvCode,targetDeptCode,planBillNo,generatePlan,emergency,arrivalTime - ) - values ( - #{billNo}, - #{billDate}, - #{status}, - #{billType}, - #{remark}, - #{invCode}, - #{deptCode}, - #{createUser}, - #{createTime}, - #{auditUser}, - #{auditTime}, - #{updateTime}, - #{updateUser}, - #{auditRemark}, - #{targetInvCode}, - #{targetDeptCode}, - #{planBillNo},#{generatePlan}, - #{emergency},#{arrivalTime} - ) - - - - - DELETE FROM pur_apply WHERE id in - - #{item} - - - - - DELETE FROM pur_apply - WHERE id = #{id} - - - - - - - UPDATE pur_apply - - billNo=#{billNo}, - billDate=#{billDate}, - status=#{status}, - billType=#{billType}, - remark=#{remark}, - invCode=#{invCode}, - deptCode=#{deptCode}, - auditUser=#{auditUser}, - auditTime=#{auditTime}, - createUser=#{createUser}, - createTime=#{createTime}, - updateTime=#{updateTime}, - updateUser=#{updateUser}, - auditRemark=#{auditRemark}, - targetInvCode=#{targetInvCode}, - targetDeptCode=#{targetDeptCode}, - planBillNo=#{planBillNo}, - generatePlan=#{generatePlan}, - emergency=#{emergency}, - arrivalTime=#{arrivalTime}, - - WHERE id = #{id} - - - diff --git a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml deleted file mode 100644 index adc5697..0000000 --- a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - - - - - - replace - INTO pur_apply_detail - ( - orderIdFk,productId,productName,`count`,supId,zczbhhzbapzbh - ) - values ( - #{orderIdFk}, - #{productId}, - #{productName}, - #{count}, - #{supId},#{zczbhhzbapzbh} - ) - - - - - DELETE FROM pur_apply_detail WHERE id in - - #{item} - - - - - - - - DELETE - FROM pur_apply_detail - WHERE orderIdFk = #{orderIdFk} - - - - - UPDATE pur_apply_detail - - orderIdFk=#{orderIdFk}, - productId=#{productId}, - productName=#{productName}, - `count`=#{count}, - supId=#{supId}, - zczbhhzbapzbh=#{zczbhhzbapzbh}, - - WHERE id = #{id} - - - - - REPLACE INTO pur_apply_detail - ( orderIdFk,productId,productName,count,supId,zczbhhzbapzbh) values - - - ( - #{item.orderIdFk}, - #{item.productId}, - #{item.productName}, - #{item.count}, - #{item.supId}, - #{item.zczbhhzbapzbh} - ) - - - - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml deleted file mode 100644 index 7501b5a..0000000 --- a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, billNo, billDate, `status`, billType, remark, invCode, deptCode, `createUser`, - createTime, auditUser, auditTime, auditRemark, updateTime, updateUser, applyCreateUser, - applyAuditUser, applyRemark, applyBillNo, stockOrderNo - - - - - - - diff --git a/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml deleted file mode 100644 index 7eb489c..0000000 --- a/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - - - - - - - - - - - - id, orderIdFk, productId, productName, `count`, supId, zczbhhzbapzbh - - - - - - - - - - - - DELETE FROM pur_order_detail WHERE id in - - #{item} - - - - - - - - DELETE - FROM pur_order_detail - WHERE orderIdFk = #{orderIdFk} - - - - UPDATE pur_order_detail - - orderIdFk=#{orderIdFk}, - productId=#{productId}, - productName=#{productName}, - `count`=#{count}, - supId=#{supId}, - zczbhhzbapzbh=#{zczbhhzbapzbh}, - - WHERE id = #{id} - - - - - REPLACE INTO pur_order_detail - ( orderIdFk,productId,productName,count,supId,zczbhhzbapzbh) values - - - ( - #{item.orderIdFk}, - #{item.productId}, - #{item.productName}, - #{item.count}, - #{item.supId}, - #{item.zczbhhzbapzbh} - ) - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml b/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml deleted file mode 100644 index e76001b..0000000 --- a/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml +++ /dev/null @@ -1,144 +0,0 @@ - - - - - - - - - replace - INTO pur_plan - ( - billNo,billDate,status,billType,remark,invCode, - deptCode,createUser,createTime,auditUser,auditTime,updateTime,auditRemark - ,applyCreateUser,applyAuditUser,applyRemark,applyBillNo,stockOrderNo,emergency,arrivalTime - ) - values ( - #{billNo}, - #{billDate}, - #{status}, - #{billType}, - #{remark}, - #{invCode}, - #{deptCode}, - #{createUser}, - #{createTime}, - #{auditUser}, - #{auditTime}, - #{updateTime}, - #{auditRemark}, - #{applyCreateUser}, - #{applyAuditUser}, - #{applyRemark}, - #{applyBillNo}, - #{stockOrderNo}, - #{emergency},#{arrivalTime} - ) - - - - - DELETE FROM pur_plan WHERE id in - - #{item} - - - - - - - - UPDATE pur_plan - - billNo=#{billNo}, - billDate=#{billDate}, - status=#{status}, - billType=#{billType}, - remark=#{remark}, - invCode=#{invCode}, - deptCode=#{deptCode}, - auditUser=#{auditUser}, - auditTime=#{auditTime}, - createUser=#{createUser}, - createTime=#{createTime}, - updateTime=#{updateTime}, - updateUser=#{updateUser}, - auditRemark=#{auditRemark}, - applyCreateUser=#{applyCreateUser}, - applyAuditUser=#{applyAuditUser}, - applyRemark=#{applyRemark}, - applyBillNo=#{applyBillNo}, - stockOrderNo=#{stockOrderNo}, - emergency=#{emergency}, - arrivalTime=#{arrivalTime}, - - WHERE id = #{id} - - - - DELETE FROM pur_plan - WHERE id = #{id} - - - diff --git a/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml deleted file mode 100644 index 0d961ef..0000000 --- a/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - - - - - - - replace - INTO pur_plan_detail - ( - orderIdFk,productId,productName,`count`,supId,zczbhhzbapzbh - ) - values ( - #{orderIdFk}, - #{productId}, - #{productName}, - #{count}, - #{supId},#{zczbhhzbapzbh} - ) - - - - - DELETE FROM pur_plan_detail WHERE id in - - #{item} - - - - - - - - DELETE - FROM pur_plan_detail - WHERE orderIdFk = #{orderIdFk} - - - - UPDATE pur_plan_detail - - orderIdFk=#{orderIdFk}, - productId=#{productId}, - productName=#{productName}, - `count`=#{count}, - supId=#{supId}, - zczbhhzbapzbh=#{zczbhhzbapzbh}, - - WHERE id = #{id} - - - - - REPLACE INTO pur_plan_detail - ( orderIdFk,productId,productName,count,supId,zczbhhzbapzbh) values - - - ( - #{item.orderIdFk}, - #{item.productId}, - #{item.productName}, - #{item.count}, - #{item.supId}, - #{item.zczbhhzbapzbh} - ) - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml b/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml deleted file mode 100644 index 7cc59be..0000000 --- a/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - replace INTO sync_data_bustypes - (id, `action`, `name`, outChange, orderStatus, direct, syncStatus, syncChange) - values - - - (#{item.id}, #{item.action}, #{item.name}, - #{item.outChange}, #{item.orderStatus}, #{item.direct}, #{item.syncStatus}, #{item.syncChange}) - - - diff --git a/src/main/resources/mybatis/mapper/system/SyncDataChangeBustypesDao.xml b/src/main/resources/mybatis/mapper/system/SyncDataChangeBustypesDao.xml deleted file mode 100644 index 224ee28..0000000 --- a/src/main/resources/mybatis/mapper/system/SyncDataChangeBustypesDao.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - id, `action`, `name`, outChange, orderStatus - - diff --git a/src/main/resources/mybatis/mapper/system/SyncUploadDataBustypeDao.xml b/src/main/resources/mybatis/mapper/system/SyncUploadDataBustypeDao.xml deleted file mode 100644 index 21a4a1c..0000000 --- a/src/main/resources/mybatis/mapper/system/SyncUploadDataBustypeDao.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - DELETE - FROM thr_order_upload_bustypes - - - - insert INTO thr_order_upload_bustypes - ( `action`, `name`) - values - - - ( - #{item.action}, #{item.name} - ) - - - - - diff --git a/src/main/resources/mybatis/mapper/system/SyncUploadDataSetDao.xml b/src/main/resources/mybatis/mapper/system/SyncUploadDataSetDao.xml deleted file mode 100644 index c28432c..0000000 --- a/src/main/resources/mybatis/mapper/system/SyncUploadDataSetDao.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - replace - INTO thr_order_upload(id,autoUpload, orderSyncTime,orderUnCheck,orderUnReceive, - orderScanFinish, checkUdims, checkPdaEd, checkPdaUn, checkPc, - checkWebNew, checkChange, checkSp,checkBalacne,orderStartTime) - values ( - #{id}, - #{autoUpload}, - #{orderSyncTime}, - #{orderUnCheck}, - #{orderUnReceive}, - #{orderScanFinish}, - #{checkUdims}, - #{checkPdaEd}, - #{checkPdaUn}, - #{checkPc}, - #{checkWebNew}, - #{checkChange}, - #{checkSp}, - #{checkBalacne},#{orderStartTime} - ) - - - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/system/SysErpLogDao.xml b/src/main/resources/mybatis/mapper/system/SysErpLogDao.xml deleted file mode 100644 index 0fc3207..0000000 --- a/src/main/resources/mybatis/mapper/system/SysErpLogDao.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - delete - from sys_erp_log - where date_format(#{date}, '%Y-%m-%d') >= date_format(createTime, '%Y-%m-%d') - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/system/SysRemindMsgMapper.xml b/src/main/resources/mybatis/mapper/system/SysRemindMsgMapper.xml deleted file mode 100644 index f37b70b..0000000 --- a/src/main/resources/mybatis/mapper/system/SysRemindMsgMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/src/main/resources/mybatis/mapper/system/SysRemindSetMapper.xml b/src/main/resources/mybatis/mapper/system/SysRemindSetMapper.xml deleted file mode 100644 index 1b2c358..0000000 --- a/src/main/resources/mybatis/mapper/system/SysRemindSetMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/src/main/resources/mybatis/mapper/system/ThirdSysApiDao.xml b/src/main/resources/mybatis/mapper/system/ThirdSysApiDao.xml deleted file mode 100644 index 2e469f6..0000000 --- a/src/main/resources/mybatis/mapper/system/ThirdSysApiDao.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - UPDATE sys_thirdsys_api SET - name = #{name}, - apiUrl = #{apiUrl}, - guideUrl = #{guideUrl}, - remark = #{remark} - where id = #{id} - - - - \ No newline at end of file