From 659acd06612446ca2d850321647faa5180b8b087 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, 10 Oct 2025 10:10:20 +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      | 21 ++++++++++++-------
 ruoyi-ui/src/views/out/outStockoutManage.vue  |  2 +-
 2 files changed, 14 insertions(+), 9 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 d4ec9e8..a5e38a7 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
@@ -31,6 +31,7 @@ import com.ruoyi.out.exception.service.IOutExceptionRecordService;
 import com.ruoyi.out.outStockoutDetail.domain.OutStockoutDetail;
 import com.ruoyi.out.outStockoutDetail.service.IOutStockoutDetailService;
 import com.ruoyi.pda.domain.TrayCodeMakeSure;
+import com.ruoyi.pda.mapper.PdaMapper;
 import com.ruoyi.pda.service.PdaService;
 import com.ruoyi.stock.stock.domain.BasStock;
 import com.ruoyi.stock.stock.mapper.BasStockMapper;
@@ -80,6 +81,8 @@ public class MydoJobServiceImpl implements IMydoJobService {
     private ITransferBillCallbackService transferBillCallbackService;
     @Autowired
     private BasStockMapper basStockMapper;
+    @Autowired
+    private PdaMapper pdaMapper;
 
 
     /**
@@ -335,17 +338,19 @@ public class MydoJobServiceImpl implements IMydoJobService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult OuthandFinish(String[] jobIds) {
+        StringBuilder stringBuilder = new StringBuilder();
         for (String jobId : jobIds) {
             MydoJob job = selectMydoJobByJobId(jobId);
-            BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(job.getWarehouseId());
-
-            if ("2".equals(basWarehouse.getWarehouseType()) && Integer.parseInt(job.getStatus()) < 3) {
-                log.error("只能完成正执行的作业");
-                return AjaxResult.error(MessageUtils.message("error.message14"));
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("v_tray_code", job.getTrayCode());
+            pdaMapper.outMakeSure(map);
+            String result=map.get("v_result").toString();
+            if(!"10".equals(result)){
+                stringBuilder.append(",").append(map.get("v_resultmsg"));
             }
-            TrayCodeMakeSure trayCodeMakeSure = new TrayCodeMakeSure();
-            trayCodeMakeSure.setTrayCode(job.getTrayCode());
-            pdaService.outMakeSure(trayCodeMakeSure);
+        }
+        if (!StrUtil.isEmpty(stringBuilder.toString())){
+            return AjaxResult.warn(stringBuilder.toString());
         }
         return AjaxResult.success();
     }
diff --git a/ruoyi-ui/src/views/out/outStockoutManage.vue b/ruoyi-ui/src/views/out/outStockoutManage.vue
index 8424c21..1dd2545 100644
--- a/ruoyi-ui/src/views/out/outStockoutManage.vue
+++ b/ruoyi-ui/src/views/out/outStockoutManage.vue
@@ -32,7 +32,7 @@
       </el-form-item>
       <el-form-item :label="'客户名称'" prop="customerName">
         <el-input
-          v-model="queryParams.inputCustomerName"
+          v-model="queryParams.customerName"
           :placeholder="'请输入客户名称'"
           clearable
           @keyup.enter.native="handleQuery"