1.增加成品仓上架/下架接口

2.设备管理增加所属料仓

src/main/java/com/neotel/smfcore/core/storage/enums/CORRESPONDING_WAREHOUSE.java

+package com.neotel.smfcore.core.storage.enums;
+
+public class CORRESPONDING_WAREHOUSE {
+
+    //电子仓
+    public static final int ELECTRONIC_WAREHOUSE = 0;
+
+    //结构仓
+    public static final int STRUCTURAL_WAREHOUSE = 1;
+
+    //成品仓
+    public static final int FINISHED_GOODS_WAREHOUSE = 2;
+
+}

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

@@ -68,4 +68,7 @@ public class StorageDto implements Serializable {
 
 
     @ApiModelProperty("是否可以合并库位")
     @ApiModelProperty("是否可以合并库位")
     private boolean mergePos=false;
     private boolean mergePos=false;
+
+    @ApiModelProperty("所属仓库")
+    private int correspondingWarehouse = -1;
 }
 }

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

@@ -6,6 +6,7 @@ import com.neotel.smfcore.core.storage.enums.DeviceType;
 import com.neotel.smfcore.common.utils.StorageConstants;
 import com.neotel.smfcore.common.utils.StorageConstants;
 import com.neotel.smfcore.core.barcode.bean.PlateSizeBean;
 import com.neotel.smfcore.core.barcode.bean.PlateSizeBean;
 import com.neotel.smfcore.core.storage.bean.UsageItem;
 import com.neotel.smfcore.core.storage.bean.UsageItem;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 
@@ -81,6 +82,9 @@ public class Storage extends BasePo implements Serializable {
     private boolean mergePos=false;
     private boolean mergePos=false;
 
 
 
 
+    private int correspondingWarehouse = -1;
+
+
 //    /**
 //    /**
 //     * 是否是上下层的在线料仓
 //     * 是否是上下层的在线料仓
 //     * @return
 //     * @return

src/main/java/com/neotel/smfcore/custom/aiqingzhiyin1643/Aiqingzhiyin1643Menu.java

@@ -25,8 +25,14 @@ public class Aiqingzhiyin1643Menu {
     @PostConstruct
     @PostConstruct
     public void init(){
     public void init(){
         String menuLabel = "1643";
         String menuLabel = "1643";
-        Menu poutOut = Menu.CreatePMenu("物料管理", 3, "order", "workOrder", null);
-        MenuInit.addMenu(menuLabel,poutOut,99, "上架/下架","putAwayPutOut", "system/putAwayPutOut/index","putAwayPutOut");
+        /*Menu poutOut = Menu.CreatePMenu("物料管理", 3, "order", "workOrder", null);
+        MenuInit.addMenu(menuLabel,poutOut,99, "上架/下架","putAwayPutOut", "system/putAwayPutOut/index","putAwayPutOut");*/
+
+
+        Menu finishedGoodsWarehouse = Menu.CreatePMenu("成品仓管理", 4, "finishedGoodsWarehouse", "FGStorage", null);
+        MenuInit.addMenu(menuLabel,finishedGoodsWarehouse,1, "上架","putAway", "neolight/putAway/index","putAway");
+        MenuInit.addMenu(menuLabel,finishedGoodsWarehouse,2, "下架","putOut", "neolight/putOut/index","putOut");
+
         String apiName = smfApi.getApiName();
         String apiName = smfApi.getApiName();
         if(Strings.isNotBlank(apiName) && apiName.equals(menuLabel)){
         if(Strings.isNotBlank(apiName) && apiName.equals(menuLabel)){
             menuInit.showMenu(apiName);
             menuInit.showMenu(apiName);