jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,309 Commits 134 Branches 31 Tags
e20bf3816abb81841e9d09a1eb97185cc72d9aa7
Commit Graph

309 Commits

Author SHA1 Message Date
guanhuan
5636681ee6 CNC工单返工 2025-01-23 16:42:16 +08:00
mgw
4b6fd72237 调整下发更新进行中状态的制造订单 2025-01-15 09:34:09 +08:00
mgw
78a9c59cde 直接使用recordset 2025-01-14 16:03:28 +08:00
mgw
5106067882 调整取值对象 2025-01-14 15:52:09 +08:00
mgw
40603fea6a 调整编程记录生成 2025-01-14 11:12:07 +08:00
mgw
f29582ef07 调整首次下发理由 2025-01-13 17:30:23 +08:00
mgw
d8a816c90e 调整写入编程记录的位置 2025-01-13 16:51:25 +08:00
mgw
b2c6c9c27d 调整码值 2025-01-13 14:00:20 +08:00
mgw
ed6e326539 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-01-13 13:51:35 +08:00
mgw
be9846986f 调整爆出位置 2025-01-13 13:51:07 +08:00
秦圣
005fa10539 Accept Merge Request #1734: (feature/customer_supply -> develop) 
Merge Request: cloud 静态资源库同步问题

Created By: @廖丹龙
Accepted By: @秦圣
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1734
 2025-01-13 13:42:08 +08:00
liaodanlong
e8e05bbf6d cloud 镜头资源库同步问题 2025-01-13 13:40:28 +08:00
mgw
d6325bd483 对程序用刀增加补充逻辑 2025-01-13 13:15:44 +08:00
mgw
6b6f091da8 更新编程记录相关 2025-01-13 11:11:09 +08:00
mgw
28d3d6fe60 更新编程记录 2025-01-10 10:20:23 +08:00
yuxianghui
97facdaf9c 1、销售订单状态添加【加工中】、【物流中】、【已交付】三种状态；2、优化 获取mrs下发的编程单 接口，添加对返工重新编程的处理 2024-12-19 13:45:10 +08:00
jinling.yang
ecf683e663 修复采购 2024-11-27 17:54:31 +08:00
jinling.yang
33b9c48e87 优化制造订单报废 2024-11-22 17:51:40 +08:00
jinling.yang
d4ff4be32e 还原注释代码 2024-11-21 17:19:41 +08:00
jinling.yang
310d8b33df 优化制造订单报废 2024-11-21 17:12:50 +08:00
胡尧
d53f3837c3 增加坯料冗余量 2024-11-19 08:59:52 +08:00
杨金灵
0f26cac68d Merge branch refs/heads/develop into refs/heads/feature/新增工艺退回调整 2024-11-18 11:43:12 +08:00
jinling.yang
a2855f1f08 还原代码 2024-11-18 11:40:24 +08:00
胡尧
bc0b8bdecb 增加坯料冗余量，调整坯料客供料的名称 2024-11-18 09:44:50 +08:00
jinling.yang
ff072a32bb 添加退回调整 2024-11-12 17:53:17 +08:00
guanhuan
390213881a 加工精度修改 2024-10-25 08:58:05 +08:00
guanhuan
7157ea1587 加工精度同步 2024-10-22 15:35:34 +08:00
guanhuan
cc40d479a9 加工精度同步 2024-10-17 17:20:51 +08:00
yuxianghui
1245323b9d 1、优化手动获取编程的接口，添加获取编程完成之后进行用刀校验；2、处理 权限问题-工单详情缺少【时间跟踪】tab；3、用刀校验方法添加日志 2024-10-17 14:22:09 +08:00
jinling.yang
4e4c53927b 下发编程单接口添加输出 2024-10-16 14:15:37 +08:00
胡尧
e2bd36ca16 工单异常处理 2024-10-14 15:18:27 +08:00
yuxianghui
70b3daad73 1、删除功能刀具tree视图图片字段；2、修改货位看板关联展示字段；3、获取编程单接口调用cnc用刀校验方法添加报错处理； 2024-10-11 17:53:12 +08:00
yuxianghui
25a90f3966 1、获取mrs编程接口优化，重新编程接口优化，创建CAM方法优化，cnc用刀校验逻辑优化 2024-10-10 17:31:56 +08:00
yuxianghui
f18c0e3eaf 1、重构cnc用刀校验方法，优化下发编程单后校验cnc用刀的逻辑；2、优化CAM创建方法；3、优化获取mrs编程单接口、优化编程单更新接口； 2024-10-09 17:52:20 +08:00
廖丹龙
6b4a7e35a9 Accept Merge Request #1375: (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/1375
 2024-09-29 16:48:53 +08:00
liaodanlong
198296f0f8 价格计算 2024-09-27 18:04:39 +08:00
廖丹龙
f122343e31 Accept Merge Request #1373: (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/1373?initial=true
 2024-09-27 18:02:25 +08:00
liaodanlong
82fa39f1a3 价格计算 2024-09-27 18:00:34 +08:00
廖丹龙
841e1b4ce2 Accept Merge Request #1372: (feature/销售和排程添加消息推送 -> develop) 
Merge Request: d刀具标准库数据同步

Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1372?initial=true
 2024-09-27 17:46:09 +08:00
liaodanlong
1ab62d7724 d刀具标准库数据同步 2024-09-27 17:43:47 +08:00
胡尧
88ffc34a68 程序用刀异常提醒 2024-09-27 14:00:56 +08:00
guanhuan
01a2771dfb Revert "消息模板初始数据" 
This reverts commit 45b6214ddd.
 2024-09-27 09:35:18 +08:00
guanhuan
45b6214ddd 消息模板初始数据 2024-09-27 09:33:17 +08:00
yuxianghui
4d63b90373 屏蔽重新下发编程单时调用删除CAM程序用刀计划记录方法 2024-09-26 16:36:49 +08:00
yuxianghui
271e23a67f 1、刀具标准库数据同步接口优化 2024-09-26 14:01:03 +08:00
liaodanlong
b986dd8473 刀具组装与拆解信息推送 2024-09-24 14:58:32 +08:00
liaodanlong
d197fc5b9e 保留小数点后两位 2024-09-23 16:58:58 +08:00
liaodanlong
8643c41193 代码还原 2024-09-23 13:33:05 +08:00
liaodanlong
e7e64720c6 消息推送 2024-09-23 11:55:28 +08:00
yuxianghui
4558fc0336 Merge branch 'feature/库存优化' into feature/刀具优化 2024-09-20 16:51:39 +08:00