bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

导出代码提交

This commit is contained in:
1539530615@qq.com 2024-03-06 18:08:29 +08:00
parent 14dedcf440
commit 8efb73bd59
14 changed files with 736 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java
View File

@ -106,7 +106,6 @@ public class MaMachineServiceImpl implements MaMachineService {
maPropSet.setCreateBy(SecurityUtils.getUsername());
maPropSet.setCompanyId(maMachine.getCompanyId());
maPropInfoMapper.insertMaPropSet(maPropSet);
return maMachineMapper.updateMaMachine(maMachine);
}

1
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml
View File

@ -80,7 +80,6 @@
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
LEFT JOIN ma_type_repair mtk ON mtk.type_id = mt.type_id
LEFT JOIN sys_dic dic ON dic.id = b.label_type
LEFT JOIN ma_machine ma ON ma.ma_id = a.ma_id
LEFT JOIN sys_user user on user.user_id =a.binder

52
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java
View File

@ -1,17 +1,20 @@
package com.bonus.sgzb.material.controller;
import cn.hutool.core.convert.Convert;
import com.bonus.sgzb.base.api.domain.SltAgreementInfo;
import com.bonus.sgzb.common.core.utils.poi.ExcelUtil;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.material.domain.SecondaryWarehouse;
import com.bonus.sgzb.material.domain.TeamLeaseInfo;
import com.bonus.sgzb.common.log.annotation.Log;
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.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@ -35,6 +38,18 @@ public class SecondaryWarehouseController extends BaseController {
return getDataTable(list);
}
/**
* 二级库导出
*/
@Log(title = "二级库导出", businessType = BusinessType.EXPORT)
@PostMapping("/exportList")
public void exportList(HttpServletResponse response, @RequestBody SecondaryWarehouse bean)
{
List<SecondaryWarehouse> list = service.getList(bean);
ExcelUtil<SecondaryWarehouse> util = new ExcelUtil<SecondaryWarehouse>(SecondaryWarehouse.class);
util.exportExcel(response, list, "二级库导出");
}
/**
* 出库/退库操作
*/
@ -55,6 +70,31 @@ public class SecondaryWarehouseController extends BaseController {
return getDataTable(list);
}
/**
* 出库台账导出
*/
@Log(title = "出库台账导出", businessType = BusinessType.EXPORT)
@PostMapping("/exportOperateList")
public void exportOperateList(HttpServletResponse response, @RequestBody TeamLeaseInfo bean)
{
List<TeamLeaseInfo> list = service.getOperateList(bean);
ExcelUtil<TeamLeaseInfo> util = new ExcelUtil<TeamLeaseInfo>(TeamLeaseInfo.class);
util.exportExcel(response, list, "出库台账导出");
}
/**
* 回库台账导出
*/
@Log(title = "回库台账导出", businessType = BusinessType.EXPORT)
@PostMapping("/exportIntOperateList")
public void exportIntOperateList(HttpServletResponse response, @RequestBody TeamLeaseInfo bean)
{
List<TeamLeaseInfo> list = service.getOperateList(bean);
List<TeamLeaseInfoTwo> listTwo = Convert.toList(TeamLeaseInfoTwo.class,list);
ExcelUtil<TeamLeaseInfoTwo> util = new ExcelUtil<TeamLeaseInfoTwo>(TeamLeaseInfoTwo.class);
util.exportExcel(response, listTwo, "回库台账导出");
}
/**
* 获取进场、退场、场内库存记录
*/

56
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java
View File

