Compare commits

...

5 Commits

Author SHA1 Message Date
guyaodong
8b66fda899 增加kanban悬停tip 2025-06-18 14:26:53 +08:00
huziyang@jikimo.com
6321e7ef23 货位看板详情回退修复,删除幽灵卡片。 2025-06-12 15:38:56 +08:00
huziyang@jikimo.com
23dd88b7ba 解决冲突 2025-06-09 10:01:57 +08:00
huziyang@jikimo.com
f164488e48 屏蔽OCC导入 2025-06-09 09:59:47 +08:00
huziyang@jikimo.com
25b53794bb 处理#6973任务:
1货位编码规则简化
2货位看板直观化展示
2025-06-09 09:49:21 +08:00
9 changed files with 2066 additions and 1629 deletions

View File

@@ -10,8 +10,8 @@ from odoo.exceptions import ValidationError, UserError
from odoo.modules import get_resource_path
from OCC.Extend.DataExchange import read_step_file
from OCC.Extend.DataExchange import write_stl_file
# from OCC.Extend.DataExchange import read_step_file
# from OCC.Extend.DataExchange import write_stl_file
class ResProductMo(models.Model):

View File

@@ -8,8 +8,8 @@ from datetime import datetime
import requests
from odoo import http
from odoo.http import request
from OCC.Extend.DataExchange import read_step_file
from OCC.Extend.DataExchange import write_stl_file
# from OCC.Extend.DataExchange import read_step_file
# from OCC.Extend.DataExchange import write_stl_file
from odoo import models, fields, api
from odoo.modules import get_resource_path
from odoo.exceptions import ValidationError, UserError

View File

@@ -5,8 +5,8 @@ import requests
import os
from datetime import datetime
# from OCC.Core.GProp import GProp_GProps
from OCC.Extend.DataExchange import read_step_file
from OCC.Extend.DataExchange import write_stl_file
# from OCC.Extend.DataExchange import read_step_file
# from OCC.Extend.DataExchange import write_stl_file
from odoo.addons.sf_base.commons.common import Common
from odoo import models, fields, api
from odoo.modules import get_resource_path

View File

