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

rev:结构变更

Browse Source
This commit is contained in:
zhangzhiqiang
2023-07-09 10:21:13 +08:00
parent a37aaf90f3
commit 586436419b
116 changed files with 635 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@
</template>
<script>
import crudSaleOrder from '@/api/wms/pcs/saleOrder'
import crudSaleOrder from '@/views/wms/pcs/saleorder/saleOrder'
import CRUD, { crud } from '@crud/crud'
export default {

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

@@ -68,23 +68,6 @@
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>
@@ -116,9 +99,87 @@
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="500px"
width="1200px"
>
<el-form ref="form" :model="form" size="mini" label-width="80px" />
<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
@@ -168,11 +229,11 @@
{{ 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="create_name" label="创建人" />
@@ -209,7 +270,8 @@
</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'
@@ -243,7 +305,7 @@ const defaultForm = {
}
export default {
name: 'SaleOrder',
dicts: ['PCS_SALE_STATUS', 'PCS_SAL_TYPE', 'IS_OR_NOT'],
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() {
@@ -253,7 +315,7 @@ export default {
idField: 'sale_id',
sort: 'sale_id,desc',
optShow: {
add: false,
add: true,
edit: false,
del: false,
reset: true,
@@ -264,6 +326,10 @@ export default {
},
data() {
return {
unit_list: [
{value: 16, label: '个\\只'}
],
customer_list:[],
classes3: [],
uploadShow: false,
dialogShow: false,
@@ -275,6 +341,11 @@ export default {
this.initClass3()
},
methods: {
[CRUD.HOOK.beforeToAdd]() {
customerbase.selectList().then(res => {
this.customer_list = res.content
})
},
queryClassId() {
const param = {
class_idStr: this.class_idStr

35
mes/qd/src/views/wms/pcs/saleorder/saleOrder.js Normal file
View File

@@ -0,0 +1,35 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/mpsSaleOrder',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: 'api/mpsSaleOrder/',
method: 'delete',
data: ids
})
}
export function edit(data) {
return request({
url: 'api/mpsSaleOrder',
method: 'put',
data
})
}
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"

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

@@ -123,6 +123,44 @@
/>
</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="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="码盘模版" 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">
@@ -184,7 +222,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: {
@@ -256,9 +294,12 @@ 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 != null && JSON.stringify(this.form.package_ext).length>3){
this.form.package_ext = JSON.parse(this.form.package_ext)
}
},
formatBoolean: function(row, column) {
alert(row)

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

@@ -379,6 +379,18 @@
>{{ item.label }}
</el-radio>
</el-form-item>
<el-form-item v-show="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-show="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-show="form.workprocedure_id == '1535144822984282112'" label="是否翻转" prop="is_foreward">
<el-radio
v-for="item in dict.IS_OR_NOT"
@@ -433,12 +445,12 @@
>
<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 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_id }}</el-link>
<el-link type="warning" @click="toView(scope.row)">{{ scope.row.workorder_code }}</el-link>
</template>
</el-table-column>
<el-table-column prop="workorder_code" label="工单编号" width="85px" />
<el-table-column prop="workorder_status" label="工单状态">
<template slot-scope="scope">
{{ dict.label.MPS_BD_ORDERSTATUS[scope.row.workorder_status] }}
@@ -450,7 +462,7 @@
<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="materialCode" 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
@@ -630,6 +642,8 @@ export default {
},
data() {
return {
zxj: [ { value: 'A1_ZXJ_1', label: '一线1号装箱机' }, { value: 'A1_ZXJ_2', label: '一线2号装箱机' }],
cxj: [ { value: 'A1_KXJ_1', label: '一线1号拆箱机' }, { value: 'A1_KXJ_1', label: '一线2号拆箱机' }],
trueorfalse: [ { value: true, label: '是' }, { value: false, label: '否' }],
deviceList: [],
classes3: [],

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"