jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,753 Commits 134 Branches 31 Tags
52e68ffa4c7fc943dee71cfb759ad635f3eb53a1
Commit Graph

391 Commits

Author SHA1 Message Date
yuxianghui
6c879e4af3 1、新增由销售单生成的采购申请自动确认；2、销售单新增【采购申请】跳转按钮 2025-03-20 15:20:05 +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
廖丹龙
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
廖丹龙
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
guanhuan
0d7f348194 调拨列表采购订单询价单页面优化 2025-03-07 11:29:32 +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
管欢
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
guanhuan
bdccce07d4 采购协议 2025-02-19 11:31:46 +08:00
guanhuan
4dc19cab81 采购协议 2025-02-19 10:42:48 +08:00
hyyy
9e6fc3bacb 增加样式权重 2025-02-19 10:29:25 +08:00
hyyy
6f4f0ab0fb 增加刀具管理的展开列 2025-02-18 15:44:40 +08:00
hyyy
69c5996db7 合并销售订单列，修改必填*展示方法， 2025-02-17 16:03:14 +08:00
hyyy
b117fde8c3 删除模块，移到efms里面，修改样式 2025-02-14 17:31:19 +08:00
yuxianghui
c223869bbd Merge branch 'feature/销售视图优化' into feature/库存优化 2025-02-12 11:30:27 +08:00
胡尧
356e1e55e4 解决采购总监选择销售员报错的问题 2025-02-10 09:03:13 +08:00
yuxianghui
bc4806b303 1、销售订单详情界面列表优化；2、完成 人工线下加工制造订单提交返工时-建议隐藏【保留装夹预调测量数据】 需求 2025-02-08 16:47:06 +08:00
胡尧
47c73ae66e 处理订单行参数说明的精度问题 2025-01-17 15:20:50 +08:00
胡尧
79bd5344ad Accept Merge Request #1756: (feature/增加质检模块 -> develop) 
Merge Request: 解决收藏报错的问题

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1756?initial=true
 2025-01-14 15:50:21 +08:00
胡尧
b9d95c0751 解决收藏报错的问题 2025-01-14 15:48:49 +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
yuxianghui
32e3c2f79f 采购订单源文档字段名称改为源单据 2024-12-31 08:56:41 +08:00
yuxianghui
acee32cc39 1、采购订单form页买家改名为采购员；2、优化成品入库单的的坯料委外加工链接； 2024-12-31 08:47:44 +08:00
yuxianghui
d7ce69f474 1、询价单的确认按钮权限添加；2、成品调拨单添加对应的坯料采购单和坯料外协单跳转链接 2024-12-30 17:04:59 +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
yuxianghui
82983871fc Merge branch 'feature/制造订单优化' into feature/制造、采购优化 2024-12-25 13:03:44 +08:00