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

151 Commits

Author SHA1 Message Date
yuxianghui
bc4806b303 1、销售订单详情界面列表优化；2、完成 人工线下加工制造订单提交返工时-建议隐藏【保留装夹预调测量数据】 需求 2025-02-08 16:47:06 +08:00
yuxianghui
39d6c8ae24 处理制造订单再次返工时，点击返工按钮报错 2025-01-16 15:41:07 +08:00
yuxianghui
e3562e7ae3 1、制造订单状态优化 2025-01-16 09:01:11 +08:00
yuxianghui
5ff6fe73d4 点击制造订单触发返工的过滤条件优化 2025-01-15 15:40:19 +08:00
yuxianghui
5297bf05d1 1、制造订单返工按钮添加新的显示条件；2、优化返工流程 2025-01-15 14:36:49 +08:00
mgw
40603fea6a 调整编程记录生成 2025-01-14 11:12:07 +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
mgw
6b6f091da8 更新编程记录相关 2025-01-13 11:11:09 +08:00
mgw
8589da1b4d 增加多种状态对编程记录的更改 2025-01-10 09:34:38 +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
mgw
aaf72d5e35 调整数据源 2025-01-09 16:12:54 +08:00
mgw
fc16c867aa 申请编程需求 2025-01-09 14:07:35 +08:00
管欢
0ce88f322c Accept Merge Request #1717: (feature/报废优化 -> develop) 
Merge Request: 报废解绑rfid

Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1717
 2025-01-08 13:09:07 +08:00
guanhuan
d582604f13 报废解绑rfid 2025-01-08 13:06:01 +08:00
guanhuan
4fc0eab513 修复报废没有生成调拨单 2025-01-08 10:58:56 +08:00
mgw
aaded331cd 解除装夹方法增加前置判断 2025-01-06 10:11:44 +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
廖丹龙
f80aaf978b Accept Merge Request #1639: (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/1639
 2024-12-25 14:57:16 +08:00
liaodanlong
64f35b5633 工艺确认统一工艺设计 2024-12-25 14:49:05 +08:00
yuxianghui
c2d346282c 1、制造订单隐藏不必的取消按钮、添加取消按钮的隐藏条件；2、添加返工完成后制造订单状态置为加工中 2024-12-24 16:47:10 +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
bdac1e7460 1、处理工单返工时就解除rfid绑定问题；2、同步bfm的订单状态到销售订单 2024-12-20 11:06:41 +08:00
yuxianghui
03dbeaf988 1、隐藏返工状态工单的开始按钮；2、优化工单状态方法；3、优化制造订单状态 2024-12-19 17:14:48 +08:00
guanhuan
79d188fb5c 消息提醒 2024-12-18 16:26:28 +08:00
管欢
d24b0e8af8 Accept Merge Request #1616: (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/1616
 2024-12-13 16:29:45 +08:00
guanhuan
b551777d49 逾期工单不能批量重新安排的优化需求 2024-12-13 16:24:25 +08:00
guanhuan
01fa7bbe87 批量重新安排 2024-12-12 14:39:10 +08:00
guanhuan
c793089131 工艺确认弹框优化 2024-12-12 09:29:48 +08:00
yuxianghui
7c17241882 1、制造订单点击返工按钮添加新的过滤条件；2、优化工单工序逻辑；3、返工添加校验限制条件； 2024-12-11 17:24:32 +08:00
yuxianghui
179ce86bef 1、去除工单页面的时效状态自动筛选项；2、坯料制造订单添加批量确认加工工艺功能；3、处理返工新生成的工单工序错误问题；4、采购、销售页面优化 2024-12-11 10:33:10 +08:00
胡尧
54c502dd64 处理供应商相同的特殊表面工艺不能删除的问题 2024-12-05 16:36:33 +08:00
胡尧
52ab962ace 解决删除表面工艺，多增加了采购单的bug 2024-12-05 15:09:04 +08:00
mgw
d933416b2d 处理“制造订单退回调整删除特殊表面工艺后对应坯料的采购单也变成取消状态了” 2024-12-04 11:52:52 +08:00
jinling.yang
a7dc3a1227 修复表面外协 2024-11-29 10:03:44 +08:00
jinling.yang
805eabd07e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复外协出入库单 2024-11-28 16:01:11 +08:00
jinling.yang
c42c053d66 修复表面工艺外协及工艺设计 2024-11-28 15:59:17 +08:00
yuxianghui
d741d6ccf5 Merge branch 'feature/制造订单状态优化' into feature/工单状态优化_2 2024-11-28 15:09:51 +08:00
jinling.yang
a80d498eab 修复制造订单-采购单 2024-11-28 10:40:48 +08:00
杨金灵
306d5074f2 Accept Merge Request #1563: (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/1563
 2024-11-28 10:03:05 +08:00
jinling.yang
c22b91f9d9 优化采购：一个制造订单对应一个采购单 2024-11-28 09:59:01 +08:00
yuxianghui
0bea93ea46 1、添加返工向导中选择返工工单限制条件 2024-11-27 17:54:59 +08:00
yuxianghui
d6c194eaa8 处理制造订单状态问题。 2024-11-27 16:18:18 +08:00
yuxianghui
a434227807 1、工序排序方法优化；2、返工优化 2024-11-27 11:01:10 +08:00
yuxianghui
d3b61f320f 1、返工优化 2024-11-26 18:01:02 +08:00
jinling.yang
6be7c05415 优化代码 2024-11-26 17:05:45 +08:00
杨金灵
afa5ad36f2 Accept Merge Request #1554: (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/1554
 2024-11-26 16:32:47 +08:00
jinling.yang
e6eb41ad24 优化代码 2024-11-26 16:15:50 +08:00