分切计划查询优化

This commit is contained in:
2023-02-07 10:16:31 +08:00
parent 97cbe9d5d2
commit a6b817d8ac
3 changed files with 165 additions and 61 deletions

View File

@@ -51,6 +51,10 @@ public class SlittingproductionplanServiceImpl implements Slittingproductionplan
String resource_name = MapUtil.getStr(whereJson, "resource_name");
String parent_container_name = MapUtil.getStr(whereJson, "parent_container_name");
String container_name = MapUtil.getStr(whereJson, "container_name");
String qzzno = MapUtil.getStr(whereJson, "qzzno");
String is_parent_ok = MapUtil.getStr(whereJson, "is_parent_ok");
String is_child_tz_ok = MapUtil.getStr(whereJson, "is_child_tz_ok");
String is_child_ps_ok = MapUtil.getStr(whereJson, "is_child_ps_ok");
String begin_time = MapUtil.getStr(whereJson, "begin_time");
String end_time = MapUtil.getStr(whereJson, "end_time");
@@ -61,9 +65,13 @@ public class SlittingproductionplanServiceImpl implements Slittingproductionplan
map.put("status", status);
map.put("begin_time", begin_time);
map.put("end_time", end_time);
map.put("is_parent_ok", is_parent_ok);
map.put("is_child_tz_ok", is_child_tz_ok);
map.put("is_child_ps_ok", is_child_ps_ok);
if (ObjectUtil.isNotEmpty(resource_name)) map.put("resource_name","%"+resource_name+"%");
if (ObjectUtil.isNotEmpty(parent_container_name)) map.put("parent_container_name","%"+parent_container_name+"%");
if (ObjectUtil.isNotEmpty(container_name)) map.put("container_name","%"+container_name+"%");
if (ObjectUtil.isNotEmpty(qzzno)) map.put("qzzno","%"+qzzno+"%");
JSONObject json = WQL.getWO("PDM_BI_SLIDTTINGPLAN_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "plan.container_name");
return json;

View File

@@ -22,6 +22,10 @@
输入.container_name TYPEAS s_string
输入.begin_time TYPEAS s_string
输入.end_time TYPEAS s_string
输入.qzzno TYPEAS s_string
输入.is_child_ps_ok TYPEAS s_string
输入.is_child_tz_ok TYPEAS s_string
输入.is_parent_ok TYPEAS s_string
[临时表]
@@ -82,6 +86,22 @@
plan.container_name like 输入.container_name
ENDOPTION
OPTION 输入.qzzno <> ""
plan.qzzno like 输入.qzzno
ENDOPTION
OPTION 输入.is_parent_ok <> ""
plan.is_parent_ok = 输入.is_parent_ok
ENDOPTION
OPTION 输入.is_child_tz_ok <> ""
plan.is_child_tz_ok = 输入.is_child_tz_ok
ENDOPTION
OPTION 输入.is_child_ps_ok <> ""
plan.is_child_ps_ok = 输入.is_child_ps_ok
ENDOPTION
OPTION 输入.begin_time <> ""
plan.manufacture_date >= 输入.begin_time
ENDOPTION

View File

@@ -87,6 +87,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="母卷号">
<label slot="label">&nbsp;&nbsp;&nbsp;&nbsp;:</label>
<el-input
v-model="query.parent_container_name"
clearable
@@ -111,8 +112,24 @@
</el-col>
</el-row>
<el-row>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="气涨轴">
<label slot="label">&nbsp;&nbsp;&nbsp;&nbsp;:</label>
<el-input
v-model="query.qzzno"
clearable
size="mini"
placeholder="气涨轴编号"
style="width: 250px"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
</el-col>
<el-form-item label="日期">
<label slot="label">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
<label slot="label">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
<el-date-picker
v-model="query.createTime"
type="daterange"
@@ -123,7 +140,65 @@
@change="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="母卷上料完成">
<el-select
v-model="query.is_parent_ok"
clearable
placeholder="母卷上料完成"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.IS_OR_NOT"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="子卷套轴完成">
<el-select
v-model="query.is_child_tz_ok"
clearable
placeholder="子卷套轴完成"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.IS_OR_NOT"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="子卷配送完成">
<el-select
v-model="query.is_child_ps_ok"
clearable
placeholder="子卷配送完成"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.IS_OR_NOT"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<rrOperation/>
</el-col>
</el-row>
</el-form>
@@ -181,137 +256,137 @@
<el-row>
<el-col :span="12">
<el-form-item label="订单类型" prop="order_type">
<el-input v-model="form.order_type" style="width: 370px;" />
<el-input v-model="form.order_type" style="width: 370px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="子卷号" prop="container_name">
<el-input v-model="form.container_name" style="width: 370px;" />
<el-input v-model="form.container_name" style="width: 370px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="产品编码" prop="product_name">
<el-input v-model="form.product_name" style="width: 370px;" />
<el-input v-model="form.product_name" style="width: 370px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="产品描述" prop="description">
<el-input v-model="form.description" style="width: 370px;" />
<el-input v-model="form.description" style="width: 370px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="来源母卷号" prop="parent_container_name">
<el-input v-model="form.parent_container_name" style="width: 370px;" />
<el-input v-model="form.parent_container_name" style="width: 370px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="改制来源子卷号" prop="restruct_container_name">
<el-input v-model="form.restruct_container_name" style="width: 370px;" />
<el-input v-model="form.restruct_container_name" style="width: 370px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="子卷立库木箱号" prop="package_box_sn">
<el-input v-model="form.package_box_sn" style="width: 370px;" />
<el-input v-model="form.package_box_sn" style="width: 370px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="来源卷位置" prop="ware_house">
<el-input v-model="form.ware_house" style="width: 370px;" />
<el-input v-model="form.ware_house" style="width: 370px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="分切机台编码" prop="resource_name">
<el-input v-model="form.resource_name" style="width: 370px;" />
<el-input v-model="form.resource_name" style="width: 370px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="分切组" prop="split_group">
<el-input v-model="form.split_group" style="width: 370px;" />
<el-input v-model="form.split_group" style="width: 370px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="生产顺序" prop="manufacture_sort">
<el-input v-model="form.manufacture_sort" style="width: 370px;" />
<el-input v-model="form.manufacture_sort" style="width: 370px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="生产订单" prop="mfg_order_name">
<el-input v-model="form.mfg_order_name" style="width: 370px;" />
<el-input v-model="form.mfg_order_name" style="width: 370px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="生产日期" prop="manufacture_date">
<el-input v-model="form.manufacture_date" style="width: 370px;" />
<el-input v-model="form.manufacture_date" style="width: 370px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="管件类型" prop="paper_tube_or_FRP">
<el-input v-model="form.paper_tube_or_FRP" style="width: 370px;" />
<el-input v-model="form.paper_tube_or_FRP" style="width: 370px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="纸筒物料编码" prop="paper_tube_material">
<el-input v-model="form.paper_tube_material" style="width: 370px;" />
<el-input v-model="form.paper_tube_material" style="width: 370px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="纸筒物料描述" prop="paper_tube_description">
<el-input v-model="form.paper_tube_description" style="width: 370px;" />
<el-input v-model="form.paper_tube_description" style="width: 370px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="FRP管物料编码" prop="FRP_material">
<el-input v-model="form.FRP_material" style="width: 370px;" />
<el-input v-model="form.FRP_material" style="width: 370px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="FRP管物料描述" prop="FRP_description">
<el-input v-model="form.FRP_description" style="width: 370px;" />
<el-input v-model="form.FRP_description" style="width: 370px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="FRP管规格" prop="FRP_model">
<el-input v-model="form.FRP_model" style="width: 370px;" />
<el-input v-model="form.FRP_model" style="width: 370px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="子卷幅宽" prop="split_breadth">
<el-input v-model="form.split_breadth" style="width: 370px;" />
<el-input v-model="form.split_breadth" style="width: 370px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="子卷理论长度" prop="split_height">
<el-input v-model="form.split_height" style="width: 370px;" />
<el-input v-model="form.split_height" style="width: 370px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="子卷理论重量" prop="split_weight">
<el-input v-model="form.split_weight" style="width: 370px;" />
<el-input v-model="form.split_weight" style="width: 370px;"/>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" />
<el-input v-model="form.remark" style="width: 370px;"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -320,40 +395,41 @@
</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-column type="selection" width="55" />
<el-table-column v-if="false" prop="workorder_id" label="分切计划标识" />
<el-table-column prop="status" label="状态" :formatter="formatStatusName" />
<el-table-column prop="order_type" label="订单类型" :formatter="formatTypeName" />
<el-table-column prop="mfg_order_name" label="订单" min-width="140" show-overflow-tooltip />
<el-table-column prop="container_name" label="子卷" min-width="140" show-overflow-tooltip />
<el-table-column prop="parent_container_name" label="卷号" min-width="120" show-overflow-tooltip />
<el-table-column prop="ware_house" label="来源位置" :formatter="formatHouseName" width="120px" />
<el-table-column prop="restruct_container_name" label="改制来源子卷号" width="120px" />
<el-table-column prop="package_box_sn" label="改制来源子卷木箱" width="150px" />
<el-table-column prop="resource_name" label="机台编码" min-width="110" show-overflow-tooltip />
<el-table-column prop="point_code" label="点位" min-width="110" show-overflow-tooltip />
<el-table-column prop="product_name" label="产品编码" min-width="130" show-overflow-tooltip />
<el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="split_group" label="分切组" />
<el-table-column prop="manufacture_sort" label="生产顺序" />
<el-table-column prop="manufacture_date" label="生产日期" width="120px" />
<el-table-column prop="split_breadth" label="子卷幅宽" :formatter="crud.formatNum3" />
<el-table-column prop="split_height" label="子卷理论长度" width="100px" :formatter="crud.formatNum3" />
<el-table-column prop="split_weight" label="子卷理论重量" width="100px" :formatter="crud.formatNum3" />
<el-table-column prop="paper_tube_or_frp" label="管件类型" :formatter="formatTubeName" />
<el-table-column prop="paper_tube_material" label="纸筒物料编码" min-width="140" show-overflow-tooltip />
<el-table-column prop="paper_tube_description" label="纸筒物料描述" width="120px" show-overflow-tooltip />
<el-table-column prop="paper_tube_model" label="纸筒规格" min-width="140" show-overflow-tooltip />
<el-table-column prop="frp_material" label="FRP管物料编码" min-width="140" show-overflow-tooltip />
<el-table-column prop="frp_description" label="FRP管物料描述" min-width="140" show-overflow-tooltip />
<el-table-column prop="frp_model" label="FRP管规格" min-width="140" show-overflow-tooltip />
<el-table-column prop="is_parent_ok" label="母卷上料完成" width="100px" :formatter="formatParentName" />
<el-table-column prop="is_child_tz_ok" label="子卷套轴完成" width="100px" :formatter="formatChildName" />
<el-table-column prop="is_child_ps_ok" label="子卷配送完成" width="100px" :formatter="formatChildPsName" />
<el-table-column prop="qzzno" label="气涨轴编码" width="100px" />
<el-table-column prop="start_time" label="开始时间" width="150px" />
<el-table-column prop="end_time" label="结束时间" width="150px" />
<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 v-if="false" prop="workorder_id" label="分切计划标识"/>
<el-table-column prop="status" label="状态" :formatter="formatStatusName"/>
<el-table-column prop="order_type" label="订单类型" :formatter="formatTypeName"/>
<el-table-column prop="mfg_order_name" label="订单" min-width="140" show-overflow-tooltip/>
<el-table-column prop="container_name" label="卷号" min-width="140" show-overflow-tooltip/>
<el-table-column prop="parent_container_name" label="母卷号" min-width="120" show-overflow-tooltip/>
<el-table-column prop="ware_house" label="来源位置" :formatter="formatHouseName" width="120px"/>
<el-table-column prop="restruct_container_name" label="改制来源子卷号" width="120px"/>
<el-table-column prop="package_box_sn" label="改制来源子卷木箱号" width="150px"/>
<el-table-column prop="resource_name" label="机台编码" min-width="110" show-overflow-tooltip/>
<el-table-column prop="point_code" label="点位" min-width="110" show-overflow-tooltip/>
<el-table-column prop="product_name" label="产品编码" min-width="130" show-overflow-tooltip/>
<el-table-column prop="product_area" label="生产区域"/>
<el-table-column prop="split_group" label="分切组"/>
<el-table-column prop="manufacture_sort" label="生产顺序"/>
<el-table-column prop="manufacture_date" label="生产日期" width="120px"/>
<el-table-column prop="split_breadth" label="子卷幅宽" :formatter="crud.formatNum3"/>
<el-table-column prop="split_height" label="子卷理论长度" width="100px" :formatter="crud.formatNum3"/>
<el-table-column prop="split_weight" label="子卷理论重量" width="100px" :formatter="crud.formatNum3"/>
<el-table-column prop="paper_tube_or_frp" label="管件类型" :formatter="formatTubeName"/>
<el-table-column prop="paper_tube_material" label="纸筒物料编码" min-width="140" show-overflow-tooltip/>
<el-table-column prop="paper_tube_description" label="纸筒物料描述" width="120px" show-overflow-tooltip/>
<el-table-column prop="paper_tube_model" label="纸筒规格" min-width="140" show-overflow-tooltip/>
<el-table-column prop="frp_material" label="FRP管物料编码" min-width="140" show-overflow-tooltip/>
<el-table-column prop="frp_description" label="FRP管物料描述" min-width="140" show-overflow-tooltip/>
<el-table-column prop="frp_model" label="FRP管规格" min-width="140" show-overflow-tooltip/>
<el-table-column prop="is_parent_ok" label="母卷上料完成" width="100px" :formatter="formatParentName"/>
<el-table-column prop="is_child_tz_ok" label="子卷套轴完成" width="100px" :formatter="formatChildName"/>
<el-table-column prop="is_child_ps_ok" label="子卷配送完成" width="100px" :formatter="formatChildPsName"/>
<el-table-column prop="qzzno" label="气涨轴编码" width="100px"/>
<el-table-column prop="start_time" label="开始时间" width="150px"/>
<el-table-column prop="end_time" label="结束时间" width="150px"/>
<!-- <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -364,7 +440,7 @@
</el-table-column>-->
</el-table>
<!--分页组件-->
<pagination />
<pagination/>
</div>
</div>
</template>
@@ -422,7 +498,7 @@ const defaultForm = {
}
export default {
name: 'Slittingproductionplan',
dicts: ['product_area', 'order_type', 'cut_product_status', 'IS_OR_NOT', 'ware_house', 'paper_tube_or_frp'],
dicts: ['product_area', 'order_type', 'cut_product_status', 'ware_house', 'paper_tube_or_frp', 'IS_OR_NOT'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {