From 1c2baee1ec93475eaa6043bbd1efd14dcfaa2f0a Mon Sep 17 00:00:00 2001 From: wcy <761646706@qq.com> Date: Wed, 25 Sep 2024 16:30:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=BA=93=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SecondaryWarehouseController.java | 15 ++++- .../mapper/SecondaryWarehouseMapper.java | 5 ++ .../service/SecondaryWarehouseService.java | 3 + .../impl/SecondaryWarehouseServiceImpl.java | 22 +++++++ .../material/SecondaryWarehouseMapper.xml | 59 +++++++++++++++++++ 5 files changed, 101 insertions(+), 3 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java index fa20deb..b1047b9 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java @@ -10,6 +10,7 @@ import com.bonus.sgzb.common.log.enums.BusinessType; import com.bonus.sgzb.material.domain.*; import com.bonus.sgzb.material.service.SecondaryWarehouseService; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -44,9 +45,17 @@ public class SecondaryWarehouseController extends BaseController { @PostMapping("/exportList") public void exportList(HttpServletResponse response, @RequestBody SecondaryWarehouse bean) { - List list = service.getList(bean); - ExcelUtil util = new ExcelUtil(SecondaryWarehouse.class); - util.exportExcel(response, list, "二级库导出"); + if (bean.getLeaseType().equals(0)){ + SecondaryWarehouseVo bean1 = new SecondaryWarehouseVo(); + BeanUtils.copyProperties(bean,bean1); + List list = service.getList1(bean1); + ExcelUtil util = new ExcelUtil(SecondaryWarehouseVo.class); + util.exportExcel(response, list, "二级库导出"); + }else { + List list = service.getList(bean); + ExcelUtil util = new ExcelUtil(SecondaryWarehouse.class); + util.exportExcel(response, list, "二级库导出"); + } } /** diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SecondaryWarehouseMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SecondaryWarehouseMapper.java index 87bcdca..104d8cc 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SecondaryWarehouseMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SecondaryWarehouseMapper.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.material.mapper; import com.bonus.sgzb.material.domain.SecondaryWarehouse; +import com.bonus.sgzb.material.domain.SecondaryWarehouseVo; import com.bonus.sgzb.material.domain.TeamLeaseInfo; import org.apache.ibatis.annotations.Mapper; @@ -41,4 +42,8 @@ public interface SecondaryWarehouseMapper { Integer selectStockNum(SecondaryWarehouse secondaryWarehouse); List getNewRecords(TeamLeaseInfo bean); + + List getList2(SecondaryWarehouseVo bean1); + + Integer selectStockNum1(SecondaryWarehouseVo secondaryWarehouse); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/SecondaryWarehouseService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/SecondaryWarehouseService.java index f098f8c..d460e29 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/SecondaryWarehouseService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/SecondaryWarehouseService.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.material.service; import com.bonus.sgzb.material.domain.SecondaryWarehouse; +import com.bonus.sgzb.material.domain.SecondaryWarehouseVo; import com.bonus.sgzb.material.domain.TeamLeaseInfo; import java.util.List; @@ -21,4 +22,6 @@ public interface SecondaryWarehouseService { // List getNewRecords(TeamLeaseInfo bean); int addNewOperate(TeamLeaseInfo bean); + + List getList1(SecondaryWarehouseVo bean1); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java index 2cd807e..adaa067 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java @@ -2,6 +2,7 @@ package com.bonus.sgzb.material.service.impl; import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.material.domain.SecondaryWarehouse; +import com.bonus.sgzb.material.domain.SecondaryWarehouseVo; import com.bonus.sgzb.material.domain.TeamLeaseInfo; import com.bonus.sgzb.material.mapper.SecondaryWarehouseMapper; import com.bonus.sgzb.material.service.SecondaryWarehouseService; @@ -20,6 +21,25 @@ public class SecondaryWarehouseServiceImpl implements SecondaryWarehouseService @Autowired private SecondaryWarehouseMapper mapper; + + @Override + public List getList1(SecondaryWarehouseVo bean1) { + List list = new ArrayList<>(); + if (bean1.getLeaseType().equals(1)){ + list = mapper.getList2(bean1); + for (SecondaryWarehouseVo secondaryWarehouse : list) { + Integer warehouse = mapper.selectStockNum1(secondaryWarehouse); + if (warehouse == null) { + warehouse = 0; + } + secondaryWarehouse.setReceiveNum(warehouse); + secondaryWarehouse.setStockNum(secondaryWarehouse.getNum() - secondaryWarehouse.getReceiveNum()); + } + }else { + list = mapper.getList2(bean1); + } + return list; + } @Override public List getList(SecondaryWarehouse bean) { List list = new ArrayList<>(); @@ -65,6 +85,8 @@ public class SecondaryWarehouseServiceImpl implements SecondaryWarehouseService return mapper.addNewOperate(bean); } + + // @Override // public List getNewRecords(TeamLeaseInfo bean) { // List list = new ArrayList<>(); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml index 3e78e42..40f6606 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml @@ -145,6 +145,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) + + + insert into receive_detail (parent_id,type_id,out_num,out_time,type,out_name,pick_name)