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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop

Browse Source
This commit is contained in:
jinling.yang
2024-06-26 10:17:27 +08:00
parent 86f67556ce 0f7f12008f
commit 94175f2039
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sf_machine_connect/views/compensation.xml
View File

@@ -5,10 +5,10 @@
<field name="model">mrp.workorder</field> <field name="model">mrp.workorder</field>
<field name="inherit_id" ref="sf_manufacturing.view_mrp_production_workorder_tray_form_inherit_sf"/> <field name="inherit_id" ref="sf_manufacturing.view_mrp_production_workorder_tray_form_inherit_sf"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<!-- <xpath expr="//header" position="inside">--> <xpath expr="//header" position="inside">-->
<!-- <button string="程序下载" name="cnc_file_download" type="object" class="oe_highlight" attrs='{"invisible": ["|",--> <button string="程序下载" name="cnc_file_download" type="object" class="oe_highlight" attrs='{"invisible": ["|",
<!-- ("user_permissions","=",False),("routing_type","!=","CNC加工")]}'/>--> ("user_permissions","=",False),("routing_type","!=","CNC加工")]}'/>
<!-- </xpath>--> </xpath>
<xpath expr="//page//field[@name='cnc_ids']" position="before"> <xpath expr="//page//field[@name='cnc_ids']" position="before">
<group> <group>
<group> <group>

3
sf_plan/views/view.xml
View File

@@ -268,7 +268,8 @@
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">sf.production.plan</field> <field name="res_model">sf.production.plan</field>
<field name="view_mode">tree,gantt,form</field> <field name="view_mode">tree,gantt,form</field>
<field name="context">{'search_default_group_by_state': 1, 'search_default_draft': 1, 'display_complete': True}</field> <!-- <field name="context">{'search_default_group_by_state': 1, 'search_default_draft': 1, 'display_complete': True}</field> -->
<field name="context">{'search_default_draft': 1, 'display_complete': True}</field>
</record> </record>
<menuitem <menuitem

11
sf_warehouse/models/model.py
View File

@@ -622,6 +622,11 @@ class SfStockMoveLine(models.Model):
if not qr_code_data: if not qr_code_data:
raise UserError("没有找到二维码数据。") raise UserError("没有找到二维码数据。")
lot_name = self.lot_name lot_name = self.lot_name
# 增加"当为坯料时，只打印序列号的前面部分"
if self.lot_name: # 确保 lot_name 存在
if self.product_id.categ_id.name == '坯料':
lot_name = lot_name.split('[', 1)[0]
# host = "192.168.50.110" # 可以根据实际情况修改 # host = "192.168.50.110" # 可以根据实际情况修改
# port = 9100 # 可以根据实际情况修改 # port = 9100 # 可以根据实际情况修改
@@ -1184,6 +1189,12 @@ class CustomStockMove(models.Model):
# todo 待控制 # todo 待控制
if not lot_name: if not lot_name:
raise ValidationError("请先分配序列号") raise ValidationError("请先分配序列号")
# 增加"当为坯料时，只打印序列号的前面部分"
if record.lot_name: # 确保 lot_name 存在
if record.product_id.categ_id.name == '坯料':
lot_name = lot_name.split('[', 1)[0]
# host = "192.168.50.110" # 可以根据实际情况修改 # host = "192.168.50.110" # 可以根据实际情况修改
# port = 9100 # 可以根据实际情况修改 # port = 9100 # 可以根据实际情况修改