mgw
|
3745125990
|
编程单去重
|
2025-02-24 16:59:12 +08:00 |
|
mgw
|
28a16ca08e
|
调整工单名称、编程单去重
|
2025-02-24 15:29:02 +08:00 |
|
mgw
|
74442c6539
|
改正语法问题
|
2025-02-24 15:15:27 +08:00 |
|
mgw
|
4e7bf40d91
|
调整领料单生成次数
|
2025-02-24 15:12:23 +08:00 |
|
mgw
|
7ab90143b6
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-02-24 14:59:53 +08:00 |
|
mgw
|
8bf788e39c
|
调整行号取值
|
2025-02-24 14:57:19 +08:00 |
|
mgw
|
9e25657fea
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-02-24 14:46:35 +08:00 |
|
mgw
|
555802b271
|
调整下游单据内容
|
2025-02-24 14:46:18 +08:00 |
|
mgw
|
91061b1eec
|
调整调拨产品名称等
|
2025-02-21 17:34:57 +08:00 |
|
胡尧
|
70855a4936
|
Accept Merge Request #1830: (feature/mrp_bug_fixed -> develop)
Merge Request: 取消配送路线关联字段修改
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1830?initial=true
|
2025-02-21 14:29:46 +08:00 |
|
胡尧
|
1bbdf2bd44
|
取消配送路线关联字段修改
|
2025-02-21 14:29:15 +08:00 |
|
mgw
|
064af3b884
|
调整名称
|
2025-02-19 15:34:42 +08:00 |
|
mgw
|
0969967570
|
修复完善取消订单问题
|
2025-02-19 15:14:05 +08:00 |
|
mgw
|
dc29671f1a
|
增加状态映射
|
2025-02-17 17:59:38 +08:00 |
|
mgw
|
09f8f5c0fd
|
调整状态
|
2025-02-17 17:30:02 +08:00 |
|
mgw
|
f24c5ff75a
|
调整字段名称
|
2025-02-17 16:21:01 +08:00 |
|
mgw
|
8d9aee497a
|
完善取消订单功能
|
2025-02-17 16:11:48 +08:00 |
|
mgw
|
5d2cadc3d0
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-02-17 15:37:58 +08:00 |
|
mgw
|
567ea84b00
|
完善人工编程功能
|
2025-02-17 15:37:30 +08:00 |
|
胡尧
|
8095a8a972
|
修改配送类型的字段关联形式，修改工件配送列表页的默认筛选条件
|
2025-02-17 13:23:32 +08:00 |
|
mgw
|
3e9b6f808d
|
优化取消接单功能
|
2025-02-17 10:00:40 +08:00 |
|
mgw
|
e98a9a3788
|
增加取消订单其他功能
|
2025-02-14 17:29:33 +08:00 |
|
mgw
|
3ac096e9a7
|
取消接单需求进行中
|
2025-02-13 17:41:18 +08:00 |
|
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 |
|