Merge remote-tracking branch 'origin/master'

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml

@@ -364,6 +364,7 @@
     </select>
     <select id="selGoodsH5Vo" resultType="com.yxt.wms.biz.inventory.wmsinventory.appH5.GoodsTagH5Vo">
         SELECT wi.goodsID,
+               wi.manufacturerName,
                b.supplierName  provider,
                wi.goodsSpuName goodsName,
                wi.goodsSkuCode numId,
@@ -381,11 +382,13 @@
             resultType="com.yxt.wms.biz.inventory.wmsinventory.appH5.GoodsListTagH5Vo">
         SELECT wi.count                                 num,
                r.rackCode                               houseAddress,
-               CONCAT(i.warehouseName, '-', a.areaName) houseName
+               CONCAT(z.zoneName, '-', a.areaName,' ',r.rackCode) houseInfo,
+               i.warehouseName store
         FROM wms_inventory AS wi
                  LEFT JOIN wms_warehouse_info AS i ON wi.warehouseSid = i.sid
                  LEFT JOIN wms_warehouse_rack AS r ON wi.warehouseRackSid = r.sid
                  LEFT JOIN wms_warehouse_area AS a ON r.locationSid = a.sid
+                 LEFT JOIN wms_warehouse_zone AS z ON r.zoneSid = z.sid
         WHERE wi.goodsID = #{goodsID}
     </select>
 

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsListTagH5Vo.java

@@ -23,4 +23,13 @@ public class GoodsListTagH5Vo {
      */
     private String num;
 
+
+    /**
+     * 仓库
+     */
+    private String store;
+    /**
+     * 格式例：区域-库区 库位编码
+     */
+    private String houseInfo;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsTagH5Vo.java

@@ -1,8 +1,8 @@
 package com.yxt.wms.biz.inventory.wmsinventory.appH5;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -13,6 +13,11 @@ import java.util.List;
 @Data
 public class GoodsTagH5Vo {
 
+    @ApiModelProperty("商品ID（唯一编码，入库时生成，生成规则为商品编码+YYMMdd+4位流水）")
+    private String goodsID;
+
+    @ApiModelProperty("厂家名称")
+    private String manufacturerName;
     /**
      * 商品名称
      */