修改扫码返回库位接口2

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,

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;
         }

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;
 

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