From 2eecb1a7d658479ed7ac0990b6dbdddc91fe8480 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 18 六月 2024 16:38:14 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/device/shuttle/index.jsx |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/zy-asrs-flow/src/pages/device/shuttle/index.jsx b/zy-asrs-flow/src/pages/device/shuttle/index.jsx
index be86591..1aebf64 100644
--- a/zy-asrs-flow/src/pages/device/shuttle/index.jsx
+++ b/zy-asrs-flow/src/pages/device/shuttle/index.jsx
@@ -12,6 +12,7 @@
     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);
@@ -88,6 +89,10 @@
         setOpenOpera(false);
     };
 
+    const sourceLocChange = (e) => {
+        setSourceLoc(e.target.value)
+    }
+
     const targetLocChange = (e) => {
         setTargetLoc(e.target.value)
     }
@@ -98,12 +103,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 +162,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 +242,7 @@
                     {
                         key: '6',
                         label: '閿欒鐮�',
-                        children: '0',
+                        children: item.errorCode$,
                     },
                     {
                         key: '7',
@@ -239,6 +274,11 @@
                         label: '鏄惁鏈夋墭鐩�',
                         children: item.hasPallet ? 'Y' : 'N',
                     },
+                    {
+                        key: '13',
+                        label: '鑷姩',
+                        children: item.mode ? 'Y' : 'N',
+                    }
                 ];
                 return <div key={item.id} style={{ width: '45%' }}>
                     <div style={{ marginBottom: '10px' }}>
@@ -260,11 +300,19 @@
                     <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>
+                            <p>
+                            </p>
+                            <div className="commandItem">
+                                <Button onClick={() => shuttleOperator('moveLoc')}>绉诲姩鍒扮洰鏍囦綅缃�</Button>
+                                <Button onClick={() => shuttleOperator('takeMove')}>鍙栨斁璐т綔涓�</Button>
+                            </div>
                         </Card>
                     </div>
 
@@ -292,10 +340,11 @@
                                         defaultValue="0"
                                         onChange={moveLocTypeChange}
                                         style={{ width: 120 }}
-                                        options={[{ value: '0', label: '璺戣建閬�' }, { value: '1', label: '璺戝簱浣�' }, { value: '2', label: '姣嶈建閬撳惊鐜窇' }, { value: '3', label: '瀛愯建閬撳惊鐜窇' }]}
+                                        options={[{ value: '0', label: '璺戣建閬�' }, { value: '1', label: '璺戝簱浣�' }, { value: '2', label: '姣嶈建閬撳惊鐜窇' }, { value: '3', label: '瀛愯建閬撳惊鐜窇' }, { value: '4', label: '鍙栨斁璐�' }]}
                                     />
                                 </div>
                                 <Button onClick={() => shuttleMoveLoc()}>璺戝簱</Button>
+                                <Button onClick={() => shuttleMoveLocClose()}>璺戝簱鍏抽棴</Button>
                             </div>
                         </Card>
                     </div>

--
Gitblit v1.9.1