From 21a6953ae2fce527c8949e8ca651ee8287078cd1 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Tue, 28 Feb 2023 16:43:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8B=E8=BD=BD=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=A8=A1=E6=9D=BF=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../depository_manage/controller/PlaceController.java | 11 +++++++++--
 .../service/impl/PlaceServiceImpl.java                |  6 ++++++
 .../resources/templates/pages/place/place_edit.html   |  7 +++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

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 d9c0d9da..68781b63 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java
@@ -69,6 +69,11 @@ public class PlaceController {
         return new RestResponse(placePList, placeService.findPlaceCountByCondition(map), 200);
     }
 
+    /**
+     * 用于创建库位
+     * @param map
+     * @return
+     */
     @PostMapping("/addPlace")
     public RestResponse insertPlace(@RequestBody Map<String, Object> map) {
         String type = (String) map.get("type");
@@ -117,9 +122,9 @@ public class PlaceController {
             total =  (place_end_x - place_start_x) *  (place_end_z - place_start_z);
             String min = (String) map.get("min");
             String max = (String) map.get("max");
-            for (int i = place_start_x; i < place_end_x; i++) {
+            for (int i = place_start_x; i <= place_end_x; i++) {
 //                for (int j = place_start_y; j < place_end_y; j++) {
-                    for (int k = place_start_z; k < place_end_z; k++) {
+                    for (int k = place_start_z; k <= place_end_z; k++) {
 //                        String code = String.format("%02d", i) + String.format("%02d", j) + String.format("%02d", k);
                         String code = String.format("%02d", i)  + String.format("%02d", k);
                         insert.put("x",i);
@@ -184,11 +189,13 @@ public class PlaceController {
         String min = (String) map.get("min");
         String max = (String) map.get("max");
 //        String code = String.format("%02d", place_x) + String.format("%02d", place_y) + String.format("%02d", place_z);
+        String oldCode = (String)map.get("code");
         String code = String.format("%02d", place_x)  + String.format("%02d", place_z);
         update.put("x", place_x);
 //        update.put("y", place_y);
         update.put("z", place_z);
         update.put("code", code);
+        update.put("oldCode", oldCode);
         update.put("did", map.get("depositoryId"));
         if (!"".equals(min)) {
             update.put("min", map.get("min"));
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 96d19cc6..89a6b7b6 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
@@ -105,6 +105,12 @@ public class PlaceServiceImpl implements PlaceService {
      */
     @Override
     public Integer UpdatePlace(Map<String, Object> 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);
+        }
         return placeMapper.UpdatePlace(map);
     }
 
diff --git a/src/main/resources/templates/pages/place/place_edit.html b/src/main/resources/templates/pages/place/place_edit.html
index b7845691..16c63c44 100644
--- a/src/main/resources/templates/pages/place/place_edit.html
+++ b/src/main/resources/templates/pages/place/place_edit.html
@@ -43,6 +43,13 @@
                                                name="place_z" lay-verify="required"/>
                                     </div>
                                 </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">库位码:</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" placeholder="请填写最大库位码" class="layui-input" th:value="${place.getCode()}"
+                                               name="code" lay-verify="required"/>
+                                    </div>
+                                </div>
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">最大存放量:</label>
                                     <div class="layui-input-block">