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

396 Commits

Author SHA1 Message Date
mgw
63ca6f5856 解除状态限制屏蔽 2025-01-14 08:33:34 +08:00
liaodanlong
6cf4bf1005 代码合并 2025-01-13 17:16:22 +08:00
mgw
80384e3244 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 
# Conflicts:
#	sf_manufacturing/models/mrp_production.py
 2025-01-13 16:56:49 +08:00
mgw
d8a816c90e 调整写入编程记录的位置 2025-01-13 16:51:25 +08:00
秦圣
266927f53b Accept Merge Request #1739: (feature/customer_supply -> develop) 
Merge Request: 工艺确认后的错误提示

Created By: @廖丹龙
Accepted By: @秦圣
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1739
 2025-01-13 16:47:45 +08:00
liaodanlong
b398d1236e 工艺确认后的错误提示 2025-01-13 16:46:13 +08:00
秦圣
d626303a2d Accept Merge Request #1738: (feature/customer_supply -> develop) 
Merge Request: 采购单参考销售订单可见性设置

Created By: @廖丹龙
Accepted By: @秦圣
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1738
 2025-01-13 16:11:13 +08:00
liaodanlong
bf4d06e22b 制造订单调拨单合并排除自加工产品 2025-01-13 16:08:51 +08:00
yuxianghui
3de86cf538 Merge branch 'feature/工单-质检优化' into feature/工单-质检优化_1 2025-01-13 15:08:04 +08:00
yuxianghui
186dca4618 1、取消质量检查页面根据指令检查自动筛选；2、修改送检按钮隐藏条件；3、优化工单后置三元检测page页显示时，检测结果选择返工时制造订单没有生成检测结果记录问题 2025-01-13 15:07:08 +08:00
秦圣
a2a8ea5ab1 Accept Merge Request #1731: (feature/customer_supply -> develop) 
Merge Request: 客供料合并，坯料制造订单问题处理

Created By: @廖丹龙
Accepted By: @秦圣
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1731
 2025-01-13 11:35:03 +08:00
liaodanlong
d5c65fdc6c 客供料合并，坯料制造订单问题处理 2025-01-13 11:31:24 +08:00
mgw
6a3a739e2c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-01-13 11:11:33 +08:00
管欢
a78b1c7eaf Accept Merge Request #1729: (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/1729
 2025-01-13 10:56:28 +08:00
guanhuan
0870bafdb9 制造订单、工单页面导航优化 2025-01-13 10:41:49 +08:00
mgw
9dfe9ba572 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-01-13 09:08:38 +08:00
管欢
2323c888b4 Accept Merge Request #1726: (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/1726
 2025-01-10 13:22:38 +08:00
廖丹龙
5a4ca414a5 Accept Merge Request #1723: (feature/customer_supply -> 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/1723?initial=true
 2025-01-10 10:03:02 +08:00
胡尧
22bac48a98 检测结果增加创建人，时间，处理人，时间 2025-01-10 09:57:06 +08:00
mgw
8589da1b4d 增加多种状态对编程记录的更改 2025-01-10 09:34:38 +08:00
liaodanlong
e27506fb07 错误信息修改与委外加工单报错处理 2025-01-09 17:22:03 +08:00
mgw
4b5661108a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 
# Conflicts:
#	sf_manufacturing/security/ir.model.access.csv
 2025-01-09 16:14:23 +08:00
liaodanlong
1084f4db12 错误信息修改 2025-01-09 16:12:56 +08:00
mgw
aaf72d5e35 调整数据源 2025-01-09 16:12:54 +08:00
liaodanlong
ebf290fbb3 客供料调拨单合并 2025-01-09 14:32:17 +08:00
mgw
fc16c867aa 申请编程需求 2025-01-09 14:07:35 +08:00
guanhuan
c658027dcc 新增零件图号 2025-01-09 10:45:06 +08:00
廖丹龙
d312782245 Accept Merge Request #1718: (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/1718
 2025-01-08 13:11:30 +08:00
liaodanlong
3ba79d88b5 修改错误提示 2025-01-08 11:36:28 +08:00
guanhuan
4fc0eab513 修复报废没有生成调拨单 2025-01-08 10:58:56 +08:00
guanhuan
9660392495 修复报废没有生成调拨单 2025-01-06 14:52:24 +08:00
liaodanlong
0ce51a4a66 添加人工线下加工工单排序 2025-01-02 12:49:46 +08:00
liaodanlong
37476bcc88 回退代码 2024-12-31 14:03:15 +08:00
胡尧
64eb66c334 修改退回工艺设计后再确认，采购单编程草稿状态 2024-12-31 11:39:36 +08:00
管欢
f4312c4d4e Accept Merge Request #1675: (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/1675
 2024-12-30 16:20:37 +08:00
guanhuan
5928456ffe 提示优化 2024-12-30 16:19:17 +08:00
guanhuan
f084b5d765 提示优化 2024-12-30 14:12:54 +08:00
guanhuan
854c3ceef2 提示优化 2024-12-30 13:51:31 +08:00
管欢
4269ce58db Accept Merge Request #1668: (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/1668?initial=true
 2024-12-30 11:37:04 +08:00
guanhuan
3555be86c6 提示优化 2024-12-30 11:35:08 +08:00
廖丹龙
610028c5f4 Accept Merge Request #1657: (feature/part_number -> develop) 
Merge Request: sorted_workorders变量过滤

Created By: @廖丹龙
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1657
 2024-12-28 09:13:42 +08:00
liaodanlong
abfac28094 sorted_workorders变量过滤 2024-12-28 09:12:27 +08:00
廖丹龙
24d8d37e0a Accept Merge Request #1656: (feature/part_number -> develop) 
Merge Request: sorted_workorders变量定义

Created By: @廖丹龙
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1656?initial=true
 2024-12-28 09:08:20 +08:00
liaodanlong
6780d4e758 sorted_workorders变量定义 2024-12-28 09:07:02 +08:00
廖丹龙
ead54cfc87 Accept Merge Request #1654: (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/1654
 2024-12-27 17:08:40 +08:00
liaodanlong
e990f24615 两张外协工单报错问题 2024-12-27 16:21:36 +08:00
yuxianghui
40865b7c6c 取消制造订单功能刀具状态为无效刀时自动返工修改制造订单的状态； 2024-12-26 13:24:04 +08:00
yuxianghui
78fff46452 1、制造订单状态优化 2024-12-25 14:16:34 +08:00
yuxianghui
7f17ff8b78 1、处理制造订单返工确认后，状态还是返工的bug；2、隐藏已取消状态的采购单【确认订单】按钮 2024-12-25 13:02:49 +08:00
yuxianghui
32fb6eadbc 1 2024-12-25 09:43:04 +08:00