2/14 高拍仪设置1.0

src/views/basic/collectPoint/timerSetting.vue

@@ -186,6 +186,79 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <!--<el-row :gutter="20" style="margin-top: 20px">-->
+            <!--  <el-col :span="8" class="el-col">-->
+            <!--    <el-form-item label="是否手动解码:" prop="scanMaxCount" style="margin-bottom: 0">-->
+            <!--      <el-radio-group v-model="formData.isAutoCodec">-->
+            <!--        <el-radio :label="true">是</el-radio>-->
+            <!--        <el-radio :label="false">否</el-radio>-->
+            <!--      </el-radio-group>-->
+            <!--    </el-form-item>-->
+            <!--  </el-col>-->
+            <!--</el-row>-->
+          </el-collapse-item>
+          <el-collapse-item name="4">
+            <template slot="title">
+              <p class="form-title">高拍仪扫码设置</p>
+            </template>
+            <el-row :gutter="20">
+              <el-col :span="8" class="el-col">
+                <el-form-item label="扫码数量设置:" prop="scanMaxCount" style="margin-bottom: 0">
+                  <el-input
+                    style="width: 90%"
+                    size="small"
+                    type='number'
+                    splaceholder="请输入内容"
+                    v-model="formData.FixedCount"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <!--<el-col :span="8" class="el-col">-->
+              <!--  <el-form-item label="PAD扫码数量设置:" prop="pdaMaxCount" style="margin-bottom: 0">-->
+              <!--    <el-input-->
+              <!--      style="width: 90%"-->
+              <!--      size="small"-->
+              <!--      type='number'-->
+              <!--      splaceholder="请输入内容"-->
+              <!--      v-model="formData.pdaMaxCount"-->
+              <!--    ></el-input>-->
+              <!--  </el-form-item>-->
+              <!--</el-col>-->
+              <!--<el-col :span="8" class="el-col">-->
+              <!--  <el-form-item label="工控扫码数量设置:" prop="ipcMaxCount" style="margin-bottom: 0">-->
+              <!--    <el-input-->
+              <!--      style="width: 90%"-->
+              <!--      size="small"-->
+              <!--      type='number'-->
+              <!--      splaceholder="请输入内容"-->
+              <!--      v-model="formData.ipcMaxCount"-->
+              <!--    ></el-input>-->
+              <!--  </el-form-item>-->
+              <!--</el-col>-->
+              <el-col :span="8" class="el-col">
+                <el-form-item label="是否自动解码:" prop="AutoDecode" style="margin-bottom: 0">
+                  <el-select v-model="formData.AutoDecode"  placeholder="选择是否自动解码">
+                    <el-option label="否" :value="0"></el-option>
+                    <el-option label="是" :value="1"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="8" class="el-col">
+                <el-form-item label="输出顺序:" prop="OutputMode" >
+                  <el-select v-model="formData.OutputMode"  placeholder="选择输出顺序">
+                    <el-option label="不排序" :value="0"></el-option>
+                    <el-option label="从左到右" :value="1"></el-option>
+                    <el-option label="从右到左" :value="2"></el-option>
+                    <el-option label="从上到下" :value="3"></el-option>
+                    <el-option label="从下到上" :value="4"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20" style="margin-top: 20px">
+
+            </el-row>
           </el-collapse-item>
         </el-collapse>
 
@@ -204,8 +277,6 @@
           >
           </ShelfDisplay>
         </el-dialog>
-
-
       </el-form>
     </el-card>
   </div>
@@ -298,11 +369,14 @@ export default {
         lastCodeSplit: true,
         isScanCodeCheck: true,
         getSplitConfirm: false,
-        scanMaxCount:null,
+        FixedCount:null,
         pdaMaxCount: null,
         ipcMaxCount: null,
+        AutoDecode:1,
+        OutputMode:1
       },
       systemParam: null,
+      socket:null,
 
     }
   },
@@ -319,6 +393,8 @@ export default {
       getSet().then((response) => {
         if (response.code == 20000) {
           this.formData = response.data
+          // this.formData.AutoDecode = 1
+          // this.formData.OutputMode = 1
         }
       })
     },
@@ -345,13 +421,73 @@ export default {
         })
         .catch(() => {
         });
+      if (this.socket && this.socket.readyState === WebSocket.OPEN){
+        if (!isBlank(this.formData.AutoDecode)){
+          var setStr = "AutoDecode=" +  this.formData.AutoDecode
+          this.sendData(setStr)
+        }
+        if (!isBlank(this.formData.FixedCount)){
+          var setStr = "FixedCount=" +  this.formData.FixedCount
+          this.sendData(setStr)
+        }
+
       }
     },
