diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dto/MaterialQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dto/MaterialQuery.java index d03d0a0..ba6c895 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dto/MaterialQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dto/MaterialQuery.java @@ -14,6 +14,8 @@ public class MaterialQuery implements Serializable { private String productName; //供应商编码 private String productDescription; + //客户来料批次号 + private String ingotBatch; //供应商名称 private String supplierCode; //绑定状态 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/impl/MaterialServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/impl/MaterialServiceImpl.java index 6b053c9..47eb7f5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/impl/MaterialServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/impl/MaterialServiceImpl.java @@ -40,7 +40,7 @@ public class MaterialServiceImpl extends ServiceImpl 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); diff --git a/lms/nladmin-ui/src/views/wms/sch/material/index.vue b/lms/nladmin-ui/src/views/wms/sch/material/index.vue index b830407..91592c6 100644 --- a/lms/nladmin-ui/src/views/wms/sch/material/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/material/index.vue @@ -24,7 +24,7 @@ v-model="query.lotSN" clearable size="mini" - placeholder="物料条码号" + placeholder="例KNDR24CA1037141NSD" @keyup.enter.native="crud.toQuery" /> @@ -55,21 +55,14 @@ @keyup.enter.native="crud.toQuery" /> - - + - - + placeholder="例YBDK241219N183.75-18" + @keyup.enter.native="crud.toQuery" + /> +