From 839d3bc47a9a521181319520912623268da81c1c Mon Sep 17 00:00:00 2001 From: erdanergou Date: Fri, 3 Mar 2023 11:00:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=98=E7=9B=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PageController.java | 4 + .../controller/PlaceController.java | 32 +++- .../service/impl/PlaceServiceImpl.java | 120 +++++++----- .../templates/pages/place/place_edit.html | 2 +- .../pages/place/place_editForTray.html | 176 ++++++++++++++++++ .../templates/pages/place/place_edit.html | 2 +- 6 files changed, 287 insertions(+), 49 deletions(-) create mode 100644 src/main/resources/templates/pages/place/place_editForTray.html diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index 9fd7f68a..5249b172 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -1188,6 +1188,10 @@ public class PageController { mv.addObject("id", id); Place placeById = placeService.findPlaceById(id); mv.addObject("place", placeById); + if(Integer.compare(placeById.getFlagForType(),2)==0){ + // 如果是托盘 + mv.setViewName("pages/place/place_editForTray"); + } } else { throw new MyException("缺少必要参数！"); } 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 5ad25c83..8e10058e 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java @@ -269,7 +269,7 @@ public class PlaceController { update.put("z", place_z); update.put("code", newCode); update.put("oldCode", oldCode); - update.put("did", map.get("depositoryId")); + update.put("did", map.get("did")); if (!"".equals(min)) { update.put("min", map.get("min")); } else { @@ -284,6 +284,36 @@ public class PlaceController { return CrudUtil.postHandle(placeService.UpdatePlace(update),1); } + @PostMapping("/tray_edit") + public RestResponse trayEdit(@RequestBody Map map){ + if(map.containsKey("state")){ + map.put("state",1); + }else{ + map.put("state",2); + } + String code = (String) map.get("code"); + Integer depositoryId = ObjectFormatUtil.toInteger(map.get("did")); + Place placeByDidAndCode = placeService.findPlaceByDidAndCode(depositoryId, code); + if(placeByDidAndCode != null){ + return new RestResponse("",12345,new StatusInfo("修改失败","该编码已经存在")); + } + Map update = new HashMap<>(); + String min = (String) map.get("min"); + String max = (String) map.get("max"); + if (!"".equals(min)) { + update.put("min", map.get("min")); + } else { + update.put("min", 0); + } + if (!"".equals(max)) { + update.put("max", map.get("max")); + } else { + update.put("max", 500); + } + update.put("code",code); + update.put("id", map.get("id")); + return CrudUtil.postHandle(placeService.UpdatePlace(update),1); } + @PostMapping("/editPlaceState") public RestResponse editPlaceState(@RequestBody Map map) { 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 471a57e1..39461ac0 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 @@ -34,29 +34,32 @@ public class PlaceServiceImpl implements PlaceService { /** * 查找所有库位 + * * @return */ @Override public List findPlaceAll() { return placeMapper.findPlaceAll(); } + /** * 根据条件查找库位 + * * @param map * @return */ @Override public List findPlaceByCondition(Map map) { - if(map.containsKey("place_x")){ - map.put("x",map.get("place_x")); + if (map.containsKey("place_x")) { + map.put("x", map.get("place_x")); map.remove("place_x"); } - if(map.containsKey("place_y")){ - map.put("y",map.get("place_y")); + if (map.containsKey("place_y")) { + map.put("y", map.get("place_y")); map.remove("place_y"); } - if(map.containsKey("place_z")){ - map.put("z",map.get("place_z")); + if (map.containsKey("place_z")) { + map.put("z", map.get("place_z")); map.remove("place_z"); } Integer size = 10, page = 1; @@ -68,19 +71,21 @@ public class PlaceServiceImpl implements PlaceService { page = ObjectFormatUtil.toInteger(map.get("page")); map.put("begin", (page - 1) * size); } - if(map.containsKey("depositoryId")){ - map.put("did",map.get("depositoryId")); + if (map.containsKey("depositoryId")) { + map.put("did", map.get("depositoryId")); map.remove("depositoryId"); } Object state = 1; - if(map.containsKey("state")){ + if (map.containsKey("state")) { state = map.get("state"); } - map.put("state",state); + map.put("state", state); return placeMapper.findPlaceByCondition(map); } + /** * 查找符合条件的库位数 + * * @param map * @return */ @@ -100,22 +105,26 @@ public class PlaceServiceImpl implements PlaceService { /** * 根据条件修改库位 + * * @param map * @return */ @Override public Integer UpdatePlace(Map map) { Integer id = ObjectFormatUtil.toInteger(map.get("id")); - Place placeById = placeMapper.findPlaceById(id); - String oldCode = (String) map.get("oldCode"); - if(!oldCode.equals(placeById.getCode())){ - map.put("code",oldCode); + if (map.containsKey("oldCode")) { + Place placeById = placeMapper.findPlaceById(id); + String oldCode = (String) map.get("oldCode"); + if (!oldCode.equals(placeById.getCode())) { + map.put("code", oldCode); + } } return placeMapper.UpdatePlace(map); } /** * 修改库位状态 + * * @param map * @return */ @@ -130,6 +139,7 @@ public class PlaceServiceImpl implements PlaceService { /** * 根据条件修改库位 + * * @param place * @return */ @@ -137,8 +147,10 @@ public class PlaceServiceImpl implements PlaceService { public Integer UpdatePlace(Place place) { return placeMapper.UpdatePlace(place); } + /** * 根据主键删除库位 + * * @param pid * @return */ @@ -146,24 +158,28 @@ public class PlaceServiceImpl implements PlaceService { public Integer DelPlace(Integer pid) { return placeMapper.DelPlace(pid); } + /** * 插入一条库位信息 + * * @param map * @return */ @Override public Integer InsertPlace(Map map) { - Map param = new HashMap<>(); - param.put("did",map.get("did")); - param.put("code",map.get("code")); + Map param = new HashMap<>(); + param.put("did", map.get("did")); + param.put("code", map.get("code")); List placeByCondition = placeMapper.findPlaceByCondition(param); - if(placeByCondition.size() > 0){ + if (placeByCondition.size() > 0) { return 1; } return placeMapper.InsertPlace(map); } + /** * 根据仓库编号查找库位 + * * @param did * @return */ @@ -174,6 +190,7 @@ public class PlaceServiceImpl implements PlaceService { /** * 根据id查询库位 + * * @return */ @Override @@ -183,20 +200,22 @@ public class PlaceServiceImpl implements PlaceService { /** * 根据仓库id及库位编码获取对应库位 - * @param did 仓库id + * + * @param did 仓库id * @param code 库位编码 * @return */ @Override public Place findPlaceByDidAndCode(Integer did, String code) { - Map paramForPlace = new HashMap<>(); - paramForPlace.put("code",code); - paramForPlace.put("did",did); - return placeMapper.findPlaceByDidAndCode(paramForPlace); + Map paramForPlace = new HashMap<>(); + paramForPlace.put("code", code); + paramForPlace.put("did", did); + return placeMapper.findPlaceByDidAndCode(paramForPlace); } /** * 根据id将库位状态改为删除 + * * @param id * @return */ @@ -207,6 +226,7 @@ public class PlaceServiceImpl implements PlaceService { /** * 根据批量id将库位状态改为删除 + * * @param ids * @return */ @@ -217,14 +237,15 @@ public class PlaceServiceImpl implements PlaceService { /** * 根据物料与所处仓库获取库位 + * * @param mid * @return */ @Override - public List findPlaceByMidAndDid(Integer mid,Integer depositoryId) { - Map map = new HashMap<>(); - map.put("mid",mid); - map.put("did",depositoryId); + public List findPlaceByMidAndDid(Integer mid, Integer depositoryId) { + Map map = new HashMap<>(); + map.put("mid", mid); + map.put("did", depositoryId); Inventory inventoryById = materialMapper.findInventoryById(mid); List placeByCondition = placeMapper.findPlaceByMidAndDid(map); List placePList = new ArrayList<>(); @@ -253,15 +274,16 @@ public class PlaceServiceImpl implements PlaceService { /** * 根据仓库id及物料id获取对应库位存储的物料 + * * @param did 待查询仓库id * @param mid 物料id * @return */ @Override public List findPlaceAndMaterialByDidAndMid(Integer did, Integer mid) { - Map map = new HashMap<>(); - map.put("depositoryId",did); - map.put("mid",mid); + Map map = new HashMap<>(); + map.put("depositoryId", did); + map.put("mid", mid); return placeMapper.findPlaceAndMaterialByDidAndMid(map); } @@ -270,9 +292,9 @@ public class PlaceServiceImpl implements PlaceService { */ @Override public MaterialAndPlace findPlaceAndMaterialByMidAndPid(Integer pid, Integer mid) { - Map map = new HashMap<>(); - map.put("mid",mid); - map.put("pid",pid); + Map map = new HashMap<>(); + map.put("mid", mid); + map.put("pid", pid); return placeMapper.findPlaceAndMaterialByMidAndPid(map); } @@ -297,20 +319,22 @@ public class PlaceServiceImpl implements PlaceService { /** * 获取当前物料在当前库位的数量 + * * @param mid * @param pid * @return */ @Override public Integer findQuantityByMidAndPid(Integer mid, Integer pid) { - Map map = new HashMap<>(); - map.put("pid",pid); - map.put("mid",mid); + Map map = new HashMap<>(); + map.put("pid", pid); + map.put("mid", mid); return placeMapper.findQuantityByMidAndPid(map); } /** * 修改当前库位存放物料 + * * @param mp * @return */ @@ -321,6 +345,7 @@ public class PlaceServiceImpl implements PlaceService { /** * 删除当前库位与物料的对应关系 + * * @param id 主键id * @return */ @@ -331,27 +356,29 @@ public class PlaceServiceImpl implements PlaceService { /** * 获取库位对应的二维码 + * * @param pid * @return */ @Override public String findQrCodeByPlace(Integer pid) { - Map map = new HashMap<>(); + Map map = new HashMap<>(); // 1为库位2为仓库 - map.put("flag",1); - map.put("pid",pid); + map.put("flag", 1); + map.put("pid", pid); return qrCodeMapper.selectQrCodeByDepositoryOrPlace(map); } /** * 用于添加库位与二维码的对应关系 + * * @param map * @return */ @Override public Integer addQrCodeByPlace(Map map) { // 1为库位2为仓库 - map.put("flag",1); + map.put("flag", 1); return qrCodeMapper.addQrCodeByPidOrDid(map); } @@ -360,10 +387,10 @@ public class PlaceServiceImpl implements PlaceService { */ @Override public PidOrDidAndCode findLocationByQrCode(String qrCode) { - Map map = new HashMap<>(); - map.put("qrCode",qrCode); + Map map = new HashMap<>(); + map.put("qrCode", qrCode); List locationByCondition = qrCodeMapper.findLocationByCondition(map); - if(locationByCondition.size()>0){ + if (locationByCondition.size() > 0) { return locationByCondition.get(0); } return null; @@ -371,14 +398,15 @@ public class PlaceServiceImpl implements PlaceService { /** * 查询当前类型的库位数量 + * * @param flag 类型 * @return */ @Override public Integer findPlaceCoutnByTypeForFlag(Integer flag, Integer did) { - Map map = new HashMap<>(); - map.put("flag",flag); - map.put("did",did); + Map map = new HashMap<>(); + map.put("flag", flag); + map.put("did", did); return placeMapper.findPlaceCoutnByTypeForFlag(map); } diff --git a/src/main/resources/templates/pages/place/place_edit.html b/src/main/resources/templates/pages/place/place_edit.html index 7181469d..5c5899f9 100644 --- a/src/main/resources/templates/pages/place/place_edit.html +++ b/src/main/resources/templates/pages/place/place_edit.html @@ -46,7 +46,7 @@
-
diff --git a/src/main/resources/templates/pages/place/place_editForTray.html b/src/main/resources/templates/pages/place/place_editForTray.html new file mode 100644 index 00000000..efdc50e4 --- /dev/null +++ b/src/main/resources/templates/pages/place/place_editForTray.html @@ -0,0 +1,176 @@ + + + + + layui + + + + + + + +
+
+
+ 库位详情 +
+
+
+
+
+ + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + +
+
+
+
+ +
+
+
+
+
+
+
+
+
+ +
+
+ + + + + + + \ No newline at end of file diff --git a/target/classes/templates/pages/place/place_edit.html b/target/classes/templates/pages/place/place_edit.html index 7181469d..5c5899f9 100644 --- a/target/classes/templates/pages/place/place_edit.html +++ b/target/classes/templates/pages/place/place_edit.html @@ -46,7 +46,7 @@
-