添加选择商品名称功能

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<String, Object> parameterMap = new HashMap<String, Object>();
+        //查询参数
+        JSONObject obj=JSON.parseObject(search);
+        Set<String> key= obj.keySet();
+        for(String keyEach: key){
+            parameterMap.put(keyEach,obj.getString(keyEach));
+        }
+        PageQueryInfo queryInfo = new PageQueryInfo();
+        Map<String, Object> objectMap = new HashMap<String, Object>();
+        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<Material> list = materialService.getMaterialEnableSerialNumberList(parameterMap);
+        //获取分页查询后的数据
+        PageInfo<Material> pageInfo = new PageInfo<>(list);
+        objectMap.put("page", queryInfo);
+        if (list == null) {
+            queryInfo.setRows(new ArrayList<Object>());
+            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);
+    }
 }

src/main/java/com/jsh/erp/datasource/mappers/DepotMapperEx.java

@@ -23,5 +23,4 @@ public interface DepotMapperEx {
             @Param("remark") String remark);
 
     List<DepotEx> getDepotList(Map<String, Object> params);
-    Long getDepotListCount(Map<String, Object> params);
 }

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<Material> findByMaterialName(@Param("name") String name);
-
+    /**
+     * 获取开启序列号并且状态正常的商品列表
+     * */
+    List<Material> getMaterialEnableSerialNumberList(Map<String, Object> parameterMap);
 }

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<Material> getMaterialEnableSerialNumberList(Map<String, Object> parameterMap) {
+        return materialMapperEx.getMaterialEnableSerialNumberList(parameterMap);
+    }
 }

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);
         //已卖出，默认未否

src/main/resources/mapper_xml/MaterialMapperEx.xml

@@ -104,6 +104,25 @@
         </if>
 
     </select>
+    <select id="getMaterialEnableSerialNumberList" parameterType="java.util.Map" resultMap="com.jsh.erp.datasource.mappers.MaterialMapper.BaseResultMap">
+        select
+        Id, CategoryId, name, Mfrs, Packing, SafetyStock, Model, Standard, Color, Unit, Remark,
+        RetailPrice, LowPrice, PresetPriceOne, PresetPriceTwo, UnitId, FirstOutUnit, FirstInUnit,
+        PriceStrategy, Enabled,enableSerialNumber
+        FROM jsh_material
+        where 1=1
+        and enabled ='1'
+        and enableSerialNumber ='1'
+        <if test="name != null and name != ''">
+            <bind name="name" value="'%' + _parameter.name + '%'" />
+            and name like #{name}
+        </if>
+        <if test="model != null and model != ''">
+            <bind name="model" value="'%' + _parameter.model + '%'" />
+            and model like #{model}
+        </if>
+        order by id desc
+    </select>
 
 
 </mapper>