Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹预调工单任务

sf_warehouse/models/model.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import datetime
 import logging
 from odoo import api, fields, models, _
 from odoo.osv import expression
@@ -224,6 +225,23 @@ class ShelfLocation(models.Model):
     _description = '货架货位'
     _order = 'name'
 
+    # current_location_id = fields.Many2one('sf.shelf.location', string='当前位置')
+    # # 目的位置
+    # destination_location_id = fields.Many2one('sf.shelf.location', string='目的位置')
+    current_move_ids = fields.One2many('stock.move.line', 'current_location_id', '当前位置调拨单')
+    destination_move_ids = fields.One2many('stock.move.line', 'destination_location_id', '目标位置调拨单')
+    storage_time = fields.Datetime('入库时间',  compute='_compute_location_status')
+
+    @api.depends('location_status')
+    def _compute_location_status(self):
+        for record in self:
+            if record.location_status == '占用':
+                record.storage_time = datetime.datetime.now()
+            if record.location_status == '空闲':
+                record.storage_time = False
+            if record.location_status == '禁用':
+                record.storage_time = False
+
     name = fields.Char('名称', required=True, size=20)
     barcode = fields.Char('编码', copy=False, size=15)
 
@@ -291,8 +309,8 @@ class ShelfLocation(models.Model):
                 record.sudo().product_id = record.product_sn_id.product_id
                 record.sudo().location_status = '占用'
             else:
-                record.sudo().product_id = False
-                record.sudo().location_status = '空闲'
+                record.product_id = False
+                # record.location_status = '空闲'
 
     @api.depends('location_type')
     def _compute_hide_what(self):
@@ -453,7 +471,7 @@ class SfStockPicking(models.Model):
             if line:
                 if line.current_location_id:
                     line.current_location_id.product_sn_id = False
-                    line.current_location_id = False
+                    line.current_location_id.location_status = '空闲'
         return res