From c38a400aba3221fdff0bb576d177c1a6a590ecb7 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期五, 08 十二月 2023 11:37:04 +0800
Subject: [PATCH] feat: 设置库管员

---
 consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java |   11 +++++------
 1 files changed, 5 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 56ceb2c..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
@@ -297,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);
 
@@ -335,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());
@@ -453,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