xiongyi/Feeding_control_system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改F块派单方量

Browse Source
This commit is contained in:
xiongyi
2026-01-27 14:57:29 +08:00
parent 6291b34243
commit f8ee2b9ff6
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
API/send_data_test.py
View File

@ -205,9 +205,12 @@ def get_not_pour_info():
"Code": 200, "Code": 200,
"Message": None, "Message": None,
"Data": [ "Data": [
{ {
"ArtifactID": "QR1B12000151AD", "ArtifactID": "QR1B12000151AD",
"ArtifactActionID": 346482967298136, "ArtifactActionID": 346482967298139,
"ArtifactIDVice1": "Q00001AD", "ArtifactIDVice1": "Q00001AD",
"ProduceRingNumber": 1, "ProduceRingNumber": 1,
"MouldCode": "SHR2B1-9", "MouldCode": "SHR2B1-9",
@ -215,16 +218,16 @@ def get_not_pour_info():
"RingTypeCode": "R22", "RingTypeCode": "R22",
"SizeSpecification": "6900*1500", "SizeSpecification": "6900*1500",
"BuriedDepth": "中埋", "BuriedDepth": "中埋",
"BlockNumber": "L1", "BlockNumber": "F",
"HoleRingMarking": "否", "HoleRingMarking": "否",
"GroutingPipeMarking": "否", "GroutingPipeMarking": "否",
"PolypropyleneFiberMarking": "否", "PolypropyleneFiberMarking": "否",
"BetonVolume": 1.9, "BetonVolume": 0.6,
"BetonTaskID": "20251020-01" "BetonTaskID": "20251020-01"
}, },
{ {
"ArtifactID": "QR1B32000153AD", "ArtifactID": "QR1B32000153AD",
"ArtifactActionID": 346482967298137, "ArtifactActionID": 346482967298140,
"ArtifactIDVice1": "Q00001AD", "ArtifactIDVice1": "Q00001AD",
"ProduceRingNumber": 1, "ProduceRingNumber": 1,
"MouldCode": "SHR2B3-9", "MouldCode": "SHR2B3-9",
@ -232,7 +235,7 @@ def get_not_pour_info():
"RingTypeCode": "R22", "RingTypeCode": "R22",
"SizeSpecification": "6900*1500", "SizeSpecification": "6900*1500",
"BuriedDepth": "中埋", "BuriedDepth": "中埋",
"BlockNumber": "L2", "BlockNumber": "B1",
"HoleRingMarking": "否", "HoleRingMarking": "否",
"GroutingPipeMarking": "否", "GroutingPipeMarking": "否",
"PolypropyleneFiberMarking": "否", "PolypropyleneFiberMarking": "否",
@ -241,7 +244,7 @@ def get_not_pour_info():
}, },
{ {
"ArtifactID": "QR1B12000151AD", "ArtifactID": "QR1B12000151AD",
"ArtifactActionID": 346482967298138, "ArtifactActionID": 346482967298141,
"ArtifactIDVice1": "Q00001AD", "ArtifactIDVice1": "Q00001AD",
"ProduceRingNumber": 1, "ProduceRingNumber": 1,
"MouldCode": "SHR2B1-9", "MouldCode": "SHR2B1-9",
@ -249,11 +252,11 @@ def get_not_pour_info():
"RingTypeCode": "R22", "RingTypeCode": "R22",
"SizeSpecification": "6900*1500", "SizeSpecification": "6900*1500",
"BuriedDepth": "中埋", "BuriedDepth": "中埋",
"BlockNumber": "B3", "BlockNumber": "B2",
"HoleRingMarking": "否", "HoleRingMarking": "否",
"GroutingPipeMarking": "否", "GroutingPipeMarking": "否",
"PolypropyleneFiberMarking": "否", "PolypropyleneFiberMarking": "否",
"BetonVolume": 0.6, "BetonVolume": 1.9,
"BetonTaskID": "20251020-01" "BetonTaskID": "20251020-01"
}, },

4
services/task_service.py
View File

@ -188,8 +188,8 @@ class TaskService:
"""处理单个F块的情况""" """处理单个F块的情况"""
if f_positions == [2]: if f_positions == [2]:
f_volume = f_blocks[0].get("BetonVolume") if f_blocks else 0 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[0] = 0.1#round(total_f_volume / 2, 2)#暂时修改为0.1
self.half_volume[1] = f_volume - self.half_volume[0] self.half_volume[1] = 0.1#f_volume - self.half_volume[0]#暂时修改
adjusted_volume = current_task["beton_volume"] + self.half_volume[0] adjusted_volume = current_task["beton_volume"] + self.half_volume[0]
elif f_positions == [1]: elif f_positions == [1]:
adjusted_volume = current_task["beton_volume"] + self.half_volume[1] adjusted_volume = current_task["beton_volume"] + self.half_volume[1]