opt:原材料入库信息查询加 来料批次条件
This commit is contained in:
@@ -14,6 +14,8 @@ public class MaterialQuery implements Serializable {
|
||||
private String productName;
|
||||
//供应商编码
|
||||
private String productDescription;
|
||||
//客户来料批次号
|
||||
private String ingotBatch;
|
||||
//供应商名称
|
||||
private String supplierCode;
|
||||
//绑定状态
|
||||
|
||||
@@ -40,7 +40,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
|
||||
wrapper.like(StringUtils.isNotBlank(whereJson.getProductName()),Material::getProductName,whereJson.getProductName());
|
||||
wrapper.like(StringUtils.isNotBlank(whereJson.getSupplierCode()),Material::getSupplierCode,whereJson.getSupplierCode());
|
||||
wrapper.like(StringUtils.isNotBlank(whereJson.getProductDescription()),Material::getProductDescription,whereJson.getProductDescription());
|
||||
wrapper.eq(StringUtils.isNotBlank(whereJson.getGroup_bind_material_status()),Material::getGroup_bind_material_status,whereJson.getGroup_bind_material_status());
|
||||
wrapper.like(StringUtils.isNotBlank(whereJson.getIngotBatch()),Material::getIngotBatch,whereJson.getIngotBatch());
|
||||
wrapper.eq(StringUtils.isNotBlank(whereJson.getReturn_status()),Material::getReturn_status,whereJson.getReturn_status());
|
||||
wrapper.orderByDesc(Material::getCreate_time);
|
||||
pages = materialMapper.selectPage(pages, wrapper);
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
v-model="query.lotSN"
|
||||
clearable
|
||||
size="mini"
|
||||
placeholder="物料条码号"
|
||||
placeholder="例KNDR24CA1037141NSD"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
@@ -55,21 +55,14 @@
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="绑定状态">
|
||||
<el-select
|
||||
v-model="query.group_bind_material_status"
|
||||
<el-form-item label="来料批次号">
|
||||
<el-input
|
||||
v-model="query.ingotBatch"
|
||||
clearable
|
||||
size="mini"
|
||||
placeholder="绑定状态"
|
||||
class="filter-item"
|
||||
@change="crud.toQuery"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dict.group_bind_material_status"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
placeholder="例YBDK241219N183.75-18"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="回传状态">
|
||||
<el-select
|
||||
@@ -108,6 +101,7 @@
|
||||
<el-table-column prop="specification" label="规格" :min-width="flexWidth('specification',crud.data,'规格')" />
|
||||
<el-table-column prop="batch" label="批次号" :min-width="flexWidth('batch',crud.data,'批次号')" />
|
||||
<el-table-column prop="qty" label="数量" :min-width="flexWidth('qty',crud.data,'数量')" />
|
||||
<el-table-column prop="ingotBatch" label="来料批次号" :min-width="flexWidth('ingotBatch',crud.data,'来料批次号')" />
|
||||
<el-table-column prop="incomingLength" label="来料长度" :min-width="flexWidth('incomingLength',crud.data,'来料长度')" />
|
||||
<el-table-column prop="incomingWeight" label="来料重量" :min-width="flexWidth('incomingWeight',crud.data,'来料重量')" />
|
||||
<el-table-column prop="incomingchipping" label="来料缺陷长度" :min-width="flexWidth('incomingchipping',crud.data,'来料缺陷长度')" />
|
||||
|
||||
Reference in New Issue
Block a user