@ -1,5 +1,6 @@
package com.bonus.sgzb.material.controller;
import cn.hutool.core.convert.Convert;
import com.bonus.sgzb.base.api.domain.SltAgreementApply;
import com.bonus.sgzb.base.api.domain.SltAgreementDetails;
import com.bonus.sgzb.base.api.domain.SltAgreementInfo;
@ -11,6 +12,9 @@ import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.common.log.annotation.Log;
import com.bonus.sgzb.common.log.enums.BusinessType;
import com.bonus.sgzb.material.domain.AgreementInfo;
import com.bonus.sgzb.material.domain.LeaseInfo;
import com.bonus.sgzb.material.domain.LoseInfo;
import com.bonus.sgzb.material.domain.ScrapInfo;
import com.bonus.sgzb.material.service.SltAgreementInfoService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@ -58,6 +62,58 @@ public class SltAgreementInfoController extends BaseController {
return AjaxResult.success(bean);
}
/**
* 租赁明细导出
*/
@Log(title = "租赁明细导出", businessType = BusinessType.EXPORT)
@PostMapping("/exportLease")
public void exportLease(HttpServletResponse response,@RequestBody List<AgreementInfo> list)
{
List<SltAgreementInfo> explist = service.getLeaseList(list);
List<LeaseInfo> leaseInfoList = Convert.toList(LeaseInfo.class,explist);
ExcelUtil<LeaseInfo> util = new ExcelUtil<LeaseInfo>(LeaseInfo.class);
util.exportExcel(response, leaseInfoList, "租赁明细导出");
}
/**
* 丢失明细导出
*/
@Log(title = "丢失明细导出", businessType = BusinessType.EXPORT)
@PostMapping("/exportLose")
public void exportLose(HttpServletResponse response,@RequestBody List<AgreementInfo> list)
{
List<SltAgreementInfo> explist = service.getLoseList(list);
List<LoseInfo> leaseInfoList = Convert.toList(LoseInfo.class,explist);
ExcelUtil<LoseInfo> util = new ExcelUtil<LoseInfo>(LoseInfo.class);
util.exportExcel(response, leaseInfoList, "丢失明细导出");
}
/**
* 维修明细导出
*/
@Log(title = "维修明细导出", businessType = BusinessType.EXPORT)
@PostMapping("/exportRepair")
public void exportRepair(HttpServletResponse response,@RequestBody List<AgreementInfo> list)
{
List<SltAgreementInfo> explist = service.getRepairList(list);
List<LeaseInfo> leaseInfoList = Convert.toList(LeaseInfo.class,explist);
ExcelUtil<LeaseInfo> util = new ExcelUtil<LeaseInfo>(LeaseInfo.class);
util.exportExcel(response, leaseInfoList, "维修明细导出");
}
/**
* 报废明细导出
*/
@Log(title = "报废明细导出", businessType = BusinessType.EXPORT)
@PostMapping("/exportScrap")
public void exportScrap(HttpServletResponse response,@RequestBody List<AgreementInfo> list)
{
List<SltAgreementInfo> explist = service.getScrapList(list);
List<ScrapInfo> leaseInfoList = Convert.toList(ScrapInfo.class,explist);
ExcelUtil<ScrapInfo> util = new ExcelUtil<ScrapInfo>(ScrapInfo.class);
util.exportExcel(response, leaseInfoList, "维修明细导出");
}
/**
* 费用结算提交
*/

124
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseInfo.java Normal file
View File

@ -0,0 +1,124 @@
package com.bonus.sgzb.material.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import com.bonus.sgzb.common.core.annotation.Excels;
import lombok.Data;
/**
* @author c liu
* @date 2024/2/21
*/
@Data
public class LeaseInfo {
/**
*
*/
private Long id;
/**
*协议id
*/
private String agreementId;
/**
*机具规格id
*/
private String typeId;
/**
*机具id
*/
private String maId;
/**
*0在用1退回
*/
private String status;
/**
*领料id
*/
private String leaseId;
/**
*退料id
*/
private String backId;
/**
*原值
*/
private String buyPrice;
/**
*
*/
private String companyId;
/**
* 项目名称
*/
@Excel(name = "结算单位名称")
private String unitName;
/**
* 工程名称
*/
@Excel(name = "结算工程名称")
private String projectName;
/**
* 设备名称
*/
@Excel(name = "设备名称")
private String typeName;
/**
* 规格型号
*/
@Excel(name = "规格型号")
private String modelName;
/**
* 计量单位
*/
@Excel(name = "计量单位")
private String nuitName;
/**
*租赁单价
*/
@Excel(name = "租赁单价")
private String leasePrice;
/**
*领料数量
*/
@Excel(name = "租赁数量")
private String num;
/**
*领料时间
*/
@Excel(name = "租赁日期")
private String startTime;
/**
*退料时间
*/
@Excel(name = "归还日期")
private String endTime;
/**
* 租赁天数
*/
@Excel(name = "租赁天数")
private String leaseDays;
/**
* 租赁费用
*/
@Excel(name = "外部租赁费用")
private String costs;
/**
* 类型（0不收费，1收费）
*/
private String partType;
/**
* 维修审核：0未审核，1已审核，2已驳回
*/
private String repairStatus;
/**
* （0自然，1人为）
*/
private String scrapType;
/**
* 费用类型：1租赁2丢失3维修4报废
*/
private String sltType;
private String applyId;
}

