胡尧
|
9c40aa9a7e
|
修复更新agv站点同时下发任务的bug
|
2024-08-20 14:36:02 +08:00 |
|
胡尧
|
dc5b68cca0
|
生产总监、机床操作岗增加agv调度菜单权限，AGV下发任务界面需二次确认
|
2024-08-20 10:45:31 +08:00 |
|
胡尧
|
1241737dea
|
修改agv调度搜索条件
|
2024-08-19 14:37:55 +08:00 |
|
胡尧
|
a6b7167f3b
|
修改创建调度任务逻辑，不匹配的路线返回错误信息
|
2024-08-16 16:49:30 +08:00 |
|
胡尧
|
c4de966dea
|
装夹工单完成后生成工件配送单同时绑定rfid
|
2024-08-16 16:31:54 +08:00 |
|
胡尧
|
e5793638f7
|
屏蔽开始装夹预调绑定rfid时，不绑定工件配送的rfid
|
2024-08-16 15:21:08 +08:00 |
|
胡尧
|
e92905fe32
|
修改agv小车相关接口
|
2024-08-16 10:36:01 +08:00 |
|
胡尧
|
1b521ae460
|
解决冲突
|
2024-08-16 09:50:31 +08:00 |
|
胡尧
|
4e0d8f1c88
|
修改AGV调度
|
2024-08-16 09:43:03 +08:00 |
|
胡尧
|
aecf2121a1
|
agv调度开发
|
2024-08-15 17:41:25 +08:00 |
|
胡尧
|
9f180e307d
|
agv调度开发
|
2024-08-15 15:02:13 +08:00 |
|
胡尧
|
6c734eead4
|
agv调度开发
|
2024-08-15 11:34:38 +08:00 |
|
胡尧
|
f7e4ce416a
|
AGV任务调度开发
|
2024-08-14 17:34:50 +08:00 |
|
胡尧
|
0b85f29262
|
修改agv调度
|
2024-08-12 11:08:04 +08:00 |
|
胡尧
|
9dbea66b73
|
修改AGV调度系统
|
2024-08-09 17:32:46 +08:00 |
|
jinling.yang
|
a9b7f99944
|
修复表面工艺外协
|
2024-08-09 15:39:58 +08:00 |
|
jinling.yang
|
34e858ffe4
|
添加表面工艺服务产品验证
|
2024-08-09 11:31:30 +08:00 |
|
jinling.yang
|
41efe81119
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺外协
|
2024-08-09 10:43:34 +08:00 |
|
jinling.yang
|
7cab8cd287
|
调拨单新增表面工艺参数字段
|
2024-08-09 10:42:59 +08:00 |
|
胡尧
|
a79500d0ad
|
增加agv调度系统
|
2024-08-08 17:47:03 +08:00 |
|
jinling.yang
|
112efccb7c
|
修复表面工艺外协采购
|
2024-08-08 16:21:15 +08:00 |
|
jinling.yang
|
f58fb2ea13
|
Merge branch 'feature/优化表面工艺' into develop
|
2024-08-08 15:08:08 +08:00 |
|
jinling.yang
|
aaa19b96fd
|
还原注释代码
|
2024-08-08 14:57:55 +08:00 |
|
胡尧
|
5d8f0f83b2
|
增加AGV调度功能，工单页面增加自定义筛选字段
|
2024-08-07 17:44:43 +08:00 |
|
jinling.yang
|
1547a6064f
|
优化表面工艺
|
2024-08-07 17:30:29 +08:00 |
|
yuxianghui
|
d469c09f15
|
Merge branch 'feature/制造订单优化' into feature/销售单优化
|
2024-08-07 17:11:57 +08:00 |
|
廖丹龙
|
8ec5e05739
|
Accept Merge Request #1213: (feature/tax_sync -> develop)
Merge Request: bfm 加工订单税信息同步
Created By: @廖丹龙
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1213
|
2024-08-06 09:09:37 +08:00 |
|
jinling.yang
|
5393ef686a
|
优化表面工艺
|
2024-08-05 17:28:48 +08:00 |
|
yuxianghui
|
070890e3b6
|
解决 SF，根据制造订单生成的采购单坯料入库时到原材料库BUG
|
2024-08-05 16:26:54 +08:00 |
|
jinling.yang
|
ed0d57c364
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺
# Conflicts:
# sf_manufacturing/models/mrp_production.py
# sf_manufacturing/models/mrp_workorder.py
|
2024-08-02 14:41:42 +08:00 |
|
yuxianghui
|
cec426920b
|
Merge branch 'feature/优化工单状态' into feature/bug优化
|
2024-08-02 11:19:45 +08:00 |
|
jinling.yang
|
c0202330f8
|
去掉工单输出
|
2024-08-01 16:40:46 +08:00 |
|
yuxianghui
|
a5da18bbc7
|
1、修改夹具重量单位为kg
|
2024-08-01 11:34:20 +08:00 |
|
liaodanlong
|
051273017d
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/tax_sync
|
2024-08-01 10:45:09 +08:00 |
|
jinling.yang
|
0675937588
|
优化制造订单列表
|
2024-07-31 17:00:14 +08:00 |
|
yuxianghui
|
2fa47eae27
|
1
|
2024-07-31 15:06:55 +08:00 |
|
yuxianghui
|
cb2e1ecabe
|
1
|
2024-07-31 15:06:14 +08:00 |
|
yuxianghui
|
9f1233d20e
|
1
|
2024-07-31 15:04:37 +08:00 |
|
yuxianghui
|
db50253100
|
Merge branch 'feature/优化工单_6' into feature/优化工单状态
|
2024-07-31 15:00:48 +08:00 |
|
yuxianghui
|
5f7f905540
|
优化工单状态
|
2024-07-31 14:59:57 +08:00 |
|
liaodanlong
|
115a3e0712
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/tax_sync
|
2024-07-31 14:41:02 +08:00 |
|
jinling.yang
|
f361106c40
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化三次元检测报告
|
2024-07-31 11:51:16 +08:00 |
|
jinling.yang
|
a46cd0f515
|
优化三次元检测报告
|
2024-07-31 11:51:04 +08:00 |
|
yuxianghui
|
ffb775abb7
|
1、优化工单状态
|
2024-07-31 11:45:59 +08:00 |
|
jinling.yang
|
1980ee2a9a
|
优化三次元检测报告
|
2024-07-31 10:59:35 +08:00 |
|
jinling.yang
|
c01dfddfb4
|
修复返工-功能刀具
|
2024-07-30 17:45:41 +08:00 |
|
liaodanlong
|
d49e8779f9
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/tax_sync
|
2024-07-30 09:24:48 +08:00 |
|
yuxianghui
|
a0ed14aed1
|
解决 制造订单提交返工-申请重新编程-第一张工单状态不对 bug
|
2024-07-30 09:21:08 +08:00 |
|
yuxianghui
|
683d79a4e3
|
恢复制造订单的功能刀具备注字段自动计算方法代码
|
2024-07-29 17:03:25 +08:00 |
|
jinling.yang
|
a81ad08740
|
修复功能刀具
|
2024-07-29 16:43:37 +08:00 |
|