opt

.gitignore

@@ -6,3 +6,4 @@
 /app_web_studio
 /web_studio
 .conf
+.pyc

app_stock_barcode/i18n/zh_CN.po

@@ -1,16 +1,220 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* felive_home
+#	* app_stock_barcode
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 10.0+e-20171107\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-08 14:28+0000\n"
+"POT-Creation-Date: 2018-03-19 21:04+0000\n"
-"PO-Revision-Date: 2018-01-08 14:28+0000\n"
+"PO-Revision-Date: 2018-03-19 21:04+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_pack_current_create_uid
+msgid "Created by"
+msgstr "创建人"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_pack_current_create_date
+msgid "Created on"
+msgstr "创建时间"
+
+#. module: app_stock_barcode
+#: model:ir.model,name:app_stock_barcode.model_stock_pack_current
+msgid "Current Packing Operation"
+msgstr "当前扫码打包信息 Packing Operation"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_pack_current_result_package_id
+msgid "Destination Package"
+msgstr "目的包裹"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_pack_current_display_name
+msgid "Display Name"
+msgstr "显示名称"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_pack_current_qty_done
+msgid "Done"
+msgstr "完成"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_picking_qty_done_total
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_quant_package_qty_done_total
+msgid "Done Total"
+msgstr "完成总数"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_pack_current_id
+msgid "ID"
+msgstr "ID"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,help:app_stock_barcode.field_stock_pack_current_result_package_id
+msgid "If set, the operations are packed into this package"
+msgstr "如果设置，此作业即打包到此包裹内"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_pack_current___last_update
+msgid "Last Modified on"
+msgstr "最后修改日"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_picking_last_op_product
+msgid "Last OP"
+msgstr "当前扫码"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_pack_current_write_uid
+msgid "Last Updated by"
+msgstr "最后更新人"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_pack_current_write_date
+msgid "Last Updated on"
+msgstr "最后更新时间"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_picking_package_done_count
+msgid "Package Done Total"
+msgstr "包裹完成"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_picking_package_count
+msgid "Package Total"
+msgstr "包裹待办"
+
+#. module: app_stock_barcode
+#: model:ir.ui.view,arch_db:app_stock_barcode.app_view_picking_form
+msgid "Package："
+msgstr "包裹："
+
+#. module: app_stock_barcode
+#: model:ir.model,name:app_stock_barcode.model_stock_pack_operation
+msgid "Packing Operation"
+msgstr "打包作业"
+
+#. module: app_stock_barcode
+#: model:ir.actions.act_window,name:app_stock_barcode.picking_2_current_action
+msgid "Packing Package"
+msgstr "包裹再包装"
+
+#. module: app_stock_barcode
+#: model:ir.model,name:app_stock_barcode.model_stock_quant_package
+msgid "Physical Packages"
+msgstr "物理包裹"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_pack_current_product_id
+msgid "Product"
+msgstr "产品"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_picking_pack_operation_product_packed_ids
+msgid "Product packed"
+msgstr "散件打包"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_picking_pack_operation_product_current_ids
+msgid "Product packing"
+msgstr "当前打码散件"
+
+#. module: app_stock_barcode
+#: model:ir.ui.view,arch_db:app_stock_barcode.app_view_picking_form
+msgid "Product："
+msgstr "散件："
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_picking_result_package_ids
+msgid "Relate Packages"
+msgstr "完成包裹"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_pack_current_package_id
+msgid "Source Package"
+msgstr "源包裹"
+
+#. module: app_stock_barcode
+#: model:ir.ui.view,arch_db:app_stock_barcode.app_view_picking_form
+msgid "Statistics"
+msgstr "操作统计"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_pack_current_picking_id
+msgid "Stock Picking"
+msgstr "仓库拣货"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,help:app_stock_barcode.field_stock_pack_current_picking_id
+msgid "The stock operation where the packing has been made"
+msgstr "打包作业执行的库存作业"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,help:app_stock_barcode.field_stock_pack_current_weight
+#: model:ir.model.fields,help:app_stock_barcode.field_stock_pack_current_weight_done_subtotal
+#: model:ir.model.fields,help:app_stock_barcode.field_stock_pack_operation_weight
+#: model:ir.model.fields,help:app_stock_barcode.field_stock_pack_operation_weight_done_subtotal
+msgid "The weight of the contents in Kg, not including any packaging, etc."
+msgstr "以Kg(公斤)表示内容物重量，不包含任何包装等。"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_pack_current_product_qty
+msgid "To Do"
+msgstr "待办"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_picking_product_qty_total
+msgid "To Do Total"
+msgstr "待办总数"
+
+#. module: app_stock_barcode
+#: model:ir.ui.view,arch_db:app_stock_barcode.app_view_picking_form
+#: model:ir.ui.view,arch_db:app_stock_barcode.app_vpicktree
+msgid "Total"
+msgstr "总计"
+
+#. module: app_stock_barcode
+#: model:ir.model,name:app_stock_barcode.model_stock_picking
+msgid "Transfer"
+msgstr "调拨"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_pack_current_product_uom_id
+msgid "Unit of Measure"
+msgstr "计量单位"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_pack_current_weight
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_pack_operation_weight
+msgid "Weight"
+msgstr "重量"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_pack_current_weight_done_subtotal
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_pack_operation_weight_done_subtotal
+msgid "Weight Done Subtotal"
+msgstr "重量小计"
+
+#. module: app_stock_barcode
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_picking_weight_done_total
+#: model:ir.model.fields,field_description:app_stock_barcode.field_stock_quant_package_weight_done_total
+msgid "Weight Done Total(kg)"
+msgstr "完成总重量(kg)"
+
+#. module: app_stock_barcode
+#: model:ir.ui.view,arch_db:app_stock_barcode.app_view_picking_form
+msgid "Working Product"
+msgstr "当前操作散件"
+
+#. module: app_stock_barcode
+#: model:ir.ui.view,arch_db:app_stock_barcode.app_view_pack_current_tree
+msgid "total"
+msgstr "总计"
+

