root/WuXiDiKe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 读取kep和打印驱动

Browse Source
This commit is contained in:
zhoujj
2025-01-03 17:49:01 +08:00
parent 94a1a69ee1
commit 9a824161a3
131 changed files with 567 additions and 26938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acs/nladmin-ui/src/api/acs/order/order.js
View File

@@ -16,7 +16,7 @@ export function del(ids) {
})
}
export function edit(data) {
export function update(data) {
return request({
url: 'api/tickets',
method: 'put',
@@ -46,4 +46,4 @@ export function submits(param) {
})
}
export default { add, del, edit, query, submits, finishorder }
export default { add, del, update, query, submits, finishorder }

120
acs/nladmin-ui/src/views/acs/order/index.vue
View File

@@ -40,7 +40,7 @@
</el-button>
<el-button
slot="left"
v-permission="['admin','task:add']"
<!-- v-permission="['admin','task:add']" -->
class="filter-item"
size="mini"
type="primary"
@@ -56,7 +56,7 @@
size="mini"
type="primary"
icon="el-icon-plus"
@click="formDias=true"
@click="editBtn(scope.row.ticket_id)"
>
{{ $t('auto.common.Update') }}
</el-button> -->
@@ -84,15 +84,18 @@
<el-form-item label="计划数量" prop="planned_quantity">
<el-input v-model="form.planned_quantity" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="瓶盖号" prop="bottle_number">
<el-form-item label="瓶盖号(选填)" prop="bottle_number">
<el-input v-model="form.bottle_number" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="纸箱号" prop="carton_number">
<el-form-item label="纸箱号(选填)" prop="carton_number">
<el-input v-model="form.carton_number" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="晶科每罐重量kg(选填)" prop="bottle_weight">
<el-input v-model="form.bottle_weight" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="送货单(选填)" prop="shdnumber">
<el-input v-model="form.shdnumber" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="瓶盖关联标签模板" prop="bottle_board">
<el-select
v-model="form.bottle_board"
@@ -153,7 +156,7 @@
<el-col :span="24">
<div class="grid-content bg-purple" />
<el-form-item label="批次号" prop="batch_number">
<el-input v-model="form.batch_number" style="width: 370px;" @change="isDisabled=false"/>
<el-input v-model="form.batch_number" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="所属客户" prop="customer">
<el-input v-model="form.customer" style="width: 370px;" @change="isDisabled=false" />
@@ -170,17 +173,53 @@
<el-form-item label="计划数量" prop="planned_quantity">
<el-input v-model="form.planned_quantity" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="瓶盖号" prop="bottle_number">
<el-form-item label="瓶盖号(选填)" prop="bottle_number">
<el-input v-model="form.bottle_number" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="纸箱号" prop="carton_number">
<el-form-item label="纸箱号(选填)" prop="carton_number">
<el-input v-model="form.carton_number" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="晶科每罐重量kg(选填)" prop="bottle_weight">
<el-input v-model="form.bottle_weight" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="送货单(选填)" prop="shdnumber">
<el-input v-model="form.shdnumber" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="瓶盖关联标签模板" prop="bottle_board">
<el-input v-model="form.bottle_board" style="width: 370px;" @change="isDisabled=false" />
<el-select
v-model="form.bottle_board"
filterable
placeholder="请选择"
style="width: 370px;"
>
<el-option
v-for="item in templateList"
:key="item.template_name"
:label="item.template_name"
:value="item.template_name"
>
<span style="float: left">{{ item.template_name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.bottle_board }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="纸箱关联标签模板" prop="carton_board">
<el-input v-model="form.carton_board" style="width: 370px;" @change="isDisabled=false" />
<el-select
v-model="form.carton_board"
filterable
placeholder="请选择"
style="width: 370px;"
>
<el-option
v-for="item in templateList1"
:key="item.template_name"
:label="item.template_name"
:value="item.template_name"
>
<span style="float: left">{{ item.template_name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.carton_board }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="纸箱装瓶数量" prop="carton_qty">
<el-input v-model="form.carton_qty" style="width: 370px;" @change="isDisabled=false" />
@@ -196,7 +235,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="formDias=false">{{ $t('task.select.Cancel') }}</el-button>
<el-button :loading="crud.cu === 2" :disabled="isDisabled" type="primary" @click="editBtn">{{ $t('task.select.Confirm') }}</el-button>
<el-button :loading="crud.cu === 2" v-permission="['admin','task:del']" type="primary" @click="editBtn">{{ $t('task.select.Confirm') }}</el-button>
</div>
</el-dialog>
<!--表单组件-->
@@ -238,13 +277,14 @@
<el-table-column prop="create_time" :label="$t('task.select.Create_time')" :min-width="flexWidth('create_time',crud.data,$t('task.select.Create_time'))" />
<el-table-column v-permission="['admin','task:edit','task:del']" :label="$t('task.select.Operation')" width="80px" align="center" fixed="right">
<template slot-scope="scope">
<!-- <el-button
<el-button
type="text"
icon="el-icon-edit"
@click="queryBtn(scope.row.ticket_id)"
v-permission="['admin']"
@click="queryBtn(scope.row)"
>
修改
</el-button> -->
</el-button>
</template>
</el-table-column>
</el-table>
@@ -279,7 +319,7 @@ export default {
optShow: {
add: false,
edit: false,
del: true,
del: false,
reset: false,
download: true
},
@@ -329,6 +369,7 @@ export default {
ticket_id: null,
batch_number: null,
bottle_weight: null,
shdnumber: null,
device_code: null,
production_orders: null,
production_materials: null,
@@ -353,6 +394,7 @@ export default {
ticket_id: null,
batch_number: null,
bottle_weight: null,
shdnumber: null,
device_code: null,
production_orders: null,
production_materials: null,
@@ -493,6 +535,7 @@ export default {
this.form.bottle_number=row.bottle_number
this.form.carton_number=row.carton_number
this.form.carton_qty=row.carton_qty
this.form.shdnumber=row.shdnumber
}
},
handleDateTimeChange() {
@@ -541,23 +584,26 @@ export default {
},
queryBtn(ticket) {
// 禁用按钮
console.log(ticket)
this.form=ticket
this.isDisabled = true
crudTask.query(ticket).then(res => {
// 请求完成后启用按钮
this.isDisabled = false
this.form = res
this.crud.toQuery()
this.formDia = true
if (this.form1.weight_ok) {
const parts = this.form1.weight_ok.split(',')
this.input3 = parts[0] || '' // 如果没有值，则为空字符串
this.input4 = parts[1] || '' // 如果没有第二个值，则为空字符串
}
})
// 设置定时器，等待一定时间后再次允许请求
setTimeout(() => {
this.isDisabled = false // 可根据具体需求进行调整
}, 1000) // 5000 毫秒，即 5 秒钟
this.formDias = true
// crudTask.update(this.form).then(res => {
// // 请求完成后启用按钮
// this.isDisabled = false
// this.form = res
// this.crud.toQuery()
// this.formDia = true
// if (this.form1.weight_ok) {
// const parts = this.form1.weight_ok.split(',')
// this.input3 = parts[0] || '' // 如果没有值，则为空字符串
// this.input4 = parts[1] || '' // 如果没有第二个值，则为空字符串
// }
// })
// // 设置定时器，等待一定时间后再次允许请求
// setTimeout(() => {
// this.isDisabled = false // 可根据具体需求进行调整
// }, 1000) // 5000 毫秒，即 5 秒钟
},
saveBtn() {
// 禁用按钮
@@ -573,6 +619,7 @@ export default {
device_code: null,
batch_number: null,
bottle_weight: null,
shdnumber: null,
production_orders: null,
production_materials: null,
planned_quantity: null,
@@ -602,13 +649,13 @@ export default {
}, 1000) // 5000 毫秒，即 5 秒钟
},
editBtn() {
if (!this.isFormChanged) {
// 如果表单没有变化，不进行提交
return
}
禁用按钮
// this.form=crudTask.query(ticket.ticket_id)
this.isDisabled = true
crudTask.edit(this.form1).then(res => {
// if (!this.isFormChanged) {
// // 如果表单没有变化，不进行提交
// return
// }
crudTask.update(this.form).then(res => {
// 请求完成后启用按钮
this.isDisabled = false
this.crud.toQuery()
@@ -617,6 +664,7 @@ export default {
this.originalForm = JSON.parse(JSON.stringify(this.form))
console.log(JSON.parse(JSON.stringify(this.form)))
this.isFormChanged = false
this.form={}
})
this.extension = [{
name: '',

2
acs/nladmin-ui/src/views/acs/order/template.vue
View File

@@ -367,7 +367,7 @@ export default {
duration: 0
})
}
const wsUri = window.g.dev.VUE_APP_BASE_API.replace('http', 'ws') + '/webSocket/sendPrint/' + uuidv1()
const wsUri = window.g.prod.VUE_APP_BASE_API.replace('http', 'ws') + '/webSocket/sendPrint/' + uuidv1()
this.websock = new WebSocket(wsUri)
this.websock.onmessage = this.webSocketOnMessage
},