diff --git a/erp_web/pages/manage/serialNumber.html b/erp_web/pages/manage/serialNumber.html index 1542c07b..022217a8 100644 --- a/erp_web/pages/manage/serialNumber.html +++ b/erp_web/pages/manage/serialNumber.html @@ -44,6 +44,7 @@
+
商品名称 - + - + + + + 序列号 @@ -100,20 +104,20 @@ - + + - - -
商品名称 - + + +
序列号前缀
序列号数量 取消 +
+
diff --git a/erp_web/pages/materials/material.html b/erp_web/pages/materials/material.html index 08ea4d6b..6d650362 100644 --- a/erp_web/pages/materials/material.html +++ b/erp_web/pages/materials/material.html @@ -270,6 +270,7 @@
+
- diff --git a/erp_web/pages/materials/material_forselect.html b/erp_web/pages/materials/material_forselect.html new file mode 100644 index 00000000..4497ea2f --- /dev/null +++ b/erp_web/pages/materials/material_forselect.html @@ -0,0 +1,318 @@ + + + + 商品信息选择 + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
品名： + +  型号： + +   + 查询   + 重置 +
+
+ + +
+
+
+ +
+
+
+ + + + diff --git a/erp_web/pages/materials/materialcategory_forselect.html b/erp_web/pages/materials/materialcategory_forselect.html index d519d8da..39c365d7 100644 --- a/erp_web/pages/materials/materialcategory_forselect.html +++ b/erp_web/pages/materials/materialcategory_forselect.html @@ -31,6 +31,9 @@ */ $(function () { var id=$("#id").val(); + if(id==undefined){ + id=''; + } console.log(id); $('#ttForSelect').tree({ url: '/materialCategory/getMaterialCategoryTree?id='+id, diff --git a/src/main/java/com/jsh/erp/controller/MaterialController.java b/src/main/java/com/jsh/erp/controller/MaterialController.java index 271fbda9..44e08fb3 100644 --- a/src/main/java/com/jsh/erp/controller/MaterialController.java +++ b/src/main/java/com/jsh/erp/controller/MaterialController.java @@ -3,6 +3,10 @@ package com.jsh.erp.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.jsh.erp.constants.BusinessConstants; +import com.jsh.erp.datasource.entities.DepotEx; import com.jsh.erp.datasource.entities.Material; import com.jsh.erp.datasource.entities.MaterialVo4Unit; import com.jsh.erp.service.material.MaterialService; @@ -19,10 +23,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.File; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; @@ -307,4 +308,37 @@ public class MaterialController { return null; } } + @RequestMapping(value = "/getMaterialEnableSerialNumberList") + public String getMaterialEnableSerialNumberList(@RequestParam(value = Constants.PAGE_SIZE, required = false) Integer pageSize, + @RequestParam(value = Constants.CURRENT_PAGE, required = false) Integer currentPage, + @RequestParam(value = Constants.SEARCH, required = false) String search) { + Map parameterMap = new HashMap(); + //查询参数 + JSONObject obj=JSON.parseObject(search); + Set key= obj.keySet(); + for(String keyEach: key){ + parameterMap.put(keyEach,obj.getString(keyEach)); + } + PageQueryInfo queryInfo = new PageQueryInfo(); + Map objectMap = new HashMap(); + if (pageSize == null || pageSize <= 0) { + pageSize = BusinessConstants.DEFAULT_PAGINATION_PAGE_SIZE; + } + if (currentPage == null || currentPage <= 0) { + currentPage = BusinessConstants.DEFAULT_PAGINATION_PAGE_NUMBER; + } + PageHelper.startPage(currentPage,pageSize,true); + List list = materialService.getMaterialEnableSerialNumberList(parameterMap); + //获取分页查询后的数据 + PageInfo pageInfo = new PageInfo<>(list); + objectMap.put("page", queryInfo); + if (list == null) { + queryInfo.setRows(new ArrayList()); + queryInfo.setTotal(BusinessConstants.DEFAULT_LIST_NULL_NUMBER); + return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code); + } + queryInfo.setRows(list); + queryInfo.setTotal(pageInfo.getTotal()); + return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); + } } diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotMapperEx.java index 75d84934..19263dc5 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/DepotMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotMapperEx.java @@ -23,5 +23,4 @@ public interface DepotMapperEx { @Param("remark") String remark); List getDepotList(Map params); - Long getDepotListCount(Map params); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java index c5649193..a68aefe2 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java @@ -5,6 +5,7 @@ import com.jsh.erp.datasource.entities.MaterialVo4Unit; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * Description @@ -49,5 +50,8 @@ public interface MaterialMapperEx { * 通过商品名称查询商品信息 * */ List findByMaterialName(@Param("name") String name); - + /** + * 获取开启序列号并且状态正常的商品列表 + * */ + List getMaterialEnableSerialNumberList(Map parameterMap); } diff --git a/src/main/java/com/jsh/erp/service/material/MaterialService.java b/src/main/java/com/jsh/erp/service/material/MaterialService.java index c0c65c52..4a92e5f0 100644 --- a/src/main/java/com/jsh/erp/service/material/MaterialService.java +++ b/src/main/java/com/jsh/erp/service/material/MaterialService.java @@ -1,6 +1,7 @@ package com.jsh.erp.service.material; import com.alibaba.fastjson.JSONObject; +import com.jsh.erp.datasource.entities.DepotEx; import com.jsh.erp.datasource.entities.Material; import com.jsh.erp.datasource.entities.MaterialExample; import com.jsh.erp.datasource.entities.MaterialVo4Unit; @@ -194,4 +195,8 @@ public class MaterialService { info.data = data; return info; } + + public List getMaterialEnableSerialNumberList(Map parameterMap) { + return materialMapperEx.getMaterialEnableSerialNumberList(parameterMap); + } } diff --git a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java index 418092b6..a8a57a49 100644 --- a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java +++ b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java @@ -172,9 +172,7 @@ public class SerialNumberService { return null; } /**处理商品id*/ - if(serialNumberEx.getMaterialId()==null){ - serialNumberEx.setMaterialId(getSerialNumberMaterialIdByMaterialName(serialNumberEx.getMaterialName())); - } + serialNumberEx.setMaterialId(getSerialNumberMaterialIdByMaterialName(serialNumberEx.getMaterialName())); //删除标记,默认未删除 serialNumberEx.setDeleteFlag(BusinessConstants.DELETE_FLAG_EXISTS); //已卖出，默认未否 diff --git a/src/main/resources/mapper_xml/MaterialMapperEx.xml b/src/main/resources/mapper_xml/MaterialMapperEx.xml index 6986f4b5..1e07a6fc 100644 --- a/src/main/resources/mapper_xml/MaterialMapperEx.xml +++ b/src/main/resources/mapper_xml/MaterialMapperEx.xml @@ -104,6 +104,25 @@ + \ No newline at end of file diff --git a/src/main/resources/mapper_xml/UserMapperEx.xml b/src/main/resources/mapper_xml/UserMapperEx.xml index 1a4c5f70..6e39ff49 100644 --- a/src/main/resources/mapper_xml/UserMapperEx.xml +++ b/src/main/resources/mapper_xml/UserMapperEx.xml @@ -11,7 +11,7 @@ select * FROM jsh_user where 1=1 - and user.status not in('1','2') + and status not in('1','2') and username like '%${userName}%' @@ -27,7 +27,7 @@ COUNT(id) FROM jsh_user WHERE 1=1 - and user.status not in('1','2') + and status not in('1','2') and username like '%${userName}%'