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

rev:提交aps相关代码

Browse Source
This commit is contained in:
baoge
2023-09-18 13:26:48 +08:00
parent 928770aa9b
commit e8f6b19560
97 changed files with 49946 additions and 4464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

207
mes/qd/src/views/wms/pcs/purchaseorder/AddDialog.vue
View File

@@ -1,25 +1,25 @@
<!--suppress ALL -->
<template>
<el-dialog
:before-close="crud.cancelCU"
:title="crud.status.title"
:visible.sync="crud.status.cu > 0 || crud.status.view > 0"
append-to-body
fullscreen
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0 || crud.status.view > 0"
width="1200px"
@open="open"
@close="close"
@open="open"
>
<el-row v-show="crud.status.cu > 0" :gutter="20">
<el-col :span="20" style="border: 1px solid white">
<span />
<span/>
</el-col>
<el-col :span="4">
<span>
<el-button
:loading="crud.cu === 2"
icon="el-icon-check"
size="mini"
:loading="crud.cu === 2"
type="primary"
@click="crud.submitCU"
>保存</el-button>
@@ -30,22 +30,22 @@
<el-form
ref="form"
style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
:inline="true"
:model="form"
:rules="rules"
size="mini"
label-width="85px"
label-suffix=":"
label-width="85px"
size="mini"
style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
>
<el-form-item label="车间" prop="workshop_id">
<label slot="label">车间</label>
<el-select
v-model="form.workshop_id"
clearable
size="mini"
placeholder="全部"
class="filter-item"
clearable
placeholder="全部"
size="mini"
>
<el-option
v-for="item in dict.product_area"
@@ -55,16 +55,26 @@
/>
</el-select>
</el-form-item>
<el-form-item label="物料编码" prop="material_code">
<el-input v-model.trim="form.material_code" disabled class="input-with-select" style="width: 370px;">
<el-button slot="append" icon="el-icon-search" @click="insertEvent" />
<el-form-item label="原料编码" prop="material_code">
<el-input v-model.trim="form.material_code" class="input-with-select" disabled style="width: 210px;">
<el-button slot="append" icon="el-icon-search" @click="insertEvent"/>
</el-input>
</el-form-item>
<el-form-item label="物料名称" prop="material_name">
<label slot="label">物料名称:</label>
<el-input v-model="form.material_name" size="mini" disabled style="width: 210px" />
<el-form-item label="原料名称" prop="material_name">
<label slot="label">原料名称:</label>
<el-input v-model="form.material_name" disabled size="mini" style="width: 210px"/>
</el-form-item>
<el-form-item label="明细数" prop="detail_count">
<el-form-item label="选择对应半成品编码" label-width="150px" prop="semireal_code">
<el-select v-model="form.semireal_code" size="mini">
<el-option
v-for="option in codeOptions"
:key="option.relation_id"
:label="option.semireal_code"
:value="option.semireal_code"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="明细数" prop="detail_count">
<label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
<el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
</el-form-item>
@@ -91,94 +101,94 @@
</el-form-item>
</el-form>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<div class="crud-opts2" style="margin-bottom: 5px;">
<!-如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<div class="crud-opts2" style="margin-bottom: 5px;">
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<slot name="left"/>
<el-button
v-if="crud.status.add > 0"
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
type="primary"
@click="add"
>
新增一行
</el-button>
</span>
</div>
<!--表格渲染-->
<el-table
ref="table"
:data="form.tableData"
style="width: 100%;"
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column type="index" label="序号" width="55" align="center" />
</div>
<!--表格渲染-->
<el-table
ref="table"
:data="form.tableData"
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
border
style="width: 100%;"
>
<el-table-column align="center" label="序号" type="index" width="55"/>
<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="ask_time" label="要求到货日期" style="width: 250px">
<template slot-scope="scope">
<el-date-picker
v-model="form.tableData[scope.$index].ask_time"
type="date"
placeholder="选择日期"
align="center"
value-format="yyyy-MM-dd"
:disabled="crud.status.view > 0"
/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="qty" label="需求数量">
<template slot-scope="scope">
<el-input-number
v-model.number="form.tableData[scope.$index].qty"
size="small"
:controls="false"
controls-position="right"
:precision="3"
:min="0"
@change="changeQty"
/>
</template>
</el-table-column>
<!-- <el-table-column show-overflow-tooltip prop="safe_qty" label="安全库存"/>-->
<!-- <el-table-column show-overflow-tooltip prop="remark" label="总需求数量"/>-->
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="数量单位">
<template scope="scope">
KG
</template>
</el-table-column>
<el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="100" fixed="right">
<template scope="scope">
<el-button
type="danger"
class="filter-item"
size="mini"
icon="el-icon-delete"
@click.native.prevent="deleteRow(scope.$index, form.tableData)"
/>
</template>
</el-table-column>
</el-table>
<el-table-column label="物料编码" prop="material_code" show-overflow-tooltip/>
<el-table-column label="物料名称" prop="material_name" show-overflow-tooltip/>
<el-table-column label="要求到货日期" prop="ask_time" show-overflow-tooltip style="width: 250px">
<template slot-scope="scope">
<el-date-picker
v-model="form.tableData[scope.$index].ask_time"
:disabled="crud.status.view > 0"
align="center"
placeholder="选择日期"
type="date"
value-format="yyyy-MM-dd"
/>
</template>
</el-table-column>
<el-table-column label="需求重量" prop="show_qty" show-overflow-tooltip>
<template slot-scope="scope">
<el-input-number
v-model.number="form.tableData[scope.$index].show_qty"
:controls="false"
:min="0"
:precision="3"
controls-position="right"
size="small"
@change="changeQty"
/>
</template>
</el-table-column>
<!-- <el-table-column show-overflow-tooltip prop="safe_qty" label="安全库存"/>-->
<!-- <el-table-column show-overflow-tooltip prop="remark" label="总需求数量"/>-->
<el-table-column label="数量单位" prop="qty_unit_name" show-overflow-tooltip>
<template scope="scope">
KG
</template>
</el-table-column>
<el-table-column v-if="crud.status.cu > 0" align="center" fixed="right" label="操作" width="100">
<template scope="scope">
<el-button
class="filter-item"
icon="el-icon-delete"
size="mini"
type="danger"
@click.native.prevent="deleteRow(scope.$index, form.tableData)"
/>
</template>
</el-table-column>
</el-table>
</el-form>
<MaterDtl
:dialog-show.sync="materShow"
:is-single="true"
@setMaterValue="tableChanged"
/>
</el-dialog>
</template>
<script>
import CRUD, { crud, form } from '@crud/crud'
import MaterDtl from '@/views/wms/pub/MaterDialog'
import MaterDtl from '@/views/wms/pub/rawMaterDialog'
import crudPurchase from '@/views/wms/pcs/purchaseorder/purchase'
const defaultForm = {
@@ -187,11 +197,13 @@ const defaultForm = {
create_mode: '01',
material_code: '',
material_name: '',
qty_unit_id: '1',
semireal_code: '',
semi_material_name: '',
qty_unit_id: '',
qty_unit_name: 'KG',
total_qty: 0,
detail_count: '0',
workshop_id: '',
workshop_id: 'A1',
tableData: []
}
@@ -209,6 +221,7 @@ export default {
sect_id: '',
opendtlParam: null,
sects: [],
codeOptions: [],
rules: {
product_code: [
{ required: true, message: '生产车间不能为空', trigger: 'blur' }
@@ -247,10 +260,17 @@ export default {
this.crud.notify('车间不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
if (!this.form.material_code) {
this.crud.notify('原料编码不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
if (!this.form.semireal_code) {
this.crud.notify('对应半成品编码不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
for (let i = 0; i < this.form.tableData.length; i++) {
const row = this.form.tableData[i]
if (!row.qty || row.qty === 0) {
if (!row.show_qty || row.show_qty === 0) {
this.crud.notify('数量不能为0', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
@@ -272,13 +292,23 @@ export default {
}
},
tableChanged(item) {
this.form.qty_unit_id = '1'
this.form.qty_unit_name = 'KG'
this.queryCode(item.material_code)
this.form.qty_unit_id = item.base_unit_id
this.form.qty_unit_name = item.base_unit_name
this.form.material_code = item.material_code
this.form.material_name = item.material_name
this.form.material_id = item.material_id
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(row.plan_qty)
},
async queryCode(materialCode) {
try {
const response = await crudPurchase.getSemiRealCode(materialCode)
this.codeOptions = response
} catch (error) {
debugger;
console.error('Error fetching data:', error)
}
},
add() {
if (!this.form.material_code) {
this.crud.notify('请选择一种物料进行新增！', CRUD.NOTIFICATION_TYPE.INFO)
@@ -289,12 +319,15 @@ export default {
row.material_name = this.form.material_name
row.qty_unit_name = this.form.qty_unit_name
this.$set(row, 'ask_time', null)
this.$set(row, 'qty', null)
this.$set(row, 'show_qty', null)
this.form.tableData.splice(-1, 0, row)
},
insertEvent() {
this.materShow = true
},
insertEvent2() {
this.materShow2 = true
},
insertBill(row) {
this.billShow = true
},

117
mes/qd/src/views/wms/pcs/purchaseorder/index.vue
View File

@@ -9,17 +9,17 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
label-width="80px"
>
<el-form-item label="车间">
<el-select
v-model="query.workshop_id"
clearable
size="mini"
placeholder="全部"
class="filter-item"
clearable
placeholder="全部"
size="mini"
@change="crud.toQuery"
>
<el-option
@@ -33,44 +33,27 @@
<el-form-item label="需求日期">
<el-date-picker
v-model="query.createTime"
:default-time="['00:00:00', '23:59:59']"
align="center"
end-placeholder="结束日期"
start-placeholder="开始日期"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
align="center"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
</el-form-item>
<el-form-item label="状态">
<el-select
v-model="query.bill_status"
clearable
size="mini"
placeholder="单据状态"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.IO_BILL_STATUS"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="生成方式">
<el-select
v-model="query.create_mode"
class="filter-item"
clearable
filterable
size="mini"
placeholder="生成方式"
class="filter-item"
size="mini"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_CREATE"
v-for="item in dict.ST_CREATE_MODE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -80,24 +63,24 @@
<el-form-item label="物料">
<el-input
v-model="query.material_search"
size="mini"
clearable
placeholder="编码、名称"
size="mini"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
<rrOperation/>
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="warning"
icon="el-icon-check"
:disabled="crud.selections.length === 0"
class="filter-item"
icon="el-icon-check"
size="mini"
type="warning"
@click="commit(crud.selections)"
>
提交采购
@@ -107,31 +90,29 @@
<el-table
ref="table"
v-loading="crud.loading"
size="mini"
:data="crud.data"
:summary-method="getSummaries"
highlight-current-row
show-summary
:summary-method="getSummaries"
size="mini"
style="width: 100%;"
@select-all="crud.selectAllChange"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="workshop_id" label="车间" />
<el-table-column show-overflow-tooltip prop="material_code" width="130" label="物料编号"/>
<el-table-column show-overflow-tooltip prop="material_name" width="130" label="物料名称"/>
<el-table-column prop="ask_time" label="要求到货日期" width="130" show-overflow-tooltip />
<el-table-column show-overflow-tooltip prop="qty" min-width="120" label="重量"/>
<!-- <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="安全库存" />-->
<!-- <el-table-column label="总重量" align="center" prop="total_qty"/>-->
<el-table-column label="状态" align="center" prop="status" :formatter="stateFormat"/>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="生成方式" align="center" prop="create_mode" :formatter="createModeFormat"/>
<el-table-column label="创建人" align="center" prop="create_name" width="150" />
<el-table-column label="创建时间" align="center" prop="create_time" width="150" />
<el-table-column label="提交人" align="center" prop="audit_namne" width="150" />
<el-table-column label="提交时间" align="center" prop="audit_time" width="140px" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<el-table-column type="selection" width="55"/>
<el-table-column label="车间" prop="workshop_id" show-overflow-tooltip/>
<el-table-column label="物料编号" prop="material_code" show-overflow-tooltip width="130"/>
<el-table-column :min-width="flexWidth('material_name', crud.data, '物料名称')" label="物料名称" prop="material_name" show-overflow-tooltip/>
<el-table-column :min-width="flexWidth('ask_time', crud.data, '要求到货日期')" label="要求到货日期" prop="askTime"/>
<el-table-column label="重量" min-width="120" prop="show_qty" show-overflow-tooltip/>
<!-- <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="安全库存" />-->
<!-- <el-table-column label="总重量" align="center" prop="total_qty"/>-->
<el-table-column :formatter="stateFormat" align="center" label="状态" prop="status"/>
<el-table-column :formatter="createModeFormat" align="center" label="生成方式" prop="create_mode" width="110"/>
<el-table-column align="center" label="创建人" prop="create_name" width="150"/>
<el-table-column align="center" label="创建时间" prop="createTime" width="150"/>
<el-table-column align="center" label="备注" prop="remark"/>
<el-table-column v-permission="[]" align="center" fixed="right" label="操作" width="120px">
<template slot-scope="scope">
<udOperation
:data="scope.row"
@@ -141,9 +122,9 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
<pagination/>
</div>
<AddDialog @AddChanged="querytable" />
<AddDialog @AddChanged="querytable"/>
</div>
</template>
@@ -169,7 +150,7 @@ export default {
query: {
'status': '0'
},
url: '/api/pcsIfPurchaseorder',
url: '/api/pcsIfPurchaseorder/query',
crudMethod: { ...crudPurchase }
})
},
@@ -203,27 +184,27 @@ export default {
},
methods: {
getSummaries(param) {
const { columns, data } = param;
const sums = [];
const { columns, data } = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
sums[index] = '合计'
return
}
const values = data.map(item => Number(item[column.property]));
if (column.property === 'qty') {
const values = data.map(item => Number(item[column.property]))
if (column.property === 'show_qty') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr;
return prev + curr
} else {
return prev;
return prev
}
}, 0);
sums[index] += ' KG';
}, 0)
sums[index] = sums[index].toFixed(3) + ' KG'
}
});
return sums;
})
return sums
},
bill_typeFormat(row, column) {
return this.dict.label.ST_INV_RAW_IN_TYPE[row.bill_type]
@@ -247,7 +228,7 @@ export default {
}
}
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
<style lang="scss" rel="stylesheet/scss" scoped>
::v-deep .el-dialog__body {
padding-top: 10px;
}

93
mes/qd/src/views/wms/pcs/purchaseorder/purchase.js
View File

@@ -1,67 +1,76 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: '/api/pcsIfPurchaseorder',
method: 'post',
data
})
return request({
url: '/api/pcsIfPurchaseorder',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: '/api/pcsIfPurchaseorder/delete',
method: 'post',
data: ids
})
return request({
url: '/api/pcsIfPurchaseorder/delete',
method: 'post',
data: ids
})
}
export function edit(data) {
return request({
url: '/api/pcsIfPurchaseorder/update',
method: 'post',
data
})
return request({
url: '/api/pcsIfPurchaseorder/update',
method: 'post',
data
})
}
export function confirm(data) {
return request({
url: '/api/pcsIfPurchaseorder/confirm',
method: 'post',
data
})
return request({
url: '/api/pcsIfPurchaseorder/confirm',
method: 'post',
data
})
}
export function getDtl(data) {
return request({
url: '/api/pcsIfPurchaseorder/getDtl',
method: 'post',
data
})
return request({
url: '/api/pcsIfPurchaseorder/getDemandDtl',
method: 'post',
data
})
}
export function getSemiRealCode(data) {
return request({
url: '/api/pcsIfPurchaseorder/getSemiRealCode',
method: 'post',
data
})
}
export function commit(data) {
return request({
url: '/api/pcsIfPurchaseorder/commit',
method: 'post',
data
})
return request({
url: '/api/pcsIfPurchaseorder/commit',
method: 'post',
data
})
}
export function excelImport(data) {
return request({
url: '/api/pcsIfPurchaseorder/excelImport',
method: 'post',
data
})
return request({
url: '/api/pcsIfPurchaseorder/excelImport',
method: 'post',
data
})
}
export default {
add,
edit,
del,
confirm,
getDtl,
commit,
excelImport
add,
edit,
del,
confirm,
getDtl,
commit,
excelImport,
getSemiRealCode
}

83
mes/qd/src/views/wms/pcs/purchaseplan/AddDialog.vue
View File

@@ -1,14 +1,14 @@
<!--suppress ALL -->
<template>
<el-dialog
:before-close="crud.cancelCU"
:title="crud.status.title"
:visible.sync="crud.status.cu > 0 || crud.status.view > 0"
append-to-body
fullscreen
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0 || crud.status.view > 0"
width="1200px"
@open="open"
@close="close"
@open="open"
>
<el-row v-show="crud.status.cu > 0" :gutter="20" style="margin-bottom: 5px;">
<el-col :span="20" style="border: 1px solid white">
@@ -17,9 +17,9 @@
<el-col :span="4">
<span>
<el-button
:loading="crud.cu === 2"
icon="el-icon-check"
size="mini"
:loading="crud.cu === 2"
type="primary"
@click="crud.submitCU"
>保存</el-button>
@@ -29,24 +29,24 @@
</el-row>
<el-form
ref="form"
v-show="false"
style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
ref="form"
:inline="true"
:model="form"
:rules="rules"
size="mini"
label-width="85px"
label-suffix=":"
label-width="85px"
size="mini"
style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
>
<el-form-item label="车间" prop="workshop_id">
<label slot="label">车间</label>
<el-select
v-model="form.workshop_id"
clearable
size="mini"
placeholder="全部"
class="filter-item"
clearable
placeholder="全部"
size="mini"
>
<el-option
v-for="item in dict.product_area"
@@ -57,25 +57,25 @@
</el-select>
</el-form-item>
<el-form-item label="物料编码" prop="material_code">
<el-input v-model.trim="form.material_code" disabled class="input-with-select" style="width: 370px;">
<el-input v-model.trim="form.material_code" class="input-with-select" disabled style="width: 370px;">
<el-button slot="append" icon="el-icon-search" @click="insertEvent"/>
</el-input>
</el-form-item>
<el-form-item label="物料名称" prop="material_name">
<label slot="label">物料名称:</label>
<el-input v-model="form.material_name" size="mini" disabled style="width: 210px"/>
<el-input v-model="form.material_name" disabled size="mini" style="width: 210px"/>
</el-form-item>
<el-form-item label="明细数" prop="detail_count">
<label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
<el-input v-model="form.detail_count" size="mini" disabled style="width: 210px"/>
<el-input v-model="form.detail_count" disabled size="mini" 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.number="form.total_qty"
:controls="false"
:precision="3"
:min="0"
:precision="3"
disabled
style="width: 210px"
/>
@@ -84,10 +84,10 @@
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
<el-input
v-model="form.remark"
style="width: 380px;"
rows="2"
type="textarea"
:disabled="crud.status.view > 0"
rows="2"
style="width: 380px;"
type="textarea"
/>
</el-form-item>
</el-form>
@@ -96,45 +96,50 @@
<el-table
ref="table"
:data="form.tableData"
style="width: 100%;"
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
border
style="width: 100%;"
>
<el-table-column type="index" label="序号" width="55" align="center"/>
<el-table-column prop="ask_time" label="要求到货日期" width="150"/>
<el-table-column prop="material_code" label="物料编码" width="150"/>
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称"/>
<el-table-column prop="qty" label="需求数量" width="100"/>
<el-table-column prop="qty_unit_name" label="数量单位" width="100"/>
<el-table-column prop="ask_time" label="确认到货日期" width="250">
<el-table-column align="center" label="序号" type="index" width="55"/>
<el-table-column label="要求到货日期" prop="ask_time" width="150"/>
<el-table-column label="物料编码" prop="material_code" width="150"/>
<el-table-column label="物料名称" prop="material_name" show-overflow-tooltip/>
<el-table-column label="需求数量" prop="show_qty" width="100"/>
<el-table-column label="数量单位" prop="qty_unit_name" show-overflow-tooltip>
<template scope="scope">
KG
</template>
</el-table-column>
<el-table-column label="确认到货日期" prop="ask_time" width="250">
<template slot-scope="scope">
<el-date-picker
v-model="form.tableData[scope.$index].agree_time"
type="date"
placeholder="选择日期"
align="center"
value-format="yyyy-MM-dd"
:disabled="crud.status.view > 0"
align="center"
placeholder="选择日期"
type="date"
value-format="yyyy-MM-dd"
/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="po_code" label="采购订单">
<el-table-column label="采购订单" prop="po_code" show-overflow-tooltip>
<template slot-scope="scope">
<el-input
v-model="form.tableData[scope.$index].po_code"
size="small"
:controls="false"
controls-position="right"
size="small"
/>
</template>
</el-table-column>
<!-- <el-table-column show-overflow-tooltip prop="safe_qty" label="安全库存"/>-->
<!-- <el-table-column show-overflow-tooltip prop="remark" label="总需求数量"/>-->
<!-- <el-table-column show-overflow-tooltip prop="safe_qty" label="安全库存"/>-->
<!-- <el-table-column show-overflow-tooltip prop="remark" label="总需求数量"/>-->
</el-table>
<MaterDtl
:dialog-show.sync="materShow"
:is-single="true"
:mater-opt-code="10"
@setMaterValue="tableChanged"
/>
@@ -142,9 +147,9 @@
</template>
<script>
import CRUD, {crud, form} from '@crud/crud'
import CRUD, { crud, form } from '@crud/crud'
import MaterDtl from '@/views/wms/pub/MaterDialog'
import crudPurchase from '@/views/wms/pcs/purchaseorder/purchase'
import crudPurchase from '@/views/wms/pcs/purchaseplan/purchase'
const defaultForm = {
product_code: '',
@@ -156,13 +161,13 @@ const defaultForm = {
qty_unit_name: '',
total_qty: 0,
detail_count: '0',
workshop_id: '',
workshop_id: 'A1',
tableData: []
}
export default {
name: 'AddDialog',
components: {MaterDtl},
components: { MaterDtl },
mixins: [crud(), form(defaultForm)],
dicts: ['IO_BILL_STATUS', 'ST_INV_RAW_IN_TYPE', 'ST_QUALITY_SCODE', 'bill_type', 'product_area'],
methods: {

20
mes/qd/src/views/wms/pcs/purchaseplan/index.vue
View File

@@ -51,7 +51,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.IO_BILL_STATUS"
v-for="item in dict.PURCHASE_STATUS"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -69,7 +69,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_CREATE"
v-for="item in dict.ST_CREATE_MODE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -150,8 +150,8 @@
<el-table-column show-overflow-tooltip prop="workshop_id" label="车间"/>
<el-table-column show-overflow-tooltip prop="material_code" width="130" label="物料编号"/>
<el-table-column show-overflow-tooltip prop="material_name" width="130" label="物料名称"/>
<el-table-column prop="ask_time" label="要求到货日期" width="130" show-overflow-tooltip/>
<el-table-column show-overflow-tooltip prop="qty" min-width="120" label="重量"/>
<el-table-column prop="askTime" label="要求到货日期" width="130" show-overflow-tooltip/>
<el-table-column show-overflow-tooltip prop="show_qty" min-width="120" label="重量"/>
<el-table-column show-overflow-tooltip prop="agree_time" min-width="120" label="确认交货日期"/>
<el-table-column show-overflow-tooltip prop="po_code" min-width="120" label="订单编号"/>
<el-table-column show-overflow-tooltip prop="instor_qty" min-width="120" label="入库重量"/>
@@ -159,9 +159,9 @@
<!-- <el-table-column label="总重量" align="center" prop="total_qty"/>-->
<el-table-column label="状态" align="center" prop="status" :formatter="stateFormat"/>
<el-table-column label="备注" align="center" prop="remark"/>
<el-table-column label="生成方式" align="center" prop="create_mode" :formatter="createModeFormat"/>
<el-table-column label="生成方式" align="center" prop="create_mode" :formatter="createModeFormat" min-width="100" />
<el-table-column label="创建人" align="center" prop="create_name" width="150"/>
<el-table-column label="创建时间" align="center" prop="create_time" width="150"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="150"/>
<el-table-column label="提交人" align="center" prop="audit_name" width="150"/>
<el-table-column label="提交时间" align="center" prop="audit_time" width="140px"/>
<el-table-column label="采购确认人" align="center" prop="purchase_name" width="150"/>
@@ -244,8 +244,8 @@ export default {
})
},
methods: {
getSummaries(param) {
const {columns, data} = param;
getSummaries(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
@@ -253,7 +253,7 @@ export default {
return;
}
const values = data.map(item => Number(item[column.property]));
if (column.property === 'qty' || column.property === 'instor_qty') {
if (column.property === 'show_qty' || column.property === 'instor_qty') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
@@ -262,7 +262,7 @@ export default {
return prev;
}
}, 0);
sums[index] += ' KG';
sums[index] = sums[index].toFixed(3) + ' KG';
}
});
return sums;

72
mes/qd/src/views/wms/pcs/purchaseplan/purchase.js
View File

@@ -1,58 +1,58 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: '/api/pcsIfPurchaseorder',
method: 'post',
data
})
return request({
url: '/api/pcsIfPurchaseorder',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: '/api/pcsIfPurchaseorder/delete',
method: 'post',
data: ids
})
return request({
url: '/api/pcsIfPurchaseorder/delete',
method: 'post',
data: ids
})
}
export function edit(data) {
return request({
url: '/api/pcsIfPurchaseorder/update',
method: 'post',
data
})
return request({
url: '/api/pcsIfPurchaseorder/update',
method: 'post',
data
})
}
export function confirm(data) {
return request({
url: '/api/pcsIfPurchaseorder/confirm',
method: 'post',
data
})
return request({
url: '/api/pcsIfPurchaseorder/confirm',
method: 'post',
data
})
}
export function getDtl(data) {
return request({
url: '/api/pcsIfPurchaseorder/getDtl',
method: 'post',
data
})
return request({
url: '/api/pcsIfPurchaseorder/getDtl',
method: 'post',
data
})
}
export function commit(data) {
return request({
url: '/api/pcsIfPurchaseorder/commit',
method: 'post',
data
})
return request({
url: '/api/pcsIfPurchaseorder/commit',
method: 'post',
data
})
}
export default {
add,
edit,
del,
confirm,
getDtl,
commit
add,
edit,
del,
confirm,
getDtl,
commit
}

