From 20249c17d5b28c588e88451545af291995271f9c Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 15 十二月 2023 14:07:21 +0800
Subject: [PATCH] 1.出库手续回显 2.调拨申请时库存查询更换接口
---
admin-web/src/api/baseSetting/finsystenant.js | 9 +++++++++
admin-web/src/views/stock/transfer/transferissue/detail.vue | 2 +-
consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java | 2 +-
admin-web/src/views/stock/transfer/transferApplication/edit.vue | 4 ++--
consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputParam.java | 2 +-
5 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/admin-web/src/api/baseSetting/finsystenant.js b/admin-web/src/api/baseSetting/finsystenant.js
index ae74867..d6fff5e 100644
--- a/admin-web/src/api/baseSetting/finsystenant.js
+++ b/admin-web/src/api/baseSetting/finsystenant.js
@@ -137,6 +137,15 @@
params,
});
}
+
+// 鏈�夋嫨浠撳簱鏃剁殑搴撳瓨鏌ヨ锛屾煡鎵�鏈変粨搴�
+export function warehouseAllSelectNumber(params) {
+ return request({
+ url: '/pc/base/warehouse/select/in/warehouse/num',
+ method: 'get',
+ params,
+ });
+}
// 搴撳瓨
export function tenantUserQueryUser(params) {
return request({
diff --git a/admin-web/src/views/stock/transfer/transferApplication/edit.vue b/admin-web/src/views/stock/transfer/transferApplication/edit.vue
index ee03a15..26b8129 100644
--- a/admin-web/src/views/stock/transfer/transferApplication/edit.vue
+++ b/admin-web/src/views/stock/transfer/transferApplication/edit.vue
@@ -177,7 +177,7 @@
</template>
<script>
import {getParentTenant, queryWarehouseGoods, transferAdd} from '@/api/stock/transfer';
-import {getCategorySelectTree, goodsModel, warehouseSelectNumber} from '@/api/baseSetting/finsystenant';
+import {getCategorySelectTree, goodsModel, warehouseAllSelectNumber, warehouseSelectNumber} from '@/api/baseSetting/finsystenant';
import MyButton from '@/components/myButton/myButton';
import winMd from '@/components/win/win-md';
import upload from '@/components/upload/index';
@@ -373,7 +373,7 @@
for (let item of e) {
if (str.indexOf(item) == -1) {
let temp = this.goodsModelAll.find((v) => v.id == item);
- let num = await warehouseSelectNumber({
+ let num = await warehouseAllSelectNumber({
baseGoodsModelsId: item,
warehouseType: 0,
states: 1,
diff --git a/admin-web/src/views/stock/transfer/transferissue/detail.vue b/admin-web/src/views/stock/transfer/transferissue/detail.vue
index 2023833..90c98a9 100644
--- a/admin-web/src/views/stock/transfer/transferissue/detail.vue
+++ b/admin-web/src/views/stock/transfer/transferissue/detail.vue
@@ -130,7 +130,7 @@
this.loading = true;
transferDetail({id: this.setting.id}).then((res) => {
this.detail = res;
- this.fileList = this.detail.doc ? JSON.parse(this.detail.doc) : [];
+ this.fileList = this.detail.procureDoc ? JSON.parse(this.detail.procureDoc) : [];
this.loading = false;
this.$nextTick(() => {
this.initPreviewImg();
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputParam.java b/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputParam.java
index 8581d99..e81b07f 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputParam.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputParam.java
@@ -29,7 +29,7 @@
* 鍑哄簱鎵嬬画
*/
@ApiModelProperty(value = "鍑哄簱鎵嬬画")
- private String procureDoc;
+ private String doc;
/**
* 璁板綍鐗╁搧淇℃伅鍜岃鏍煎瀷鍙�
*/
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
index c0c7a02..dc1b633 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
@@ -90,7 +90,7 @@
lWhFormOutput.setOperatorName(sysInfo.getUserName());
lWhFormOutput.setDealTime(param.getDealTime());
lWhFormOutput.setStates(OutPutStatesType.OUT_PENDING.getValue());
- lWhFormOutput.setOutputDoc(param.getProcureDoc());
+ lWhFormOutput.setOutputDoc(param.getDoc());
int flag1 = this.insert(lWhFormOutput);
if (flag1 == 0) {
log.error("鏂板鍑哄簱鍗曡褰�");
--
Gitblit v1.9.1