From afc12f9bbd372b55a4539c1fc40b17dbd5949cb1 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 19 八月 2025 13:44:38 +0800
Subject: [PATCH] 1

---
 src/main/webapp/views/pipeline.html |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 34bc757..5780974 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -100,10 +100,11 @@
                         <th>鍙叆</th>
                         <th>鍙嚭</th>
                         <th>鍑哄叆搴撴ā寮�</th>
-                        <th>绌烘澘淇″彿</th>
+                        <th>瀹岀粨宸ヤ綔鍙�</th>
                         <th>鐩爣绔�</th>
-                        <th>鎻愬崌鏈哄埌浣嶄俊鍙�</th>
-                        <th>楂樹綆淇″彿</th>
+                        <th>鎵樼洏鐮�</th>
+<!--                        <th>鎻愬崌鏈哄埌浣嶄俊鍙�</th>-->
+<!--                        <th>楂樹綆淇″彿</th>-->
                     </tr>
                     </thead>
                     <!-- 琛ㄦ牸鍐呭 -->
@@ -287,10 +288,11 @@
                         setVal(tr.children("td").eq(4), table[i-1].inEnable);
                         setVal(tr.children("td").eq(5), table[i-1].outEnable);
                         setVal(tr.children("td").eq(6), table[i-1].outInModel);
-                        setVal(tr.children("td").eq(7), table[i-1].emptyMk);
+                        setVal(tr.children("td").eq(7), table[i-1].finishWorkNo);
                         setVal(tr.children("td").eq(8), table[i-1].staNo);
-                        setVal(tr.children("td").eq(9), table[i-1].liftArrival);
-                        setVal(tr.children("td").eq(10), table[i-1].locType1);
+                        setVal(tr.children("td").eq(9), table[i-1].barcode);
+                        // setVal(tr.children("td").eq(9), table[i-1].liftArrival);
+                        //setVal(tr.children("td").eq(10), table[i-1].locType1);
                     }
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";
@@ -376,7 +378,7 @@
                 "       <td></td>\n" +
                 "       <td></td>\n" +
                 "       <td></td>\n" +
-                "       <td></td>\n" +
+                 "       <td></td>\n" +
                 "       <td></td>\n" +
                 "     </tr>\n";
         }

--
Gitblit v1.9.1