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

Merge branch 'master' of http://121.40.234.130:8899/root/hl_one

Browse Source 
# Conflicts:
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/IMdMeMaterialbaseService.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/impl/MdMeMaterialbaseServiceImpl.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/MaterialbaseServiceImpl.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/productProcessRoute/ProductprocessrouteController.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/impl/PdmBiProcessrouteServiceImpl.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/impl/PdmBiProductprocessrouteServiceImpl.java
#	mes/qd/src/api/wms/basedata/master/customerbase.js
This commit is contained in:
zhouz
2023-07-17 15:35:42 +08:00
parent ffe29d6d4d a020439a97
commit 76ff2a41ec
528 changed files with 15919 additions and 5037 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mes/qd/src/api/wms/basedata/master/customerbase.js
View File

@@ -32,4 +32,11 @@ export function excelImport(data) {
})
}
export default { add, edit, del, excelImport }
export function selectList() {
return request({
url: 'api/customerbase/selectList',
method: 'get'
})
}
export default { add, edit, del, selectList, excelImport }

2
mes/qd/src/layout/components/Sidebar/Logo.vue
View File

@@ -34,7 +34,7 @@ export default {
},
data() {
return {
title: '海量mes系统',
title: '海亮mes系统',
logo: Logo,
title_param: 'platform'
}

2
mes/qd/src/views/login.vue
View File

@@ -2,7 +2,7 @@
<div class="login" :style="'background-image:url('+ Background +');'">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
<h3 class="title">
海量mes系统
海亮mes系统
</h3>
<el-form-item prop="username">
<el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">

2
mes/qd/src/views/system/dict/dictDetail.vue
View File

@@ -106,7 +106,7 @@ import pagination from '@crud/Pagination'
import rrOperation from '@crud/RR.operation'
import udOperation from '@crud/UD.operation'
const defaultForm = { dict_id: null, name: null, label: null, value: null, dictSort: null, dictType: null, para1: null, para2: null, para3: null, createId: null, createName: null, createTime: null, updateId: null, updateName: null, updateTime: null }
const defaultForm = { dict_id: null, name: null, label: null, value: null, dict_sort: null, dict_type: null, para1: null, para2: null, para3: null, create_id: null, create_name: null, create_time: null, update_id: null, update_name: null, update_time: null }
export default {
components: { pagination, rrOperation, udOperation },

4
mes/qd/src/views/system/dict/index.vue
View File

@@ -86,14 +86,14 @@ import pagination from '@crud/Pagination'
import rrOperation from '@crud/RR.operation'
import udOperation from '@crud/UD.operation'
const defaultForm = { dictId: null, code: null, name: null, label: null, value: null, dictSort: null, dictType: null, para1: null, para2: null, para3: null, createId: null, createName: null, createTime: null, updateId: null, updateName: null, updateTime: null }
const defaultForm = { dict_id: null, code: null, name: null, label: null, value: null, dict_sort: null, dict_type: null, para1: null, para2: null, para3: null, create_id: null, create_name: null, create_time: null, update_id: null, update_name: null, update_time: null }
export default {
name: 'Dict',
components: { crudOperation, pagination, rrOperation, udOperation, dictDetail },
cruds() {
return [
CRUD({ title: '字典', url: 'api/dict', idField: 'dictId', crudMethod: { ...crudDict }})
CRUD({ title: '字典', url: 'api/dict', idField: 'dict_id', crudMethod: { ...crudDict }})
]
},
mixins: [presenter(), header(), form(defaultForm)],

8
mes/qd/src/views/wms/device_manage/deviceMaterial/deviceMaterial.js
View File

@@ -14,6 +14,12 @@ export function edit(data) {
method: 'post',
data
})
}export function setEmp(data) {
return request({
url: 'api/specialDevice/setEmp',
method: 'post',
data
})
}
export default { query, edit }
export default { query, setEmp, edit }

136
mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue
View File

@@ -39,14 +39,55 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="设备编号">
<el-form-item >
<rrOperation :permission="permission" />
</el-form-item>
</el-form>
</div>
<crudOperation v-show="false" :permission="permission" />
</div>
<!--表格渲染-->
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
@click="setEmpty(crud.selections)"
>
设置空位
</el-button>
</crudOperation>
<el-dialog
:close-on-click-modal="false"
:visible.sync=pointMVisible
title="点位物料信息"
width="540px"
@close="materiValueCancel()"
>
<el-form ref="form" :model="materialForm" :rules="rules" size="mini" label-width="110px">
<el-form-item label="物料编码" prop="material_code">
<template slot-scope="scope">
<el-input v-model="materialForm.material_code" clearable @clear="materialForm.material_code='',materialForm.material_id='',materialForm.material_spec=''" style="width: 370px">
<el-button slot="append" icon="el-icon-plus" @click="queryMater(scope.$index, scope.row)" />
</el-input>
</template>
</el-form-item>
<el-form-item label="物料规格" prop="material_spec">
<el-input v-model="materialForm.material_spec" disabled style="width: 370px;" />
</el-form-item>
<el-form-item label="物料数量(个)" prop="deviceinstor_qty">
<el-input-number v-model="materialForm.deviceinstor_qty" clearable style="width: 370px;" />
</el-form-item>
<el-form-item label="物料重量(g)" prop="deviceinstor_weight">
<el-input-number v-model="materialForm.deviceinstor_weight" clearable style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="materiValueCancel()">取消</el-button>
<el-button type="primary" @click="pointMateriSubmit()">确认</el-button>
</div>
</el-dialog>
<el-table
ref="table"
@@ -59,27 +100,20 @@
<el-table-column type="selection" width="55" />
<el-table-column prop="product_area" label="生产车间" width="100px" show-overflow-tooltip />
<el-table-column prop="device_code" label="设备编码" width="100px" show-overflow-tooltip />
<el-table-column prop="material_id" label="物料id" width="200px" show-overflow-tooltip>
<template slot-scope="scope">
<el-input v-model="scope.row.material_id">
<el-button slot="append" icon="el-icon-plus" @click="queryMater(scope.$index, scope.row)" />
</el-input>
</template>
</el-table-column>
<el-table-column prop="material_name" label="物料名称" width="200px" show-overflow-tooltip />
<el-table-column prop="material_id" label="物料id" width="200px" show-overflow-tooltip />
<el-table-column prop="material_code" label="物料编码" width="200px" show-overflow-tooltip />
<el-table-column prop="material_spec" label="物料规格" width="200px" show-overflow-toolti />
<el-table-column prop="deviceinstor_qty" label="物料数量(单位:个)" align="center" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
<el-input v-model="scope.row.deviceinstor_qty" /></template>
</el-table-column>
<el-table-column prop="deviceinstor_weight" label="物料重量(单位:g)" align="center" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
<el-input v-model="scope.row.deviceinstor_weight" /></template>
</el-table-column>
<el-table-column prop="deviceinstor_qty" label="物料数量(个)" align="center" width="120px" show-overflow-tooltip />
<el-table-column prop="deviceinstor_weight" label="物料重量(g)" align="center" width="120px" show-overflow-tooltip />
<el-table-column prop="remark" label="备注" width="200px" show-overflow-tooltip />
<el-table-column label="操作" width="150px" align="center" fixed="right">
<template slot-scope="scope">
<el-button size="mini" style="margin-left: -1px;margin-right: 2px" type="text" @click="updateSKMaterial(scope.row)">提交修改</el-button>
<el-button
type="text"
slot="left"
@click="toEditMaterial(scope.row)">
修改
</el-button>
</template>
</el-table-column>
</el-table>
@@ -98,13 +132,13 @@
<script>
import crudDevice from '@/views/wms/device_manage/deviceMaterial/deviceMaterial.js'
import CRUD, { presenter, header, form } from '@crud/crud'
import CRUD, { presenter, header, form, crud } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
import rrOperation from '@crud/RR.operation'
import MaterDtl from '@/views/wms/pub/MaterDialog'
const defaultForm = { product_area: 'A1', workprocedure_id: '1535144552481034240', device_code: null, material_id: null, material_name: null, material_spec: null, deviceinstor_qty: null, deviceinstor_weight: null, remark: null }
const defaultForm = { product_area: 'A1', workprocedure_id: '1535144552481034240', device_code: null, material_id: null, material_name: null,material_code: null, material_spec: null, deviceinstor_qty: null, deviceinstor_weight: null, remark: null }
export default {
name: 'SKdevice',
@@ -112,14 +146,21 @@ export default {
dicts: ['product_area'],
cruds() {
return [
CRUD({ title: '深坑设备物料', url: 'api/specialDevice/query', query: { product_area: 'A1', workprocedure_id: '1535144552481034240' }, idField: 'device_code', crudMethod: { ...crudDevice }})
CRUD({ title: '深坑设备物料', url: 'api/specialDevice/query', query: { product_area: 'A1', workprocedure_id: '1535144552481034240' }, idField: 'device_code', crudMethod: { ...crudDevice },
optShow: {add: false,
edit: false,
del: false,
download: false,
reset: true}})
]
},
mixins: [presenter(), header(), form(defaultForm)],
mixins: [presenter(), header(), form(defaultForm),crud()],
data() {
return {
materType: '',
materialShow: false,
pointMVisible: false,
materialForm:{},
queryTypeOptions: [
{ key: 'name', display_name: '字典名称' },
{ key: 'description', display_name: '描述' }
@@ -130,19 +171,52 @@ export default {
]
},
permission: {
add: ['admin', 'dict:add'],
edit: ['admin', 'dict:edit'],
del: ['admin', 'dict:del']
}
}
},
methods: {
setEmpty(rows) {
var points = []
rows.forEach((item) => {
points.push(item.device_code)
})
crudDevice.setEmp(points).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.materiValueCancel()
this.crud.refresh()
}).catch(() => {
})
},
toEditMaterial(row) {
this.pointMVisible = true
this.materialForm = JSON.parse(JSON.stringify(row))
},
setMaterValue(row) {
this.nowrow.material_id = row.material_id
this.nowrow.material_code = row.material_code
this.nowrow.material_name = row.material_name
this.nowrow.material_spec = row.material_spec
this.tableData.splice(this.nowindex, 1, this.nowrow) // 通过splice 替换数据 触发视图更新
this.materialForm.material_id = row.material_id
this.materialForm.material_code = row.material_code
this.materialForm.material_name = row.material_name
this.materialForm.material_spec = row.material_spec // 通过splice 替换数据 触发视图更新
},
materiValueCancel(){
this.materialForm = {}
this.dialogVisible = false
this.pointMVisible = false
},
materiCancel(){
this.materialForm.material_id = ""
this.materialForm.material_code = ""
this.materialForm.material_name = ""
},
pointMateriSubmit(){
console.log(this.materialForm)
crudDevice.edit(this.materialForm).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.materiValueCancel()
this.crud.refresh()
}).catch(() => {
})
},
queryMater(index, row) {
this.materialShow = true

21
mes/qd/src/views/wms/masterdata_manage/st/struct/index.vue
View File

@@ -174,6 +174,17 @@
<el-radio v-model="form.is_tempstruct" label="0">否</el-radio>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item v-if="form.sect_id == '1528631044482404352'" label="是否空载具" prop="is_emptyvehicle">
<el-radio
v-for="item in trueorfalse"
:key="item.value"
v-model="form.is_emptyvehicle"
:label="item.value"
>{{ item.label }}
</el-radio>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
@@ -207,6 +218,15 @@
<el-table-column prop="sect_name" label="所属库区" width="150" />
<el-table-column prop="stor_name" label="所属仓库" width="150" />
<el-table-column prop="storagevehicle_code" label="载具号" min-width="120" show-overflow-tooltip />
<el-table-column prop="is_emptyvehicle" label="是否空载具" width="150" >
<template slot-scope="scope">
<el-switch
:value="format_is_used(scope.row.is_emptyvehicle)"
active-color="#409EFF"
inactive-color="#F56C6C"
/>
</template>
</el-table-column>
<el-table-column prop="lock_type" label="锁定类型" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.d_lock_type[scope.row.lock_type] }}
@@ -334,6 +354,7 @@ export default {
}
return {
sects: [],
trueorfalse: [ { value: true, label: '是' }, { value: false, label: '否' }],
invtypelist: [],
permission: {},
rules: {

4
mes/qd/src/views/wms/old_manage/old_package/index.vue
View File

@@ -9,7 +9,7 @@
label-width="120px"
label-suffix=":"
>
<!--每箱袋数、每袋数量、箱数、箱型、目标巷道、是否翻转、托盘满托数量、袋数-->
<!--每箱袋数、每箱袋数、箱数、箱型、目标巷道、是否翻转、托盘满托数量、袋数-->
<el-row>
<el-col :span="6">
<el-form-item label="每箱袋数">
@@ -22,7 +22,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="每袋数量">
<el-form-item label="每箱袋数">
<el-input-number
v-model="query.one_package_qty"
clearable

116
mes/qd/src/views/wms/pcs/saleorder/UploadDialog.vue Normal file
View File

@@ -0,0 +1,116 @@
<template>
<el-dialog
title="导入Excel文件"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
width="400px"
:show-close="true"
@close="close"
@open="open"
>
<el-upload
ref="upload"
class="upload-demo"
action=""
drag
:on-exceed="is_one"
:limit="1"
:auto-upload="false"
:multiple="false"
:show-file-list="true"
:on-change="uploadByJsqd"
:file-list="fileList"
accept=".xlsx,.xls"
>
<i class="el-icon-upload" />
<div class="el-upload__text">
将文件拖到此处，或
<em>点击上传</em>
</div>
<div slot="tip" class="el-upload__tip">只能上传Excel文件，且不超过10MB</div>
</el-upload>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="submit">确 定</el-button>
</span>
</el-dialog>
</template>
<script>
import crudSaleOrder from '@/views/wms/pcs/saleorder/saleOrder'
import CRUD, { crud } from '@crud/crud'
export default {
name: 'UploadDialog',
mixins: [crud()],
components: {},
props: {
dialogShow: {
type: Boolean,
default: false
},
openParam: {
type: String
}
},
data() {
return {
dialogVisible: false,
fileList: [],
file1: ''
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
},
openParam: {
handler(newValue, oldValue) {
this.opendtlParam = newValue
}
}
},
methods: {
open() {
},
close() {
this.$emit('update:dialogShow', false)
},
is_one() {
this.crud.notify('只能上传一个excel文件！', CRUD.NOTIFICATION_TYPE.WARNING)
},
// 文件校验方法
beforeAvatarUpload(file) {
// 不能导入大小超过2Mb的文件
if (file.size > 10 * 1024 * 1024) {
return false
}
return true
},
// 文件发生改变就会触发的事件
uploadByJsqd(file) {
this.file1 = file
},
submit() {
if (this.beforeAvatarUpload(this.file1)) {
this.fileList.name = this.file1.name
this.fileList.url = ''
var formdata = new FormData()
formdata.append('file', this.file1.raw)
// excelImport：请求接口 formdata：传递参数
crudSaleOrder.excelImport(formdata).then((res) => {
this.crud.notify('导入成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.$emit('tableChanged3', '')
this.$emit('update:dialogShow', false)
})
} else {
this.crud.notify('文件过大，请上传小于10MB的文件〜', CRUD.NOTIFICATION_TYPE.WARNING)
}
}
}
}
</script>

262
mes/qd/src/views/wms/pcs/saleorder/index.vue
View File

@@ -12,7 +12,13 @@
label-suffix=":"
>
<el-form-item label="销售单号">
<el-input v-model="query.sale_code" clearable placeholder="销售单号" style="width: 200px;" class="filter-item" />
<el-input
v-model="query.sale_code"
clearable
placeholder="销售单号"
style="width: 200px;"
class="filter-item"
/>
</el-form-item>
<el-form-item label="物料搜索">
<el-input
@@ -31,7 +37,7 @@
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00','23:59:59']"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
</el-form-item>
@@ -62,27 +68,20 @@
placeholder="请选择"
/>
</el-form-item>
<el-form-item label="是否正常">
<el-select
v-model="query.is_success"
style="width: 200px"
clearable
filterable
placeholder="请选择"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.IS_OR_NOT"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<rrOperation :crud="crud" />
</el-form>
</div>
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="warning"
icon="el-icon-upload2"
size="mini"
@click="uploadShow = true"
>
导入
</el-button>
<el-button
slot="right"
class="filter-item"
@@ -95,42 +94,165 @@
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" size="mini" label-width="80px">
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="1200px"
>
<el-form ref="form" :inline="true" :model="form" label-width="160px" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;">
<el-form-item label="车间" prop="product_area"> <!-- unit_list-->
<el-select
v-model="form.product_area"
placeholder=""
>
<el-option
v-for="item in dict.product_area"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="销售单号" prop="sale_code">
<el-input
v-model="form.sale_code"
style="width: 200px;"
/>
</el-form-item>
<el-form-item label="销售单明细" prop="seq_no">
<el-input
v-model="form.seq_no"
style="width: 200px;"
/>
</el-form-item>
<el-form-item label="订单数量" prop="sale_qty">
<el-input-number
v-model="form.sale_qty"
style="width: 200px;"
/>
</el-form-item>
<el-form-item label="计量单位" prop="unit_name"> <!-- unit_list-->
<el-select
v-model="form.qty_unit_id"
placeholder=""
>
<el-option
v-for="item in unit_list"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="物料编码" prop="material_code">
<el-input
v-model="form.material_code"
style="width: 200px;"
/>
</el-form-item>
<el-form-item label="客户名称" prop="cust_name">
<el-select
v-model="form.cust_code"
placeholder=""
>
<el-option
v-for="item in customer_list"
:key="item.label"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="计划交期时间" prop="plandeliver_date">
<el-date-picker
v-model="form.plandeliver_date"
value-format="yyyy-MM-dd"
type="date"
style="width: 200px;"
/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="form.remark"
style="width: 200px;"
/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
<el-button
:loading="crud.cu === 2"
type="primary"
@click="crud.submitCU"
>确认</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
size="mini"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="sale_code" label="销售单号" min-width="100" show-overflow-tooltip/>
<el-table-column
prop="sale_code"
label="销售单号"
min-width="100"
show-overflow-tooltip
/>
<el-table-column prop="seq_no" label="明细序号" />
<el-table-column prop="sale_type" label="销售单类型" min-width="100" show-overflow-tooltip>
<el-table-column
prop="sale_type"
label="销售单类型"
min-width="100"
show-overflow-tooltip
>
<template slot-scope="scope">
{{ dict.label.PCS_SAL_TYPE[scope.row.sale_type] }}
</template>
</el-table-column>
<el-table-column prop="material_code" label="物料编码" />
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')"/>
<el-table-column
prop="material_name"
label="物料名称"
min-width="100"
show-overflow-tooltip
/>
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
<el-table-column prop="status" label="状态">
<template slot-scope="scope">
{{ dict.label.PCS_SALE_STATUS[scope.row.status] }}
</template>
</el-table-column>
<el-table-column prop="sale_qty" label="销售数量" />
<el-table-column prop="sale_qty" label="订单数量" />
<el-table-column prop="qty_unit_name" label="计量单位" show-overflow-tooltip min-width="150" />
<el-table-column prop="produce_seq" label="生产顺序" />
<el-table-column prop="cust_code" label="客户编码" :min-width="flexWidth('cust_code',crud.data,'客户编码')"/>
<el-table-column prop="cust_name" label="客户名称" :min-width="flexWidth('cust_name',crud.data,'cust_name')"/>
<el-table-column prop="unit_name" label="计量单位" show-overflow-tooltip min-width="150" />
<el-table-column prop="plandeliver_date" label="计划交期" min-width="100" show-overflow-tooltip/>
<el-table-column prop="remark" label="备注" show-overflow-tooltip min-width="200"/>
<el-table-column prop="cust_code" label="客户编码" :min-width="flexWidth('cust_code',crud.data,'客户编码')" />
<el-table-column prop="cust_name" label="客户名称" :min-width="flexWidth('cust_name',crud.data,'cust_name')" />
<el-table-column prop="plandeliver_date" label="计划交期" min-width="100" show-overflow-tooltip />
<el-table-column prop="remark" label="备注" show-overflow-tooltip min-width="200" />
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')"/>
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')"/>
<!-- <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<!-- <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<el-table-column
prop="create_time"
label="创建时间"
min-width="120"
show-overflow-tooltip
/>
<el-table-column
prop="confirm_time"
label="修改时间"
min-width="120"
show-overflow-tooltip
/>
<!-<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
@@ -142,56 +264,91 @@
<!--分页组件-->
<pagination />
</div>
<UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="tableChanged3" />
<Dialog :dialog-show.sync="dialogShow" />
</div>
</template>
<script>
import crudSaleOrder from '@/api/wms/pcs/saleOrder'
import crudSaleOrder from '@/views/wms/pcs/saleorder/saleOrder'
import customerbase from '@/api/wms/basedata/master/customerbase'
import CRUD, { presenter, header, form, crud } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import UploadDialog from '@/views/wms/pcs/saleorder/UploadDialog'
import Dialog from '@/views/wms/pcs/saleorder/Dialog'
import pagination from '@crud/Pagination'
import Treeselect, {LOAD_CHILDREN_OPTIONS} from '@riophae/vue-treeselect'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import crudClassstandard from '@/api/wms/basedata/master/classstandard'
const defaultForm = { sale_id: null, sale_code: null, seq_no: null, sale_type: null, material_id: null, status: null, sale_qty: null, produce_seq: null, cust_id: null, qty_unit_id: null, plandeliver_date: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, cust_code: null, cust_name: null }
const defaultForm = {
sale_id: null,
sale_code: null,
seq_no: null,
sale_type: null,
material_id: null,
status: null,
sale_qty: null,
produce_seq: null,
cust_id: null,
qty_unit_id: null,
plandeliver_date: null,
create_id: null,
create_name: null,
create_time: null,
update_optid: null,
update_optname: null,
update_time: null,
cust_code: null,
cust_name: null
}
export default {
name: 'SaleOrder',
dicts: ['PCS_SALE_STATUS', 'PCS_SAL_TYPE', 'IS_OR_NOT'],
components: { pagination, crudOperation, rrOperation, Treeselect, Dialog },
dicts: ['PCS_SALE_STATUS', 'PCS_SAL_TYPE', 'IS_OR_NOT', 'product_area'],
components: { pagination, crudOperation, rrOperation, Treeselect, UploadDialog, Dialog },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({ title: '销售订单', url: 'api/saleOrder', idField: 'sale_id', sort: 'sale_id,desc',
return CRUD({
title: '销售订单',
url: 'api/mpsSaleOrder',
idField: 'sale_id',
sort: 'sale_id,desc',
optShow: {
add: false,
add: true,
edit: false,
del: false,
reset: true,
download: false
},
crudMethod: { ...crudSaleOrder }})
crudMethod: { ...crudSaleOrder }
})
},
data() {
return {
unit_list: [
{value: 16, label: '个\\只'}
],
customer_list:[],
classes3: [],
uploadShow: false,
dialogShow: false,
permission: {
},
queryTypeOptions: [
{ key: 'sale_code', display_name: '销售单号' }
]
permission: {},
queryTypeOptions: [{ key: 'sale_code', display_name: '销售单号' }]
}
},
created() {
this.initClass3()
},
methods: {
[CRUD.HOOK.beforeToAdd]() {
customerbase.selectList().then(res => {
this.customer_list = res.content
})
},
queryClassId() {
const param = {
'class_idStr': this.class_idStr
class_idStr: this.class_idStr
}
crudClassstandard.queryClassById(param).then(res => {
this.classes = res.content.map(obj => {
@@ -205,6 +362,9 @@ export default {
importin() {
this.dialogShow = true
},
tableChanged3() {
this.crud.toQuery()
},
buildTree(classes) {
classes.forEach(data => {
if (data.children) {
@@ -249,6 +409,4 @@ export default {
}
</script>
<style scoped>
</style>
<style scoped></style>

16
mes/qd/src/api/wms/pcs/saleOrder.js → mes/qd/src/views/wms/pcs/saleorder/saleOrder.js
View File

@@ -2,7 +2,7 @@ import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/saleOrder',
url: 'api/mpsSaleOrder',
method: 'post',
data
})
@@ -10,7 +10,7 @@ export function add(data) {
export function del(ids) {
return request({
url: 'api/saleOrder/',
url: 'api/mpsSaleOrder/',
method: 'delete',
data: ids
})
@@ -18,10 +18,18 @@ export function del(ids) {
export function edit(data) {
return request({
url: 'api/saleOrder',
url: 'api/mpsSaleOrder',
method: 'put',
data
})
}
export default { add, edit, del }
export function excelImport(data) {
return request({
url: 'api/mpsSaleOrder/excelImport',
method: 'post',
data
})
}
export default { add, edit, del, excelImport }

22
mes/qd/src/views/wms/pdm/device/index.vue
View File

@@ -51,17 +51,17 @@
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="danger"
icon="el-icon-position"
size="mini"
:disabled="crud.selections.length !== 1"
@click="deviceInfo(crud.selections[0])"
>
设备详情
</el-button>
<!-- <el-button-->
<!-- slot="right"-->
<!-- class="filter-item"-->
<!-- type="danger"-->
<!-- icon="el-icon-position"-->
<!-- size="mini"-->
<!-- :disabled="crud.selections.length !== 1"-->
<!-- @click="deviceInfo(crud.selections[0])"-->
<!-- >-->
<!-- 设备详情-->
<!-- </el-button>-->
<el-button
slot="right"
class="filter-item"

9
mes/qd/src/views/wms/product_manage/workorder/AddDialog.vue
View File

@@ -77,9 +77,9 @@
</template>
</el-table-column>
<el-table-column v-if="false" prop="material_id" label="物料标识" align="center"/>
<el-table-column prop="material_code" label="物料编码" align="center" width="190px">
<el-table-column prop="materialCode" label="物料编码" align="center" width="190px">
<template scope="scope">
<el-input v-model="scope.row.material_code" disabled class="input-with-select">
<el-input v-model="scope.row.materialCode" disabled class="input-with-select">
<el-button slot="append" icon="el-icon-plus" @click="queryMater(scope.$index, scope.row)"/>
</el-input>
</template>
@@ -230,7 +230,7 @@ export default {
is_used_fxx: false,
report_qty: '',
material_id: '',
material_code: '',
materialCode: '',
material_weight: '',
planproducestart_date: date,
planproduceend_date: formatter1,
@@ -252,6 +252,7 @@ export default {
crudWorkProcedure.downSelect({}).then(res => {
this.workprocedureList = res
})
console(this.form)
},
copyAdd() {
if (!this.current_row) {
@@ -290,7 +291,7 @@ export default {
},
setMaterValue(row) {
this.nowrow.material_id = row.material_id
this.nowrow.material_code = row.material_code
this.nowrow.materialCode = row.material_code
this.nowrow.material_name = row.material_name
this.nowrow.material_spec = row.material_spec
this.tableData.splice(this.nowindex, 1, this.nowrow) // 通过splice 替换数据 触发视图更新

81
mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue
View File

@@ -20,11 +20,11 @@
</el-form-item>
<el-form-item label="物料编码">
<el-input
v-model="form.material_code"
v-model="form.materialCode"
style="width: 200px;"
clearable
@focus="materialShow=true"
@clear="form.material_id='',form.material_code='',form.material_name='',form.material_spec=''"
@clear="form.material_id='',form.materialCode='',form.material_name='',form.material_spec=''"
/>
</el-form-item>
<el-form-item label="物料名称">
@@ -123,6 +123,60 @@
/>
</el-select>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="是否启用封箱线" prop="is_used_fxx">
<el-radio
v-for="item in dict.IS_OR_NOT"
:key="item.id"
v-model="form.package_ext.is_used_fxx"
:label="item.value"
>{{ item.label }}
</el-radio>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="拆箱机" prop="unboxing_device_code">
<el-input v-model="form.package_ext.unboxing_device_code" style="width: 200px;" />
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="装箱机" prop="ealing_device_code">
<el-input v-model="form.package_ext.ealing_device_code" style="width: 200px;" />
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="是否翻转" prop="is_foreward">
<el-radio
v-for="item in dict.IS_OR_NOT"
:key="item.id"
v-model="form.package_ext.is_foreward"
:label="item.value"
>{{ item.label }}
</el-radio>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="封箱机自动确认" prop="auto_confirm">
<el-select
v-model="form.package_ext.auto_confirm" style="width: 200px" >
<el-option v-for="item in auto_confirm" :key="item.value" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="封箱机确认时间" prop="time">
<el-input-number
v-model="form.package_ext.time"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="装箱模版" prop="package_model">
<el-input v-model="form.package_ext.package_model" style="width: 200px;" />
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="总箱数" prop="demol_num">
<el-input v-model="form.package_ext.demol_num" style="width: 200px;" />
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="总袋量" prop="order_bag_num">
<el-input v-model="form.package_ext.order_bag_num" style="width: 200px;" />
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="每袋重量(g)" prop="one_bag_weight">
<el-input v-model="form.package_ext.one_bag_weight" style="width: 200px;" />
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="巷道码盘模版" prop="stack_model">
<el-input v-model="form.package_ext.stack_model" style="width: 200px;" />
</el-form-item>
</el-form>
</el-card>
<div class="crud-opts2" style="margin-top: 30px;margin-bottom: 15px">
@@ -157,8 +211,8 @@
<el-table-column prop="nok_qty" label="报废数量" />
<el-table-column prop="repare_qty" label="报修数量" />
<el-table-column prop="person_finish_qty" label="人员期末数量" :min-width="flexWidth('person_finish_qty',tableData,'人员期末数量')"/>
<el-table-column prop="operatetime_start" label="开工时间" :min-width="flexWidth('operatetime_start',tableData,'开工时间')"/>
<el-table-column prop="operatetime_end" label="完工时间" />
<el-table-column prop="operatetime_start" label="开始时间" :min-width="flexWidth('operatetime_start',tableData,'开工时间')"/>
<el-table-column prop="operatetime_end" label="结束时间" />
<el-table-column prop="report_status" label="报工状态" >
<template slot-scope="scope">
{{ reportStatus[scope.row.report_status-1].label }}
@@ -184,7 +238,7 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
export default {
name: 'ViewDialog',
components: { },
dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'PDM_BI_ORDERTYPE' ],
dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT' ],
mixins: [crud()],
props: {
dialogShow: {
@@ -201,6 +255,7 @@ export default {
data() {
return {
dialogVisible: false,
auto_confirm: [ { value: '1', label: '自动确认' }, { value: '2', label: '定时确认' }, { value: '3', label: '人工确认' }],
trueorfalse:[{value: true, label: '是' }, {value: false, label: '否'}],
reportStatus:[{value: '1', label: '创建记录' }, {value: '2', label: '报工完成'}, {value: '3', label: '审核完成'}],
form: {
@@ -256,9 +311,20 @@ export default {
open() {
this.getworkprocedure()
this.getMaterialClass()
crudProduceshiftorder.reportQuery3({ workorder_id: this.form.workorder_id }).then(res => {
crudProduceshiftorder.reportQuery3({ workorder_code: this.form.workorder_code }).then(res => {
this.tableData = res.content
})
if (this.form.package_ext != undefined && this.form.package_ext != null && JSON.stringify(this.form.package_ext).length>3){
this.form.package_ext = JSON.parse(this.form.package_ext)
}
},
close() {
this.$emit('AddChanged')
if (JSON.stringify(this.form.package_ext).length>3){
this.form.package_ext = JSON.stringify(this.form.package_ext)
}else {
this.form.package_ext = ''
}
},
formatBoolean: function(row, column) {
alert(row)
@@ -284,9 +350,6 @@ export default {
this.workprocedureList = res
})
},
close() {
this.$emit('AddChanged')
},
setForm(row) {
this.dialogVisible = true
this.form = row

291
mes/qd/src/views/wms/product_manage/workorder/index.vue
View File

@@ -23,11 +23,13 @@
>
<el-option
v-for="item in dict.product_area"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<!-- 搜索 -->
<el-form-item label="工单检索">
<el-input
@@ -109,7 +111,7 @@
@change="crud.toQuery"
/>
</el-form-item>
<el-form-item label="物料系列" >
<el-form-item label="物料系列">
<treeselect
v-model="query.product_series"
:options="classes3"
@@ -139,7 +141,7 @@
@change="crud.toQuery"
/>
</el-form-item>
<rrOperation :crud="crud"/>
<rrOperation :crud="crud" />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -197,6 +199,17 @@
>
取消下发
</el-button>
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
:disabled="is_disopen(crud.selections)"
@click="openstart(crud.selections)"
>
开工
</el-button>
<el-button
slot="right"
class="filter-item"
@@ -275,15 +288,15 @@
</el-select>
</el-form-item>
<el-form-item v-if="false" label="物料标识" prop="material_id">
<el-input v-model="form.material_id" style="width: 200px;"/>
<el-input v-model="form.material_id" style="width: 200px;" />
</el-form-item>
<el-form-item label="物料编码" prop="material_code">
<el-form-item label="物料编码" prop="materialCode">
<el-input
v-model="form.material_code"
v-model="form.materialCode"
style="width: 200px;"
clearable
@focus="materialShow=true"
@clear="form.material_id='',form.material_code='',form.material_name='',form.material_spec=''"
@clear="form.material_id='',form.materialCode='',form.material_name='',form.material_spec=''"
/>
</el-form-item>
<el-form-item label="物料名称" prop="material_name">
@@ -301,10 +314,10 @@
/>
</el-form-item>
<el-form-item label="物料单重" prop="material_weight">
<el-input v-model="form.material_weight" style="width: 200px;"/>
<el-input v-model="form.material_weight" style="width: 200px;" />
</el-form-item>
<el-form-item label="计划数量" prop="plan_qty">
<el-input v-model="form.plan_qty" style="width: 200px;"/>
<el-input v-model="form.plan_qty" style="width: 200px;" />
</el-form-item>
<el-form-item label="计划开始时间" prop="planproducestart_date">
<el-date-picker
@@ -323,7 +336,7 @@
/>
</el-form-item>
<el-form-item v-if="crud.status.edit" label="实际数量" prop="report_qty">
<el-input v-model="form.real_qty" style="width: 200px;"/>
<el-input v-model="form.real_qty" style="width: 200px;" />
</el-form-item>
<el-form-item label="班次类型" prop="shift_type_scode">
<el-select
@@ -343,35 +356,97 @@
</el-select>
</el-form-item>
<el-form-item label="销售单标识">
<el-input v-model="form.sale_id" style="width: 200px;"/>
<el-input v-model="form.sale_id" style="width: 200px;" />
</el-form-item>
<el-form-item label="是否搬运" prop="is_needmove">
<el-select
v-model="form.is_needmove" style="width: 200px" >
<el-option v-for="item in trueorfalse" :key="item.value" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="修改报工数" prop="is_canupdate_update">
<el-select
v-model="form.is_canupdate_update" style="width: 200px" >
<el-option v-for="item in trueorfalse" :key="item.value" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="是否启用封箱线" prop="is_used_fxx">
<el-radio
v-for="item in dict.IS_OR_NOT"
:key="item.id"
v-model="form.is_needmove"
v-model="form.package_ext.is_used_fxx"
:label="item.value"
>{{ item.label }}
</el-radio>
</el-form-item>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<el-form-item label="允许修改报工数量" prop="is_canupdate_update">
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="拆箱机" prop="unboxing_device_code">
<el-select
v-model="form.package_ext.unboxing_device_code" style="width: 200px" >
<el-option v-for="item in cxj" :key="item.value" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="装箱机" prop="ealing_device_code">
<el-select
v-model="form.package_ext.ealing_device_code" style="width: 200px" >
<el-option v-for="item in zxj" :key="item.value" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="是否翻转" prop="is_foreward">
<el-radio
v-for="item in dict.IS_OR_NOT"
:key="item.id"
v-model="form.is_canupdate_update"
v-model="form.package_ext.is_foreward"
:label="item.value"
>{{ item.label }}
</el-radio>
</el-form-item>
<el-form-item v-show="form.workprocedure_id == '1535144822984282112'" label="是否启用封箱线" prop="is_used_fxx">
<el-radio
v-for="item in dict.IS_OR_NOT"
:key="item.id"
v-model="form.is_used_fxx"
:label="item.value"
>{{ item.label }}
</el-radio>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="封箱机自动确认" prop="auto_confirm">
<el-select
v-model="form.package_ext.auto_confirm" style="width: 200px" >
<el-option v-for="item in auto_confirm" :key="item.value" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="封箱机确认时间" prop="time">
<el-input-number
v-model="form.package_ext.time"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="装箱模版" prop="package_model">
<el-input-number
v-model="form.package_ext.package_model"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="总箱数" prop="demol_num">
<el-input-number
v-model="form.package_ext.demol_num"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="总袋量" prop="order_bag_num">
<el-input-number
v-model="form.package_ext.order_bag_num"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="每袋重量(g)" prop="one_bag_weight">
<el-input-number
v-model="form.package_ext.one_bag_weight"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="巷道码盘模版" prop="stack_model">
<el-input-number
v-model="form.package_ext.stack_model"
style="width: 200px;"
clearable
/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -388,9 +463,10 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column v-if="false" prop="workorder_id" label="生产班次工单标识"/>
<el-table-column prop="workorder_code" label="工单编号" :min-width="flexWidth('workorder_code',crud.data,'工单编号')">
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="workorder_id" label="生产班次工单标识" />
<el-table-column prop="workorder_id" label="工单id" width="160px"></el-table-column>
<el-table-column prop="workorder_code" label="工单编号" width="100px" >
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.row)">{{ scope.row.workorder_code }}</el-link>
</template>
@@ -401,51 +477,71 @@
</template>
</el-table-column>
<!-- <el-table-column prop="workprocedure_code" label="工序编码" />-->
<el-table-column prop="product_area" label="生产车间"/>
<el-table-column prop="plan_qty" label="计划数量"/>
<el-table-column prop="outupperlimit_qty" label="满筐数量"/>
<el-table-column prop="dq_real_qty" label="电气实时数" width="100" show-overflow-tooltip/>
<el-table-column prop="real_qty" label="报工总数"/>
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')"/>
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')"/>
<el-table-column prop="device_code" label="当前设备编码" :min-width="flexWidth('device_code',crud.data,'当前设备编码')"/>
<el-table-column prop="workprocedure_name" label="工序名称"
:min-width="flexWidth('workprocedure_name',crud.data,'工序名称')"/>
<el-table-column prop="material_weight" label="物料单重" width="100" :formatter="crud.formatQlNum4"/>
<el-table-column prop="planproducestart_date" label="计划开始时间"
:min-width="flexWidth('planproducestart_date',crud.data,'计划开始时间')"/>
<el-table-column prop="planproduceend_date" label="计划结束时间"
:min-width="flexWidth('planproduceend_date',crud.data,'计划结束时间')"/>
<el-table-column prop="realproducestart_date" label="实际开始时间"
:min-width="flexWidth('realproducestart_date',crud.data,'实际开始时间')"/>
<el-table-column prop="realproduceend_date" label="实际结束时间"
:min-width="flexWidth('realproduceend_date',crud.data,'实际结束时间')"/>
<el-table-column prop="is_canupdate_update" label="允许修改报工数" :formatter="formatBoolean" width="200"
show-overflow-tooltip/>
<el-table-column prop="is_needmove" label="是否搬运" :formatter="formatBoolean"/>
<el-table-column prop="product_area" label="生产车间" />
<el-table-column prop="plan_qty" label="计划数量" />
<el-table-column prop="outupperlimit_qty" label="满筐数量" />
<el-table-column prop="dq_real_qty" label="电气实时数" width="100" show-overflow-tooltip />
<el-table-column prop="real_qty" label="报工总数" />
<el-table-column prop="materialCode" label="物料编码" :min-width="flexWidth('materialCode',crud.data,'物料编码')" />
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
<el-table-column prop="device_code" label="当前设备编码" :min-width="flexWidth('device_code',crud.data,'当前设备编码')" />
<el-table-column
prop="workprocedure_name"
label="工序名称"
:min-width="flexWidth('workprocedure_name',crud.data,'工序名称')"
/>
<el-table-column prop="material_weight" label="物料单重" width="100" :formatter="crud.formatQlNum4" />
<el-table-column
prop="planproducestart_date"
label="计划开始时间"
:min-width="flexWidth('planproducestart_date',crud.data,'计划开始时间')"
/>
<el-table-column
prop="planproduceend_date"
label="计划结束时间"
:min-width="flexWidth('planproduceend_date',crud.data,'计划结束时间')"
/>
<el-table-column
prop="realproducestart_date"
label="实际开始时间"
:min-width="flexWidth('realproducestart_date',crud.data,'实际开始时间')"
/>
<el-table-column
prop="realproduceend_date"
label="实际结束时间"
:min-width="flexWidth('realproduceend_date',crud.data,'实际结束时间')"
/>
<el-table-column
prop="is_canupdate_update"
label="允许修改报工数"
:formatter="formatBoolean"
width="200"
show-overflow-tooltip
/>
<el-table-column prop="is_needmove" label="是否搬运" :formatter="formatBoolean" />
<el-table-column prop="shift_type_scode" label="班次类型">
<template slot-scope="scope">
{{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
</template>
</el-table-column>
<el-table-column prop="create_type" label="创建类型" width="100">
<el-table-column prop="create_type" label="创建类型" width="100">
<template slot-scope="scope">
{{ dict.label.WORKORDER_CREATE_TYPE[scope.row.create_type] }}
</template>
</el-table-column>
<el-table-column prop="is_error" :formatter="formatBoolean" label="是否异常"/>
<el-table-column prop="error_info" label="异常信息" show-overflow-tooltip/>
<el-table-column prop="remark" label="备注"/>
<el-table-column prop="nok_qty" label="报废总数"/>
<el-table-column prop="report_qty" label="报修总数"/>
<el-table-column prop="person_real_qty" label="人员实际数量" width="100" show-overflow-tooltip/>
<el-table-column prop="current_produce_person_name" label="操作工" show-overflow-tooltip/>
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')"/>
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')"/>
<el-table-column prop="down_name" label="下发人" :min-width="flexWidth('down_name',crud.data,'下发人')"/>
<el-table-column prop="down_time" label="下发时间" :min-width="flexWidth('down_time',crud.data,'下发时间')"/>
<el-table-column prop="confirm_name" label="完工人" :min-width="flexWidth('confirm_name',crud.data,'完工人')"/>
<el-table-column prop="confirm_time" label="完工时间" :min-width="flexWidth('confirm_time',crud.data,'完工时间')"/>
<el-table-column prop="is_error" :formatter="formatBoolean" label="是否异常" />
<el-table-column prop="error_info" label="异常信息" show-overflow-tooltip />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="nok_qty" label="报废总数" />
<el-table-column prop="report_qty" label="报修总数" />
<el-table-column prop="person_real_qty" label="人员实际数量" width="100" show-overflow-tooltip />
<el-table-column prop="current_produce_person_name" label="操作工" show-overflow-tooltip />
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="down_name" label="下发人" :min-width="flexWidth('down_name',crud.data,'下发人')" />
<el-table-column prop="down_time" label="下发时间" :min-width="flexWidth('down_time',crud.data,'下发时间')" />
<el-table-column prop="confirm_name" label="完工人" :min-width="flexWidth('confirm_name',crud.data,'完工人')" />
<el-table-column prop="confirm_time" label="完工时间" :min-width="flexWidth('confirm_time',crud.data,'完工时间')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -456,7 +552,7 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
<MaterDtl
:dialog-show.sync="materialShow"
@@ -464,11 +560,11 @@
:mater-opt-code="materType"
@setMaterValue="setMaterValue"
/>
<ViewDialog ref="child3"/>
<reportDialog ref="report" @AddChanged="querytable"/>
<UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="tableChanged3"/>
<AddDialog :dialog-show.sync="addShow" @AddChanged="querytable"/>
<ReplaceDeviceDialog ref="child4" @AddChanged="querytable"/>
<ViewDialog ref="child3" />
<reportDialog ref="report" @AddChanged="querytable" />
<UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="tableChanged3" />
<AddDialog :dialog-show.sync="addShow" @AddChanged="querytable" />
<ReplaceDeviceDialog ref="child4" @AddChanged="querytable" />
</div>
</template>
@@ -489,11 +585,12 @@ import crudClassstandard from '@/api/wms/basedata/master/classstandard'
import AddDialog from '@/views/wms/product_manage/workorder/AddDialog'
import UploadDialog from '@/views/wms/product_manage/workorder/UploadDialog'
import ReplaceDeviceDialog from '@/views/wms/product_manage/workorder/ReplaceDeviceDialog'
import {openStart} from "./produceshiftorder";
const defaultForm = {
workorder_id: null,
workorder_code: null,
shift_type_scode: null,
shift_type_scode: "1",
workprocedure_id: null,
product_area: 'A1',
plan_qty: null,
@@ -501,7 +598,7 @@ const defaultForm = {
person_real_qty: null,
dq_real_qty: null,
material_id: null,
material_code: null,
materialCode: null,
material_weight: null,
material_name: null,
material_spec: null,
@@ -511,10 +608,10 @@ const defaultForm = {
realproduceend_date: null,
device_code: null,
current_produce_person_id: null,
is_canupdate_update: null,
is_used_fxx: false,
is_canupdate_update: true,
package_ext: {},
workorder_status: null,
is_needmove: null,
is_needmove: true,
sale_id: null,
create_type: null,
is_error: null,
@@ -565,6 +662,10 @@ export default {
},
data() {
return {
zxj: [ { value: 'A1_ZXJ_1', label: '一线1号装箱机' }, { value: 'A1_ZXJ_2', label: '一线2号装箱机' }],
auto_confirm: [ { value: '1', label: '自动确认' }, { value: '2', label: '定时确认' }, { value: '3', label: '人工确认' }],
cxj: [ { value: 'A1_KXJ_1', label: '一线1号拆箱机' }, { value: 'A1_KXJ_1', label: '一线2号拆箱机' }],
trueorfalse: [ { value: true, label: '是' }, { value: false, label: '否' }],
deviceList: [],
classes3: [],
materType: '01',
@@ -592,7 +693,7 @@ export default {
plan_qty: [
{ required: true, message: '计划数量不能为空', trigger: 'blur' }
],
material_code: [
materialCode: [
{ required: true, message: '物料编码不能为空', trigger: 'change' }
],
order_status: [
@@ -653,12 +754,12 @@ export default {
const year = d.getFullYear()
const month = (d.getMonth() + 1) < 10 ? '0' + (d.getMonth() + 1) : (d.getMonth() + 1)
const day = d.getDate() < 10 ? '0' + d.getDate() : d.getDate()
if (val === '02') {
if (val === '2') {
this.form.planproducestart_date = [year, month, day].join('-') + ' ' + ['18', '30', '00'].join(':')
const day1 = d.getDate() < 10 ? '0' + (d.getDate() + 1) : d.getDate() + 1
this.form.planproduceend_date = [year, month, day1].join('-') + ' ' + ['07', '30', '00'].join(':')
}
if (val === '01') {
if (val === '1') {
this.form.planproducestart_date = [year, month, day].join('-') + ' ' + ['07', '30', '00'].join(':')
this.form.planproduceend_date = [year, month, day].join('-') + ' ' + ['18', '30', '00'].join(':')
}
@@ -740,7 +841,6 @@ export default {
},
// 查看
toView(row) {
console.log(row)
if (row !== null) {
this.$refs.child3.setForm(row)
}
@@ -791,6 +891,18 @@ export default {
return true
}
},
is_disopen(rows) {
var length = rows.length
if (length === 1 ) {
if (rows[0].workorder_status==='2'){
return false
}else {
return true
}
} else {
return true
}
},
close() {
this.$emit('AddChanged')
},
@@ -815,7 +927,7 @@ export default {
// 新增编辑给form表单物料相关信息赋值
setMaterValue(row) {
this.form.material_id = row.material_id
this.form.material_code = row.material_code
this.form.materialCode = row.material_code
this.form.material_name = row.material_name
this.form.material_spec = row.material_spec
},
@@ -848,6 +960,12 @@ export default {
this.crud.toQuery()
})
},
openstart(rows) {
crudProduceshiftorder.openStart(rows[0]).then(res => {
this.crud.notify('开工成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
},
add() {
this.addShow = true
},
@@ -859,11 +977,22 @@ export default {
},
[CRUD.HOOK.beforeToAdd]() {
this.initDataPlan()
},
[CRUD.HOOK.beforeToEdit]() {
console.log(this.form.package_ext)
console.log(this.form)
if (this.form.package_ext != undefined && this.form.package_ext != null && JSON.stringify(this.form.package_ext).length>3){
this.form.package_ext = JSON.parse(this.form.package_ext)
}
},
[CRUD.HOOK.beforeSubmit]() {
if (JSON.stringify(this.form.package_ext).length>3){
this.form.package_ext = JSON.stringify(this.form.package_ext)
}else {
this.form.package_ext = ''
}
}
// [CRUD.HOOK.afterToEdit]() {
// const editForm1 = JSON.parse(JSON.stringify(this.form))
// this.getNotWorkDeviceByWorkproceduceId(editForm1.workprocedure_id)
// }
}
}
</script>

3
mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js
View File

@@ -41,7 +41,7 @@ export function submits(data) {
}
export function unSubmits(data) {
return request({
url: 'api/produceWorkorder/submits',
url: 'api/produceWorkorder/unSubmits',
method: 'post',
data
})
@@ -112,7 +112,6 @@ export function reportQuery(data) {
})
}
export function reportQuery3(data) {
return request({
url: '/api/produceWorkorder/reportQuery3',

4
mes/qd/src/views/wms/product_manage/workorder/reportDialog.vue
View File

@@ -94,8 +94,8 @@
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="person_finish_qty" label="人员期末数量" />-->
<el-table-column prop="operatetime_start" label="开工时间" :min-width="flexWidth('operatetime_start',crud.data,'开工时间')"/>
<el-table-column prop="operatetime_end" label="完工时间" :min-width="flexWidth('operatetime_end',crud.data,'完工时间')"/>
<el-table-column prop="operatetime_start" label="开始时间" :min-width="flexWidth('operatetime_start',crud.data,'开始时间')"/>
<el-table-column prop="operatetime_end" label="完成时间" :min-width="flexWidth('operatetime_end',crud.data,'完成时间')"/>
<el-table-column prop="report_status" label="报工状态" >
<template slot-scope="scope">
{{ reportStatus[scope.row.report_status-1].label }}

4
mes/qd/src/views/wms/product_manage/workorder/reportDialog3.vue
View File

@@ -87,8 +87,8 @@
<el-input v-model="scope.row.repare_qty" /></template>
</el-table-column>
<el-table-column prop="person_finish_qty" label="人员期末数量" />
<el-table-column prop="operatetime_start" label="开工时间" />
<el-table-column prop="operatetime_end" label="完工时间" />
<el-table-column prop="operatetime_start" label="开始时间" />
<el-table-column prop="operatetime_end" label="结束时间" />
<el-table-column prop="report_status" label="报工状态">
<template slot-scope="scope">
{{ reportStatus[scope.row.report_status-1].label }}

8
mes/qd/src/views/wms/scheduler_manage/task/index.vue
View File

@@ -161,12 +161,12 @@
<el-table-column v-if="false" prop="task_status" label="任务状态" />
<el-table-column prop="task_status_name" label="任务状态" width="120px" :formatter="formatTaskStatusName" />
<el-table-column prop="point_code1" label="起点" :min-width="flexWidth('point_code1',crud.data,'起点')" />
<el-table-column prop="point_code2" label="终点" :min-width="flexWidth('point_code2',crud.data,'终点')" />
<el-table-column prop="point_code3" label="返回点" :min-width="flexWidth('point_code3',crud.data,'返回点')" />
<el-table-column prop="point_code2" label="倒料点" :min-width="flexWidth('point_code2',crud.data,'终点')" />
<el-table-column prop="point_code3" label="终点" :min-width="flexWidth('point_code3',crud.data,'返回点')" />
<el-table-column prop="product_area" label="生产车间" />
<el-table-column prop="point1_region_name" label="起点区域" width="120" />
<el-table-column prop="point2_region_name" label="终点区域" min-width="120" show-overflow-tooltip />
<el-table-column prop="point3_region_name" label="返回点区域" min-width="120" show-overflow-tooltip />
<el-table-column prop="point2_region_name" label="倒料点区域" min-width="120" show-overflow-tooltip />
<el-table-column prop="point3_region_name" label="终点区域" min-width="120" show-overflow-tooltip />
<el-table-column prop="vehicle_code" label="载具编码1" min-width="100" show-overflow-tooltip />
<el-table-column prop="vehicle_code2" label="载具编码2" min-width="100" show-overflow-tooltip />
<el-table-column prop="vehicle_type" label="载具类型" min-width="100" show-overflow-tooltip>

161
mes/qd/src/views/wms/staging_manage/staging/kzStaging/index.vue
View File

@@ -57,7 +57,7 @@
</el-button>
</crudOperation>
</div>
<!--表格渲染-->
<!--托盘物料-->
<el-dialog
:close-on-click-modal="false"
:visible.sync=dialogVisible
@@ -88,32 +88,70 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="materiValueCancel()">取消</el-button>
<el-button type="primary" @click="materiValueSubmit()">确认</el-button>
<el-button type="primary" @click="pointMateriSubmit()">确认</el-button>
</div>
</el-dialog>
<!--点位物料-->
<el-dialog
:close-on-click-modal="false"
:visible.sync=pointMVisible
title="点位物料信息"
width="540px"
@close="materiValueCancel()"
>
<el-form ref="form" :model="materialForm" :rules="rules" size="mini" label-width="110px">
<el-form-item label="载具编码" prop="vehicle_code">
<el-input v-model="materialForm.point_code" disabled style="width: 370px;" />
</el-form-item>
<el-form-item label="物料编码" prop="material_code">
<template slot-scope="scope">
<el-input v-model="materialForm.material_code" clearable @clear="materialForm.material_code='',materialForm.material_id='',materialForm.material_name='',materialForm.material_spec=''" style="width: 370px">
<el-button slot="append" icon="el-icon-plus" @click="queryMater(scope.$index, scope.row)" />
</el-input>
</template>
</el-form-item>
<el-form-item label="物料规格" prop="material_spec">
<el-input v-model="materialForm.material_spec" disabled style="width: 370px;" />
</el-form-item>
<el-form-item label="物料数量" prop="storage_qty">
<el-input v-model="materialForm.qty" clearable style="width: 370px;" />
</el-form-item>
<el-form-item label="锁定类型" prop="lock_type">
<el-select
v-model="materialForm.lock_type"
size="mini"
placeholder="锁定类型"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.d_lock_type"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="点位状态" prop="point_status">
<el-select
v-model="materialForm.point_status"
size="mini"
placeholder="锁定类型"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.point_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="materiValueCancel()">取消</el-button>
<el-button type="primary" @click="pointMateriSubmit()">确认</el-button>
</div>
</el-dialog>
<!-- <el-dialog-->
<!-- :close-on-click-modal="false"-->
<!-- :before-close="crud.cancelCU"-->
<!-- :visible.sync="crud.status.cu > 0"-->
<!-- :title="crud.status.title"-->
<!-- width="710px"-->
<!-- >-->
<!-- <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="120px">-->
<!-- <el-form-item label="载具编码">-->
<!-- <el-input v-model="form.vehicle_code" style="width: 200px;" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="点位状态">-->
<!-- <el-input v-model="form.point_status" style="width: 200px;" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="锁定状态">-->
<!-- <el-input v-model="form.lock_type" style="width: 200px;" />-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button type="text" @click="crud.cancelCU">取消</el-button>-->
<!-- <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>-->
<!-- </div>-->
<!-- </el-dialog>-->
<el-table
ref="table"
@@ -143,6 +181,7 @@
</template>
</el-table-column>
<el-table-column prop="material_spec" label="物料规格" />
<el-table-column prop="qty" label="数量" />
<el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip />
<el-table-column prop="is_used" label="是否启用">
<template slot-scope="scope">
@@ -151,20 +190,16 @@
</el-table-column>
<el-table-column prop="update_name" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="150" />
<!-- <el-table-column-->
<!-- v-permission="[]"-->
<!-- label="操作"-->
<!-- fixed="right"-->
<!-- width="120px"-->
<!-- align="center"-->
<!-- >-->
<!-- <template slot-scope="scope">-->
<!-- <udOperation-->
<!-- :data="scope.row"-->
<!-- :permission="permission"-->
<!-- />-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column v-permission="[]" label="操作" width="100px" align="center" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
slot="left"
@click="toEditMaterial(scope.row)">
修改
</el-button>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
@@ -182,7 +217,7 @@
<script>
import crudDevice from '@/views/wms/staging_manage/staging/kzStaging/kzStaging.js'
import CRUD, { presenter, header, form } from '@crud/crud'
import CRUD, { crud,presenter, header, form } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
import rrOperation from '@crud/RR.operation'
@@ -199,19 +234,26 @@ const defaultForm = { product_area: 'A1', region_code: 'A1_KZHC', workprocedure_
export default {
name: 'SKdevice',
components: { crudOperation, pagination, udOperation, rrOperation, ViewDialog, MaterDtl },
dicts: ['product_area'],
dicts: ['product_area','d_lock_type','point_status'],
cruds() {
return [
CRUD({ title: '刻字缓存区', url: 'api/point/queryVehicle', query: { product_area: 'A1', region_code: 'A1_KZHC' }, idField: 'device_code', crudMethod: { ...crudDevice }})
CRUD({ title: '刻字缓存区', url: 'api/point/queryVehicle', query: { product_area: 'A1', region_code: 'A1_KZHC' }, idField: 'device_code', crudMethod: { ...crudDevice },optShow: {
add: false,
edit: false,
del: false,
download: false,
reset: true
}})
]
},
mixins: [presenter(), header(), form(defaultForm)],
mixins: [presenter(), header(), form(defaultForm),crud()],
data() {
return {
materialForm:{},
materType:'',
materialShow: false,
dialogVisible: false,
pointMVisible: false,
queryTypeOptions: [
{ key: 'name', display_name: '字典名称' },
{ key: 'description', display_name: '描述' }
@@ -226,17 +268,18 @@ export default {
},
methods: {
setEmpty(rows) {
var structIds = []
console.log(rows)
var points = []
rows.forEach((item) => {
structIds.push(item.workorder_id)
points.push(item.point_id)
})
alert(structIds)
// crudProduceshiftorder.submits(orders).then(res => {
// this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
// this.crud.toQuery()
// })
}, // 取消下发
crudDevice.setEmp(points).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.materiValueCancel()
this.crud.refresh()
}).catch(() => {
})
},
setMaterValue(row) {
this.materialForm.material_id = row.material_id
this.materialForm.material_code = row.material_code
@@ -251,6 +294,7 @@ export default {
materiValueCancel(){
this.materialForm = {}
this.dialogVisible = false
this.pointMVisible = false
},
materiValueSubmit(){
console.log(this.materialForm)
@@ -262,12 +306,25 @@ export default {
})
},
pointMateriSubmit(){
crudDevice.edit(this.materialForm).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.materiValueCancel()
this.crud.refresh()
}).catch(() => {
})
},
toView(row) {
crudStoragevehicleinfo.vehileInfo(row).then(data => {
this.dialogVisible = true
this.materialForm = data
})
},
toEditMaterial(row) {
this.pointMVisible = true
this.materialForm = row
},
toViewOption(row) {
if (row) {
this.$refs.viewDialog.setParentData(row)

9
mes/qd/src/views/wms/staging_manage/staging/kzStaging/kzStaging.js
View File

@@ -66,5 +66,12 @@ export function vehileInfo(data) {
method: 'get',
})
}
export function setEmp(data) {
return request({
url: 'api/point/setEmp',
method: 'post',
data
})
}
export default { add, edit, del, changeActive, findPoints, getPoint, getRegion, changeUsed, vehileInfo }
export default { add, edit, del, changeActive, setEmp, getPoint, getRegion, changeUsed, vehileInfo }

3
mes/qd/src/views/wms/storage_manage/product/productIn/DivDialog.vue
View File

@@ -68,7 +68,7 @@
<el-card class="box-card" shadow="never" :body-style="{padding:'20px 20px 0 20px'}">
<el-form ref="form2" :inline="true" :model="form" :rules="rules" size="mini">
<el-form-item label="载具号:" prop="vehicle_code">
<el-input v-model="form.vehicle_code" style="width: 200px" size="mini" disabled clearable placeholder="载具号">
<el-input v-model="form.vehicle_code" style="width: 200px" size="mini" clearable placeholder="载具号">
<el-button slot="append" @click="vehicleCheck" >生成</el-button>
</el-input>
</el-form-item>
@@ -82,7 +82,6 @@
<el-form-item label="放入数量:" prop="storage_qty">
<el-input-number
v-model="form.storage_qty"
:disabled="form.bucketunique !== ''"
style="width: 200px"
size="mini"
:controls="false"

4
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/AddDialog.vue
View File

@@ -163,7 +163,7 @@
/>
</template>
</el-table-column>-->
<el-table-column show-overflow-tooltip prop="plan_qty" label="数量">
<el-table-column show-overflow-tooltip prop="plan_qty" label="重量">
<template slot-scope="scope">
<el-input-number
v-model="form.tableData[scope.$index].plan_qty"
@@ -338,7 +338,7 @@ export default {
// return false
// }
if (!row.plan_qty) {
this.crud.notify('数量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
this.crud.notify('重量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
if (!this.form.stor_id) {

2
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/ViewDialog.vue
View File

@@ -82,7 +82,7 @@
<el-form-item label="总重量" prop="total_qty">
<label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
<el-input-number
v-model="form.weight_qty"
v-model="form.total_qty"
:controls="false"
:precision="3"
:min="0"

4
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/index.vue
View File

@@ -161,8 +161,8 @@
<!-- <el-table-column show-overflow-tooltip prop="base_bill_code" min-width="120" label="关联单据号" />-->
<el-table-column show-overflow-tooltip min-width="120" prop="material_code" label="物料编码" />
<el-table-column show-overflow-tooltip min-width="120" prop="material_spec" label="物料规格" />
<el-table-column show-overflow-tooltip min-width="120" prop="weight_qty" label="总重量" />
<el-table-column show-overflow-tooltip min-width="120" prop="plan_qty" label="总数量" />
<el-table-column show-overflow-tooltip min-width="120" prop="plan_qty" label="总重量(g)" />
<el-table-column show-overflow-tooltip min-width="120" prop="qty" label="总数量(个)" />
<el-table-column show-overflow-tooltip min-width="120" prop="unit_weight" label="单重" />
<el-table-column show-overflow-tooltip min-width="120" prop="storagevehicle_code" label="载具号" />
<el-table-column show-overflow-tooltip min-width="120" prop="point_code" label="入库点" />

4
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvt/index.vue
View File

@@ -84,8 +84,8 @@
<el-table-column show-overflow-tooltip min-width="120" prop="material_name" label="物料名称" />
<el-table-column show-overflow-tooltip min-width="120" prop="material_spec" label="物料规格" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
<el-table-column show-overflow-tooltip prop="canuse_qty" label="可用数量" :formatter="crud.formatNum3" />
<el-table-column show-overflow-tooltip prop="unit_name" label="单位" />
<el-table-column show-overflow-tooltip prop="canuse_qty" label="可用重量(g)" :formatter="crud.formatNum3" />
<!-- <el-table-column show-overflow-tooltip prop="unit_name" label="单位" />-->
<el-table-column show-overflow-tooltip prop="instorage_time" label="入库时间" min-width="150" />
</el-table>
<!--分页组件-->

6
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/index.vue
View File

@@ -103,9 +103,9 @@
<el-table-column show-overflow-tooltip min-width="120" prop="bill_code" label="单据号" />
<el-table-column show-overflow-tooltip min-width="120" prop="change_person_name" label="变动人" />
<el-table-column show-overflow-tooltip min-width="150" prop="change_time" label="变动时间" />
<el-table-column show-overflow-tooltip prop="change_qty" label="变动数" :formatter="crud.formatNum3" />
<el-table-column show-overflow-tooltip prop="result_qty" label="结存数" :formatter="crud.formatNum3" />
<el-table-column show-overflow-tooltip prop="unit_name" label="单位" />
<el-table-column show-overflow-tooltip prop="change_qty" label="变动数(g)" :formatter="crud.formatNum3" />
<el-table-column show-overflow-tooltip prop="result_qty" label="结存数(g)" :formatter="crud.formatNum3" />
<!-- <el-table-column show-overflow-tooltip prop="unit_name" label="单位" />-->
</el-table>
<!--分页组件-->
<pagination />

4
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/AddDialog.vue
View File

@@ -165,7 +165,7 @@
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="150px" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" width="110px" />
<el-table-column show-overflow-tooltip prop="canuse_qty" label="数量（个）" width="110px" />
<el-table-column show-overflow-tooltip prop="canuse_qty" label="重量(g)" width="110px" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
<el-table-column show-overflow-tooltip prop="unit_weight" label="单重" width="85px" />
<el-table-column show-overflow-tooltip prop="struct_code" label="货位" />
@@ -191,7 +191,7 @@ const defaultForm = {
bill_status: '10',
total_qty: '0',
detail_count: '0',
bill_type: '51',
bill_type: '52',
remark: '',
biz_date: '',
create_mode: '',

5
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/AddDialog.vue
View File

@@ -176,7 +176,7 @@
<el-table-column show-overflow-tooltip prop="struct_code" label="仓位" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
<el-table-column show-overflow-tooltip prop="plan_qty" label="数量" />
<el-table-column show-overflow-tooltip prop="plan_qty" label="重量(g)" />
<el-table-column show-overflow-tooltip prop="unit_weight" label="单重" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
<el-table-column v-if="crud.status.add === 1" align="center" label="操作" width="170" fixed="right">
@@ -280,7 +280,8 @@ export default {
crudStorattr.getStor({ 'stor_type': '2' }).then(res => {
this.storlist = res.content
})
const area_type = 'A1_BCPCK01'
//A1_BCPCK01
const area_type = 'A1_BCPRK01'
crudPoint.getPoint({ 'area_type': area_type }).then(res => {
this.pointList = res
})

2
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/StructIvt.vue
View File

@@ -62,7 +62,7 @@
<el-table-column show-overflow-tooltip prop="material_code" width="100" label="物料编号" />
<el-table-column show-overflow-tooltip prop="material_spec" width="100" label="物料规格" />
<el-table-column show-overflow-tooltip width="300" prop="material_name" label="物料名称" />
<el-table-column show-overflow-tooltip width="150" prop="canuse_qty" label="数量（个）" />
<el-table-column show-overflow-tooltip width="150" prop="canuse_qty" label="重量(g)" />
<el-table-column show-overflow-tooltip width="100" prop="unit_weight" label="单重" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
</el-table>

14
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/ViewDialog.vue
View File

@@ -75,12 +75,12 @@
/>
</el-select>
</el-form-item>
<el-form-item label="总重量" prop="detail_count">
<label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
<el-input v-model="form.weight_qty" size="mini" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="总数量" prop="total_qty">
<el-form-item label="总数量" prop="detail_count">
<label slot="label">总&nbsp;&nbsp;数&nbsp;量:</label>
<el-input v-model="form.qty" size="mini" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="总重量" prop="total_qty">
<label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
<el-input-number
v-model="form.plan_qty"
:controls="false"
@@ -117,8 +117,8 @@
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
<el-table-column prop="pcsn" label="批次" width="150" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="数量" align="center" />
<el-table-column prop="qty_unit_name" label="单位" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
<!-- <el-table-column prop="qty_unit_name" label="单位" align="center" />-->
<el-table-column prop="unit_weight" label="单重" align="center" />
<el-table-column prop="storagevehicle_code" label="载具号" align="center" />
<el-table-column prop="struct_code" label="起始位置" align="center" />

6
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/index.vue
View File

@@ -160,9 +160,9 @@
<el-table-column show-overflow-tooltip prop="bill_type" min-width="120" label="业务类型" :formatter="bill_typeFormat" />
<el-table-column show-overflow-tooltip min-width="120" prop="material_code" label="物料编码" />
<el-table-column show-overflow-tooltip min-width="120" prop="material_spec" label="物料规格" />
<el-table-column show-overflow-tooltip min-width="120" prop="weight_qty" label="总重量" />
<el-table-column show-overflow-tooltip min-width="120" prop="plan_qty" label="总数量" />
<el-table-column show-overflow-tooltip min-width="120" prop="qty_unit_name" label="单位" />
<el-table-column show-overflow-tooltip min-width="120" prop="plan_qty" label="总重量(g)" />
<el-table-column show-overflow-tooltip min-width="120" prop="qty" label="总数量(个)" />
<!-- <el-table-column show-overflow-tooltip min-width="120" prop="qty_unit_name" label="单位" />-->
<el-table-column show-overflow-tooltip min-width="120" prop="point_code" label="出库点" />
<el-table-column show-overflow-tooltip min-width="120" prop="struct_code" label="分配货位" />
<el-table-column label="备注" align="center" prop="remark" />