From 9bf2e9628f08b7273a2805bced46a7ca51baaaef Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 21 Oct 2024 14:37:59 +0800 Subject: [PATCH] 1 --- .../com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml | 2 -- .../com/yxt/purchase/biz/purchasebill/PurchaseBillService.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml index 88d0172..0877d22 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml @@ -26,8 +26,6 @@ pbe.productProgress, SUM(pbd.unTaxTotalAmount) AS unTaxTotalAmount, SUM(pbd.count) AS countTotal, - 0 AS enterWareCount, - 0 AS enterWareAmount, pbe.deliveryCount, pbe.deliveryStateValue, pb.`remarks`, diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java index bc8bd19..2db7fff 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java @@ -29,6 +29,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -71,7 +72,6 @@ public class PurchaseBillService extends MybatisBaseService