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 5f811430..5ad25c83 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java @@ -105,6 +105,7 @@ public class PlaceController { } insert.put("state",1); insert.put("quantity",0); + insert.put("flagType",1); success += placeService.InsertPlace(insert); } else if("list".equals(type)){ @@ -119,7 +120,7 @@ public class PlaceController { Integer place_end_z = ObjectFormatUtil.toInteger(map.get("place_end_z")); // 计算所需库位数目 // total = (place_end_x - place_start_x) * (place_end_y - place_start_y) * (place_end_z - place_start_z); - total = (place_end_x - place_start_x) * (place_end_z - place_start_z); + total = (place_end_x - place_start_x + 1) * (place_end_z - place_start_z + 1); String min = (String) map.get("min"); String max = (String) map.get("max"); for (int i = place_start_x; i <= place_end_x; i++) { @@ -136,6 +137,7 @@ public class PlaceController { insert.put("did", map.get("depositoryId")); insert.put("state",1); insert.put("quantity",0); + insert.put("flagType",1); success += placeService.InsertPlace(insert); } // } @@ -154,6 +156,57 @@ public class PlaceController { } } + + + @PostMapping("/addTray") + public RestResponse addTray(@RequestBody Map map){ + String type = (String) map.get("type"); + Map insert = new HashMap<>(); + Integer success = 0; + Integer total = 0; + String min = (String) map.get("min"); + String max = (String) map.get("max"); + if (!"".equals(min)) { + insert.put("min", map.get("min")); + } else { + insert.put("min", 0); + } + if (!"".equals(max)) { + insert.put("max", map.get("max")); + } else { + insert.put("max", 0); + } + Object depositoryId = map.get("depositoryId"); + insert.put("did", depositoryId); + // 获取当前仓库的托盘数量 + Integer countForTray = placeService.findPlaceCoutnByTypeForFlag(2, ObjectFormatUtil.toInteger(depositoryId)); + if ("one".equals(type)) { + String code = "F"+String.format("%02d",countForTray+1); + insert.put("code", code); + insert.put("state",1); + insert.put("quantity",0); + insert.put("flagType",2); + success += placeService.InsertPlace(insert); + }else if("list".equals(type)){ + Integer num = ObjectFormatUtil.toInteger(map.get("num")); + insert.put("state",1); + insert.put("quantity",0); + insert.put("flagType",2); + total = num; + for (int i = 1; i <= num; i++) { + String code = "F"+String.format("%02d",countForTray+i); + insert.put("code", code); + success += placeService.InsertPlace(insert); + } + } + if ("one".equals(type)) { + return CrudUtil.postHandle(success, 1); + } else if("list".equals(type)){ + return CrudUtil.postHandle(success,total); + }else{ + throw new MyException("请求参数错误！"); + } + } /** * 将库位状态改为删除 * @param map diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.java b/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.java index 9576d1f3..5fc4f37c 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.java @@ -176,4 +176,11 @@ public interface PlaceMapper { * @return */ Integer findQuantityByMidAndPid(Map map); + + /** + * 查询当前出库中该类型的库位数量 + * @param map 待查询数量 + * @return + */ + Integer findPlaceCoutnByTypeForFlag(Map map); } diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml index 6398fd0e..d04d8a1b 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml @@ -245,7 +245,7 @@ INSERT INTO place ( - id,x,y,z,code, mid,did,min,max,state,quantity + id,x,y,z,code, mid,did,min,max,state,quantity,flagForType ) VALUES ( #{id}, #{x}, @@ -257,7 +257,8 @@ #{min}, #{max}, #{state}, - #{quantity} + #{quantity}, + #{flagType} ) @@ -369,5 +370,17 @@ + \ No newline at end of file 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 e3d1a447..fbefe6e3 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/PlaceService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/PlaceService.java @@ -185,6 +185,14 @@ public interface PlaceService { PidOrDidAndCode findLocationByQrCode(String qrCode); + /** + * 查询当前出库中该类型的库位数量 + * @param flag 类型 + * @return + */ + Integer findPlaceCoutnByTypeForFlag(Integer flag, Integer did); + + } 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 89a6b7b6..471a57e1 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 @@ -160,8 +160,6 @@ public class PlaceServiceImpl implements PlaceService { if(placeByCondition.size() > 0){ return 1; } - - return placeMapper.InsertPlace(map); } /** @@ -371,5 +369,18 @@ public class PlaceServiceImpl implements PlaceService { return null; } + /** + * 查询当前类型的库位数量 + * @param flag 类型 + * @return + */ + @Override + public Integer findPlaceCoutnByTypeForFlag(Integer flag, Integer 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_add.html b/src/main/resources/templates/pages/place/place_add.html index 513f9422..b142e20f 100644 --- a/src/main/resources/templates/pages/place/place_add.html +++ b/src/main/resources/templates/pages/place/place_add.html @@ -15,58 +15,105 @@
库位创建
-
-
-
-
- -
- -
- +
+
    +
  • 库位创建
    • +
  • 托盘创建
    • +
+
+
+
+
+
+ + +
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- +
+
+
+
+
+
+
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+ +
+
+
- +
-
@@ -79,7 +126,7 @@