From 5a660ffa4ba2db7d808a59037834e076969e4082 Mon Sep 17 00:00:00 2001 From: liupopo Date: Tue, 11 Apr 2023 10:45:49 +0800 Subject: [PATCH] sql --- docs/databases/table_modify.sql | 1 + .../InTransitCheckVo.java | 12 ++- .../customer/biz/gdinstorage/GdInstorage.java | 75 ++++++++++++++++ .../biz/gdinstorage/GdInstorageMapper.java | 58 +++++++++++++ .../biz/gdinstorage/GdInstorageRest.java | 58 +++++++++++++ .../biz/gdinstorage/GdInstorageService.java | 85 +++++++++++++++++++ .../customer/biz/gdinstorage/GdRukuQuery.java | 47 ++++++++++ .../PurchaseRequisitionMapper.java | 6 +- .../SupplierBankInfoService.java | 14 ++- 9 files changed, 351 insertions(+), 5 deletions(-) create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorage.java create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageMapper.java create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageRest.java create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageService.java create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdRukuQuery.java diff --git a/docs/databases/table_modify.sql b/docs/databases/table_modify.sql index 50a5f8d7..e8091fba 100644 --- a/docs/databases/table_modify.sql +++ b/docs/databases/table_modify.sql @@ -33,3 +33,4 @@ ALTER TABLE supervise_supplychain.purchase_requisition_pro ADD distributionAmoun ALTER TABLE supervise_supplychain.purchase_requisition_pro ADD preqCode varchar(100) DEFAULT NULL COMMENT '订单编号'; +ALTER TABLE supervise_supplychain.purchase_requisition_pro MODIFY COLUMN packageTotalPrice double(12,2) NULL COMMENT '包合计（元）（对应采购订单中的送货金额）'; diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/InTransitCheckVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/InTransitCheckVo.java index 38c52534..3d9f61ca 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/InTransitCheckVo.java +++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/InTransitCheckVo.java @@ -5,13 +5,13 @@ public class InTransitCheckVo { public InTransitCheckVo() { } - public InTransitCheckVo(String supplierOnlyCode ) { + public InTransitCheckVo(String supplierOnlyCode) { this.supplierOnlyCode = supplierOnlyCode; // this.supplierName = supplierName; } private String supplierOnlyCode; -// private String supplierName; + // private String supplierName; private double orderAmount = 0.0; private double instorageAmount = 0.0; @@ -46,4 +46,12 @@ public class InTransitCheckVo { public void setInstorageAmount(double instorageAmount) { this.instorageAmount = instorageAmount; } + + public boolean getHasInTransit() { + return this.getOrderAmount() > this.getInstorageAmount(); + } + + public double getAmountOfInTransit() { + return this.getOrderAmount() - this.getInstorageAmount(); + } } diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorage.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorage.java new file mode 100644 index 00000000..216ae474 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorage.java @@ -0,0 +1,75 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.customer.biz.gdinstorage; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.EntityWithId; +import lombok.Data; + +/** + * Project: yxt_supervise
+ * File: GdInstorage.java
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorage
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022/12/3 0:57
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@TableName("gd_instorage") +public class GdInstorage extends EntityWithId { + + private String cola0; // 企业组织机构代码证 + private String colb1; // 仓库/门店编号 + private String colc2; // 仓库/门店名称 + private String cold3; // 入库时间 + private String colex; // 供应商编号 + private String cole4; // 供应商名称 + private String colf5; // 单据号 + private String colg6; // 单据类型 + private String colh7; // 货号 + private String coli8; // 商品名称 + private String colj9; // 商品生产日期 + private String colk10; // 商品保质期 + private String coll11; // 商品规格 + private String colm12; // 类别编号 + private String coln13; // 类别名称 + private String colo14; // 一级类别名称 + private String colp15; // 二级类别名称 + private String colq16; // 入库金额 + private String colr17; // 入库数量 + private String cols18; // 成本金额 + private String colt19; // 成本税额 + private String colu20; // 不含税成本 + private String colv21; // 进项税率 + private String orderDate; // 单据日期 + private String supplierCodeUnified; // 供货商编码统一 + private String inOrderNo; // 入库定单号 +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageMapper.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageMapper.java new file mode 100644 index 00000000..5a6823d1 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageMapper.java @@ -0,0 +1,58 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.customer.biz.gdinstorage; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +/** + * Project: yxt_supervise
+ * File: GdInstorageMapper.java
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorageMapper
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022/12/3 1:02
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface GdInstorageMapper extends BaseMapper { + + @Delete("delete from gd_instorage where orderDate=#{orderDate} ") + void clearByOrderDate(@Param("orderDate") String orderDate); + + @Select("select CONVERT(IFNULL(sum(colq16),0),DECIMAL(12,2)) as amount from gd_instorage where orderDate=#{orderDate}") + double amountOfDay(@Param("orderDate") String orderDate); + + @Select("select CONVERT(IFNULL(sum(colq16),0),DECIMAL(12,2)) as amount from gd_instorage where supplierCodeUnified=#{supplierCodeUnified}") + double amountOfSupplier(@Param("supplierCodeUnified") String supplierOnlyCode); +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageRest.java new file mode 100644 index 00000000..147f2f56 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageRest.java @@ -0,0 +1,58 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0/ = /0 * + * ___/`---'/___ * + * .' /| |// '. * + * / /||| : |||// / * + * / _||||| -:- |||||- / * + * | | // - /// | | * + * | /_| ''/---/'' |_/ | * + * / .-/__ '-' ___/-. / * + * ___'. .' /--.--/ `. .'___ * + * ."" '< `.___/_<|>_/___.' >' "". * + * | | : `- /`.;`/ _ /`;.`/ - ` : | | * + * / / `_. /_ __/ /__ _/ .-` / / * + * =====`-.____`.___ /_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.customer.biz.gdinstorage; + +import cn.hutool.core.util.StrUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; + +/** + * Project: yxt_supervise
+ * File: GdInstorageRest.java
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorageRest
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022/12/3 1:08
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@RestController("com.yxt.supervise.portal.biz.gdinstorage.GdInstorageRest") +@RequestMapping("/ruku") +public class GdInstorageRest { + + @Autowired + private GdInstorageService gdInstorageService; + +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageService.java new file mode 100644 index 00000000..ac878957 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageService.java @@ -0,0 +1,85 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.customer.biz.gdinstorage; + +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.config.component.FileUploadComponent; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * Project: yxt_supervise
+ * File: GdInstorageService.java
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorageService
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022/12/3 1:02
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class GdInstorageService extends ServiceImpl { + + @Autowired + private FileUploadComponent fileUploadComponent; + + public PagerVo listPageVo(PagerQuery pq) { + + GdRukuQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.orderByDesc("orderDate"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void clearByOrderDate(String orderDate) { + baseMapper.clearByOrderDate(orderDate); + } + + /** + * 112仓某一天的入库金额 + * + * @param orderDate + * @return + */ + public double amountOfDay(String orderDate) { + return baseMapper.amountOfDay(orderDate); + } + + public double amountOfSupplier(String supplierOnlyCode) { + return baseMapper.amountOfSupplier(supplierOnlyCode); + } +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdRukuQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdRukuQuery.java new file mode 100644 index 00000000..915e0cf3 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdRukuQuery.java @@ -0,0 +1,47 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.customer.biz.gdinstorage; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * Project: yxt_supervise
+ * File: GdRukuQuery.java
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdRukuQuery
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022/12/10 21:15
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +public class GdRukuQuery implements Query { + private String orderDate; +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionMapper.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionMapper.java index 3eaf5012..a0400b5a 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionMapper.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionMapper.java @@ -28,6 +28,8 @@ public interface PurchaseRequisitionMapper extends BaseMapper selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); //查询导出的数据 List exportExcel(@Param(Constants.WRAPPER) Wrapper qw); - @Select("") - double amountBySupplierOnlyCode(@Param("") String supplierOnlyCode); + @Select("select sum(packageTotalPrice) amount from purchase_requisition_pro prp " + + "left join purchase_requisition pr on pr.sid =prp.mainSid " + + "where pr.purchaseState=1 and pr.bankState=1 and pr.supplierOnlyCode=#{supplierOnlyCode}") + double amountBySupplierOnlyCode(@Param("supplierOnlyCode") String supplierOnlyCode); } diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java index fb171eac..1712fb51 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java @@ -38,6 +38,7 @@ import com.yxt.supervise.customer.api.purchaserequisitionpro.InTransitCheckVo; import com.yxt.supervise.customer.api.supplierbankinfo.*; import com.yxt.supervise.customer.api.suppliercontractinfo.SupplierContractInfoDto; import com.yxt.supervise.customer.api.supplierindex.SupplierIndex; +import com.yxt.supervise.customer.biz.gdinstorage.GdInstorageService; import com.yxt.supervise.customer.biz.purchaserequisition.PurchaseRequisitionService; import com.yxt.supervise.customer.biz.suppliercontractinfo.SupplierContractInfoService; import com.yxt.supervise.customer.biz.supplierindex.SupplierIndexService; @@ -70,6 +71,8 @@ public class SupplierBankInfoService extends MybatisBaseService createQueryWrapper(SupplierBankInfoQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -260,7 +263,15 @@ public class SupplierBankInfoService extends MybatisBaseService