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

配件批量审核

This commit is contained in:
syruan 2025-07-15 20:31:06 +08:00
parent f815734fda
commit 8a283c3bfa
5 changed files with 137 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/bonus/gzgqj/business/app/entity/PartApplyAppVo.java
View File

@ -13,12 +13,15 @@ import java.util.List;
* @author 黑子 * @author 黑子
*/ */
@Data @Data
public class PartApplyAppVo extends PageInfo {
public class PartApplyAppVo extends PageInfo implements java.io.Serializable {
@Excel(name = "序号", width = 10.0, orderNum = "0") @Excel(name = "序号", width = 10.0, orderNum = "0")
private int xh; private int xh;
private String id; private String id;
private List<String> idList;
/** /**
* 编码 * 编码
*/ */

22
src/main/java/com/bonus/gzgqj/business/bases/controller/PartApplyController.java
View File

@ -3,6 +3,7 @@ package com.bonus.gzgqj.business.bases.controller;
import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import cn.hutool.core.util.ObjectUtil;
import com.bonus.gzgqj.business.app.entity.PartApplyAppVo; import com.bonus.gzgqj.business.app.entity.PartApplyAppVo;
import com.bonus.gzgqj.business.app.entity.PartApplyDetailAppVo; import com.bonus.gzgqj.business.app.entity.PartApplyDetailAppVo;
import com.bonus.gzgqj.business.bases.entity.PartInputDetails; import com.bonus.gzgqj.business.bases.entity.PartInputDetails;
@ -36,6 +37,7 @@ import java.util.List;
@RequestMapping("/backstage/partApply") @RequestMapping("/backstage/partApply")
@Slf4j @Slf4j
public class PartApplyController { public class PartApplyController {
@Autowired @Autowired
private PartApplyService service; private PartApplyService service;
@ -62,6 +64,7 @@ public class PartApplyController {
public ServerResponse getPartDetails(EncryptedReq<PartApplyAppVo> dto) { public ServerResponse getPartDetails(EncryptedReq<PartApplyAppVo> dto) {
return service.getPartDetails(dto.getData()); return service.getPartDetails(dto.getData());
} }
/** /**
* 领料出库 查询 * 领料出库 查询
* @param dto * @param dto
@ -75,6 +78,7 @@ public class PartApplyController {
PageInfo<PartApplyDetailAppVo> pageInfo = new PageInfo<>(list); PageInfo<PartApplyDetailAppVo> pageInfo = new PageInfo<>(list);
return pageInfo; return pageInfo;
} }
/** /**
* 导出需求计划 * 导出需求计划
* @param * @param
@ -102,6 +106,7 @@ public class PartApplyController {
log.error(e.toString(), e); log.error(e.toString(), e);
} }
} }
/** /**
* 导出需求计划详情 * 导出需求计划详情
* @param request * @param request
@ -131,7 +136,6 @@ public class PartApplyController {
} }
/** /**
* 数据审核 * 数据审核
* @param dto * @param dto
@ -143,7 +147,21 @@ public class PartApplyController {
return service.auditData(dto.getData()); return service.auditData(dto.getData());
} }
/**
* 数据审核--批量审核
*/
@PostMapping("batchAudit")
@DecryptAndVerify(decryptedClass = PartApplyAppVo.class)
public ServerResponse batchAudit(EncryptedReq<PartApplyAppVo> dto) {
PartApplyAppVo data = dto.getData();
ServerResponse serverResponse = null;
for (String id : data.getIdList()) {
PartApplyAppVo cloned = ObjectUtil.cloneByStream(data);
cloned.setId(id);
serverResponse = service.auditData(cloned);
}
return serverResponse;
}

175
src/main/java/com/bonus/gzgqj/business/bases/service/PartApplyServiceImpl.java
View File

@ -28,209 +28,206 @@ import java.util.Objects;
/** /**
* 配件管理 入库 * 配件管理 入库
*
* @author 黑子 * @author 黑子
*/ */
@Service @Service
@Slf4j @Slf4j
public class PartApplyServiceImpl implements PartApplyService{ public class PartApplyServiceImpl implements PartApplyService {
@Autowired
private PartApplyMapper mapper;
@Autowired
private FileUploadService uploadService;
@Autowired @Autowired
UserPartInfoServiceImpl userPartInfoService; UserPartInfoServiceImpl userPartInfoService;
@Autowired
private PartApplyMapper mapper;
@Autowired
private FileUploadService uploadService;
public static String transBast64(String url) {
try {
if (StringHelper.isEmpty(url)) {
return "";
}
Path path = Paths.get(url);
byte[] fileBytes = Files.readAllBytes(path);
return Base64.getEncoder().encodeToString(fileBytes);
} catch (Exception e) {
log.error(e.toString(), e);
}
return "";
}
/** /**
* 申请记录列表查询 * 申请记录列表查询
*
* @param data * @param data
* @return * @return
*/ */
@Override @Override
public List<PartApplyAppVo> findByPage(PartApplyAppVo data) { public List<PartApplyAppVo> findByPage(PartApplyAppVo data) {
List<PartApplyAppVo> list=new ArrayList<>(); List<PartApplyAppVo> list = new ArrayList<>();
try{ try {
list=mapper.findByPage(data); list = mapper.findByPage(data);
}catch (Exception e){ } catch (Exception e) {
log.error(e.toString(),e); log.error(e.toString(), e);
} }
return list; return list;
} }
/** /**
* 查询申请记录详情 * 查询申请记录详情
*
* @param data * @param data
* @return * @return
*/ */
@Override @Override
public ServerResponse getPartDetails(PartApplyAppVo data) { public ServerResponse getPartDetails(PartApplyAppVo data) {
try{ try {
PartApplyAppVo vo=mapper.getPartDetails(data); PartApplyAppVo vo = mapper.getPartDetails(data);
List<String> info=mapper.getInfoMsg(data); List<String> info = mapper.getInfoMsg(data);
String infoMsg = String.join(",", info); String infoMsg = String.join(",", info);
vo.setInfoMsg(infoMsg); vo.setInfoMsg(infoMsg);
//图片转换 //图片转换
String bast641=transBast64(vo.getLyUrl()); String bast641 = transBast64(vo.getLyUrl());
String bast642=transBast64(vo.getCkUrl()); String bast642 = transBast64(vo.getCkUrl());
String bast643=transBast64(vo.getShUrl()); String bast643 = transBast64(vo.getShUrl());
String bast644=transBast64(vo.getZdUrl()); String bast644 = transBast64(vo.getZdUrl());
vo.setLyUrl(bast641); vo.setLyUrl(bast641);
vo.setCkUrl(bast642); vo.setCkUrl(bast642);
vo.setShUrl(bast643); vo.setShUrl(bast643);
vo.setZdUrl(bast644); vo.setZdUrl(bast644);
List<FileUploadVo> flieList=uploadService.getFileList(data.getId(),"t_part_apply",null); List<FileUploadVo> flieList = uploadService.getFileList(data.getId(), "t_part_apply", null);
vo.setFileList(flieList); vo.setFileList(flieList);
return ServerResponse.createSuccess(vo); return ServerResponse.createSuccess(vo);
}catch (Exception e){ } catch (Exception e) {
log.error(e.toString(),e); log.error(e.toString(), e);
} }
return ServerResponse.createSuccess(new PartApplyAppVo()); return ServerResponse.createSuccess(new PartApplyAppVo());
} }
/** /**
* 查询申请记录详情 * 查询申请记录详情
*
* @param data * @param data
* @return * @return
*/ */
@Override @Override
public List<PartApplyDetailAppVo> getPartDetailsList(PartApplyDetailAppVo data) { public List<PartApplyDetailAppVo> getPartDetailsList(PartApplyDetailAppVo data) {
try{ try {
List<PartApplyDetailAppVo> details=mapper.getDetailsList(data); List<PartApplyDetailAppVo> details = mapper.getDetailsList(data);
return details; return details;
}catch (Exception e){ } catch (Exception e) {
log.error(e.toString(),e); log.error(e.toString(), e);
} }
return new ArrayList<PartApplyDetailAppVo>(); return new ArrayList<>();
} }
/** /**
* 审核 数据 * 审核 数据
*
* @param data * @param data
* @return * @return
*/ */
@Override @Override
public ServerResponse auditData(PartApplyAppVo data) { public ServerResponse auditData(PartApplyAppVo data) {
try{ try {
String status=data.getStatus(); String status = data.getStatus();
PartApplyAppVo vo=mapper.getAuditStatus(data); PartApplyAppVo vo = mapper.getAuditStatus(data);
if(!"1".equals(vo.getStatus())){ if (!"1".equals(vo.getStatus())) {
return ServerResponse.createErroe("该数据已被审核,请刷新重试"); return ServerResponse.createErroe("该数据已被审核,请刷新重试");
} }
Long userId= Objects.requireNonNull(UserUtil.getLoginUser()).getUserId(); Long userId = Objects.requireNonNull(UserUtil.getLoginUser()).getUserId();
AuditRecord voo=new AuditRecord(); AuditRecord voo = new AuditRecord();
voo.setAuditor(userId.toString()); voo.setAuditor(userId.toString());
voo.setAuditRemark(data.getRemark()); voo.setAuditRemark(data.getRemark());
voo.setApplyId(data.getId()); voo.setApplyId(data.getId());
voo.setAuditStatus(status); voo.setAuditStatus(status);
voo.setAuditType("2"); voo.setAuditType("2");
//通过 //通过
if("2".equals(status)){ if ("2".equals(status)) {
data.setStatusType("3"); data.setStatusType("3");
} }
int num=mapper.insertAuditRecord(voo); int num = mapper.insertAuditRecord(voo);
if(num>0){ if (num > 0) {
data.setFzUser(userId.toString()); data.setFzUser(userId.toString());
mapper.updatePartInfo(data); mapper.updatePartInfo(data);
return ServerResponse.createSuccess("审核成功","审核成功"); return ServerResponse.createSuccess("审核成功", "审核成功");
} }
}catch (Exception e){ } catch (Exception e) {
log.error(e.toString(),e); log.error(e.toString(), e);
} }
return ServerResponse.createErroe("审核失败"); return ServerResponse.createErroe("审核失败");
} }
/** /**
* 出库-接口 * 出库-接口
*
* @param request * @param request
* @return * @return
*/ */
@Override @Override
public ServerResponse partOutInfo(HttpServletRequest request, MultipartFile[] files) { public ServerResponse partOutInfo(HttpServletRequest request, MultipartFile[] files) {
List<PartApplyAppVo> list=new ArrayList<>(); List<PartApplyAppVo> list = new ArrayList<>();
try{ try {
String param=request.getParameter("params"); String param = request.getParameter("params");
PartApplyAppVo data= JSON.parseObject(param,PartApplyAppVo.class); PartApplyAppVo data = JSON.parseObject(param, PartApplyAppVo.class);
String id=data.getId(); String id = data.getId();
if(StringHelper.isEmpty(id)){ if (StringHelper.isEmpty(id)) {
return ServerResponse.createErroe("请选择出库记录"); return ServerResponse.createErroe("请选择出库记录");
} }
if(files==null || files.length <= 0){ if (files == null || files.length <= 0) {
System.out.println("本次未上传附件"); System.out.println("本次未上传附件");
//return ServerResponse.createErroe("请先上传文件"); //return ServerResponse.createErroe("请先上传文件");
} else { } else {
List<FileUploadVo> fileList=uploadService.uploadImage(files,id,"t_part_apply","出库附件"); List<FileUploadVo> fileList = uploadService.uploadImage(files, id, "t_part_apply", "出库附件");
if(fileList.size()!=files.length){ if (fileList.size() != files.length) {
return ServerResponse.createErroe("出库失败,附件上传缺失"); return ServerResponse.createErroe("出库失败,附件上传缺失");
} }
} }
PartApplyAppVo vo=mapper.getAuditStatus(data); PartApplyAppVo vo = mapper.getAuditStatus(data);
if(!"2".equals(vo.getStatus())){ if (!"2".equals(vo.getStatus())) {
return ServerResponse.createErroe("该数据状态已变更,请刷新数据重试"); return ServerResponse.createErroe("该数据状态已变更,请刷新数据重试");
} }
Long userId= Objects.requireNonNull(UserUtil.getLoginUser()).getUserId(); Long userId = Objects.requireNonNull(UserUtil.getLoginUser()).getUserId();
AuditRecord voo=new AuditRecord(); AuditRecord voo = new AuditRecord();
voo.setAuditor(userId.toString()); voo.setAuditor(userId.toString());
voo.setApplyId(data.getId()); voo.setApplyId(data.getId());
voo.setAuditStatus("4"); voo.setAuditStatus("4");
voo.setAuditType("3"); voo.setAuditType("3");
int num=mapper.insertAuditRecord(voo); int num = mapper.insertAuditRecord(voo);
if(num>0){ if (num > 0) {
//出库 //出库
data.setCkUser(userId.toString()); data.setCkUser(userId.toString());
data.setStatus("4"); data.setStatus("4");
data.setStatusType("1"); data.setStatusType("1");
mapper.updatePartInfo(data); mapper.updatePartInfo(data);
// //
PartApplyDetailAppVo det=new PartApplyDetailAppVo(); PartApplyDetailAppVo det = new PartApplyDetailAppVo();
det.setId(data.getId()); det.setId(data.getId());
//计算出库数量 //计算出库数量
List<PartApplyDetailAppVo> details=mapper.getDetailsList(det); List<PartApplyDetailAppVo> details = mapper.getDetailsList(det);
String userName=UserUtil.getLoginUser().getUsername(); String userName = UserUtil.getLoginUser().getUsername();
//出库数据 维护 //出库数据 维护
userPartInfoService.insert(details,vo.getCreator(),vo.getUserName()); userPartInfoService.insert(details, vo.getCreator(), vo.getUserName());
details.forEach(detail->{ details.forEach(detail -> {
String partId=detail.getPartId(); String partId = detail.getPartId();
int applyNum=detail.getApplyNum(); int applyNum = detail.getApplyNum();
PaTypeVo paTypeVo=mapper.getPaTypeVoById(partId); PaTypeVo paTypeVo = mapper.getPaTypeVoById(partId);
paTypeVo.setNum(paTypeVo.getNum()-applyNum); paTypeVo.setNum(paTypeVo.getNum() - applyNum);
paTypeVo.setCkNum(paTypeVo.getCkNum()+applyNum); paTypeVo.setCkNum(paTypeVo.getCkNum() + applyNum);
//更新当前库存 //更新当前库存
mapper.updatePaTypeVoById(paTypeVo); mapper.updatePaTypeVoById(paTypeVo);
}); });
return ServerResponse.createSuccess("出库成功","出库成功"); return ServerResponse.createSuccess("出库成功", "出库成功");
} }
}catch (Exception e){ } catch (Exception e) {
log.error(e.toString(),e); log.error(e.toString(), e);
} }
return ServerResponse.createErroe("出库失败"); return ServerResponse.createErroe("出库失败");
} }
public static String transBast64(String url){
try{
if(StringHelper.isEmpty(url)){
return "";
}
Path path = Paths.get(url);
byte[] fileBytes = Files.readAllBytes(path);
return Base64.getEncoder().encodeToString(fileBytes);
}catch (Exception e){
log.error(e.toString(),e);
}
return "";
}
public static void main(String[] args) {
System.err.println(transBast64("D:\\files\\zg_gqj\\20241109\\173113057456537938315.jpg"));
}
} }

17
src/main/java/com/bonus/gzgqj/business/plan/service/PlanApplicationServiceImp.java
View File

@ -212,10 +212,10 @@ public class PlanApplicationServiceImp implements PlanApplicationService {
Row row = sheet.getRow(i); Row row = sheet.getRow(i);
PlanDevBean data = new PlanDevBean(); PlanDevBean data = new PlanDevBean();
// 获取全部列的值 // 获取全部列的值
data.setPpName(row.getCell(1).getStringCellValue()); //物资类型 data.setPpName(row.getCell(1).getStringCellValue().trim()); //物资类型
data.setpName(row.getCell(2).getStringCellValue()); //物资名称 data.setpName(row.getCell(2).getStringCellValue().trim()); //物资名称
data.setName(row.getCell(3).getStringCellValue()); //物资型号 data.setName(row.getCell(3).getStringCellValue().trim()); //物资型号
data.setUnit(row.getCell(4).getStringCellValue()); //单位 data.setUnit(row.getCell(4).getStringCellValue().trim()); //单位
data.setNeedNum((int)row.getCell(5).getNumericCellValue()); //数量 data.setNeedNum((int)row.getCell(5).getNumericCellValue()); //数量
// data.setTimes(row.getCell(6).getStringCellValue()); //时间 // data.setTimes(row.getCell(6).getStringCellValue()); //时间
Cell cell = row.getCell(6); // 假设时间是在第7列（0-based index 6） Cell cell = row.getCell(6); // 假设时间是在第7列（0-based index 6）
@ -255,20 +255,21 @@ public class PlanApplicationServiceImp implements PlanApplicationService {
workbook.close(); workbook.close();
} }
} }
if(dataList!=null && !dataList.isEmpty()){ if (!dataList.isEmpty()) {
for (PlanDevBean planDevBean : dataList) { for (PlanDevBean planDevBean : dataList) {
//根据物资类型，物资名称，物资型号 去数据库查询是否存在 //根据物资类型，物资名称，物资型号 去数据库查询是否存在
PlanDevBean bean = dao.getExist(planDevBean); PlanDevBean bean = dao.getExist(planDevBean);
if(bean == null){ if (bean == null) {
// 在数据库中不存在，则记录下，全部判断完，返回到前段，提示 // 在数据库中不存在，则记录下，全部判断完，返回到前段，提示
nonExistList.add(planDevBean); nonExistList.add(planDevBean);
}else{ } else {
planDevBean.setId(bean.getId()); planDevBean.setId(bean.getId());
} }
} }
// 如果存在数据库中不存在的数据，返回提示 // 如果存在数据库中不存在的数据，返回提示
if (!nonExistList.isEmpty()) { if (!nonExistList.isEmpty()) {
return ServerResponse.createError("导入失败，以下数据在数据库中不存在", nonExistList); return ServerResponse.createSuccess("导入成功,有部分物资不存在", dataList);
// return ServerResponse.createError("导入失败，以下数据在数据库中不存在", nonExistList);
} }
} }
return ServerResponse.createSuccess("导入成功", dataList); return ServerResponse.createSuccess("导入成功", dataList);

1
src/main/resources/mappers/plan/PlanApplicationMapper.xml
View File

@ -238,7 +238,6 @@
LEFT JOIN mm_type mt1 on mt.PARENT_ID=mt1.id and mt1.IS_ACTIVE=1 LEFT JOIN mm_type mt1 on mt.PARENT_ID=mt1.id and mt1.IS_ACTIVE=1
LEFT JOIN mm_type mt2 on mt1.PARENT_ID=mt2.id and mt2.IS_ACTIVE=1 LEFT JOIN mm_type mt2 on mt1.PARENT_ID=mt2.id and mt2.IS_ACTIVE=1
WHERE mt.IS_ACTIVE=1 WHERE mt.IS_ACTIVE=1
and mt.IS_LABEL=1
and mt2.`NAME` = #{param.ppName} and mt2.`NAME` = #{param.ppName}
and mt1.`NAME` = #{param.pName} and mt1.`NAME` = #{param.pName}
and mt.`NAME` = #{param.name} and mt.`NAME` = #{param.name}