From 0ca5e1050e3854d709ecbf864d65353b49b72022 Mon Sep 17 00:00:00 2001
From: zj <zhangjun@fortucky.cn>
Date: Thu, 15 Jan 2026 14:11:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/api/controller/ToErpApiController.java   |  8 ++++----
 .../ruoyi/api/service/impl/ToWmsServiceImpl.java   | 14 +++++++++++++-
 .../domain/ViewProductAndStock.java                | 12 ++++++------
 ruoyi-ui/src/views/stock/pointOut.vue              |  7 ++++---
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java
index 1f7d84c..da955af 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java
@@ -32,8 +32,8 @@ public class ToErpApiController {
     /**
      * 回传其他出入库单
      */
-    //@Scheduled(fixedDelay = 1500)
-//    public void callbackTransferBill() {
-//        toErpService.callbackTransferBill();
-//    }
+    @Scheduled(fixedDelay = 1500)
+    public void callbackTransferBill() {
+        toErpService.callbackTransferBill();
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
index 9d17549..b5b7fc2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
@@ -35,6 +35,7 @@ import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
 import com.ruoyi.job.mydojobdetail.service.IMydoJobDetailService;
 import com.ruoyi.log.service.IRequestLogService;
 import com.ruoyi.out.outStockout.service.IOutStockoutService;
+import com.ruoyi.pda.mapper.PdaMapper;
 import com.ruoyi.stock.stock.domain.BasStock;
 import com.ruoyi.stock.stock.service.IBasStockService;
 import lombok.extern.slf4j.Slf4j;
@@ -86,6 +87,9 @@ public class ToWmsServiceImpl implements IToWmsService {
     private IRequestLogService requestLogService;
     @Autowired
     private IBasStockService stockService;
+    @Autowired
+    private PdaMapper pdaMapper;
+
 
 
     @Override
@@ -326,10 +330,11 @@ public class ToWmsServiceImpl implements IToWmsService {
             return AjaxResult.error("没有任务");
         }
     }
-
+    //TODO
     @Override
     public AjaxResult jobFinish(WmsJobRequest wmsJobRequest) {
         MydoJob mydoJobParam = new MydoJob();
+        StringBuilder stringBuilder = new StringBuilder();
         switch (wmsJobRequest.getWmsType()) {
             case "1":
 
@@ -363,6 +368,13 @@ public class ToWmsServiceImpl implements IToWmsService {
                 MydoJob outJob = outMydoJobs.get(0);
                 outJob.setExecutionPhase("2");
                 mydoJobService.updateMydoJob(outJob);
+                HashMap<String, Object> map = new HashMap<>();
+                map.put("v_tray_code", outJob.getTrayCode());
+                pdaMapper.outMakeSure(map);
+                String result=map.get("v_result").toString();
+                if(!"10".equals(result)){
+                    stringBuilder.append(",").append(map.get("v_resultmsg"));
+                }
                 break;
 
             default:
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java
index 593ec2b..47c78c3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java
@@ -76,11 +76,11 @@ public class ViewProductAndStock extends BaseEntity
 
     /** 净重 */
     @Excel(name = "净重")
-    private BigDecimal netWeight;
+    private String netWeight;
 
     /** 毛重 */
     @Excel(name = "毛重")
-    private BigDecimal grossWeight;
+    private String grossWeight;
 
     /** 分销 */
     @Excel(name = "分销")
@@ -242,22 +242,22 @@ public class ViewProductAndStock extends BaseEntity
         return phase;
     }
 
-    public void setNetWeight(BigDecimal netWeight)
+    public void setNetWeight(String netWeight)
     {
         this.netWeight = netWeight;
     }
 
-    public BigDecimal getNetWeight()
+    public String getNetWeight()
     {
         return netWeight;
     }
 
-    public void setGrossWeight(BigDecimal grossWeight)
+    public void setGrossWeight(String grossWeight)
     {
         this.grossWeight = grossWeight;
     }
 
-    public BigDecimal getGrossWeight()
+    public String getGrossWeight()
     {
         return grossWeight;
     }
diff --git a/ruoyi-ui/src/views/stock/pointOut.vue b/ruoyi-ui/src/views/stock/pointOut.vue
index 3276063..74e216e 100644
--- a/ruoyi-ui/src/views/stock/pointOut.vue
+++ b/ruoyi-ui/src/views/stock/pointOut.vue
@@ -9,9 +9,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="订单号" prop="序列号"><!-- 库存id -->
+      <el-form-item label="订单号" prop="orderId"><!-- 库存id -->
         <el-input
-          v-model="queryParams.序列号"
+          v-model="queryParams.orderId"
           placeholder="请输入订单号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -230,7 +230,8 @@ export default {
         spare4: null,
         spare5: null,
         spare6: null,
-        roadwayId: null
+        roadwayId: null,
+        orderId:null
       },
       // 表单参数
       form: {},