Commit Graph

413 Commits

Author SHA1 Message Date
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
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