0711提交

sf_warehouse/__manifest__.py

@@ -10,7 +10,7 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['stock', ],
+    'depends': ['stock','web' ],
     'data': [
         # 'security/group_security.xml',
         # 'security/ir.model.access.csv',
@@ -24,11 +24,10 @@
         ],
         'web.assets_backend': [
             'sf_warehouse/static/src/change.scss',
-            'sf_warehouse/static/src/kanban_color_change.scss'
+            'sf_warehouse/static/src/kanban_color_change.scss',
-
+            'sf_warehouse/static/src/colorGuide.js'
         ]
 
-
     },
     'license': 'LGPL-3',
     'installable': True,

sf_warehouse/models/model.py

@@ -53,7 +53,7 @@ class SfLocation(models.Model):
     # product_id = fields.Many2one('product.template', string='产品')
     product_id = fields.Many2one('product.product', string='产品', compute='_compute_product_id', readonly=True)
     product_sn_id = fields.Many2one('stock.lot', string='产品序列号')
-
+    time_test = fields.Char(string='time')
     # 添加SQL约束
     _sql_constraints = [
         ('name_uniq', 'unique(name)', '位置名称必须唯一!'),
@@ -90,7 +90,7 @@ class SfLocation(models.Model):
                 record.location_status = '占用'
             else:
                 record.product_id = False
-                record.location_status = '空闲'
+                # record.location_status = '空闲'
 
     @api.depends('location_type')
     def _compute_hide_what(self):

sf_warehouse/static/src/colorGuide.js

@@ -0,0 +1,20 @@
+odoo.define('sf_warehouse.custom_kanban', function (require) {
+    "use strict"
+    var KanbanRenderer = require('web.KanbanRenderer');
+
+    KanbanRenderer.include({
+      _render: function () {
+        var self = this;
+        return this._super.apply(this, arguments).then(function () {
+
+            var colorGuide = $('<div class="color-guide"> \
+                <span class="color-guide-item" style="background-color: red;"></span> \
+                <span class="color-guide-item" style="background-color: green;"></span> \
+                <span class="color-guide-item" style="background-color: blue;"></span> \
+            </div>');
+            self.$('.o_kanban_renderer').prepend(colorGuide);
+        });
+      },
+    });
+
+});

sf_warehouse/static/src/kanban_color_change.scss

@@ -1,11 +1,37 @@
 .oe_kanban_card.kanban_color_1 {
-    background-color: red !important;
+  background-color: #73b9a2 !important;
+  opacity: 0.7;
+  color: #fff;
 }
 
 .oe_kanban_card.kanban_color_2 {
-    background-color: blue !important;
+  background-color: #ac6767 !important;
+  color: #fff;
 }
 
 .oe_kanban_card.kanban_color_3 {
-    background-color: green !important;
+  background-color: #77787b !important;
+  color: #fff;
+}
+
+.spilit {
+  margin-right: 10px;
+}
+
+.testss {
+  width: 200px !important;
+  height: 100px !important;
+  background-color: #000 !important;
+}
+
+.oe_kanban_card .o_kanban_record_bottom:nth-child(2) span:nth-child(2) {
+  display: inline-block;
+  margin-right: 10px;
+}
+
+.color-guide-item {
+  display: inline-block;
+  width: 30px;
+  height: 30px;
+  border-radius: 50%;
 }

sf_warehouse/views/view.xml

@@ -27,19 +27,29 @@
                             <field name="hide_location" invisible="1"/>
                             <field name="barcode" string="编码"/>
                             <field name="location_type"/>
-                        <field name="channel" attrs="{'invisible': [('hide_shelf', '=', False)], 'required': [('hide_shelf', '!=', False)]}"/>
+                            <field name="channel"
-                        <field name="direction" attrs="{'invisible': [('hide_shelf', '=', False)], 'required': [('hide_shelf', '!=', False)]}"/>
+                                   attrs="{'invisible': [('hide_shelf', '=', False)], 'required': [('hide_shelf', '!=', False)]}"/>
-                        <field name="product_sn_id" attrs="{'invisible': [('hide_location', '=', False)], 'required': [('hide_location', '!=', False)]}"/>
+                            <field name="direction"
-
+                                   attrs="{'invisible': [('hide_shelf', '=', False)], 'required': [('hide_shelf', '!=', False)]}"/>
+                            <field name="product_sn_id"
+                                   attrs="{'invisible': [('hide_location', '=', False)], 'required': [('hide_location', '!=', False), ('location_status', '=', '空闲')]}"/>
+                            <field name="time_test" widget='timepicker'/>
                         </group>
                         <group>
-                        <field name="location_category" attrs="{'invisible': [('hide_location_type', '=', False)], 'required': [('hide_location_type', '!=', False)]}"/>
+                            <field name="location_category"
-                        <field name="area_type" attrs="{'invisible': [('hide_area', '=', False)], 'required': [('hide_area', '!=', False)]}"/>
+                                   attrs="{'invisible': [('hide_location_type', '=', False)], 'required': [('hide_location_type', '!=', False)]}"/>
-                        <field name="shelf_height" attrs="{'invisible': [('hide_shelf', '=', False)], 'required': [('hide_shelf', '!=', False)]}"/>
+                            <field name="area_type"
-                        <field name="shelf_layer" attrs="{'invisible': [('hide_shelf', '=', False)], 'required': [('hide_shelf', '!=', False)]}"/>
+                                   attrs="{'invisible': [('hide_area', '=', False)], 'required': [('hide_area', '!=', False)]}"/>
-                        <field name="layer_capacity" attrs="{'invisible': [('hide_shelf', '=', False)], 'required': [('hide_shelf', '!=', False)]}"/>
+                            <field name="shelf_height"
-                        <field name="product_id" attrs="{'invisible': [('hide_location', '=', False)], 'required': [('hide_location', '!=', False)]}"/>
+                                   attrs="{'invisible': [('hide_shelf', '=', False)], 'required': [('hide_shelf', '!=', False)]}"/>
-                        <field name="location_status" attrs="{'invisible': [('hide_location', '=', False)], 'required': [('hide_location', '!=', False)]}"/>
+                            <field name="shelf_layer"
+                                   attrs="{'invisible': [('hide_shelf', '=', False)], 'required': [('hide_shelf', '!=', False)]}"/>
+                            <field name="layer_capacity"
+                                   attrs="{'invisible': [('hide_shelf', '=', False)], 'required': [('hide_shelf', '!=', False)]}"/>
+                            <field name="product_id"
+                                   attrs="{'invisible': [('hide_location', '=', False)], 'required': [('hide_location', '!=', False), ('location_status', '=', '空闲')]}"/>
+                            <field name="location_status"
+                                   attrs="{'invisible': [('hide_location', '=', False)], 'required': [('hide_location', '!=', False)]}"/>
 
                         </group>
 
@@ -50,7 +60,8 @@
                 <!--             </xpath> -->
                 <xpath expr="//form/sheet" position="before">
                     <header>
-                    <button string="生成货位" name="create_location" type="object" class="oe_highlight" attrs="{'invisible': [('hide_shelf', '=', False)]}"/>
+                        <button string="生成货位" name="create_location" type="object" class="oe_highlight"
+                                attrs="{'invisible': [('hide_shelf', '=', False)]}"/>
                     </header>
                 </xpath>
 
@@ -70,11 +81,13 @@
                 </xpath>
             </field>
         </record>
+        <!--         <div class="testss">1023</div>-->
         <record id="example_kanban_view" model="ir.ui.view">
             <field name="name">example.kanban</field>
             <field name="model">stock.location</field>
             <field name="arch" type="xml">
                 <kanban class="o_kanban_mobile">
+                    <div class="xu">
                         <templates>
                         <t t-name="kanban-box">
                             <div t-attf-class="oe_kanban_card oe_kanban_global_click
@@ -93,7 +106,7 @@
                                 </div>
                                 <div class="o_kanban_record_bottom">
                                     <field name="product_sn_id"/>
-                            <span> | </span>
+                                    <span class="spilit">|</span>
                                     <field name="product_id"/>
                                 </div>
                             </div>
@@ -124,6 +137,7 @@
                         <!--                         </div> -->
                         <!--                     </t> -->
                     </templates>
+                    </div>
                 </kanban>
             </field>
         </record>