Accept Merge Request #2117: (feature/6694 -> develop)
Merge Request: 修改中控日志接口授权为none Created By: @胡尧 Accepted By: @胡尧 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2117?initial=true
This commit is contained in:
@@ -56,6 +56,7 @@ class Manufacturing_Connect(http.Controller):
|
||||
|
||||
@http.route('/AutoDeviceApi/GetShiftPlan', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
|
||||
cors="*")
|
||||
@api_log('获取日计划', requester='中控系统')
|
||||
def get_ShiftPlan(self, **kw):
|
||||
"""
|
||||
自动化每天获取机台日计划
|
||||
|
||||
@@ -76,7 +76,7 @@ class SaleOrder(models.Model):
|
||||
'embryo_redundancy_id': line.embryo_redundancy_id,
|
||||
}
|
||||
product_name = ''
|
||||
match = re.search(r'(S\d{5}-\d)', product.name)
|
||||
match = re.search(r'(S\d{5}-\d*)', product.name)
|
||||
# 如果匹配成功,提取结果
|
||||
if match:
|
||||
product_name = match.group(0)
|
||||
|
||||
Reference in New Issue
Block a user