Commit Graph

8 Commits

Author SHA1 Message Date
gqh
8776fc7d6c 合并代码 2022-11-07 11:21:31 +08:00
gqh
84cf25f39d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
# Conflicts:
#	sf_base/security/ir.model.access.csv
#	sf_base/views/mrs_common_view.xml
#	sf_route_workcenter/models/workcenter.py
2022-11-07 11:00:14 +08:00
gqh
a49a24e9e6 合并代码 2022-11-07 10:59:22 +08:00
jinling.yang
14d0d32ab6 匹配加工中心 2022-11-03 17:58:33 +08:00
gqh
3dfbd7a1e4 新增工单字段 2022-11-03 15:09:36 +08:00
gqh
d375787160 托盘根据工单绑定制造订单,修改托盘状态
添加解除装夹功能
三元定位增加xy 8个点的字段
2022-10-31 17:32:44 +08:00
gqh
ccb26bc4ec 托盘打印出条形码功能 2022-10-27 17:24:08 +08:00
gqh
0fb751ebbe 托盘绑定工单,托盘生成二维码 2022-10-25 17:19:42 +08:00