fix 委外收料修改添加编号

sdddl_project/controllers/roke_work_order.py

@@ -19,45 +19,24 @@ env = Environment(loader=templateloader)
 
 
 class InheritEntrustOrderMain(Main):
 class InheritEntrustOrderMain(Main):
 
 
-
-    # @http.route('/entrust/send/product', type='json', method=["POST", "OPTIONS"], auth='user', cors='*', csrf=False)
-    # def entrust_send_product(self):
-    #     res = super(InheritEntrustOrderMain, self).entrust_send_product()
-    #     work_id = http.request.jsonrequest.get('work_id')
-    #     if work_id:
-    #         work_order = http.request.env['roke.work.order'].search([('id', '=', int(work_id))])
-    #         default_routing = work_order.product_id.routing_id
-    #         bom_line = default_routing.line_ids.filtered(lambda r: r.process_id == work_order.process_id)
-    #         product_list = self._prepare_entrust_send_product_from_process(bom_line, work_order)
-    #         res.update({"info": product_list})
-    #     return res
-    #
-    # def _prepare_entrust_send_product_from_process(self, bom_line, work_order):
-    #     """准备接口/entrust/send/product中的product_list数据"""
-    #     product_list = []
-    #     for i in bom_line.p_bom_ids:
-    #         product_list.append({
-    #             "product_id": i.product_id.id,
-    #             "product_name": i.product_id.name,
-    #             "qty": i.qty * work_order.plan_qty,
-    #             "note": i.note if i.note != False else ''
-    #         })
-    #     return product_list
-
     def _prepare_entrust_info_data(self, entrust_orders):
     def _prepare_entrust_info_data(self, entrust_orders):
         info = []
         info = []
         for i in entrust_orders:
         for i in entrust_orders:
+            user_tz = pytz.timezone(http.request.env.context.get('tz', "Asia/Shanghai"))
+            date_dt = pytz.utc.localize(i.plan_date).astimezone(user_tz)
+            plan_date = date_dt.strftime("%Y-%m-%d %H:%M:%S")
             previours_work_order = i._get_previous_wo()
             previours_work_order = i._get_previous_wo()
             plan_qty = i.plan_qty - sum(
             plan_qty = i.plan_qty - sum(
                 previours_work_order.record_ids.mapped('unqualified_qty')) if previours_work_order else i.plan_qty
                 previours_work_order.record_ids.mapped('unqualified_qty')) if previours_work_order else i.plan_qty
             info.append({
             info.append({
                 'work_id': i.id,
                 'work_id': i.id,
+                'code': i.code,
                 'product_id': i.product_id.id,
                 'product_id': i.product_id.id,
                 'product': i.product_id.name,
                 'product': i.product_id.name,
                 'plan_qty': plan_qty,
                 'plan_qty': plan_qty,
                 'process': i.process_id.name,
                 'process': i.process_id.name,
                 'entrust_customer': i.entrust_customer.name,
                 'entrust_customer': i.entrust_customer.name,
-                'plan_date': i.plan_date,
+                'plan_date': plan_date,
                 'entrust_state': i.entrust_state,
                 'entrust_state': i.entrust_state,
                 'finish_qty': i.finish_qty,
                 'finish_qty': i.finish_qty,
                 'unqualified_qty': i.unqualified_qty,
                 'unqualified_qty': i.unqualified_qty,