From ef2d6d4d42a346b62631532019139cff06b47c80 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Mon, 24 Feb 2025 10:04:25 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dtoken=E6=97=A0=E5=80=BC?=
 =?UTF-8?q?=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../portal/biz/sysstaffinfo/SysStaffinfoService.java  | 11 +++++++++--
 .../com/yxt/anrui/portal/biz/sysuser/SysUserRest.java |  4 +++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
index 0fd0d3faf2..381c8423a3 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
@@ -624,8 +624,15 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         if (reduce1.size() > 0) {
             //根据staffSid查询token
             String token = sysUserService.selectByStaffsid(sid).getToken();
-            //清空该token
-            redisUtil.remove(token);
+            if(StringUtils.isNotBlank(token)){
+                //查询redis中是否包含该token
+                String userName = redisUtil.get(token);
+                if(StringUtils.isNotBlank(userName)){
+                    //清空该token
+                    redisUtil.remove(token);
+                }
+            }
+
         }
         return rb.success().setMsg("更新员工信息成功");
     }
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java
index abb8a6cdbc..d69fa4a151 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java
@@ -286,7 +286,9 @@ public class SysUserRest implements SysUserFeign {
         if (i == 0) {
             return ResultBean.fireFail().setMsg("修改失败");
         }
-        redisUtil.remove(token);
+        if(StringUtils.isNotBlank(token)){
+            redisUtil.remove(token);
+        }
         return ResultBean.fireSuccess().setMsg("修改成功");
     }
 

From aa2470796fc96d8fab91cfb08b912903583e8ac5 Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Mon, 24 Feb 2025 13:39:16 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=BA=93=E4=BD=8D=E6=8E=A5=E5=8F=A32?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventory/wmsinventory/WmsInventoryMapper.xml |  1 +
 .../wmsinventory/WmsInventoryService.java         | 12 +++++-------
 .../wmsinventory/appH5/HouseRackH5Vo.java         | 15 ++++++++++-----
 .../wmsinventory/appH5/HouseRackListVo.java       |  3 +++
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml
index 79c90ecc95..6fba8b09bf 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml
@@ -351,6 +351,7 @@
     <select id="selGoodsListForScanRackTag"
             resultType="com.yxt.wms.biz.inventory.wmsinventory.appH5.HouseRackListVo">
         SELECT wi.goodsID,
+               wi.manufacturerName,
                b.supplierName  provider,
                wi.goodsSpuName goodsName,
                wi.goodsSkuCode numId,
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
index 8220876dbe..b672609251 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
@@ -698,7 +698,7 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
         WmsHouseInfoVo infoVo = wmsWarehouseRackService.selHouseInfoByFullCode(houseRackSid).getData();
         String houseName = "";
         String areaName = "";