app_stock_barcode/models/stock_picking.py

@@ -22,6 +22,8 @@ class Picking(models.Model):
         domain=[('product_id', '>=', 1), ('qty_done', '>=', 1), ('result_package_id', '!=', False)], readonly=True, copy=False)
     # 散件涉及到的包裹列表
     result_package_ids = fields.Many2many('stock.quant.package', string='Relate Packages', readonly=True, copy=False)
+    # 当前操作产品
+    last_op_product = fields.Many2one('product.product', string='Last OP', readonly=True)
 
     # 统计，散件与包裹一起处理的数量
     product_qty_total = fields.Float('To Do Total', compute="_compute_product_qty_total",
@@ -117,4 +119,8 @@ class Picking(models.Model):
                     'qty_done': op.qty_done,
                     'weight': op.weight,
                 }])
-            self.update({'pack_operation_product_current_ids': ops})
+            self.update({'pack_operation_product_current_ids': ops})
+
+    def _check_product(self, product, qty=1.0):
+        self.last_op_product = product
+        return super(Picking, self)._check_product()

app_stock_barcode/views/stock_picking_views.xml

@@ -22,8 +22,9 @@
         <field name="arch" type="xml">
             <xpath expr="//field[@name='origin']" position="after">
                 <field name="result_package_ids" widget="many2many_tags" readonly="1"/>
-                <label for=""/>
+                <label for="last_op_product"/>
                 <div>
+                    <strong><field name="last_op_product"/></strong>
                     <button class="btn btn-primary oe_right" name="put_in_pack2" type="object" string="&#8627;放入包裹"
                             attrs="{'invisible': [('state', 'in', ('done', 'cancel'))]}" groups="stock.group_tracking_lot"/>
                     <button class="btn btn-primary oe_right mb4 mr4" name="set_current" type="object" string="刷新扫码视图"