jinling.yang
|
018d51e25f
|
批量处理工艺调整
|
2024-11-14 18:02:24 +08:00 |
|
guanhuan
|
3b686a8272
|
新增零件名称
|
2024-11-08 16:56:00 +08:00 |
|
yuxianghui
|
8ea72198ea
|
1、完成报价单优化需求；2、修改制造订单内装夹工单的‘返工’按钮为’异常反馈‘
|
2024-11-05 17:52:18 +08:00 |
|
mgw
|
3bc33fe2fc
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2024-10-29 14:28:44 +08:00 |
|
mgw
|
c21319a127
|
rfid手动输入推送
|
2024-10-29 14:28:24 +08:00 |
|
管欢
|
00689d76cc
|
Accept Merge Request #1463: (feature/message_update -> develop)
Merge Request: 工单下发url调整,加工精度取值调整,2D加工图纸和质检标准位置调整
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1463
|
2024-10-25 13:38:25 +08:00 |
|
guanhuan
|
86d97ef331
|
2D加工图纸和质检标准位置调整
|
2024-10-25 11:55:43 +08:00 |
|
jinling.yang
|
e51fff4120
|
修复消息提醒时区问题
|
2024-10-25 11:25:37 +08:00 |
|
mgw
|
cab9e08066
|
增加对Enter的判断
|
2024-10-24 15:50:32 +08:00 |
|
mgw
|
598e8fee9c
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2024-10-24 15:32:41 +08:00 |
|
mgw
|
6f3a788101
|
将扫描rfid绑定并开启装夹工单写成widget形式
|
2024-10-24 15:32:15 +08:00 |
|
guanhuan
|
f557cb8d10
|
零件图纸,质检标准显示位置修改
|
2024-10-24 14:55:36 +08:00 |
|
guanhuan
|
4003d6a652
|
Merge branch 'refs/heads/develop' into feature/auxiliary_files_upload
# Conflicts:
# sf_dlm_management/views/product_template_management_view.xml
|
2024-10-21 09:50:09 +08:00 |
|
guanhuan
|
b132771c92
|
辅助文件上传
|
2024-10-18 14:32:20 +08:00 |
|
guanhuan
|
cf34ac5bbc
|
辅助文件上传
|
2024-10-17 16:31:13 +08:00 |
|
yuxianghui
|
1245323b9d
|
1、优化手动获取编程的接口，添加获取编程完成之后进行用刀校验；2、处理 权限问题-工单详情缺少【时间跟踪】tab；3、用刀校验方法添加日志
|
2024-10-17 14:22:09 +08:00 |
|
杨金灵
|
284c66ad86
|
Merge branch refs/heads/develop into refs/heads/feature/销售订单和工单逾期消息推送
|
2024-10-15 09:17:21 +08:00 |
|
jinling.yang
|
8f2d5129b1
|
还原代码
|
2024-10-15 09:06:13 +08:00 |
|
jinling.yang
|
2a067778bc
|
优化质量检测(加工检测)及消息推送
|
2024-10-14 17:53:38 +08:00 |
|
yuxianghui
|
e1af6ba2f5
|
1、完成 工件装夹工单详情页版面优化需求
|
2024-10-14 13:41:52 +08:00 |
|
jinling.yang
|
d8bade64e1
|
优化质量：添加加工质检
|
2024-10-11 17:52:33 +08:00 |
|
jinling.yang
|
351815ad91
|
优化销售订单+工单逾期预警和已1逾期代码
|
2024-10-10 17:36:35 +08:00 |
|
胡尧
|
d239509299
|
解决空料架配送不能正常下发AGV任务的问题
|
2024-10-09 13:53:49 +08:00 |
|
mgw
|
ddfb233452
|
修复按钮固定条件显示问题
|
2024-09-23 08:55:23 +08:00 |
|
mgw
|
7d877a0cbb
|
处理提示词制造订单重复问题；处理获取数据按钮显隐问题
|
2024-09-20 11:45:23 +08:00 |
|
jinling.yang
|
63ac4f2b44
|
返工工单添加标签字段
|
2024-09-19 17:23:01 +08:00 |
|
mgw
|
27da7639b2
|
增加扫码点击按钮功能
|
2024-09-19 09:04:05 +08:00 |
|
mgw
|
0ae7424f04
|
获取数据按钮增加调用服务功能
|
2024-09-10 16:12:24 +08:00 |
|
liaodanlong
|
6711f6f6e6
|
Merge branch 'refs/heads/develop' into feature/tax_sync
|
2024-09-09 17:37:21 +08:00 |
|
胡尧
|
388929f207
|
扫码触发按键功能
|
2024-09-05 17:59:55 +08:00 |
|
liaodanlong
|
64180ca57f
|
Merge branch 'refs/heads/develop' into feature/tax_sync
|
2024-09-02 15:43:25 +08:00 |
|
liaodanlong
|
3624ef4755
|
销售订单价格问题处理
|
2024-08-30 16:30:34 +08:00 |
|
jinling.yang
|
821a7a63be
|
优化工单
|
2024-08-28 17:30:46 +08:00 |
|
liaodanlong
|
e49362e2e3
|
Merge branch 'refs/heads/develop' into feature/tax_sync
|
2024-08-27 14:04:13 +08:00 |
|
liaodanlong
|
d5b5231873
|
多面加工工单排程优化
|
2024-08-27 14:03:41 +08:00 |
|
mgw
|
78d00e9157
|
修复coding问题，增加机床类型返回
|
2024-08-26 13:23:44 +08:00 |
|
jinling.yang
|
ba986995ed
|
修复报废-工单状态
|
2024-08-21 16:53:32 +08:00 |
|
jinling.yang
|
8a6ebb331a
|
Merge branch 'feature/优化最新版报废' into develop
|
2024-08-20 14:39:21 +08:00 |
|
mgw
|
6fe56605ab
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
|
2024-08-20 11:27:34 +08:00 |
|
mgw
|
bf2c7fd3c5
|
增加解绑托盘功能
|
2024-08-20 11:27:18 +08:00 |
|
胡尧
|
dc5b68cca0
|
生产总监、机床操作岗增加agv调度菜单权限，AGV下发任务界面需二次确认
|
2024-08-20 10:45:31 +08:00 |
|
mgw
|
1d399527e0
|
增加装夹预调工单扫码开启
|
2024-08-20 10:42:36 +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 |
|
jinling.yang
|
e2d7576a5e
|
优化报废
|
2024-08-15 17:31:37 +08:00 |
|
胡尧
|
f7e4ce416a
|
AGV任务调度开发
|
2024-08-14 17:34:50 +08:00 |
|
jinling.yang
|
9a7ac4dfa6
|
优化制造订单报废向导
|
2024-08-09 17:26:57 +08:00 |
|
胡尧
|
a79500d0ad
|
增加agv调度系统
|
2024-08-08 17:47:03 +08:00 |
|
jinling.yang
|
aaa19b96fd
|
还原注释代码
|
2024-08-08 14:57:55 +08:00 |
|