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

212 Commits

Author SHA1 Message Date
liaodanlong
221e25f581 【合金牌号】，【材料应用】字段同步 2025-03-19 15:33:06 +08:00
liaodanlong
83b051e0b9 材料型号同步添加材料代号 2025-03-18 15:51:56 +08:00
liaodanlong
5bbcd8ec23 材料型号同步添加材料代号 2025-03-18 15:46:22 +08:00
liaodanlong
9c5ecdfe76 sf 材料型号页面修改字段信息 2025-03-06 10:25:56 +08:00
liaodanlong
0cb73b6d29 切割工单过滤掉回退按钮 2025-02-26 14:36:50 +08:00
liaodanlong
d7e3ce2b1a 刀具标准库数据同步 2025-02-26 10:21:40 +08:00
liaodanlong
8799fcddb2 还原代码 2025-02-26 09:41:17 +08:00
liaodanlong
c4c6386871 坯料的采购订单零件图号，零件名称显示 2025-02-26 09:37:56 +08:00
liaodanlong
c3f5a890f1 工厂编码修改 2025-02-20 16:12:59 +08:00
liaodanlong
416a63138a Merge branch 'refs/heads/develop' into feature/tool_standard_library_process 
# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py
 2025-02-20 15:48:22 +08:00
yuxianghui
a05885936d 刀具标准库及关联模型同步接口优化 2025-02-13 14:26:01 +08:00
liaodanlong
b604209df4 刀具标准库列表视图添加创建时间与修改时间 2025-01-21 16:23:34 +08:00
liaodanlong
a9b4c5d91b 保持智能工厂刀具标准库与cloud一致 2025-01-21 16:04:16 +08:00
胡尧
d53f3837c3 增加坯料冗余量 2024-11-19 08:59:52 +08:00
胡尧
bc0b8bdecb 增加坯料冗余量，调整坯料客供料的名称 2024-11-18 09:44:50 +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
廖丹龙
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
yuxianghui
271e23a67f 1、刀具标准库数据同步接口优化 2024-09-26 14:01:03 +08:00
liaodanlong
d197fc5b9e 保留小数点后两位 2024-09-23 16:58:58 +08:00
yuxianghui
4558fc0336 Merge branch 'feature/库存优化' into feature/刀具优化 2024-09-20 16:51:39 +08:00
yuxianghui
4609ec442a 1、刀具标准库优化，整体式刀具物料产品优化；刀具同步接口优化；2、新增组装单扫描确认组装和获取测量值功能；组装单更换物料弹窗信息优化； 2024-09-20 16:50:55 +08:00
liaodanlong
4a22071f94 Merge branch 'refs/heads/develop' into feature/tax_sync 
# Conflicts:
#	sf_manufacturing/models/res_config_setting.py
#	sf_manufacturing/views/res_config_settings_views.xml
#	sf_mrs_connect/models/res_config_setting.py
 2024-09-20 10:35:47 +08:00
liaodanlong
ebc9716019 agv 配置调整位置 2024-09-20 10:32:08 +08:00
mgw
47ad2410cf 调整agv参数位置 2024-09-19 10:16:09 +08:00
liaodanlong
7ce2f6c797 历史销售订单价格问题 2024-09-14 17:40:45 +08:00
liaodanlong
dba8d23348 销售订单价格问题 2024-09-09 17:11:33 +08:00
liaodanlong
9a43af98c3 cloud 与 sf 静态资源同步问题 2024-09-09 10:46:05 +08:00
liaodanlong
6e9c326a52 智能工厂数据同步任务的错误提示优化 2024-09-03 13:56:16 +08:00
liaodanlong
3624ef4755 销售订单价格问题处理 2024-08-30 16:30:34 +08:00
hujiaying
deef246a6d 修改表面工艺字段同步 2024-08-26 11:10:52 +08:00
jinling.yang
1ea6f649f0 优化ftp（pdf路径） 2024-07-31 14:54:15 +08:00
jinling.yang
1980ee2a9a 优化三次元检测报告 2024-07-31 10:59:35 +08:00
yuxianghui
83334e2915 1、表面工艺及同步接口添加‘加工天数’、‘路途天数’字段；2、表面工艺可选参数及同步接口添加‘工艺描述’、‘加工天数’、‘路途天数’字段 2024-07-16 14:10:14 +08:00
jinling.yang
5997cbcb0e download_program_file方法添加关闭ftp 2024-06-28 12:00:29 +08:00
jinling.yang
2ff935f68d 修复编程单下发ftp路径 2024-06-26 11:10:54 +08:00
jinling.yang
dcbb60b088 修复编程单下发ftp路径:去掉注释 2024-06-25 18:11:45 +08:00
jinling.yang
88ef9c106d 修复编程单下发ftp路径 2024-06-25 17:54:08 +08:00
马广威
4894576d25 Accept Merge Request #1072: (release/release_1.5 -> 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/1072
 2024-06-14 16:21:38 +08:00
yuxianghui
14d823ab6e 1、增加是否使用刀具预调仪的配置； 2024-06-11 11:58:58 +08:00
jinling.yang
fe88a416a7 制造订单合并一张编程单下发时，工件配送记录的未下发nc程序为未下发及cnc程序没有对应ftp文件路径问题 2024-05-28 17:57:27 +08:00
jinling.yang
57b264b84d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化返工和重新制造订单 2024-05-22 17:36:17 +08:00
jinling.yang
ff12a86406 优化cnc工单返工：在原有的cnc工单后新增返工标志的cnc工单，且工序累加，状态为就绪，解除装夹工单的状态为等待其他工单 2024-05-22 17:35:57 +08:00
mgw
3afa76b79c 优化同步代码 2024-05-18 21:32:24 +08:00