diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/SerialNumberController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/SerialNumberController.java index 782d6bdc..00f0804d 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/SerialNumberController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/SerialNumberController.java @@ -60,27 +60,23 @@ public class SerialNumberController { /** * 获取序列号商品 - * @param name - * @param depotId - * @param barCode - * @param currentPage - * @param pageSize + * @param jsonObject * @param request * @return * @throws Exception */ - @GetMapping(value = "/getEnableSerialNumberList") + @PostMapping(value = "/getEnableSerialNumberList") @ApiOperation(value = "获取序列号商品") - public BaseResponseInfo getEnableSerialNumberList(@RequestParam("name") String name, - @RequestParam("depotItemId") Long depotItemId, - @RequestParam("depotId") Long depotId, - @RequestParam("barCode") String barCode, - @RequestParam("page") Integer currentPage, - @RequestParam("rows") Integer pageSize, - HttpServletRequest request)throws Exception { + public BaseResponseInfo getEnableSerialNumberList(@RequestBody JSONObject jsonObject, HttpServletRequest request)throws Exception { BaseResponseInfo res = new BaseResponseInfo(); Map map = new HashMap<>(); try { + String name = jsonObject.getString("name"); + Long depotItemId = jsonObject.getLong("depotItemId"); + Long depotId = jsonObject.getLong("depotId"); + String barCode = jsonObject.getString("barCode"); + Integer currentPage = jsonObject.getInteger("page"); + Integer pageSize = jsonObject.getInteger("rows"); String number = ""; String [] nameArray = null; if(depotItemId != null) { diff --git a/jshERP-web/src/api/api.js b/jshERP-web/src/api/api.js index 504212a9..c66d1e3f 100644 --- a/jshERP-web/src/api/api.js +++ b/jshERP-web/src/api/api.js @@ -65,7 +65,7 @@ const batchUpdateMaterial = (params)=>postAction("/material/batchUpdate",params) const changeNameToPinYin = (params)=>postAction("/material/changeNameToPinYin",params); //序列号 const batAddSerialNumber = (params)=>postAction("/serialNumber/batAddSerialNumber",params); -const getEnableSerialNumberList = (params)=>getAction("/serialNumber/getEnableSerialNumberList",params); +const getEnableSerialNumberList = (params)=>postAction("/serialNumber/getEnableSerialNumberList",params); //多属性 const addMaterialAttribute = (params)=>postAction("/materialAttribute/add",params); const editMaterialAttribute = (params)=>putAction("/materialAttribute/update",params);