1.库位上传,增加 Column-Magazine-Layer-Slot(列-模组-层-槽位) 字段

src/main/java/com/neotel/smfcore/core/storage/rest/StorageController.java

@@ -435,6 +435,10 @@ public class StorageController {
             titles.add("pri");
             titles.add("pri");
             titles.add(("h"));
             titles.add(("h"));
             titles.add("w");
             titles.add("w");
+            titles.add("column");  //列
+            titles.add("magazine"); //模组
+            titles.add("layer"); //层
+            titles.add("slot"); //槽位
             for(int i=1;i<=10;i++) {
             for(int i=1;i<=10;i++) {
 
 
                 Map<String, Object> map = new LinkedHashMap<>();
                 Map<String, Object> map = new LinkedHashMap<>();
@@ -443,6 +447,10 @@ public class StorageController {
                 map.put("pri",  i);
                 map.put("pri",  i);
                 map.put("h", 8);
                 map.put("h", 8);
                 map.put("w", 7);
                 map.put("w", 7);
+                map.put("column", "");
+                map.put("magazine", "");
+                map.put("layer", "");
+                map.put("slot", "");
                 maps.add(map);
                 maps.add(map);
             }
             }
 
 
@@ -477,6 +485,10 @@ public class StorageController {
         int warmPosIndex = csvRead.getHasCsvIndex("回温库位","warmPos");//true表示回温区库位，
         int warmPosIndex = csvRead.getHasCsvIndex("回温库位","warmPos");//true表示回温区库位，
         int areaIndex = csvRead.getHasCsvIndex("区域","area");
         int areaIndex = csvRead.getHasCsvIndex("区域","area");
         int posTypeIndex = csvRead.getHasCsvIndex("库位类型","posType");
         int posTypeIndex = csvRead.getHasCsvIndex("库位类型","posType");
+        int columnIndex = csvRead.getHasCsvIndex("列","column");
+        int magazineIndex = csvRead.getHasCsvIndex("模组","magazine");
+        int layerIndex = csvRead.getHasCsvIndex("层","layer");
+        int slotIndex = csvRead.getHasCsvIndex("槽位","slot");
 
 
 
 
         int row = 1;
         int row = 1;
@@ -495,6 +507,10 @@ public class StorageController {
             Integer width =0;
             Integer width =0;
             String labelName="";
             String labelName="";
             Integer posType=0;
             Integer posType=0;
+            String column = lineValues[columnIndex];  //lie
+            String magazine = lineValues[magazineIndex]; //模组
+            String layer = lineValues[layerIndex]; //层
+            String slot = lineValues[slotIndex]; //槽位
             try {
             try {
                  priority =Integer.parseInt(lineValues[priIndex]) ;
                  priority =Integer.parseInt(lineValues[priIndex]) ;
                  height = Integer.parseInt(lineValues[hIndex]);
                  height = Integer.parseInt(lineValues[hIndex]);
@@ -535,6 +551,10 @@ public class StorageController {
                 posInfo=new StoragePos(storageId,posName,height,width,priority);
                 posInfo=new StoragePos(storageId,posName,height,width,priority);
                 posInfo.setWarmPos(isWarmPos);
                 posInfo.setWarmPos(isWarmPos);
                 posInfo.setLabelName(labelName);
                 posInfo.setLabelName(labelName);
+                posInfo.setColumn(column);
+                posInfo.setMagazine(magazine);
+                posInfo.setSlot(slot);
+                posInfo.setLayer(layer);
                 newRowCount++;
                 newRowCount++;
                 newList.add(posInfo);
                 newList.add(posInfo);
             }else{
             }else{
@@ -553,6 +573,26 @@ public class StorageController {
                     posInfo.setLabelName(labelName);
                     posInfo.setLabelName(labelName);
                     needUpdate=true;
                     needUpdate=true;
                 }
                 }
+                column = column == null ? "" : column;
+                magazine = magazine == null ? "" : magazine;
+                layer = layer == null ? "" : layer;
+                slot = slot == null ? "" : slot;
+                if (!column.equals(posInfo.getColumn())){
+                    posInfo.setColumn(column);
+                    needUpdate = true;
+                }
+                if (!magazine.equals(posInfo.getMagazine())){
+                    posInfo.setMagazine(magazine);
+                    needUpdate = true;
+                }
+                if (!layer.equals(posInfo.getLayer())){
+                    posInfo.setLayer(layer);
+                    needUpdate = true;
+                }
+                if (!slot.equals(posInfo.getSlot())){
+                    posInfo.setSlot(slot);
+                    needUpdate = true;
+                }
                 if(needUpdate){
                 if(needUpdate){
                     updateRowCount++;
                     updateRowCount++;
                     storagePosManager.save(posInfo);
                     storagePosManager.save(posInfo);

src/main/java/com/neotel/smfcore/core/storage/rest/dto/StoragePosDto.java

@@ -78,5 +78,15 @@ public class StoragePosDto implements Serializable {
     @ApiModelProperty("组名称")
     @ApiModelProperty("组名称")
     private String groupName = "";
     private String groupName = "";
 
 
+    @ApiModelProperty("列")
+    private String column;
 
 
+    @ApiModelProperty("模组")
+    private String magazine;
+
+    @ApiModelProperty("层")
+    private String layer;
+
+    @ApiModelProperty("槽位")
+    private String slot;
 }
 }

src/main/java/com/neotel/smfcore/core/storage/service/po/StoragePos.java

@@ -116,6 +116,26 @@ public class StoragePos extends BasePo implements Serializable {
      */
      */
     private List<String> mergePosList;
     private List<String> mergePosList;
 
 
+    /**
+     * 列
+     */
+    private String column;
+
+    /**
+     * 模组
+     */
+    private String magazine;
+
+    /**
+     * 层
+     */
+    private String layer;
+
+    /**
+     * 槽位
+     */
+    private String slot;
+
 
 
     public String getLabelStr(){
     public String getLabelStr(){
         String posNameLabel = posName;
         String posNameLabel = posName;