From 54b4f53323d0833cbac86fd18932c5fa5a5447a8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 17 二月 2025 14:19:17 +0800
Subject: [PATCH] #移库任务

---
 zy-asrs-flow/src/pages/device/shuttle/index.jsx |   71 +++++++++++++++++++++++++++++++++--
 1 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/zy-asrs-flow/src/pages/device/shuttle/index.jsx b/zy-asrs-flow/src/pages/device/shuttle/index.jsx
index 360d421..dea6fef 100644
--- a/zy-asrs-flow/src/pages/device/shuttle/index.jsx
+++ b/zy-asrs-flow/src/pages/device/shuttle/index.jsx
@@ -6,12 +6,14 @@
     PageContainer,
 } from '@ant-design/pro-components';
 import './index.less'
+import { WEBSOCKET_BASE_URL } from '@/config/setting';
 
 const Main = () => {
     const [deviceInfos, setDeviceInfos] = useState([]);
     const [ws, setWs] = useState(null);
     const [openOpera, setOpenOpera] = useState(false);
     const [currentData, setCurrentData] = useState(null);
+    const [sourceLoc, setSourceLoc] = useState("");
     const [targetLoc, setTargetLoc] = useState("");
     const [xStart, setXStart] = useState(1);
     const [xTarget, setXTarget] = useState(1);
@@ -20,8 +22,7 @@
     const [moveLocType, setMoveLocType] = useState(1);
 
     useEffect(() => {
-        var newWs = new WebSocket("ws://127.0.0.1:9090/wcs/ws/shuttle/websocket");
-        setWs(newWs);
+        connect();
 
         return () => {
             if (ws) {
@@ -57,6 +58,7 @@
 
             ws.onclose = function (e) {
                 console.log("close");
+                reconnect();
             }
 
             ws.onerror = function (e) {
@@ -64,6 +66,18 @@
             }
         }
     }, [ws]);
+
+    const connect = () => {
+        var newWs = new WebSocket(WEBSOCKET_BASE_URL + "/ws/shuttle/websocket");
+        setWs(newWs);
+    }
+
+    const reconnect = () => {
+        setTimeout(() => {
+            console.log('WebSocketClient: Attempting to reconnect...');
+            connect();
+        }, 3000);
+    }
 
     const sendWs = (message) => {
         if (ws.readyState == WebSocket.OPEN) {
@@ -88,6 +102,10 @@
         setOpenOpera(false);
     };
 
+    const sourceLocChange = (e) => {
+        setSourceLoc(e.target.value)
+    }
+
     const targetLocChange = (e) => {
         setTargetLoc(e.target.value)
     }
@@ -98,12 +116,23 @@
                 message.warning('璇疯緭鍏ョ洰鏍囦綅缃�');
                 return;
             }
+        }else if(type == 'takeMove') {
+            if (targetLoc == '') {
+                message.warning('璇疯緭鍏ョ洰鏍囦綅缃�');
+                return;
+            }
+
+            if (sourceLoc == '') {
+                message.warning('璇疯緭鍏ヨ捣濮嬩綅缃�');
+                return;
+            }
         }
 
         try {
             const resp = await Http.doPost('api/basShuttle/operator/shuttle', {
                 shuttleNo: currentData.shuttleNo,
                 shuttleTaskMode: type,
+                sourceLocNo: sourceLoc,
                 targetLocNo: targetLoc
             });
             if (resp.code === 200) {
@@ -146,6 +175,25 @@
             return false;
         }
     }
+
+    const shuttleMoveLocClose = async () => {
+        try {
+            const resp = await Http.doPost('api/basShuttle/moveLocClose', {
+                shuttleNo: currentData.shuttleNo,
+            });
+            if (resp.code === 200) {
+                message.success("璇锋眰鎴愬姛");
+                return true;
+            } else {
+                message.warning(resp.msg);
+                return false;
+            }
+        } catch (error) {
+            message.warning("璇锋眰澶辫触");
+            return false;
+        }
+    }
+
 
     const xStartChange = (e) => {
         setXStart(e.target.value)
@@ -207,7 +255,7 @@
                     {
                         key: '6',
                         label: '閿欒鐮�',
-                        children: '0',
+                        children: item.errorCode$,
                     },
                     {
                         key: '7',
@@ -243,7 +291,12 @@
                         key: '13',
                         label: '鑷姩',
                         children: item.mode ? 'Y' : 'N',
-                    }
+                    },
+                    {
+                        key: '14',
+                        label: '搴撲綅鍙�',
+                        children: item.currentLocNo,
+                    },
                 ];
                 return <div key={item.id} style={{ width: '45%' }}>
                     <div style={{ marginBottom: '10px' }}>
@@ -265,11 +318,17 @@
                     <div style={{ marginBottom: '15px' }}>
                         <Card title="绉诲姩鎸囦护" style={{ width: 300 }}>
                             <p>
+                                <Input addonBefore="璧峰浣嶇疆" onChange={sourceLocChange} />
+                            </p>
+                            <p>
                                 <Input addonBefore="鐩爣浣嶇疆" onChange={targetLocChange} />
                             </p>
                             <p>
-                                <Button onClick={() => shuttleOperator('moveLoc')}>绉诲姩鍒扮洰鏍囦綅缃�</Button>
                             </p>
+                            <div className="commandItem">
+                                <Button onClick={() => shuttleOperator('moveLoc')}>绉诲姩鍒扮洰鏍囦綅缃�</Button>
+                                <Button onClick={() => shuttleOperator('takeMove')}>鍙栨斁璐т綔涓�</Button>
+                            </div>
                         </Card>
                     </div>
 
@@ -280,6 +339,7 @@
                                 <Button onClick={() => shuttleOperator('palletDown')}>鎵樼洏涓嬮檷</Button>
                                 <Button onClick={() => shuttleOperator('chargeOpen')}>鍏呯數寮�</Button>
                                 <Button onClick={() => shuttleOperator('chargeClose')}>鍏呯數鍏�</Button>
+                                <Button onClick={() => shuttleOperator('requestWaiting')}>鐢宠纭</Button>
                                 <Button onClick={() => shuttleOperator('reset')}>澶嶄綅</Button>
                             </div>
                         </Card>
@@ -301,6 +361,7 @@
                                     />
                                 </div>
                                 <Button onClick={() => shuttleMoveLoc()}>璺戝簱</Button>
+                                <Button onClick={() => shuttleMoveLocClose()}>璺戝簱鍏抽棴</Button>
                             </div>
                         </Card>
                     </div>

--
Gitblit v1.9.1