add:出入库单据转发中鼎

2026-07-08 10:12:51 +08:00
parent 5324d1583e
commit 0768a1c059
11 changed files with 95 additions and 17 deletions
--- 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);
+    }
 }
--- 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
--- 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 }
--- 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
--- 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 }
--- 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
--- 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 }
--- 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
--- 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 }
--- 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
--- 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 }