From 0768a1c0591dae2d51d7daea999919739e76e845 Mon Sep 17 00:00:00 2001
From: zhaoyf <1783123481@qq.com>
Date: Wed, 8 Jul 2026 10:12:51 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=87=BA=E5=85=A5=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E8=BD=AC=E5=8F=91=E4=B8=AD=E9=BC=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchase/controller/PurchaseController.java      | 10 ++++++++++
 nladmin-ui/src/views/wms/st/allocationIn/index.vue   | 12 +++++++++---
 nladmin-ui/src/views/wms/st/allocationIn/purchase.js | 10 +++++++++-
 nladmin-ui/src/views/wms/st/allocationOut/index.vue  | 10 ++++++++--
 .../src/views/wms/st/allocationOut/purchase.js       | 10 +++++++++-
 nladmin-ui/src/views/wms/st/otherIn/index.vue        | 10 ++++++++--
 nladmin-ui/src/views/wms/st/otherIn/purchase.js      |  9 ++++++++-
 nladmin-ui/src/views/wms/st/otherOut/index.vue       | 10 ++++++++--
 nladmin-ui/src/views/wms/st/otherOut/purchase.js     |  9 ++++++++-
 nladmin-ui/src/views/wms/st/purchase/index.vue       | 12 +++++++++---
 nladmin-ui/src/views/wms/st/purchase/purchase.js     | 10 +++++++++-
 11 files changed, 95 insertions(+), 17 deletions(-)

diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/purchase/controller/PurchaseController.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/purchase/controller/PurchaseController.java
index 5dbfd1c..23878a0 100644
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/purchase/controller/PurchaseController.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/purchase/controller/PurchaseController.java
@@ -4,6 +4,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.logging.annotation.Log;
+import org.nl.wms.ext_manage.purchase.service.dto.BillChangeDto;
+import org.nl.wms.ext_manage.service.WmsToZDWmdService;
 import org.nl.wms.pm_manage.purchase.service.PurchaseService;
 import org.nl.wms.pm_manage.purchase.service.dto.PurchaseDto;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +24,8 @@ public class PurchaseController {
 
     @Autowired
     private PurchaseService purchaseService;
+    @Autowired
+    private WmsToZDWmdService wmsToZDWmdService;
 
     @GetMapping("/{type}")
     @Log("查询采购入库单")
@@ -71,4 +75,10 @@ public class PurchaseController {
         purchaseService.print(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+    @PostMapping("/pushZD")
+    @Log("出入库单推中鼎")
+    public ResponseEntity pushZD(@RequestBody BillChangeDto billChangeDto){
+        return wmsToZDWmdService.syncPurchaseReceiving(billChangeDto);
+    }
 }
diff --git a/nladmin-ui/src/views/wms/st/allocationIn/index.vue b/nladmin-ui/src/views/wms/st/allocationIn/index.vue
index c84ae7f..8085058 100644
--- a/nladmin-ui/src/views/wms/st/allocationIn/index.vue
+++ b/nladmin-ui/src/views/wms/st/allocationIn/index.vue
@@ -68,7 +68,7 @@
             <p v-if="scope.row.forwardZD == '0'">-</p>
             <template v-else-if="scope.row.forwardZD == '1'">
               <el-popconfirm confirm-button-text="是" cancel-button-text="否" icon="el-icon-info" icon-color="red"
-                             title="是否重新转发中鼎？" @confirm="toForwardZD">
+                             title="是否重新转发中鼎？" @confirm="toForwardZD(scope.row)">
                 <a slot="reference" style="color: red;text-decoration: underline">失败</a>
               </el-popconfirm>
             </template>
@@ -143,8 +143,14 @@ export default {
       const d = new Date(val);
       return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')} ${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}:${String(d.getSeconds()).padStart(2, '0')}`
     },
-    toForwardZD() {
-      console.log(123)
+    toForwardZD(row) {
+      crudPurchase.pushZD({
+        billid: row.bill_id,
+        orderNo: row.order_no,
+        orderType: row.order_type,
+        red: row.red,
+        status: row.status
+      })
     }, toView(index, row) {
       this.mstrow = row;
       this.viewShow = true
diff --git a/nladmin-ui/src/views/wms/st/allocationIn/purchase.js b/nladmin-ui/src/views/wms/st/allocationIn/purchase.js
index ac45453..eda9cce 100644
--- a/nladmin-ui/src/views/wms/st/allocationIn/purchase.js
+++ b/nladmin-ui/src/views/wms/st/allocationIn/purchase.js
@@ -47,4 +47,12 @@ export function print(ids) {
   })
 }
 
-export default { add, edit, del, get, issueReturnBill, print }
+export function pushZD(data) {
+  return request({
+    url: '/api/purchasemst/pushZD',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, get, issueReturnBill, print,pushZD }
diff --git a/nladmin-ui/src/views/wms/st/allocationOut/index.vue b/nladmin-ui/src/views/wms/st/allocationOut/index.vue
index bf547f3..1b540c0 100644
--- a/nladmin-ui/src/views/wms/st/allocationOut/index.vue
+++ b/nladmin-ui/src/views/wms/st/allocationOut/index.vue
@@ -51,7 +51,7 @@
           <template slot-scope="scope">
             <p v-if="scope.row.forwardZD == '0'">-</p>
             <template v-else-if="scope.row.forwardZD == '1'">
-              <el-popconfirm confirm-button-text="是" cancel-button-text="否" icon="el-icon-info" icon-color="red" title="是否重新转发中鼎？" @confirm="toForwardZD">
+              <el-popconfirm confirm-button-text="是" cancel-button-text="否" icon="el-icon-info" icon-color="red" title="是否重新转发中鼎？" @confirm="toForwardZD(scope.row)">
                 <a slot="reference" style="color: red;text-decoration: underline">失败</a>
               </el-popconfirm>
             </template>
@@ -142,7 +142,13 @@ export default {
       return y + '-' + m + '-' + day + ' ' + h + ':' + min + ':' + s
     },
     toForwardZD() {
-      console.log(123)
+      crudPurchase.pushZD({
+        billid: row.bill_id,
+        orderNo: row.order_no,
+        orderType: row.order_type,
+        red: row.red,
+        status: row.status
+      })
     },
     toView(index, row) {
       this.mstrow = row
diff --git a/nladmin-ui/src/views/wms/st/allocationOut/purchase.js b/nladmin-ui/src/views/wms/st/allocationOut/purchase.js
index b813bd8..ec74ff4 100644
--- a/nladmin-ui/src/views/wms/st/allocationOut/purchase.js
+++ b/nladmin-ui/src/views/wms/st/allocationOut/purchase.js
@@ -47,4 +47,12 @@ export function print(ids) {
   })
 }
 
-export default { add, edit, del, get, issueReturnBill, print }
+export function pushZD(data) {
+  return request({
+    url: '/api/purchasemst/pushZD',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, get, issueReturnBill, print,pushZD }
diff --git a/nladmin-ui/src/views/wms/st/otherIn/index.vue b/nladmin-ui/src/views/wms/st/otherIn/index.vue
index 3ff6fa7..ac3694d 100644
--- a/nladmin-ui/src/views/wms/st/otherIn/index.vue
+++ b/nladmin-ui/src/views/wms/st/otherIn/index.vue
@@ -54,7 +54,7 @@
           <template slot-scope="scope">
             <p v-if="scope.row.forwardZD == '0'">-</p>
             <template v-else-if="scope.row.forwardZD == '1'">
-              <el-popconfirm confirm-button-text="是" cancel-button-text="否" icon="el-icon-info" icon-color="red" title="是否重新转发中鼎？" @confirm="toForwardZD">
+              <el-popconfirm confirm-button-text="是" cancel-button-text="否" icon="el-icon-info" icon-color="red" title="是否重新转发中鼎？" @confirm="toForwardZD(scope.row)">
                 <a slot="reference" style="color: red;text-decoration: underline">失败</a>
               </el-popconfirm>
             </template>
@@ -145,7 +145,13 @@ export default {
       return y + '-' + m + '-' + day + ' ' + h + ':' + min + ':' + s
     },
     toForwardZD() {
-      console.log(123)
+      crudPurchase.pushZD({
+        billid: row.bill_id,
+        orderNo: row.order_no,
+        orderType: row.order_type,
+        red: row.red,
+        status: row.status
+      })
     },
     toView(index, row) {
       this.mstrow = row
diff --git a/nladmin-ui/src/views/wms/st/otherIn/purchase.js b/nladmin-ui/src/views/wms/st/otherIn/purchase.js
index 5b3947b..3966b2d 100644
--- a/nladmin-ui/src/views/wms/st/otherIn/purchase.js
+++ b/nladmin-ui/src/views/wms/st/otherIn/purchase.js
@@ -46,5 +46,12 @@ export function print(ids) {
     data: ids
   })
 }
+export function pushZD(data) {
+  return request({
+    url: '/api/purchasemst/pushZD',
+    method: 'post',
+    data
+  })
+}
 
-export default { add, edit, del, get, issueReturnBill, print }
+export default { add, edit, del, get, issueReturnBill, print,pushZD }
diff --git a/nladmin-ui/src/views/wms/st/otherOut/index.vue b/nladmin-ui/src/views/wms/st/otherOut/index.vue
index 2fd081a..3992235 100644
--- a/nladmin-ui/src/views/wms/st/otherOut/index.vue
+++ b/nladmin-ui/src/views/wms/st/otherOut/index.vue
@@ -51,7 +51,7 @@
           <template slot-scope="scope">
             <p v-if="scope.row.forwardZD == '0'">-</p>
             <template v-else-if="scope.row.forwardZD == '1'">
-              <el-popconfirm confirm-button-text="是" cancel-button-text="否" icon="el-icon-info" icon-color="red" title="是否重新转发中鼎？" @confirm="toForwardZD">
+              <el-popconfirm confirm-button-text="是" cancel-button-text="否" icon="el-icon-info" icon-color="red" title="是否重新转发中鼎？" @confirm="toForwardZD(scope.row)">
                 <a slot="reference" style="color: red;text-decoration: underline">失败</a>
               </el-popconfirm>
             </template>
@@ -142,7 +142,13 @@ export default {
       return y + '-' + m + '-' + day + ' ' + h + ':' + min + ':' + s
     },
     toForwardZD() {
-      console.log(123)
+      crudPurchase.pushZD({
+        billid: row.bill_id,
+        orderNo: row.order_no,
+        orderType: row.order_type,
+        red: row.red,
+        status: row.status
+      })
     },
     toView(index, row) {
       this.mstrow = row
diff --git a/nladmin-ui/src/views/wms/st/otherOut/purchase.js b/nladmin-ui/src/views/wms/st/otherOut/purchase.js
index 6d427c6..c726106 100644
--- a/nladmin-ui/src/views/wms/st/otherOut/purchase.js
+++ b/nladmin-ui/src/views/wms/st/otherOut/purchase.js
@@ -46,5 +46,12 @@ export function print(ids) {
     data: ids
   })
 }
+export function pushZD(data) {
+  return request({
+    url: '/api/purchasemst/pushZD',
+    method: 'post',
+    data
+  })
+}
 
-export default { add, edit, del, get, issueReturnBill, print }
+export default { add, edit, del, get, issueReturnBill, print,pushZD }
diff --git a/nladmin-ui/src/views/wms/st/purchase/index.vue b/nladmin-ui/src/views/wms/st/purchase/index.vue
index 25dddb2..79e84d0 100644
--- a/nladmin-ui/src/views/wms/st/purchase/index.vue
+++ b/nladmin-ui/src/views/wms/st/purchase/index.vue
@@ -58,7 +58,7 @@
                 icon="el-icon-info"
                 icon-color="red"
                 title="是否重新转发中鼎？"
-                @confirm="toForwardZD"
+                @confirm="toForwardZD(scope.row)"
               >
                 <a slot="reference" style="color: red;text-decoration: underline">失败</a>
               </el-popconfirm>
@@ -166,8 +166,14 @@ export default {
       const s = String(d.getSeconds()).padStart(2, '0')
       return y + '-' + m + '-' + day + ' ' + h + ':' + min + ':' + s
     },
-    toForwardZD() {
-      console.log(123)
+    toForwardZD(row) {
+      crudPurchase.pushZD({
+        billid: row.bill_id,
+        orderNo: row.order_no,
+        orderType: row.order_type,
+        red: row.red,
+        status: row.status
+      })
     },
     toView(index, row) {
       this.mstrow = row
diff --git a/nladmin-ui/src/views/wms/st/purchase/purchase.js b/nladmin-ui/src/views/wms/st/purchase/purchase.js
index ab9ab88..4eb721a 100644
--- a/nladmin-ui/src/views/wms/st/purchase/purchase.js
+++ b/nladmin-ui/src/views/wms/st/purchase/purchase.js
@@ -47,4 +47,12 @@ export function print(ids) {
   })
 }
 
-export default { add, edit, del, get, issueReturnBill, print }
+export function pushZD(data) {
+  return request({
+    url: '/api/purchasemst/pushZD',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, get, issueReturnBill, print,pushZD }