Browse Source

堆垛去掉4的倍数验证

zhangafei 1 week ago
parent
commit
6494ac3b9b

+ 1 - 1
src/views/billet/operator/components/car.vue

@@ -265,7 +265,7 @@
     }
   };
 
-  const { start, stop } = useTimeoutFn(getInfo, 10000, true);
+  const { start, stop } = useTimeoutFn(getInfo, 10000);
 
   // 获取堆垛机堆垛信息
   // 获取当前堆垛信息

+ 1 - 1
src/views/billet/operator/components/headTop.vue

@@ -289,7 +289,7 @@
     }
   };
 
-  const { start, stop } = useTimeoutFn(getInfo, 5000, true);
+  const { start, stop } = useTimeoutFn(getInfo, 5000);
 
   // 换炉
   const changeHeatLoading = ref(false);

+ 4 - 4
src/views/billet/operator/components/orgData.vue

@@ -1283,10 +1283,10 @@
     let stackInfo: any = null;
     // const buCount = lengthGroupCount > -1 ? val - obj[lengthGroupCount].stackingCount : val;
     if (val && val > 0) {
-      if (val % 4 !== 0) {
-        createMessage.error('补数量必须是4的倍数');
-        return;
-      }
+      // if (val % 4 !== 0) {
+      //   createMessage.error('补数量必须是4的倍数');
+      //   return;
+      // }
       stackInfo = val + '-' + size + '-' + stackingId;
     } else {
       stackInfo = '0-' + size + '-' + stackingId;

+ 4 - 4
src/views/billet/operator/components/printOriginalRecords.vue

@@ -1502,10 +1502,10 @@
     let stackInfo: any = null;
     // const buCount = lengthGroupCount > -1 ? val - obj[lengthGroupCount].stackingCount : val;
     if (val && val > 0) {
-      if (val % 4 !== 0) {
-        createMessage.error('补数量必须是4的倍数');
-        return;
-      }
+      // if (val % 4 !== 0) {
+      //   createMessage.error('补数量必须是4的倍数');
+      //   return;
+      // }
       stackInfo = val + '-' + size + '-' + stackingId;
     } else {
       stackInfo = '0-' + size + '-' + stackingId;

+ 1 - 2
src/views/billet/operator/index.vue

@@ -287,6 +287,7 @@
       title: '交班确认',
       content: '确定要交班吗?',
       onOk: () => {
+        openJiaobanModal.value = false;
         return changeShift({
           ccmNo,
           shiftGroup: newShiftGroup.value,
@@ -294,8 +295,6 @@
           headTopRef && headTopRef.value.reload();
           carRef && carRef.value.refreshCarList();
           heatListRef && heatListRef.value.reload();
-
-          openJiaobanModal.value = false;
         });
       },
     });