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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
mashuai 2024-12-10 15:22:31 +08:00
parent dee3f6a025 91457e7ce7
commit f6e1144039
26 changed files with 227 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
bonus-common-biz/src/main/java/com/bonus/common/biz/aspect/StoreLogAspect.java
View File

@ -3,6 +3,7 @@ package com.bonus.common.biz.aspect;
import com.alibaba.fastjson2.JSON;
import com.bonus.common.biz.annotation.StoreLog;
import com.bonus.common.biz.domain.BmStorageLog;
import com.bonus.common.biz.domain.lease.LeaseOutDetails;
import com.bonus.common.biz.service.AsyncStoreLogService;
import com.bonus.common.biz.utils.HttpResult;
import com.bonus.common.core.utils.ServletUtils;
@ -105,9 +106,82 @@ public class StoreLogAspect {
* @throws Exception 异常
*/
private void setRequestValue(JoinPoint joinPoint, List<BmStorageLog> bmStorageLogList) throws Exception {
System.err.println("获取请求参数");
System.out.println("进入获取请求参数");
String requestMethod = ServletUtils.getRequest().getMethod();
Map<?, ?> paramsMap = ServletUtils.getParamMap(ServletUtils.getRequest());
// if (StringUtils.isEmpty(paramsMap) && (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod))) {
// // 盘点入库操作
// if (joinPoint.getArgs()[0] instanceof SavePutInfoDto) {
// SavePutInfoDto savePutInfoDto = (SavePutInfoDto) joinPoint.getArgs()[0];
// for (MachIneDto machineDto : savePutInfoDto.getMachIneDtoList()) {
// BmStorageLog bmStorageLog = new BmStorageLog();
// bmStorageLog.setTypeId(Integer.parseInt(machineDto.getTypeId()));
// bmStorageLog.setTypeName(machineDto.getMaCode());
// bmStorageLog.setPreStoreNum(Objects.isNull(machineDto.getNum()) ? 0 : machineDto.getNum().intValue());
// bmStorageLog.setInNum(Objects.isNull(machineDto.getPutInStoreNum()) ? 0 : machineDto.getPutInStoreNum().intValue());
// bmStorageLog.setPostStoreNum(bmStorageLog.getPreStoreNum() + bmStorageLog.getInNum());
// bmStorageLogList.add(bmStorageLog);
// }
// }
// // 新购验收任务 PurchaseMacodeInfoController.modifyManageStatus
// if (joinPoint.getArgs()[0] instanceof MaInputVO) {
// MaInputVO maInputVO = (MaInputVO) joinPoint.getArgs()[0];
// for (MaInputRecord maInputRecord : maInputVO.getInputRecordList()) {
// BmStorageLog bmStorageLog = new BmStorageLog();
// bmStorageLog.setTypeId(Objects.isNull(maInputRecord.getTypeId()) ? 0 : maInputRecord.getTypeId().intValue());
// bmStorageLog.setTypeName(maInputRecord.getMaCode());
// bmStorageLog.setPostStoreNum(Objects.isNull(maInputRecord.getNum()) ? 0: maInputRecord.getNum().intValue());
// bmStorageLog.setInNum(Objects.isNull(maInputRecord.getInputNum()) ? 0: maInputRecord.getInputNum().intValue());
// bmStorageLog.setPreStoreNum(bmStorageLog.getPostStoreNum() - bmStorageLog.getInNum());
// bmStorageLog.setTaskId(String.valueOf(maInputRecord.getTaskId()));
// bmStorageLogList.add(bmStorageLog);
// }
// }
// // 领料出库
// if (joinPoint.getArgs()[0] instanceof List &&
// ((List) joinPoint.getArgs()[0]).stream().noneMatch((o -> !(o instanceof LeaseOutDetails)))) {
// List<LeaseOutDetails> leaseOutDetails = (List<LeaseOutDetails>)joinPoint.getArgs()[0];
// for (LeaseOutDetails lod : leaseOutDetails) {
// BmStorageLog bmStorageLog = new BmStorageLog();
// bmStorageLog.setTaskId(String.valueOf(lod.getTaskId()));
// bmStorageLog.setTypeId(lod.getTypeId());
// bmStorageLog.setTypeName(lod.getMaCode());
// bmStorageLog.setPreStoreNum(lod.getPreStoreNum());
// bmStorageLog.setOutNum(Objects.isNull(lod.getInputNum()) ? 0 : lod.getInputNum().intValue());
// bmStorageLog.setPostStoreNum(lod.getPostStoreNum());
// bmStorageLogList.add(bmStorageLog);
// }
// }
// if (joinPoint.getArgs()[0] instanceof LeaseOutDetails) {
// LeaseOutDetails lod = (LeaseOutDetails)joinPoint.getArgs()[0];
// BmStorageLog bmStorageLog = new BmStorageLog();
// bmStorageLog.setTaskId(String.valueOf(lod.getTaskId()));
// bmStorageLog.setTypeId(lod.getTypeId());
// bmStorageLog.setTypeName(lod.getMaCode());
// bmStorageLog.setPreStoreNum(lod.getPreStoreNum());
// bmStorageLog.setOutNum(Objects.isNull(lod.getInputNum()) ? 0 : lod.getInputNum().intValue());
// bmStorageLog.setPostStoreNum(lod.getPostStoreNum());
// bmStorageLogList.add(bmStorageLog);
// }
// // 退料接收-完成退料
// if (joinPoint.getArgs()[0] instanceof BackApplyInfo) {
// BackApplyInfo bai = (BackApplyInfo)joinPoint.getArgs()[0];
// BmStorageLog bmStorageLog = new BmStorageLog();
// bmStorageLog.setTaskId(String.valueOf(bai.getTaskId()));
// bmStorageLog.setTypeId(Integer.parseInt(bai.getTypeId()));
// bmStorageLog.setTypeName(bai.getMaCode());
// bmStorageLog.setPreStoreNum(bai.getNum());
// bmStorageLog.setBackNum(bai.getBackNum());
// bmStorageLog.setPassNum(bai.getPassNum());
// bmStorageLog.setMaintenanceNum(bai.getMaintenanceNum());
// bmStorageLog.setScrapNum(bai.getScrapNum());
// bmStorageLog.setPostStoreNum(bai.getPostStoreNum());
// bmStorageLogList.add(bmStorageLog);
// }
// } else {
// log.warn("没有获取到请求参数{},或请求方式不是POST、PUT请求:{}", joinPoint.getSignature(), requestMethod);
// }
}
}

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseOutDetails.java → bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseOutDetails.java
View File

