sql

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 '包合计（元）（对应采购订单中的送货金额）';

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();
+    }
 }

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 <br/>
+ * File: GdInstorage.java <br/>
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorage <br/>
+ * Description: <描述类的功能>. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022/12/3 0:57 <br/>
+ *
+ * @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; // 入库定单号
+}

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 <br/>
+ * File: GdInstorageMapper.java <br/>
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorageMapper <br/>
+ * Description: <描述类的功能>. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022/12/3 1:02 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface GdInstorageMapper extends BaseMapper<GdInstorage> {
+
+    @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);
+}

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 <br/>
+ * File: GdInstorageRest.java <br/>
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorageRest <br/>
+ * Description: <描述类的功能>. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022/12/3 1:08 <br/>
+ *
+ * @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;
+
+}

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 <br/>
+ * File: GdInstorageService.java <br/>
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorageService <br/>
+ * Description: <描述类的功能>. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022/12/3 1:02 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class GdInstorageService extends ServiceImpl<GdInstorageMapper, GdInstorage> {
+
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+
+    public PagerVo<GdInstorage> listPageVo(PagerQuery<GdRukuQuery> pq) {
+
+        GdRukuQuery query = pq.getParams();
+        QueryWrapper<GdInstorage> qw = new QueryWrapper<>();
+        qw.orderByDesc("orderDate");
+        IPage<GdInstorage> page = PagerUtil.queryToPage(pq);
+        IPage<GdInstorage> pagging = baseMapper.selectPage(page, qw);
+        PagerVo<GdInstorage> 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);
+    }
+}

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 <br/>
+ * File: GdRukuQuery.java <br/>
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdRukuQuery <br/>
+ * Description: <描述类的功能>. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022/12/10 21:15 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+public class GdRukuQuery implements Query {
+    private String orderDate;
+}

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<PurchaseRequisitio
     IPage<PurchaseRequisitionVo> selectPageVo(IPage<PurchaseRequisition> page, @Param(Constants.WRAPPER) Wrapper<PurchaseRequisition> qw);
     //查询导出的数据
     List<PurchaseRequisitionExcelVo> exportExcel(@Param(Constants.WRAPPER) Wrapper<PurchaseRequisition> 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);
 }

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<SupplierBankInfo
 
     @Autowired
     private PurchaseRequisitionService purchaseRequisitionService;
+    @Autowired
+    private GdInstorageService gdInstorageService;
 
     private QueryWrapper<SupplierBankInfo> createQueryWrapper(SupplierBankInfoQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -260,7 +263,15 @@ public class SupplierBankInfoService extends MybatisBaseService<SupplierBankInfo
                 list.add(vo);
                 return list;
             }
-            list = checkInTransitByUniCode(pr.getSupplierOnlyCode());
+            InTransitCheckVo ivo = checkInTransitByUniCode(pr.getSupplierOnlyCode());
+            if (ivo.getHasInTransit()) {
+                PurchaseRequisitionCheckVo vo = new PurchaseRequisitionCheckVo(purchaseRequisitionSid, "", 3);
+                vo.setSupplierCode(pr.getSupplierCode());
+                vo.setSupplierName(pr.getSupplierName());
+                vo.setSupplierCodeUnified(pr.getSupplierOnlyCode());
+                vo.setMsg("供应商[" + pr.getSupplierName() + "]有在途货值");
+                list.add(vo);
+            }
         }
         return list;
     }
@@ -365,6 +376,7 @@ public class SupplierBankInfoService extends MybatisBaseService<SupplierBankInfo
     public InTransitCheckVo checkInTransitByUniCode(String supplierOnlyCode) {
         InTransitCheckVo vo = new InTransitCheckVo(supplierOnlyCode);
         vo.setOrderAmount(purchaseRequisitionService.amountOfSupplier(supplierOnlyCode));
+        vo.setInstorageAmount(gdInstorageService.amountOfSupplier(supplierOnlyCode));
         return vo;
     }
 }