From b04965d39ae30fddc8c79622ad309ba541961d9f Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 07 十二月 2023 14:53:12 +0800
Subject: [PATCH] 出库单金额处理
---
admin-web/src/views/stock/accessStock/outbound/detail.vue | 7 ++-----
consum-base/src/main/java/com/consum/base/pojo/response/OutAndInDetailVO.java | 3 ++-
admin-web/src/views/stock/accessStock/outbound/edit.vue | 1 +
consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java | 20 +++++++++++++-------
4 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/admin-web/src/views/stock/accessStock/outbound/detail.vue b/admin-web/src/views/stock/accessStock/outbound/detail.vue
index ff58e36..d09af1a 100644
--- a/admin-web/src/views/stock/accessStock/outbound/detail.vue
+++ b/admin-web/src/views/stock/accessStock/outbound/detail.vue
@@ -59,9 +59,9 @@
{{ scope.row.counts }}
</template>
</el-table-column>
- <el-table-column prop="counts" label="閲戦" align="center">
+ <el-table-column prop="totalAmount" label="閲戦" align="center">
<template slot-scope="scope">
- {{ scope.row.price * scope.row.counts | formatPrice}}
+ {{ scope.row.totalAmount}}
</template>
</el-table-column>
</el-table>
@@ -118,9 +118,6 @@
formatTime(time) {
if (!time) return;
return DateFormatter.LongToDateTime(time);
- },
- formatPrice(price) {
- return price / 100
}
},
created() {
diff --git a/admin-web/src/views/stock/accessStock/outbound/edit.vue b/admin-web/src/views/stock/accessStock/outbound/edit.vue
index 91eb146..91a2f3a 100644
--- a/admin-web/src/views/stock/accessStock/outbound/edit.vue
+++ b/admin-web/src/views/stock/accessStock/outbound/edit.vue
@@ -238,6 +238,7 @@
worehouseCount: 0,
counts: null, // 鎿嶄綔鏁伴噺
unit: null, //鍗曚綅
+ totalAmount: 0, //鍗曚綅
},
rules: {
warehouseId: [{ required: true, message: '璇烽�夋嫨浠撳簱', trigger: 'change' }],
diff --git a/consum-base/src/main/java/com/consum/base/pojo/response/OutAndInDetailVO.java b/consum-base/src/main/java/com/consum/base/pojo/response/OutAndInDetailVO.java
index ea63ef4..a9ebdf1 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/response/OutAndInDetailVO.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/response/OutAndInDetailVO.java
@@ -1,6 +1,7 @@
package com.consum.base.pojo.response;
import com.fasterxml.jackson.annotation.JsonProperty;
+
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -21,7 +22,7 @@
@JsonProperty("dealTime")
private Long dealTime;
@JsonProperty("totalPrice")
- private Integer totalPrice;
+ private Double totalPrice;
@JsonProperty("businessFormCode")
private String businessFormCode;
@JsonProperty("baseGoodsModelsName")
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..bd56ed2 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,20 +1,25 @@
package com.consum.base.service;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.stereotype.Service;
+
import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.type.MixType;
-import com.consum.base.core.utils.*;
+import com.consum.base.core.utils.CurrencyUtil;
+import com.consum.base.core.utils.MapRowMapper;
+import com.consum.base.core.utils.MapUtils;
+import com.consum.base.core.utils.MapperUtil;
+import com.consum.base.core.utils.PageUtil;
import com.consum.base.pojo.LWarehouseFlowParam;
import com.consum.base.pojo.query.LWhFormOutputQry;
import com.consum.base.pojo.response.OutAndInDetailVO;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import org.apache.commons.compress.utils.Lists;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
/**
* @ClassName LWarehouseFlowService
@@ -453,6 +458,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