胡尧
|
c80e12d731
|
回退工艺外协代码
|
2025-05-15 11:07:22 +08:00 |
|
liaodanlong
|
51c517145b
|
工艺外协代码
|
2025-05-07 17:17:41 +08:00 |
|
胡尧
|
fffbfc21c2
|
表面工艺外协工单流程数量按照制造订单的product_uom_qty设置
|
2025-05-07 13:02:13 +08:00 |
|
liaodanlong
|
efc4ae31c9
|
工艺外协代码
|
2025-05-07 11:00:32 +08:00 |
|
liaodanlong
|
95c25ac7b8
|
工艺外协代码
|
2025-04-29 13:39:36 +08:00 |
|
liaodanlong
|
ecf5dcf2f2
|
sf .r-采购-采购订单-坯料委外加工生成的采购申请创建采购订单的类型不正确
|
2025-04-28 09:43:25 +08:00 |
|
liaodanlong
|
7d7c7b0fcf
|
工艺外协代码回退
|
2025-04-27 09:09:48 +08:00 |
|
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 |
|
管欢
|
8f0ade7b43
|
Accept Merge Request #2067: (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/2067
|
2025-04-25 15:55:38 +08:00 |
|
guanhuan
|
128bebf338
|
紧急采购默认为是
|
2025-04-25 14:57:56 +08:00 |
|
liaodanlong
|
443a21a0cc
|
工序外协需求
|
2025-04-25 11:46:05 +08:00 |
|
胡尧
|
4b29def105
|
修改模型id为模型ID，增加机台判断
|
2025-04-24 14:58:50 +08:00 |
|
胡尧
|
40137ba69c
|
去掉产品form重复的字段
|
2025-04-24 14:31:22 +08:00 |
|
胡尧
|
d16d47dfbe
|
销售订单，制造订单视图中加入模型id
|
2025-04-24 14:13:10 +08:00 |
|
liaodanlong
|
397c35867b
|
产品设置默认供应商数据
|
2025-04-22 13:41:22 +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
|
a4f8183654
|
更新工艺外协流程的采购单查询逻辑
|
2025-04-17 17:02:43 +08:00 |
|
liaodanlong
|
962931bc9d
|
外协流程更改
|
2025-04-17 14:29:06 +08:00 |
|
guanhuan
|
9cfc8418ec
|
优化库存排序
|
2025-04-17 13:44:25 +08:00 |
|
liaodanlong
|
61a3cf606e
|
表面工艺数据内置与数据同步调整
|
2025-04-14 15:23:47 +08:00 |
|
hyyy
|
1c57ee0be1
|
修复没加引号字段
|
2025-04-02 09:04:38 +08:00 |
|
hyyy
|
5b9dc05653
|
还原代码
|
2025-04-02 08:48:27 +08:00 |
|
胡尧
|
0347eb48e4
|
销售订单行增加交期字段，销售订单列表默认值修改为供货方式待确认
|
2025-03-25 13:48:17 +08:00 |
|
胡尧
|
80118b61c2
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-21 11:24:02 +08:00 |
|
yuxianghui
|
7124eebabe
|
采购单采购类型计算方法添加新判断条件
|
2025-03-20 17:01:36 +08:00 |
|
mgw
|
3f6f9bb709
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-20 15:44:11 +08:00 |
|
yuxianghui
|
6c879e4af3
|
1、新增由销售单生成的采购申请自动确认；2、销售单新增【采购申请】跳转按钮
|
2025-03-20 15:20:05 +08:00 |
|
胡尧
|
f6e87493d3
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-18 11:28:23 +08:00 |
|
廖丹龙
|
8c4c65a00f
|
Accept Merge Request #1919: (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/1919
|
2025-03-18 11:27:43 +08:00 |
|
liaodanlong
|
3642398724
|
表面工艺零件图号没有问题
|
2025-03-18 11:25:46 +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 |
|
廖丹龙
|
fb19a19b25
|
Accept Merge Request #1912: (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/1912
|
2025-03-17 16:50:52 +08:00 |
|
liaodanlong
|
8347a8b029
|
零件图号零件名称无数据 问题修复
|
2025-03-17 16:05:42 +08:00 |
|
liaodanlong
|
0a1b48ed93
|
零件图号零件名称数据填充
|
2025-03-17 11:26:42 +08:00 |
|
胡尧
|
a864845d2b
|
解决销售订单form中，tree内显示模型的问题
|
2025-03-14 16:06:33 +08:00 |
|
胡尧
|
a6a2e53111
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-14 13:52:18 +08:00 |
|
廖丹龙
|
528d63123f
|
Accept Merge Request #1901: (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/1901
|
2025-03-13 15:27:59 +08:00 |
|
liaodanlong
|
3543531f61
|
表面工艺添加零件图号零件名称
|
2025-03-13 14:13:28 +08:00 |
|
胡尧
|
ad8ec770b6
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-13 09:17:33 +08:00 |
|
胡尧
|
f5da36a82c
|
修改销售订单模型显示
|
2025-03-12 17:26:19 +08:00 |
|
胡尧
|
29337bfceb
|
调整模型显示
|
2025-03-12 17:05:29 +08:00 |
|
guanhuan
|
0d7f348194
|
调拨列表采购订单询价单页面优化
|
2025-03-07 11:29:32 +08:00 |
|
胡尧
|
e8fc38e6ed
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-04 09:32:07 +08:00 |
|
yuxianghui
|
7ecb28382a
|
1、库存序列号的更新序列号功能按钮优化；2、销售单默认显示字段优化；
|
2025-02-25 10:28:51 +08:00 |
|
yuxianghui
|
eb11e71d0d
|
1、入库单据优化：单据就绪自动分配序列号；分配序列号时，流水号取值=MAX（产品序列号模型最大序号，预分配最大序号），界面优化。2、客供料入库单批量调拨有待质检的单子时-提示语显示重复了优化
|
2025-02-24 16:27:09 +08:00 |
|
胡尧
|
52e585e637
|
解决冲突
|
2025-02-20 13:51:24 +08:00 |
|
胡尧
|
05dac9fb0c
|
调整模型上传的流程
|
2025-02-20 13:36:05 +08:00 |
|
管欢
|
85f19defa8
|
Accept Merge Request #1820: (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/1820
|
2025-02-19 14:50:15 +08:00 |
|
guanhuan
|
a628826b52
|
采购协议
|
2025-02-19 11:34:58 +08:00 |
|