雷海东 / factory-java · 提交

转到一个项目

作者 雷海东
提交 52c204078bcded27c6226e64bcecc32c6d0c02e2 1 个父辈 e3057b01

新

内嵌 并排对比
正在显示 19 个修改的文件 包含 584 行增加 和 30 行删除
  1 +package org.jeecg.modules.erp.bidding_info.controller;
  2 +
  3 +import java.util.Arrays;
  4 +import java.util.List;
  5 +import java.util.Map;
  6 +import java.util.stream.Collectors;
  7 +import java.io.IOException;
  8 +import java.io.UnsupportedEncodingException;
  9 +import java.net.URLDecoder;
  10 +import javax.servlet.http.HttpServletRequest;
  11 +import javax.servlet.http.HttpServletResponse;
  12 +import org.jeecg.common.api.vo.Result;
  13 +import org.jeecg.common.system.query.QueryGenerator;
  14 +import org.jeecg.common.util.oConvertUtils;
  15 +import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShiji;
  16 +import org.jeecg.modules.erp.bidding_info.service.ITblBiddingShijiService;
  17 +
  18 +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  19 +import com.baomidou.mybatisplus.core.metadata.IPage;
  20 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  21 +import lombok.extern.slf4j.Slf4j;
  22 +
  23 +import org.jeecgframework.poi.excel.ExcelImportUtil;
  24 +import org.jeecgframework.poi.excel.def.NormalExcelConstants;
  25 +import org.jeecgframework.poi.excel.entity.ExportParams;
  26 +import org.jeecgframework.poi.excel.entity.ImportParams;
  27 +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
  28 +import org.jeecg.common.system.base.controller.JeecgController;
  29 +import org.springframework.beans.factory.annotation.Autowired;
  30 +import org.springframework.web.bind.annotation.*;
  31 +import org.springframework.web.multipart.MultipartFile;
  32 +import org.springframework.web.multipart.MultipartHttpServletRequest;
  33 +import org.springframework.web.servlet.ModelAndView;
  34 +import com.alibaba.fastjson.JSON;
  35 +import io.swagger.annotations.Api;
  36 +import io.swagger.annotations.ApiOperation;
  37 +import org.jeecg.common.aspect.annotation.AutoLog;
  38 +
  39 + /**
  40 + * @Description: tbl_bidding_shiji
  41 + * @Author: jeecg-boot
  42 + * @Date: 2024-04-26
  43 + * @Version: V1.0
  44 + */
  45 +@Api(tags="tbl_bidding_shiji")
  46 +@RestController
  47 +@RequestMapping("/bidding_info/tblBiddingShiji")
  48 +@Slf4j
  49 +public class TblBiddingShijiController extends JeecgController<TblBiddingShiji, ITblBiddingShijiService> {
  50 + @Autowired
  51 + private ITblBiddingShijiService tblBiddingShijiService;
  52 +
  53 + /**
  54 + * 分页列表查询
  55 + *
  56 + * @param tblBiddingShiji
  57 + * @param pageNo
  58 + * @param pageSize
  59 + * @param req
  60 + * @return
  61 + */
  62 + //@AutoLog(value = "tbl_bidding_shiji-分页列表查询")
  63 + @ApiOperation(value="tbl_bidding_shiji-分页列表查询", notes="tbl_bidding_shiji-分页列表查询")
  64 + @GetMapping(value = "/list")
  65 + public Result<IPage<TblBiddingShiji>> queryPageList(TblBiddingShiji tblBiddingShiji,
  66 + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
  67 + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
  68 + HttpServletRequest req) {
  69 + QueryWrapper<TblBiddingShiji> queryWrapper = QueryGenerator.initQueryWrapper(tblBiddingShiji, req.getParameterMap());
  70 + Page<TblBiddingShiji> page = new Page<TblBiddingShiji>(pageNo, pageSize);
  71 + IPage<TblBiddingShiji> pageList = tblBiddingShijiService.page(page, queryWrapper);
  72 + return Result.OK(pageList);
  73 + }
  74 +
  75 + /**
  76 + * 添加
  77 + *
  78 + * @param tblBiddingShiji
  79 + * @return
  80 + */
  81 + @AutoLog(value = "tbl_bidding_shiji-添加")
  82 + @ApiOperation(value="tbl_bidding_shiji-添加", notes="tbl_bidding_shiji-添加")
  83 + @PostMapping(value = "/add")
  84 + public Result<String> add(@RequestBody TblBiddingShiji tblBiddingShiji) {
  85 + tblBiddingShijiService.save(tblBiddingShiji);
  86 + return Result.OK("添加成功！");
  87 + }
  88 +
  89 + /**
  90 + * 编辑
  91 + *
  92 + * @param tblBiddingShiji
  93 + * @return
  94 + */
  95 + @AutoLog(value = "tbl_bidding_shiji-编辑")
  96 + @ApiOperation(value="tbl_bidding_shiji-编辑", notes="tbl_bidding_shiji-编辑")
  97 + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
  98 + public Result<String> edit(@RequestBody TblBiddingShiji tblBiddingShiji) {
  99 + tblBiddingShijiService.updateById(tblBiddingShiji);
  100 + return Result.OK("编辑成功!");
  101 + }
  102 +
  103 + /**
  104 + * 通过id删除
  105 + *
  106 + * @param id
  107 + * @return
  108 + */
  109 + @AutoLog(value = "tbl_bidding_shiji-通过id删除")
  110 + @ApiOperation(value="tbl_bidding_shiji-通过id删除", notes="tbl_bidding_shiji-通过id删除")
  111 + @DeleteMapping(value = "/delete")
  112 + public Result<String> delete(@RequestParam(name="id",required=true) String id) {
  113 + tblBiddingShijiService.removeById(id);
  114 + return Result.OK("删除成功!");
  115 + }
  116 +
  117 + /**
  118 + * 批量删除
  119 + *
  120 + * @param ids
  121 + * @return
  122 + */
  123 + @AutoLog(value = "tbl_bidding_shiji-批量删除")
  124 + @ApiOperation(value="tbl_bidding_shiji-批量删除", notes="tbl_bidding_shiji-批量删除")
  125 + @DeleteMapping(value = "/deleteBatch")
  126 + public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
  127 + this.tblBiddingShijiService.removeByIds(Arrays.asList(ids.split(",")));
  128 + return Result.OK("批量删除成功!");
  129 + }
  130 +
  131 + /**
  132 + * 通过id查询
  133 + *
  134 + * @param id
  135 + * @return
  136 + */
  137 + //@AutoLog(value = "tbl_bidding_shiji-通过id查询")
  138 + @ApiOperation(value="tbl_bidding_shiji-通过id查询", notes="tbl_bidding_shiji-通过id查询")
  139 + @GetMapping(value = "/queryById")
  140 + public Result<TblBiddingShiji> queryById(@RequestParam(name="id",required=true) String id) {
  141 + TblBiddingShiji tblBiddingShiji = tblBiddingShijiService.getById(id);
  142 + if(tblBiddingShiji==null) {
  143 + return Result.error("未找到对应数据");
  144 + }
  145 + return Result.OK(tblBiddingShiji);
  146 + }
  147 +
  148 + /**
  149 + * 导出excel
  150 + *
  151 + * @param request
  152 + * @param tblBiddingShiji
  153 + */
  154 + @RequestMapping(value = "/exportXls")
  155 + public ModelAndView exportXls(HttpServletRequest request, TblBiddingShiji tblBiddingShiji) {
  156 + return super.exportXls(request, tblBiddingShiji, TblBiddingShiji.class, "tbl_bidding_shiji");
  157 + }
  158 +
  159 + /**
  160 + * 通过excel导入数据
  161 + *
  162 + * @param request
  163 + * @param response
  164 + * @return
  165 + */
  166 + @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
  167 + public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
  168 + return super.importExcel(request, response, TblBiddingShiji.class);
  169 + }
  170 +
  171 +}
@@ -51,11 +51,33 @@ public class TblBiddingShenq implements Serializable { @@ -51,11 +51,33 @@ public class TblBiddingShenq implements Serializable {
51 @Excel(name = "单位", width = 15) 51 @Excel(name = "单位", width = 15)
52 @ApiModelProperty(value = "单位") 52 @ApiModelProperty(value = "单位")
53 private String danwei; 53 private String danwei;
54 - /**到货日期*/  
55 - @Excel(name = "到货日期", width = 15) 54 + /**物料类别*/
  55 + @Excel(name = "物料类别", width = 15)
  56 + @ApiModelProperty(value = "物料类别")
  57 + private String wuType;
  58 + /**工作令*/
  59 + @Excel(name = "工作令", width = 15)
  60 + @ApiModelProperty(value = "工作令")
  61 + private String workOrder;
  62 + /**用途*/
  63 + @Excel(name = "用途", width = 15)
  64 + @ApiModelProperty(value = "用途")
  65 + private String purpose;
  66 + /**当前库存*/
  67 + @Excel(name = "当前库存", width = 15)
  68 + @ApiModelProperty(value = "当前库存")
  69 + private String ku;
  70 + /**申请日期*/
  71 + @Excel(name = "申请日期", width = 15)
56 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") 72 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
57 @DateTimeFormat(pattern="yyyy-MM-dd") 73 @DateTimeFormat(pattern="yyyy-MM-dd")
58 - @ApiModelProperty(value = "到货日期") 74 + @ApiModelProperty(value = "申请日期")
  75 + private Date sqTime;
  76 + /**使用日期*/
  77 + @Excel(name = "使用日期", width = 15)
  78 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
  79 + @DateTimeFormat(pattern="yyyy-MM-dd")
  80 + @ApiModelProperty(value = "使用日期")
59 private Date deliveryTime; 81 private Date deliveryTime;
60 /**品牌*/ 82 /**品牌*/
61 @Excel(name = "品牌", width = 15) 83 @Excel(name = "品牌", width = 15)
  1 +package org.jeecg.modules.erp.bidding_info.entity;
  2 +
  3 +import java.io.Serializable;
  4 +import java.io.UnsupportedEncodingException;
  5 +import java.util.Date;
  6 +import java.math.BigDecimal;
  7 +import com.baomidou.mybatisplus.annotation.IdType;
  8 +import com.baomidou.mybatisplus.annotation.TableId;
  9 +import com.baomidou.mybatisplus.annotation.TableName;
  10 +import lombok.Data;
  11 +import com.fasterxml.jackson.annotation.JsonFormat;
  12 +import org.springframework.format.annotation.DateTimeFormat;
  13 +import org.jeecgframework.poi.excel.annotation.Excel;
  14 +import org.jeecg.common.aspect.annotation.Dict;
  15 +import io.swagger.annotations.ApiModel;
  16 +import io.swagger.annotations.ApiModelProperty;
  17 +import lombok.EqualsAndHashCode;
  18 +import lombok.experimental.Accessors;
  19 +
  20 +/**
  21 + * @Description: tbl_bidding_shiji
  22 + * @Author: jeecg-boot
  23 + * @Date: 2024-04-26
  24 + * @Version: V1.0
  25 + */
  26 +@Data
  27 +@TableName("tbl_bidding_shiji")
  28 +@Accessors(chain = true)
  29 +@EqualsAndHashCode(callSuper = false)
  30 +@ApiModel(value="tbl_bidding_shiji对象", description="tbl_bidding_shiji")
  31 +public class TblBiddingShiji implements Serializable {
  32 + private static final long serialVersionUID = 1L;
  33 +
  34 + /**id*/
  35 + @TableId(type = IdType.ASSIGN_ID)
  36 + @ApiModelProperty(value = "id")
  37 + private Integer id;
  38 + /**品名*/
  39 + @Excel(name = "品名", width = 15)
  40 + @ApiModelProperty(value = "品名")
  41 + private String productName;
  42 + /**规格*/
  43 + @Excel(name = "规格", width = 15)
  44 + @ApiModelProperty(value = "规格")
  45 + private String specifications;
  46 + /**数量*/
  47 + @Excel(name = "数量", width = 15)
  48 + @ApiModelProperty(value = "数量")
  49 + private Integer num;
  50 + /**单位*/
  51 + @Excel(name = "单位", width = 15)
  52 + @ApiModelProperty(value = "单位")
  53 + private String danwei;
  54 + /**物料类别*/
  55 + @Excel(name = "物料类别", width = 15)
  56 + @ApiModelProperty(value = "物料类别")
  57 + private String wuType;
  58 + /**单价*/
  59 + @Excel(name = "单价", width = 15)
  60 + @ApiModelProperty(value = "单价")
  61 + private BigDecimal danPrice;
  62 + /**总价*/
  63 + @Excel(name = "总价", width = 15)
  64 + @ApiModelProperty(value = "总价")
  65 + private BigDecimal zongPrice;
  66 + /**用途*/
  67 + @Excel(name = "用途", width = 15)
  68 + @ApiModelProperty(value = "用途")
  69 + private String purpose;
  70 + /**厂商*/
  71 + @Excel(name = "厂商", width = 15)
  72 + @ApiModelProperty(value = "厂商")
  73 + private String chang;
  74 + /**购买日期*/
  75 + @Excel(name = "购买日期", width = 15, format = "yyyy-MM-dd")
  76 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
  77 + @DateTimeFormat(pattern="yyyy-MM-dd")
  78 + @ApiModelProperty(value = "购买日期")
  79 + private Date buyTime;
  80 + /**到货日期*/
  81 + @Excel(name = "到货日期", width = 15, format = "yyyy-MM-dd")
  82 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
  83 + @DateTimeFormat(pattern="yyyy-MM-dd")
  84 + @ApiModelProperty(value = "到货日期")
  85 + private Date deliveryTime;
  86 + /**品牌*/
  87 + @Excel(name = "品牌", width = 15)
  88 + @ApiModelProperty(value = "品牌")
  89 + private String brand;
  90 + /**备注*/
  91 + @Excel(name = "备注", width = 15)
  92 + @ApiModelProperty(value = "备注")
  93 + private String notes;
  94 + /**发票类别*/
  95 + @Excel(name = "发票类别", width = 15)
  96 + @ApiModelProperty(value = "发票类别")
  97 + private String fpType;
  98 + /**发票到否*/
  99 + @Excel(name = "发票到否", width = 15)
  100 + @ApiModelProperty(value = "发票到否")
  101 + private String fpIsyn;
  102 + /**发票收到信息*/
  103 + @Excel(name = "发票收到信息", width = 15, format = "yyyy-MM-dd")
  104 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
  105 + @DateTimeFormat(pattern="yyyy-MM-dd")
  106 + @ApiModelProperty(value = "发票收到日期")
  107 + private Date fpTime;
  108 + /**物品图片*/
  109 + @Excel(name = "物品图片", width = 15)
  110 + @ApiModelProperty(value = "物品图片")
  111 + private String picture;
  112 + /**创建人*/
  113 + @ApiModelProperty(value = "创建人")
  114 + private String createBy;
  115 + /**创建日期*/
  116 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
  117 + @DateTimeFormat(pattern="yyyy-MM-dd")
  118 + @ApiModelProperty(value = "创建日期")
  119 + private Date createTime;
  120 + /**更新人*/
  121 + @ApiModelProperty(value = "更新人")
  122 + private String updateBy;
  123 + /**更新日期*/
  124 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
  125 + @DateTimeFormat(pattern="yyyy-MM-dd")
  126 + @ApiModelProperty(value = "更新日期")
  127 + private Date updateTime;
  128 +}
  1 +package org.jeecg.modules.erp.bidding_info.mapper;
  2 +
  3 +import java.util.List;
  4 +
  5 +import org.apache.ibatis.annotations.Param;
  6 +import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShiji;
  7 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  8 +
  9 +/**
  10 + * @Description: tbl_bidding_shiji
  11 + * @Author: jeecg-boot
  12 + * @Date: 2024-04-26
  13 + * @Version: V1.0
  14 + */
  15 +public interface TblBiddingShijiMapper extends BaseMapper<TblBiddingShiji> {
  16 +
  17 +}
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="org.jeecg.modules.erp.bidding_info.mapper.TblBiddingShijiMapper">
  4 +
  5 +</mapper>
  1 +package org.jeecg.modules.erp.bidding_info.service;
  2 +
  3 +import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShiji;
  4 +import com.baomidou.mybatisplus.extension.service.IService;
  5 +
  6 +/**
  7 + * @Description: tbl_bidding_shiji
  8 + * @Author: jeecg-boot
  9 + * @Date: 2024-04-26
  10 + * @Version: V1.0
  11 + */
  12 +public interface ITblBiddingShijiService extends IService<TblBiddingShiji> {
  13 +
  14 +}
  1 +package org.jeecg.modules.erp.bidding_info.service.impl;
  2 +
  3 +import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShiji;
  4 +import org.jeecg.modules.erp.bidding_info.mapper.TblBiddingShijiMapper;
  5 +import org.jeecg.modules.erp.bidding_info.service.ITblBiddingShijiService;
  6 +import org.springframework.stereotype.Service;
  7 +
  8 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  9 +
  10 +/**
  11 + * @Description: tbl_bidding_shiji
  12 + * @Author: jeecg-boot
  13 + * @Date: 2024-04-26
  14 + * @Version: V1.0
  15 + */
  16 +@Service
  17 +public class TblBiddingShijiServiceImpl extends ServiceImpl<TblBiddingShijiMapper, TblBiddingShiji> implements ITblBiddingShijiService {
  18 +
  19 +}
@@ -9,10 +9,15 @@ import java.io.UnsupportedEncodingException; @@ -9,10 +9,15 @@ import java.io.UnsupportedEncodingException;
9 import java.net.URLDecoder; 9 import java.net.URLDecoder;
10 import javax.servlet.http.HttpServletRequest; 10 import javax.servlet.http.HttpServletRequest;
11 import javax.servlet.http.HttpServletResponse; 11 import javax.servlet.http.HttpServletResponse;
  12 +
  13 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
12 import org.jeecg.common.api.vo.Result; 14 import org.jeecg.common.api.vo.Result;
13 import org.jeecg.common.system.query.QueryGenerator; 15 import org.jeecg.common.system.query.QueryGenerator;
14 import org.jeecg.common.util.oConvertUtils; 16 import org.jeecg.common.util.oConvertUtils;
  17 +import org.jeecg.modules.erp.meterial.entity.TblMaterial;
  18 +import org.jeecg.modules.erp.trad.entity.TblTradBase;
15 import org.jeecg.modules.erp.trad.entity.TblTradContract; 19 import org.jeecg.modules.erp.trad.entity.TblTradContract;
  20 +import org.jeecg.modules.erp.trad.service.TblTradBaseService;
16 import org.jeecg.modules.erp.trad.service.TblTradContractService; 21 import org.jeecg.modules.erp.trad.service.TblTradContractService;
17 22
18 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 23 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -50,6 +55,9 @@ import org.jeecg.common.aspect.annotation.AutoLog; @@ -50,6 +55,9 @@ import org.jeecg.common.aspect.annotation.AutoLog;
50 public class TblTradContractController extends JeecgController<TblTradContract, TblTradContractService> { 55 public class TblTradContractController extends JeecgController<TblTradContract, TblTradContractService> {
51 @Autowired 56 @Autowired
52 private TblTradContractService tblTradContractService; 57 private TblTradContractService tblTradContractService;
  58 +
  59 + @Autowired
  60 + private TblTradBaseService tblTradBaseService;
53 61
54 /** 62 /**
55 * 分页列表查询 63 * 分页列表查询
@@ -146,6 +154,38 @@ public class TblTradContractController extends JeecgController<TblTradContract, @@ -146,6 +154,38 @@ public class TblTradContractController extends JeecgController<TblTradContract,
146 return Result.OK(tblTradContract); 154 return Result.OK(tblTradContract);
147 } 155 }
148 156
  157 + /**
  158 + * 查基本信息表是否有这个数据存在
  159 + *
  160 + * @param tenderNumber
  161 + * @return
  162 + */
  163 + @GetMapping(value = "/queryBy")
  164 + public Result<TblTradBase> queryBaseByPartNum(@RequestParam(name = "tenderNumber", required = true) String tenderNumber,
  165 + @RequestParam(name = "partNumber", required = true) String partNumber) {
  166 +
  167 + LambdaQueryWrapper<TblTradBase> queryWrapper = new LambdaQueryWrapper<TblTradBase>()
  168 + .eq(TblTradBase::getTenderNumber,tenderNumber).eq(TblTradBase::getPartNumber,partNumber);
  169 + TblTradBase tblTradBase = tblTradBaseService.getOne(queryWrapper);
  170 + return Result.ok(tblTradBase);
  171 + }
  172 +
  173 + /**
  174 + * 查是否有这个数据存在
  175 + *
  176 + * @param tenderNumber
  177 + * @return
  178 + */
  179 + @GetMapping(value = "/queryhetongBy")
  180 + public Result<TblTradContract> queryContractByPartNum(@RequestParam(name = "tenderNumber", required = true) String tenderNumber,
  181 + @RequestParam(name = "partNumber", required = true) String partNumber) {
  182 +
  183 + LambdaQueryWrapper<TblTradContract> queryWrapper = new LambdaQueryWrapper<TblTradContract>()
  184 + .eq(TblTradContract::getTenderNumber,tenderNumber).eq(TblTradContract::getPartNumber,partNumber);
  185 + TblTradContract tblTradContract = tblTradContractService.getOne(queryWrapper);
  186 + return Result.ok(tblTradContract);
  187 + }
  188 +
149 /** 189 /**
150 * 导出excel 190 * 导出excel
151 * 191 *
@@ -9,10 +9,15 @@ import java.io.UnsupportedEncodingException; @@ -9,10 +9,15 @@ import java.io.UnsupportedEncodingException;
9 import java.net.URLDecoder; 9 import java.net.URLDecoder;
10 import javax.servlet.http.HttpServletRequest; 10 import javax.servlet.http.HttpServletRequest;
11 import javax.servlet.http.HttpServletResponse; 11 import javax.servlet.http.HttpServletResponse;
  12 +
  13 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
12 import org.jeecg.common.api.vo.Result; 14 import org.jeecg.common.api.vo.Result;
13 import org.jeecg.common.system.query.QueryGenerator; 15 import org.jeecg.common.system.query.QueryGenerator;
14 import org.jeecg.common.util.oConvertUtils; 16 import org.jeecg.common.util.oConvertUtils;
  17 +import org.jeecg.modules.erp.trad.entity.TblTradBase;
  18 +import org.jeecg.modules.erp.trad.entity.TblTradContract;
15 import org.jeecg.modules.erp.trad.entity.TblTradFphk; 19 import org.jeecg.modules.erp.trad.entity.TblTradFphk;
  20 +import org.jeecg.modules.erp.trad.service.TblTradBaseService;
16 import org.jeecg.modules.erp.trad.service.TblTradFphkService; 21 import org.jeecg.modules.erp.trad.service.TblTradFphkService;
17 22
18 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 23 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -50,7 +55,8 @@ import org.jeecg.common.aspect.annotation.AutoLog; @@ -50,7 +55,8 @@ import org.jeecg.common.aspect.annotation.AutoLog;
50 public class TblTradFphkController extends JeecgController<TblTradFphk, TblTradFphkService> { 55 public class TblTradFphkController extends JeecgController<TblTradFphk, TblTradFphkService> {
51 @Autowired 56 @Autowired
52 private TblTradFphkService tblTradFphkService; 57 private TblTradFphkService tblTradFphkService;
53 - 58 + @Autowired
  59 + private TblTradBaseService tblTradBaseService;
54 /** 60 /**
55 * 分页列表查询 61 * 分页列表查询
56 * 62 *
@@ -146,6 +152,38 @@ public class TblTradFphkController extends JeecgController<TblTradFphk, TblTradF @@ -146,6 +152,38 @@ public class TblTradFphkController extends JeecgController<TblTradFphk, TblTradF
146 return Result.OK(tblTradFphk); 152 return Result.OK(tblTradFphk);
147 } 153 }
148 154
  155 + /**
  156 + * 查基本信息表是否有这个数据存在
  157 + *
  158 + * @param tenderNumber
  159 + * @return
  160 + */
  161 + @GetMapping(value = "/queryBy")
  162 + public Result<TblTradBase> queryBaseByPartNum(@RequestParam(name = "tenderNumber", required = true) String tenderNumber,
  163 + @RequestParam(name = "partNumber", required = true) String partNumber) {
  164 +
  165 + LambdaQueryWrapper<TblTradBase> queryWrapper = new LambdaQueryWrapper<TblTradBase>()
  166 + .eq(TblTradBase::getTenderNumber,tenderNumber).eq(TblTradBase::getPartNumber,partNumber);
  167 + TblTradBase tblTradBase = tblTradBaseService.getOne(queryWrapper);
  168 + return Result.ok(tblTradBase);
  169 + }
  170 +
  171 + /**
  172 + * 查是否有这个数据存在
  173 + *
  174 + * @param tenderNumber
  175 + * @return
  176 + */
  177 + @GetMapping(value = "/queryfphkBy")
  178 + public Result<TblTradFphk> queryFphkByPartNum(@RequestParam(name = "tenderNumber", required = true) String tenderNumber,
  179 + @RequestParam(name = "partNumber", required = true) String partNumber) {
  180 +
  181 + LambdaQueryWrapper<TblTradFphk> queryWrapper = new LambdaQueryWrapper<TblTradFphk>()
  182 + .eq(TblTradFphk::getTenderNumber,tenderNumber).eq(TblTradFphk::getPartNumber,partNumber);
  183 + TblTradFphk tblTradFphk = tblTradFphkService.getOne(queryWrapper);
  184 + return Result.ok(tblTradFphk);
  185 + }
  186 +
149 /** 187 /**
150 * 导出excel 188 * 导出excel
151 * 189 *
@@ -3,9 +3,14 @@ package org.jeecg.modules.erp.trad.controller; @@ -3,9 +3,14 @@ package org.jeecg.modules.erp.trad.controller;
3 import java.util.Arrays; 3 import java.util.Arrays;
4 import javax.servlet.http.HttpServletRequest; 4 import javax.servlet.http.HttpServletRequest;
5 import javax.servlet.http.HttpServletResponse; 5 import javax.servlet.http.HttpServletResponse;
  6 +
  7 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
6 import org.jeecg.common.api.vo.Result; 8 import org.jeecg.common.api.vo.Result;
7 import org.jeecg.common.system.query.QueryGenerator; 9 import org.jeecg.common.system.query.QueryGenerator;
  10 +import org.jeecg.modules.erp.trad.entity.TblTradBase;
  11 +import org.jeecg.modules.erp.trad.entity.TblTradFphk;
8 import org.jeecg.modules.erp.trad.entity.TblTradInquiry; 12 import org.jeecg.modules.erp.trad.entity.TblTradInquiry;
  13 +import org.jeecg.modules.erp.trad.service.TblTradBaseService;
9 import org.jeecg.modules.erp.trad.service.TblTradInquiryService; 14 import org.jeecg.modules.erp.trad.service.TblTradInquiryService;
10 15
11 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 16 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -34,6 +39,8 @@ import org.jeecg.common.aspect.annotation.AutoLog; @@ -34,6 +39,8 @@ import org.jeecg.common.aspect.annotation.AutoLog;
34 public class TblTradInquiryController extends JeecgController<TblTradInquiry, TblTradInquiryService> { 39 public class TblTradInquiryController extends JeecgController<TblTradInquiry, TblTradInquiryService> {
35 @Autowired 40 @Autowired
36 private TblTradInquiryService tblTradInquiryService; 41 private TblTradInquiryService tblTradInquiryService;
  42 + @Autowired
  43 + private TblTradBaseService tblTradBaseService;
37 44
38 /** 45 /**
39 * 分页列表查询 46 * 分页列表查询
@@ -129,6 +136,22 @@ public class TblTradInquiryController extends JeecgController<TblTradInquiry, Tb @@ -129,6 +136,22 @@ public class TblTradInquiryController extends JeecgController<TblTradInquiry, Tb
129 } 136 }
130 return Result.OK(tblTradInquiry); 137 return Result.OK(tblTradInquiry);
131 } 138 }
  139 + /**
  140 + * 查基本信息表是否有这个数据存在
  141 + *
  142 + * @param tenderNumber
  143 + * @return
  144 + */
  145 + @GetMapping(value = "/queryBy")
  146 + public Result<TblTradBase> queryBaseByPartNum(@RequestParam(name = "tenderNumber", required = true) String tenderNumber,
  147 + @RequestParam(name = "partNumber", required = true) String partNumber) {
  148 +
  149 + LambdaQueryWrapper<TblTradBase> queryWrapper = new LambdaQueryWrapper<TblTradBase>()
  150 + .eq(TblTradBase::getTenderNumber,tenderNumber).eq(TblTradBase::getPartNumber,partNumber);
  151 + TblTradBase tblTradBase = tblTradBaseService.getOne(queryWrapper);
  152 + return Result.ok(tblTradBase);
  153 + }
  154 +
132 155
133 /** 156 /**
134 * 导出excel 157 * 导出excel
@@ -9,10 +9,15 @@ import java.io.UnsupportedEncodingException; @@ -9,10 +9,15 @@ import java.io.UnsupportedEncodingException;
9 import java.net.URLDecoder; 9 import java.net.URLDecoder;
10 import javax.servlet.http.HttpServletRequest; 10 import javax.servlet.http.HttpServletRequest;
11 import javax.servlet.http.HttpServletResponse; 11 import javax.servlet.http.HttpServletResponse;
  12 +
  13 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
12 import org.jeecg.common.api.vo.Result; 14 import org.jeecg.common.api.vo.Result;
13 import org.jeecg.common.system.query.QueryGenerator; 15 import org.jeecg.common.system.query.QueryGenerator;
14 import org.jeecg.common.util.oConvertUtils; 16 import org.jeecg.common.util.oConvertUtils;
  17 +import org.jeecg.modules.erp.trad.entity.TblTradBase;
  18 +import org.jeecg.modules.erp.trad.entity.TblTradFphk;
15 import org.jeecg.modules.erp.trad.entity.TblTradTender; 19 import org.jeecg.modules.erp.trad.entity.TblTradTender;
  20 +import org.jeecg.modules.erp.trad.service.TblTradBaseService;
16 import org.jeecg.modules.erp.trad.service.TblTradTenderService; 21 import org.jeecg.modules.erp.trad.service.TblTradTenderService;
17 22
18 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 23 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -50,6 +55,9 @@ import org.jeecg.common.aspect.annotation.AutoLog; @@ -50,6 +55,9 @@ import org.jeecg.common.aspect.annotation.AutoLog;
50 public class TblTradTenderController extends JeecgController<TblTradTender, TblTradTenderService> { 55 public class TblTradTenderController extends JeecgController<TblTradTender, TblTradTenderService> {
51 @Autowired 56 @Autowired
52 private TblTradTenderService tblTradTenderService; 57 private TblTradTenderService tblTradTenderService;
  58 +
  59 + @Autowired
  60 + private TblTradBaseService tblTradBaseService;
53 61
54 /** 62 /**
55 * 分页列表查询 63 * 分页列表查询
@@ -146,6 +154,38 @@ public class TblTradTenderController extends JeecgController<TblTradTender, TblT @@ -146,6 +154,38 @@ public class TblTradTenderController extends JeecgController<TblTradTender, TblT
146 return Result.OK(tblTradTender); 154 return Result.OK(tblTradTender);
147 } 155 }
148 156
  157 + /**
  158 + * 查基本信息表是否有这个数据存在
  159 + *
  160 + * @param tenderNumber
  161 + * @return
  162 + */
  163 + @GetMapping(value = "/queryBy")
  164 + public Result<TblTradBase> queryBaseByPartNum(@RequestParam(name = "tenderNumber", required = true) String tenderNumber,
  165 + @RequestParam(name = "partNumber", required = true) String partNumber) {
  166 +
  167 + LambdaQueryWrapper<TblTradBase> queryWrapper = new LambdaQueryWrapper<TblTradBase>()
  168 + .eq(TblTradBase::getTenderNumber,tenderNumber).eq(TblTradBase::getPartNumber,partNumber);
  169 + TblTradBase tblTradBase = tblTradBaseService.getOne(queryWrapper);
  170 + return Result.ok(tblTradBase);
  171 + }
  172 +
  173 + /**
  174 + * 查是否有这个数据存在
  175 + *
  176 + * @param tenderNumber
  177 + * @return
  178 + */
  179 + @GetMapping(value = "/querytenderBy")
  180 + public Result<TblTradTender> queryTenderByPartNum(@RequestParam(name = "tenderNumber", required = true) String tenderNumber,
  181 + @RequestParam(name = "partNumber", required = true) String partNumber) {
  182 +
  183 + LambdaQueryWrapper<TblTradTender> queryWrapper = new LambdaQueryWrapper<TblTradTender>()
  184 + .eq(TblTradTender::getTenderNumber,tenderNumber).eq(TblTradTender::getPartNumber,partNumber);
  185 + TblTradTender tblTradTender = tblTradTenderService.getOne(queryWrapper);
  186 + return Result.ok(tblTradTender);
  187 + }
  188 +
149 /** 189 /**
150 * 导出excel 190 * 导出excel
151 * 191 *
@@ -9,10 +9,15 @@ import java.io.UnsupportedEncodingException; @@ -9,10 +9,15 @@ import java.io.UnsupportedEncodingException;
9 import java.net.URLDecoder; 9 import java.net.URLDecoder;
10 import javax.servlet.http.HttpServletRequest; 10 import javax.servlet.http.HttpServletRequest;
11 import javax.servlet.http.HttpServletResponse; 11 import javax.servlet.http.HttpServletResponse;
  12 +
  13 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
12 import org.jeecg.common.api.vo.Result; 14 import org.jeecg.common.api.vo.Result;
13 import org.jeecg.common.system.query.QueryGenerator; 15 import org.jeecg.common.system.query.QueryGenerator;
14 import org.jeecg.common.util.oConvertUtils; 16 import org.jeecg.common.util.oConvertUtils;
  17 +import org.jeecg.modules.erp.trad.entity.TblTradBase;
  18 +import org.jeecg.modules.erp.trad.entity.TblTradContract;
15 import org.jeecg.modules.erp.trad.entity.TblTradTou; 19 import org.jeecg.modules.erp.trad.entity.TblTradTou;
  20 +import org.jeecg.modules.erp.trad.service.TblTradBaseService;
16 import org.jeecg.modules.erp.trad.service.TblTradTouService; 21 import org.jeecg.modules.erp.trad.service.TblTradTouService;
17 22
18 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 23 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -50,7 +55,8 @@ import org.jeecg.common.aspect.annotation.AutoLog; @@ -50,7 +55,8 @@ import org.jeecg.common.aspect.annotation.AutoLog;
50 public class TblTradTouController extends JeecgController<TblTradTou, TblTradTouService> { 55 public class TblTradTouController extends JeecgController<TblTradTou, TblTradTouService> {
51 @Autowired 56 @Autowired
52 private TblTradTouService tblTradTouService; 57 private TblTradTouService tblTradTouService;
53 - 58 + @Autowired
  59 + private TblTradBaseService tblTradBaseService;
54 /** 60 /**
55 * 分页列表查询 61 * 分页列表查询
56 * 62 *
@@ -146,6 +152,37 @@ public class TblTradTouController extends JeecgController<TblTradTou, TblTradTou @@ -146,6 +152,37 @@ public class TblTradTouController extends JeecgController<TblTradTou, TblTradTou
146 return Result.OK(tblTradTou); 152 return Result.OK(tblTradTou);
147 } 153 }
148 154
  155 + /**
  156 + * 查基本信息表是否有这个数据存在
  157 + *
  158 + * @param tenderNumber
  159 + * @return
  160 + */
  161 + @GetMapping(value = "/queryBy")
  162 + public Result<TblTradBase> queryBaseByPartNum(@RequestParam(name = "tenderNumber", required = true) String tenderNumber,
  163 + @RequestParam(name = "partNumber", required = true) String partNumber) {
  164 +
  165 + LambdaQueryWrapper<TblTradBase> queryWrapper = new LambdaQueryWrapper<TblTradBase>()
  166 + .eq(TblTradBase::getTenderNumber,tenderNumber).eq(TblTradBase::getPartNumber,partNumber);
  167 + TblTradBase tblTradBase = tblTradBaseService.getOne(queryWrapper);
  168 + return Result.ok(tblTradBase);
  169 + }
  170 +
  171 + /**
  172 + * 查是否有这个数据存在
  173 + *
  174 + * @param tenderNumber
  175 + * @return
  176 + */
  177 + @GetMapping(value = "/querytouBy")
  178 + public Result<TblTradTou> queryTouByPartNum(@RequestParam(name = "tenderNumber", required = true) String tenderNumber,
  179 + @RequestParam(name = "partNumber", required = true) String partNumber) {
  180 +
  181 + LambdaQueryWrapper<TblTradTou> queryWrapper = new LambdaQueryWrapper<TblTradTou>()
  182 + .eq(TblTradTou::getTenderNumber,tenderNumber).eq(TblTradTou::getPartNumber,partNumber);
  183 + TblTradTou tblTradTou = tblTradTouService.getOne(queryWrapper);
  184 + return Result.ok(tblTradTou);
  185 + }
149 /** 186 /**
150 * 导出excel 187 * 导出excel
151 * 188 *
@@ -67,6 +67,14 @@ public class TblTradBase implements Serializable { @@ -67,6 +67,14 @@ public class TblTradBase implements Serializable {
67 @Excel(name = "申请数量", width = 15) 67 @Excel(name = "申请数量", width = 15)
68 @ApiModelProperty(value = "申请数量") 68 @ApiModelProperty(value = "申请数量")
69 private java.math.BigDecimal num; 69 private java.math.BigDecimal num;
  70 + /**含税运单价*/
  71 + @Excel(name = "含税运单价", width = 15)
  72 + @ApiModelProperty(value = "含税运单价")
  73 + private java.math.BigDecimal baseShuiprice;
  74 + /**中标单价*/
  75 + @Excel(name = "中标单价", width = 15)
  76 + @ApiModelProperty(value = "中标单价")
  77 + private java.math.BigDecimal baseZhong;
70 /**计量单位*/ 78 /**计量单位*/
71 @Excel(name = "计量单位", width = 15) 79 @Excel(name = "计量单位", width = 15)
72 @ApiModelProperty(value = "计量单位") 80 @ApiModelProperty(value = "计量单位")
@@ -39,30 +39,10 @@ public class TblTradInquiry implements Serializable { @@ -39,30 +39,10 @@ public class TblTradInquiry implements Serializable {
39 @Excel(name = "招标号", width = 15) 39 @Excel(name = "招标号", width = 15)
40 @ApiModelProperty(value = "招标号") 40 @ApiModelProperty(value = "招标号")
41 private java.lang.String tenderNumber; 41 private java.lang.String tenderNumber;
42 - /**客户*/  
43 - @Excel(name = "客户", width = 15)  
44 - @ApiModelProperty(value = "客户")  
45 - private java.lang.String customer;  
46 - /**客户采购*/  
47 - @Excel(name = "客户采购", width = 15)  
48 - @ApiModelProperty(value = "客户采购")  
49 - private java.lang.String procurement;  
50 /**客户料号*/ 42 /**客户料号*/
51 @Excel(name = "客户料号", width = 15) 43 @Excel(name = "客户料号", width = 15)
52 @ApiModelProperty(value = "客户料号") 44 @ApiModelProperty(value = "客户料号")
53 private java.lang.String partNumber; 45 private java.lang.String partNumber;
54 - /**物料描述*/  
55 - @Excel(name = "物料描述", width = 15)  
56 - @ApiModelProperty(value = "物料描述")  
57 - private java.lang.String description;  
58 - /**品名*/  
59 - @Excel(name = "品名", width = 15)  
60 - @ApiModelProperty(value = "品名")  
61 - private java.lang.String productname;  
62 - /**规格*/  
63 - @Excel(name = "规格", width = 15)  
64 - @ApiModelProperty(value = "规格")  
65 - private java.lang.String specifications;  
66 /**厂商*/ 46 /**厂商*/
67 @Excel(name = "厂商", width = 15) 47 @Excel(name = "厂商", width = 15)
68 @ApiModelProperty(value = "厂商") 48 @ApiModelProperty(value = "厂商")
@@ -67,6 +67,14 @@ public class TblTradZong implements Serializable { @@ -67,6 +67,14 @@ public class TblTradZong implements Serializable {
67 @Excel(name = "申请数量", width = 15) 67 @Excel(name = "申请数量", width = 15)
68 @ApiModelProperty(value = "申请数量") 68 @ApiModelProperty(value = "申请数量")
69 private BigDecimal num; 69 private BigDecimal num;
  70 + /**含税运单价*/
  71 + @Excel(name = "含税运单价", width = 15)
  72 + @ApiModelProperty(value = "含税运单价")
  73 + private java.math.BigDecimal baseShuiprice;
  74 + /**中标单价*/
  75 + @Excel(name = "中标单价", width = 15)
  76 + @ApiModelProperty(value = "中标单价")
  77 + private java.math.BigDecimal baseZhong;
70 /**计量单位*/ 78 /**计量单位*/
71 @Excel(name = "计量单位", width = 15) 79 @Excel(name = "计量单位", width = 15)
72 @ApiModelProperty(value = "计量单位") 80 @ApiModelProperty(value = "计量单位")
@@ -16,6 +16,8 @@ @@ -16,6 +16,8 @@
16 productname, 16 productname,
17 specifications, 17 specifications,
18 num, 18 num,
  19 + base_shuiprice,
  20 + base_zhong,
19 danwei, 21 danwei,
20 company, 22 company,
21 jiaohuo_time, 23 jiaohuo_time,
@@ -72,6 +74,8 @@ @@ -72,6 +74,8 @@
72 base.productname, 74 base.productname,
73 base.specifications, 75 base.specifications,
74 base.num, 76 base.num,
  77 + base.base_shuiprice,
  78 + base.base_zhong,
75 base.danwei, 79 base.danwei,
76 base.company, 80 base.company,
77 base.delivery_time, 81 base.delivery_time,
@@ -136,9 +136,9 @@ spring: @@ -136,9 +136,9 @@ spring:
136 connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 136 connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
137 datasource: 137 datasource:
138 master: 138 master:
139 - 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  
140 - username: ntsd_root  
141 - password: L3bHRJwg6lJ2SC4WFfGA 139 + url: jdbc:mysql://localhost:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
  140 + username: root
  141 + password: root
142 driver-class-name: com.mysql.cj.jdbc.Driver 142 driver-class-name: com.mysql.cj.jdbc.Driver
143 # 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 143 # 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
144 # username: ntsd_root 144 # username: ntsd_root
@@ -153,7 +153,7 @@ spring: @@ -153,7 +153,7 @@ spring:
153 #redis 配置 153 #redis 配置
154 redis: 154 redis:
155 database: 0 155 database: 0
156 - host: 172.18.0.4 156 + host: 127.0.0.1
157 lettuce: 157 lettuce:
158 pool: 158 pool:
159 max-active: 8 #最大连接数据库连接数,设 -1 为没有限制 159 max-active: 8 #最大连接数据库连接数,设 -1 为没有限制
@@ -264,7 +264,7 @@ jeecg: @@ -264,7 +264,7 @@ jeecg:
264 data-type: database 264 data-type: database
265 #分布式锁配置 265 #分布式锁配置
266 redisson: 266 redisson:
267 - address: 172.18.0.4:6379 267 + address: 127.0.0.1:6379
268 password: 268 password:
269 type: STANDALONE 269 type: STANDALONE
270 enabled: true 270 enabled: true