1
This commit is contained in:
@@ -26,8 +26,6 @@
|
|||||||
pbe.productProgress,
|
pbe.productProgress,
|
||||||
SUM(pbd.unTaxTotalAmount) AS unTaxTotalAmount,
|
SUM(pbd.unTaxTotalAmount) AS unTaxTotalAmount,
|
||||||
SUM(pbd.count) AS countTotal,
|
SUM(pbd.count) AS countTotal,
|
||||||
0 AS enterWareCount,
|
|
||||||
0 AS enterWareAmount,
|
|
||||||
pbe.deliveryCount,
|
pbe.deliveryCount,
|
||||||
pbe.deliveryStateValue,
|
pbe.deliveryStateValue,
|
||||||
pb.`remarks`,
|
pb.`remarks`,
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ import cn.hutool.core.bean.BeanUtil;
|
|||||||
import cn.hutool.core.date.DateUtil;
|
import cn.hutool.core.date.DateUtil;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
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.service.MybatisBaseService;
|
||||||
import com.yxt.common.base.utils.PagerUtil;
|
import com.yxt.common.base.utils.PagerUtil;
|
||||||
import com.yxt.common.core.query.PagerQuery;
|
import com.yxt.common.core.query.PagerQuery;
|
||||||
@@ -71,7 +72,6 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
|
|||||||
private PurchaseAppendixService purchaseAppendixService;
|
private PurchaseAppendixService purchaseAppendixService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private PurchaseFlowNodeService purchaseFlowNodeService;
|
private PurchaseFlowNodeService purchaseFlowNodeService;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private FileUploadComponent fileUploadComponent;
|
private FileUploadComponent fileUploadComponent;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user