From f8ee2b9ff6d384e38c01e9a5f15a62debf8aace1 Mon Sep 17 00:00:00 2001 From: xiongyi <827523911@qq.com> Date: Tue, 27 Jan 2026 14:57:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9F=E5=9D=97=E6=B4=BE=E5=8D=95?= =?UTF-8?q?=E6=96=B9=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- API/send_data_test.py | 19 +++++++++++-------- services/task_service.py | 4 ++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/API/send_data_test.py b/API/send_data_test.py index 9922a75..422f7af 100644 --- a/API/send_data_test.py +++ b/API/send_data_test.py @@ -205,9 +205,12 @@ def get_not_pour_info(): "Code": 200, "Message": None, "Data": [ + + + { "ArtifactID": "QR1B12000151AD", - "ArtifactActionID": 346482967298136, + "ArtifactActionID": 346482967298139, "ArtifactIDVice1": "Q00001AD", "ProduceRingNumber": 1, "MouldCode": "SHR2B1-9", @@ -215,16 +218,16 @@ def get_not_pour_info(): "RingTypeCode": "R22", "SizeSpecification": "6900*1500", "BuriedDepth": "中埋", - "BlockNumber": "L1", + "BlockNumber": "F", "HoleRingMarking": "否", "GroutingPipeMarking": "否", "PolypropyleneFiberMarking": "否", - "BetonVolume": 1.9, + "BetonVolume": 0.6, "BetonTaskID": "20251020-01" }, { "ArtifactID": "QR1B32000153AD", - "ArtifactActionID": 346482967298137, + "ArtifactActionID": 346482967298140, "ArtifactIDVice1": "Q00001AD", "ProduceRingNumber": 1, "MouldCode": "SHR2B3-9", @@ -232,7 +235,7 @@ def get_not_pour_info(): "RingTypeCode": "R22", "SizeSpecification": "6900*1500", "BuriedDepth": "中埋", - "BlockNumber": "L2", + "BlockNumber": "B1", "HoleRingMarking": "否", "GroutingPipeMarking": "否", "PolypropyleneFiberMarking": "否", @@ -241,7 +244,7 @@ def get_not_pour_info(): }, { "ArtifactID": "QR1B12000151AD", - "ArtifactActionID": 346482967298138, + "ArtifactActionID": 346482967298141, "ArtifactIDVice1": "Q00001AD", "ProduceRingNumber": 1, "MouldCode": "SHR2B1-9", @@ -249,11 +252,11 @@ def get_not_pour_info(): "RingTypeCode": "R22", "SizeSpecification": "6900*1500", "BuriedDepth": "中埋", - "BlockNumber": "B3", + "BlockNumber": "B2", "HoleRingMarking": "否", "GroutingPipeMarking": "否", "PolypropyleneFiberMarking": "否", - "BetonVolume": 0.6, + "BetonVolume": 1.9, "BetonTaskID": "20251020-01" }, diff --git a/services/task_service.py b/services/task_service.py index 4daa280..52f93e0 100644 --- a/services/task_service.py +++ b/services/task_service.py @@ -188,8 +188,8 @@ class TaskService: """处理单个F块的情况""" if f_positions == [2]: f_volume = f_blocks[0].get("BetonVolume") if f_blocks else 0 - self.half_volume[0] = round(total_f_volume / 2, 2) - self.half_volume[1] = f_volume - self.half_volume[0] + self.half_volume[0] = 0.1#round(total_f_volume / 2, 2)#暂时修改为0.1 + self.half_volume[1] = 0.1#f_volume - self.half_volume[0]#暂时修改 adjusted_volume = current_task["beton_volume"] + self.half_volume[0] elif f_positions == [1]: adjusted_volume = current_task["beton_volume"] + self.half_volume[1]