From e51994a6ec1084334870cc2cf8b5f96b05cc8d45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=80=A1=E8=93=89?= <377046077@qq.com>
Date: Fri, 19 Sep 2025 15:09:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/MydoJobServiceImpl.java | 13 +-
.../service/impl/BasStockServiceImpl.java | 1 -
.../resources/mapper/stock/BasStockMapper.xml | 10 +-
ruoyi-ui/src/api/out/outStockout.js | 2 -
ruoyi-ui/src/api/stock/management.js | 2 +-
ruoyi-ui/src/views/stock/pointOut.vue | 195 ++++--------------
6 files changed, 53 insertions(+), 170 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
index d1c587a..914f733 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
@@ -3,6 +3,7 @@ package com.ruoyi.job.mydojob.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
import com.ruoyi.api.service.IToWcsService;
import com.ruoyi.bas.basJobId.service.IBasJobIdService;
import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace;
@@ -418,12 +419,14 @@ public class MydoJobServiceImpl implements IMydoJobService {
mydoJobMapper.pointOut(map);
iToWcsService.pushOutMydoJob();
String result = map.get("v_result").toString();
- if ("10".equals(result)) {
- msg = "操作成功！";
- } else {
- msg = map.get("v_resultmsg").toString();
+ if (!"10".equals(result)) {
+ Stringbuilder += stockId + msg + "
";
}
- Stringbuilder += stockId + msg + "
";
+
+ }
+
+ if (!StrUtil.isEmpty(Stringbuilder)) {
+ return AjaxResult.warn(Stringbuilder);
}
return AjaxResult.success();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java
index 8585054..7a41c35 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java
@@ -55,7 +55,6 @@ public class BasStockServiceImpl implements IBasStockService
* @return 库存信息
*/
@Override
- @DataScope(warehouseAlias = "bw")
public List selectBasStockList(BasStock basStock)
{
return basStockMapper.selectBasStockList(basStock);
diff --git a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
index d260168..d0cf2ee 100644
--- a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
@@ -108,15 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and bs.order_id = #{orderId}
and bs.product_id = #{productId}
and bcs.status = #{cargoSpaceStockStatus}
-
- and bw.warehouse_type in
-
- #{item}
-
-
-
- ${params.warehouseDataScope}
-
+
diff --git a/ruoyi-ui/src/api/out/outStockout.js b/ruoyi-ui/src/api/out/outStockout.js
index 2c4fe6a..e842dee 100644
--- a/ruoyi-ui/src/api/out/outStockout.js
+++ b/ruoyi-ui/src/api/out/outStockout.js
@@ -18,8 +18,6 @@ export function getOutStockoutDetail(query) {
}
-
-
// 查询可出库的库存物资信息列表
export function listProductAndStock(query) {
return request({
diff --git a/ruoyi-ui/src/api/stock/management.js b/ruoyi-ui/src/api/stock/management.js
index 9757949..8230edc 100644
--- a/ruoyi-ui/src/api/stock/management.js
+++ b/ruoyi-ui/src/api/stock/management.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询库存信息列表
export function listManagement(query) {
return request({
- url: '/stock/management/list',
+ url: '/out/handAllotStock/list',
method: 'get',
params: query
})
diff --git a/ruoyi-ui/src/views/stock/pointOut.vue b/ruoyi-ui/src/views/stock/pointOut.vue
index f6d0e60..7943ead 100644
--- a/ruoyi-ui/src/views/stock/pointOut.vue
+++ b/ruoyi-ui/src/views/stock/pointOut.vue
@@ -17,16 +17,16 @@
@keyup.enter.native="handleQuery"
/>
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -37,16 +37,7 @@
-
-
-
-
-
+
-
+
+
+
-
-
-
-
-
-
-
-
搜索
@@ -105,63 +80,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 修改
- 删除
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
this.ids.includes(item.stockId));
this.selectedStockData = selectedData;
- // 根据选中数据的仓库ID设置出口选项
- this.setExitOptionsByWarehouse(selectedData);
+
// 显示出口选择弹窗
this.exitDialogVisible = true;
this.exitForm.exitId = null;
},
- /** 根据仓库ID设置出口选项 */
- setExitOptionsByWarehouse(selectedData) {
- try {
- // 获取选中数据的仓库ID集合，过滤掉空值和无效值
- const warehouseIds = [...new Set(
- selectedData
- .map(row => row.warehouseId)
- .filter(id => id !== null && id !== undefined && id !== '')
- )];
-
- // 如果没有有效的仓库ID，清空出口选项
- if (warehouseIds.length === 0) {
- this.exitOptions = []
- return
- }
-
- if (warehouseIds.length === 1) {
- // 如果所有选中数据都是同一个仓库，显示该仓库的出口
- const warehouseId = warehouseIds[0]
- this.exitOptions = this.allExitOptions[warehouseId] || []
- }
-
- // 如果最终没有可用的出口选项，给出默认选项
- if (this.exitOptions.length === 0) {
- this.exitOptions=[{exitId: '0', exitName: '人工出口'}]
- }
-
- } catch (error) {
- console.error('设置出口选项时发生错误:', error)
- // 发生错误时，设置为空数组，确保不会影响用户操作
- this.exitOptions = []
- }
- },
/** 提交指定货位出库 */
submitPointOut() {