作者 雷海东

正在显示 19 个修改的文件 包含 584 行增加30 行删除
package org.jeecg.modules.erp.bidding_info.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.erp.bidding_info.entity.TblBiddingShiji;
import org.jeecg.modules.erp.bidding_info.service.ITblBiddingShijiService;
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;
/**
* @Description: tbl_bidding_shiji
* @Author: jeecg-boot
* @Date: 2024-04-26
* @Version: V1.0
*/
@Api(tags="tbl_bidding_shiji")
@RestController
@RequestMapping("/bidding_info/tblBiddingShiji")
@Slf4j
public class TblBiddingShijiController extends JeecgController<TblBiddingShiji, ITblBiddingShijiService> {
@Autowired
private ITblBiddingShijiService tblBiddingShijiService;
/**
* 分页列表查询
*
* @param tblBiddingShiji
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "tbl_bidding_shiji-分页列表查询")
@ApiOperation(value="tbl_bidding_shiji-分页列表查询", notes="tbl_bidding_shiji-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<TblBiddingShiji>> queryPageList(TblBiddingShiji tblBiddingShiji,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<TblBiddingShiji> queryWrapper = QueryGenerator.initQueryWrapper(tblBiddingShiji, req.getParameterMap());
Page<TblBiddingShiji> page = new Page<TblBiddingShiji>(pageNo, pageSize);
IPage<TblBiddingShiji> pageList = tblBiddingShijiService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param tblBiddingShiji
* @return
*/
@AutoLog(value = "tbl_bidding_shiji-添加")
@ApiOperation(value="tbl_bidding_shiji-添加", notes="tbl_bidding_shiji-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody TblBiddingShiji tblBiddingShiji) {
tblBiddingShijiService.save(tblBiddingShiji);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param tblBiddingShiji
* @return
*/
@AutoLog(value = "tbl_bidding_shiji-编辑")
@ApiOperation(value="tbl_bidding_shiji-编辑", notes="tbl_bidding_shiji-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody TblBiddingShiji tblBiddingShiji) {
tblBiddingShijiService.updateById(tblBiddingShiji);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "tbl_bidding_shiji-通过id删除")
@ApiOperation(value="tbl_bidding_shiji-通过id删除", notes="tbl_bidding_shiji-通过id删除")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
tblBiddingShijiService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "tbl_bidding_shiji-批量删除")
@ApiOperation(value="tbl_bidding_shiji-批量删除", notes="tbl_bidding_shiji-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.tblBiddingShijiService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "tbl_bidding_shiji-通过id查询")
@ApiOperation(value="tbl_bidding_shiji-通过id查询", notes="tbl_bidding_shiji-通过id查询")
@GetMapping(value = "/queryById")
public Result<TblBiddingShiji> queryById(@RequestParam(name="id",required=true) String id) {
TblBiddingShiji tblBiddingShiji = tblBiddingShijiService.getById(id);
if(tblBiddingShiji==null) {
return Result.error("未找到对应数据");
}
return Result.OK(tblBiddingShiji);
}
/**
* 导出excel
*
* @param request
* @param tblBiddingShiji
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, TblBiddingShiji tblBiddingShiji) {
return super.exportXls(request, tblBiddingShiji, TblBiddingShiji.class, "tbl_bidding_shiji");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, TblBiddingShiji.class);
}
}
... ...
... ... @@ -51,11 +51,33 @@ public class TblBiddingShenq implements Serializable {
@Excel(name = "单位", width = 15)
@ApiModelProperty(value = "单位")
private String danwei;
/**到货日期*/
@Excel(name = "到货日期", width = 15)
/**物料类别*/
@Excel(name = "物料类别", width = 15)
@ApiModelProperty(value = "物料类别")
private String wuType;
/**工作令*/
@Excel(name = "工作令", width = 15)
@ApiModelProperty(value = "工作令")
private String workOrder;
/**用途*/
@Excel(name = "用途", width = 15)
@ApiModelProperty(value = "用途")
private String purpose;
/**当前库存*/
@Excel(name = "当前库存", width = 15)
@ApiModelProperty(value = "当前库存")
private String ku;
/**申请日期*/
@Excel(name = "申请日期", width = 15)
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "到货日期")
@ApiModelProperty(value = "申请日期")
private Date sqTime;
/**使用日期*/
@Excel(name = "使用日期", width = 15)
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "使用日期")
private Date deliveryTime;
/**品牌*/
@Excel(name = "品牌", width = 15)
... ...
package org.jeecg.modules.erp.bidding_info.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 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: tbl_bidding_shiji
* @Author: jeecg-boot
* @Date: 2024-04-26
* @Version: V1.0
*/
@Data
@TableName("tbl_bidding_shiji")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="tbl_bidding_shiji对象", description="tbl_bidding_shiji")
public class TblBiddingShiji implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private Integer id;
/**品名*/
@Excel(name = "品名", width = 15)
@ApiModelProperty(value = "品名")
private String productName;
/**规格*/
@Excel(name = "规格", width = 15)
@ApiModelProperty(value = "规格")
private String specifications;
/**数量*/
@Excel(name = "数量", width = 15)
@ApiModelProperty(value = "数量")
private Integer num;
/**单位*/
@Excel(name = "单位", width = 15)
@ApiModelProperty(value = "单位")
private String danwei;
/**物料类别*/
@Excel(name = "物料类别", width = 15)
@ApiModelProperty(value = "物料类别")
private String wuType;
/**单价*/
@Excel(name = "单价", width = 15)
@ApiModelProperty(value = "单价")
private BigDecimal danPrice;
/**总价*/
@Excel(name = "总价", width = 15)
@ApiModelProperty(value = "总价")
private BigDecimal zongPrice;
/**用途*/
@Excel(name = "用途", width = 15)
@ApiModelProperty(value = "用途")
private String purpose;
/**厂商*/
@Excel(name = "厂商", width = 15)
@ApiModelProperty(value = "厂商")
private String chang;
/**购买日期*/
@Excel(name = "购买日期", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "购买日期")
private Date buyTime;
/**到货日期*/
@Excel(name = "到货日期", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "到货日期")
private Date deliveryTime;
/**品牌*/
@Excel(name = "品牌", width = 15)
@ApiModelProperty(value = "品牌")
private String brand;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private String notes;
/**发票类别*/
@Excel(name = "发票类别", width = 15)
@ApiModelProperty(value = "发票类别")
private String fpType;
/**发票到否*/
@Excel(name = "发票到否", width = 15)
@ApiModelProperty(value = "发票到否")
private String fpIsyn;
/**发票收到信息*/
@Excel(name = "发票收到信息", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "发票收到日期")
private Date fpTime;
/**物品图片*/
@Excel(name = "物品图片", width = 15)
@ApiModelProperty(value = "物品图片")
private String picture;
/**创建人*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "创建日期")
private Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "更新日期")
private Date updateTime;
}
... ...
package org.jeecg.modules.erp.bidding_info.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShiji;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: tbl_bidding_shiji
* @Author: jeecg-boot
* @Date: 2024-04-26
* @Version: V1.0
*/
public interface TblBiddingShijiMapper extends BaseMapper<TblBiddingShiji> {
}
... ...
<?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.erp.bidding_info.mapper.TblBiddingShijiMapper">
</mapper>
\ No newline at end of file
... ...
package org.jeecg.modules.erp.bidding_info.service;
import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShiji;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: tbl_bidding_shiji
* @Author: jeecg-boot
* @Date: 2024-04-26
* @Version: V1.0
*/
public interface ITblBiddingShijiService extends IService<TblBiddingShiji> {
}
... ...
package org.jeecg.modules.erp.bidding_info.service.impl;
import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShiji;
import org.jeecg.modules.erp.bidding_info.mapper.TblBiddingShijiMapper;
import org.jeecg.modules.erp.bidding_info.service.ITblBiddingShijiService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: tbl_bidding_shiji
* @Author: jeecg-boot
* @Date: 2024-04-26
* @Version: V1.0
*/
@Service
public class TblBiddingShijiServiceImpl extends ServiceImpl<TblBiddingShijiMapper, TblBiddingShiji> implements ITblBiddingShijiService {
}
... ...
... ... @@ -9,10 +9,15 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.erp.meterial.entity.TblMaterial;
import org.jeecg.modules.erp.trad.entity.TblTradBase;
import org.jeecg.modules.erp.trad.entity.TblTradContract;
import org.jeecg.modules.erp.trad.service.TblTradBaseService;
import org.jeecg.modules.erp.trad.service.TblTradContractService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
... ... @@ -51,6 +56,9 @@ public class TblTradContractController extends JeecgController<TblTradContract,
@Autowired
private TblTradContractService tblTradContractService;
@Autowired
private TblTradBaseService tblTradBaseService;
/**
* 分页列表查询
*
... ... @@ -147,6 +155,38 @@ public class TblTradContractController extends JeecgController<TblTradContract,
}
/**
* 查基本信息表是否有这个数据存在
*
* @param tenderNumber
* @return
*/
@GetMapping(value = "/queryBy")
public Result<TblTradBase> queryBaseByPartNum(@RequestParam(name = "tenderNumber", required = true) String tenderNumber,
@RequestParam(name = "partNumber", required = true) String partNumber) {
LambdaQueryWrapper<TblTradBase> queryWrapper = new LambdaQueryWrapper<TblTradBase>()
.eq(TblTradBase::getTenderNumber,tenderNumber).eq(TblTradBase::getPartNumber,partNumber);
TblTradBase tblTradBase = tblTradBaseService.getOne(queryWrapper);
return Result.ok(tblTradBase);
}
/**
* 查是否有这个数据存在
*
* @param tenderNumber
* @return
*/
@GetMapping(value = "/queryhetongBy")
public Result<TblTradContract> queryContractByPartNum(@RequestParam(name = "tenderNumber", required = true) String tenderNumber,
@RequestParam(name = "partNumber", required = true) String partNumber) {
LambdaQueryWrapper<TblTradContract> queryWrapper = new LambdaQueryWrapper<TblTradContract>()
.eq(TblTradContract::getTenderNumber,tenderNumber).eq(TblTradContract::getPartNumber,partNumber);
TblTradContract tblTradContract = tblTradContractService.getOne(queryWrapper);
return Result.ok(tblTradContract);
}
/**
* 导出excel
*
* @param request
... ...
... ... @@ -9,10 +9,15 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.erp.trad.entity.TblTradBase;
import org.jeecg.modules.erp.trad.entity.TblTradContract;
import org.jeecg.modules.erp.trad.entity.TblTradFphk;
import org.jeecg.modules.erp.trad.service.TblTradBaseService;
import org.jeecg.modules.erp.trad.service.TblTradFphkService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
... ... @@ -50,7 +55,8 @@ import org.jeecg.common.aspect.annotation.AutoLog;
public class TblTradFphkController extends JeecgController<TblTradFphk, TblTradFphkService> {
@Autowired
private TblTradFphkService tblTradFphkService;
@Autowired
private TblTradBaseService tblTradBaseService;
/**
* 分页列表查询
*
... ... @@ -147,6 +153,38 @@ public class TblTradFphkController extends JeecgController<TblTradFphk, TblTradF
}
/**
* 查基本信息表是否有这个数据存在
*
* @param tenderNumber
* @return
*/
@GetMapping(value = "/queryBy")
public Result<TblTradBase> queryBaseByPartNum(@RequestParam(name = "tenderNumber", required = true) String tenderNumber,
@RequestParam(name = "partNumber", required = true) String partNumber) {
LambdaQueryWrapper<TblTradBase> queryWrapper = new LambdaQueryWrapper<TblTradBase>()
.eq(TblTradBase::getTenderNumber,tenderNumber).eq(TblTradBase::getPartNumber,partNumber);
TblTradBase tblTradBase = tblTradBaseService.getOne(queryWrapper);
return Result.ok(tblTradBase);
}
/**
* 查是否有这个数据存在
*
* @param tenderNumber
* @return
*/
@GetMapping(value = "/queryfphkBy")
public Result<TblTradFphk> queryFphkByPartNum(@RequestParam(name = "tenderNumber", required = true) String tenderNumber,
@RequestParam(name = "partNumber", required = true) String partNumber) {
LambdaQueryWrapper<TblTradFphk> queryWrapper = new LambdaQueryWrapper<TblTradFphk>()
.eq(TblTradFphk::getTenderNumber,tenderNumber).eq(TblTradFphk::getPartNumber,partNumber);
TblTradFphk tblTradFphk = tblTradFphkService.getOne(queryWrapper);
return Result.ok(tblTradFphk);
}
/**
* 导出excel
*
* @param request
... ...
... ... @@ -3,9 +3,14 @@ package org.jeecg.modules.erp.trad.controller;
import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.erp.trad.entity.TblTradBase;
import org.jeecg.modules.erp.trad.entity.TblTradFphk;
import org.jeecg.modules.erp.trad.entity.TblTradInquiry;
import org.jeecg.modules.erp.trad.service.TblTradBaseService;
import org.jeecg.modules.erp.trad.service.TblTradInquiryService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
... ... @@ -34,6 +39,8 @@ import org.jeecg.common.aspect.annotation.AutoLog;
public class TblTradInquiryController extends JeecgController<TblTradInquiry, TblTradInquiryService> {
@Autowired
private TblTradInquiryService tblTradInquiryService;
@Autowired
private TblTradBaseService tblTradBaseService;
/**
* 分页列表查询
... ... @@ -129,6 +136,22 @@ public class TblTradInquiryController extends JeecgController<TblTradInquiry, Tb
}
return Result.OK(tblTradInquiry);
}
/**
* 查基本信息表是否有这个数据存在
*
* @param tenderNumber
* @return
*/
@GetMapping(value = "/queryBy")
public Result<TblTradBase> queryBaseByPartNum(@RequestParam(name = "tenderNumber", required = true) String tenderNumber,
@RequestParam(name = "partNumber", required = true) String partNumber) {
LambdaQueryWrapper<TblTradBase> queryWrapper = new LambdaQueryWrapper<TblTradBase>()
.eq(TblTradBase::getTenderNumber,tenderNumber).eq(TblTradBase::getPartNumber,partNumber);
TblTradBase tblTradBase = tblTradBaseService.getOne(queryWrapper);
return Result.ok(tblTradBase);
}
/**
* 导出excel
... ...
... ... @@ -9,10 +9,15 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.erp.trad.entity.TblTradBase;
import org.jeecg.modules.erp.trad.entity.TblTradFphk;
import org.jeecg.modules.erp.trad.entity.TblTradTender;
import org.jeecg.modules.erp.trad.service.TblTradBaseService;
import org.jeecg.modules.erp.trad.service.TblTradTenderService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
... ... @@ -51,6 +56,9 @@ public class TblTradTenderController extends JeecgController<TblTradTender, TblT
@Autowired
private TblTradTenderService tblTradTenderService;
@Autowired
private TblTradBaseService tblTradBaseService;
/**
* 分页列表查询
*
... ... @@ -147,6 +155,38 @@ public class TblTradTenderController extends JeecgController<TblTradTender, TblT
}
/**
* 查基本信息表是否有这个数据存在
*
* @param tenderNumber
* @return
*/
@GetMapping(value = "/queryBy")
public Result<TblTradBase> queryBaseByPartNum(@RequestParam(name = "tenderNumber", required = true) String tenderNumber,
@RequestParam(name = "partNumber", required = true) String partNumber) {
LambdaQueryWrapper<TblTradBase> queryWrapper = new LambdaQueryWrapper<TblTradBase>()
.eq(TblTradBase::getTenderNumber,tenderNumber).eq(TblTradBase::getPartNumber,partNumber);
TblTradBase tblTradBase = tblTradBaseService.getOne(queryWrapper);
return Result.ok(tblTradBase);
}
/**
* 查是否有这个数据存在
*
* @param tenderNumber
* @return
*/
@GetMapping(value = "/querytenderBy")
public Result<TblTradTender> queryTenderByPartNum(@RequestParam(name = "tenderNumber", required = true) String tenderNumber,
@RequestParam(name = "partNumber", required = true) String partNumber) {
LambdaQueryWrapper<TblTradTender> queryWrapper = new LambdaQueryWrapper<TblTradTender>()
.eq(TblTradTender::getTenderNumber,tenderNumber).eq(TblTradTender::getPartNumber,partNumber);
TblTradTender tblTradTender = tblTradTenderService.getOne(queryWrapper);
return Result.ok(tblTradTender);
}
/**
* 导出excel
*
* @param request
... ...
... ... @@ -9,10 +9,15 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.erp.trad.entity.TblTradBase;
import org.jeecg.modules.erp.trad.entity.TblTradContract;
import org.jeecg.modules.erp.trad.entity.TblTradTou;
import org.jeecg.modules.erp.trad.service.TblTradBaseService;
import org.jeecg.modules.erp.trad.service.TblTradTouService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
... ... @@ -50,7 +55,8 @@ import org.jeecg.common.aspect.annotation.AutoLog;
public class TblTradTouController extends JeecgController<TblTradTou, TblTradTouService> {
@Autowired
private TblTradTouService tblTradTouService;
@Autowired
private TblTradBaseService tblTradBaseService;
/**
* 分页列表查询
*
... ... @@ -147,6 +153,37 @@ public class TblTradTouController extends JeecgController<TblTradTou, TblTradTou
}
/**
* 查基本信息表是否有这个数据存在
*
* @param tenderNumber
* @return
*/
@GetMapping(value = "/queryBy")
public Result<TblTradBase> queryBaseByPartNum(@RequestParam(name = "tenderNumber", required = true) String tenderNumber,
@RequestParam(name = "partNumber", required = true) String partNumber) {
LambdaQueryWrapper<TblTradBase> queryWrapper = new LambdaQueryWrapper<TblTradBase>()
.eq(TblTradBase::getTenderNumber,tenderNumber).eq(TblTradBase::getPartNumber,partNumber);
TblTradBase tblTradBase = tblTradBaseService.getOne(queryWrapper);
return Result.ok(tblTradBase);
}
/**
* 查是否有这个数据存在
*
* @param tenderNumber
* @return
*/
@GetMapping(value = "/querytouBy")
public Result<TblTradTou> queryTouByPartNum(@RequestParam(name = "tenderNumber", required = true) String tenderNumber,
@RequestParam(name = "partNumber", required = true) String partNumber) {
LambdaQueryWrapper<TblTradTou> queryWrapper = new LambdaQueryWrapper<TblTradTou>()
.eq(TblTradTou::getTenderNumber,tenderNumber).eq(TblTradTou::getPartNumber,partNumber);
TblTradTou tblTradTou = tblTradTouService.getOne(queryWrapper);
return Result.ok(tblTradTou);
}
/**
* 导出excel
*
* @param request
... ...
... ... @@ -67,6 +67,14 @@ public class TblTradBase implements Serializable {
@Excel(name = "申请数量", width = 15)
@ApiModelProperty(value = "申请数量")
private java.math.BigDecimal num;
/**含税运单价*/
@Excel(name = "含税运单价", width = 15)
@ApiModelProperty(value = "含税运单价")
private java.math.BigDecimal baseShuiprice;
/**中标单价*/
@Excel(name = "中标单价", width = 15)
@ApiModelProperty(value = "中标单价")
private java.math.BigDecimal baseZhong;
/**计量单位*/
@Excel(name = "计量单位", width = 15)
@ApiModelProperty(value = "计量单位")
... ...
... ... @@ -39,30 +39,10 @@ public class TblTradInquiry implements Serializable {
@Excel(name = "招标号", width = 15)
@ApiModelProperty(value = "招标号")
private java.lang.String tenderNumber;
/**客户*/
@Excel(name = "客户", width = 15)
@ApiModelProperty(value = "客户")
private java.lang.String customer;
/**客户采购*/
@Excel(name = "客户采购", width = 15)
@ApiModelProperty(value = "客户采购")
private java.lang.String procurement;
/**客户料号*/
@Excel(name = "客户料号", width = 15)
@ApiModelProperty(value = "客户料号")
private java.lang.String partNumber;
/**物料描述*/
@Excel(name = "物料描述", width = 15)
@ApiModelProperty(value = "物料描述")
private java.lang.String description;
/**品名*/
@Excel(name = "品名", width = 15)
@ApiModelProperty(value = "品名")
private java.lang.String productname;
/**规格*/
@Excel(name = "规格", width = 15)
@ApiModelProperty(value = "规格")
private java.lang.String specifications;
/**厂商*/
@Excel(name = "厂商", width = 15)
@ApiModelProperty(value = "厂商")
... ...
... ... @@ -67,6 +67,14 @@ public class TblTradZong implements Serializable {
@Excel(name = "申请数量", width = 15)
@ApiModelProperty(value = "申请数量")
private BigDecimal num;
/**含税运单价*/
@Excel(name = "含税运单价", width = 15)
@ApiModelProperty(value = "含税运单价")
private java.math.BigDecimal baseShuiprice;
/**中标单价*/
@Excel(name = "中标单价", width = 15)
@ApiModelProperty(value = "中标单价")
private java.math.BigDecimal baseZhong;
/**计量单位*/
@Excel(name = "计量单位", width = 15)
@ApiModelProperty(value = "计量单位")
... ...
... ... @@ -16,6 +16,8 @@
productname,
specifications,
num,
base_shuiprice,
base_zhong,
danwei,
company,
jiaohuo_time,
... ... @@ -72,6 +74,8 @@
base.productname,
base.specifications,
base.num,
base.base_shuiprice,
base.base_zhong,
base.danwei,
base.company,
base.delivery_time,
... ...
... ... @@ -136,9 +136,9 @@ spring:
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
url: jdbc:mysql://rm-2zeiuncjm75qti641ho.mysql.rds.aliyuncs.com:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: ntsd_root
password: L3bHRJwg6lJ2SC4WFfGA
url: jdbc:mysql://localhost:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root
password: root
driver-class-name: com.mysql.cj.jdbc.Driver
# 192.168.110.10 pass#word1 url: jdbc:mysql://rm-2zeiuncjm75qti641ho.mysql.rds.aliyuncs.com:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
# username: ntsd_root
... ... @@ -153,7 +153,7 @@ spring:
#redis 配置
redis:
database: 0
host: 172.18.0.4
host: 127.0.0.1
lettuce:
pool:
max-active: 8 #最大连接数据库连接数,设 -1 为没有限制
... ... @@ -264,7 +264,7 @@ jeecg:
data-type: database
#分布式锁配置
redisson:
address: 172.18.0.4:6379
address: 127.0.0.1:6379
password:
type: STANDALONE
enabled: true
... ...