Big-Data-Lab
/
Glass-ERP
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

第三模块功能开发进度+1

This commit is contained in:
super 2023-08-17 00:56:27 +08:00
parent bcdfaf4461
commit f5c772fa64
9 changed files with 397 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

179
jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/demo/Try/controller/ProcurementProgressController.java Normal file
View File

@ -0,0 +1,179 @@
package org.jeecg.modules.demo.Try.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.Try.entity.ProcurementProgress;
import org.jeecg.modules.demo.Try.service.IProcurementProgressService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
* @Description: 采购进度
* @Author: jeecg-boot
* @Date: 2023-08-16
* @Version: V1.0
*/
@Api(tags = "采购进度")
@RestController
@RequestMapping("/Try/procurementProgress")
@Slf4j
public class ProcurementProgressController extends JeecgController<ProcurementProgress, IProcurementProgressService> {
@Autowired
private IProcurementProgressService procurementProgressService;
/**
* 分页列表查询
*
* @param procurementProgress
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "采购进度-分页列表查询")
@ApiOperation(value = "采购进度-分页列表查询", notes = "采购进度-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<ProcurementProgress>> queryPageList(ProcurementProgress procurementProgress,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ProcurementProgress> queryWrapper = QueryGenerator.initQueryWrapper(procurementProgress, req.getParameterMap());
Page<ProcurementProgress> page = new Page<ProcurementProgress>(pageNo, pageSize);
IPage<ProcurementProgress> pageList = procurementProgressService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param procurementProgress
* @return
*/
@AutoLog(value = "采购进度-添加")
@ApiOperation(value = "采购进度-添加", notes = "采购进度-添加")
@RequiresPermissions("Try:procurement_progress:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody ProcurementProgress procurementProgress) {
procurementProgressService.save(procurementProgress);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param procurementProgress
* @return
*/
@AutoLog(value = "采购进度-编辑")
@ApiOperation(value = "采购进度-编辑", notes = "采购进度-编辑")
@RequiresPermissions("Try:procurement_progress:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody ProcurementProgress procurementProgress) {
procurementProgressService.updateById(procurementProgress);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "采购进度-通过id删除")
@ApiOperation(value = "采购进度-通过id删除", notes = "采购进度-通过id删除")
@RequiresPermissions("Try:procurement_progress:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
procurementProgressService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "采购进度-批量删除")
@ApiOperation(value = "采购进度-批量删除", notes = "采购进度-批量删除")
@RequiresPermissions("Try:procurement_progress:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.procurementProgressService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "采购进度-通过id查询")
@ApiOperation(value = "采购进度-通过id查询", notes = "采购进度-通过id查询")
@GetMapping(value = "/queryById")
public Result<ProcurementProgress> queryById(@RequestParam(name = "id", required = true) String id) {
ProcurementProgress procurementProgress = procurementProgressService.getById(id);
if (procurementProgress == null) {
return Result.error("未找到对应数据");
}
return Result.OK(procurementProgress);
}
/**
* 导出excel
*
* @param request
* @param procurementProgress
*/
@RequiresPermissions("Try:procurement_progress:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ProcurementProgress procurementProgress) {
return super.exportXls(request, procurementProgress, ProcurementProgress.class, "采购进度");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("Try:procurement_progress:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ProcurementProgress.class);
}
}

45
jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/demo/Try/controller/PurchaseOrderConfirmationController.java
View File

@ -9,13 +9,16 @@ import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.Try.entity.ProcurementProgress;
import org.jeecg.modules.demo.Try.entity.PurchaseAndOrder;
import org.jeecg.modules.demo.Try.entity.PurchaseOrderConfirmation;
import org.jeecg.modules.demo.Try.entity.PurchaseRequest;
import org.jeecg.modules.demo.Try.service.IProcurementProgressService;
import org.jeecg.modules.demo.Try.service.IPurchaseOrderConfirmationService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -178,18 +181,41 @@ public class PurchaseOrderConfirmationController extends JeecgController<Purchas
return Result.OK("已取消接收!");
}
/**
* 处理完成
*
* @param purchaseOrderConfirmation
* @return
*/
@Autowired
private IProcurementProgressService procurementProgressService;
@AutoLog(value = "订单确认-处理完成")
@ApiOperation(value = "订单确认-处理完成", notes = "订单确认-处理完成")
@RequestMapping(value = "/finish", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> finish(@RequestBody PurchaseOrderConfirmation purchaseOrderConfirmation) {
public Result<String> finish(@RequestBody Map<String, String> requestMap) {
LambdaUpdateWrapper<PurchaseOrderConfirmation> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(PurchaseOrderConfirmation::getAssociationNumber, purchaseOrderConfirmation.getAssociationNumber())
.set(PurchaseOrderConfirmation::getIsDone, purchaseOrderConfirmation.getIsDone());
updateWrapper.eq(PurchaseOrderConfirmation::getAssociationNumber, requestMap.get("requirementNumber"))
.set(PurchaseOrderConfirmation::getIsDone,"1");
purchaseOrderConfirmationService.update(updateWrapper);
ProcurementProgress procurementProgress = new ProcurementProgress();
procurementProgress.setReqirementNumber(Integer.valueOf(requestMap.get("requirementNumber")));
procurementProgress.setProcurementLog(requestMap.get("procurementLog"));
procurementProgressService.save(procurementProgress);
return Result.OK("已更改处理状态!");
}
@AutoLog(value = "订单确认-处理完成撤销")
@ApiOperation(value = "订单确认-处理完成撤销", notes = "订单确认-处理完成撤销")
@RequestMapping(value = "/unFinish", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> unFinish(@RequestBody Map<String, String> requestMap) {
LambdaUpdateWrapper<PurchaseOrderConfirmation> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(PurchaseOrderConfirmation::getAssociationNumber, requestMap.get("requirementNumber"))
.set(PurchaseOrderConfirmation::getIsDone, "0");
purchaseOrderConfirmationService.update(updateWrapper);
procurementProgressService.remove(new LambdaQueryWrapper<ProcurementProgress>().eq(ProcurementProgress::getReqirementNumber, requestMap.get("requirementNumber")));
return Result.OK("已更改处理状态!");
}
// public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
// purchaseOrderConfirmationService.removeById(id);
// return Result.OK("删除成功!");
/**
* 通过id删除
@ -259,7 +285,12 @@ public class PurchaseOrderConfirmationController extends JeecgController<Purchas
return super.importExcel(request, response, PurchaseOrderConfirmation.class);
}
/**
* 生成word文档
*
* @param jsonData 前端的json数据
* @return 返回生成的word文档[二进制数组]
*/
private final Object lock = new Object(); // 用于同步的锁对象
@Autowired
private WordGeneratorService wordGeneratorService;

75
jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/demo/Try/entity/ProcurementProgress.java Normal file
View File

@ -0,0 +1,75 @@
package org.jeecg.modules.demo.Try.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: 采购进度
* @Author: jeecg-boot
* @Date: 2023-08-16
* @Version: V1.0
*/
@Data
@TableName("procurement_progress")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="procurement_progress对象", description="采购进度")
public class ProcurementProgress implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**需求编号*/
@Excel(name = "需求编号", width = 15)
@ApiModelProperty(value = "需求编号")
private java.lang.Integer reqirementNumber;
/**采购日志*/
@Excel(name = "采购日志", width = 15)
@ApiModelProperty(value = "采购日志")
private java.lang.String procurementLog;
/**是否完成*/
@Excel(name = "是否完成", width = 15)
@ApiModelProperty(value = "是否完成")
private java.lang.Integer isDone;
/**质检详情*/
@Excel(name = "质检详情", width = 15)
@ApiModelProperty(value = "质检详情")
private java.lang.String qualityInspectionDetails;
/**质检是否通过*/
@Excel(name = "质检是否通过", width = 15)
@ApiModelProperty(value = "质检是否通过")
private java.lang.Integer qualityIsPass;
}

6
jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/demo/Try/entity/PurchaseAndOrder.java
View File

@ -67,9 +67,9 @@ public class PurchaseAndOrder implements Serializable {
/**
* 关联编号
*/
@Excel(name = "关联编号", width = 15)
@ApiModelProperty(value = "关联编号")
private java.lang.String associationNumber;
@Excel(name = "需求编号", width = 15)
@ApiModelProperty(value = "需求编号")
private java.lang.String requirementNumber;
/**
* 供应商选择
*/

17
jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/demo/Try/mapper/ProcurementProgressMapper.java Normal file
View File

@ -0,0 +1,17 @@
package org.jeecg.modules.demo.Try.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.demo.Try.entity.ProcurementProgress;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 采购进度
* @Author: jeecg-boot
* @Date: 2023-08-16
* @Version: V1.0
*/
public interface ProcurementProgressMapper extends BaseMapper<ProcurementProgress> {
}

5
jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/demo/Try/mapper/xml/ProcurementProgressMapper.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.demo.Try.mapper.ProcurementProgressMapper">
</mapper>

51
jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/demo/Try/mapper/xml/PurchaseOrderConfirmationMapper.xml
View File

@ -3,10 +3,53 @@
<mapper namespace="org.jeecg.modules.demo.Try.mapper.PurchaseOrderConfirmationMapper">
<select id="getAllData" resultType="org.jeecg.modules.demo.Try.entity.PurchaseAndOrder">
select c.id,r.create_by,r.create_time,r.update_time,r.sys_org_code,c.association_number,c.supplier_selection,c.receiver,c.receiving_time,c.notes,r.approved_by
,r.procurement_category,r.procurement_direction,r.procurement_content,r.procurement_budget,r.annex,
r.audit_results,r.is_receiving
from purchase_order_confirmation c,purchase_request r where r.requirement_number=c.association_number;
select c.id,
r.create_by,
r.create_time,
r.update_time,
r.sys_org_code,
r.requirement_number,
c.supplier_selection,
c.receiver,
c.receiving_time,
c.notes,
r.approved_by,
r.procurement_category,
r.procurement_direction,
r.procurement_content,
r.procurement_budget,
r.annex,
r.audit_results,
r.is_receiving
from purchase_order_confirmation c,
purchase_request r
where r.requirement_number = c.association_number
and c.is_done = 0;
</select>
<select id="getAllData2" resultType="org.jeecg.modules.demo.Try.entity.PurchaseAndOrder">
select c.id,
r.create_by,
r.create_time,
r.update_time,
r.sys_org_code,
r.requirement_number,
c.supplier_selection,
c.receiver,
c.receiving_time,
c.notes,
r.approved_by,
r.procurement_category,
r.procurement_direction,
r.procurement_content,
r.procurement_budget,
r.annex,
r.audit_results,
r.is_receiving
from purchase_order_confirmation c,
purchase_request r
where r.requirement_number = c.association_number
and c.is_done = 1;
</select>
</mapper>

14
jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/demo/Try/service/IProcurementProgressService.java Normal file
View File

@ -0,0 +1,14 @@
package org.jeecg.modules.demo.Try.service;
import org.jeecg.modules.demo.Try.entity.ProcurementProgress;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 采购进度
* @Author: jeecg-boot
* @Date: 2023-08-16
* @Version: V1.0
*/
public interface IProcurementProgressService extends IService<ProcurementProgress> {
}

19
jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/demo/Try/service/impl/ProcurementProgressServiceImpl.java Normal file
View File

@ -0,0 +1,19 @@
package org.jeecg.modules.demo.Try.service.impl;
import org.jeecg.modules.demo.Try.entity.ProcurementProgress;
import org.jeecg.modules.demo.Try.mapper.ProcurementProgressMapper;
import org.jeecg.modules.demo.Try.service.IProcurementProgressService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 采购进度
* @Author: jeecg-boot
* @Date: 2023-08-16
* @Version: V1.0
*/
@Service
public class ProcurementProgressServiceImpl extends ServiceImpl<ProcurementProgressMapper, ProcurementProgress> implements IProcurementProgressService {
}