119
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LoseInfo.java Normal file
View File

@ -0,0 +1,119 @@
package com.bonus.sgzb.material.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import lombok.Data;
/**
* @author c liu
* @date 2024/2/21
*/
@Data
public class LoseInfo {
/**
*
*/
private Long id;
/**
*协议id
*/
private String agreementId;
/**
*机具规格id
*/
private String typeId;
/**
*机具id
*/
private String maId;
/**
*0在用1退回
*/
private String status;
/**
*领料id
*/
private String leaseId;
/**
*退料id
*/
private String backId;
/**
*原值
*/
private String buyPrice;
/**
*
*/
private String companyId;
/**
* 项目名称
*/
@Excel(name = "结算单位名称")
private String unitName;
/**
* 工程名称
*/
@Excel(name = "结算工程名称")
private String projectName;
/**
* 设备名称
*/
@Excel(name = "设备名称")
private String typeName;
/**
* 规格型号
*/
@Excel(name = "规格型号")
private String modelName;
/**
* 计量单位
*/
@Excel(name = "计量单位")
private String nuitName;
/**
*租赁单价
*/
private String leasePrice;
/**
*领料数量
*/
@Excel(name = "丢失数量")
private String num;
/**
*领料时间
*/
private String startTime;
/**
*退料时间
*/
private String endTime;
/**
* 租赁天数
*/
private String leaseDays;
/**
* 租赁费用
*/
@Excel(name = "丢失费用")
private String costs;
/**
* 类型（0不收费，1收费）
*/
private String partType;
/**
* 维修审核：0未审核，1已审核，2已驳回
*/
private String repairStatus;
/**
* （0自然，1人为）
*/
private String scrapType;
/**
* 费用类型：1租赁2丢失3维修4报废
*/
private String sltType;
private String applyId;
}

120
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairInfo.java Normal file
View File

@ -0,0 +1,120 @@
package com.bonus.sgzb.material.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import lombok.Data;
/**
* @author c liu
* @date 2024/2/21
*/
@Data
public class RepairInfo {
/**
*
*/
private Long id;
/**
*协议id
*/
private String agreementId;
/**
*机具规格id
*/
private String typeId;
/**
*机具id
*/
private String maId;
/**
*0在用1退回
*/
private String status;
/**
*领料id
*/
private String leaseId;
/**
*退料id
*/
private String backId;
/**
*原值
*/
private String buyPrice;
/**
*
*/
private String companyId;
/**
* 项目名称
*/
@Excel(name = "结算单位名称")
private String unitName;
/**
* 工程名称
*/
@Excel(name = "结算工程名称")
private String projectName;
/**
* 设备名称
*/
@Excel(name = "设备名称")
private String typeName;
/**
* 规格型号
*/
@Excel(name = "规格型号")
private String modelName;
/**
* 计量单位
*/
@Excel(name = "计量单位")
private String nuitName;
/**
*租赁单价
*/
private String leasePrice;
/**
*领料数量
*/
@Excel(name = "维修数量")
private String num;
/**
*领料时间
*/
private String startTime;
/**
*退料时间
*/
private String endTime;
/**
* 租赁天数
*/
private String leaseDays;
/**
* 租赁费用
*/
@Excel(name = "维修费用")
private String costs;
/**
* 类型（0不收费，1收费）
*/
@Excel(name = "是否收费")
private String partType;
/**
* 维修审核：0未审核，1已审核，2已驳回
*/
private String repairStatus;
/**
* （0自然，1人为）
*/
private String scrapType;
/**
* 费用类型：1租赁2丢失3维修4报废
*/
private String sltType;
private String applyId;
}

