基础信息-库位，库位导入修改

warewms-base/src/main/java/com/ruoyi/base/domain/BaseLocationInfo.java

@@ -54,7 +54,7 @@ public class BaseLocationInfo extends BaseEntity {
      * 排序号
      */
     @Excel(name = "排序号")
-    private Long rowIndex;
+    private String rowIndex;
 
     /**
      * 列号
@@ -198,11 +198,11 @@ public class BaseLocationInfo extends BaseEntity {
         return rowNo;
     }
 
-    public void setRowIndex(Long rowIndex) {
+    public void setRowIndex(String rowIndex) {
         this.rowIndex = rowIndex;
     }
 
-    public Long getRowIndex() {
+    public String getRowIndex() {
         return rowIndex;
     }
 

warewms-base/src/main/java/com/ruoyi/base/service/impl/BaseLocationInfoServiceImpl.java

@@ -363,7 +363,7 @@ public class BaseLocationInfoServiceImpl implements IBaseLocationInfoService {
             try {
                 if (StringUtils.isEmpty(baseLocationInfo.getLocationNo())) {
                     if (baseLocationInfo.getLocationType().equals("1")) {
-                        baseLocationInfo.setLocationNo(baseLocationInfo.getRowNo() + "-" + StringUtils.addZero(baseLocationInfo.getShiftNo(), 2) + "-" + StringUtils.addZero(baseLocationInfo.getShiftIndex().toString(), 2));
+                        baseLocationInfo.setLocationNo(baseLocationInfo.getColNo() + "-" + StringUtils.addZero(baseLocationInfo.getRowNo(), 2)+ "-" +StringUtils.addZero(baseLocationInfo.getRowIndex(),2));
                     } else {
                         baseLocationInfo.setLocationNo(baseLocationInfo.getRowNo() + "-" + StringUtils.addZero(baseLocationInfo.getColNo(), 2) + "-" + StringUtils.addZero(baseLocationInfo.getColIndex().toString(), 2));
                     }