diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java index 584a5246..2f51dda2 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java @@ -204,6 +204,17 @@ public class PlaceController { return CrudUtil.postHandle(placeService.UpdatePlace(update),1); } + + @PostMapping("/editPlaceState") + public RestResponse editPlaceState(@RequestBody Map map) { + if (map.containsKey("state")) { + map.put("state", 1); + } else { + map.put("state", 2); + } + return CrudUtil.postHandle(placeService.editPlaceState(map),1); + } + // 根据物料编号获取库位 @PostMapping("/findPlaceByMid") public RestResponse findPlaceByMid(@RequestBody Map map, HttpServletRequest request){ diff --git a/src/main/java/com/dreamchaser/depository_manage/service/PlaceService.java b/src/main/java/com/dreamchaser/depository_manage/service/PlaceService.java index cfb6510e..e3d1a447 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/PlaceService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/PlaceService.java @@ -37,6 +37,14 @@ public interface PlaceService { */ Integer UpdatePlace(Map map); + + /** + * 修改库位状态 + * @param map + * @return + */ + Integer editPlaceState(Map map); + /** * 根据条件修改库位 * @param place diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java index c1700f3a..96d19cc6 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java @@ -72,6 +72,11 @@ public class PlaceServiceImpl implements PlaceService { map.put("did",map.get("depositoryId")); map.remove("depositoryId"); } + Object state = 1; + if(map.containsKey("state")){ + state = map.get("state"); + } + map.put("state",state); return placeMapper.findPlaceByCondition(map); } /** @@ -102,6 +107,21 @@ public class PlaceServiceImpl implements PlaceService { public Integer UpdatePlace(Map map) { return placeMapper.UpdatePlace(map); } + + /** + * 修改库位状态 + * @param map + * @return + */ + @Override + public Integer editPlaceState(Map map) { + Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Integer state = ObjectFormatUtil.toInteger(map.get("state")); + Place placeById = placeMapper.findPlaceById(id); + placeById.setState(state); + return placeMapper.UpdatePlace(placeById); + } + /** * 根据条件修改库位 * @param place diff --git a/src/main/resources/templates/pages/JcPrinter/PrinterIndex.html b/src/main/resources/templates/pages/JcPrinter/PrinterIndex.html index 24b1acb1..d5f79ec1 100644 --- a/src/main/resources/templates/pages/JcPrinter/PrinterIndex.html +++ b/src/main/resources/templates/pages/JcPrinter/PrinterIndex.html @@ -13,7 +13,7 @@
-

刷新

+

下载

下载打印服务
diff --git a/src/main/resources/templates/pages/material/material-add.html b/src/main/resources/templates/pages/material/material-add.html index 61034974..a746ff49 100644 --- a/src/main/resources/templates/pages/material/material-add.html +++ b/src/main/resources/templates/pages/material/material-add.html @@ -98,7 +98,7 @@
-
diff --git a/src/main/resources/templates/pages/warehouse/warehouseByParentId.html b/src/main/resources/templates/pages/warehouse/warehouseByParentId.html index 072c38c2..c3ac45d9 100644 --- a/src/main/resources/templates/pages/warehouse/warehouseByParentId.html +++ b/src/main/resources/templates/pages/warehouse/warehouseByParentId.html @@ -328,13 +328,13 @@ //监听状态操作 form.on('switch(changeState)', function (obj) { - var req = new Map; + var req = {}; if (obj.elem.checked) { req["state"] = 1 } req["id"] = this.value; $.ajax({ - url: "/place/place_edit", + url: "/place/editPlaceState", type: 'post', dataType: 'json', contentType: "application/json;charset=utf-8",