52
mes/qd/src/views/wms/pcs/saleorder/Dialog.vue
View File

@@ -1,6 +1,6 @@
<template>
<el-dialog
title="销售订单导入"
title="aps提交"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
@@ -13,6 +13,15 @@
<div>
<!-- 搜索 -->
<el-form ref="form" :model="form1" :rules="rules" size="mini" label-width="110px">
<el-form-item label="订单阶段:" prop="bill_code">
<el-select v-model="form.bill_type" style="width: 350px;">
<el-option label="前段" value="2"/>
<el-option label="后段" value="3"/>
</el-select>
</el-form-item>
<el-form-item label="日期区间：" prop="createTime">
<el-date-picker
v-model="form.createTime"
@@ -22,9 +31,13 @@
end-placeholder="结束日期"
/>
</el-form-item>
<el-form-item label="销售订单号:" prop="bill_code">
<!-- <el-form-item label="销售订单号:" prop="bill_code">
<el-input v-model="form.bill_code" style="width: 350px;"/>
</el-form-item>
</el-form-item> -->
</el-form>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="queryStruct">确认
</el-button>
@@ -35,15 +48,15 @@
<script>
import CRUD, {header, presenter} from '@crud/crud'
import CRUD, { header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker/index'
import crudSap from '@/api/wms/ext/sap'
import crudSaleOrder from '@/views/wms/pcs/saleorder/saleOrder'
export default {
name: 'importOrder',
components: {rrOperation, pagination, DateRangePicker},
components: { rrOperation, pagination, DateRangePicker },
cruds() {
},
mixins: [presenter(), header()],
@@ -57,7 +70,7 @@ export default {
return {
fullscreenLoading: false,
dialogVisible: false,
form: {}
form: { bill_type: '2' }
}
},
watch: {
@@ -74,18 +87,37 @@ export default {
this.$emit('tableChanged', this.rows)
},
queryStruct() {
// 校验开始日期和结束日期是否为空
if (!this.form.createTime || !this.form.createTime[0] || !this.form.createTime[1]) {
this.showErrorNotification('请选择日期区间')
return
}
// 校验销售订单号值是否为空
if (!this.form.bill_type) {
this.showErrorNotification('请选择订单阶段')
return
}
this.fullscreenLoading = true
if (this.form.createTime) {
this.form.date_begin = this.form.createTime[0]
this.form.date_end = this.form.createTime[1]
}
crudSap.getSaleOrder(this.form).then(res => {
this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS)
crudSaleOrder.submit(this.form).then(res => {
this.crud.notify('提交成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.fullscreenLoading = false
this.dialogVisible = false
this.form = {} // 清空表单数据
}).catch(() => {
this.fullscreenLoading = false
})
},
showErrorNotification: function(message) {
this.crud.notify(message, CRUD.NOTIFICATION_TYPE.ERROR)
this.fullscreenLoading = false
},
showSuccessNotification: function(message) {
this.crud.notify(message, CRUD.NOTIFICATION_TYPE.SUCCESS)
this.fullscreenLoading = false
}
}
}

26
mes/qd/src/views/wms/pcs/saleorder/UploadDialog.vue
View File

@@ -1,27 +1,27 @@
<template>
<el-dialog
title="导入Excel文件"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
width="400px"
:show-close="true"
:visible.sync="dialogVisible"
append-to-body
destroy-on-close
title="导入Excel文件"
width="400px"
@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"
:limit="1"
:multiple="false"
:on-change="uploadByJsqd"
:on-exceed="is_one"
:show-file-list="true"
accept=".xlsx,.xls"
action=""
class="upload-demo"
drag
>
<i class="el-icon-upload" />
<div class="el-upload__text">

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

@@ -68,8 +68,19 @@
placeholder="请选择"
/>
</el-form-item>
<rrOperation :crud="crud" />
<rrOperation :crud="crud"/>
</el-form>
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
@click="deleteApsData"
>
清空测试数据
</el-button>
</div>
<crudOperation :permission="permission">
<el-button
@@ -82,7 +93,8 @@
>
导入
</el-button>
<!-- <el-button
<el-button
slot="right"
class="filter-item"
type="success"
@@ -90,8 +102,8 @@
size="mini"
@click="importin"
>
同步
</el-button> -->
aps提交
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog
@@ -110,7 +122,9 @@
>
<el-form-item label="车间" prop="product_area">
<!-- unit_list-->
<el-select v-model="form.product_area" placeholder="">
<el-select v-model="form.product_area" :disabled="crud.status.edit > 0 || crud.status.view > 0"
placeholder=""
>
<el-option
v-for="item in dict.product_area"
:key="item.value"
@@ -120,16 +134,16 @@
</el-select>
</el-form-item>
<el-form-item label="销售单号" prop="sale_code">
<el-input v-model="form.sale_code" style="width: 200px;" />
<el-input v-model="form.sale_code" :disabled="crud.status.edit > 0 || crud.status.view > 0"
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 label="合同号" prop="contract_code">
<el-input v-model="form.contract_code" :disabled="crud.status.edit > 0 || crud.status.view > 0"
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-form-item label="计量单位" prop="unit_name">
<el-select v-model="form.qty_unit_id" placeholder="">
<el-option
v-for="item in unit_list"
@@ -138,11 +152,13 @@
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="物料编码" prop="material_code">
<el-input v-model="form.material_code" style="width: 200px;" />
<el-input v-model="form.material_code" :disabled="crud.status.edit > 0 || crud.status.view > 0"
style="width: 200px;"
/>
</el-form-item>
<el-form-item label="客户名称" prop="cust_name">
<!-- <el-form-item label="客户名称" prop="cust_name">
<el-select v-model="form.cust_code" placeholder="">
<el-option
v-for="item in customer_list"
@@ -151,9 +167,20 @@
:value="item.value"
/>
</el-select>
</el-form-item> -->
<el-form-item label="计划交期时间" prop="plandeliver_date">
<el-date-picker
v-model="form.plandeliverDate"
value-format="yyyy-MM-dd"
type="date"
style="width: 200px;"
/>
<el-form-item label="订单数量" prop="sale_qty">
<el-input-number v-model="form.sale_qty" style="width: 200px;"/>
</el-form-item>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" style="width: 200px;" />
<el-input v-model="form.remark" style="width: 200px;"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -162,7 +189,8 @@
:loading="crud.cu === 2"
type="primary"
@click="crud.submitCU"
>确认</el-button>
>确认
</el-button>
</div>
</el-dialog>
<!--表格渲染-->
@@ -174,7 +202,7 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column type="selection" width="55"/>
<el-table-column
prop="sale_code"
label="销售单号"
@@ -182,26 +210,20 @@
show-overflow-tooltip
/>
<el-table-column
prop="seq_no"
label="销售单行号"
min-width="100"
show-overflow-tooltip
/>
<!-- <el-table-column prop="seq_no" label="明细序号" /> -->
<el-table-column
prop="sale_type"
label="销售单类型"
prop="seq_no"
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="seq_no" label="明细序号" /> -->
<el-table-column prop="contract_code" label="合同号" :min-width="flexWidth('contract_code', crud.data, '合同号')" />
<el-table-column prop="contract_code" label="合同号"
:min-width="flexWidth('contract_code', crud.data, '合同号')"
/>
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code', crud.data, '物料编码')" />
<el-table-column prop="material_code" label="物料编码"
:min-width="flexWidth('material_code', crud.data, '物料编码')"
/>
<el-table-column
prop="material_spec"
@@ -222,7 +244,7 @@
</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"
@@ -230,76 +252,106 @@
show-overflow-tooltip
min-width="80"
/>
<el-table-column prop="status" label="状态">
<el-table-column
prop="plandeliverDate"
label="前段计划交期"
min-width="100"
show-overflow-tooltip
/>
<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="plandeliverDate"
label="计划交期"
prop="behindPlandeliverDate"
label="后段计划交期"
min-width="100"
show-overflow-tooltip
/>
<el-table-column prop="behind_submit_flag" label="后段状态">
<template slot-scope="scope">
{{ dict.label.PCS_SALE_STATUS[scope.row.behind_submit_flag] }}
</template>
</el-table-column>
<el-table-column
prop="early_start_time"
label="最早开始时间"
min-width="100"
prop="rawmaterial_name"
label="原材料信息"
:min-width="flexWidth('rawmaterial_name', crud.data, '原材料信息')"
show-overflow-tooltip
/>
<el-table-column prop="create_name" label="创建人" />
<el-table-column
prop="createTime"
label="创建时间"
:min-width="flexWidth('createTime', crud.data, '创建时间')"
prop="rate_qty"
label="单重"
:min-width="flexWidth('rate_qty', crud.data, '单重')"
show-overflow-tooltip
/>
<el-table-column
prop="canuse_qty"
label="原材料库存"
:min-width="flexWidth('canuse_qty', crud.data, '原材料库存')"
show-overflow-tooltip
/>
<!-- <el-table-column-->
<!-- prop="early_start_time"-->
<!-- label="最早开始时间"-->
<!-- min-width="100"-->
<!-- show-overflow-tooltip-->
<!-- />-->
<el-table-column
prop="product_qty"
label="生产数量"
:min-width="flexWidth('product_qty', crud.data, '生产数量')"
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="create_mode" label="生成方式" min-width="100">
<template slot-scope="scope">
{{ dict.label.ST_CREATE_MODE[scope.row.create_mode] }}
</template>
</el-table-column>
<el-table-column prop="create_name" label="创建人"/>
<el-table-column
prop="createTime"
label="创建时间"
:min-width="flexWidth('createTime', crud.data, '创建时间')"
/>
<el-table-column prop="update_time" label="修改时间"
:min-width="flexWidth('update_time',crud.data,'修改时间')"
/>
<el-table-column
prop="remark"
label="备注"
show-overflow-tooltip
min-width="200"
/>
<!-- <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">
<!-- <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
/>
</template>
</el-table-column>-->
</el-table-column> -->
</el-table>
<!--分页组件-->
<pagination />
<pagination/>
</div>
<UploadDialog
:dialog-show.sync="uploadShow"
@tableChanged3="tableChanged3"
/>
<Dialog :dialog-show.sync="dialogShow" />
<Dialog :dialog-show.sync="dialogShow"/>
</div>
</template>
@@ -315,11 +367,13 @@ import pagination from '@crud/Pagination'
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'
import crudBigScreen from '@/api/wms/bigScreen/bigScreen'
const defaultForm = {
sale_id: null,
sale_code: null,
seq_no: null,
contract_code: null,
sale_type: null,
material_id: null,
status: null,
@@ -357,7 +411,7 @@ export default {
sort: 'sale_id,desc',
optShow: {
add: true,
edit: false,
edit: true,
del: false,
reset: true,
download: false
@@ -372,7 +426,11 @@ export default {
classes3: [],
uploadShow: false,
dialogShow: false,
permission: {},
permission: {
add: ['admin', 'roles:add'],
edit: ['admin', 'roles:edit'],
del: ['admin', 'roles:del']
},
queryTypeOptions: [{ key: 'sale_code', display_name: '销售单号' }]
}
},
@@ -440,6 +498,11 @@ export default {
this.classes3 = data
})
},
deleteApsData() {
crudSaleOrder.deleteTestData().then((res) => {
this.crud.notify('清空成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true

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

@@ -32,4 +32,18 @@ export function excelImport(data) {
})
}
export default { add, edit, del, excelImport }
export function submit(data) {
return request({
url: 'api/mpsSaleOrder/submit',
method: 'post',
data
})
}
export function deleteTestData() {
return request({
url: 'api/mpsSaleOrder/deleteTestData',
method: 'post'
})
}
export default { add, edit, del, excelImport, submit, deleteTestData }