jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #1019: (feature/制造代码优化 -> develop)

Browse Source 
Merge Request: 显示优化，物流下单增补逻辑

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1019?initial=true
This commit is contained in:
马广威
2024-05-17 11:48:21 +08:00
committed by Coding
parent 27b5e92563 fe6bb46d54
commit 095c15cba4
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_bf_connect/models/jd_eclp.py
View File

@@ -56,7 +56,7 @@ class JdEclp(models.Model):
"""
res = super(JdEclp, self).button_validate()
if self.check_out == 'OUT':
if self.logistics_way != '自提':
if self.logistics_way != '自提' and self.logistics_way:
if self.logistics_status != '2':
raise ValidationError('非自提订单，必须先下物流单，并获取物流面单后才可出库！')
return res

2
sf_dlm/views/product_template_view.xml
View File

@@ -55,7 +55,7 @@
</page>
<page name="inventory" position="attributes">
<attribute name="groups">
stock.group_stock_user,product.group_stock_packaging,sf_base.group_sale_salemanager,sf_base.group_sale_director,sf_base.group_purchase,sf_base.group_purchase_director
stock.group_stock_user,product.group_stock_packaging,sf_base.group_sale_salemanager,sf_base.group_sale_director,sf_base.group_purchase,sf_base.group_purchase_director,sf_base.group_plan_dispatch
</attribute>
</page>
</field>

4
sf_plan/models/custom_plan.py
View File

@@ -230,8 +230,8 @@ class sf_production_plan(models.Model):
record.env['mrp.production'].sudo().browse(i).schedule_state = '已排'
# record.production_id.date_planned_start = record.date_planned_start
# record.production_id.date_planned_finished = record.date_planned_finished
record.production_id.production_line_id = record.production_line_id.id
record.production_id.workorder_ids.filtered(
record.sudo().production_id.production_line_id = record.production_line_id.id
record.sudo().production_id.workorder_ids.filtered(
lambda b: b.routing_type == "装夹预调").workpiece_delivery_ids.write(
{'production_line_id': record.production_line_id.id,
'plan_start_processing_time': record.date_planned_start})