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

add:订单新增生产数量等字段；

Browse Source 
fix：修复相同订单号相同品目相同交期合并订单无订单号时的bug。
This commit is contained in:
baoge
2023-10-08 13:25:08 +08:00
parent 418b40f683
commit ee24ae7c2a
9 changed files with 244 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,7 +103,7 @@
<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="要求到货日期" prop="askTime" show-overflow-tooltip width="150"/>
<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"/>-->

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

@@ -151,7 +151,7 @@
<el-table-column :formatter="workshopFormat" label="车间" prop="workshop_id" show-overflow-tooltip/>
<el-table-column label="物料编号" prop="material_code" show-overflow-tooltip width="130"/>
<el-table-column label="物料名称" prop="material_name" show-overflow-tooltip width="130"/>
<el-table-column label="要求到货日期" prop="askTime" show-overflow-tooltip width="130"/>
<el-table-column label="要求到货日期" prop="askTime" show-overflow-tooltip width="150"/>
<el-table-column label="重量" min-width="120" prop="show_qty" show-overflow-tooltip/>
<el-table-column label="确认交货日期" min-width="120" prop="agree_time" show-overflow-tooltip/>
<el-table-column label="订单编号" min-width="120" prop="po_code" show-overflow-tooltip/>

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

@@ -1,18 +1,18 @@
<template>
<el-dialog
title="aps提交"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
:show-close="true"
width="500px"
v-loading.fullscreen.lock="fullscreenLoading"
:show-close="true"
:visible.sync="dialogVisible"
append-to-body
destroy-on-close
title="aps提交"
width="500px"
@close="close"
>
<div class="head-container">
<div>
<!-- 搜索 -->
<el-form ref="form" :model="form1" :rules="rules" size="mini" label-width="110px">
<el-form ref="form" :model="form1" :rules="rules" label-width="110px" size="mini">
<el-form-item label="订单阶段:" prop="bill_code">
@@ -22,13 +22,13 @@
</el-select>
</el-form-item>
<el-form-item label="日期区间：" prop="createTime">
<el-form-item label="订单交期：" prop="createTime">
<el-date-picker
v-model="form.createTime"
end-placeholder="结束日期"
start-placeholder="开始日期"
type="daterange"
value-format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期"
/>
</el-form-item>
@@ -39,7 +39,7 @@
</el-form>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="queryStruct">确认
<el-button class="filter-item" icon="el-icon-search" size="mini" type="success" @click="queryStruct">确认
</el-button>
</div>
</div>
@@ -89,7 +89,7 @@ export default {
queryStruct() {
// 校验开始日期和结束日期是否为空
if (!this.form.createTime || !this.form.createTime[0] || !this.form.createTime[1]) {
this.showErrorNotification('请选择日期区间')
this.showErrorNotification('请选择订单交期')
return
}
// 校验销售订单号值是否为空

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

@@ -8,46 +8,91 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
label-width="80px"
>
<el-form-item label="销售单号">
<el-input
v-model="query.sale_code"
class="filter-item"
clearable
placeholder="销售单号"
style="width: 200px;"
class="filter-item"
/>
</el-form-item>
<el-form-item label="物料搜索">
<el-input
v-model="query.material"
clearable
size="small"
placeholder="物料编码、名称或规格"
style="width: 200px;"
class="filter-item"
clearable
placeholder="物料编码、名称或规格"
size="small"
style="width: 200px;"
/>
</el-form-item>
<el-form-item label="订单交期">
<el-date-picker
v-model="query.planTime"
:default-time="['00:00:00', '23:59:59']"
end-placeholder="结束日期"
start-placeholder="开始日期"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
@change="crud.toQuery"
/>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="query.createTime"
:default-time="['00:00:00', '23:59:59']"
end-placeholder="结束日期"
start-placeholder="开始日期"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
<el-form-item label="单据类型">
<el-select
v-model="query.sale_type"
clearable
filterable
placeholder="请选择"
style="width: 200px"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.PCS_SAL_TYPE"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item label="生成方式">
<el-select
v-model="query.create_mode"
clearable
filterable
placeholder="请选择"
style="width: 200px"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_CREATE_MODE"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="状态">
<el-select
v-model="query.status"
style="width: 200px"
clearable
filterable
placeholder="请选择"
style="width: 200px"
@change="crud.toQuery"
>
<el-option
@@ -58,24 +103,24 @@
/>
</el-select>
</el-form-item>
<el-form-item label="产品系列">
<treeselect
v-model="query.product_series"
:options="classes3"
:auto-load-root-options="false"
:load-options="loadChildNodes"
style="width: 200px;"
placeholder="请选择"
/>
</el-form-item>
<!-- <el-form-item label="产品系列">-->
<!-- <treeselect-->
<!-- v-model="query.product_series"-->
<!-- :auto-load-root-options="false"-->
<!-- :load-options="loadChildNodes"-->
<!-- :options="classes3"-->
<!-- placeholder="请选择"-->
<!-- style="width: 200px;"-->
<!-- />-->
<!-- </el-form-item>-->
<rrOperation :crud="crud"/>
</el-form>
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
type="success"
@click="deleteApsData"
>
清空测试数据
@@ -86,9 +131,9 @@
<el-button
slot="right"
class="filter-item"
type="warning"
icon="el-icon-upload2"
size="mini"
type="warning"
@click="uploadShow = true"
>
导入
@@ -97,9 +142,9 @@
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
type="success"
@click="importin"
>
aps提交
@@ -107,10 +152,10 @@
</crudOperation>
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:close-on-click-modal="false"
:title="crud.status.title"
:visible.sync="crud.status.cu > 0"
width="1200px"
>
<el-form
@@ -122,8 +167,9 @@
>
<el-form-item label="车间" prop="product_area">
<!-- unit_list-->
<el-select v-model="form.product_area" :disabled="crud.status.edit > 0 || crud.status.view > 0"
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"
@@ -134,13 +180,15 @@
</el-select>
</el-form-item>
<el-form-item label="销售单号" prop="sale_code">
<el-input v-model="form.sale_code" :disabled="crud.status.edit > 0 || crud.status.view > 0"
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="contract_code">
<el-input v-model="form.contract_code" :disabled="crud.status.edit > 0 || crud.status.view > 0"
style="width: 200px;"
<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="unit_name">
@@ -154,8 +202,9 @@
</el-select>
</el-form-item> -->
<el-form-item label="物料编码" prop="material_code">
<el-input v-model="form.material_code" :disabled="crud.status.edit > 0 || crud.status.view > 0"
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">
@@ -171,9 +220,9 @@
<el-form-item label="计划交期时间" prop="plandeliver_date">
<el-date-picker
v-model="form.plandeliverDate"
value-format="yyyy-MM-dd"
type="date"
style="width: 200px;"
type="date"
value-format="yyyy-MM-dd"
/>
<el-form-item label="订单数量" prop="sale_qty">
<el-input-number v-model="form.sale_qty" style="width: 200px;"/>
@@ -204,76 +253,95 @@
>
<el-table-column type="selection" width="55"/>
<el-table-column
prop="sale_code"
label="销售单号"
min-width="100"
prop="sale_code"
show-overflow-tooltip
/>
<el-table-column
label="行号"
min-width="60"
prop="seq_no"
label="销售单行号"
min-width="100"
show-overflow-tooltip
/>
<!-- <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="material_code" label="物料编码"
:min-width="flexWidth('material_code', crud.data, '物料编码')"
<el-table-column
:min-width="flexWidth('contract_code', crud.data, '合同号')" label="合同号"
prop="contract_code"
/>
<el-table-column
:min-width="flexWidth('material_code', crud.data, '物料编码')" label="物料编码"
prop="material_code"
/>
<el-table-column
prop="material_spec"
label="物料规格"
:min-width="flexWidth('material_spec', crud.data, '物料规格')"
label="物料规格"
prop="material_spec"
/>
<el-table-column
prop="material_name"
label="物料名称"
:min-width="flexWidth('material_name', crud.data, '物料名称')"
show-overflow-tooltip
/>
<!-- <el-table-column-->
<!-- :min-width="flexWidth('material_name', crud.data, '物料名称')"-->
<!-- label="物料名称"-->
<!-- prop="material_name"-->
<!-- show-overflow-tooltip-->
<!-- />-->
<el-table-column prop="product_area" label="工段">
<el-table-column label="工段" prop="product_area">
<template slot-scope="scope">
{{ dict.label.product_area[scope.row.product_area] }}
</template>
</el-table-column>
<el-table-column prop="sale_qty" label="订单数量"/>
<el-table-column label="订单数量" min-width="80" prop="sale_qty"/>
<el-table-column label="需生产数量" min-width="88" prop="need_product_qty"/>
<el-table-column label="已生产数量" min-width="88" prop="product_qty"/>
<el-table-column label="刻字数量" prop="lettering_qty"/>
<el-table-column label="预入库数量" min-width="88" prop="instor_qty"/>
<el-table-column label="入库数量" prop="in_storage_qty"/>
<el-table-column label="发货数量" prop="sendout_qty"/>
<el-table-column
prop="qty_unit_name"
label="计量单位"
show-overflow-tooltip
min-width="80"
/>
<el-table-column
prop="plandeliverDate"
label="前段计划交期"
label="预入库交期"
min-width="100"
prop="warehousing_date"
show-overflow-tooltip
/>
<el-table-column prop="status" label="前段状态">
<el-table-column
label="计划交期"
min-width="100"
prop="plandeliverDate"
show-overflow-tooltip
/>
<el-table-column
label="订单交期"
min-width="100"
prop="order_date"
show-overflow-tooltip
/>
<el-table-column label="订单状态" prop="status">
<template slot-scope="scope">
{{ dict.label.PCS_SALE_STATUS[scope.row.status] }}
</template>
</el-table-column>
<el-table-column
prop="behindPlandeliverDate"
label="后段计划交期"
min-width="100"
label="计量单位"
min-width="80"
prop="qty_unit_name"
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-->
<!-- label="后段计划交期"-->
<!-- min-width="100"-->
<!-- prop="behindPlandeliverDate"-->
<!-- show-overflow-tooltip-->
<!-- />-->
<!-- <el-table-column label="后段状态" prop="behind_submit_flag">-->
<!-- <template slot-scope="scope">-->
<!-- {{ dict.label.PCS_SALE_STATUS[scope.row.behind_submit_flag] }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column
prop="rawmaterial_name"
@@ -282,9 +350,9 @@
show-overflow-tooltip
/>
<el-table-column
prop="rate_qty"
label="单重"
:min-width="flexWidth('rate_qty', crud.data, '单重')"
label="单重"
prop="rate_qty"
show-overflow-tooltip
/>
<el-table-column
@@ -292,6 +360,7 @@
label="原辅料库存"
:min-width="flexWidth('canuse_qty', crud.data, '原辅料库存')"
show-overflow-tooltip
width="90"
/>
<!-- <el-table-column-->
<!-- prop="early_start_time"-->
@@ -300,38 +369,34 @@
<!-- 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"
prop="sale_type"
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">
<el-table-column label="生成方式" min-width="100" prop="create_mode">
<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 label="创建人" prop="create_name"/>
<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,'修改时间')"
label="创建时间"
prop="createTime"
/>
<el-table-column
:min-width="flexWidth('update_time',crud.data,'修改时间')" label="修改时间"
prop="update_time"
/>
<el-table-column
prop="remark"
label="备注"
min-width="200"
prop="remark"
show-overflow-tooltip
min-width="200"
/>
@@ -358,7 +423,7 @@
<script>
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 CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import UploadDialog from '@/views/wms/pcs/saleorder/UploadDialog'