Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dwsproject
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dws
dwsproject
Commits
1f78adcf
Commit
1f78adcf
authored
Nov 23, 2024
by
夏超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[fix] 修改问题
parent
334d0c01
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
jzjx_project/models/inherit_production_task.py
+2
-0
jzjx_project/static/src/html/view/craft_design.html
+1
-0
jzjx_project/views/inherit_roke_production_task.xml
+1
-2
No files found.
jzjx_project/models/inherit_production_task.py
View file @
1f78adcf
...
@@ -138,6 +138,8 @@ class InheritProductionTask(models.Model):
...
@@ -138,6 +138,8 @@ class InheritProductionTask(models.Model):
return
res
return
res
def
craft_design
(
self
):
def
craft_design
(
self
):
if
self
.
record_ids
and
not
self
.
routing_id
.
routing_task_id
:
raise
ValidationError
(
"该任务已报工,无法生成新的工艺设计。"
)
if
not
self
.
routing_id
:
if
not
self
.
routing_id
:
routing_id
=
self
.
env
[
"roke.routing"
]
.
create
({
routing_id
=
self
.
env
[
"roke.routing"
]
.
create
({
"name"
:
f
"{self.product_id.name}({self.code})"
or
""
,
"name"
:
f
"{self.product_id.name}({self.code})"
or
""
,
...
...
jzjx_project/static/src/html/view/craft_design.html
View file @
1f78adcf
...
@@ -2491,6 +2491,7 @@
...
@@ -2491,6 +2491,7 @@
this
.
routingInfoSortSaveApi
(
config
).
then
(
data
=>
{
this
.
routingInfoSortSaveApi
(
config
).
then
(
data
=>
{
this
.
loading
=
false
this
.
loading
=
false
this
.
$message
.
success
(
data
.
result
.
message
)
this
.
$message
.
success
(
data
.
result
.
message
)
this
.
workstation_work_process_check_work_order
()
}).
catch
(
error
=>
{
}).
catch
(
error
=>
{
this
.
errorHandle
(
error
,
true
)
this
.
errorHandle
(
error
,
true
)
})
})
...
...
jzjx_project/views/inherit_roke_production_task.xml
View file @
1f78adcf
...
@@ -23,8 +23,7 @@
...
@@ -23,8 +23,7 @@
<button
name=
"upload_task"
type=
"object"
string=
"上传任务"
class=
"btn btn-primary"
<button
name=
"upload_task"
type=
"object"
string=
"上传任务"
class=
"btn btn-primary"
attrs=
"{'invisible': [('UploadMsg', '=', 'OK')]}"
/>
attrs=
"{'invisible': [('UploadMsg', '=', 'OK')]}"
/>
<field
name=
"record_ids"
invisible=
"1"
/>
<field
name=
"record_ids"
invisible=
"1"
/>
<button
name=
"craft_design"
type=
"object"
string=
"工艺设计"
class=
"btn btn-primary"
<button
name=
"craft_design"
type=
"object"
string=
"工艺设计"
class=
"btn btn-primary"
/>
attrs=
"{'invisible': [('record_ids', '!=', [])]}"
/>
</xpath>
</xpath>
</field>
</field>
</record>
</record>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment