Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
董杰
/
induction_shelf
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 0d11a2d5
由
刘韬
编写于
2023-12-27 13:02:35 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
启动后首次执行sensorChange
1 个父辈
766a51a0
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
7 行增加
和
4 行删除
smartshelf/app/induction_post.py
smartshelf/app/utils/__pycache__/__init__.cpython-37.pyc
smartshelf/app/utils/__pycache__/__init__.cpython-39.pyc
smartshelf/app/utils/__pycache__/location.cpython-37.pyc
smartshelf/app/utils/__pycache__/location.cpython-39.pyc
smartshelf/app/utils/__pycache__/serial_collection.cpython-37.pyc
smartshelf/app/utils/__pycache__/serial_communication.cpython-37.pyc
smartshelf/app/utils/__pycache__/serial_communication.cpython-39.pyc
smartshelf/app/utils/g.py
smartshelf/app/induction_post.py
查看文件 @
0d11a2d
...
...
@@ -235,6 +235,8 @@ def serverboard():
global
last_sensor_dict
global
lastupdatetime
global
ServerAliveTime
global
sensorChangeFirstRun
sensorChangeFirstRun
=
True
# serial_cf = ReadConfig()
command
=
""
# addrs = serial_cf.get_serial("addrs")
...
...
@@ -473,7 +475,7 @@ def filter_ng(in_loc,out_loc):
logging
.
warning
(
'入库ng恢复:{}'
.
format
(
out
))
return
in_loc
,
out_loc
sensorChangeFirstRun
=
True
# 发送入库/出库库位到服务器
def
send_loc_server
(
in_loc
,
out_loc
):
# http://ip/smdbox/service/store/sensorShelf/sensorChange
...
...
@@ -482,6 +484,7 @@ def send_loc_server(in_loc,out_loc):
# print ('--------------------origin_out_loc',out_loc)
global
locations
global
ServerErrorTimes
global
sensorChangeFirstRun
in_ng_loc
=
[]
out_ng_loc
=
[]
for
locnum
,
locvalue
in
locations
.
items
():
...
...
@@ -490,11 +493,11 @@ def send_loc_server(in_loc,out_loc):
if
locvalue
[
'outloc_ng'
]:
out_ng_loc
.
append
(
locnum
)
if
len
(
in_loc
)
==
0
and
len
(
out_loc
)
==
0
and
len
(
in_ng_loc
)
==
0
and
len
(
out_ng_loc
)
==
0
:
if
not
sensorChangeFirstRun
and
len
(
in_loc
)
==
0
and
len
(
out_loc
)
==
0
and
len
(
in_ng_loc
)
==
0
and
len
(
out_ng_loc
)
==
0
:
print
(
"send_loc_server,nochange"
)
return
sensorChangeFirstRun
=
False
headers
=
{
'content-type'
:
"application/x-www-form-urlencoded"
}
url
=
ip_config
[
'ip'
]
+
'/service/store/sensorShelf/sensorChange'
data
=
{
"cid"
:
ip_config
[
'cid'
],
"hasReelPosList"
:
in_loc
,
"hasReelPosErrorList"
:
in_ng_loc
,
"noReelPosList"
:
out_loc
,
"noReelPosErrorList"
:
out_ng_loc
}
...
...
smartshelf/app/utils/__pycache__/__init__.cpython-37.pyc
deleted
100644 → 0
查看文件 @
766a51a
此文件类型无法预览
smartshelf/app/utils/__pycache__/__init__.cpython-39.pyc
deleted
100644 → 0
查看文件 @
766a51a
此文件类型无法预览
smartshelf/app/utils/__pycache__/location.cpython-37.pyc
deleted
100644 → 0
查看文件 @
766a51a
此文件类型无法预览
smartshelf/app/utils/__pycache__/location.cpython-39.pyc
deleted
100644 → 0
查看文件 @
766a51a
此文件类型无法预览
smartshelf/app/utils/__pycache__/serial_collection.cpython-37.pyc
deleted
100644 → 0
查看文件 @
766a51a
此文件类型无法预览
smartshelf/app/utils/__pycache__/serial_communication.cpython-37.pyc
deleted
100644 → 0
查看文件 @
766a51a
此文件类型无法预览
smartshelf/app/utils/__pycache__/serial_communication.cpython-39.pyc
deleted
100644 → 0
查看文件 @
766a51a
此文件类型无法预览
smartshelf/app/utils/g.py
查看文件 @
0d11a2d
...
...
@@ -10,7 +10,7 @@ basepath = os.path.dirname(__file__)
shelfconfigfile
=
basepath
+
"/../"
+
Config
.
STATE_PATH
+
'shelfconfig.pkl'
def
ver
():
return
"1.87
3
"
return
"1.87
4
"
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论