胡尧
|
7db0a44420
|
Accept Merge Request #2117: (feature/6694 -> develop)
Merge Request: 修改中控日志接口授权为none
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2117?initial=true
|
2025-05-14 16:09:30 +08:00 |
|
胡尧
|
5477582a69
|
修改中控日志接口授权为none
|
2025-05-14 16:09:06 +08:00 |
|
liaodanlong
|
c6f06a4c32
|
外协调拨单就绪条件修改
|
2025-05-14 14:12:06 +08:00 |
|
liaodanlong
|
5b61a801c5
|
空值判断
|
2025-05-14 13:57:57 +08:00 |
|
liaodanlong
|
ed55e36f45
|
sf-制造-产品-表单详情中-工艺参数显示内容=未归档，未绑定产品的工艺参数
|
2025-05-14 11:49:14 +08:00 |
|
liaodanlong
|
50c3b31ece
|
外协采购单使用采购申请创建出来的采购单
|
2025-05-14 10:24:21 +08:00 |
|
liaodanlong
|
8afc8bb3a6
|
外协调拨单只有当制造订单状态变为已编程才能就绪
|
2025-05-14 10:03:26 +08:00 |
|
liaodanlong
|
3148ce5a15
|
外协调拨单不同产品的调拨单混合到一起了
|
2025-05-13 15:49:02 +08:00 |
|
liaodanlong
|
8e726e1bf6
|
sf-制造-工艺外协的采购订单确认后，外协的调拨单的作业详情的预留数量跟完成数量不对
|
2025-05-13 15:01:54 +08:00 |
|
liaodanlong
|
4c0f9cfb39
|
外协工单零件图号零件名称
|
2025-05-13 11:04:45 +08:00 |
|
liaodanlong
|
a8e4c7d9a0
|
调拨单报错问题处理
|
2025-05-13 10:24:09 +08:00 |
|
liaodanlong
|
7501832637
|
调拨单就绪问题处理
|
2025-05-13 10:01:58 +08:00 |
|
liaodanlong
|
ce0ead4da6
|
sf-工序-手动创建工艺可选参数及产品问题
|
2025-05-12 17:13:52 +08:00 |
|
liaodanlong
|
6d3793ee30
|
调拨单就绪问题处理
|
2025-05-12 15:21:10 +08:00 |
|
胡尧
|
9cb22d810e
|
增加接口日志
|
2025-05-12 15:14:04 +08:00 |
|
liaodanlong
|
9e6f3fa864
|
Merge branch 'refs/heads/develop' into feature/tool_standard_library_process
# Conflicts:
# sf_manufacturing/models/purchase_order.py
|
2025-05-12 15:03:25 +08:00 |
|
liaodanlong
|
ed50d7c9a7
|
调拨单就绪问题处理
|
2025-05-12 14:55:19 +08:00 |
|
胡尧
|
35bf954529
|
增加中控接口调用日志记录
|
2025-05-12 11:50:35 +08:00 |
|
liaodanlong
|
36a13c04de
|
采购申请数量与产品数量不一致问题
|
2025-05-12 10:55:21 +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 |
|
胡尧
|
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 |
|