@@ -2,7 +2,7 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
{
'name': '机企猫智能工厂 库存管理',
'version': '1.0',
'version': '1.2',
'summary': '智能工厂库存管理',
'sequence': 1,
'description': """
@@ -23,17 +23,16 @@
'demo': [
],
'assets': {
'web.assets_qweb': [
],
'web.assets_backend': [
# 'sf_warehouse/static/src/js/vanilla-masker.min.js',
'sf_warehouse/static/src/css/kanban_color_change.scss',
'sf_warehouse/static/src/js/custom_kanban_controller.js',
'sf_warehouse/static/src/xml/custom_kanban_controller.xml',
'sf_warehouse/static/src/css/kanban_location_custom.scss',
'sf_warehouse/static/src/js/shelf_location_search.js',
]
},
'license': 'LGPL-3',
'installable': True,

View File

@@ -0,0 +1,15 @@
from odoo import api, SUPERUSER_ID
def migrate(cr, version):
env = api.Environment(cr, SUPERUSER_ID, {})
sf_shelf_model = env["sf.shelf"]
sf_shelf_location_model = env["sf.shelf.location"]
shelves = sf_shelf_model.search([])
for shelf in shelves:
shelf_barcode = shelf.barcode or ""
if not shelf_barcode:
continue
locations = sf_shelf_location_model.search([("shelf_id", "=", shelf.id)], order="id asc")
for index, location in enumerate(locations, start=1):
new_barcode = f"{shelf_barcode}-{index:03d}"
location.barcode = new_barcode

View File

@@ -303,7 +303,9 @@ class SfShelf(models.Model):
area_type_barcode = self.barcode
i_str = str(i + 1).zfill(3) # 确保是两位数如果不足两位左侧补0
j_str = str(j + 1).zfill(3) # 确保是两位数如果不足两位左侧补0
return area_type_barcode + self.channel + self.direction + '-' + self.barcode + '-' + i_str + '-' + j_str
num_str = str((i)*self.layer_capacity+j + 1).zfill(3)
# return area_type_barcode + self.channel + self.direction + '-' + self.barcode + '-' + i_str + '-' + j_str
return area_type_barcode + '-' + num_str
def print_all_location_barcode(self):
"""
@@ -457,7 +459,41 @@ class ShelfLocation(models.Model):
product_sn_ids = fields.One2many('sf.shelf.location.lot', 'shelf_location_id', string='产品批次号')
# 产品数量
product_num = fields.Integer('总数量', compute='_compute_number', store=True)
tool_rfid = fields.Char('Rfid', compute='_compute_tool', store=True)
tool_name_id = fields.Many2one('sf.functional.cutting.tool.entity', string='功能刀具名称', compute='_compute_tool', store=True)
display_rfid = fields.Char('RFID', compute='_compute_display_rfid', store=True)
@api.depends('product_sn_id')
def _compute_display_rfid(self):
"""计算显示 RFID"""
for record in self:
try:
record.display_rfid = record.product_sn_id.rfid if record.product_sn_id else ''
except Exception as e:
record.display_rfid = ''
_logger.error(f"计算 display_rfid 时出错: {e}")
@api.depends('product_id')
def _compute_tool(self):
"""计算工具 RFID"""
for record in self:
try:
if record.product_id:
if record.product_id.categ_id.name == '功能刀具':
# 搜索关联的功能刀具实体
tool_id = self.env['sf.functional.cutting.tool.entity'].search(
[('barcode_id', '=', record.product_sn_id.id)], limit=1
)
if tool_id:
record.tool_rfid = tool_id.rfid
record.tool_name_id = tool_id.id
continue
# 默认值
record.tool_rfid = ''
record.tool_name_id = False
except Exception as e:
record.tool_rfid = ''
record.tool_name_id = False
_logger.error(f"计算 tool_rfid 时出错: {e}")
@api.depends('product_num')
def _compute_product_num(self):
for record in self:
@@ -545,6 +581,25 @@ class ShelfLocation(models.Model):
records = super(ShelfLocation, self).create(vals_list)
return records
kanban_show_layer_info = fields.Char('展示货位的层信息', compute='_compute_kanban_show_info')
kanban_show_center_control_code = fields.Char('展示货位的货柜信息', compute='_compute_kanban_show_info')
@api.depends('shelf_id','barcode')
def _compute_kanban_show_info(self):
for record in self:
arr = record.barcode.split('-')
alen = len(arr)
if( alen >= 1):
_cc_code = int(arr[alen-1])
_layer = _cc_code // record.shelf_id.layer_capacity
_layer_capacity = _cc_code % record.shelf_id.layer_capacity
if _layer_capacity == 0:
_layer_capacity = record.shelf_id.layer_capacity
else:
_layer_capacity = _layer_capacity
_layer = _layer+1
_layer_capacity = f"{_layer_capacity:02d}"
record.kanban_show_layer_info=f"{_layer}-{_layer_capacity}"
record.kanban_show_center_control_code=f"{_cc_code}"
class SfShelfLocationLot(models.Model):
_name = 'sf.shelf.location.lot'

View File

@@ -0,0 +1,198 @@
// 定义看板公共样式的Mixin
@mixin kanban-common-styles($record-count-each-row, $record-gap: 16px) {
$record-gap-total-width: $record-gap * ($record-count-each-row - 1);
display: flex !important;
flex-wrap: wrap !important;
overflow-x: hidden !important;
overflow-y: auto !important;
padding: 0 !important;
gap: $record-gap !important;
width: 100% !important;
height: 100% !important;
// === 卡片基础样式(完全保留)===
.o_kanban_record {
flex: 0 0 calc((100% - #{$record-gap-total-width}) / #{$record-count-each-row}) !important;
height: calc((100% - #{$record-gap * 6}) / 6) !important;
margin: 0 !important;
padding: 0 !important;
background-color: white !important;
border: 1px solid #dee2e6 !important;
border-radius: 4px !important;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1) !important;
min-width: calc((100% - #{$record-gap-total-width}) / #{$record-count-each-row}) !important;
max-width: calc((100% - #{$record-gap-total-width}) / #{$record-count-each-row}) !important;
position: relative;
transition: all 0.25s ease !important;
overflow: visible !important; // 允许悬停条溢出卡片边界
// === 状态标签(保留原设计)===
.status-label {
position: absolute;
top: 8px;
right: 8px;
padding: 3px 8px;
background: rgba(255, 255, 255, 0.9);
border: 1px solid #e0e0e0;
border-radius: 3px;
font-size: 11px;
color: #424242;
z-index: 2;
}
// === 优化:悬停信息条(核心改动)===
.status-hover-bar {
position: absolute;
bottom: calc(100% + 8px); // 默认显示在卡片上方
left: 0;
z-index: 1000;
min-width: max-content; // 宽度自适应内容
max-width: 300px; // 防止过宽
padding: 10px 12px;
background: rgba(255, 255, 255, 0.95);
border: 1px solid #e0e0e0;
border-radius: 4px;
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
font-size: 12px;
color: #424242;
white-space: nowrap; // 强制单行显示
opacity: 0;
pointer-events: none; // 避免阻挡卡片交互
transition: opacity 0.2s ease, transform 0.2s ease;
transform: translateY(10px);
// 三角形指示器
&::after {
content: '';
position: absolute;
top: 100%;
left: 15px;
border: 6px solid transparent;
border-top-color: rgba(0, 0, 0, 0.85);
}
div {
margin-bottom: 4px;
line-height: 1.4;
}
}
// === 悬停触发逻辑 ===
&:hover {
transform: translateY(-4px) !important;
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08) !important;
z-index: 10;
.status-hover-bar {
background: rgba(50, 50, 50, 0.9);
color: #fff !important;
font-size: 12px;
opacity: 0.9;
transform: translateY(0);
pointer-events: auto; // 悬停时允许交互
}
}
// === 边界保护(智能定位)===
// 左侧卡片:左对齐
&:nth-child(#{$record-count-each-row}n+1) .status-hover-bar {
left: 0;
right: auto;
&::after { left: 15px; }
}
// 右侧卡片:右对齐
&:nth-child(#{$record-count-each-row}n) .status-hover-bar {
left: auto;
right: 0;
&::after {
left: auto;
right: 15px;
}
}
&:nth-child(#{$record-count-each-row}n + #{$record-count-each-row - 1}) .status-hover-bar {
left: auto;
right: 0;
&::after {
left: auto;
right: 15px;
}
}
// 顶部卡片:悬停条显示在下方
&:nth-child(-n+#{$record-count-each-row}) .status-hover-bar {
bottom: auto;
top: calc(100% + 8px);
&::after {
top: auto;
bottom: 100%;
border-top-color: transparent;
border-bottom-color: rgba(255, 255, 255, 0.95);
}
}
// === 禁用状态样式(保留原效果)===
&.kanban_color_3 {
opacity: 0.6;
&:hover {
opacity: 0.85;
.status-hover-bar {
background:rgba(0, 0, 0, 0.85);
color: white !important;
border: 1px solid rgba(255, 255, 255, 0.15) !important;
}
}
}
}
}
// === 看板视图样式(完全保留)===
.o_kanban_view {
// 卡片内部结构(不修改)
.o_kanban_record {
.o_kanban_record_bottom {
margin: 0;
}
.oe_kanban_card.kanban_color_3,
.oe_kanban_card.kanban_color_1,
.oe_kanban_card.kanban_color_2 {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
width: 100%;
height: 100%;
.sf_kanban_custom_location_info_style {
display: flex !important;
justify-content: center !important;
align-items: center !important;
width: 100%;
font-size: 15px;
color: #000000;
padding:0px;
}
.sf_kanban_no {
display: flex !important;
justify-content: center !important;
align-items: center !important;
font-size: 18px;
color: #000000;
}
}
}
// 不同列数的看板样式
.sf_kanban_location_style12 {
@include kanban-common-styles(12);
}
.sf_kanban_location_style19 {
@include kanban-common-styles(19);
}
.sf_kanban_location_style4 {
@include kanban-common-styles(4);
}
.sf_kanban_location_style3 {
@include kanban-common-styles(3);
}
}

View File

@@ -1,21 +1,177 @@
/** @odoo-module */
import {KanbanController} from "@web/views/kanban/kanban_controller";
import {kanbanView} from "@web/views/kanban/kanban_view";
import {registry} from "@web/core/registry";
import { KanbanController } from "@web/views/kanban/kanban_controller";
import { KanbanRenderer } from "@web/views/kanban/kanban_renderer";
import { kanbanView } from "@web/views/kanban/kanban_view";
import { registry } from "@web/core/registry";
import { useService } from "@web/core/utils/hooks";
import { useState, onWillStart, onWillUnmount, onMounted } from "@odoo/owl";
// 自定义看板渲染器
class CustomKanbanRenderer extends KanbanRenderer {
// the controller usually contains the Layout and the renderer.
class CustomKanbanController extends KanbanController {
// Your logic here, override or insert new methods...
// if you override setup(), don't forget to call super.setup()
}
// 自定义看板控制器
class CustomKanbanController extends KanbanController {
setup() {
super.setup();
this.orm = useService("orm");
this.searchModel = this.model.env.searchModel;
this.defaultPagerLimit = this.getSystemDefaultLimit();
this._onUpdate = (payload) => {
this._handleSearchUpdate(payload);
};
this.env.services.user.updateContext({
isBaseStyle: true
});
let self = this;
// 获取货架分层数据
onWillStart(async () => {
this.searchModel.on('update', self, self._onUpdate);
await this.loadShelfLayersData();
});
// 组件销毁时移除监听
onWillUnmount(() => {
this.searchModel.off('update', self, self._onUpdate);
});
// 监听视图切换事件以监控面包屑
onMounted(() => {
this.handleRouteChange()
});
}
handleRouteChange() {
this.render(true);
let domain = this.searchModel.domain;
if (domain.length > 0) {
let shelfDomain = domain.find(item => item[0] === 'shelf_id');
this.onShelfChange(shelfDomain[2]);
} else {
this.setKanbanStyle('sf_kanban_location_style');
}
}
_handleSearchUpdate() {
try {
let domain = this.searchModel.domain;
if (domain.length > 0) {
let shelfDomain = domain.find(item => item[0] === 'shelf_id');
if (shelfDomain) {
let shelfId = shelfDomain[2];
// 如果货架ID存在则设置相应的样式
if (shelfId) {
this.onShelfChange(shelfId);
return;
}
}
}
//设置默认样式
this.updatePagerLimit(this.defaultPagerLimit);
this.setKanbanStyle('sf_kanban_location_style');
} catch (error) {
}
}
// 加载所有货架的层数数据
async loadShelfLayersData() {
this.shelfLayersMap = {};
const shelfIds = await this.orm.search('sf.shelf', []);
const shelves = await this.orm.read('sf.shelf', shelfIds, ['id', 'layer_capacity']);
shelves.forEach(shelf => {
this.shelfLayersMap[shelf.id] = shelf.layer_capacity;
});
}
setKanbanStyle(style) {
this.env.services.user.updateContext({
isBaseStyle: style === 'sf_kanban_location_style'
});
const kanbanViewEl = document.querySelector('.o_kanban_renderer');
if (kanbanViewEl) {
let isHave = false;
// 移除所有现有的 sf_kanban_* 类
Array.from(kanbanViewEl.classList).forEach(cls => {
if (cls.startsWith('sf_kanban_location_style')) {
kanbanViewEl.classList.remove(cls);
isHave = true;
}
});
// 添加新类
if (isHave) kanbanViewEl.classList.add(style);
}
const ghostCards = document.querySelectorAll('.o_kanban_ghost');
ghostCards.forEach(card => {
card.remove();
});
}
updatePagerLimit(limit) {
if (this.model.root.limit !== limit) {
this.model.root.limit = limit;
this.render(true);
}
}
// 处理货架变更事件
async onShelfChange(shelfId) {
let style = 'sf_kanban_location_style';
let isBaseStyle = true;
if (shelfId) {
// 如果没有缓存,从服务器加载数据
if (!(shelfId in this.shelfLayersMap)) {
const [shelf] = await this.orm.read('sf.shelf', [shelfId], ['layer_capacity']);
this.shelfLayersMap[shelfId] = shelf.layer_capacity;
}
// 获取该货架的层数
const layerCapacity = this.shelfLayersMap[shelfId];
// 根据层数设置不同的样式
if (layerCapacity >= 1) {
style = `sf_kanban_location_style${layerCapacity}`;
isBaseStyle = false;
}
}
if (isBaseStyle) {
this.updatePagerLimit(this.defaultPagerLimit);
}
else {
this.updatePagerLimit(500);
}
this.setKanbanStyle(style);
}
/**
* 获取系统默认分页记录数
*/
getSystemDefaultLimit() {
// 方法1从用户服务获取默认值
const userService = this.env.services.user;
// 获取用户配置的默认分页大小
if (userService && userService.user_context && userService.user_context.limit) {
return userService.user_context.limit;
}
// 方法3使用Odoo核心默认值通常为80
return 80;
}
}
// 设置自定义模板
CustomKanbanController.template = "sf_warehouse.CustomKanbanView";
export const customKanbanView = {
...kanbanView, // contains the default Renderer/Controller/Model
...kanbanView,
Controller: CustomKanbanController,
Renderer: CustomKanbanRenderer,
};
// Register it to the views registry
registry.category("views").add("custom_kanban", customKanbanView);

View File

@@ -193,64 +193,78 @@
</field>
</record>
<record id="shelf_location_kanban_view" model="ir.ui.view">
<record id="shelf_location_kanban_view" model="ir.ui.view">
<field name="name">shelf.location.kanban</field>
<field name="model">sf.shelf.location</field>
<field name="arch" type="xml">
<kanban class="o_kanban_mobile" js_class="custom_kanban" create="0">
<kanban class="sf_kanban_location_style" js_class="custom_kanban" create="0">
<templates>
<t t-name="kanban-box">
<t t-set='isBaseStyle' t-value="user_context.isBaseStyle"/>
<div t-attf-class="oe_kanban_card oe_kanban_global_click
#{record.location_status.raw_value == '空闲' ? 'kanban_color_1' : ''}
#{record.location_status.raw_value == '占用' ? 'kanban_color_2' : ''}
#{record.location_status.raw_value == '禁用' ? 'kanban_color_3' : ''}">
<!-- 标题 -->
<!-- 所有情况都需要的数据 (隐藏) -->
<div style="display:none">
<field name="location_status"/>
<field name="tool_name_id"/>
</div>
<t t-if="isBaseStyle">
<div class="o_kanban_card_header">
<div class="o_kanban_card_header_title">
<field name="name"/>
</div>
</div>
<!-- 内容 -->
<div class="o_kanban_record_bottom">
<field name="location_status"/>
</div>
<div class="o_kanban_record_bottom">
<field name="product_sn_id"/>
<span>|</span>
<field name="product_id"/>
</div>
</t>
<t t-else="">
<div class="o_kanban_record_bottom sf_kanban_custom_location_info_style">
<field name="kanban_show_layer_info"/>
</div>
<!-- 添加RFID字段 -->
<t t-if="record.data and record.data.display_rfid">
<div class="o_kanban_record_bottom">
<field name="display_rfid"/>
</div>
</t>
<t t-if="record.data and record.data.tool_rfid">
<div class="o_kanban_record_bottom">
<field name="tool_rfid"/>
</div>
</t>
<!-- 悬停时显示的详细信息 -->
<div class="status-hover-bar">
<t t-if="record.product_id.value">
<div>产品: <t t-esc="record.product_id.value"/></div>
</t>
<t t-if="record.product_sn_id.value">
<div>标签ID: <t t-esc="record.product_sn_id.value"/></div>
</t>
<!-- <t t-if="record.display_rfid.value">
<div>rfid: <t t-esc="record.display_rfid.value"/></div>
</t>
<t t-if="record.tool_rfid.value">
<div>rfid: <t t-esc="record.tool_rfid.value"/></div>
</t> -->
<t t-if="record.tool_name_id and record.tool_name_id.value">
<div>功能刀具名称: <t t-esc="record.tool_name_id.value"/></div>
</t>
<div>状态: <t t-esc="record.location_status.value"/></div>
</div>
</t>
</div>
</t>
<!-- <t t-name="kanban-box"> -->
<!-- <div t-attf-class="oe_kanban_card oe_kanban_global_click -->
<!-- #{record.location_status.raw_value == '空闲' ? 'kanban_color_1' : ''} -->
<!-- #{record.location_status.raw_value == '占用' ? 'kanban_color_2' : ''} -->
<!-- #{record.location_status.raw_value == '禁用' ? 'kanban_color_3' : ''}"> -->
<!-- 看板内容 -->
<!-- </div> -->
<!-- <div t-attf-class="oe_kanban_card"> -->
<!-- 标题 -->
<!-- <div class="o_kanban_card_header"> -->
<!-- <div class="o_kanban_card_header_title"> -->
<!-- <field name="name"/> -->
<!-- </div> -->
<!-- </div> -->
<!-- 内容 -->
<!-- <div class="o_kanban_record_bottom"> -->
<!-- <field name="location_status"/> -->
<!-- </div> -->
<!-- <div class="o_kanban_record_bottom"> -->
<!-- <field name="product_sn_id"/> -->
<!-- <span> | </span> -->
<!-- <field name="product_id"/> -->
<!-- </div> -->
<!-- </div> -->
<!-- </t> -->
</templates>
</kanban>
</field>
</record>
</record>
<!-- 搜索视图 -->
<record id="shelf_location_search_view" model="ir.ui.view">
<field name="name">shelf.location.search</field>