From 9a8168790e0d6b8601b0f7f5557976358677eeb1 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 19 5月 2025 08:00:50 +0800
Subject: [PATCH] 22

---
 PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx |   77 +++++++++++++++++++++++---------------
 1 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx b/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx
index 7261c72..11339fe 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx
+++ b/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx
@@ -17,9 +17,8 @@
   getPlaceNoForStockList,
   getMaterialModelList,
   instock,
-  findSingleWorkPlanByFilter,
-  pick,
-  finishProduction
+  getPickRet,
+  pick
 } from '@/widgets/PipeAccessoryPick/Models/Service/PipeAccessoryPick'
 import { Message } from '@element-plus/icons-vue/dist/types'
 
@@ -30,6 +29,7 @@
 const queryForm = ref({
   pipeSpecCode: '',
   continerNo:'',
+  placeNo:'',
   processRouteNumber: '',
   taskCode: '',
   length: '',
@@ -104,12 +104,13 @@
         processName:'瑁呴厤宸ュ簭',
         processName_FilterMode:2,//绮惧噯鏌ヨ
       }
-      const workPlan = await findSingleWorkPlanByFilter(param);
+      const workPlan = await getPickRet(param);
       console.log('杩斿洖:'+workPlan);
-      if(workPlan==''){
+      if(workPlan.code!="200"){
         ElMessage.error('娌℃湁鎵惧埌鏁版嵁'); 
         queryForm.value ={ pipeSpecCode: '',
           continerNo:'',
+          placeNo:'',
           processRouteNumber: '',
           taskCode: '',
           length: '',
@@ -124,7 +125,10 @@
           processName: '',
           equipmentCode: ''}
       }else{
-        queryForm.value=workPlan;
+        queryForm.value=workPlan.data.workPlan;
+
+        queryForm.value.placeNo=workPlan.data.placeNo;
+        queryForm.value.continerNo=workPlan.data.continerNo;
       }
     };
 
@@ -146,40 +150,44 @@
                 const param={
                   pipeSpecCode:queryForm.value.pipeSpecCode,
                   continerNo:queryForm.value.continerNo,
+                  placeNo:queryForm.value.placeNo
                 };
+                
                 const ret = await pick(param);
       console.log('杩斿洖:'+ret);
-                if(ret.code="200"){
+      
+                if(ret.code=="200"){
                   ElMessage.success('鍒嗘嫞鎴愬姛'); 
                 }else{
                   ElMessage.error('鍒嗘嫞澶辫触:'+ret.message); 
                 }
               }) 
     } 
-    // 瀹屽伐浜嬩欢澶勭悊
-    const finishWork = () => {
-      console.log('鎵ц寮�宸ユ搷浣�');
-      if(queryForm.value.pipeSpecCode==''){
-        ElMessage.error('璇疯緭鍏ョ娈电紪鐮�'); 
-        return
-      }
-      ConfirmBox( 
-                `纭畾瑕佸皢绠℃缂栫爜${queryForm.value.pipeSpecCode}瀹屽伐鍚梎 
-              ).then(async () => { 
-                //鎮ㄧ殑涓氬姟閫昏緫
-                const param={
-                  pipeSpecCode:queryForm.value.pipeSpecCode,
-                  processName:queryForm.value.processName,
-                };
-                const ret = await finishProduction(param);
-      console.log('杩斿洖:'+ret);
-                if(ret.code="200"){
-                  ElMessage.success('瀹屽伐鎴愬姛'); 
-                }else{
-                  ElMessage.error('瀹屽伐澶辫触:'+ret.message); 
-                }
-              }) 
-    }
+    // // 瀹屽伐浜嬩欢澶勭悊
+    // const finishWork = () => {
+    //   console.log('鎵ц寮�宸ユ搷浣�');
+    //   if(queryForm.value.pipeSpecCode==''){
+    //     ElMessage.error('璇疯緭鍏ョ娈电紪鐮�'); 
+    //     return
+    //   }
+    //   ConfirmBox( 
+    //             `纭畾瑕佸皢绠℃缂栫爜${queryForm.value.pipeSpecCode}瀹屽伐鍚梎 
+    //           ).then(async () => { 
+    //             //鎮ㄧ殑涓氬姟閫昏緫
+    //             const param={
+    //               pipeSpecCode:queryForm.value.pipeSpecCode,
+    //               processName:queryForm.value.processName,
+
+    //             };
+    //             const ret = await finishProduction(param);
+    //   console.log('杩斿洖:'+ret);
+    //             if(ret.code="200"){
+    //               ElMessage.success('瀹屽伐鎴愬姛'); 
+    //             }else{
+    //               ElMessage.error('瀹屽伐澶辫触:'+ret.message); 
+    //             }
+    //           }) 
+    // }
     const tableData = ref([
       { sequence: 1, flangeA: 'RF-200-1.6MPa', flangeB: 'WN-200-1.6MPa' },
       { sequence: 2, flangeA: 'WN-250-2.5MPa', flangeB: 'SO-250-2.5MPa' },
@@ -215,6 +223,13 @@
                     class={styles.formInput}
                   />
                 </ElFormItem>
+                <ElFormItem label="搴撲綅鍙�&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;">
+                  <ElInput
+                    v-model={queryForm.value.placeNo}
+                    clearable
+                    class={styles.formInput}
+                  />
+                </ElFormItem>
           <div class={styles.actionButtons}>
             <ElButton type="warning" onClick={startWork}>鍒嗘嫞</ElButton>
             {/* <ElButton type="warning" onClick={finishWork}>瀹屽伐</ElButton> */}

--
Gitblit v1.9.3