From 950c0143f72d81a10cb3ed52e0995d060750a0ce Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Fri, 3 Mar 2023 10:39:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=98=E7=9B=98=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PageController.java            |   8 +-
 .../depository_manage/entity/Place.java       |   5 +
 .../depository_manage/mapper/PlaceMapper.xml  |   3 +-
 .../depository_manage/mapper/PlaceMapper.xml  |   3 +-
 .../templates/pages/place/place_add.html      | 193 ++++++++++++------
 5 files changed, 149 insertions(+), 63 deletions(-)

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 c6f82ef9..9fd7f68a 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
@@ -1959,7 +1959,7 @@ public class PageController {
         if (!(Integer.compare(placeId, 0) == 0)) {
             // 如果不是默认库位
             Place placeById = placeService.findPlaceById(placeId);
-            location.append("-" + placeById.getCode());
+            location.append("-").append(placeById.getCode());
         }
         // 设置盘点位置
         stp.setDepositoryName(location.toString());
@@ -1976,12 +1976,12 @@ public class PageController {
         List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId());
         StringBuilder RoleName = new StringBuilder();
         StringBuilder DepositoryName = new StringBuilder();
-        for (int i = 0; i < depositoryAndRole.size(); i++) {
-            String depositoryName = depositoryAndRole.get(i).getDepositoryName();
+        for (RoleAndDepository roleAndDepository : depositoryAndRole) {
+            String depositoryName = roleAndDepository.getDepositoryName();
             if (depositoryName == null) {
                 depositoryName = "";
             }
-            DepositoryName.append(depositoryName + " ");
+            DepositoryName.append(depositoryName).append(" ");
         }
         mv.addObject("roleAndDepository", depositoryAndRole);
         mv.addObject("RoleName", RoleName.toString());
diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/Place.java b/src/main/java/com/dreamchaser/depository_manage/entity/Place.java
index 5a3b0094..13be6d32 100644
--- a/src/main/java/com/dreamchaser/depository_manage/entity/Place.java
+++ b/src/main/java/com/dreamchaser/depository_manage/entity/Place.java
@@ -59,4 +59,9 @@ public class Place {
      * 当前库位数目
      */
     private Integer quantity;
+
+    /**
+     * 当前库位类型（1库位2托盘）
+     */
+    private Integer flagForType;
 }
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 d04d8a1b..5db040f4 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
@@ -17,6 +17,7 @@
         <result column="max" property="max" jdbcType="INTEGER" />
         <result column="state" property="state" jdbcType="INTEGER" />
         <result column="quantity" property="quantity" jdbcType="INTEGER" />
+        <result column="flagForType" property="flagForType" jdbcType="INTEGER" />
     </resultMap>
     
     <resultMap id="materialAndPlaceMap" type="com.dreamchaser.depository_manage.entity.MaterialAndPlace">
@@ -53,7 +54,7 @@
 
     <!-- 表查询字段 -->
     <sql id="allColumns">
-        p.id,p.x,p.y,p.z,p.code,p.mid,p.did,p.min,p.max,p.state,p.quantity
+        p.id,p.x,p.y,p.z,p.code,p.mid,p.did,p.min,p.max,p.state,p.quantity,p.flagForType
     </sql>
 
     <sql id="allColumnsByMaterialAndPlace">
diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
index d04d8a1b..5db040f4 100644
--- a/target/classes/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
+++ b/target/classes/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
@@ -17,6 +17,7 @@
         <result column="max" property="max" jdbcType="INTEGER" />
         <result column="state" property="state" jdbcType="INTEGER" />
         <result column="quantity" property="quantity" jdbcType="INTEGER" />
+        <result column="flagForType" property="flagForType" jdbcType="INTEGER" />
     </resultMap>
     
     <resultMap id="materialAndPlaceMap" type="com.dreamchaser.depository_manage.entity.MaterialAndPlace">
@@ -53,7 +54,7 @@
 
     <!-- 表查询字段 -->
     <sql id="allColumns">
-        p.id,p.x,p.y,p.z,p.code,p.mid,p.did,p.min,p.max,p.state,p.quantity
+        p.id,p.x,p.y,p.z,p.code,p.mid,p.did,p.min,p.max,p.state,p.quantity,p.flagForType
     </sql>
 
     <sql id="allColumnsByMaterialAndPlace">
diff --git a/target/classes/templates/pages/place/place_add.html b/target/classes/templates/pages/place/place_add.html
index 513f9422..b142e20f 100644
--- a/target/classes/templates/pages/place/place_add.html
+++ b/target/classes/templates/pages/place/place_add.html
@@ -15,58 +15,105 @@
         <fieldset class="table-search-fieldset">
             <legend>库位创建</legend>
             <div class="layui-fluid">
-                <div class="layui-card">
-                    <div class="layui-card-body" style="padding-top: 40px;">
-                        <div>
-                            <form class="layui-form"
-                                  style="margin: 0 auto;max-width: 700px;padding-top: 100px; padding-bottom: 200px" lay-filter="form1">
-                                <input style="display: none" th:value="${depositoryId}" name="depositoryId" id="depositoryID">
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label">库位行:</label>
-                                    <div class="layui-input-block">
-                                        <input type="text" placeholder="请填写行数" class="layui-input"
-                                               name="place_x" lay-verify="required"/>
+                <div class="layui-tab">
+                    <ul class="layui-tab-title" style="text-align: center">
+                        <li class="layui-this">库位创建</li>
+                        <li class="layui-this">托盘创建</li>
+                    </ul>
+                    <div class="layui-tab-content">
+                        <div class="layui-tab-item layui-show">
+                            <div class="layui-card">
+                                <div class="layui-card-body" style="padding-top: 40px;">
+                                    <div>
+                                        <form class="layui-form"
+                                              style="margin: 0 auto;max-width: 700px;padding-top: 100px; padding-bottom: 200px"
+                                              lay-filter="form1">
+                                            <input style="display: none" th:value="${depositoryId}" name="depositoryId"
+                                                   id="depositoryID">
+                                            <div class="layui-form-item">
+                                                <label class="layui-form-label">库位行:</label>
+                                                <div class="layui-input-block">
+                                                    <input type="text" placeholder="请填写行数" class="layui-input"
+                                                           name="place_x" 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"
+                                                            name="place_y" 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"
+                                                           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"
+                                                           name="max" 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"
+                                                           name="min" lay-verify="required"/>
+                                                </div>
+                                            </div>
+                                            <div class="layui-form-item">
+                                                <div class="layui-input-block">
+                                                    <button class="layui-btn" lay-submit lay-filter="formStep">
+                                                        &emsp;创建库位&emsp;
+                                                    </button>
+                                                </div>
+                                            </div>
+                                        </form>
                                     </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"
-                                               name="place_y" 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"
-                                               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"
-                                               name="max" 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"
-                                               name="min" lay-verify="required"/>
-                                    </div>
-                                </div>
-                                <div class="layui-form-item">
-                                    <div class="layui-input-block">
-                                        <button class="layui-btn" lay-submit lay-filter="formStep">
-                                            &emsp;创建库位&emsp;
-                                        </button>
+                                <hr>
+                            </div>
+                        </div>
+                        <div class="layui-tab-item">
+                            <div class="layui-card">
+                                <div class="layui-card-body" style="padding-top: 40px;">
+                                    <div>
+                                        <form class="layui-form"
+                                              style="margin: 0 auto;max-width: 700px;padding-top: 100px; padding-bottom: 200px"
+                                              lay-filter="form2">
+                                            <input style="display: none" th:value="${depositoryId}" name="depositoryId">
+                                            <div class="layui-form-item">
+                                                <label class="layui-form-label">最大存放量:</label>
+                                                <div class="layui-input-block">
+                                                    <input type="text" placeholder="请填写最大存放量" class="layui-input"
+                                                           name="max" 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"
+                                                           name="min" lay-verify="required"/>
+                                                </div>
+                                            </div>
+
+                                            <div class="layui-form-item">
+                                                <div class="layui-input-block">
+                                                    <button class="layui-btn" type="button" lay-submit lay-filter="formStep1">
+                                                        &emsp;创建库位&emsp;
+                                                    </button>
+                                                </div>
+                                            </div>
+                                        </form>
                                     </div>
                                 </div>
-                            </form>
+                            </div>
                         </div>
                     </div>
-                    <hr>
                 </div>
             </div>
         </fieldset>
@@ -79,7 +126,7 @@
 <script>
     var data;
 
-    layui.use(['form', 'layer','dropdown','tree'], function () {
+    layui.use(['form', 'layer', 'dropdown', 'tree'], function () {
         var $ = layui.jquery,
             form = layui.form,
             layer = layui.layer;
@@ -107,28 +154,60 @@
                                 icon: 6,//成功的表情
                                 time: 1000
                             }, //1秒关闭（如果不配置，默认是3秒）
-                            function(){
+                            function () {
                                 //do something
-                                window.location="/insertPlace?depositoryId="+depositoryId
+                                window.location = "/insertPlace?depositoryId=" + depositoryId
                             });
                     }
                 },
                 complete: function () {
-                    form.val("form1", {
-                    })
+                    form.val("form1", {})
+                }
+            });
+            return false;
+        });
+        form.on('submit(formStep1)', function (data) {
+            var req = data.field;
+            req.type = "one";
+            $.ajax({
+                url: "/place/addTray",
+                type: 'post',
+                dataType: 'json',
+                contentType: "application/json;charset=utf-8",
+                data: JSON.stringify(req),
+                beforeSend: function () {
+                    this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
+                },
+                success: function (data) {
+                    layer.close(this.layerIndex);
+                    if (data.status >= 300) {
+                        layer.msg(data.statusInfo.message);//失败的表情
+                        return;
+                    } else {
+                        layer.msg("添加成功！", {
+                                icon: 6,//成功的表情
+                                time: 1000
+                            }, //1秒关闭（如果不配置，默认是3秒）
+                            function () {
+                                //do something
+                                window.location = "/insertPlace?depositoryId=" + depositoryId
+                            });
+                    }
+                },
+                complete: function () {
+                    form.val("form1", {})
                 }
             });
             return false;
         });
 
-
-        form.on('select(depositoryId)',function (data){
+        form.on('select(depositoryId)', function (data) {
             $.ajax({
-                url:"/repository/findDepositoryByParent?parentId="+data.value,
-                type:'get',
-                dataType:'json',
+                url: "/repository/findDepositoryByParent?parentId=" + data.value,
+                type: 'get',
+                dataType: 'json',
                 contentType: "application/json;charset=utf-8",
-                success:function(d){
+                success: function (d) {
                     console.log(d.data)
                 }
             })