jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,808 Commits 134 Branches 31 Tags
62f0578ce881281bdd76b45178d814a91f8a6dd8
Commit Graph

231 Commits

Author SHA1 Message Date
刘磊
62f0578ce8 Accept Merge Request #2293: (feature/7254_new -> 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/2293
 2025-07-18 15:12:05 +08:00
陈赓
4609ddfa7a 夹具型号相关数据表的优化 2025-07-18 09:55:21 +08:00
陈赓
e73c0b15ea 夹具型号相关数据表的优化 2025-07-18 09:26:30 +08:00
陈赓
2347ed9cb3 材料型号增加是否磁吸 2025-07-17 14:12:35 +08:00
陈赓
f4829f57a1 还原 2025-07-17 11:08:42 +08:00
陈赓
cdf6a36c30 Redis同步 2025-07-16 11:49:41 +08:00
陈赓
8e8f5eb8be feat: 新增 Redis 缓存同步相关模块与控制器 2025-07-15 11:29:18 +08:00
陈赓
cdbc277a94 feat: 新增 Redis 工具与控制器，更新同步逻辑相关文件 2025-07-15 11:28:12 +08:00
胡尧
4bea169327 撤回_run_manufacturing方法 2025-06-26 10:26:39 +08:00
胡尧
a19cf5d894 解决冲突 2025-06-26 09:35:26 +08:00
胡尧
885064fb12 没有model_id的制造订单不请求编程 2025-06-26 09:29:02 +08:00
胡尧
8f7e785760 Accept Merge Request #2259: (feature/根据项目组区分sf代码 -> develop) 
Merge Request: 修复加工面报错的问题

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2259?initial=true
 2025-06-25 17:36:14 +08:00
yuxianghui
28ade4ac72 完成 物料需求计划主数据准备：库存路线 需求 2025-06-25 13:57:56 +08:00
胡尧
b177bd95ff 将fetchCNC移动到sf_mrs_connect模块 2025-06-23 11:04:44 +08:00
胡尧
92f591c3e7 将sf_manufacturing模块中stock.py的_run_manufacture方法进行拆分 2025-06-18 09:25:44 +08:00
liaodanlong
9cf70cc54c 工艺外协代码回退 2025-04-26 14:42:38 +08:00
liaodanlong
69e8bf67d1 sf-制造-表面工艺可选参数-从cloud同步过来的数据，获取方式方式=外协 2025-04-21 10:04:59 +08:00
liaodanlong
61a3cf606e 表面工艺数据内置与数据同步调整 2025-04-14 15:23:47 +08:00
guanhuan
6a70f3b88a 坯料冗余新增描述字段 2025-03-26 14:32:53 +08:00
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