121
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapInfo.java Normal file
View File

@ -0,0 +1,121 @@
package com.bonus.sgzb.material.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import lombok.Data;
/**
* @author c liu
* @date 2024/2/21
*/
@Data
public class ScrapInfo {
/**
*
*/
private Long id;
/**
*协议id
*/
private String agreementId;
/**
*机具规格id
*/
private String typeId;
/**
*机具id
*/
private String maId;
/**
*0在用1退回
*/
private String status;
/**
*领料id
*/
private String leaseId;
/**
*退料id
*/
private String backId;
/**
*原值
*/
private String buyPrice;
/**
*
*/
private String companyId;
/**
* 项目名称
*/
@Excel(name = "结算单位名称")
private String unitName;
/**
* 工程名称
*/
@Excel(name = "结算工程名称")
private String projectName;
/**
* 设备名称
*/
@Excel(name = "设备名称")
private String typeName;
/**
* 规格型号
*/
@Excel(name = "规格型号")
private String modelName;
/**
* 计量单位
*/
@Excel(name = "计量单位")
private String nuitName;
/**
*租赁单价
*/
private String leasePrice;
/**
*领料数量
*/
@Excel(name = "报废数量")
private String num;
/**
*领料时间
*/
private String startTime;
/**
*退料时间
*/
private String endTime;
/**
* 租赁天数
*/
private String leaseDays;
/**
* （0自然，1人为）
*/
@Excel(name = "报废原因")
private String scrapType;
/**
* 租赁费用
*/
@Excel(name = "报废费用")
private String costs;
/**
* 类型（0不收费，1收费）
*/
private String partType;
/**
* 维修审核：0未审核，1已审核，2已驳回
*/
private String repairStatus;
/**
* 费用类型：1租赁2丢失3维修4报废
*/
private String sltType;
private String applyId;
}

20
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SecondaryWarehouse.java
View File