@ -1,11 +1,10 @@
package com.bonus.material.lease.domain;
package com.bonus.common.biz.domain.lease;
import com.bonus.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.ToString;
import com.bonus.common.core.web.domain.BaseEntity;
import org.apache.poi.hpsf.Decimal;
import java.math.BigDecimal;

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java
View File

@ -42,7 +42,7 @@ public class SelectServiceImpl implements SelectService {
return AjaxResult.success(list);
}
List<ProjectTreeNode> groupList = new ArrayList<>();
List<ProjectTreeNode> list = new ArrayList<>();
List<ProjectTreeNode> list;
try {
list = mapper.getUnitList(bmUnit);
if (CollectionUtils.isNotEmpty(list)) {

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseOutDetailsController.java
View File

@ -16,7 +16,7 @@
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.RestController;
//import com.bonus.common.log.annotation.SysLog;
//import com.bonus.material.lease.domain.LeaseOutDetails;
//import com.bonus.common.biz.domain.lease.LeaseOutDetails;
//import com.bonus.material.lease.service.ILeaseOutDetailsService;
//import com.bonus.common.core.web.controller.BaseController;
//import com.bonus.common.core.web.domain.AjaxResult;

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java
View File

@ -137,14 +137,14 @@ public class LeaseApplyInfo extends BaseEntity {
@Excel(name = "领料工程")
private String leaseProject;
@ApiModelProperty(value = "租赁工程id")
@ApiModelProperty(value = "领料工程id")
private Integer leaseProjectId;
@ApiModelProperty(value = "租赁单位")
@ApiModelProperty(value = "领料单位")
@Excel(name = "领料单位")
private String leaseUnit;
@ApiModelProperty(value = "租赁单位id")
@ApiModelProperty(value = "领料id")
private Integer leaseUnitId;
@ApiModelProperty(value = "协议id")

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/vo/LeaseOutRequestVo.java
View File

@ -1,9 +1,8 @@
package com.bonus.material.lease.domain.vo;
import com.bonus.common.core.web.domain.BaseEntity;
import com.bonus.material.lease.domain.LeaseApplyDetails;
import com.bonus.material.lease.domain.LeaseApplyInfo;
import com.bonus.material.lease.domain.LeaseOutDetails;
import com.bonus.common.biz.domain.lease.LeaseOutDetails;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java
View File

@ -2,7 +2,7 @@ package com.bonus.material.lease.mapper;
import java.util.List;
import com.bonus.material.lease.domain.LeaseApplyDetails;
import com.bonus.material.lease.domain.LeaseOutDetails;
import com.bonus.common.biz.domain.lease.LeaseOutDetails;
import org.apache.ibatis.annotations.Param;
/**

7
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseOutDetailsMapper.java
View File

@ -2,12 +2,7 @@ package com.bonus.material.lease.mapper;
import java.util.List;
import com.bonus.material.lease.domain.LeaseApplyDetails;
import com.bonus.material.lease.domain.LeaseOutDetails;
import com.bonus.material.ma.domain.Type;
import com.bonus.material.settlement.domain.SltAgreementInfo;
import com.bonus.material.task.domain.TmTask;
import org.apache.ibatis.annotations.Param;
import com.bonus.common.biz.domain.lease.LeaseOutDetails;
/**
* 领料出库详细Mapper接口

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseOutDetailsService.java
View File

@ -3,7 +3,7 @@ package com.bonus.material.lease.service;
import java.util.List;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.material.lease.domain.LeaseOutDetails;
import com.bonus.common.biz.domain.lease.LeaseOutDetails;
/**
* 领料出库详细Service接口

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
View File

@ -13,7 +13,7 @@ import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.security.utils.SecurityUtils;
import com.bonus.material.lease.domain.LeaseApplyDetails;
import com.bonus.material.lease.domain.LeaseOutDetails;
import com.bonus.common.biz.domain.lease.LeaseOutDetails;
import com.bonus.material.lease.domain.vo.LeaseApplyRequestVo;
import com.bonus.material.lease.domain.vo.LeaseOutRequestVo;
import com.bonus.material.lease.mapper.LeaseApplyDetailsMapper;
@ -22,7 +22,6 @@ import com.bonus.material.task.domain.TmTask;
import com.bonus.material.task.domain.TmTaskAgreement;
import com.bonus.material.task.mapper.TmTaskAgreementMapper;
import com.bonus.material.task.mapper.TmTaskMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
import com.bonus.material.lease.mapper.LeaseApplyInfoMapper;

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java
View File

@ -26,7 +26,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.bonus.material.lease.mapper.LeaseOutDetailsMapper;
import com.bonus.material.lease.domain.LeaseOutDetails;
import com.bonus.common.biz.domain.lease.LeaseOutDetails;
import com.bonus.material.lease.service.ILeaseOutDetailsService;
import org.springframework.transaction.annotation.Transactional;

21
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/WorkSiteDirectManageController.java
View File

@ -8,6 +8,7 @@ import com.bonus.common.security.utils.SecurityUtils;
import com.bonus.material.ma.domain.DirectApplyDetails;
import com.bonus.material.ma.domain.DirectApplyInfo;
import com.bonus.material.ma.domain.DirectApplyInfoDetails;
import com.bonus.material.ma.domain.DirectPassApplyInfoDetails;
import com.bonus.material.ma.service.WorkSiteDirectManageService;
import com.bonus.material.settlement.domain.SltAgreementInfo;
import io.swagger.annotations.Api;
@ -90,16 +91,16 @@ public class WorkSiteDirectManageController extends BaseController {
return AjaxResult.success("保存成功");
}
// @ApiOperation(value = "通过")
// @PostMapping("/pass")
// public AjaxResult pass(@RequestBody DirectPassApplyInfoDetails directApplyInfoDetails) {
// int rows = workSiteDirectManageService.passDirectApplyInfoDetails(directApplyInfoDetails);
// if (rows == 1) {
// return AjaxResult.success("已通过");
// } else {
// return AjaxResult.error("未通过");
// }
// }
@ApiOperation(value = "通过")
@PostMapping("/pass")
public AjaxResult pass(@RequestBody DirectPassApplyInfoDetails directApplyInfoDetails) {
int rows = workSiteDirectManageService.passDirectApplyInfoDetails(directApplyInfoDetails);
if (rows == 1) {
return AjaxResult.success("已通过");
} else {
return AjaxResult.error("未通过");
}
}
/**

1
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplyDetails.java
View File

@ -44,5 +44,4 @@ public class DirectApplyDetails extends BaseEntity {
private Integer useNum;
private String companyId;
}

11
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectPassApplyInfoDetails.java
View File

@ -1,8 +1,9 @@
package com.bonus.material.ma.domain;
import com.bonus.common.core.web.domain.BaseEntity;
import com.bonus.material.back.domain.BackApplyInfo;
import com.bonus.material.lease.domain.LeaseOutDetails;
import com.bonus.material.back.domain.vo.BackApplyRequestVo;
import com.bonus.common.biz.domain.lease.LeaseOutDetails;
import com.bonus.material.lease.domain.vo.LeaseApplyRequestVo;
import com.bonus.material.task.domain.TmTask;
import lombok.Data;
@ -19,9 +20,11 @@ public class DirectPassApplyInfoDetails extends BaseEntity {
private String id;
private TmTask leaseApplyInfo;
private TmTask tmTask;
private BackApplyInfo backApplyInfo;
private BackApplyRequestVo backApplyRequestVo;
private LeaseApplyRequestVo leaseApplyRequestVo;
private List<LeaseOutDetails> leaseOutDetails;
}

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java
View File

@ -2,7 +2,7 @@ package com.bonus.material.ma.mapper;
import java.util.List;
import com.bonus.material.lease.domain.LeaseOutDetails;
import com.bonus.common.biz.domain.lease.LeaseOutDetails;
import com.bonus.material.ma.domain.Machine;
import com.bonus.material.ma.domain.Type;
import com.bonus.material.ma.domain.vo.MachineVo;

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeMapper.java
View File

@ -2,7 +2,7 @@ package com.bonus.material.ma.mapper;
import java.util.List;
import com.bonus.material.lease.domain.LeaseOutDetails;
import com.bonus.common.biz.domain.lease.LeaseOutDetails;
import com.bonus.material.ma.domain.Type;
import com.bonus.material.ma.domain.vo.MaTypeConfigVo;
import com.bonus.material.ma.domain.vo.MaTypeVo;

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/WorkSiteDirectManageMapper.java
View File

@ -2,7 +2,7 @@ package com.bonus.material.ma.mapper;
import com.bonus.material.lease.domain.LeaseApplyDetails;
import com.bonus.material.lease.domain.LeaseApplyInfo;
import com.bonus.material.lease.domain.LeaseOutDetails;
import com.bonus.common.biz.domain.lease.LeaseOutDetails;
import com.bonus.material.ma.domain.DirectApplyDetails;
import com.bonus.material.ma.domain.DirectApplyInfo;
import com.bonus.material.settlement.domain.SltAgreementInfo;

18
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/WorkSiteDirectManageService.java
View File

@ -1,8 +1,6 @@
package com.bonus.material.ma.service;
import com.bonus.material.back.domain.BackApplyInfo;
import com.bonus.material.lease.domain.LeaseOutDetails;
import com.bonus.material.ma.domain.DirectApplyDetails;
import com.bonus.material.ma.domain.DirectApplyInfo;
import com.bonus.material.ma.domain.DirectPassApplyInfoDetails;
@ -32,21 +30,7 @@ public interface WorkSiteDirectManageService {
int insertTmTask(TmTask bean);
// int insertAgreement(TmTask task);
// int insertApplyInfoAndDetails(TmTask task);
//
// int insertLeaseOutDetail(List<LeaseOutDetails> leaseOutDetails, TmTask task);
//
// int insertBackApplyInfoAndDetails(BackApplyInfo backApplyInfo);
//
// int insertTmTaskByBackInfo(BackApplyInfo backApplyInfo);
// int insertAgreementByBackInfo(BackApplyInfo backApplyInfo);
//
// int insertBackCheckDetails(List<BackApplyInfo> backApplyDetails);
DirectApplyInfo getInfoById(SltAgreementInfo sltAgreementInfo);
// int passDirectApplyInfoDetails(DirectPassApplyInfoDetails directApplyInfoDetails);
int passDirectApplyInfoDetails(DirectPassApplyInfoDetails directApplyInfoDetails);
}

146
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WorkSiteDirectManageImpl.java
View File

@ -1,12 +1,11 @@
package com.bonus.material.ma.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.core.utils.StringUtils;
import com.bonus.material.back.domain.BackApplyInfo;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.security.utils.SecurityUtils;
import com.bonus.material.back.service.IBackApplyInfoService;
import com.bonus.material.lease.domain.LeaseApplyDetails;
import com.bonus.material.lease.domain.LeaseApplyInfo;
import com.bonus.material.lease.domain.LeaseOutDetails;
import com.bonus.material.lease.service.ILeaseApplyInfoService;
import com.bonus.material.ma.domain.DirectApplyDetails;
import com.bonus.material.ma.domain.DirectApplyInfo;
import com.bonus.material.ma.domain.DirectPassApplyInfoDetails;
@ -21,10 +20,8 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
/**
* @author ：梁超
@ -42,6 +39,9 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
@Resource
private IBackApplyInfoService backApplyService;
@Resource
private ILeaseApplyInfoService leaseApplyService;
// @Resource
// private BackRecordMapper backRecordMapper;
//
@ -324,60 +324,42 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
return directApplyInfo;
}
// @Override
// @Transactional(rollbackFor = Exception.class)
// public int passDirectApplyInfoDetails(DirectPassApplyInfoDetails directApplyInfoDetails) {
// int res = 0;
// try {
// // 修改状态为通过
// res = updateDirectApplyInfo(directApplyInfoDetails);
// if (res == 0) {
// throw new RuntimeException("updateDirectApplyInfo异常");
// }
//
// //创建领料信息和详情
// res = createLeaseInfo(directApplyInfoDetails);
// if (res == 0) {
// throw new RuntimeException("createLeaseInfo异常");
// }
//
// //创建退料信息和详情
// res = createBackInfo(directApplyInfoDetails);
// if (res == 0) {
// throw new RuntimeException("createBackInfo异常");
// }
//
// } catch (Exception e) {
// log.error(e.getMessage());
// }
// return res;
// }
//
// private int createBackInfo(DirectPassApplyInfoDetails directApplyInfoDetails) {
// int res = 0;
// try {
// BackApplyInfo backApplyInfo = directApplyInfoDetails.getBackApplyInfo();
// // 创建退料任务(1、创建tm_task )
// res = createTmTaskByBackInfo(backApplyInfo);
// if (res == 0) {
// throw new RuntimeException("createBackTmTask异常");
// }
// //2.创建协议tm_task_agreement
// res = createAgreementByBackInfo(backApplyInfo);
// if (res == 0) {
// throw new RuntimeException("createBackAgreement异常");
// }
// // 3、创建back_apply_info和back_apply_details和出库记录back_check_details和计算结算数据
// res = createtBackApplyInfoAndDetails(backApplyInfo);
// if (res == 0) {
// throw new RuntimeException("createBackApplyInfoAndDetails异常");
// }
// } catch (Exception e) {
// log.error(e.getMessage());
// }
// return res;
//
// }
@Override
@Transactional(rollbackFor = Exception.class)
public int passDirectApplyInfoDetails(DirectPassApplyInfoDetails directApplyInfoDetails) {
int res;
try {
// 修改状态为通过
if (StringUtils.isNotBlank(directApplyInfoDetails.getId())) {
DirectApplyInfo directApplyInfos = getDirectApplyInfoById(directApplyInfoDetails.getId());
directApplyInfos.setStatus("1");
directApplyInfos.setAuditor(SecurityUtils.getLoginUser().getUsername());
directApplyInfos.setAuditTime(DateUtils.getNowDate());
res = refuseDirectApplyInfo(directApplyInfos);
} else {
throw new RuntimeException("updateDirectApplyInfo异常");
}
//创建领料信息和详情
AjaxResult createLeaseResult = leaseApplyService.insertLeaseApplyInfo(directApplyInfoDetails.getLeaseApplyRequestVo());
if (!createLeaseResult.isSuccess()) {
System.err.println(createLeaseResult.get("msg"));
throw new RuntimeException("createLeaseInfo异常");
}
//创建退料信息和详情
AjaxResult createBackResult = backApplyService.insertBackApplyInfo(directApplyInfoDetails.getBackApplyRequestVo());
if (!createBackResult.isSuccess()) {
System.err.println(createBackResult.get("msg"));
throw new RuntimeException("createBackInfo异常");
}
} catch (Exception e) {
log.error(e.getMessage());
throw new RuntimeException(e.getMessage());
}
return res;
}
//
// private int createtBackApplyInfoAndDetails(BackApplyInfo backApplyInfo) {
// int res = 0;
@ -558,47 +540,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
// return res;
// }
// private int createTmTask(TmTask task, String taskType) {
// int taskId = 0;
// int res = 0;
// try {
// if ("1".equals(taskType)) {
// // 生成领料code
// String lcode = tmTaskService.genderLeaseCode();
// if (StringUtils.isEmpty(lcode)) {
// return res;
// }
// task.setCode(lcode);
// task.setTaskStatus(35);
// // 创建领料任务（tm_task）
// res = insertTmTask(task);
// if (res == 0) {
// throw new RuntimeException("insertTmTask异常");
// }
// taskId = Integer.valueOf(task.getId());
// }
// } catch (Exception e) {
// log.error(e.getMessage());
// }
//
// return taskId;
//
// }
//
// private int updateDirectApplyInfo(DirectPassApplyInfoDetails directApplyInfoDetails) {
// int res = 0;
// if (StringUtils.isNotBlank(directApplyInfoDetails.getId())) {
// DirectApplyInfo directApplyInfos = getDirectApplyInfoById(directApplyInfoDetails.getId());
// directApplyInfos.setStatus("1");
// directApplyInfos.setAuditor(SecurityUtils.getLoginUser().getUsername());
// directApplyInfos.setAuditTime(DateUtils.getNowDate());
// res = refuseDirectApplyInfo(directApplyInfos);
// } else {
// return res;
// }
// return res;
// }
//
// public int insertBcd(List<BackApplyInfo> backApplyDetails) {
// int res = 0;
// for (BackApplyInfo backApplyDetail : backApplyDetails) {

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseStorageController.java
View File

@ -37,7 +37,7 @@ public class PurchaseStorageController extends BaseController {
*/
@ApiOperation(value = "入库或批量入库操作")
@PreventRepeatSubmit
@RequiresPermissions("purchase:storage:add")
// @RequiresPermissions("purchase:storage:add")
@PostMapping("/warehouse")
public AjaxResult warehouse(@RequestBody PurchaseDto dto) {
return purchaseStorageService.warehouse(dto);
@ -46,7 +46,7 @@ public class PurchaseStorageController extends BaseController {
@ApiOperation(value = "查询待绑定编号机具详情")
@PreventRepeatSubmit
@RequiresPermissions("purchase:storage:query")
// @RequiresPermissions("purchase:storage:query")
@PostMapping("/getMachineById")
public AjaxResult getMachineById(@RequestBody PurchaseDto dto) {
return purchaseStorageService.getMachineById(dto);
@ -59,7 +59,7 @@ public class PurchaseStorageController extends BaseController {
*/
@ApiOperation(value = "驳回或批量驳回操作")
@PreventRepeatSubmit
@RequiresPermissions("purchase:storage:reject")
// @RequiresPermissions("purchase:storage:reject")
@PostMapping("/reject")
public AjaxResult reject(@RequestBody PurchaseDto dto) {
return purchaseStorageService.reject(dto);

8
bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java
View File

@ -169,4 +169,12 @@ public class SltAgreementInfo extends BaseEntity {
@ApiModelProperty(value = "结算状态")
private String sltStatus;
private String typeModelName;
private String maCode;
private Double useNum;
private String keyWord;
}

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/mapper/SltAgreementInfoMapper.java
View File

@ -2,7 +2,7 @@ package com.bonus.material.settlement.mapper;
import java.util.List;
import com.bonus.material.lease.domain.LeaseOutDetails;
import com.bonus.common.biz.domain.lease.LeaseOutDetails;
import com.bonus.material.ma.domain.Type;
import com.bonus.material.settlement.domain.SltAgreementApply;
import com.bonus.material.settlement.domain.SltAgreementInfo;

10
bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseOutDetailsMapper.xml
View File

@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.material.lease.mapper.LeaseOutDetailsMapper">
<resultMap type="com.bonus.material.lease.domain.LeaseOutDetails" id="LeaseOutDetailsResult">
<resultMap type="com.bonus.common.biz.domain.lease.LeaseOutDetails" id="LeaseOutDetailsResult">
<result property="id" column="id" />
<result property="parentId" column="parent_id" />
<result property="typeId" column="type_id" />
@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
lease_out_details lod
</sql>
<select id="selectLeaseOutDetailsList" parameterType="com.bonus.material.lease.domain.LeaseOutDetails" resultMap="LeaseOutDetailsResult">
<select id="selectLeaseOutDetailsList" parameterType="com.bonus.common.biz.domain.lease.LeaseOutDetails" resultMap="LeaseOutDetailsResult">
<include refid="selectLeaseOutDetailsVo"/>
<where>
<if test="parentId != null "> and lod.parent_id = #{parentId}</if>
@ -47,14 +47,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where lod.id = #{id}
</select>
<select id="selectLeaseOutDetailsListByParentId" parameterType="com.bonus.material.lease.domain.LeaseOutDetails" resultMap="LeaseOutDetailsResult">
<select id="selectLeaseOutDetailsListByParentId" parameterType="com.bonus.common.biz.domain.lease.LeaseOutDetails" resultMap="LeaseOutDetailsResult">
<include refid="selectLeaseOutDetailsVo"/>
<where>
lod.parent_id = #{parentId}
</where>
</select>
<insert id="insertLeaseOutDetails" parameterType="com.bonus.material.lease.domain.LeaseOutDetails" useGeneratedKeys="true" keyProperty="id">
<insert id="insertLeaseOutDetails" parameterType="com.bonus.common.biz.domain.lease.LeaseOutDetails" useGeneratedKeys="true" keyProperty="id">
insert into lease_out_details
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="parentId!= null">
@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
</insert>
<update id="updateLeaseOutDetails" parameterType="com.bonus.material.lease.domain.LeaseOutDetails">
<update id="updateLeaseOutDetails" parameterType="com.bonus.common.biz.domain.lease.LeaseOutDetails">
update lease_out_details
<trim prefix="SET" suffixOverrides=",">
<if test="parentId != null">parent_id = #{parentId},</if>

102
bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WorkSiteDirectManageMapper.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.material.ma.mapper.WorkSiteDirectManageMapper">
<insert id="saveDirectApplyInfo" parameterType="com.bonus.material.ma.domain.DirectApplyInfo" keyColumn="id" keyProperty="id" useGeneratedKeys="true">
@ -329,7 +328,12 @@
</insert>
<update id="refuseDirectApplyInfo">
update direct_apply_info set status = #{status},auditor=#{auditor},audit_time=#{auditTime},update_time = now() where id = #{id}
update
direct_apply_info
set
status = #{status},auditor=#{auditor},audit_time= now(),update_time = now()
where
id = #{id}
</update>
<update id="updateLeaseApplyDetailsOutNum">
@ -417,21 +421,21 @@
LEFT JOIN bm_project bpl1 ON bpl1.pro_id = bai1.project_id
LEFT JOIN bm_unit bui ON bui.unit_id = bai.unit_id
LEFT JOIN bm_unit bui1 ON bui1.unit_id = bai1.unit_id
WHERE
1=1
<if test="keyWord != null and keyWord != ''">
and (bpl.pro_name like concat('%', #{keyWord}, '%') or
<where>
<if test="keyWord != null and keyWord != ''">
and (bpl.pro_name like concat('%', #{keyWord}, '%') or
bui.unit_name like concat('%', #{keyWord}, '%'))
</if>
<if test="lotId != null and lotId != ''">
and bpl.pro_id = #{lotId}
</if>
<if test="unitId != null and unitId != ''">
and bui.unit_id = #{unitId}
</if>
<if test="status != null and status != ''">
and dai.status = #{status}
</if>
</if>
<if test="lotId != null and lotId != ''">
and bpl.pro_id = #{lotId}
</if>
<if test="unitId != null and unitId != ''">
and bui.unit_id = #{unitId}
</if>
<if test="status != null and status != ''">
and dai.status = #{status}
</if>
</where>
</select>
<select id="getDirectApplyInfoById" resultType="com.bonus.material.ma.domain.DirectApplyInfo">
@ -443,15 +447,16 @@
from ma_machine
where ma_id = #{maId}
</select>
<select id="getListLease" resultType="com.bonus.material.ma.domain.DirectApplyInfo">
SELECT DISTINCT
bpl.lot_id as backProId,bpl.lot_name as backProName,
bpl.pro_id as backProId,bpl.pro_name as backProName,
bui.unit_id as backUnitId,bui.unit_name as backUnitName
FROM
direct_apply_info dai
LEFT JOIN bm_agreement_info bai ON dai.agreement_id = bai.agreement_id
LEFT JOIN bm_project_lot bpl ON bpl.lot_id = bai.project_id
LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
LEFT JOIN bm_agreement_info bai ON dai.agreement_id = bai.agreement_id
LEFT JOIN bm_project bpl ON bpl.lot_id = bai.project_id
LEFT JOIN bm_unit bui ON bui.unit_id = bai.unit_id
</select>
<select id="getInfoById" resultType="com.bonus.material.ma.domain.DirectApplyInfo">
@ -459,23 +464,23 @@
dai.*,
bai.agreement_code as backAgreementCode,
bai1.agreement_code as leaseAgreementCode,
bpl.lot_id AS backProId,
bpl.lot_name AS backProName,
bpl.pro_id AS backProId,
bpl.pro_name AS backProName,
bui.unit_id AS backUnitId,
bui.unit_name AS backUnitName,
bpl1.lot_id AS leaseProId,
bpl1.lot_name AS leaseProName,
bpl1.pro_id AS leaseProId,
bpl1.pro_name AS leaseProName,
bui1.unit_id AS leaseUnitId,
bui1.unit_name AS leaseUnitName
FROM
direct_apply_info dai
LEFT JOIN direct_apply_details dad ON dai.id = dad.direct_id
LEFT JOIN bm_agreement_info bai ON dai.back_agreement_id = bai.agreement_id
LEFT JOIN bm_agreement_info bai1 ON dai.lease_agreement_id = bai1.agreement_id
LEFT JOIN bm_project_lot bpl ON bpl.lot_id = bai.project_id
LEFT JOIN bm_project_lot bpl1 ON bpl1.lot_id = bai1.project_id
LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
LEFT JOIN bm_unit_info bui1 ON bui1.unit_id = bai1.unit_id
LEFT JOIN direct_apply_details dad ON dai.id = dad.direct_id
LEFT JOIN bm_agreement_info bai ON dai.back_agreement_id = bai.agreement_id
LEFT JOIN bm_agreement_info bai1 ON dai.lease_agreement_id = bai1.agreement_id
LEFT JOIN bm_project bpl ON bpl.pro_id = bai.project_id
LEFT JOIN bm_project bpl1 ON bpl1.pro_id = bai1.project_id
LEFT JOIN bm_unit bui ON bui.unit_id = bai.unit_id
LEFT JOIN bm_unit bui1 ON bui1.unit_id = bai1.unit_id
WHERE
dai.id = #{id} GROUP BY dai.id
</select>
@ -484,7 +489,6 @@
SELECT
dad.direct_num AS directNum,
dad.type_id AS typeId,
mt.company_id AS companyId,
mt3.type_name AS typeName,
mt2.type_name AS kindName,
mt.type_name AS modelName,
@ -494,16 +498,14 @@
mm.ma_id AS maId
FROM
direct_apply_info dai
LEFT JOIN direct_apply_details dad ON dai.id = dad.direct_id
LEFT JOIN slt_agreement_info sai ON dai.back_agreement_id = sai.agreement_id
AND sai.type_id = dad.type_id
LEFT JOIN ma_type mt ON mt.type_id = dad.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id
LEFT JOIN ma_machine mm ON dad.ma_id = mm.ma_id
LEFT JOIN direct_apply_details dad ON dai.id = dad.direct_id
LEFT JOIN slt_agreement_info sai ON dai.back_agreement_id = sai.agreement_id AND sai.type_id = dad.type_id
LEFT JOIN ma_type mt ON mt.type_id = dad.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id
LEFT JOIN ma_machine mm ON dad.ma_id = mm.ma_id
WHERE
dai.id = #{id}
AND sai.STATUS = '0'
dai.id = #{id} AND sai.STATUS = '0'
<if test="keyWord != null and keyWord != ''">
and (mt2.type_name like concat('%', #{keyWord}, '%') or
mt.type_name like concat('%', #{keyWord}, '%'))
@ -515,22 +517,22 @@
<select id="getListAll" resultType="com.bonus.material.ma.domain.DirectApplyInfo">
SELECT
dai.*,
bpl.lot_id AS backProId,
bpl.lot_name AS backProName,
bpl.pro_id AS backProId,
bpl.pro_name AS backProName,
bui.unit_id AS backUnitId,
bui.unit_name AS backUnitName,
bpl1.lot_id AS leaseProId,
bpl1.lot_name AS leaseProName,
bpl1.pro_id AS leaseProId,
bpl1.pro_name AS leaseProName,
bui1.unit_id AS leaseUnitId,
bui1.unit_name AS leaseUnitName
FROM
direct_apply_info dai
LEFT JOIN bm_agreement_info bai ON dai.back_agreement_id = bai.agreement_id
LEFT JOIN bm_agreement_info bai1 ON dai.lease_agreement_id = bai1.agreement_id
LEFT JOIN bm_project_lot bpl ON bpl.lot_id = bai.project_id
LEFT JOIN bm_project_lot bpl1 ON bpl1.lot_id = bai1.project_id
LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
LEFT JOIN bm_unit_info bui1 ON bui1.unit_id = bai1.unit_id
LEFT JOIN bm_project bpl ON bpl.pro_id = bai.project_id
LEFT JOIN bm_project bpl1 ON bpl1.pro_id = bai1.project_id
LEFT JOIN bm_unit bui ON bui.unit_id = bai.unit_id
LEFT JOIN bm_unit bui1 ON bui1.unit_id = bai1.unit_id
</select>
</mapper>

2
bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml
View File

@ -243,7 +243,7 @@
LEFT JOIN tm_task_agreement tta ON rd.task_id = tta.task_id
LEFT JOIN bm_agreement_info bai2 ON tta.agreement_id = bai2.agreement_id
LEFT JOIN bm_unit_info bui ON bai2.unit_id = bui.unit_id
LEFT JOIN bm_project_lot bpi ON bai2.project_id = bpi.lot_id AND bpi.STATUS = '0' AND bpi.del_flag = '0'
LEFT JOIN bm_project bpi ON bai2.project_id = bpi.lot_id AND bpi.STATUS = '0' AND bpi.del_flag = '0'
LEFT JOIN sys_user su ON rd.create_by = su.user_id
left join sys_user su2 on rd.repairer = su2.user_id
LEFT JOIN ma_machine mm ON mm.ma_id = rd.ma_id

8
bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml
View File

@ -356,21 +356,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getRelations" resultType="com.bonus.material.settlement.domain.SltAgreementRelation">
select sar.id,
bui.unit_name as unitName,
bp.lot_name as projectName,
bp.pro_name as projectName,
sar.apply_id as applyId,
sar.agreement_id as agreementId,
sar.add_cost as addCost,
sar.sub_cost as subCost,
sar.remark as remark,
sar.cost as cost,
sar.lease_cost as leaseCost,
0 as leaseCost,
sar.repair_cost as repairCost,
sar.scrap_cost as scrapCost,
sar.lose_cost as loseCost
from slt_agreement_relation sar
LEFT JOIN bm_agreement_info bai on sar.agreement_id = bai.agreement_id
LEFT JOIN bm_project_lot bp ON bp.lot_id = bai.project_id
LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
LEFT JOIN bm_project bp ON bp.pro_id = bai.project_id
LEFT JOIN bm_unit bui ON bui.unit_id = bai.unit_id
where sar.apply_id = #{id}
</select>