diff --git a/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java b/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java index 072fd49..bc48568 100644 --- a/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java +++ b/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java @@ -18,10 +18,6 @@ import com.huaheng.framework.web.page.TableDataInfo; import com.huaheng.framework.web.page.TableSupport; import com.huaheng.pc.config.material.domain.Material; import com.huaheng.pc.config.material.service.MaterialService; -import com.huaheng.pc.config.material.service.MaterialServiceImpl; -import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail; -import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService; -import com.huaheng.pc.inventory.inventoryTransaction.domain.InventoryTransaction; import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail; import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService; import io.swagger.annotations.Api; @@ -76,10 +72,10 @@ public class MaterialController extends BaseController { LambdaQueryWrapper<Material> lambda = Wrappers.lambdaQuery(); lambda.gt(StringUtils.isNotEmpty(createdBegin), Material::getCreated, createdBegin) .lt(StringUtils.isNotEmpty(createdEnd), Material::getCreated, createdEnd) - .eq(StringUtils.isNotEmpty(material.getCode()), Material::getCode, material.getCode()) - .like(StringUtils.isNotEmpty(material.getName()), Material::getName, material.getName()) + .like(StringUtils.isNotNull(material.getCode())&& StringUtils.isNotEmpty(material.getCode()), Material::getCode, material.getCode()) + .like(StringUtils.isNotNull(material.getName())&& StringUtils.isNotEmpty(material.getName()), Material::getName, material.getName()) .eq(StringUtils.isNotEmpty(material.getType()), Material::getType, material.getType()) - .like(StringUtils.isNotEmpty(material.getSpec()), Material::getSpec, material.getSpec()) + .like(StringUtils.isNotNull(material.getSpec())&& StringUtils.isNotEmpty(material.getSpec()), Material::getSpec, material.getSpec()) .eq(Material::getWarehouseCode, ShiroUtils.getWarehouseCode()) .eq(Material::getDeleted, false); diff --git a/src/main/resources/templates/config/material/material.html b/src/main/resources/templates/config/material/material.html index 06c5e8d..3f191ac 100644 --- a/src/main/resources/templates/config/material/material.html +++ b/src/main/resources/templates/config/material/material.html @@ -84,8 +84,19 @@ checkbox: true }, { + title: '操作', + align: 'center', + formatter: function(value, row, index) { + var actions = []; + // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> '); + actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>'); + return actions.join(''); + } + }, + { field : 'id', - title : 'id' + title : 'id', + visible: false }, { field : 'code', @@ -220,17 +231,8 @@ formatter: function(value, row, index) { return $.table.selectDictLabel(datas, value); } - }, - { - title: '操作', - align: 'center', - formatter: function(value, row, index) { - var actions = []; - // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> '); - actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>'); - return actions.join(''); - } - }] + } + ] }; $.table.init(options); }); diff --git a/src/main/resources/templates/config/materialType/materialType.html b/src/main/resources/templates/config/materialType/materialType.html index d1f1909..7f142a7 100644 --- a/src/main/resources/templates/config/materialType/materialType.html +++ b/src/main/resources/templates/config/materialType/materialType.html @@ -64,15 +64,16 @@ }, { field : 'id', - title : '编码' + title : '标识', + visible: false }, { field : 'code', - title : '物料编码' + title : '编码' }, { field : 'name', - title : '物料名称' + title : '名称' }, { field : 'companyCode',