Merge remote-tracking branch 'origin/master'

3 months ago · 259554297b
11 changed files with 55 additions and 27 deletions
--- 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("更新员工信息成功");
    }
--- 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("修改成功");
    }

--- 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" />
--- 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,27 +69,27 @@
            </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="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" min-width="200">
+            <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>
--- 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}
--- 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:添加查询条件
--- 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;
 }
--- 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,
--- 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.setHouseInfo(zoneName + "-" + areaName + " " + rackCode);
+            vo.setStore(houseName);
        } else {
            return null;
        }
--- 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;

--- 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
     */