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 |
|
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 |
|
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 |
|
liaodanlong
|
3543531f61
|
表面工艺添加零件图号零件名称
|
2025-03-13 14:13:28 +08:00 |
|
胡尧
|
29337bfceb
|
调整模型显示
|
2025-03-12 17:05:29 +08:00 |
|
胡尧
|
e8fc38e6ed
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-04 09:32:07 +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 |
|
guanhuan
|
bdccce07d4
|
采购协议
|
2025-02-19 11:31:46 +08:00 |
|
guanhuan
|
4dc19cab81
|
采购协议
|
2025-02-19 10:42:48 +08:00 |
|
胡尧
|
356e1e55e4
|
解决采购总监选择销售员报错的问题
|
2025-02-10 09:03:13 +08:00 |
|
胡尧
|
47c73ae66e
|
处理订单行参数说明的精度问题
|
2025-01-17 15:20:50 +08:00 |
|
liaodanlong
|
e5f15661ce
|
采购单重复产品限制去除
|
2025-01-14 15:10:22 +08:00 |
|
liaodanlong
|
6ac3bbe2af
|
外协工单采购单关联产品展示
|
2025-01-13 12:57:21 +08:00 |
|
liaodanlong
|
a6c8cd8784
|
采购单合并后确认工单外协工序为就绪问题
|
2025-01-10 11:08:45 +08:00 |
|
liaodanlong
|
7e9e6d0738
|
工艺确认修改采购单状态变动逻辑
|
2025-01-09 17:22:40 +08:00 |
|
liaodanlong
|
58acdc4913
|
工艺确认重置表面工艺工单的关联采购单代码还原
|
2025-01-02 16:38:26 +08:00 |
|
liaodanlong
|
f884963abc
|
工艺确认重置表面工艺工单的关联采购单为草稿
|
2025-01-02 13:34:09 +08:00 |
|
liaodanlong
|
2f3e12e3af
|
表面工艺采购单确认订单限制，自动化产线加工路线逻辑矫正
|
2025-01-02 12:50:39 +08:00 |
|
liaodanlong
|
e99b8692ea
|
Merge branch 'refs/heads/develop' into feature/part_number
|
2025-01-02 09:06:41 +08:00 |
|
liaodanlong
|
701decb38f
|
表面工艺采购单确认订单进行限制
|
2024-12-31 17:08:38 +08:00 |
|
胡尧
|
c3ceda2ba9
|
Accept Merge Request #1697: (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/1697?initial=true
|
2024-12-31 16:01:03 +08:00 |
|
胡尧
|
281f3c67c3
|
特殊表面工艺外协采购单发起人修改为供应商的采购员
|
2024-12-31 16:00:24 +08:00 |
|
胡尧
|
198f1145d7
|
Accept Merge Request #1692: (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/1692?initial=true
|
2024-12-31 11:40:03 +08:00 |
|
胡尧
|
64eb66c334
|
修改退回工艺设计后再确认，采购单编程草稿状态
|
2024-12-31 11:39:36 +08:00 |
|
yuxianghui
|
4902fc5d9a
|
1、采购订单的关联销售订单字段从销售模块搬迁到制造模块，并新增一个many2many类型字段，且对字段的自动计算方法进行优化。
|
2024-12-31 10:56:07 +08:00 |
|
liaodanlong
|
9f3b351544
|
sf-工序外协调拨单-外协出库单多生成了一张外协出库调拨单
|
2024-12-30 15:25:20 +08:00 |
|
mgw
|
a3a2c96d00
|
添加紧急采购字段
|
2024-12-30 08:57:05 +08:00 |
|
yuxianghui
|
1b278a1432
|
1、订单详情字段显示优化；2、采购单页面优化
|
2024-12-26 16:28:39 +08:00 |
|
yuxianghui
|
0f4d25abb4
|
Merge branch 'feature/工单按钮优化' into feature/销售订单优化
|
2024-12-25 17:13:24 +08:00 |
|
yuxianghui
|
14cc285ee2
|
1、销售订单供货方式为委外加工时生成的采购单问题优化
|
2024-12-25 17:12:38 +08:00 |
|
廖丹龙
|
54b896004b
|
Accept Merge Request #1640: (feature/part_number -> 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/1640?initial=true
|
2024-12-25 15:16:26 +08:00 |
|
liaodanlong
|
7a1237ddf8
|
时间获取修改
|
2024-12-25 15:14:07 +08:00 |
|
胡尧
|
9efece315f
|
Accept Merge Request #1635: (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/1635?initial=true
|
2024-12-25 11:32:36 +08:00 |
|
胡尧
|
d82cb1e64c
|
解决手工创建表面工艺采购单由于没有源单据报错
|
2024-12-25 11:31:27 +08:00 |
|
mgw
|
aaf3b20e65
|
询价单字段排版及增加逻辑验证
|
2024-12-24 17:27:08 +08:00 |
|
yuxianghui
|
fe5990ff9a
|
Merge branch 'feature/制造、采购、工单优化' into feature/采购、外协优化
|
2024-12-23 17:14:00 +08:00 |
|
yuxianghui
|
6db5e72752
|
1、采购单的采购类型优化，外协优化
|
2024-12-23 17:13:12 +08:00 |
|
管欢
|
20994e6656
|
Accept Merge Request #1627: (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/1627
|
2024-12-23 14:27:24 +08:00 |
|
guanhuan
|
88f3155132
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/消息提醒优化
# Conflicts:
# sf_sale/views/purchase_order_view.xml
|
2024-12-23 14:06:11 +08:00 |
|
yuxianghui
|
8bd2250d45
|
Merge branch 'feature/工单rfid优化' into feature/制造、采购、工单优化
|
2024-12-23 13:47:22 +08:00 |
|
yuxianghui
|
0e7e7af85a
|
1、优化销售订单状态；2、优化夹具物料查询的托盘可用状态；3、优化工单开始按键；4、优化采购订单的采购类型，根据销售订单的供货方式和工艺确认时是否外协自动选择对应采购类型；
|
2024-12-23 13:46:30 +08:00 |
|
guanhuan
|
5a06811732
|
发送消息
|
2024-12-20 16:12:30 +08:00 |
|