yuxianghui
|
3a9cd3f39d
|
1、获取日计划接口优化；2、货位信息接口优化；
|
2025-05-22 11:04:06 +08:00 |
|
胡尧
|
c2e4085b50
|
解决产品模板复制的问题
|
2025-05-15 12:14:33 +08:00 |
|
胡尧
|
c80e12d731
|
回退工艺外协代码
|
2025-05-15 11:07:22 +08:00 |
|
胡尧
|
9c4d545915
|
Merge branch 'develop' into feature/6694
|
2025-05-15 10:33:42 +08:00 |
|
胡尧
|
c898e02860
|
解决制造申请字段未复制到成品中
|
2025-05-14 17:02:04 +08:00 |
|
胡尧
|
5477582a69
|
修改中控日志接口授权为none
|
2025-05-14 16:09:06 +08:00 |
|
胡尧
|
9cb22d810e
|
增加接口日志
|
2025-05-12 15:14:04 +08:00 |
|
胡尧
|
35bf954529
|
增加中控接口调用日志记录
|
2025-05-12 11:50:35 +08:00 |
|
胡尧
|
ceb38aa483
|
Accept Merge Request #2106: (feature/tool_standard_library_process -> develop)
Merge Request: 工艺外协代码
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2106
|
2025-05-12 08:41:26 +08:00 |
|
胡尧
|
11ecad5ef2
|
解决冲突
|
2025-05-12 08:41:12 +08:00 |
|
胡尧
|
61bcd72a41
|
表面工艺外协调拨单数量问题
|
2025-05-09 17:24:24 +08:00 |
|
胡尧
|
ee87e1dacf
|
处理特殊表面工艺采购单确认报错的问题
|
2025-05-09 15:26:12 +08:00 |
|
胡尧
|
d0d4db1555
|
修改制造目录文件结构
|
2025-05-09 14:57:35 +08:00 |
|
胡尧
|
bfff4ac440
|
确认接收时，将不追溯的产品的完成数量自动填上
|
2025-05-09 13:43:10 +08:00 |
|
胡尧
|
e5b730b2ef
|
人工线下返工在不选择重新编程时复制加工图纸
|
2025-05-08 21:21:51 +08:00 |
|
liaodanlong
|
b5339046b9
|
工艺外协代码
|
2025-05-08 16:42:18 +08:00 |
|
liaodanlong
|
51c517145b
|
工艺外协代码
|
2025-05-07 17:17:41 +08:00 |
|
胡尧
|
fffbfc21c2
|
表面工艺外协工单流程数量按照制造订单的product_uom_qty设置
|
2025-05-07 13:02:13 +08:00 |
|
胡尧
|
5aa848de53
|
修改判断坯料序列号的逻辑
|
2025-05-07 11:01:01 +08:00 |
|
liaodanlong
|
efc4ae31c9
|
工艺外协代码
|
2025-05-07 11:00:32 +08:00 |
|
liaodanlong
|
0863238819
|
Merge branch 'refs/heads/develop' into feature/tool_standard_library_process
|
2025-05-07 11:00:24 +08:00 |
|
胡尧
|
2bf43ae9a1
|
将成品的追溯复制到product上，将坯料的追溯同成品的追组
|
2025-05-07 08:47:33 +08:00 |
|
liaodanlong
|
95c25ac7b8
|
工艺外协代码
|
2025-04-29 13:39:36 +08:00 |
|
liaodanlong
|
ce79016bef
|
返工未申请重新编程，新工单复制程序文件问题处理
|
2025-04-27 17:20:15 +08:00 |
|
liaodanlong
|
5f79d2038c
|
工艺外协采购单展示问题
|
2025-04-27 11:49:56 +08:00 |
|
liaodanlong
|
defd779279
|
返工 不重新编程 cnc加工工单没有数据问题
|
2025-04-27 11:35:29 +08:00 |
|
liaodanlong
|
e2e820267e
|
字符串拼接问题处理
|
2025-04-27 11:04:09 +08:00 |
|
liaodanlong
|
94f179a6d6
|
工艺外协代码回退
|
2025-04-27 10:46:48 +08:00 |
|
liaodanlong
|
9f1beb4013
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# sf_manufacturing/models/mrp_production.py
# sf_manufacturing/models/purchase_order.py
# sf_sale/models/sale_order.py
|
2025-04-27 08:50:45 +08:00 |
|
liaodanlong
|
9cf70cc54c
|
工艺外协代码回退
|
2025-04-26 14:42:38 +08:00 |
|
liaodanlong
|
443a21a0cc
|
工序外协需求
|
2025-04-25 11:46:05 +08:00 |
|
胡尧
|
8116e4f97d
|
解决更新出现字段未找到的问题
|
2025-04-25 10:08:03 +08:00 |
|
胡尧
|
27b9a4f982
|
解决冲突
|
2025-04-25 09:19:00 +08:00 |
|
胡尧
|
94007bae2b
|
产品详情增加只有成品类型才显示模型ID
|
2025-04-25 09:16:40 +08:00 |
|
yuxianghui
|
d7d094c84d
|
Merge branch 'feature/工单排序' into feature/工单排序_1
|
2025-04-24 15:05:57 +08:00 |
|
yuxianghui
|
a06e24583d
|
添加工单先按工序排序，再按创建时间排序
|
2025-04-24 15:04:04 +08:00 |
|
胡尧
|
4b29def105
|
修改模型id为模型ID，增加机台判断
|
2025-04-24 14:58:50 +08:00 |
|
胡尧
|
40137ba69c
|
去掉产品form重复的字段
|
2025-04-24 14:31:22 +08:00 |
|
胡尧
|
d16d47dfbe
|
销售订单，制造订单视图中加入模型id
|
2025-04-24 14:13:10 +08:00 |
|
胡尧
|
5a61b3b459
|
调整机台二维码使用A4打印机
|
2025-04-24 09:58:27 +08:00 |
|
胡尧
|
f598b6c71c
|
解决从制造订单跳转到产品无法显示模型id的问题
|
2025-04-23 16:58:59 +08:00 |
|
胡尧
|
7b77d846c3
|
Accept Merge Request #2040: (hotfix/解决采购申请bug -> develop)
Merge Request: 解决创建采购申请报错
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2040?initial=true
|
2025-04-23 14:21:27 +08:00 |
|
廖丹龙
|
5e3bce1931
|
Accept Merge Request #2038: (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/2038
|
2025-04-23 11:25:04 +08:00 |
|
yuxianghui
|
7c7876e96f
|
工单添加默认按工序排序
|
2025-04-23 11:19:08 +08:00 |
|
liaodanlong
|
5438ff6df1
|
排程产能限制问题
|
2025-04-23 11:06:03 +08:00 |
|
管欢
|
9b3fe5c070
|
Accept Merge Request #2036: (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/2036
|
2025-04-23 09:48:26 +08:00 |
|
廖丹龙
|
a84f8636a4
|
Accept Merge Request #2035: (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/2035
|
2025-04-23 09:12:59 +08:00 |
|
liaodanlong
|
7c26045377
|
工艺确认报错问题处理
|
2025-04-23 09:12:20 +08:00 |
|
guanhuan
|
151bc5da4f
|
报价菜单修改
|
2025-04-22 15:43:14 +08:00 |
|
廖丹龙
|
8e09e9715c
|
Accept Merge Request #2031: (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/2031
|
2025-04-22 15:05:42 +08:00 |
|