+    // 连接 WebSocket
+    connectWebSocket() {
+      // WebSocket 服务器地址
+
+      // 创建 WebSocket 连接
+      this.socket = new WebSocket('ws://127.0.0.1:9988')
+
+      // 监听连接成功事件
+      this.socket.onopen = () => {
+        console.log("WebSocket connected!");
+      };
+
+      // 监听接收消息事件
+      this.socket.onmessage = (event) => {
+        this.receivedMessage = event.data; // 更新接收到的消息
+        console.log("Received message:", event.data);
+      };
+
+      // 监听错误事件
+      this.socket.onerror = (error) => {
+        console.error("WebSocket error:", error);
+      };
+
+      // 监听连接关闭事件
+      this.socket.onclose = () => {
+        console.log("WebSocket connection closed.");
+      };
+    },
+    // 发送数据
+    sendData(data) {
+      if (this.socket && this.socket.readyState === WebSocket.OPEN) {
+        // const data = JSON.stringify({ action: "subscribe", channel: "updates" }); // 发送的参数
+
+        this.socket.send(data); // 发送数据
+        console.log("Data sent:", data);
+      } else {
+        console.error("WebSocket is not connected.");
+      }
+    },
+  },
+  mounted() {
+    // 在组件挂载时创建 WebSocket 连接
+    this.connectWebSocket();
+  },
   created() {
     this.selectSysParam()
 
+  },
+  beforeDestroy() {
+    // 组件销毁前关闭 WebSocket 连接
+    if (this.socket) {
+      this.socket.close();
+      console.log("WebSocket connection closed in beforeDestroy.");
+    }
   }
-
 }
 </script>
 

src/views/collect/IoCreateOrder.vue

@@ -19,7 +19,11 @@
           <el-button-group
             style="display: flex; margin-top: 5px; float: right"
           >
-
+            <el-button size="mini" type="primary" @click.native="paizhao()" :loading="submitLoading"
+                       v-if="splitType=='out' &&  !redMesg" style="margin-right: 8px;border-radius: 5%;"
+                       v-show="isLinkDisabled"
+            >拍照解码
+            </el-button>
             <el-button size="mini" type="primary" @click.native="deleteCode" :loading="submitLoading"
                        v-if="splitType=='out' && labelName == 1" style="margin-right: 8px;border-radius: 5%;"
                        v-show="isLinkDisabled" :disabled="orderFormData.billNo == null"
@@ -699,7 +703,8 @@ export default {
         fifoSplit: 1
       }
       this.orderFormData.workPlaceCode = tempData.workPlaceCode
-      this.orderFormData.workPlaceQueueCode = tempData.workPlaceQueueCode
+      //workPlaceQueueCode 置空 不然放弃单据的时候直接扫追溯码没有校验是否按取货槽上货
+      // this.orderFormData.workPlaceQueueCode = tempData.workPlaceQueueCode
       this.orderFormData.mainAction = tempData.mainAction
       this.orderFormData.action = tempData.action
       this.orderFormData.fromCorp = tempData.fromCorp
@@ -715,6 +720,7 @@ export default {
       this.orderStatus = false
       this.scanReCount = 0
       this.$refs.newCreateCodeDetail.codeCount = 0
+
       this.refreshCodesPanel()
       this.selectSysParam()
     },
@@ -2344,7 +2350,7 @@ export default {
       this.ws.onmessage = function (event) {
         let scanData = event.data // 获取扫码数据
         let currentTime = Date.now()
-        console.log(scanData)
+        console.log(scanData + "33333")
         // 如果时间间隔超过预设的阈值，表示这是一次新的扫码
         if (currentTime - lastScanTime > SCAN_TIMEOUT) {
           // 处理上一次完整的扫码数据
@@ -2391,6 +2397,16 @@ export default {
     },
     handleCodeArray(codeArray) {
       this.codeArray = codeArray;
+    },
+    paizhao(){
+      if (this.ws && this.ws.readyState === WebSocket.OPEN) {
+        // const data = JSON.stringify({ action: "subscribe", channel: "updates" }); // 发送的参数
+        var sendData = "ManualClick=1"
+        this.ws.send(sendData); // 发送数据
+        console.log("Data sent:", sendData);
+      } else {
+        console.error("WebSocket is not connected.");
+      }
     }
   },
   filters: {},