五号机稳定版

models/billet_trace_pusher.py

@@ -171,7 +171,7 @@ class Trace_pusher:
     def billet_in_buffer_action(self, i):
         with self.locks[i]:
             if self.strands_cutting[i]:
-                time.sleep(12)
+                time.sleep(15)
                 self.logger.info(f"[TRACE]{i+1}流新增钢坯存储")
                 self.strands_buffer[i] = self.strands_cutting[i]
                 self.strands_cutting[i] = []

models/data_sender.py

@@ -14,17 +14,20 @@ class Sender:
             'car_add': 'syn/storageBill/add',
             'car_save': 'syn/billetHotsendBase/shipp/save',
             'car_go': 'syn/billetHotsendBase/shipp/depart',
-            'stack_add': 'syn/billet/addStacking'
+            'stack_add': 'syn/billet/addStacking',
+            'plate_update': 'syn/storageBill/update'
         }
 
         self.url = {
             'billet_add': 'http://192.168.0.119:8181/jeecg-boot/actualControl/billetActual/reportRealTimeBilletBasicInfo',
             'heat_add': 'http://192.168.0.119:8181/jeecg-boot/actualControl/heatsActuals/reportRealTimeHeatsActuals',
+            'billet_union': '',
             'host_send': 'http://192.168.0.119:8181/billetHotsendBase/billetHotsendBase/add',
             'car_add': 'http://192.168.0.119:8181/storageBill/add',
             'car_save': 'http://192.168.0.119:8181/billetHotsendBase/billetHotsendBase/add',
             'car_go': 'http://192.168.0.119:8181/billetHotsendBase/billetHotsendBase/rodLineDepart',
-            'stack_add': 'http://192.168.0.119:8181/billet/stackingAndLoadingVehicles/addStacking'
+            'stack_add': 'http://192.168.0.119:8181/billet/stackingAndLoadingVehicles/addStacking',
+            'plate_update': ''
         }
 
         self.heat_tangible_temp = {
@@ -116,6 +119,7 @@ class Sender:
 
         self.car_go_temp = {
             "ccmNo": "",
+            "positionNum": "",
             "licensePlate": ""
         }
 
@@ -371,6 +375,16 @@ class Sender:
         #此处应存储进数据库
         self.send('stack_add', tmp)
 
+    def plate_update(self, ccmNo, carNo, plate):
+        tmp = self.car_go_temp.copy()
+        
+        tmp['ccmNo'] = ccmNo
+        tmp['positionNum'] = carNo
+        tmp['licensePlate'] = plate
+
+        #此处应存储进数据库
+        self.send('plate_update', tmp)
+
 
 if __name__ == '__main__':
     import logging

models/overhead_crane.py

@@ -77,7 +77,7 @@ class Crane:
         while True:
             if self.cranes[craneNo].data < start or self.cranes[craneNo].data > end:
                 return True
-            if wait_time >= 10:
+            if wait_time >= 18:
                 return False
             time.sleep(0.5)
             wait_time += 0.5

models/parking.py

@@ -44,14 +44,20 @@ class Parking:
         else:
             valuedata = self.value_a[i]
 
+        send_flag = False
         with self.lock:
             if self.current_car[i] != valuedata.data:
+                send_flag = True
                 self.current_car[i] = valuedata.data
                 self.car_time[i] = time.time()
                 # self.sender.car_add(self.ccmNo_list[i], str(i+1), self.current_car[i])
-            
+
+        if send_flag:
+            self.sender.plate_update(self.ccmNo_list[i], str(i+1), self.current_car[i])
+
     def car_in(self, i):
         plate = ''
+        time.sleep(10)
         if time.time() - self.car_time[i] <= 10:
             plate = self.current_car[i]