@ -1,5 +1,6 @@
package com.bonus.sgzb.material.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -35,8 +36,9 @@ public class SecondaryWarehouse {
*/
private String companyId;
/**
* 项目名称
* 单位名称
*/
@Excel(name = "单位名称")
private String unitName;
/**
* 工程名称
@ -45,39 +47,47 @@ public class SecondaryWarehouse {
/**
* 设备名称
*/
@Excel(name = "类型名称")
private String typeName;
/**
* 规格型号
*/
@Excel(name = "规格型号")
private String modelName;
/**
* 规格型号id
*/
private String modelId;
/**
* 计量单位
*/
private String nuitName;
/**
* 进场数量
*/
@Excel(name = "进场数量")
private String jcNum;
/**
* 退场数量
*/
@Excel(name = "退场数量")
private String tcNUm;
/**
* 场内库存量
*/
@Excel(name = "场内库存量")
private String kcNum;
/**
* 已出库数量
*/
@Excel(name = "已出库数量")
private String ckNum;
/**
* 在库数量
*/
@Excel(name = "在库数量")
private String zkNum;
/**
* 计量单位
*/
@Excel(name = "计量单位")
private String nuitName;
private String keyword;

35
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TeamLeaseInfo.java
View File

@ -1,5 +1,6 @@
package com.bonus.sgzb.material.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -26,14 +27,6 @@ public class TeamLeaseInfo {
*机具id
*/
private String maId;
/**
*创建人
*/
private String createBy;
/**
*创建时间
*/
private String createTime;
/**
* 查询时间
*/
@ -44,8 +37,9 @@ public class TeamLeaseInfo {
*/
private String companyId;
/**
* 项目名称
* 单位名称
*/
@Excel(name = "单位名称")
private String unitName;
/**
* 工程名称
@ -54,11 +48,18 @@ public class TeamLeaseInfo {
/**
* 设备名称
*/
@Excel(name = "类型名称")
private String typeName;
/**
* 规格型号
*/
@Excel(name = "规格型号")
private String modelName;
/**
* 数量
*/
@Excel(name = "出库数量")
private String num;
/**
* 规格型号id
*/
@ -70,15 +71,23 @@ public class TeamLeaseInfo {
/**
* 领料人
*/
@Excel(name = "领料人员")
private String leaseMan;
/**
*创建人
*/
@Excel(name = "出库人员")
private String createBy;
/**
*创建时间
*/
@Excel(name = "出库时间")
private String createTime;
/**
* 手机号
*/
private String phone;
/**
* 数量
*/
private String num;
/**
* 1出库2退库
*/

102
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TeamLeaseInfoTwo.java Normal file
View File

@ -0,0 +1,102 @@
package com.bonus.sgzb.material.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author c liu
* @date 2024/2/21
*/
@Data
public class TeamLeaseInfoTwo {
/**
*
*/
private Long id;
/**
* 往来单位id
*/
@ApiModelProperty(value = "往来单位id")
private Long unitId;
/**
*机具类型id
*/
private String typeId;
/**
*机具id
*/
private String maId;
/**
* 查询时间
*/
private String startTime;
private String endTime;
/**
*
*/
private String companyId;
/**
* 单位名称
*/
@Excel(name = "单位名称")
private String unitName;
/**
* 工程名称
*/
private String projectName;
/**
* 设备名称
*/
@Excel(name = "类型名称")
private String typeName;
/**
* 规格型号
*/
@Excel(name = "规格型号")
private String modelName;
/**
* 数量
*/
@Excel(name = "退库数量")
private String num;
/**
* 规格型号id
*/
private String modelId;
/**
* 班组名称
*/
private String teamName;
/**
* 领料人
*/
@Excel(name = "退料人员")
private String leaseMan;
/**
*创建人
*/
@Excel(name = "退库人员")
private String createBy;
/**
*创建时间
*/
@Excel(name = "退库时间")
private String createTime;
/**
* 手机号
*/
private String phone;
/**
* 1出库2退库
*/
private String type;
private String keyword;
/**
* 1 2 3 4
*/
private String queryType;
}

6
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/SltAgreementInfoService.java
View File

@ -27,4 +27,10 @@ public interface SltAgreementInfoService {
int settlementReview(SltAgreementApply apply);
List<SltAgreementInfo> getLeaseList(List<AgreementInfo> list);
List<SltAgreementInfo> getLoseList(List<AgreementInfo> list);
List<SltAgreementInfo> getRepairList(List<AgreementInfo> list);
List<SltAgreementInfo> getScrapList(List<AgreementInfo> list);
}

6
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java
View File

@ -206,7 +206,7 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
}
private List<SltAgreementInfo> getLoseList(List<AgreementInfo> list) {
public List<SltAgreementInfo> getLoseList(List<AgreementInfo> list) {
List<SltAgreementInfo> loseList = new ArrayList<>();
for (AgreementInfo bean : list){
List<SltAgreementInfo> oneOflist = mapper.getLoseList(bean);
@ -227,7 +227,7 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
return loseList;
}
private List<SltAgreementInfo> getScrapList(List<AgreementInfo> list) {
public List<SltAgreementInfo> getScrapList(List<AgreementInfo> list) {
List<SltAgreementInfo> scrapList = new ArrayList<>();
String taskType = "57";
for (AgreementInfo bean : list){
@ -255,7 +255,7 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
return scrapList;
}
private List<SltAgreementInfo> getRepairList(List<AgreementInfo> list) {
public List<SltAgreementInfo> getRepairList(List<AgreementInfo> list) {
List<SltAgreementInfo> repairList = new ArrayList<>();
String taskType = "41";
for (AgreementInfo bean : list){

4
sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml
View File

@ -178,7 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mt.unit_name as nuitName,
sum(rc.repair_num) as num,
sum(rc.costs) as costs,
rc.part_type as partType,
case rc.part_type when '0' then '不收费' when '1' then '收费' else '' end as partType,
rc.status as repairStatus,
rc.company_id as companyId
from repair_cost rc
@ -208,7 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mt.unit_name as nuitName,
sum(sad.scrap_num) as num,
mt.buy_price as buyPrice,
sad.scrap_type as scrapType,
case sad.scrap_type when '0' then '自然' when '1' then '人为' else '' end as scrapType,
sad.company_id as companyId
from scrap_apply_details sad
left join tm_task_agreement tta on sad.task_id = tta.task_id