胡尧
|
72c9c9872e
|
Accept Merge Request #1326: (feature/流程用扫码完成 -> develop)
Merge Request: 修复扫码确认后接驳站点被清除的bug
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1326?initial=true
|
2024-09-20 09:39:21 +08:00 |
|
胡尧
|
2b541fe041
|
修复扫码确认后接驳站点被清除的bug
|
2024-09-20 09:38:32 +08:00 |
|
mgw
|
c4069995e0
|
解除装夹处，扫码同步打印成品条码
|
2024-09-19 14:38:24 +08:00 |
|
胡尧
|
402a323673
|
修改扫码判断起点接驳站逻辑
|
2024-09-19 08:49:23 +08:00 |
|
胡尧
|
cc3289c834
|
将工件配送页面起点接驳站修改为当前接驳站
|
2024-09-14 13:49:46 +08:00 |
|
胡尧
|
b188c8adfe
|
修改异常提示
|
2024-09-11 09:14:00 +08:00 |
|
胡尧
|
d000aa095f
|
对于测试用例进行修改
|
2024-09-10 17:49:52 +08:00 |
|
胡尧
|
8945801db8
|
解决冲突
|
2024-09-10 16:16:30 +08:00 |
|
胡尧
|
40f327ea17
|
修改工件拆卸
|
2024-09-10 16:13:57 +08:00 |
|
胡尧
|
ed20249988
|
Accept Merge Request #1286: (feature/流程用扫码完成 -> develop)
Merge Request: 扫码触发页面按钮，解除装夹起始站点根据下产线终点站点自动赋值
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1286
|
2024-09-09 17:31:25 +08:00 |
|
胡尧
|
2d5ef0aae4
|
解除装夹起点从下产线agv调度任务关联带出
|
2024-09-06 15:34:30 +08:00 |
|
胡尧
|
388929f207
|
扫码触发按键功能
|
2024-09-05 17:59:55 +08:00 |
|
jinling.yang
|
3cb3dce247
|
优化返工代码
|
2024-09-04 17:43:48 +08:00 |
|
jinling.yang
|
511bed47ff
|
优化返工-保留装夹测量数据
|
2024-09-04 16:58:55 +08:00 |
|
jinling.yang
|
d7a0dc578b
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
|
2024-08-27 11:27:42 +08:00 |
|
jinling.yang
|
b40a87df88
|
修复报废
|
2024-08-27 11:24:04 +08:00 |
|
胡尧
|
c6f6927d57
|
修复工件配送后没有同步任务下发时间的bug，AGV配置中增加是否下发AGV任务
|
2024-08-27 10:42:24 +08:00 |
|
jinling.yang
|
e662490cb5
|
修复报废
|
2024-08-26 17:31:14 +08:00 |
|
jinling.yang
|
f1780181fa
|
修复报废向导
|
2024-08-25 17:36:07 +08:00 |
|
jinling.yang
|
d13961ff5f
|
修复报废-拣货单（sfp）
|
2024-08-22 10:52:19 +08:00 |
|
jinling.yang
|
ba986995ed
|
修复报废-工单状态
|
2024-08-21 16:53:32 +08:00 |
|
胡尧
|
647d21dea3
|
Accept Merge Request #1229: (feature/agv_dispatch -> develop)
Merge Request: 放开下发agv小车任务代码
Created By: @胡尧
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1229
|
2024-08-21 11:32:50 +08:00 |
|
胡尧
|
a8211171b0
|
增加以日、月、年为日期期间的序列，工件配送单状态同步，返工时不生成工件配送单
|
2024-08-20 16:18:47 +08:00 |
|
杨金灵
|
b333e27c51
|
Accept Merge Request #1228: (feature/优化最新版报废 -> develop)
Merge Request: 优化最新版报废
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1228
|
2024-08-20 14:39:03 +08:00 |
|
jinling.yang
|
e259fd0c05
|
优化报废
|
2024-08-20 14:30:42 +08:00 |
|
胡尧
|
a767c6491f
|
增加移除焦点的controller
|
2024-08-20 14:05:05 +08:00 |
|
胡尧
|
dc5b68cca0
|
生产总监、机床操作岗增加agv调度菜单权限，AGV下发任务界面需二次确认
|
2024-08-20 10:45:31 +08:00 |
|
jinling.yang
|
3c8dac799d
|
修复报废
|
2024-08-16 17:28:21 +08:00 |
|
胡尧
|
0e4b9e44f8
|
修改下发agv调度任务参数
|
2024-08-16 17:12:34 +08:00 |
|
胡尧
|
4e0d8f1c88
|
修改AGV调度
|
2024-08-16 09:43:03 +08:00 |
|
胡尧
|
aecf2121a1
|
agv调度开发
|
2024-08-15 17:41:25 +08:00 |
|
jinling.yang
|
e2d7576a5e
|
优化报废
|
2024-08-15 17:31:37 +08:00 |
|
胡尧
|
1532184008
|
Merge branch 'feature/agv_dispatch' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/agv_dispatch
|
2024-08-15 15:02:16 +08:00 |
|
胡尧
|
9f180e307d
|
agv调度开发
|
2024-08-15 15:02:13 +08:00 |
|
hy
|
f0a4cf1d0f
|
弹窗取消聚焦
|
2024-08-15 15:01:10 +08:00 |
|
胡尧
|
6c734eead4
|
agv调度开发
|
2024-08-15 11:34:38 +08:00 |
|
胡尧
|
f7e4ce416a
|
AGV任务调度开发
|
2024-08-14 17:34:50 +08:00 |
|
jinling.yang
|
cccc2f8493
|
优化报废
|
2024-08-12 17:30:53 +08:00 |
|
胡尧
|
9dbea66b73
|
修改AGV调度系统
|
2024-08-09 17:32:46 +08:00 |
|
jinling.yang
|
9a7ac4dfa6
|
优化制造订单报废向导
|
2024-08-09 17:26:57 +08:00 |
|
jinling.yang
|
5f9c5961a5
|
报废
|
2024-08-09 10:39:48 +08:00 |
|
胡尧
|
a79500d0ad
|
增加agv调度系统
|
2024-08-08 17:47:03 +08:00 |
|
jinling.yang
|
4399700c3d
|
优化报废向导
|
2024-08-08 17:24:41 +08:00 |
|
jinling.yang
|
9c47a6bdba
|
修复返工-cmm
|
2024-07-29 16:36:46 +08:00 |
|
jinling.yang
|
b1b805959a
|
修复多次返工报依赖问题
|
2024-07-28 15:20:12 +08:00 |
|
jinling.yang
|
22a1ae11a6
|
修复返工
|
2024-07-26 16:52:48 +08:00 |
|
yuxianghui
|
98d2aa756a
|
1、解决 功能刀具是无效刀时-制造订单提交返工【申请重新编程】要做成必选
|
2024-07-26 11:49:33 +08:00 |
|
jinling.yang
|
9eddfe36d6
|
修复返工-工件配送
|
2024-07-25 15:22:48 +08:00 |
|
jinling.yang
|
f0fdeff699
|
修复cnc工单按钮显示问题
|
2024-07-24 11:40:16 +08:00 |
|
jinling.yang
|
da8e543819
|
修复返工向导
|
2024-07-23 17:18:31 +08:00 |
|