liaodanlong
|
9f1beb4013
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# sf_manufacturing/models/mrp_production.py
# sf_manufacturing/models/purchase_order.py
# sf_sale/models/sale_order.py
|
2025-04-27 08:50:45 +08:00 |
|
liaodanlong
|
9cf70cc54c
|
工艺外协代码回退
|
2025-04-26 14:42:38 +08:00 |
|
胡尧
|
ca9a91e30a
|
修改程序单二维码下方文字
|
2025-04-25 16:07:34 +08:00 |
|
liaodanlong
|
69e8bf67d1
|
sf-制造-表面工艺可选参数-从cloud同步过来的数据，获取方式方式=外协
|
2025-04-21 10:04:59 +08:00 |
|
liaodanlong
|
1b22d02700
|
Merge branch 'refs/heads/develop' into feature/tool_standard_library_process
# Conflicts:
# sf_manufacturing/models/__init__.py
|
2025-04-17 14:35:24 +08:00 |
|
胡尧
|
e4af2aacb8
|
Accept Merge Request #2007: (feature/6694 -> develop)
Merge Request: 增加工单下发时打印编程文件pdf的功能
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2007?initial=true
|
2025-04-17 13:18:03 +08:00 |
|
胡尧
|
2100ee9590
|
增加备注
|
2025-04-15 17:08:17 +08:00 |
|
胡尧
|
6ff8395916
|
增加向pdf中添加二维码的功能
|
2025-04-15 16:57:32 +08:00 |
|
胡尧
|
085e6359ce
|
编程单增加二维码
|
2025-04-15 15:47:35 +08:00 |
|
liaodanlong
|
61a3cf606e
|
表面工艺数据内置与数据同步调整
|
2025-04-14 15:23:47 +08:00 |
|
胡尧
|
026697f363
|
修改sf定时任务不在部署时更新配置
|
2025-04-11 16:12:58 +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 |
|
mgw
|
7e33ca44d0
|
人工线下加工工单标识
|
2025-02-10 13:13:57 +08:00 |
|
mgw
|
523cc4ac5e
|
增加人工线下加工工单的查找
|
2025-02-10 11:29:37 +08:00 |
|
mgw
|
ac3b50c534
|
增加人工线下加工程序写入
|
2025-02-08 16:48:36 +08:00 |
|
mgw
|
976d75973d
|
调整程序写入逻辑
|
2025-02-08 16:00:07 +08:00 |
|
guanhuan
|
5636681ee6
|
CNC工单返工
|
2025-01-23 16:42:16 +08:00 |
|
liaodanlong
|
b604209df4
|
刀具标准库列表视图添加创建时间与修改时间
|
2025-01-21 16:23:34 +08:00 |
|
liaodanlong
|
a9b4c5d91b
|
保持智能工厂刀具标准库与cloud一致
|
2025-01-21 16:04: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 |
|