胡尧
|
ceb38aa483
|
Accept Merge Request #2106: (feature/tool_standard_library_process -> develop)
Merge Request: 工艺外协代码
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2106
|
2025-05-12 08:41:26 +08:00 |
|
胡尧
|
d0d4db1555
|
修改制造目录文件结构
|
2025-05-09 14:57:35 +08:00 |
|
liaodanlong
|
efc4ae31c9
|
工艺外协代码
|
2025-05-07 11:00:32 +08:00 |
|
liaodanlong
|
95c25ac7b8
|
工艺外协代码
|
2025-04-29 13:39:36 +08:00 |
|
liaodanlong
|
9cf70cc54c
|
工艺外协代码回退
|
2025-04-26 14:42:38 +08:00 |
|
胡尧
|
8116e4f97d
|
解决更新出现字段未找到的问题
|
2025-04-25 10:08:03 +08:00 |
|
胡尧
|
27b9a4f982
|
解决冲突
|
2025-04-25 09:19:00 +08:00 |
|
胡尧
|
94007bae2b
|
产品详情增加只有成品类型才显示模型ID
|
2025-04-25 09:16:40 +08:00 |
|
yuxianghui
|
d7d094c84d
|
Merge branch 'feature/工单排序' into feature/工单排序_1
|
2025-04-24 15:05:57 +08:00 |
|
yuxianghui
|
a06e24583d
|
添加工单先按工序排序，再按创建时间排序
|
2025-04-24 15:04:04 +08:00 |
|
胡尧
|
40137ba69c
|
去掉产品form重复的字段
|
2025-04-24 14:31:22 +08:00 |
|
胡尧
|
d16d47dfbe
|
销售订单，制造订单视图中加入模型id
|
2025-04-24 14:13:10 +08:00 |
|
胡尧
|
f598b6c71c
|
解决从制造订单跳转到产品无法显示模型id的问题
|
2025-04-23 16:58:59 +08:00 |
|
胡尧
|
7b77d846c3
|
Accept Merge Request #2040: (hotfix/解决采购申请bug -> develop)
Merge Request: 解决创建采购申请报错
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2040?initial=true
|
2025-04-23 14:21:27 +08:00 |
|
管欢
|
9b3fe5c070
|
Accept Merge Request #2036: (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/2036
|
2025-04-23 09:48:26 +08:00 |
|
guanhuan
|
151bc5da4f
|
报价菜单修改
|
2025-04-22 15:43:14 +08:00 |
|
廖丹龙
|
4234a6bbd9
|
Accept Merge Request #2030: (feature/tool_standard_library_process -> 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/2030
|
2025-04-22 14:28:29 +08:00 |
|
liaodanlong
|
8fcc436ce5
|
设置字段必填
|
2025-04-22 14:24:10 +08:00 |
|
廖丹龙
|
c6f625fe44
|
Accept Merge Request #2027: (feature/tool_standard_library_process -> 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/2027
|
2025-04-22 13:49:59 +08:00 |
|
liaodanlong
|
41e4d2656a
|
采购申请单
|
2025-04-22 13:39:57 +08:00 |
|
liaodanlong
|
cbc73ee8e3
|
工艺相关展示调整
|
2025-04-21 16:04:36 +08:00 |
|
廖丹龙
|
73dce5e75e
|
Accept Merge Request #2025: (feature/tool_standard_library_process -> 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/2025
|
2025-04-21 15:00:30 +08:00 |
|
liaodanlong
|
7d70184a5d
|
外协工单采购申请查询问题
|
2025-04-21 14:55:20 +08:00 |
|
廖丹龙
|
5886b4e132
|
Accept Merge Request #2024: (feature/tool_standard_library_process -> 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/2024
|
2025-04-21 13:18:49 +08:00 |
|
liaodanlong
|
77478fd173
|
制造订单报错问题
|
2025-04-21 13:16:15 +08:00 |
|
胡尧
|
7849ce6342
|
工单列表增加模型ID搜索
|
2025-04-21 11:25:37 +08:00 |
|
liaodanlong
|
a74c07f0bb
|
字段名写错
|
2025-04-21 09:19:36 +08:00 |
|
liaodanlong
|
79006e062a
|
1.限制工序-作业配置 产品只能选中一个
2.添加产品下拉框查询过滤
3.产品选择框可以跳转到产品页面
|
2025-04-18 15:44:13 +08:00 |
|
管欢
|
f92b844c16
|
Accept Merge Request #2012: (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/2012
|
2025-04-18 09:50:58 +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 |
|
liaodanlong
|
962931bc9d
|
外协流程更改
|
2025-04-17 14:29:06 +08:00 |
|
guanhuan
|
9cfc8418ec
|
优化库存排序
|
2025-04-17 13:44:25 +08:00 |
|
胡尧
|
b041feb297
|
Merge branch 'release/release_2.11'
|
2025-04-15 20:54:53 +08:00 |
|
liaodanlong
|
61a3cf606e
|
表面工艺数据内置与数据同步调整
|
2025-04-14 15:23:47 +08:00 |
|
胡尧
|
a896108638
|
产品主数据【条码】存储模型ID
|
2025-04-11 16:49:18 +08:00 |
|
胡尧
|
8a7a90ff0d
|
agv配置不可修改
|
2025-04-07 17:04:34 +08:00 |
|
yuxianghui
|
4b5c3b383b
|
对工单的page页进行调整
|
2025-04-02 10:58:25 +08:00 |
|
胡尧
|
4cbcf08da8
|
销售单默认筛选供货方式待确认
|
2025-03-27 16:10:07 +08:00 |
|
胡尧
|
4b6f04aa9d
|
修改字段显示位置
|
2025-03-27 15:51:16 +08:00 |
|
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
|
236158d556
|
调拨单零件图号信息搜索
|
2025-03-26 13:35:28 +08:00 |
|
胡尧
|
5ae167c133
|
去掉取消自动加工原因
|
2025-03-24 09:00:16 +08:00 |
|
胡尧
|
d571b77915
|
修改工单新模型显示
|
2025-03-13 14:50:26 +08:00 |
|
胡尧
|
ad8ec770b6
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-13 09:17:33 +08:00 |
|
管欢
|
e87689da33
|
Accept Merge Request #1896: (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/1896
|
2025-03-13 08:48:04 +08:00 |
|
胡尧
|
29337bfceb
|
调整模型显示
|
2025-03-12 17:05:29 +08:00 |
|
胡尧
|
dedc820b50
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-10 16:31:35 +08:00 |
|
guanhuan
|
0d7f348194
|
调拨列表采购订单询价单页面优化
|
2025-03-07 11:29:32 +08:00 |
|
胡尧
|
cb645aa1b9
|
增加自动化产线的零件供货路线初始化为自动化产线加工
|
2025-03-06 13:59:14 +08:00 |
|
yuxianghui
|
826d5b1d58
|
1、优化工单子页签可全量配置处理方法；
|
2025-03-06 13:37:52 +08:00 |
|