禹翔辉
|
b32722ca54
|
Accept Merge Request #213: (feature/sf刀具功能分支 -> develop)
Merge Request: 优化了申请换刀功能的数据
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/213?initial=true
|
2023-06-29 14:15:57 +08:00 |
|
yuxianghui
|
d5938bf407
|
优化了申请换刀功能的数据，
|
2023-06-29 14:16:10 +08:00 |
|
jinling.yang
|
37b834b3cf
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化
# Conflicts:
# sf_mrs_connect/models/res_config_setting.py
|
2023-06-29 11:15:40 +08:00 |
|
禹翔辉
|
79dfa10d4e
|
Accept Merge Request #210: (feature/sf刀具功能分支 -> develop)
Merge Request: 新增批量出库功能（功能已完成，按键未增加），新增自动组装方法（todo），新增出库按键弹窗样式修改
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/210?initial=true
|
2023-06-29 09:37:09 +08:00 |
|
yuxianghui
|
ec95e09553
|
新增批量出库功能（功能已完成，按键未增加），新增自动组装方法（todo），新增出库按键弹窗样式修改
|
2023-06-29 09:36:54 +08:00 |
|
jinling.yang
|
b02cb16dc9
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化
# Conflicts:
# sf_tool_management/__manifest__.py
# sf_tool_management/views/tool_base_views.xml
|
2023-06-28 18:34:39 +08:00 |
|
jinling.yang
|
eab6f0ceee
|
刀具产品页面刀具物料及型号字段修改
|
2023-06-28 18:32:45 +08:00 |
|
龚启豪
|
ec0da8cf76
|
Merge branch refs/heads/develop into refs/heads/feature/设备维保
|
2023-06-28 10:39:23 +08:00 |
|
qihao.gong@jikimo.com
|
8b227d9ac9
|
设备维保
|
2023-06-25 17:37:55 +08:00 |
|
yuxianghui
|
f135f0a5e7
|
完成了弹窗换刀需求信息的视图和默认数据的同步
|
2023-06-21 17:21:58 +08:00 |
|
yuxianghui
|
24fd92fa3b
|
对功能刀具预警、实时分布和出入库记录的代码进行了合并优化
|
2023-06-14 16:27:16 +08:00 |
|
yuxianghui
|
3236d477c0
|
sf的功能刀具实时分布和功能刀具出入库记录视图界面已建立
|
2023-06-13 17:13:15 +08:00 |
|