-        String rackName = "";
+        String rackCode = "";
         String zoneName = "";
         if (null != infoVo) {
             if (StringUtils.isNotBlank(infoVo.getWarehouseName())) {
@@ -707,16 +707,14 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
             if (StringUtils.isNotBlank(infoVo.getWareAreaName())) {
                 areaName = infoVo.getWareAreaName();
             }
-            if (StringUtils.isNotBlank(infoVo.getWarehouseRackName())) {
-                rackName = infoVo.getWarehouseRackName();
+            if (StringUtils.isNotBlank(infoVo.getWarehouseRackCode())) {
+                rackCode = infoVo.getWarehouseRackCode();
             }
             if (StringUtils.isNotBlank(infoVo.getWarehouseZoneName())) {
                 zoneName = infoVo.getWarehouseZoneName();
             }
-            vo.setHouseName(houseName + "-" + zoneName + "-" + areaName);
-            if (StringUtils.isNotBlank(infoVo.getWarehouseRackCode())) {
-                vo.setHouseAddress(infoVo.getWarehouseRackCode());
-            }
+            vo.setHouseName(zoneName + "-" + areaName + " " + rackCode);
+            vo.setStore(houseName);
         } else {
             return null;
         }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/HouseRackH5Vo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/HouseRackH5Vo.java
index 9363c68c08..1ebd944dba 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/HouseRackH5Vo.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/HouseRackH5Vo.java
@@ -1,13 +1,8 @@
 package com.yxt.wms.biz.inventory.wmsinventory.appH5;
 
-import com.yxt.wms.biz.inventory.wmsgoodstag.app.ListElement;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -26,6 +21,16 @@ public class HouseRackH5Vo {
      * 库区名+库位名
      */
     private String houseName;
+
+    /**
+     * 仓库
+     */
+    private String store;
+    /**
+     * 格式例：区域-库区 库位编码
+     */
+    private String houseInfo;
+
     @ApiModelProperty("列表")
     public List<HouseRackListVo> list;
 
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/HouseRackListVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/HouseRackListVo.java
index 8a0f70adf1..dd0782dfb0 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/HouseRackListVo.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/HouseRackListVo.java
@@ -1,5 +1,6 @@
 package com.yxt.wms.biz.inventory.wmsinventory.appH5;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -10,6 +11,8 @@ import lombok.Data;
 @Data
 public class HouseRackListVo {
 
+    @ApiModelProperty("厂家名称")
+    private String manufacturerName;
     /**
      * 商品id
      */

From bd5370aa1d6b8ce830be6f84e5582d39404378a1 Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Mon, 24 Feb 2025 13:49:24 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=BA=93=E4=BD=8D=E6=8E=A5=E5=8F=A33?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.xml  | 3 +++
 .../biz/inventory/wmsgoodstag/WmsGoodsTagService.java    | 4 ++--
 .../wms/biz/inventory/wmsgoodstag/app/HouseRackVo.java   | 9 +++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.xml
index 8a562cf11c..014ff3f8ff 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.xml
@@ -45,6 +45,8 @@
         FROM
         (
         SELECT
+        CONCAT(z.zoneName, '-', ar.areaName,' ',r.rackCode) houseInfo,
+        i.warehouseName store,
         CONCAT( i.warehouseName, '-', ar.areaName ) AS houseName,
         r.sid AS houseSid,
         r.printCount AS printNum,
@@ -54,6 +56,7 @@
         wms_warehouse_rack AS r
         LEFT JOIN wms_warehouse_info AS i ON r.warehouseSid = i.sid
         LEFT JOIN wms_warehouse_area as ar ON r.locationSid = ar.sid
+        LEFT JOIN wms_warehouse_zone AS z ON r.zoneSid = z.sid
         ) AS a
         <where>
             ${ew.sqlSegment}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java
index f9380f3d79..fc3b48335a 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java
@@ -203,8 +203,8 @@ public class WmsGoodsTagService extends MybatisBaseService<WmsGoodsTagMapper, Wm
             qw.eq("a.useOrgSid", useOrgSid);
         }
         if (StringUtils.isNotBlank(query.getName())) {
-            qw.and(wrapper -> wrapper.like("a.houseName", query.getName())
-                    .or().like("a.houseNum", query.getName())
+            qw.and(wrapper -> wrapper.like("a.store", query.getName())
+                    .or().like("a.houseInfo", query.getName())
             );
         }
         //ToDo:添加查询条件
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/app/HouseRackVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/app/HouseRackVo.java
index 73fa5f40b7..e3acef9fff 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/app/HouseRackVo.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/app/HouseRackVo.java
@@ -26,4 +26,13 @@ public class HouseRackVo implements Vo {
      * 打印次数
      */
     private String printNum;
+
+    /**
+     * 仓库
+     */
+    private String store;
+    /**
+     * 格式例：区域-库区 库位编码
+     */
+    private String houseInfo;
 }

From c72b95d8317f5d5490d64a7d156c87936778f632 Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Mon, 24 Feb 2025 14:16:34 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=BA=93=E4=BD=8D=E6=8E=A5=E5=8F=A34?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
index 2eeb981d1c..7239e0e72d 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
@@ -713,7 +713,7 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
             if (StringUtils.isNotBlank(infoVo.getWarehouseZoneName())) {
                 zoneName = infoVo.getWarehouseZoneName();
             }
-            vo.setHouseName(zoneName + "-" + areaName + " " + rackCode);
+            vo.setHouseInfo(zoneName + "-" + areaName + " " + rackCode);
             vo.setStore(houseName);
         } else {
             return null;

From 9a762a1aa26e81ad5ad98b39d0f134f6ad59a181 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 24 Feb 2025 15:50:03 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E8=BD=A6?=
 =?UTF-8?q?=E8=BF=94=E5=88=A9=E6=A0=B8=E5=AF=B9=E3=80=81=E5=8D=95=E8=BD=A6?=
 =?UTF-8?q?=E8=BF=94=E5=88=A9=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bicyclerebatetobechecked.vue                   |  2 +-
 .../bicyclerebatemanagementAdd.vue                 | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
index 114de6b73a..d76a63314f 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
@@ -85,7 +85,7 @@
               <el-table-column prop="money" label="上传" align="center" width="100" />
             </el-table-column>
             <el-table-column label="日期" align="center">
-              <el-table-column prop="createTime" label="创建日期" align="center" width="95" />
+              <el-table-column prop="createTime" label="创建" align="center" width="95" />
               <el-table-column prop="withholdingDate" label="预提" align="center" width="95" />
               <el-table-column prop="uploadDate" label="上传" align="center" width="95" />
               <el-table-column prop="secondaryUploadDate" label="二次上传" align="center" width="95" />
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue
index fdcb3f6cc6..fe608359d7 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue
@@ -69,17 +69,17 @@
             </el-table-column>
             <el-table-column prop="brandName" label="品牌" align="center" width="120" />
             <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
-            <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
-            <el-table-column prop="manufactorSettlementPrice" label="车辆入库价" align="center" width="140"/>
-            <el-table-column prop="freight" label="其中运费" align="center" width="130" />
-            <el-table-column prop="topAmount" label="上装" align="center" width="120" />
-            <el-table-column prop="estimateRebate" label="预计返利" align="center" width="130" />
-            <el-table-column label="其中待支付费用" align="center" min-width="200">
+            <el-table-column prop="vinNo" label="车架号" align="center" width="90" />
+            <el-table-column prop="manufactorSettlementPrice" label="车辆入库价" align="center" width="110"/>
+            <el-table-column prop="freight" label="其中运费" align="center" width="100" />
+            <el-table-column prop="topAmount" label="上装" align="center" width="90" />
+            <el-table-column prop="estimateRebate" label="预计返利" align="center" width="100" />
+            <el-table-column label="其中待支付费用" align="center" width="300">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.expectTreatCost" @keyup.native="scope.row.expectTreatCost = getNumber(scope.row.expectTreatCost, 2)" clearable placeholder="待支付的相关人员返利等"></el-input>
               </template>
             </el-table-column>
-            <el-table-column label="其中抵顶费用" align="center" min-width="200">
+            <el-table-column label="其中抵顶费用" align="center" width="300">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.expectSuppCost" @keyup.native="scope.row.expectSuppCost = getNumber(scope.row.expectSuppCost, 2)" clearable placeholder="抵顶各种垫付款,例如垫付厂家人员房租"></el-input>
               </template>

From b93ebc726bacc60b64bb6c2a55232dd0ae872752 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 24 Feb 2025 16:01:22 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E8=BD=A6?=
 =?UTF-8?q?=E8=BF=94=E5=88=A9=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bikerebatemanagement/bicyclerebatemanagementAdd.vue   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue
index fe608359d7..49cfc7d983 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue
@@ -74,22 +74,22 @@
             <el-table-column prop="freight" label="其中运费" align="center" width="100" />
             <el-table-column prop="topAmount" label="上装" align="center" width="90" />
             <el-table-column prop="estimateRebate" label="预计返利" align="center" width="100" />
-            <el-table-column label="其中待支付费用" align="center" width="300">
+            <el-table-column label="其中待支付费用" align="center" width="225">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.expectTreatCost" @keyup.native="scope.row.expectTreatCost = getNumber(scope.row.expectTreatCost, 2)" clearable placeholder="待支付的相关人员返利等"></el-input>
               </template>
             </el-table-column>
-            <el-table-column label="其中抵顶费用" align="center" width="300">
+            <el-table-column label="其中抵顶费用" align="center" width="310">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.expectSuppCost" @keyup.native="scope.row.expectSuppCost = getNumber(scope.row.expectSuppCost, 2)" clearable placeholder="抵顶各种垫付款,例如垫付厂家人员房租"></el-input>
               </template>
             </el-table-column>
-            <el-table-column label="抵顶费用说明" align="center" min-width="200">
+            <el-table-column label="抵顶费用说明" align="center" min-width="250">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.expectSuppRemark" clearable placeholder=""></el-input>
               </template>
             </el-table-column>
-            <el-table-column label="备注" align="center" min-width="200">
+            <el-table-column label="备注" align="center" min-width="250">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.remarks" clearable placeholder=""></el-input>
               </template>