Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
factory_front
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
1
Merge Requests
1
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
qinjianhui
factory_front
Commits
b4f7fcfa
Commit
b4f7fcfa
authored
Apr 03, 2026
by
qinjianhui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 播种墙配货修改
parent
7c1373d5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
18 deletions
+20
-18
src/api/factoryOrderNew.ts
+4
-4
src/views/order/podUs/PodMakeOrder.vue
+16
-14
No files found.
src/api/factoryOrderNew.ts
View file @
b4f7fcfa
...
@@ -187,12 +187,12 @@ export function batchDeleteApi(ids: (number | string)[]) {
...
@@ -187,12 +187,12 @@ export function batchDeleteApi(ids: (number | string)[]) {
export
function
restockCheckApi
(
export
function
restockCheckApi
(
factoryId
:
number
|
string
,
factoryId
:
number
|
string
,
thirdSkuCode
:
string
,
warehouseSku
:
string
,
warehouseId
:
number
|
string
,
warehouseId
:
number
|
string
,
)
{
)
{
return
axios
.
ge
t
<
never
,
BaseRespData
<
void
>>
(
return
axios
.
pos
t
<
never
,
BaseRespData
<
void
>>
(
'factory/podOrder/
replenishVerify
'
,
'factory/podOrder/
outOfStock/autoMark
'
,
{
params
:
{
factoryId
,
thirdSkuCode
,
warehouseId
}
},
{
factoryId
,
warehouseSku
,
warehouseId
},
)
)
}
}
...
...
src/views/order/podUs/PodMakeOrder.vue
View file @
b4f7fcfa
...
@@ -64,7 +64,7 @@
...
@@ -64,7 +64,7 @@
<ElInput
<ElInput
ref=
"productionOrderRef"
ref=
"productionOrderRef"
v-model=
"productionOrder"
v-model=
"productionOrder"
placeholder=
"请输入生产单号
"
:placeholder=
"props.isNewOrder ? '请输入操作单号' : '请输入生产单号'
"
clearable
clearable
style=
"width: 100%"
style=
"width: 100%"
@
keyup
.
enter=
"handleSearch"
@
keyup
.
enter=
"handleSearch"
...
@@ -293,8 +293,10 @@ const props = withDefaults(
...
@@ -293,8 +293,10 @@ const props = withDefaults(
printOrder
:
(
data
:
OrderData
,
callback
:
(
status
:
boolean
)
=>
void
)
=>
void
printOrder
:
(
data
:
OrderData
,
callback
:
(
status
:
boolean
)
=>
void
)
=>
void
warehouseList
:
WarehouseListData
[]
warehouseList
:
WarehouseListData
[]
isNewOrder
:
boolean
isNewOrder
:
boolean
wsOpenCode
:
string
wsCloseCode
:
string
}
>
(),
}
>
(),
{
isNewOrder
:
false
},
{
isNewOrder
:
false
,
wsOpenCode
:
'STARTORDER'
,
wsCloseCode
:
'ENDORDER'
},
)
)
const
emit
=
defineEmits
([
const
emit
=
defineEmits
([
'update:modelValue'
,
'update:modelValue'
,
...
@@ -325,8 +327,8 @@ const podOrderDetailsColumns = computed(() => [
...
@@ -325,8 +327,8 @@ const podOrderDetailsColumns = computed(() => [
align
:
'center'
,
align
:
'center'
,
},
},
{
{
label
:
'生产单号'
,
label
:
props
.
isNewOrder
?
'操作单号'
:
'生产单号'
,
prop
:
'podJomallUsNo'
,
prop
:
props
.
isNewOrder
?
'operationNos'
:
'podJomallUsNo'
,
width
:
150
,
width
:
150
,
align
:
'center'
,
align
:
'center'
,
},
},
...
@@ -406,7 +408,7 @@ watch(visible, async (value: boolean) => {
...
@@ -406,7 +408,7 @@ watch(visible, async (value: boolean) => {
messageChange
,
messageChange
,
)
)
socket
.
send
({
socket
.
send
({
code
:
'STARTORDER'
,
code
:
props
.
wsOpenCode
,
factoryNo
:
userStore
.
user
?.
factory
.
id
,
factoryNo
:
userStore
.
user
?.
factory
.
id
,
warehouseId
:
warehouseId
.
value
,
warehouseId
:
warehouseId
.
value
,
})
})
...
@@ -422,7 +424,7 @@ watch(visible, async (value: boolean) => {
...
@@ -422,7 +424,7 @@ watch(visible, async (value: boolean) => {
}
else
{
}
else
{
if
(
userStore
.
user
?.
factory
.
id
)
{
if
(
userStore
.
user
?.
factory
.
id
)
{
socket
.
send
({
socket
.
send
({
code
:
'ENDORDER'
,
code
:
props
.
wsCloseCode
,
factoryNo
:
userStore
.
user
?.
factory
.
id
,
factoryNo
:
userStore
.
user
?.
factory
.
id
,
warehouseId
:
warehouseId
.
value
,
warehouseId
:
warehouseId
.
value
,
})
})
...
@@ -442,11 +444,8 @@ watch(boxIndex, (value: number | null) => {
...
@@ -442,11 +444,8 @@ watch(boxIndex, (value: number | null) => {
watch
(
watch
(
podBoxList
,
podBoxList
,
(
value
)
=>
{
(
value
)
=>
{
console
.
log
(
'podBoxIndex1111'
,
podBoxIndex
.
value
)
if
(
value
)
{
if
(
value
)
{
const
item
=
value
.
find
((
item
)
=>
item
.
box
===
podBoxIndex
.
value
)
const
item
=
value
.
find
((
item
)
=>
item
.
box
===
podBoxIndex
.
value
)
console
.
log
(
'podBoxList'
,
value
,
podBoxIndex
.
value
,
item
)
if
(
item
?.
data
)
{
if
(
item
?.
data
)
{
renderItemBox
(
true
)
renderItemBox
(
true
)
}
else
{
}
else
{
...
@@ -571,7 +570,7 @@ const messageChange = (data: WebSocketMessage) => {
...
@@ -571,7 +570,7 @@ const messageChange = (data: WebSocketMessage) => {
if
(
!
data
)
return
if
(
!
data
)
return
const
{
code
,
...
more
}
=
data
const
{
code
,
...
more
}
=
data
if
(
code
===
'POD_PRINT_ORDER'
)
{
if
(
code
===
'POD_PRINT_ORDER'
||
code
===
'FACTORY_POD_ORDER_PRINT_ORDER'
)
{
try
{
try
{
if
(
typeof
more
.
txt
===
'string'
)
{
if
(
typeof
more
.
txt
===
'string'
)
{
console
.
log
(
console
.
log
(
...
@@ -586,7 +585,10 @@ const messageChange = (data: WebSocketMessage) => {
...
@@ -586,7 +585,10 @@ const messageChange = (data: WebSocketMessage) => {
console
.
log
(
'WebSocketMessage'
,
more
)
console
.
log
(
'WebSocketMessage'
,
more
)
setPodBoxList
(
more
)
setPodBoxList
(
more
)
}
else
if
(
code
===
'POD_BOX_FLUSH'
)
{
}
else
if
(
code
===
'POD_BOX_FLUSH'
||
code
===
'FACTORY_POD_ORDER_BOX_FLUSH'
)
{
initOrderDetailBox
()
initOrderDetailBox
()
}
}
}
}
...
@@ -1130,7 +1132,7 @@ const handleWarehouseChange = (value: string | number) => {
...
@@ -1130,7 +1132,7 @@ const handleWarehouseChange = (value: string | number) => {
if
(
!
value
)
return
if
(
!
value
)
return
if
(
_warehouseId
.
value
!==
warehouseId
.
value
)
{
if
(
_warehouseId
.
value
!==
warehouseId
.
value
)
{
socket
.
send
({
socket
.
send
({
code
:
'ENDORDER'
,
code
:
props
.
wsCloseCode
,
factoryNo
:
userStore
.
user
?.
factory
.
id
,
factoryNo
:
userStore
.
user
?.
factory
.
id
,
warehouseId
:
_warehouseId
.
value
,
warehouseId
:
_warehouseId
.
value
,
})
})
...
@@ -1138,7 +1140,7 @@ const handleWarehouseChange = (value: string | number) => {
...
@@ -1138,7 +1140,7 @@ const handleWarehouseChange = (value: string | number) => {
warehouseId
.
value
=
value
warehouseId
.
value
=
value
emit
(
'set-warehouseId'
,
value
)
emit
(
'set-warehouseId'
,
value
)
socket
.
send
({
socket
.
send
({
code
:
'STARTORDER'
,
code
:
props
.
wsOpenCode
,
factoryNo
:
userStore
.
user
?.
factory
.
id
,
factoryNo
:
userStore
.
user
?.
factory
.
id
,
warehouseId
:
warehouseId
.
value
,
warehouseId
:
warehouseId
.
value
,
})
})
...
@@ -1183,7 +1185,7 @@ const reconnectWebSocket = async () => {
...
@@ -1183,7 +1185,7 @@ const reconnectWebSocket = async () => {
messageChange
,
messageChange
,
)
)
socket
.
send
({
socket
.
send
({
code
:
'STARTORDER'
,
code
:
props
.
wsOpenCode
,
factoryNo
:
userStore
.
user
?.
factory
.
id
,
factoryNo
:
userStore
.
user
?.
factory
.
id
,
warehouseId
:
warehouseId
.
value
,
warehouseId
:
warehouseId
.
value
,
})
})
...
...
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