From 8d08138524f289204c2b365655a281f1c0f8bc55 Mon Sep 17 00:00:00 2001 From: fkf <1475794025@qq.com> Date: Thu, 10 Aug 2023 17:23:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=95=B0=E6=8D=AE=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/biz/prodstock/ProdStock.java | 32 +++++++++---------- .../report/biz/prodstock/ProdStockVo.java | 30 ++++++++++------- .../biz/projectdaily/ProjectDailyMapper.java | 4 --- .../biz/projectdaily/ProjectDailyService.java | 12 +++---- 4 files changed, 38 insertions(+), 40 deletions(-) diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/prodstock/ProdStock.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/prodstock/ProdStock.java index 6970dd88..af9622df 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/prodstock/ProdStock.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/prodstock/ProdStock.java @@ -12,23 +12,23 @@ import lombok.Data; public class ProdStock { private Integer id; private String sid; - private String proName;// varchar 50 质物名称 - private String proSid;//质物sid - private String proModel;// varchar 50 规格（型号） + private String pro_name;// varchar 50 质物名称 + private String pro_sid;//质物sid + private String pro_model;// varchar 50 规格（型号） private String manufacturer;// varchar 50 生成厂家（产地） private String num;// varchar 10 数量 private String weight;// varchar 50 重量 - private String confirmedPrice;// decime 50 2 质权人确认的单价 - private String calculatedValue;// decime 50 2 核算的价值 - private String locationNumber;// varchar 10 货位号 - private String custerName;// varchar 50 客户名称（企业） - private String proUnit;// varchar 50 规格单位 - private String custerSid;// varchar 64 客户Sid（企业） - private String storeHouseSid;// varchar 64 仓库Sid - private String storeHouseName;// varchar 100 仓库名称 - private String brandInfoName;//品牌名称 - private String brandInfoKey;//品牌名称 - private String productTypeName;//分类名称 - private String productTypeKey;//分类key - private String locationId;//货位号id + private String confirmed_price;// decime 50 2 质权人确认的单价 + private String calculated_value;// decime 50 2 核算的价值 + private String location_number;// varchar 10 货位号 + private String custer_name;// varchar 50 客户名称（企业） + private String pro_unit;// varchar 50 规格单位 + private String custer_sid;// varchar 64 客户Sid（企业） + private String store_house_sid;// varchar 64 仓库Sid + private String store_house_name;// varchar 100 仓库名称 + private String brand_info_name;//品牌名称 + private String brand_info_key;//品牌名称 + private String product_type_name;//分类名称 + private String product_type_key;//分类key + private String location_id;//货位号id } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/prodstock/ProdStockVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/prodstock/ProdStockVo.java index 779fd2f3..5c4e6ed2 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/prodstock/ProdStockVo.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/prodstock/ProdStockVo.java @@ -9,19 +9,25 @@ import lombok.Data; */ @Data public class ProdStockVo implements Vo { - private String proName;// varchar 50 质物名称 - private String proSid;//质物sid - private String proModel;// varchar 50 规格（型号） + private Integer id; + private String sid; + private String pro_name;// varchar 50 质物名称 + private String pro_sid;//质物sid + private String pro_model;// varchar 50 规格（型号） private String manufacturer;// varchar 50 生成厂家（产地） private String num;// varchar 10 数量 private String weight;// varchar 50 重量 - private String confirmedPrice;// decime 50 2 质权人确认的单价 - private String calculatedValue;// decime 50 2 核算的价值 - private String locationNumber;// varchar 10 货位号 - private String custerName;// varchar 50 客户名称（企业） - private String proUnit;// varchar 50 规格单位 - private String custerSid;// varchar 64 客户Sid（企业） - private String storeHouseSid;// varchar 64 仓库Sid - private String storeHouseName;// varchar 100 仓库名称 - private String locationId;//货位号id + private String confirmed_price;// decime 50 2 质权人确认的单价 + private String calculated_value;// decime 50 2 核算的价值 + private String location_number;// varchar 10 货位号 + private String custer_name;// varchar 50 客户名称（企业） + private String pro_unit;// varchar 50 规格单位 + private String custer_sid;// varchar 64 客户Sid（企业） + private String store_house_sid;// varchar 64 仓库Sid + private String store_house_name;// varchar 100 仓库名称 + private String brand_info_name;//品牌名称 + private String brand_info_key;//品牌名称 + private String product_type_name;//分类名称 + private String product_type_key;//分类key + private String location_id;//货位号id } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java index cc2f3b79..ce5e88aa 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java @@ -6,13 +6,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; @Mapper public interface ProjectDailyMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper ew); - - @Select("select * from project_daily where projectSid = #{projectSid} and orderDate = #{orderDate}") - ProjectDaily selectByProSidAndOrderDate(@Param("projectSid") String projectSid,@Param("orderDate") String orderDate); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java index e3360952..6e35db70 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java @@ -2,13 +2,11 @@ package com.yxt.supervise.report.biz.projectdaily; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.io.unit.DataUnit; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.yxt.common.base.utils.DateUtils; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -17,12 +15,7 @@ import com.yxt.supervise.report.biz.wechat.WechatRest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; -import java.io.File; -import java.io.FileOutputStream; -import java.io.OutputStream; -import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -108,7 +101,10 @@ public class ProjectDailyService extends ServiceImpl wq = new QueryWrapper<>(); + wq.eq("projectSid",projectSid) + .eq("orderDate",orderDate); + return baseMapper.selectOne(wq); } public void sendMess(String projectSid, String orderDate) {