From c4874c0c062216f80e154861353f35e63ec7d747 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期五, 08 十二月 2023 15:01:04 +0800
Subject: [PATCH] feat: 只查询本机构的采购单
---
consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java
index c2ce57b..6d59316 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java
@@ -1,6 +1,7 @@
package com.consum.base.service;
import com.consum.base.core.WhBusinessEnum;
+import com.consum.base.core.type.MixType;
import com.consum.base.core.utils.*;
import com.consum.base.pojo.LWarehouseFlowParam;
import com.consum.base.pojo.query.LWhFormOutputQry;
@@ -296,13 +297,10 @@
paramts.put("chuKuBusinessFormCode", businessFormCode);
sqlBaoFei.append(" and tScrapped.BUSINESS_FORM_CODE = :baoFeiBusinessFormCode");
paramts.put("baoFeiBusinessFormCode", businessFormCode);
-
- sqlBaoFei.append(" and tDepScrapped.BUSINESS_FORM_CODE = :deptBaoFeiBusinessFormCode");
+ sqlDepBaoFei.append(" and tDepScrapped.BUSINESS_FORM_CODE = :deptBaoFeiBusinessFormCode");
paramts.put("deptBaoFeiBusinessFormCode", businessFormCode);
- sqlBaoFei.append(" and tBack.BUSINESS_FORM_CODE = :deptBackBusinessFormCode");
+ sqlDepTuiHui.append(" and tBack.BUSINESS_FORM_CODE = :deptBackBusinessFormCode");
paramts.put("deptBackBusinessFormCode", businessFormCode);
-
-
sqlPanDian.append(" and tInventory.BUSINESS_FORM_CODE = :panDianBusinessFormCode");
paramts.put("panDianBusinessFormCode", businessFormCode);
@@ -334,7 +332,8 @@
.append(sqlChuKu)
.append(sqlBaoFei)
.append(sqlPanDian)
-
+ .append(sqlDepBaoFei)
+ .append(sqlDepTuiHui)
.append(sqlEnd);
return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
@@ -452,6 +451,7 @@
Integer businessType = outAndInDetailVO.getBusinessType();
String mixType = MixType.getMixType(businessType + "" + thisType);
outAndInDetailVO.setMixType(mixType);
+ outAndInDetailVO.setTotalPrice(CurrencyUtil.convertFenToYuan(outAndInDetailVO.getTotalPrice()));
result.add(outAndInDetailVO);
});
pageUtil.setDatas(result);
--
Gitblit v1.9.1