diff --git a/sf_bf_connect/controllers/controllers.py b/sf_bf_connect/controllers/controllers.py
index 607aa5c2..4689345c 100644
--- a/sf_bf_connect/controllers/controllers.py
+++ b/sf_bf_connect/controllers/controllers.py
@@ -166,5 +166,5 @@ class jdElcp(http.Controller):
return json.dumps({'statusCode': 415, 'statusMessage': '订单号不能为空'}, ensure_ascii=False)
aa = request.env['sale.order'].sudo().search([('name', '=', kw['orderNo'])])
if aa:
- aa.schedule_status = 'received'
+ # aa.schedule_status = 'received'
return json.dumps({'statusCode': 200, 'statusMessage': '修改成功'}, ensure_ascii=False)
diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py
index 86d18009..ac7f77b3 100644
--- a/sf_manufacturing/controllers/controllers.py
+++ b/sf_manufacturing/controllers/controllers.py
@@ -226,8 +226,8 @@ class Manufacturing_Connect(http.Controller):
if production_obj:
production_obj.sudo().work_order_state = '已完成'
production_obj.write({'state': 'completed'})
- request.env['sale.order'].sudo().search(
- [('name', '=', production_obj.origin)]).write({'schedule_status': 'to deliver'})
+ # request.env['sale.order'].sudo().search(
+ # [('name', '=', production_obj.origin)]).write({'schedule_status': 'to deliver'})
except Exception as e:
res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index df9ed02e..4f4f35a5 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -248,7 +248,7 @@ class StockRule(models.Model):
sale_order = self.env['sale.order'].sudo().search([('name', '=', production.origin)])
if sale_order:
- sale_order.write({'schedule_status': 'to schedule'})
+ # sale_order.write({'schedule_status': 'to schedule'})
self.env['sf.production.plan'].sudo().with_company(company_id).create({
'name': production.name,
'order_deadline': sale_order.deadline_of_delivery,
diff --git a/sf_plan/models/custom_plan.py b/sf_plan/models/custom_plan.py
index 14c8dd93..73f8c5c7 100644
--- a/sf_plan/models/custom_plan.py
+++ b/sf_plan/models/custom_plan.py
@@ -221,9 +221,9 @@ class sf_production_plan(models.Model):
record.sudo().production_id.schedule_state = '已排'
record.sudo().production_id.process_state = '待装夹'
# self.env['sale.order'].browse(record.production_id.origin).schedule_status = 'to process'
- sale_obj = self.env['sale.order'].search([('name', '=', record.origin)])
- if 'S' in sale_obj.name:
- sale_obj.schedule_status = 'to process'
+ # sale_obj = self.env['sale.order'].search([('name', '=', record.origin)])
+ # if 'S' in sale_obj.name:
+ # sale_obj.schedule_status = 'to process'
mrp_production_ids = record.production_id._get_children().ids
print('mrp_production_ids', mrp_production_ids)
for i in mrp_production_ids:
@@ -313,8 +313,8 @@ class sf_production_plan(models.Model):
aa.schedule_state = '未排'
# self.env['sale.order'].browse(record.production_id.origin).schedule_status = 'to shedule'
sale_obj = self.env['sale.order'].search([('name', '=', self.origin)])
- if 'S' in sale_obj.name:
- sale_obj.schedule_status = 'to schedule'
+ # if 'S' in sale_obj.name:
+ # sale_obj.schedule_status = 'to schedule'
return self.date_planned_finished
def liucheng_cs(self):
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index e2597a58..2e449a0a 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -33,10 +33,10 @@ class ReSaleOrder(models.Model):
payments_way = fields.Selection([('现结', '现结'), ('月结', '月结')], '结算方式', default='现结', tracking=True)
pay_way = fields.Selection([('转账', '转账'), ('微信', '微信'), ('支付宝', '支付宝')], '支付方式')
check_status = fields.Selection([('pending', '待审核'), ('approved', '已审核'), ('fail', '不通过')], '审核状态')
- schedule_status = fields.Selection(
- [('to schedule', '待排程'), ('to process', '待加工'), ('to deliver', '待发货'), ('to receive', '待收货'),
- ('received', '已收货')],
- '进度状态')
+ # schedule_status = fields.Selection(
+ # [('to schedule', '待排程'), ('to process', '待加工'), ('to deliver', '待发货'), ('to receive', '待收货'),
+ # ('received', '已收货')],
+ # '进度状态')
payment_term_id = fields.Many2one(
comodel_name='account.payment.term',
string="交付条件",
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index d8f06f64..8350c761 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -70,7 +70,7 @@
-
+
{'invisible': ['|','&',('state', 'in',
['cancel','draft']),('check_status',
'in',
- [False,'approved']),'&','&',('check_status', '=', 'approved'),('state', 'in',
- ['sale','cancel','draft']),('schedule_status', 'not in', False)]}
+ [False,'approved']),'&',('check_status', '=', 'approved'),('state', 'in',
+ ['sale','cancel','draft'])]}
@@ -112,7 +112,7 @@
-
+
- schedule_status desc,date_order asc
+
+ date_order asc
False
订单号
-
-
-
+
+
+
+
+
+
+
+