From 9f2f1f535d4abfc9cdf68eef651cb73ef2e04bcb Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 29 七月 2025 11:06:14 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/system/controller/UserController.java |   16 ++++++++
 src/main/webapp/views/orderPakout/out.html                 |   16 ++++++++
 src/main/webapp/static/js/orderPakout/out.js               |   41 ++++++++++++++++++++
 src/main/java/com/zy/system/entity/User.java               |   12 ++++++
 src/main/resources/mapper/asrs/UserMapper.xml              |    1 
 src/main/java/com/zy/asrs/controller/OutController.java    |   12 ++++++
 6 files changed, 98 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 1a0c62f..c6b8899 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -11,6 +11,7 @@
 import com.zy.common.model.LocDto;
 import com.zy.common.model.TaskDto;
 import com.zy.common.web.BaseController;
+import com.zy.system.entity.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -228,6 +229,17 @@
                 }
 
                 List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locNo, ioType);
+                User user = getUser();
+                if(user != null) {
+                    Integer defaultOutSta = user.getDefaultOutSta();
+                    if(defaultOutSta != null) {
+                        if (staNos.contains(defaultOutSta)) {
+                            staNos.remove(defaultOutSta);
+                            staNos.add(0, defaultOutSta);
+                        }
+                    }
+                }
+
                 locStaNosMap.put(locNo, staNos);
             }
 
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index 3306946..1fc1f2d 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -163,4 +163,20 @@
         return R.ok(result);
     }
 
+    @RequestMapping(value = "/user/updateDefaultOutSta")
+    @ManagerAuth
+    public R updateDefaultOutSta(@RequestBody JSONObject param) {
+        User user = getUser();
+        user.setDefaultOutSta(param.getInteger("defaultOutSta"));
+        userService.updateById(user);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/user/getDefaultOutSta")
+    @ManagerAuth
+    public R getDefaultOutSta() {
+        User user = getUser();
+        return R.ok().add(user.getDefaultOutSta());
+    }
+
 }
diff --git a/src/main/java/com/zy/system/entity/User.java b/src/main/java/com/zy/system/entity/User.java
index 98d856f..c161ede 100644
--- a/src/main/java/com/zy/system/entity/User.java
+++ b/src/main/java/com/zy/system/entity/User.java
@@ -91,6 +91,11 @@
      */
     private Integer status;
 
+    /**
+     * 榛樿鍑哄簱鍙�
+     */
+    private Integer defaultOutSta;
+
     public Long getId() {
         return id;
     }
@@ -255,5 +260,12 @@
         this.status = status;
     }
 
+    public Integer getDefaultOutSta() {
+        return defaultOutSta;
+    }
+
+    public void setDefaultOutSta(Integer defaultOutSta) {
+        this.defaultOutSta = defaultOutSta;
+    }
 
 }
diff --git a/src/main/resources/mapper/asrs/UserMapper.xml b/src/main/resources/mapper/asrs/UserMapper.xml
index df40f6c..ca37439 100644
--- a/src/main/resources/mapper/asrs/UserMapper.xml
+++ b/src/main/resources/mapper/asrs/UserMapper.xml
@@ -16,6 +16,7 @@
         <result column="sex" property="sex" />
         <result column="create_time" property="createTime" />
         <result column="status" property="status" />
+        <result column="default_out_sta" property="defaultOutSta" />
 
     </resultMap>
 
diff --git a/src/main/webapp/static/js/orderPakout/out.js b/src/main/webapp/static/js/orderPakout/out.js
index 585f941..d84ce61 100644
--- a/src/main/webapp/static/js/orderPakout/out.js
+++ b/src/main/webapp/static/js/orderPakout/out.js
@@ -91,6 +91,30 @@
         return false;
     });
 
+    form.on('submit(defaultOutSta)', function (data) {
+        let val = $("#defaultOutStaSelect").val();
+        $.ajax({
+            url: baseUrl + "/user/updateDefaultOutSta",
+            headers: {'token': localStorage.getItem('token')},
+            contentType: 'application/json;charset=UTF-8',
+            data: JSON.stringify({
+                defaultOutSta: val
+            }),
+            method: 'POST',
+            success: function (res) {
+                if (res.code === 200){
+                    layer.msg(res.msg, {icon: 1})
+                    $("#defaultOutSta").html(val)
+                } else if (res.code === 403){
+                    top.location.href = baseUrl+"/";
+                } else {
+                    layer.msg(res.msg, {icon: 2})
+                }
+            }
+        })
+        return false;
+    });
+
     /* 琛ㄦ牸2澶村伐鍏锋爮鐐瑰嚮浜嬩欢 */
     table.on('toolbar(orderDetlTable)', function (obj) {
 
@@ -356,6 +380,23 @@
 
 });
 
+$.ajax({
+    url: baseUrl + "/user/getDefaultOutSta",
+    headers: {'token': localStorage.getItem('token')},
+    contentType: 'application/json;charset=UTF-8',
+    data: {},
+    method: 'POST',
+    success: function (res) {
+        if (res.code === 200){
+            $("#defaultOutSta").html(res.data)
+        } else if (res.code === 403){
+            top.location.href = baseUrl+"/";
+        } else {
+            layer.msg(res.msg, {icon: 2})
+        }
+    }
+})
+
 function tableReload(child) {
     var searchData = {};
     $.each($('#search-box [name]').serializeArray(), function() {
diff --git a/src/main/webapp/views/orderPakout/out.html b/src/main/webapp/views/orderPakout/out.html
index b79b645..b2047f4 100644
--- a/src/main/webapp/views/orderPakout/out.html
+++ b/src/main/webapp/views/orderPakout/out.html
@@ -127,6 +127,22 @@
                                     <i class="layui-icon">&#xe615;</i>鎼滅储
                                 </button>
                             </div>
+
+                            <div class="layui-inline">
+                                <div class="layui-input-inline">
+                                    <select id="defaultOutStaSelect">
+                                        <option value="">閫夋嫨榛樿鍑哄簱鍙�</option>
+                                        <option value="1068">1068</option>
+                                        <option value="1071">1071</option>
+                                        <option value="1074">1074</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="layui-inline">&emsp;
+                                <button class="layui-btn icon-btn" lay-filter="defaultOutSta" lay-submit>
+                                    淇敼榛樿鍑哄簱鍙� <span id="defaultOutSta"></span>
+                                </button>
+                            </div>
                         </div>
                     </form>
                     <table id="orderDetlTable" lay-filter="orderDetlTable"></table>

--
Gitblit v1.9.1