liaodanlong
|
d2155b17b4
|
Merge branch 'refs/heads/develop' into feature/tool_standard_library_process
# Conflicts:
# sf_manufacturing/models/product_template.py
|
2025-03-26 17:01:13 +08:00 |
|
guanhuan
|
6a70f3b88a
|
坯料冗余新增描述字段
|
2025-03-26 14:32:53 +08:00 |
|
mgw
|
e89400f04e
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-18 09:18:47 +08:00 |
|
liaodanlong
|
1311669814
|
材料型号同步修改时赋予默认值
|
2025-03-17 16:39:49 +08:00 |
|
胡尧
|
29337bfceb
|
调整模型显示
|
2025-03-12 17:05:29 +08:00 |
|
liaodanlong
|
9c5ecdfe76
|
sf 材料型号页面修改字段信息
|
2025-03-06 10:25:56 +08:00 |
|
liaodanlong
|
7efea85420
|
刀具标准库 基本参数修改字段默认隐藏，并可勾选展示
|
2025-02-24 09:30:27 +08:00 |
|
liaodanlong
|
acfc09596b
|
刀具编码修改
|
2025-02-20 17:21:44 +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 |
|
hyyy
|
e6ab17ca0d
|
sf-制造-功能刀具标准库字段样式调整
|
2025-02-20 11:34:19 +08:00 |
|
hyyy
|
6f4f0ab0fb
|
增加刀具管理的展开列
|
2025-02-18 15:44:40 +08:00 |
|
hyyy
|
b117fde8c3
|
删除模块，移到efms里面，修改样式
|
2025-02-14 17:31:19 +08:00 |
|
liaodanlong
|
b604209df4
|
刀具标准库列表视图添加创建时间与修改时间
|
2025-01-21 16:23:34 +08:00 |
|
胡尧
|
7408cc00f9
|
处理订单客供料的问题
|
2024-11-21 15:48:17 +08:00 |
|
胡尧
|
d53f3837c3
|
增加坯料冗余量
|
2024-11-19 08:59:52 +08:00 |
|
胡尧
|
21f961d893
|
Accept Merge Request #1519: (feature/sale_order_route_pick -> develop)
Merge Request: 增加坯料冗余量
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1519
|
2024-11-18 15:00:56 +08:00 |
|
胡尧
|
08a682143f
|
增加坯料冗余量
|
2024-11-18 15:00:05 +08:00 |
|
杨金灵
|
0f26cac68d
|
Merge branch refs/heads/develop into refs/heads/feature/新增工艺退回调整
|
2024-11-18 11:43:12 +08:00 |
|
胡尧
|
bc0b8bdecb
|
增加坯料冗余量，调整坯料客供料的名称
|
2024-11-18 09:44:50 +08:00 |
|
jinling.yang
|
a8e9fe40ac
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工艺退回调整
# Conflicts:
# sf_manufacturing/models/mrp_production.py
# sf_manufacturing/views/mrp_production_addional_change.xml
|
2024-11-15 18:08:31 +08:00 |
|
胡尧
|
37538141bf
|
修改材料型号获取方式名称
|
2024-11-12 14:57:59 +08:00 |
|
jinling.yang
|
8bbc65ef88
|
新增退回调整
|
2024-11-12 11:43:40 +08:00 |
|
杨金灵
|
a12eb12678
|
Accept Merge Request #1495: (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/1495
|
2024-11-11 15:41:36 +08:00 |
|
yuxianghui
|
5dae0ea973
|
1、sf视图展示界面优化
|
2024-11-11 14:52:44 +08:00 |
|
jinling.yang
|
38c4aba45c
|
根据工序生成工单
|
2024-11-08 18:01:23 +08:00 |
|
yuxianghui
|
8b9aa1c454
|
Merge branch 'feature/客供料入库单优化' into feature/客供料入库单优化_1
|
2024-11-07 10:43:58 +08:00 |
|
yuxianghui
|
9a4d7e87ec
|
1、处理销售单的依赖导致的更新报错问题；2、优化客供料单据获取销售单字段信息和成品信息方法；
|
2024-11-07 10:43:08 +08:00 |
|
jinling.yang
|
1f11d188c1
|
添加工艺工程师权限组
|
2024-11-06 17:46:14 +08:00 |
|
liaodanlong
|
b9039ef466
|
刀具标准库page样式问题
|
2024-10-25 14:01:38 +08:00 |
|
guanhuan
|
8661dd16c1
|
加工精度同步
|
2024-10-22 15:37:41 +08:00 |
|
guanhuan
|
7157ea1587
|
加工精度同步
|
2024-10-22 15:35:34 +08:00 |
|
guanhuan
|
00a04af94f
|
加工精度
|
2024-10-18 09:30:20 +08:00 |
|
guanhuan
|
cc40d479a9
|
加工精度同步
|
2024-10-17 17:20:51 +08:00 |
|
胡尧
|
54abb7a9f7
|
增加备注
|
2024-10-16 10:22:30 +08:00 |
|
胡尧
|
e2bd36ca16
|
工单异常处理
|
2024-10-14 15:18:27 +08:00 |
|
hujiaying
|
441cfaffce
|
优化代码
|
2024-10-09 16:01:27 +08:00 |
|
liaodanlong
|
79ec3f2c91
|
r角默认值
|
2024-09-27 09:09:48 +08:00 |
|
liaodanlong
|
5b4376b5f9
|
r角默认值
|
2024-09-26 17:58:04 +08:00 |
|
hy
|
64e2b71a34
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改
|
2024-09-24 11:15:10 +08:00 |
|
hy
|
d6fdeafef6
|
制造-刀具标准库界面样式显示有问题
|
2024-09-24 11:14:08 +08:00 |
|
胡尧
|
5024a9254d
|
删除皮肤文件
|
2024-09-23 16:08:49 +08:00 |
|
yuxianghui
|
4cee5213bb
|
产品字段值优化
|
2024-09-23 10:48:48 +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
|
ec2075c874
|
刀具岗权限调整
|
2024-09-20 10:32:30 +08:00 |
|
liaodanlong
|
6711f6f6e6
|
Merge branch 'refs/heads/develop' into feature/tax_sync
|
2024-09-09 17:37:21 +08:00 |
|
liaodanlong
|
7ac7077f8c
|
bom物料清单
|
2024-09-09 17:36:23 +08:00 |
|
胡尧
|
ed20249988
|
Accept Merge Request #1286: (feature/流程用扫码完成 -> develop)
Merge Request: 扫码触发页面按钮，解除装夹起始站点根据下产线终点站点自动赋值
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1286
|
2024-09-09 17:31:25 +08:00 |
|
胡尧
|
096542c8ff
|
扫码触发按键功能
|
2024-09-06 09:37:05 +08:00 |
|
胡尧
|
388929f207
|
扫码触发按键功能
|
2024-09-05 17:59:55 +08:00 |
|