Merge branch 'feature/制造-计划优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化

sf_plan/__manifest__.py

@@ -16,7 +16,8 @@
     'depends': ['sf_manufacturing'],
     'data': [
         'security/ir.model.access.csv',
-        'views/view.xml'
+        'views/view.xml',
+        'views/duration_view.xml'
     ],
 
     'assets': {

sf_plan/models/__init__.py

@@ -2,3 +2,4 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import custom_plan
+from . import duration

sf_plan/models/duration.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+import base64
+import json, requests
+from odoo import models, fields, api, _
+from datetime import datetime, timedelta
+from odoo.exceptions import UserError, ValidationError
+
+
+class HoleDuration(models.Model):
+    _name = 'hole.duration'
+    _description = 'Hole Duration'
+
+    hole_diameter = fields.Selection([('3', '≤￠3'), ('6', '≤￠6'), ('10', '≤￠10'), ('12', '≤￠12'), ('16', '≤￠16'), ('25', '≤￠25')], string='孔径', required=True)
+    name = fields.Char(string='名称', required=True, default='钻孔')
+    hole_depth = fields.Selection([
+        ('10', '≤10'),
+        ('30', '≤30'),
+        ('50', '≤50'),
+        ('70', '≤70'),
+        ('90', '≤90'),
+        ('100', '≤100'),
+        ('120', '≤120'),
+        ('150', '≤150')], string='深度', required=True)
+    working_hours = fields.Float(string='工时', required=True)
+    hole_expansion = fields.Float(string='扩孔', required=True, default=0.6)

sf_plan/security/ir.model.access.csv

@@ -1,6 +1,7 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_sf_production_plan,sf.production.plan,model_sf_production_plan,base.group_user,1,1,1,1
 access_sf_machine_schedule,sf.machine.schedule,model_sf_machine_schedule,base.group_user,1,1,1,1
+access_hole_duration,hole.duration,model_hole_duration,base.group_user,1,1,1,1
 
 
 

sf_plan/views/duration_view.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="hole_duration_tree" model="ir.ui.view">
+            <field name="name">hole.duration.tree</field>
+            <field name="model">hole.duration</field>
+            <field name="arch" type="xml">
+                <tree string="孔加工">
+                    <field name="name"/>
+                    <field name="hole_diameter"/>
+                    <field name="hole_depth"/>
+                    <field name="working_hours"/>
+                    <field name="hole_expansion"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="hole_duration_form" model="ir.ui.view">
+            <field name="name">hole.duration.form</field>
+            <field name="model">hole.duration</field>
+            <field name="arch" type="xml">
+                <form string="孔加工">
+                    <sheet>
+                        <group>
+                            <field name="name"/>
+                            <field name="hole_diameter"/>
+                            <field name="hole_depth"/>
+                            <field name="working_hours"/>
+                            <field name="hole_expansion"/>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="hole_duration_action" model="ir.actions.act_window">
+            <field name="name">孔加工</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hole.duration</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem
+                id="hole_duration_menu"
+                name="孔加工"
+                sequence="900"
+                action="hole_duration_action"
+                parent="sf_production_plan_menu"
+        />
+
+    </data>
+</odoo>

sf_plan/views/view.xml

@@ -128,7 +128,7 @@
                        decoration-success="state == 'done'"
                        progress_bar="name"
                        form_view_id="sf_production_plan_form"
-                       default_scale="week"
+                       default_scale="day"
                        scales="day,week,month,year"
                        precision="{'day': 'hour:quarter', 'week': 'day:half', 'month': 'day', 'year': 'month:quarter'}">
                         <field name="shift"/>

web_gantt/static/src/js/gantt_row.js

@@ -261,12 +261,18 @@ var GanttRow = Widget.extend({
     _adaptPills: function () {
         var self = this;
         var dateStartField = this.state.dateStartField;
+        console.log("dateStartField",dateStartField)
         var dateStopField = this.state.dateStopField;
+        console.log("dateStopField",dateStopField)
         var ganttStartDate = this.state.startDate;
+        console.log("ganttStartDate",ganttStartDate)
         var ganttStopDate = this.state.stopDate;
+        console.log("ganttStopDate",ganttStopDate)
         this.pills.forEach(function (pill) {
             var pillStartDate = self._convertToUserTime(pill[dateStartField]);
+            console.log("pillStartDate",pillStartDate)
             var pillStopDate = self._convertToUserTime(pill[dateStopField]);
+            console.log("pillStopDate",pillStopDate)
             if (pillStartDate < ganttStartDate) {
                 pill.startDate = ganttStartDate;
                 pill.disableStartResize = true;