From 854cbc47742ee83eb30062a12b9f3ed7c8ed0941 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 20 十二月 2023 16:58:27 +0800
Subject: [PATCH] 盘点物品型号修改
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java | 2 +-
admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue | 2 +-
admin-web/src/views/departmentitem/itemret/returnNote/edit.vue | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue b/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
index a07c354..1035425 100644
--- a/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
+++ b/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
@@ -405,7 +405,7 @@
}).then(res => {
this.loading = false
if (!res || res.length === 0) {
- this.$message.error('鏈煡璇㈠埌鍒嗗彂鍗�');
+ this.$message.error('鏈煡璇㈠埌闇�瑕侀��鍥炵殑鍒嗗彂鍗�');
return
}
this.fenfaSetting.show = true
diff --git a/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue b/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
index fe8b798..714ced5 100644
--- a/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
+++ b/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
@@ -433,7 +433,7 @@
}).then(res => {
this.loading = false
if (!res || res.length === 0) {
- this.$message.error('鏈煡璇㈠埌鍒嗗彂鍗�');
+ this.$message.error('鏈煡璇㈠埌鍙互鎶ュ簾鐨勫垎鍙戝崟');
return
}
this.fenfaSetting.show = true
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
index 9393423..8467aa2 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
@@ -354,7 +354,7 @@
+ "bgt.CLASSIFICATION TYPE,bgm.UNIT FROM l_wh_goods g "
+ "LEFT JOIN base_goods_template bgt ON g.BASE_GOODS_TEMPLATE_ID = bgt.ID "
+ "LEFT JOIN base_goods_models bgm ON bgm.GOODS_TEMPLATES_ID = bgt.id WHERE "
- + "WAREHOUSE_ID = :warehouseId ";
+ + "WAREHOUSE_ID = :warehouseId GROUP BY g.BASE_GOODS_MODELS_ID ";
HashMap<String, Object> param = new HashMap<>();
param.put("warehouseId", warehouseId);
--
Gitblit v1.9.1