From f8e5b30d97956443178558b8a3474083939fb61b Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Wed, 30 Oct 2024 12:15:45 +0800
Subject: [PATCH] =?UTF-8?q?wms=E7=99=BD=E8=83=9A=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/wmsbpworkorder.js       | 19 ++++++++++++++++---
 src/views/wms/workorderBP/index.vue | 28 +++++++++++++++-------------
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/api/wms/wmsbpworkorder.js b/src/api/wms/wmsbpworkorder.js
index 281df1a..7669352 100644
--- a/src/api/wms/wmsbpworkorder.js
+++ b/src/api/wms/wmsbpworkorder.js
@@ -42,7 +42,7 @@ export function getOrderAndWork(data) {
   })
 }
 
-// 查询生产工单列表
+// 查询生产工单列表s
 export function listWorkorder(query) {
 	return request({
 		url: '/plan/bppro/workorder/list',
@@ -50,7 +50,14 @@ export function listWorkorder(query) {
 		params: query
 	});
 }
-
+// 查询生产工单列表s
+export function listNeWorkorder(query) {
+  return request({
+    url: '/wms//WmsToWCSInterface/listNe',
+    method: 'get',
+    params: query
+  });
+}
 // 查询生产工单详细
 export function getWorkorder(workorderId) {
 	return request({
@@ -108,4 +115,10 @@ export function subChangeWorkOrderM(data){
 	  method:'post',
 	  data:data
 	})
-  }
\ No newline at end of file
+  }
+export function getWorkOrdersWMS(workorderCode) {
+  return request({
+    url:'/wms/WmsToWCSInterface/getWorkOrders/'+workorderCode,
+    method:'get'
+  })
+}
diff --git a/src/views/wms/workorderBP/index.vue b/src/views/wms/workorderBP/index.vue
index 09b3e62..8176d6a 100644
--- a/src/views/wms/workorderBP/index.vue
+++ b/src/views/wms/workorderBP/index.vue
@@ -102,7 +102,6 @@
 
     <el-table v-loading="loading" :data="workorderList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" align="center">
-
       </el-table-column>
       <el-table-column label="工单ID" align="center" prop="workorderId" v-if="false"/>
       <el-table-column width="160" label="子工单编号" align="center" prop="workorderCode"/>
@@ -122,7 +121,9 @@
             <div v-for="item in scope.row.batchInfo">{{ item }}</div>
         </template>
       </el-table-column>-->
-      <el-table-column width="90" label="派工数量" align="center" prop="quantitySplit"/>
+      <el-table-column width="90" label="完成数" align="center" prop="attr1"/>
+      <el-table-column width="90" label="入库数量" align="center" prop="attr5"/>
+      <el-table-column width="90" label="未入库数量" align="center" prop="attr6"/>
       <el-table-column width="50" label="单位" align="center" prop="unit"/>
       <el-table-column width="90" label="工艺编码" align="center" prop="routeCode"/>
       <el-table-column width="180" label="工艺名称" align="center" prop="routeName" />
@@ -210,21 +211,17 @@
               label="生产订单">
             </el-table-column>
             <el-table-column
-              prop="quantityProduced"
+              prop="attr1"
               label="已生产数量">
             </el-table-column>
-            <el-table-column
-              prop="quantitySplit"
-              label="拆分数量">
-            </el-table-column>
             <el-table-column
               prop="routeCode"
               label="工艺编码">
             </el-table-column>
-            <el-table-column
-              prop="prodLineCode"
-              label="产线设备">
-            </el-table-column>
+<!--            <el-table-column-->
+<!--              prop="prodLineCode"-->
+<!--              label="产线设备">-->
+<!--            </el-table-column>-->
             <el-table-column label="班次" align="center" prop="shiftId" :formatter="shiftFormat">
             </el-table-column>
             <el-table-column label="工单状态" align="center" prop="status">
@@ -273,7 +270,9 @@
 <script>
 import {
   getWorkOrders,
+  getWorkOrdersWMS,
   listWorkorder,
+  listNeWorkorder,
   delWorkorder,
   downWorkorder,
   getOrderAndWork,getProSortNo,
@@ -1023,7 +1022,7 @@ export default {
       this.printData.manufacture = this.$store.state.user.name;
       this.newWorkerLoading = true // 设置加载状态为true，表示正在加载
       this.refreshNewWorkerTable = false // 先将refreshProTable设置为false，隐藏表格
-      getWorkOrders(this.selectWork.workorderCode).then(response => {
+      getWorkOrdersWMS(this.selectWork.workorderCode).then(response => {
         this.printData.workTable = response.data;
         this.printData.factory = response.data[0].factoryCode;
         this.printData.productDate = response.data[0].productDate;
@@ -1040,7 +1039,8 @@ export default {
         this.queryParams.productDateEnd = moment(this.queryParams.productDateArray[1]).format('YYYY-MM-DD');
       }
 
-      listWorkorder(this.queryParams).then(response => {
+      listNeWorkorder(this.queryParams).then(response => {
+        console.log(response.rows)
         this.workorderList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -1282,6 +1282,8 @@ export default {
         attr2: null,
         attr3: null,
         attr4: null,
+        attr5: null,
+        attr6: null,
         createBy: null,
         createTime: null,
         updateBy: null,