From a4bc934ba3dfbda5c5de06d08357e7f77199fd01 Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Wed, 1 Apr 2026 11:25:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=95=80=E5=89=8D=E5=87=BA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/warehousingIssue.js               | 11 ++--
 pages/production/warehousing.vue      | 79 +++++++++++++--------------
 pages/production/warehousingIssue.vue | 64 +++++++++++++---------
 3 files changed, 79 insertions(+), 75 deletions(-)

diff --git a/api/warehousingIssue.js b/api/warehousingIssue.js
index 56b8ad4..51cd68e 100644
--- a/api/warehousingIssue.js
+++ b/api/warehousingIssue.js
@@ -2,21 +2,18 @@ import http from '@/http/api.js'
 // 镀前出库  查询数据
 const getBeforePlatOutCardNo = (params) => {
     return http.request({
-        url: '/blade-desk//plateAround/getBeforePlatOutCardNo',
+        url: '/blade-desk/plateAround/getBeforePlatOutCardNo',
         method: 'get',
         params: params
     })
 }
 
 // 镀前出库  保存数据 
-const savePlateFrontEnterIssue = (params) => {
+const savePlateFrontEnterIssue = (data) => {
     return http.request({
-        url: '/blade-desk/plateAround/savePlateFrontEnter',
+        url: '/blade-desk/plateAround/savePlateFrontIssue',
         method: 'post',
-        data: {
-            ...params,
-            paType:2
-        }
+        data:data
     })
 }
 
diff --git a/pages/production/warehousing.vue b/pages/production/warehousing.vue
index 185e0b0..72ff71b 100644
--- a/pages/production/warehousing.vue
+++ b/pages/production/warehousing.vue
@@ -24,58 +24,45 @@
         <t-td>批次号</t-td>
         <t-td>{{ prWorkOrder.batchNo }}</t-td>
       </t-tr>
-      <t-tr>
+      <!-- <t-tr>
         <t-td>需求部门</t-td>
-        <t-td>{{ prWorkOrder.pjYieldOrder.useDept }}</t-td>
-      </t-tr>
-      <t-tr>
+        <t-td>{{ prWorkOrder.useDept }}</t-td>
+      </t-tr> -->
+      <!-- <t-tr>
         <t-td>零件编码</t-td>
-        <t-td>{{ prWorkOrder.pjYieldOrder.partCode }}</t-td>
+        <t-td>{{ prWorkOrder.partCode }}</t-td>
       </t-tr>
       <t-tr>
         <t-td>零件名称</t-td>
-        <t-td>{{ prWorkOrder.pjYieldOrder.partName }}</t-td>
-      </t-tr>
+        <t-td>{{ prWorkOrder.partName }}</t-td>
+      </t-tr> -->
       <t-tr>
         <t-td>工序号</t-td>
-        <t-td>{{ prWorkPlan.orders }}</t-td>
+        <t-td>{{ prWorkPlan.processCode }}</t-td>
       </t-tr>
       <t-tr>
         <t-td>工序名称</t-td>
-        <t-td>{{ prWorkOrder.procedureSet.ppsName }}</t-td>
+        <t-td>{{ prWorkOrder.processName }}</t-td>
       </t-tr>
       <t-tr>
         <t-td>班组/供应商</t-td>
-        <t-td>{{ makeTeam.tsName || oemCustomer.ocName }}</t-td>
+        <t-td>{{ prWorkOrder.teamCode || prWorkOrder.ocName }}</t-td>
       </t-tr>
       <t-tr>
         <t-td>入库数量</t-td>
-        <t-td>{{ prWorkOrder.makeQty }}</t-td>
+        <t-td>{{ prWorkOrder.inQuantity }}</t-td>
       </t-tr>
       <t-tr>
         <t-td>下序号</t-td>
-        <t-td>{{ prWorkOrder.nextOrders || "" }}</t-td>
+        <t-td>{{ prWorkOrder.nextProcessCode || "" }}</t-td>
       </t-tr>
       <t-tr>
         <t-td>下序名称</t-td>
-        <t-td>{{
-          (prWorkOrder &&
-            prWorkOrder.nextProcedureSet &&
-            prWorkOrder.nextProcedureSet.ppsName) ||
-          ""
-        }}</t-td>
+        <t-td>{{ prWorkOrder.nextProcessName }}</t-td>
       </t-tr>
       <t-tr>
         <t-td>下序班组/供应商</t-td>
-        <t-td>{{
-          (prWorkOrder &&
-            prWorkOrder.nextMakeTeam &&
-            prWorkOrder.nextMakeTeam.tsName) ||
-          (prWorkOrder &&
-            prWorkOrder.nextBsOemCustomer &&
-            prWorkOrder.nextBsOemCustomer.ocName) ||
-          ""
-        }}</t-td>
+        <t-td>{{ prWorkOrder.nextTeamCode }}</t-td>
       </t-tr>
     </t-table>
     <view class="buttonBox">
@@ -135,15 +122,16 @@ export default {
         let data = res.data;
         this.value = "";
         this.prWorkPlan = data;
-        this.prWorkOrder = data.prWorkOrder;
-        console.log(data.prWorkOrder);
-        this.quantity = data.prWorkOrder.makeQty;
-        if (!data.oem) {
-          this.makeTeam = data.makeTeam;
-        }
-        if (data.oemCustomer) {
-          this.oemCustomer = data.oemCustomer;
-        }
+        this.prWorkOrder = data;
+        this.quantity = data.inQuantity;
+
+        // if (!data.oem) {
+        //   this.makeTeam = data.makeTeam;
+        // }
+        // if (data.oemCustomer) {
+        //   this.oemCustomer = data.oemCustomer;
+        // }
+
         uni.showToast({
           title: "数据获取成功",
         });
@@ -170,13 +158,24 @@ export default {
       //   });
     },
     submitClick() {
-      this.$u.api.savePlateFrontEnter({}).then((res) => {
+      let query = [];
+      query.push({
+        wpId: this.prWorkPlan.wpId,
+        tsId: this.prWorkPlan.teamId,
+        ocId: this.prWorkPlan.ocId ? this.prWorkPlan.ocId : null,
+        id: this.prWorkPlan.id,
+        quantity: this.prWorkPlan.inQuantity,
+      });
+      console.log(query,'query');
+
+      this.$u.api.savePlateFrontEnter(query).then((res) => {
         uni.showToast({
           title: "入库成功",
         });
         this.value = "";
         this.setData();
       });
+
       //   this.$ajax.request({
       //     url: "pdaSave/savePlateFe",
       //     method: "POST",
@@ -197,11 +196,7 @@ export default {
     setData() {
       this.prWorkPlan = {};
       this.prWorkOrder = {
-        procedureSet: {},
-        pjYieldOrder: {},
-        nextProcedureSet: {},
-        nextMakeTeam: {},
-        nextBsOemCustomer: {},
+       
       };
       this.quantity = null;
       this.makeTeam = {};
diff --git a/pages/production/warehousingIssue.vue b/pages/production/warehousingIssue.vue
index 801cc9d..fd5bda5 100644
--- a/pages/production/warehousingIssue.vue
+++ b/pages/production/warehousingIssue.vue
@@ -12,64 +12,64 @@
     <t-table style="margin-top: 20rpx">
       <t-tr>
         <t-td>流程卡号</t-td>
-        <t-td>{{ prWorkOrder.cardNo }}</t-td>
+        <t-td>{{ prWorkPlan.cardNo }}</t-td>
       </t-tr>
       <t-tr>
         <t-td>车间订单号</t-td>
-        <t-td>{{ prWorkOrder.woCode }}</t-td>
+        <t-td>{{ prWorkPlan.woCode }}</t-td>
       </t-tr>
       <t-tr>
         <t-td>批次号</t-td>
-        <t-td>{{ prWorkOrder.batchNo }}</t-td>
+        <t-td>{{ prWorkPlan.batchNo }}</t-td>
       </t-tr>
-      <t-tr>
+      <!-- <t-tr>
         <t-td>需求部门</t-td>
-        <t-td>{{ prWorkOrder.pjYieldOrder.useDept }}</t-td>
+        <t-td>{{ prWorkOrder.useDept }}</t-td>
       </t-tr>
       <t-tr>
         <t-td>零件编码</t-td>
-        <t-td>{{ prWorkOrder.pjYieldOrder.partCode }}</t-td>
+        <t-td>{{ prWorkOrder.partCode }}</t-td>
       </t-tr>
       <t-tr>
         <t-td>零件名称</t-td>
-        <t-td>{{ prWorkOrder.pjYieldOrder.partName }}</t-td>
-      </t-tr>
+        <t-td>{{ prWorkOrder.partName }}</t-td>
+      </t-tr> -->
       <t-tr>
         <t-td>上序号</t-td>
-        <t-td>{{ prWorkPlan.orders }}</t-td>
+        <t-td>{{ prWorkOrder.nextProcessCode }}</t-td>
       </t-tr>
       <t-tr>
         <t-td>上序名称</t-td>
-        <t-td>{{ prWorkPlan.procedureSet.ppsName }}</t-td>
+        <t-td>{{ prWorkOrder.nextProcessName }}</t-td>
       </t-tr>
       <t-tr>
         <t-td>上序班组/供应商</t-td>
         <t-td>{{
-          prWorkPlan.makeTeam.tsName || prWorkPlan.bsOemCustomer.ocName
+          prWorkOrder.nextTeamCode || prWorkOrder.ocName
         }}</t-td>
       </t-tr>
       <t-tr>
         <t-td>工序号</t-td>
-        <t-td>{{ prWorkPlan.nextWorkPlan.orders }}</t-td>
+        <t-td>{{ prWorkOrder.processCode }}</t-td>
       </t-tr>
       <t-tr>
         <t-td>工序名称</t-td>
-        <t-td>{{ prWorkPlan.nextWorkPlan.procedureSet.ppsName }}</t-td>
+        <t-td>{{ prWorkOrder.processName }}</t-td>
       </t-tr>
       <t-tr>
         <t-td>班组/供应商</t-td>
-        <t-td>{{ makeTeam.tsName || oemCustomer.ocName }}</t-td>
+        <t-td>{{ prWorkOrder.teamCode || prWorkOrder.ocName }}</t-td>
       </t-tr>
       <t-tr>
         <t-td>出库数量</t-td>
-        <t-td>{{ prWorkOrder.makeQty }}</t-td>
+        <t-td>{{ prWorkOrder.inQuantity }}</t-td>
       </t-tr>
     </t-table>
     <view class="buttonBox"
       ><button
         class="button"
         type="primary"
-        :disabled="!(Object.keys(this.prWorkOrder.pjYieldOrder).length > 0)"
+        :disabled="!(Object.keys(this.prWorkOrder).length > 0)"
         @click="submitClick"
       >
         出库
@@ -121,17 +121,18 @@ export default {
       this.value = code;
       this.$u.api.getBeforePlatOutCardNo({ cardNo: code }).then((res) => {
         let data = res.data;
+        console.log(data,'8787878878');
         this.value = "";
         this.prPlateAround = data;
-        this.prWorkPlan = data.prWorkPlan;
-        this.prWorkOrder = data.prWorkPlan.prWorkOrder;
-        this.quantity = data.prWorkPlan.quantity;
-        if (!data.prWorkPlan.oem) {
-          this.makeTeam = data.prWorkPlan.makeTeam;
-        }
-        if (data.oemCustomer) {
-          this.oemCustomer = data.prWorkPlan.oemCustomer;
-        }
+        this.prWorkPlan = data;
+        this.prWorkOrder = data;
+        this.quantity = data.inQuantity;
+        // if (!data.prWorkPlan.oem) {
+        //   this.makeTeam = data.prWorkPlan.makeTeam;
+        // }
+        // if (data.oemCustomer) {
+        //   this.oemCustomer = data.prWorkPlan.oemCustomer;
+        // }
         uni.showToast({
           title: "数据获取成功",
         });
@@ -158,13 +159,24 @@ export default {
       //   });
     },
     submitClick() {
-      this.$u.api.savePlateFrontEnterIssue(this.prPlateAround).then((res) => {
+      let query = [];
+      query.push({
+        wpId: this.prWorkPlan.wpId,
+        tsId: this.prWorkPlan.teamId,
+        ocId: this.prWorkPlan.ocId ? this.prWorkPlan.ocId : null,
+        id: this.prWorkPlan.id,
+        quantity: this.prWorkPlan.inQuantity,
+      });
+      console.log(query,'query');
+      this.$u.api.savePlateFrontEnterIssue(query).then((res) => {
         uni.showToast({
           title: "出库成功",
         });
         this.value = "";
         this.setData();
       });
+
+
       // this.$ajax.request({
       //     url: 'pdaSave/savePlateFi',
       //     method: 'POST',