From 3a1a47a86ebfd18f1d6b89cfed821bec5dd18fcd Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Mon, 29 Dec 2025 14:00:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KgLowDurable/constant/BatchConstant.java | 15 +- .../controller/DepartmentController.java | 45 ++++++ .../controller/LdConsumerFormController.java | 39 +++++ .../controller/LdDemandEndController.java | 10 +- .../controller/LdDurableFormController.java | 27 +++- .../controller/LdOneFormController.java | 1 - .../controller/LdOneOutStorageController.java | 3 + .../controller/LdTwoOutStorageController.java | 62 ++++++++ .../LdTwoOutStorageDetailController.java | 25 ++++ .../controller/UserController.java | 45 ++++++ .../controller/UserInfoController.java | 33 ---- .../KgLowDurable/mapper/DepartmentMapper.java | 19 +++ .../KgLowDurable/mapper/LdApproveMapper.java | 1 + .../mapper/LdConsumerFormMapper.java | 6 + .../mapper/LdDemandEndMapper.java | 7 +- .../mapper/LdDurableFormMapper.java | 4 + .../KgLowDurable/mapper/LdOneFormMapper.java | 2 +- .../mapper/LdTwoOutStorageDetailMapper.java | 17 +++ .../mapper/LdTwoOutStorageMapper.java | 21 +++ .../nov/KgLowDurable/mapper/UserMapper.java | 19 +++ .../pojo/dto/LdTwoOutStorageDto.java | 37 +++++ .../KgLowDurable/pojo/entity/Department.java | 49 ++++++ .../pojo/entity/LdConsumerForm.java | 5 + .../KgLowDurable/pojo/entity/LdDemandEnd.java | 13 +- .../pojo/entity/LdDurableForm.java | 15 +- .../KgLowDurable/pojo/entity/LdOneForm.java | 5 - .../pojo/entity/LdOneOutStorage.java | 16 -- .../pojo/entity/LdOnePutStorage.java | 6 - .../pojo/entity/LdPurchaseEnd.java | 5 - .../pojo/entity/LdTwoInventoryRecord.java | 89 +++++++++++ .../pojo/entity/LdTwoOutStorage.java | 100 +++++++++++++ .../pojo/entity/LdTwoOutStorageDetail.java | 102 +++++++++++++ .../pojo/entity/LdTwoPutStorage.java | 4 - .../pojo/entity/{Tuser.java => User.java} | 74 ++++----- .../KgLowDurable/pojo/vo/DepartmentVO.java | 26 ++++ .../pojo/vo/LdOnePutStorageInfoVO.java | 6 + .../pojo/vo/LdTwoOutStorageInfoVO.java | 35 +++++ .../service/IDepartmentService.java | 21 +++ .../service/ILdApproveService.java | 9 +- .../service/ILdConsumerFormService.java | 20 +++ .../service/ILdDemandEndService.java | 8 +- .../service/ILdDurableFormService.java | 12 +- .../service/ILdOneFormService.java | 2 +- .../ILdTwoOutStorageDetailService.java | 20 +++ .../service/ILdTwoOutStorageService.java | 42 ++++++ .../service/IUserInfoService.java | 38 ----- .../KgLowDurable/service/IUserService.java | 46 ++++++ .../service/Impl/DepartmentServiceImpl.java | 32 ++++ .../service/Impl/LdApproveServiceImpl.java | 7 +- .../Impl/LdConsumerFormServiceImpl.java | 18 +++ .../service/Impl/LdDemandEndServiceImpl.java | 96 +++++++++--- .../Impl/LdDurableFormServiceImpl.java | 16 +- .../Impl/LdInventoryRecordServiceImpl.java | 1 - .../service/Impl/LdOneFormServiceImpl.java | 2 +- .../Impl/LdOneOutStorageServiceImpl.java | 7 +- .../Impl/LdOnePutStorageServiceImpl.java | 29 ++-- .../Impl/LdPurchaseEndServiceImpl.java | 7 +- .../LdTwoOutStorageDetailServiceImpl.java | 30 ++++ .../Impl/LdTwoOutStorageServiceImpl.java | 141 ++++++++++++++++++ .../Impl/LdTwoPutStorageServiceImpl.java | 2 + ...oServiceImpl.java => UserServiceImpl.java} | 51 ++++--- .../com/nov/KgLowDurable/util/OrderNoGen.java | 2 +- .../resources/mapper/DepartmentMapper.xml | 20 +++ src/main/resources/mapper/LdApproveMapper.xml | 3 + .../resources/mapper/LdConsumerFormMapper.xml | 13 ++ .../resources/mapper/LdDemandEndMapper.xml | 12 +- .../resources/mapper/LdDurableFormMapper.xml | 11 ++ src/main/resources/mapper/LdOneFormMapper.xml | 1 - .../mapper/LdOneOutStorageDetailMapper.xml | 11 +- .../mapper/LdOneOutStorageMapper.xml | 3 - .../mapper/LdOnePutStorageDetailMapper.xml | 6 + .../mapper/LdOnePutStorageMapper.xml | 1 - .../resources/mapper/LdPurchaseEndMapper.xml | 3 +- .../mapper/LdTwoOutStorageDetailMapper.xml | 26 ++++ .../mapper/LdTwoOutStorageMapper.xml | 35 +++++ .../mapper/LdTwoPutStorageMapper.xml | 1 - src/main/resources/mapper/UserMapper.xml | 43 ++++++ 77 files changed, 1582 insertions(+), 254 deletions(-) create mode 100644 src/main/java/com/nov/KgLowDurable/controller/DepartmentController.java create mode 100644 src/main/java/com/nov/KgLowDurable/controller/LdTwoOutStorageController.java create mode 100644 src/main/java/com/nov/KgLowDurable/controller/LdTwoOutStorageDetailController.java create mode 100644 src/main/java/com/nov/KgLowDurable/controller/UserController.java delete mode 100644 src/main/java/com/nov/KgLowDurable/controller/UserInfoController.java create mode 100644 src/main/java/com/nov/KgLowDurable/mapper/DepartmentMapper.java create mode 100644 src/main/java/com/nov/KgLowDurable/mapper/LdTwoOutStorageDetailMapper.java create mode 100644 src/main/java/com/nov/KgLowDurable/mapper/LdTwoOutStorageMapper.java create mode 100644 src/main/java/com/nov/KgLowDurable/mapper/UserMapper.java create mode 100644 src/main/java/com/nov/KgLowDurable/pojo/dto/LdTwoOutStorageDto.java create mode 100644 src/main/java/com/nov/KgLowDurable/pojo/entity/Department.java create mode 100644 src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoInventoryRecord.java create mode 100644 src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorage.java create mode 100644 src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorageDetail.java rename src/main/java/com/nov/KgLowDurable/pojo/entity/{Tuser.java => User.java} (57%) create mode 100644 src/main/java/com/nov/KgLowDurable/pojo/vo/DepartmentVO.java create mode 100644 src/main/java/com/nov/KgLowDurable/pojo/vo/LdTwoOutStorageInfoVO.java create mode 100644 src/main/java/com/nov/KgLowDurable/service/IDepartmentService.java create mode 100644 src/main/java/com/nov/KgLowDurable/service/ILdTwoOutStorageDetailService.java create mode 100644 src/main/java/com/nov/KgLowDurable/service/ILdTwoOutStorageService.java delete mode 100644 src/main/java/com/nov/KgLowDurable/service/IUserInfoService.java create mode 100644 src/main/java/com/nov/KgLowDurable/service/IUserService.java create mode 100644 src/main/java/com/nov/KgLowDurable/service/Impl/DepartmentServiceImpl.java create mode 100644 src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageDetailServiceImpl.java create mode 100644 src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java rename src/main/java/com/nov/KgLowDurable/service/Impl/{UserInfoServiceImpl.java => UserServiceImpl.java} (81%) create mode 100644 src/main/resources/mapper/DepartmentMapper.xml create mode 100644 src/main/resources/mapper/LdTwoOutStorageDetailMapper.xml create mode 100644 src/main/resources/mapper/LdTwoOutStorageMapper.xml create mode 100644 src/main/resources/mapper/UserMapper.xml diff --git a/src/main/java/com/nov/KgLowDurable/constant/BatchConstant.java b/src/main/java/com/nov/KgLowDurable/constant/BatchConstant.java index 3cba1b3..02c2720 100644 --- a/src/main/java/com/nov/KgLowDurable/constant/BatchConstant.java +++ b/src/main/java/com/nov/KgLowDurable/constant/BatchConstant.java @@ -64,12 +64,23 @@ public interface BatchConstant { /** * 耐用品 */ - String DURABLE = "1"; + String DURABLE = "NY"; /** * 易耗品 */ - String CONSUMER = "2"; + String CONSUMER = "YH"; + + /** 审批类型*/ + /** + * 入库类型 + */ + String PUT_STORAGE_TYPE = "0"; + + /** + * 出库类型 + */ + String OUT_STORAGE_TYPE = "1"; diff --git a/src/main/java/com/nov/KgLowDurable/controller/DepartmentController.java b/src/main/java/com/nov/KgLowDurable/controller/DepartmentController.java new file mode 100644 index 0000000..6a6b635 --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/controller/DepartmentController.java @@ -0,0 +1,45 @@ +package com.nov.KgLowDurable.controller; +import com.nov.KgLowDurable.pojo.vo.DepartmentVO; +import com.nov.KgLowDurable.service.IDepartmentService; +import com.nov.KgLowDurable.util.Result; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiOperationSort; +import lombok.AllArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + + +/** + * @author liweidong + */ +@RestController +@AllArgsConstructor +@RequestMapping("/department") +public class DepartmentController { + + @Autowired + IDepartmentService departmentService; + + + @GetMapping("/getOnePutDepartment") + @ApiOperationSort(1) + @ApiOperation(value = "获取一级出库部门", notes = "获取指定部门", httpMethod = "GET", response = Result.class) + public Result getOnePutDepartment() { + try { + List quarters = departmentService.getOnePutDepartment(); + return Result.OK(quarters); + } catch (Exception e) { + return Result.error("获取部门列表失败"); + } + } + + + +} diff --git a/src/main/java/com/nov/KgLowDurable/controller/LdConsumerFormController.java b/src/main/java/com/nov/KgLowDurable/controller/LdConsumerFormController.java index fc3c514..1c2ae9e 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/LdConsumerFormController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/LdConsumerFormController.java @@ -1,15 +1,21 @@ package com.nov.KgLowDurable.controller; +import com.nov.KgLowDurable.pojo.entity.LdConsumerForm; import com.nov.KgLowDurable.pojo.entity.LdOneOutStorageDetail; +import com.nov.KgLowDurable.pojo.vo.DepartmentVO; import com.nov.KgLowDurable.pojo.vo.QuarterVO; +import com.nov.KgLowDurable.service.ILdConsumerFormService; import com.nov.KgLowDurable.service.ILdDemandEndService; import com.nov.KgLowDurable.util.Result; import io.swagger.annotations.*; import lombok.AllArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * @author liweidong @@ -19,5 +25,38 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/consumerForm") public class LdConsumerFormController { + @Autowired + ILdConsumerFormService consumerFormService; + + + @GetMapping("/list") + @ApiOperationSort(1) + @ApiOperation(value = "二级易耗品列表", notes = "获取二级易耗列表，支持条件筛选", httpMethod = "GET", response = Result.class) + @ApiImplicitParams({ + @ApiImplicitParam(name = "departmentId", value = "部门ID", dataType = "string", paramType = "query"), + @ApiImplicitParam(name = "materialName", value = "物资名称", dataType = "string", paramType = "query") + + }) + public Result list(@ApiParam(hidden = true) + @RequestParam(required = false) String departmentId, + @RequestParam(required = false) String materialName, + @RequestParam(required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(required = false ,defaultValue = "10") Integer pageSize) { + + return Result.OK(consumerFormService.getConsumerFormList(departmentId,materialName,pageNum,pageSize)); + } + + @GetMapping("/getConsumerFormList") + @ApiOperationSort(2) + @ApiOperation(value = "获取二级出库物资列表", notes = "根据部门获取二级出库物资列表", httpMethod = "GET", response = Result.class) + public Result getConsumerFormList(@RequestParam String departmentId) { + try { + List quarters = consumerFormService.getConsumerFormByDeptId(departmentId); + return Result.OK(quarters); + } catch (Exception e) { + return Result.error("获取二级出库物资列表失败"); + } + } + } diff --git a/src/main/java/com/nov/KgLowDurable/controller/LdDemandEndController.java b/src/main/java/com/nov/KgLowDurable/controller/LdDemandEndController.java index 97dd836..9938ca4 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/LdDemandEndController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/LdDemandEndController.java @@ -1,6 +1,7 @@ package com.nov.KgLowDurable.controller; import com.nov.KgLowDurable.pojo.entity.LdOneOutStorageDetail; import com.nov.KgLowDurable.pojo.entity.LdOnePutStorageDetail; +import com.nov.KgLowDurable.pojo.vo.DepartmentVO; import com.nov.KgLowDurable.pojo.vo.QuarterVO; import com.nov.KgLowDurable.service.ILdDemandEndService; import com.nov.KgLowDurable.service.ILdPurchaseEndService; @@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.List; +import java.util.Map; /** @@ -63,7 +65,7 @@ public class LdDemandEndController { }) public Result getDepartment(@RequestParam String year, @RequestParam String quarter) { try { - List quarters = demandEndService.getDepartment(year,quarter); + List quarters = demandEndService.getDepartment(year,quarter); return Result.OK(quarters); } catch (Exception e) { return Result.error("获取部门列表失败"); @@ -76,11 +78,11 @@ public class LdDemandEndController { @ApiOperation(value = "获取需求单数据", notes = "根据年份，季度，部门查询", httpMethod = "GET", response = Result.class) @ApiImplicitParams({ @ApiImplicitParam(name = "ids", value = "采购单ID", dataType = "string", paramType = "query"), - @ApiImplicitParam(name = "department", value = "部门", dataType = "string", paramType = "query"), + @ApiImplicitParam(name = "departmentId", value = "部门ID", dataType = "string", paramType = "query"), }) - public Result getDemandEndData(@RequestParam String ids,@RequestParam String department) { + public Result getDemandEndData(@RequestParam String ids,@RequestParam String departmentId) { try { - List quarters = demandEndService.getDemandEndData(ids,department); + Map> quarters = demandEndService.getDemandEndData(ids,departmentId); return Result.OK(quarters); } catch (Exception e) { return Result.error("获取需求单数据失败"); diff --git a/src/main/java/com/nov/KgLowDurable/controller/LdDurableFormController.java b/src/main/java/com/nov/KgLowDurable/controller/LdDurableFormController.java index 9ec866a..ee36a0b 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/LdDurableFormController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/LdDurableFormController.java @@ -1,6 +1,12 @@ package com.nov.KgLowDurable.controller; +import com.nov.KgLowDurable.service.ILdDurableFormService; +import com.nov.KgLowDurable.util.Result; +import io.swagger.annotations.*; import lombok.AllArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -9,8 +15,27 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @AllArgsConstructor -@RequestMapping("/durableForm ") +@RequestMapping("/durableForm") public class LdDurableFormController { + @Autowired + ILdDurableFormService durableFormService; + + @GetMapping("/list") + @ApiOperationSort(1) + @ApiOperation(value = "二级耐用品列表", notes = "获取二级耐用品列表，支持条件筛选", httpMethod = "GET", response = Result.class) + @ApiImplicitParams({ + @ApiImplicitParam(name = "departmentId", value = "部门ID", dataType = "string", paramType = "query"), + @ApiImplicitParam(name = "materialName", value = "物资名称", dataType = "string", paramType = "query") + + }) + public Result list(@ApiParam(hidden = true) + @RequestParam(required = false) String departmentId, + @RequestParam(required = false) String materialName, + @RequestParam(required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(required = false ,defaultValue = "10") Integer pageSize) { + + return Result.OK(durableFormService.getDurableFormList(departmentId,materialName,pageNum,pageSize)); + } } diff --git a/src/main/java/com/nov/KgLowDurable/controller/LdOneFormController.java b/src/main/java/com/nov/KgLowDurable/controller/LdOneFormController.java index cdca5c1..dc9e143 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/LdOneFormController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/LdOneFormController.java @@ -1,5 +1,4 @@ package com.nov.KgLowDurable.controller; -import com.nov.KgLowDurable.service.ILdMaterialService; import com.nov.KgLowDurable.service.ILdOneFormService; import com.nov.KgLowDurable.util.Result; import io.swagger.annotations.*; diff --git a/src/main/java/com/nov/KgLowDurable/controller/LdOneOutStorageController.java b/src/main/java/com/nov/KgLowDurable/controller/LdOneOutStorageController.java index 07abd75..1ce9739 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/LdOneOutStorageController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/LdOneOutStorageController.java @@ -8,6 +8,7 @@ import com.nov.KgLowDurable.util.Result; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; import java.util.Date; @@ -34,7 +35,9 @@ public class LdOneOutStorageController { @ApiImplicitParam(name = "shipperName", value = "出库人", dataType = "string", paramType = "query"), }) public Result list(@ApiParam(hidden = true) + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @RequestParam(required = false) Date startTime, + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @RequestParam(required = false) Date endTime, @RequestParam(required = false) String shipperName, @RequestParam(required = false ,defaultValue = "1") Integer pageNum, diff --git a/src/main/java/com/nov/KgLowDurable/controller/LdTwoOutStorageController.java b/src/main/java/com/nov/KgLowDurable/controller/LdTwoOutStorageController.java new file mode 100644 index 0000000..3d3e79a --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/controller/LdTwoOutStorageController.java @@ -0,0 +1,62 @@ +package com.nov.KgLowDurable.controller; +import com.nov.KgLowDurable.pojo.dto.LdTwoOutStorageDto; +import com.nov.KgLowDurable.pojo.dto.LdTwoPutStorageDto; +import com.nov.KgLowDurable.service.ILdTwoOutStorageService; +import com.nov.KgLowDurable.util.Result; +import io.swagger.annotations.*; +import lombok.AllArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; + + +/** + * @author liweidong + */ +@RestController +@AllArgsConstructor +@RequestMapping("/twoOutStorage") +public class LdTwoOutStorageController { + + @Autowired + ILdTwoOutStorageService twoOutStorageService; + + @GetMapping("/list") + @ApiOperationSort(1) + @ApiOperation(value = "获取二级库存列表", notes = "获取二级库存列表，支持条件筛选", httpMethod = "GET", response = Result.class) + public Result list(@ApiParam(hidden = true) + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @RequestParam(required = false) Date startTime, + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @RequestParam(required = false) Date endTime, + @RequestParam(required = false) String shipperName, + @RequestParam(required = false) String departmentId, + @RequestParam(required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(required = false ,defaultValue = "10") Integer pageSize) { + + return Result.OK(twoOutStorageService.getTwoOutStorageList(startTime,endTime,shipperName,departmentId,pageNum,pageSize)); + } + + @PostMapping("/submit") + @ApiOperationSort(2) + @ApiOperation(value = "提交", notes = "二级入库提交") + public Result submit(@RequestBody LdTwoOutStorageDto dto) { + + return Result.OK(twoOutStorageService.submit(dto)); + } + + + @GetMapping("/detail") + @ApiOperationSort(3) + @ApiOperation(value = "获取二级出库详情", notes = "根据二级出库ID获取详细信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "twoOutStorageId", value = "二级出库单Id", dataType = "Long", paramType = "query"), + }) + public Result detail(@RequestParam Long twoOutStorageId) { + return Result.OK(twoOutStorageService.getDetail(twoOutStorageId)); + } + + +} diff --git a/src/main/java/com/nov/KgLowDurable/controller/LdTwoOutStorageDetailController.java b/src/main/java/com/nov/KgLowDurable/controller/LdTwoOutStorageDetailController.java new file mode 100644 index 0000000..0406c92 --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/controller/LdTwoOutStorageDetailController.java @@ -0,0 +1,25 @@ +package com.nov.KgLowDurable.controller; +import com.nov.KgLowDurable.pojo.vo.DepartmentVO; +import com.nov.KgLowDurable.service.IDepartmentService; +import com.nov.KgLowDurable.util.Result; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiOperationSort; +import lombok.AllArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + + +/** + * @author liweidong + */ +@RestController +@AllArgsConstructor +@RequestMapping("/twoOutStorageDetail") +public class LdTwoOutStorageDetailController { + + +} diff --git a/src/main/java/com/nov/KgLowDurable/controller/UserController.java b/src/main/java/com/nov/KgLowDurable/controller/UserController.java new file mode 100644 index 0000000..78bfab6 --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/controller/UserController.java @@ -0,0 +1,45 @@ +package com.nov.KgLowDurable.controller; +import com.nov.KgLowDurable.pojo.vo.DepartmentVO; +import com.nov.KgLowDurable.service.IDepartmentService; +import com.nov.KgLowDurable.service.IUserService; +import com.nov.KgLowDurable.util.Result; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiOperationSort; +import lombok.AllArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + + +/** + * @author liweidong + */ +@RestController +@AllArgsConstructor +@RequestMapping("/user") +public class UserController { + + @Autowired + IUserService userService; + + @GetMapping("/getUserInfo") + @ApiOperationSort(1) + @ApiOperation(value = "用户信息", notes = "获取用户信息", httpMethod = "GET", response = Result.class) + public Result list(@RequestParam(required = false) String materialName) throws Exception { + + return Result.OK(userService.getUserInfo()); + } + + @GetMapping("/getUserByDeptId") + @ApiOperationSort(2) + @ApiOperation(value = "获取二级出库领用人", notes = "根据部门信息获取领用人", httpMethod = "GET", response = Result.class) + public Result getUserByDeptId(@RequestParam(required = false) String departmentId) { + + return Result.OK(userService.getUserByDeptId(departmentId)); + } + +} diff --git a/src/main/java/com/nov/KgLowDurable/controller/UserInfoController.java b/src/main/java/com/nov/KgLowDurable/controller/UserInfoController.java deleted file mode 100644 index b425c36..0000000 --- a/src/main/java/com/nov/KgLowDurable/controller/UserInfoController.java +++ /dev/null @@ -1,33 +0,0 @@ - -package com.nov.KgLowDurable.controller; -import com.nov.KgLowDurable.pojo.entity.LdMaterial; -import com.nov.KgLowDurable.service.ILdMaterialService; -import com.nov.KgLowDurable.service.IUserInfoService; -import com.nov.KgLowDurable.util.Result; -import com.nov.KgLowDurable.util.StringUtils; -import io.swagger.annotations.*; -import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.*; - - -/** - * @author liweidong - */ -@RestController -@AllArgsConstructor -@RequestMapping("/userInfo") -public class UserInfoController { - - private final IUserInfoService userInfoService; - - - @GetMapping("/getUserInfo") - @ApiOperationSort(1) - @ApiOperation(value = "用户信息", notes = "获取用户信息", httpMethod = "GET", response = Result.class) - - public Result list(@RequestParam(required = false) String materialName) throws Exception { - - return Result.OK(userInfoService.getUserInfo()); - } - -} diff --git a/src/main/java/com/nov/KgLowDurable/mapper/DepartmentMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/DepartmentMapper.java new file mode 100644 index 0000000..5043944 --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/mapper/DepartmentMapper.java @@ -0,0 +1,19 @@ +package com.nov.KgLowDurable.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nov.KgLowDurable.pojo.entity.Department; +import com.nov.KgLowDurable.pojo.entity.LdApprove; +import com.nov.KgLowDurable.pojo.vo.DepartmentVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + + +/** + * + * @author liweidong + */ +public interface DepartmentMapper extends BaseMapper { + + + List selectOnePutDepartment(); +} diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdApproveMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdApproveMapper.java index 71648d8..f865855 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdApproveMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdApproveMapper.java @@ -15,4 +15,5 @@ import java.util.List; public interface LdApproveMapper extends BaseMapper { + List selectByFromId(@Param("formId") Long formId,@Param("type") String type); } diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdConsumerFormMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdConsumerFormMapper.java index 1d1d51c..5ff8800 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdConsumerFormMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdConsumerFormMapper.java @@ -4,6 +4,8 @@ import com.nov.KgLowDurable.pojo.entity.LdApprove; import com.nov.KgLowDurable.pojo.entity.LdConsumerForm; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @@ -13,4 +15,8 @@ public interface LdConsumerFormMapper extends BaseMapper { LdConsumerForm selectByMaterialId(@Param("materialId") Long materialId); + + List selectByDepartmentId(@Param("departmentId") String departmentId); + + List selectConsumerFormList(@Param("departmentId") String departmentId, @Param("materialName") String materialName); } diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdDemandEndMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdDemandEndMapper.java index baf2718..97fb3c3 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdDemandEndMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdDemandEndMapper.java @@ -6,6 +6,7 @@ import com.nov.KgLowDurable.pojo.vo.QuarterVO; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** @@ -19,7 +20,9 @@ public interface LdDemandEndMapper extends BaseMapper { List getAllQuarter(); - List selectByYearAndQuarter(@Param("year") String year, @Param("quarter")String quarter); + ListselectByYearAndQuarter(@Param("year") String year, @Param("quarter")String quarter); + + List selectByIdList(@Param("idList")List idList, + @Param("departmentId")String departmentId); - List selectByIdList(@Param("idList")List idList); } diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdDurableFormMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdDurableFormMapper.java index 5a876da..f365221 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdDurableFormMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdDurableFormMapper.java @@ -2,6 +2,9 @@ package com.nov.KgLowDurable.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nov.KgLowDurable.pojo.entity.LdApprove; import com.nov.KgLowDurable.pojo.entity.LdDurableForm; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** @@ -11,4 +14,5 @@ import com.nov.KgLowDurable.pojo.entity.LdDurableForm; public interface LdDurableFormMapper extends BaseMapper { + List selectDurableFormList(@Param("departmentId") String departmentId, @Param("materialName") String materialName); } diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdOneFormMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdOneFormMapper.java index bd68c70..1b6384e 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdOneFormMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdOneFormMapper.java @@ -26,7 +26,7 @@ public interface LdOneFormMapper extends BaseMapper { * @param materialId * @return */ - LdOneForm selectByMaterialId(@Param("materialId")Long materialId); + List selectByMaterialId(@Param("materialId")Long materialId); LdOneForm selectByMaterialCode(@Param("materialCode")String materialCode); diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdTwoOutStorageDetailMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdTwoOutStorageDetailMapper.java new file mode 100644 index 0000000..9207c87 --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdTwoOutStorageDetailMapper.java @@ -0,0 +1,17 @@ +package com.nov.KgLowDurable.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nov.KgLowDurable.pojo.entity.LdTwoOutStorageDetail; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + + +/** + * + * @author liweidong + */ +public interface LdTwoOutStorageDetailMapper extends BaseMapper { + + + List selectByTwoOutStorageId(@Param("twoOutStorageId") Long twoOutStorageId); +} diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdTwoOutStorageMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdTwoOutStorageMapper.java new file mode 100644 index 0000000..5607306 --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdTwoOutStorageMapper.java @@ -0,0 +1,21 @@ +package com.nov.KgLowDurable.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nov.KgLowDurable.pojo.entity.LdTwoOutStorage; +import org.apache.ibatis.annotations.Param; + +import java.util.Date; +import java.util.List; + + +/** + * + * @author liweidong + */ +public interface LdTwoOutStorageMapper extends BaseMapper { + + + List selectTwoOutStorageList(@Param("startTime") Date startTime, + @Param("endTime") Date endTime, + @Param("shipperName") String shipperName, + @Param("departmentId") String departmentId); +} diff --git a/src/main/java/com/nov/KgLowDurable/mapper/UserMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/UserMapper.java new file mode 100644 index 0000000..142140c --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/mapper/UserMapper.java @@ -0,0 +1,19 @@ +package com.nov.KgLowDurable.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nov.KgLowDurable.pojo.entity.Department; +import com.nov.KgLowDurable.pojo.entity.User; +import com.nov.KgLowDurable.pojo.vo.DepartmentVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + + +/** + * + * @author liweidong + */ +public interface UserMapper extends BaseMapper { + + + List selectByDepartmentId(@Param("departmentId") String departmentId); +} diff --git a/src/main/java/com/nov/KgLowDurable/pojo/dto/LdTwoOutStorageDto.java b/src/main/java/com/nov/KgLowDurable/pojo/dto/LdTwoOutStorageDto.java new file mode 100644 index 0000000..cfa658f --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/pojo/dto/LdTwoOutStorageDto.java @@ -0,0 +1,37 @@ +package com.nov.KgLowDurable.pojo.dto; + +import com.nov.KgLowDurable.pojo.entity.LdTwoOutStorage; +import com.nov.KgLowDurable.pojo.entity.LdTwoOutStorageDetail; +import com.nov.KgLowDurable.pojo.entity.LdTwoPutStorage; +import com.nov.KgLowDurable.pojo.vo.UserInfoVO; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.List; + + +/** + * 二级出库Dto类 + * + * @author liweidong + */ +@Data +@Accessors(chain = true) +public class LdTwoOutStorageDto implements Serializable { + + /** + * 二级出库基础信息 + */ + private LdTwoOutStorage ldTwoOutStorage; + + /** + * 二级出库明细信息 + */ + private List ldTwoOutStorageDetailList; + + private UserInfoVO userInfoVO; + + + +} diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/Department.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/Department.java new file mode 100644 index 0000000..1003938 --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/Department.java @@ -0,0 +1,49 @@ +package com.nov.KgLowDurable.pojo.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import java.io.Serializable; + +/** + * 部门实体类 + * @author: liweidong + * @create: 2025-12-26 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@TableName(value = "t_department") +public class Department implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 部门ID - 主键 + */ + @TableId(value = "id", type = IdType.AUTO) + private String id; + + /** + * 部门名称 + */ + private String name; + + /** + * 父部门ID + */ + private String parentid; + + /** + * 排序字段 + */ + private Long order; + + /** + * OA上部门id + */ + private Long oaId; +} diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdConsumerForm.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdConsumerForm.java index 46d816d..80859bb 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdConsumerForm.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdConsumerForm.java @@ -78,6 +78,11 @@ public class LdConsumerForm implements Serializable { */ private BigDecimal amount; + /** + * 部门 + */ + private String departmentId; + /** * 部门 */ diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdDemandEnd.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdDemandEnd.java index 84e301f..bd7ccf3 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdDemandEnd.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdDemandEnd.java @@ -49,12 +49,6 @@ public class LdDemandEnd implements Serializable { */ private String model; - /** - * 类型：1易耗品 2耐用品 - */ - private String type; - - /** * 单位 */ @@ -85,9 +79,16 @@ public class LdDemandEnd implements Serializable { */ private Date optTime; + /** + * 申请部门名称 + */ + private String departmentId; + /** * 申请部门 */ private String department; + + } diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdDurableForm.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdDurableForm.java index 08d9c14..ea76c63 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdDurableForm.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdDurableForm.java @@ -9,6 +9,7 @@ import lombok.experimental.Accessors; import java.io.Serializable; import java.math.BigDecimal; +import java.util.Date; /** * 低值耐用品二级库库存表实体类 @@ -79,6 +80,11 @@ public class LdDurableForm implements Serializable { */ private BigDecimal amount; + /** + * 部门ID + */ + private String departmentId; + /** * 部门 */ @@ -95,7 +101,14 @@ public class LdDurableForm implements Serializable { private String remark; /** - * 是否出借：0-是；1-否 + * 是否出借：0-是；1-否 2-报废 */ private String isBorrow; + + /** + * 归还时间 + */ + private Date returnTime; + + } diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdOneForm.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdOneForm.java index 1d1dfba..b3b66db 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdOneForm.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdOneForm.java @@ -30,11 +30,6 @@ public class LdOneForm implements Serializable { @TableId(value = "id",type = IdType.AUTO) private Long id; - /** - * 库存编码 - */ - private Integer stockCode; - /** * 物资ID */ diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdOneOutStorage.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdOneOutStorage.java index df1acd4..de8288b 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdOneOutStorage.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdOneOutStorage.java @@ -34,11 +34,6 @@ public class LdOneOutStorage implements Serializable { */ private String demandEndInfo; - /** - * 仓库名称 - */ - private String warehouseName; - /** * 出库单号 @@ -61,17 +56,6 @@ public class LdOneOutStorage implements Serializable { private String materialType; - /** - * 部门 - */ - private String department; - - - /** - * 二级入库确认 - */ - private String secondaryInventory; - /** * 状态：暂存/提交 */ diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdOnePutStorage.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdOnePutStorage.java index 858bb7e..53df185 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdOnePutStorage.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdOnePutStorage.java @@ -32,12 +32,6 @@ public class LdOnePutStorage implements Serializable { */ private String purchaseEndInfo; - /** - * 仓库名称 - */ - private String warehouseName; - - /** * 入库单号 */ diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdPurchaseEnd.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdPurchaseEnd.java index 40df97f..30d7067 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdPurchaseEnd.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdPurchaseEnd.java @@ -47,11 +47,6 @@ public class LdPurchaseEnd implements Serializable { */ private String model; - /** - * 类型：1易耗品 2耐用品 - */ - private String type; - /** * 单位 diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoInventoryRecord.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoInventoryRecord.java new file mode 100644 index 0000000..55da90b --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoInventoryRecord.java @@ -0,0 +1,89 @@ +package com.nov.KgLowDurable.pojo.entity; + +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 com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 二级出入库记录表实体类 + * + * @author + * @since + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("ld_two_inventory_record") +public class LdTwoInventoryRecord implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 易耗品库存ID + */ + @TableField("consumer_form_id") + private Long consumerFormId; + + /** + * 交易类型：1-出库 2-入库 + */ + @TableField("transaction_type") + private String transactionType; + + /** + * 数量 + */ + @TableField("quantity") + private BigDecimal quantity; + + /** + * 单价 + */ + @TableField("money") + private BigDecimal money; + + /** + * 操作人ID + */ + @TableField("operator_id") + private String operatorId; + + /** + * 操作人姓名 + */ + @TableField("operator_name") + private String operatorName; + + /** + * 操作时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @TableField("operation_time") + private Date operationTime; + + /** + * 部门ID + */ + @TableField("department_id") + private String departmentId; + + /** + * 部门名称 + */ + @TableField("department_name") + private String departmentName; +} diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorage.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorage.java new file mode 100644 index 0000000..0e7277a --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorage.java @@ -0,0 +1,100 @@ +package com.nov.KgLowDurable.pojo.entity; +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 com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; + +/** + * 二级库出库表实体类 + * @author: liweidong + * @create: 2025-12-26 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("ld_two_out_storage") +public class LdTwoOutStorage implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * ID - 主键，自增 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 出库单号 + */ + @TableField("order_no") + private String orderNo; + + /** + * 出库申请日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @TableField("out_date") + private Date outDate; + + /** + * 事由 + */ + private String reason; + + /** + * 物资类型：办公物资/其他物资 + */ + @TableField("material_type") + private String materialType; + + /** + * 部门ID + */ + @TableField("department_id") + private String departmentId; + + /** + * 部门 + */ + private String department; + + /** + * 申请人id + */ + @TableField("proposer_id") + private String proposerId; + + /** + * 申请人姓名 + */ + @TableField("proposer_name") + private String proposerName; + + /** + * 出库人ID + */ + @TableField("shipper_id") + private String shipperId; + + /** + * 出库人名称 + */ + @TableField("shipper_name") + private String shipperName; + + /** + * 审批编号 + */ + @TableField("sp_no") + private String spNo; + + /** + * 出库状态：0-未出库；1-已出库；2-已驳回 + */ + private String status; +} \ No newline at end of file diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorageDetail.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorageDetail.java new file mode 100644 index 0000000..2ac6d02 --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorageDetail.java @@ -0,0 +1,102 @@ +package com.nov.KgLowDurable.pojo.entity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; + +/** + * @author liweidong + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("ld_two_out_storage_detail") +public class LdTwoOutStorageDetail implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * ID - 主键，自增 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 一级出库单ID + */ + @TableField("two_out_storage_id") + private Long twoOutStorageId; + + /** + * 一级出库单号 + */ + @TableField("two_out_storage_no") + private String twoOutStorageNo; + + /** + * 一级出库明细编号 + */ + @TableField("two_out_detail_code") + private String twoOutDetailCode; + + /** + * 物资ID + */ + @TableField("material_id") + private Long materialId; + + /** + * 物资名称 + */ + @TableField("material_name") + private String materialName; + + /** + * 物资编码 + */ + @TableField("material_code") + private String materialCode; + + /** + * 规格型号 + */ + @TableField("model") + private String model; + + /** + * 类别：耐用品/易耗品 + */ + @TableField("type") + private String type; + + /** + * 计量单位 + */ + @TableField("unit") + private String unit; + + /** + * 数量 出库数量 + */ + @TableField("num") + private String num; + + /** + * 物品详细描述 + */ + @TableField("remark") + private String remark; + + /** + * 出库情况：已出库/未出库 + */ + @TableField("shipper_status") + private String shipperStatus; + + /** + * 提交时间 + */ + @TableField("opt_time") + private Date optTime; +} \ No newline at end of file diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoPutStorage.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoPutStorage.java index 6d70693..1a7e575 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoPutStorage.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoPutStorage.java @@ -33,10 +33,6 @@ public class LdTwoPutStorage implements Serializable { */ private String demandEndInfo; - /** - * 仓库名称 - */ - private String warehouseName; /** * 入库单号 diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/Tuser.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/User.java similarity index 57% rename from src/main/java/com/nov/KgLowDurable/pojo/entity/Tuser.java rename to src/main/java/com/nov/KgLowDurable/pojo/entity/User.java index c61a7dc..8cbeacb 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/Tuser.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/User.java @@ -1,25 +1,34 @@ package com.nov.KgLowDurable.pojo.entity; + +/** + * @author: liweidong + * @create: 2025-12-26 + */ + 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; -import java.io.Serializable; -import java.time.LocalDate; -import java.time.LocalDateTime; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; /** - * 用户表 + * 用户表实体类 * - * @author liweidong * @TableName t_user */ @Data -@TableName(value = "t_user") -public class Tuser implements Serializable { +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("t_user") +public class User implements Serializable { + private static final long serialVersionUID = 1L; + /** - * 企业微信帐号 + * 企业微信帐号 - 主键 */ @TableId(value = "userId", type = IdType.INPUT) private String userId; @@ -27,171 +36,140 @@ public class Tuser implements Serializable { /** * 姓名 */ - @TableField(value = "name") private String name; /** * 部门 */ - @TableField(value = "department") private String department; /** * 主部门Id */ - @TableField(value = "main_department") private String mainDepartment; /** * 主部门的二级部门id */ - @TableField(value = "main_er_department") private String mainErDepartment; /** * 科室负责人（部门） */ - @TableField(value = "leader_in_dept") private String leaderInDept; /** * 性别 */ - @TableField(value = "gender") private String gender; /** * 联系电话 */ - @TableField(value = "phone") private String phone; /** * 邮箱 */ - @TableField(value = "mail") private String mail; /** * 姓名代号 */ - @TableField(value = "name_code") private String nameCode; /** * 门禁卡号 */ - @TableField(value = "card_no") private String cardNo; /** * 卡号--开智能柜 */ - @TableField(value = "cabinet_card_no") private String cabinetCardNo; /** * 身份证号码 */ - @TableField(value = "cert_no") private String certNo; /** * 出生日期 */ - @TableField(value = "birthday") - private LocalDate birthday; + private Date birthday; /** * 通信地址 */ - @TableField(value = "address") private String address; /** * 民族 */ - @TableField(value = "nation") private String nation; /** * 参加工作时间 */ - @TableField(value = "work_time") - private LocalDate workTime; + private Date workTime; /** * 学历 */ - @TableField(value = "school_record") private String schoolRecord; /** * 毕业院校 */ - @TableField(value = "graduation_school") private String graduationSchool; /** * 毕业专业 */ - @TableField(value = "graduation_major") private String graduationMajor; /** * 毕业时间 */ - @TableField(value = "graduation_time") - private LocalDate graduationTime; + private Date graduationTime; /** * 入职时间 */ - @TableField(value = "entry_time") - private LocalDate entryTime; + private Date entryTime; /** * 是否删除 0：否 1：是 */ - @TableField(value = "is_del") - private Boolean del; + private Boolean isDel = false; /** * 操作人 */ - @TableField(value = "opt_user") private String optUser; /** * 操作时间 */ - @TableField(value = "opt_time") - private LocalDateTime optTime; + private Date optTime; /** * OA的userId */ - @TableField(value = "oa_user_id") private Long oaUserId; /** * 车牌号 */ - @TableField(value = "car_number") private String carNumber; /** * 是否是值班人员 1 是 0否 */ - @TableField(value = "is_duty") - private Boolean duty; + private Boolean isDuty = false; /** * 考勤排序 小到大 */ - @TableField(value = "user_sort") - private Integer userSort; - - @TableField(exist = false) - private static final long serialVersionUID = 1L; + private Integer userSort = 1000; } diff --git a/src/main/java/com/nov/KgLowDurable/pojo/vo/DepartmentVO.java b/src/main/java/com/nov/KgLowDurable/pojo/vo/DepartmentVO.java new file mode 100644 index 0000000..854bc4c --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/pojo/vo/DepartmentVO.java @@ -0,0 +1,26 @@ +package com.nov.KgLowDurable.pojo.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author: liweidong + * @create: 2025-12-26 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class DepartmentVO { + /** + * 部门ID + */ + private String departmentId; + + /** + * 部门名称 + */ + private String department; + + +} diff --git a/src/main/java/com/nov/KgLowDurable/pojo/vo/LdOnePutStorageInfoVO.java b/src/main/java/com/nov/KgLowDurable/pojo/vo/LdOnePutStorageInfoVO.java index 90c0ea8..c6c0603 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/vo/LdOnePutStorageInfoVO.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/vo/LdOnePutStorageInfoVO.java @@ -1,4 +1,5 @@ package com.nov.KgLowDurable.pojo.vo; +import com.nov.KgLowDurable.pojo.entity.LdApprove; import com.nov.KgLowDurable.pojo.entity.LdOnePutStorage; import com.nov.KgLowDurable.pojo.entity.LdOnePutStorageDetail; import lombok.Data; @@ -26,4 +27,9 @@ public class LdOnePutStorageInfoVO implements Serializable { */ private List ldOnePutStorageDetailList; + /** + * 一级入库审批人列表 + */ + private List approveList; + } diff --git a/src/main/java/com/nov/KgLowDurable/pojo/vo/LdTwoOutStorageInfoVO.java b/src/main/java/com/nov/KgLowDurable/pojo/vo/LdTwoOutStorageInfoVO.java new file mode 100644 index 0000000..3619876 --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/pojo/vo/LdTwoOutStorageInfoVO.java @@ -0,0 +1,35 @@ +package com.nov.KgLowDurable.pojo.vo; + +import com.nov.KgLowDurable.pojo.entity.*; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.List; + + +/** + * 二级出库详情VO + * + * @author liweidong + */ +@Data +@Accessors(chain = true) +public class LdTwoOutStorageInfoVO implements Serializable { + + /** + * 二级出库 + */ + private LdTwoOutStorage ldTwoOutStorage; + + /** + * 二级出库明细 + */ + private List ldTwoOutStorageDetailList; + + /** + * 二级出库审批人列表 + */ + private List approveList; + +} diff --git a/src/main/java/com/nov/KgLowDurable/service/IDepartmentService.java b/src/main/java/com/nov/KgLowDurable/service/IDepartmentService.java new file mode 100644 index 0000000..5bcb9b1 --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/service/IDepartmentService.java @@ -0,0 +1,21 @@ +package com.nov.KgLowDurable.service; +import com.baomidou.mybatisplus.extension.service.IService; +import com.nov.KgLowDurable.pojo.entity.Department; +import com.nov.KgLowDurable.pojo.entity.LdConsumerForm; +import com.nov.KgLowDurable.pojo.vo.DepartmentVO; + +import java.util.List; + + +/** + * 审批 + * @author liweidong + */ +public interface IDepartmentService extends IService { + + /** + * 获取一级出库指定部门 + * @return + */ + List getOnePutDepartment(); +} diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdApproveService.java b/src/main/java/com/nov/KgLowDurable/service/ILdApproveService.java index cbf0283..8d66b8b 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdApproveService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdApproveService.java @@ -15,6 +15,11 @@ import java.util.List; */ public interface ILdApproveService extends IService { - - + /** + * 根据表单ID获取审批人 + * @param formId + * @param type + * @return + */ + List getByFromId(Long formId,String type); } diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdConsumerFormService.java b/src/main/java/com/nov/KgLowDurable/service/ILdConsumerFormService.java index 9e3c4ab..23caf30 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdConsumerFormService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdConsumerFormService.java @@ -1,8 +1,11 @@ package com.nov.KgLowDurable.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.github.pagehelper.PageInfo; import com.nov.KgLowDurable.pojo.entity.LdApprove; import com.nov.KgLowDurable.pojo.entity.LdConsumerForm; +import java.util.List; + /** * 审批 @@ -16,4 +19,21 @@ public interface ILdConsumerFormService extends IService { * @return */ LdConsumerForm getByMaterialId(Long materialId); + + /** + * 获取二级出库物资列表 + * @param departmentId + * @return + */ + List getConsumerFormByDeptId(String departmentId); + + /** + * 二级易耗品列表 + * @param departmentId + * @param materialName + * @param pageNum + * @param pageSize + * @return + */ + PageInfo getConsumerFormList(String departmentId, String materialName, Integer pageNum, Integer pageSize); } diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdDemandEndService.java b/src/main/java/com/nov/KgLowDurable/service/ILdDemandEndService.java index cc62b3a..903db88 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdDemandEndService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdDemandEndService.java @@ -5,9 +5,11 @@ import com.nov.KgLowDurable.pojo.entity.LdDemandEnd; import com.nov.KgLowDurable.pojo.entity.LdOneOutStorageDetail; import com.nov.KgLowDurable.pojo.entity.LdOnePutStorageDetail; import com.nov.KgLowDurable.pojo.entity.LdPurchaseEnd; +import com.nov.KgLowDurable.pojo.vo.DepartmentVO; import com.nov.KgLowDurable.pojo.vo.QuarterVO; import java.util.List; +import java.util.Map; /** @@ -38,13 +40,13 @@ public interface ILdDemandEndService extends IService { * @param quarter * @return */ - List getDepartment(String year, String quarter); + List getDepartment(String year, String quarter); /** * 获取需求单数据 * @param ids - * @param department + * @param departmentId * @return */ - List getDemandEndData(String ids, String department); + Map> getDemandEndData(String ids, String departmentId); } diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdDurableFormService.java b/src/main/java/com/nov/KgLowDurable/service/ILdDurableFormService.java index 200d1cf..911e583 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdDurableFormService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdDurableFormService.java @@ -1,5 +1,6 @@ package com.nov.KgLowDurable.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.github.pagehelper.PageInfo; import com.nov.KgLowDurable.pojo.entity.LdApprove; import com.nov.KgLowDurable.pojo.entity.LdDurableForm; @@ -10,6 +11,13 @@ import com.nov.KgLowDurable.pojo.entity.LdDurableForm; */ public interface ILdDurableFormService extends IService { - - + /** + * 获取二级耐用品列表 + * @param departmentId + * @param materialName + * @param pageNum + * @param pageSize + * @return + */ + PageInfo getDurableFormList(String departmentId, String materialName, Integer pageNum, Integer pageSize); } diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdOneFormService.java b/src/main/java/com/nov/KgLowDurable/service/ILdOneFormService.java index 6819305..9aeed3f 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdOneFormService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdOneFormService.java @@ -31,7 +31,7 @@ public interface ILdOneFormService extends IService { * @param materialId * @return */ - LdOneForm getByMaterialId(Long materialId); + List getByMaterialId(Long materialId); /** * 根据物资编码查询 diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdTwoOutStorageDetailService.java b/src/main/java/com/nov/KgLowDurable/service/ILdTwoOutStorageDetailService.java new file mode 100644 index 0000000..145eaf7 --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/service/ILdTwoOutStorageDetailService.java @@ -0,0 +1,20 @@ +package com.nov.KgLowDurable.service; +import com.baomidou.mybatisplus.extension.service.IService; +import com.nov.KgLowDurable.pojo.entity.LdTwoOutStorageDetail; + +import java.util.List; + + +/** + * 审批 + * @author liweidong + */ +public interface ILdTwoOutStorageDetailService extends IService { + + /** + * 根据二级出库ID查询详情 + * @param twoOutStorageId + * @return + */ + List selectByTwoOutStorageId(Long twoOutStorageId); +} diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdTwoOutStorageService.java b/src/main/java/com/nov/KgLowDurable/service/ILdTwoOutStorageService.java new file mode 100644 index 0000000..a08d4ab --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/service/ILdTwoOutStorageService.java @@ -0,0 +1,42 @@ +package com.nov.KgLowDurable.service; +import com.baomidou.mybatisplus.extension.service.IService; +import com.github.pagehelper.PageInfo; +import com.nov.KgLowDurable.pojo.dto.LdTwoOutStorageDto; +import com.nov.KgLowDurable.pojo.entity.LdTwoOutStorage; +import com.nov.KgLowDurable.pojo.vo.LdTwoOutStorageInfoVO; + +import java.util.Date; + + +/** + * 审批 + * @author liweidong + */ +public interface ILdTwoOutStorageService extends IService { + + /** + * 二级出库列表 + * @param startTime + * @param endTime + * @param shipperName + * @param departmentId + * @param pageNum + * @param pageSize + * @return + */ + PageInfo getTwoOutStorageList(Date startTime, Date endTime, String shipperName, String departmentId, Integer pageNum, Integer pageSize); + + /** + * 二级出库提交 + * @param dto + * @return + */ + boolean submit(LdTwoOutStorageDto dto); + + /** + * 二级出库详情 + * @param twoOutStorageId + * @return + */ + LdTwoOutStorageInfoVO getDetail(Long twoOutStorageId); +} diff --git a/src/main/java/com/nov/KgLowDurable/service/IUserInfoService.java b/src/main/java/com/nov/KgLowDurable/service/IUserInfoService.java deleted file mode 100644 index 4469aba..0000000 --- a/src/main/java/com/nov/KgLowDurable/service/IUserInfoService.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.nov.KgLowDurable.service; - - -import com.nov.KgLowDurable.pojo.entity.Tuser; -import com.nov.KgLowDurable.pojo.vo.ApproverUser; -import com.nov.KgLowDurable.pojo.vo.UserInfoVO; - -import java.util.List; - -/** - * 用户 - * - * @author Chill - */ -public interface IUserInfoService { - - /** - * 获取用户信息 - * @return - */ - UserInfoVO getUserInfo() throws Exception; - - /** - * 获取审批人 - * @param mainErDepartment - * @param type - * @param ldOnePutStorageId - * @return - */ - boolean getApprover(String mainErDepartment, String type,Long ldOnePutStorageId); - - /** - * 获取部门负责人 - * @param department - * @return - */ - Tuser getDeptApprove(String department); -} diff --git a/src/main/java/com/nov/KgLowDurable/service/IUserService.java b/src/main/java/com/nov/KgLowDurable/service/IUserService.java new file mode 100644 index 0000000..58bdc00 --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/service/IUserService.java @@ -0,0 +1,46 @@ +package com.nov.KgLowDurable.service; +import com.baomidou.mybatisplus.extension.service.IService; +import com.nov.KgLowDurable.pojo.entity.Department; +import com.nov.KgLowDurable.pojo.entity.User; +import com.nov.KgLowDurable.pojo.vo.DepartmentVO; +import com.nov.KgLowDurable.pojo.vo.UserInfoVO; + +import java.util.List; + + +/** + * 审批 + * @author liweidong + */ +public interface IUserService extends IService { + + + /** + * 获取用户信息 + * @return + */ + UserInfoVO getUserInfo() throws Exception; + + /** + * 获取审批人 + * @param mainErDepartment + * @param type + * @param formId + * @return + */ + boolean getApprover(String mainErDepartment, String type,Long formId); + + /** + * 获取部门负责人 + * @param department + * @return + */ + User getDeptApprove(String department); + + /** + * 根据部门Id获取领用人 + * @param departmentId + * @return + */ + List getUserByDeptId(String departmentId); +} diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/DepartmentServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/DepartmentServiceImpl.java new file mode 100644 index 0000000..ccac934 --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/DepartmentServiceImpl.java @@ -0,0 +1,32 @@ +package com.nov.KgLowDurable.service.Impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nov.KgLowDurable.mapper.DepartmentMapper; +import com.nov.KgLowDurable.mapper.LdApproveMapper; +import com.nov.KgLowDurable.pojo.entity.Department; +import com.nov.KgLowDurable.pojo.entity.LdApprove; +import com.nov.KgLowDurable.pojo.vo.DepartmentVO; +import com.nov.KgLowDurable.service.IDepartmentService; +import com.nov.KgLowDurable.service.ILdApproveService; +import lombok.AllArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 服务实现类 + * @author liweidong + */ +@Service +@AllArgsConstructor +public class DepartmentServiceImpl extends ServiceImpl implements IDepartmentService { + + @Autowired + DepartmentMapper departmentMapper; + + @Override + public List getOnePutDepartment() { + return departmentMapper.selectOnePutDepartment(); + } +} diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdApproveServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdApproveServiceImpl.java index ac20b56..3fa7789 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdApproveServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdApproveServiceImpl.java @@ -35,6 +35,11 @@ import java.util.stream.Collectors; @AllArgsConstructor public class LdApproveServiceImpl extends ServiceImpl implements ILdApproveService { + @Autowired + LdApproveMapper ldApproveMapper; - + @Override + public List getByFromId(Long formId,String type) { + return ldApproveMapper.selectByFromId(formId,type); + } } diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdConsumerFormServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdConsumerFormServiceImpl.java index 27714f4..7f33573 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdConsumerFormServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdConsumerFormServiceImpl.java @@ -1,16 +1,21 @@ package com.nov.KgLowDurable.service.Impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.nov.KgLowDurable.mapper.LdApproveMapper; import com.nov.KgLowDurable.mapper.LdConsumerFormMapper; import com.nov.KgLowDurable.pojo.entity.LdApprove; import com.nov.KgLowDurable.pojo.entity.LdConsumerForm; +import com.nov.KgLowDurable.pojo.entity.LdDemandEnd; import com.nov.KgLowDurable.service.ILdApproveService; import com.nov.KgLowDurable.service.ILdConsumerFormService; import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * 服务实现类 * @author liweidong @@ -26,4 +31,17 @@ public class LdConsumerFormServiceImpl extends ServiceImpl getConsumerFormByDeptId(String departmentId) { + return consumerFormMapper.selectByDepartmentId(departmentId); + } + + @Override + public PageInfo getConsumerFormList(String departmentId, String materialName, Integer pageNum, Integer pageSize) { + PageHelper.startPage(pageNum,pageSize); + List ldConsumerFormList = consumerFormMapper.selectConsumerFormList(departmentId,materialName); + PageInfo pageInfo = new PageInfo<>(ldConsumerFormList); + return pageInfo; + } } diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdDemandEndServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdDemandEndServiceImpl.java index ac0914a..53c580c 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdDemandEndServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdDemandEndServiceImpl.java @@ -7,6 +7,7 @@ import com.nov.KgLowDurable.exception.CustomerException; import com.nov.KgLowDurable.mapper.LdDemandEndMapper; import com.nov.KgLowDurable.mapper.LdPurchaseEndMapper; import com.nov.KgLowDurable.pojo.entity.*; +import com.nov.KgLowDurable.pojo.vo.DepartmentVO; import com.nov.KgLowDurable.pojo.vo.QuarterVO; import com.nov.KgLowDurable.service.*; import com.nov.KgLowDurable.util.StringUtils; @@ -16,9 +17,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; /** @@ -39,6 +38,12 @@ public class LdDemandEndServiceImpl extends ServiceImpl getDemandEndList(String demandNo, Integer pageNum, Integer pageSize) { @@ -54,15 +59,28 @@ public class LdDemandEndServiceImpl extends ServiceImpl getDepartment(String year, String quarter) { - return demandEndMapper.selectByYearAndQuarter(year,quarter); + public List getDepartment(String year, String quarter) { + List ldDemandEndList = demandEndMapper.selectByYearAndQuarter(year, quarter); + + return ldDemandEndList.stream() + .filter(item -> item != null && item.getDepartmentId() != null && !item.getDepartmentId().trim().isEmpty()) + .collect(Collectors.toMap( + LdDemandEnd::getDepartmentId, + item -> new DepartmentVO(item.getDepartmentId(), item.getDepartment()), + (existing, replacement) -> existing, + LinkedHashMap::new + )) + .values() + .stream() + .collect(Collectors.toList()); } @Override - public List getDemandEndData(String ids, String department) { + public Map> getDemandEndData(String ids, String departmentId) { if(StringUtils.isEmpty(ids)){ throw new CustomerException("ids不能为空"); } + Map> map = new HashMap<>(); List idList = Arrays.stream(ids.split(",")).map(Long::valueOf).collect(Collectors.toList()); //查询一级出库是否有该需求单 List oneOutStorageDemandEndList = oneOutStorageDemandEndService.selectByDemandEndId(idList); @@ -74,24 +92,66 @@ public class LdDemandEndServiceImpl extends ServiceImpl oneOutStorageDetailList = oneOutStorageDetailService.selectByOneOutStorageIds(oneOutStorageIds); - return oneOutStorageDetailList; + Map materialIdCount = oneOutStorageDetailList.stream() + .collect(Collectors.groupingBy( + LdOneOutStorageDetail::getMaterialId, + Collectors.counting() + )); + + List duplicateList = oneOutStorageDetailList.stream() + .filter(item -> materialIdCount.get(item.getMaterialId()) > 1) + .collect(Collectors.toList()); + + List uniqueList = oneOutStorageDetailList.stream() + .filter(item -> materialIdCount.get(item.getMaterialId()) == 1) + .collect(Collectors.toList()); + + map.put("duplicateList",duplicateList); + map.put("uniqueList",uniqueList); + return map; } //获取需求单数据 - List demandEndList = demandEndMapper.selectByIdList(idList); + List demandEndList = demandEndMapper.selectByIdList(idList,departmentId); List list = new ArrayList<>(); + for (LdDemandEnd ldDemandEnd : demandEndList) { - LdOneOutStorageDetail oneOutStorageDetail = new LdOneOutStorageDetail(); - oneOutStorageDetail.setMaterialId(ldDemandEnd.getMaterialId()); - oneOutStorageDetail.setMaterialName(ldDemandEnd.getMaterialName()); - oneOutStorageDetail.setModel(ldDemandEnd.getModel()); - oneOutStorageDetail.setType(ldDemandEnd.getType()); - oneOutStorageDetail.setUnit(ldDemandEnd.getUnit()); - oneOutStorageDetail.setApplicationQuantity(new BigDecimal(ldDemandEnd.getNum())); - oneOutStorageDetail.setLdDemandEndId(ldDemandEnd.getId()); - list.add(oneOutStorageDetail); + List oneFormList = oneFormService.getByMaterialId(ldDemandEnd.getMaterialId()); + if(!CollectionUtils.isEmpty(oneFormList)){ + for (LdOneForm oneForm : oneFormList) { + LdOneOutStorageDetail oneOutStorageDetail = new LdOneOutStorageDetail(); + oneOutStorageDetail.setMaterialId(ldDemandEnd.getMaterialId()); + oneOutStorageDetail.setMaterialName(ldDemandEnd.getMaterialName()); + oneOutStorageDetail.setMaterialCode(oneForm.getMaterialCode()); + oneOutStorageDetail.setModel(ldDemandEnd.getModel()); + oneOutStorageDetail.setType(oneForm.getType()); + oneOutStorageDetail.setUnit(ldDemandEnd.getUnit()); + oneOutStorageDetail.setApplicationQuantity(new BigDecimal(ldDemandEnd.getNum())); + oneOutStorageDetail.setLdDemandEndId(ldDemandEnd.getId()); + oneOutStorageDetail.setDepartment(ldDemandEnd.getDepartmentId()); + oneOutStorageDetail.setDepartmentName(ldDemandEnd.getDepartment()); + list.add(oneOutStorageDetail); + } + } } - return list; + Map materialIdCount = list.stream() + .collect(Collectors.groupingBy( + LdOneOutStorageDetail::getMaterialId, + Collectors.counting() + )); + + List duplicateList = list.stream() + .filter(item -> materialIdCount.get(item.getMaterialId()) > 1) + .collect(Collectors.toList()); + + List uniqueList = list.stream() + .filter(item -> materialIdCount.get(item.getMaterialId()) == 1) + .collect(Collectors.toList()); + + map.put("duplicateList",duplicateList); + map.put("uniqueList",uniqueList); + + return map; } } diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdDurableFormServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdDurableFormServiceImpl.java index d49a116..2ee6082 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdDurableFormServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdDurableFormServiceImpl.java @@ -1,15 +1,21 @@ package com.nov.KgLowDurable.service.Impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.nov.KgLowDurable.mapper.LdApproveMapper; import com.nov.KgLowDurable.mapper.LdDurableFormMapper; import com.nov.KgLowDurable.pojo.entity.LdApprove; +import com.nov.KgLowDurable.pojo.entity.LdConsumerForm; import com.nov.KgLowDurable.pojo.entity.LdDurableForm; import com.nov.KgLowDurable.service.ILdApproveService; import com.nov.KgLowDurable.service.ILdDurableFormService; import lombok.AllArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * 服务实现类 * @author liweidong @@ -18,6 +24,14 @@ import org.springframework.stereotype.Service; @AllArgsConstructor public class LdDurableFormServiceImpl extends ServiceImpl implements ILdDurableFormService { + @Autowired + LdDurableFormMapper durableFormMapper; - + @Override + public PageInfo getDurableFormList(String departmentId, String materialName, Integer pageNum, Integer pageSize) { + PageHelper.startPage(pageNum,pageSize); + List ldDurableFormList = durableFormMapper.selectDurableFormList(departmentId,materialName); + PageInfo pageInfo = new PageInfo<>(ldDurableFormList); + return pageInfo; + } } diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdInventoryRecordServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdInventoryRecordServiceImpl.java index 7f82697..ba207ea 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdInventoryRecordServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdInventoryRecordServiceImpl.java @@ -110,7 +110,6 @@ public class LdInventoryRecordServiceImpl extends ServiceImpl getByMaterialId(Long materialId) { return oneFormMapper.selectByMaterialId(materialId); } diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdOneOutStorageServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdOneOutStorageServiceImpl.java index f9797d5..2ea459f 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdOneOutStorageServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdOneOutStorageServiceImpl.java @@ -50,7 +50,7 @@ public class LdOneOutStorageServiceImpl extends ServiceImpl getOnePutStorageList(Date startTime, Date endTime, String inOperator, Integer pageNum, Integer pageSize) { @@ -110,14 +113,13 @@ public class LdOnePutStorageServiceImpl extends ServiceImpl ldOnePutStorageDetailList = onePutStorageDetailService.getByOnePutStorageId(ldOnePutStorage.getId()); - if(!BatchConstant.APPROVE.equals(ldOnePutStorage.getStatus())){ - for (LdOnePutStorageDetail onePutStorageDetail : ldOnePutStorageDetailList) { - onePutStorageDetail.setInboundQuantity(BigDecimal.valueOf(0)); - } - } + + List approveList = ldApproveService.getByFromId(onePutStorageId,BatchConstant.PUT_STORAGE_TYPE); + LdOnePutStorageInfoVO ldOnePutStorageInfoVO = new LdOnePutStorageInfoVO(); ldOnePutStorageInfoVO.setLdOnePutStorage(ldOnePutStorage); ldOnePutStorageInfoVO.setLdOnePutStorageDetailList(ldOnePutStorageDetailList); + ldOnePutStorageInfoVO.setApproveList(approveList); return ldOnePutStorageInfoVO; } @@ -153,7 +155,7 @@ public class LdOnePutStorageServiceImpl extends ServiceImpl getPurchaseEndList(String purchaseNo, Integer pageNum, Integer pageSize) { PageHelper.startPage(pageNum,pageSize); @@ -88,11 +91,13 @@ public class LdPurchaseEndServiceImpl extends ServiceImpl list = new ArrayList<>(); for (LdPurchaseEnd ldPurchaseEnd : ldPurchaseEndList) { + LdMaterial material = materialService.getById(ldPurchaseEnd.getMaterialId()); LdOnePutStorageDetail onePutStorageDetail = new LdOnePutStorageDetail(); onePutStorageDetail.setMaterialId(ldPurchaseEnd.getMaterialId()); onePutStorageDetail.setMaterialName(ldPurchaseEnd.getMaterialName()); + onePutStorageDetail.setMaterialCode(material.getMaterialCode()); onePutStorageDetail.setModel(ldPurchaseEnd.getModel()); - onePutStorageDetail.setType(ldPurchaseEnd.getType()); + onePutStorageDetail.setType(ldPurchaseEnd.getMoney().compareTo(new BigDecimal("600")) >= 0 ? "NY" : "YH"); onePutStorageDetail.setUnit(ldPurchaseEnd.getUnit()); onePutStorageDetail.setRequiredQuantity(new BigDecimal(ldPurchaseEnd.getNum())); onePutStorageDetail.setUnitPrice(ldPurchaseEnd.getMoney()); diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageDetailServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageDetailServiceImpl.java new file mode 100644 index 0000000..f3bdea8 --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageDetailServiceImpl.java @@ -0,0 +1,30 @@ +package com.nov.KgLowDurable.service.Impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nov.KgLowDurable.mapper.LdTwoOutStorageDetailMapper; +import com.nov.KgLowDurable.pojo.entity.LdTwoOutStorageDetail; + + +import com.nov.KgLowDurable.service.ILdTwoOutStorageDetailService; +import lombok.AllArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 服务实现类 + * @author liweidong + */ +@Service +@AllArgsConstructor +public class LdTwoOutStorageDetailServiceImpl extends ServiceImpl implements ILdTwoOutStorageDetailService { + + @Autowired + LdTwoOutStorageDetailMapper twoOutStorageDetailMapper; + + @Override + public List selectByTwoOutStorageId(Long twoOutStorageId) { + return twoOutStorageDetailMapper.selectByTwoOutStorageId(twoOutStorageId); + } +} diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java new file mode 100644 index 0000000..6a9e409 --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java @@ -0,0 +1,141 @@ +package com.nov.KgLowDurable.service.Impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.nov.KgLowDurable.constant.BatchConstant; +import com.nov.KgLowDurable.exception.CustomerException; +import com.nov.KgLowDurable.mapper.LdTwoOutStorageMapper; +import com.nov.KgLowDurable.pojo.dto.LdTwoOutStorageDto; +import com.nov.KgLowDurable.pojo.entity.LdApprove; +import com.nov.KgLowDurable.pojo.entity.LdTwoOutStorage; +import com.nov.KgLowDurable.pojo.entity.LdTwoOutStorageDetail; +import com.nov.KgLowDurable.pojo.vo.LdTwoOutStorageInfoVO; +import com.nov.KgLowDurable.pojo.vo.UserInfoVO; +import com.nov.KgLowDurable.service.ILdApproveService; +import com.nov.KgLowDurable.service.ILdTwoOutStorageDetailService; +import com.nov.KgLowDurable.service.ILdTwoOutStorageService; +import com.nov.KgLowDurable.service.IUserService; +import com.nov.KgLowDurable.util.OrderNoGen; +import lombok.AllArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * 服务实现类 + * @author liweidong + */ +@Service +@AllArgsConstructor +public class LdTwoOutStorageServiceImpl extends ServiceImpl implements ILdTwoOutStorageService { + + @Autowired + LdTwoOutStorageMapper twoOutStorageMapper; + + @Autowired + OrderNoGen orderNoGen; + + @Autowired + ILdTwoOutStorageDetailService twoOutStorageDetailService; + + @Autowired + IUserService userService; + + @Autowired + ILdApproveService approveService; + + @Override + public PageInfo getTwoOutStorageList(Date startTime, Date endTime, String shipperName, String departmentId, Integer pageNum, Integer pageSize) { + PageHelper.startPage(pageNum,pageSize); + // 查询全部 + List ldErstockOutList = twoOutStorageMapper.selectTwoOutStorageList(startTime,endTime,shipperName,departmentId); + // 返回结果 + PageInfo pageInfo = new PageInfo<>(ldErstockOutList); + return pageInfo; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean submit(LdTwoOutStorageDto dto) { + if(null == dto.getLdTwoOutStorage()){ + throw new CustomerException("基础数据不能为空"); + } + if(CollectionUtils.isEmpty(dto.getLdTwoOutStorageDetailList())){ + throw new CustomerException("出库明细数据不能为空"); + } + + UserInfoVO userInfo = dto.getUserInfoVO(); + LdTwoOutStorage ldTwoOutStorage = dto.getLdTwoOutStorage(); + + // 生成出库单号 + String orderNo = orderNoGen.generate("SO"); + ldTwoOutStorage.setOrderNo(orderNo); + + // 设置出库操作人 + ldTwoOutStorage.setShipperId(userInfo.getUserId()); + ldTwoOutStorage.setShipperName(userInfo.getName()); + + //设置状态 + ldTwoOutStorage.setStatus(BatchConstant.NO_SHIPPED_OUT); + + // 保存主表 + int insertResult = twoOutStorageMapper.insert(ldTwoOutStorage); + if (insertResult <= 0) { + throw new CustomerException("一级出库单保存失败"); + } + + Long outOneStorageId = ldTwoOutStorage.getId(); + if (outOneStorageId == null) { + throw new CustomerException("获取二级出库单ID失败"); + } + + //处理二级出库明细 + List list = new ArrayList<>(); + List ldTwoOutStorageDetailList = dto.getLdTwoOutStorageDetailList(); + for (LdTwoOutStorageDetail ldTwoOutStorageDetail : ldTwoOutStorageDetailList) { + ldTwoOutStorageDetail.setTwoOutStorageId(outOneStorageId); + ldTwoOutStorageDetail.setTwoOutStorageNo(ldTwoOutStorage.getOrderNo()); + ldTwoOutStorageDetail.setTwoOutDetailCode(orderNoGen.generate("SOD")); + ldTwoOutStorageDetail.setShipperStatus(BatchConstant.NO_SHIPPED_OUT); + ldTwoOutStorageDetail.setOptTime(new Date()); + list.add(ldTwoOutStorageDetail); + } + boolean saveDetailResult = twoOutStorageDetailService.saveBatch(list); + if (!saveDetailResult) { + throw new CustomerException("二级出库明细保存失败"); + } + + //获取审批人 + try { + boolean approver = userService.getApprover(ldTwoOutStorage.getDepartmentId(), + "1", ldTwoOutStorage.getId()); + + } catch (Exception e) { + throw new CustomerException("获取审批人失败: " + e.getMessage()); + } + + // 5. todo 提交审批 + return true; + } + + @Override + public LdTwoOutStorageInfoVO getDetail(Long twoOutStorageId) { + //基础信息 + LdTwoOutStorage ldTwoOutStorage = twoOutStorageMapper.selectById(twoOutStorageId); + //明细信息 + List ldTwoOutStorageDetailList = twoOutStorageDetailService.selectByTwoOutStorageId(twoOutStorageId); + //审批信息 + List ldApproveList = approveService.getByFromId(twoOutStorageId, BatchConstant.OUT_STORAGE_TYPE); + + return new LdTwoOutStorageInfoVO() + .setApproveList(ldApproveList) + .setLdTwoOutStorage(ldTwoOutStorage) + .setLdTwoOutStorageDetailList(ldTwoOutStorageDetailList); + } +} diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoPutStorageServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoPutStorageServiceImpl.java index dad1c5c..6a08539 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoPutStorageServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoPutStorageServiceImpl.java @@ -106,6 +106,7 @@ public class LdTwoPutStorageServiceImpl extends ServiceImpl implements IUserService { + + @Autowired + UserMapper userMapper; @Autowired ILdApproveService ldApproveService; @@ -71,13 +78,12 @@ public class UserInfoServiceImpl implements IUserInfoService { } @Override - public boolean getApprover(String mainErDepartment, String type,Long ldOnePutStorageId) { + public boolean getApprover(String mainErDepartment, String type,Long formId) { // Map headers = new HashMap() {{ // put("Content-Type", "application/json"); // }}; // // Map querys = new HashMap() {{ -// put("deptId",mainErDepartment); // put("type",type); // }}; // @@ -103,22 +109,20 @@ public class UserInfoServiceImpl implements IUserInfoService { // } // // ApproverUser approverUser = JSON.toJavaObject(obj.getJSONObject("data"), ApproverUser.class); - List tuserList = new ArrayList<>(); - LdApprove ldApprove = new LdApprove(); - ldApprove.setFormId(ldOnePutStorageId.intValue()); + ldApprove.setFormId(formId.intValue()); ldApprove.setUserId("LiuXu"); ldApprove.setUserName("刘旭"); ldApprove.setLevel("1"); ldApprove.setStatus("0"); ldApprove.setOptTime(LocalDateTime.now()); - ldApprove.setType("0"); + ldApprove.setType(type); boolean save = ldApproveService.save(ldApprove); return save; } @Override - public Tuser getDeptApprove(String department) { + public User getDeptApprove(String department) { // Map headers = new HashMap() {{ // put("Content-Type", "application/json"); // }}; @@ -149,11 +153,14 @@ public class UserInfoServiceImpl implements IUserInfoService { // } // // UserInfoVO approverUser = JSON.toJavaObject(obj.getJSONObject("data"), UserInfoVO.class); - Tuser tuser = new Tuser(); - tuser.setUserId("负责人ID"); - tuser.setName("负责人名称"); - return tuser; + User user = new User(); + user.setUserId("负责人ID"); + user.setName("负责人名称"); + return user; } - + @Override + public List getUserByDeptId(String departmentId) { + return userMapper.selectByDepartmentId(departmentId); + } } diff --git a/src/main/java/com/nov/KgLowDurable/util/OrderNoGen.java b/src/main/java/com/nov/KgLowDurable/util/OrderNoGen.java index d131a40..1ba8655 100644 --- a/src/main/java/com/nov/KgLowDurable/util/OrderNoGen.java +++ b/src/main/java/com/nov/KgLowDurable/util/OrderNoGen.java @@ -150,7 +150,7 @@ public class OrderNoGen { throw new IllegalArgumentException("前缀不能为null"); } // 可随时增加 - if (!prefix.matches("^(FI|FID|FO|SI|SO)$")) { + if (!prefix.matches("^(FI|FID|FO|SI|SO|SOD)$")) { throw new IllegalArgumentException( "前缀必须为以下值之一：FI(一级库入库),FID(一级入库明细), FO(一级库出库), SI(二级库入库), SO(二级库出库)" ); diff --git a/src/main/resources/mapper/DepartmentMapper.xml b/src/main/resources/mapper/DepartmentMapper.xml new file mode 100644 index 0000000..e763609 --- /dev/null +++ b/src/main/resources/mapper/DepartmentMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/LdApproveMapper.xml b/src/main/resources/mapper/LdApproveMapper.xml index 25f7692..f6bf375 100644 --- a/src/main/resources/mapper/LdApproveMapper.xml +++ b/src/main/resources/mapper/LdApproveMapper.xml @@ -13,6 +13,9 @@ + diff --git a/src/main/resources/mapper/LdConsumerFormMapper.xml b/src/main/resources/mapper/LdConsumerFormMapper.xml index 071befe..44ab204 100644 --- a/src/main/resources/mapper/LdConsumerFormMapper.xml +++ b/src/main/resources/mapper/LdConsumerFormMapper.xml @@ -15,6 +15,7 @@ + @@ -23,6 +24,18 @@ + + diff --git a/src/main/resources/mapper/LdDemandEndMapper.xml b/src/main/resources/mapper/LdDemandEndMapper.xml index dd2cd71..b81a23d 100644 --- a/src/main/resources/mapper/LdDemandEndMapper.xml +++ b/src/main/resources/mapper/LdDemandEndMapper.xml @@ -9,19 +9,19 @@ - + - id, demand_no, material_name, material_id, model, type, unit, num, money, year, quarter, opt_time ,department + id, demand_no, material_name, material_id, model, unit, num, money, year, quarter, opt_time ,department_id,department - SELECT - department + FROM ld_demand_end WHERE `year` = #{year} AND quarter = #{quarter} @@ -55,11 +55,13 @@ + diff --git a/src/main/resources/mapper/LdDurableFormMapper.xml b/src/main/resources/mapper/LdDurableFormMapper.xml index d707286..7364b06 100644 --- a/src/main/resources/mapper/LdDurableFormMapper.xml +++ b/src/main/resources/mapper/LdDurableFormMapper.xml @@ -15,11 +15,22 @@ + + + diff --git a/src/main/resources/mapper/LdOneFormMapper.xml b/src/main/resources/mapper/LdOneFormMapper.xml index 8dba286..669b1bb 100644 --- a/src/main/resources/mapper/LdOneFormMapper.xml +++ b/src/main/resources/mapper/LdOneFormMapper.xml @@ -5,7 +5,6 @@ - diff --git a/src/main/resources/mapper/LdOneOutStorageDetailMapper.xml b/src/main/resources/mapper/LdOneOutStorageDetailMapper.xml index fc3e982..ee9af10 100644 --- a/src/main/resources/mapper/LdOneOutStorageDetailMapper.xml +++ b/src/main/resources/mapper/LdOneOutStorageDetailMapper.xml @@ -51,12 +51,21 @@ diff --git a/src/main/resources/mapper/LdTwoOutStorageDetailMapper.xml b/src/main/resources/mapper/LdTwoOutStorageDetailMapper.xml new file mode 100644 index 0000000..7c31ded --- /dev/null +++ b/src/main/resources/mapper/LdTwoOutStorageDetailMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/LdTwoOutStorageMapper.xml b/src/main/resources/mapper/LdTwoOutStorageMapper.xml new file mode 100644 index 0000000..97ac564 --- /dev/null +++ b/src/main/resources/mapper/LdTwoOutStorageMapper.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/LdTwoPutStorageMapper.xml b/src/main/resources/mapper/LdTwoPutStorageMapper.xml index 785ed14..eee3477 100644 --- a/src/main/resources/mapper/LdTwoPutStorageMapper.xml +++ b/src/main/resources/mapper/LdTwoPutStorageMapper.xml @@ -6,7 +6,6 @@ - diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml new file mode 100644 index 0000000..640da47 --- /dev/null +++ b/src/main/resources/mapper/UserMapper.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +