1.扫码灭灯功能提交

src/main/java/com/neotel/smfcore/common/init/MenuInit.java

@@ -164,7 +164,7 @@ public class MenuInit {
         addDefaultFunctionMenu(13, poutOut, "呆滞物料", "sluggishMaterials", "system/sluggishMaterials/index",  "sMaterial");
         addDefaultFunctionMenu(13, poutOut, "呆滞物料", "sluggishMaterials", "system/sluggishMaterials/index",  "sMaterial");
         //addDefaultFunctionMenu(16, poutOut,"生成工单", "createOrder", "system/createOrder/index",  "createOrder");
         //addDefaultFunctionMenu(16, poutOut,"生成工单", "createOrder", "system/createOrder/index",  "createOrder");
 //        addDefaultFunctionMenu(91,poutOut, "共享文件夹", "orderSetting", "system/orderSetting/index", "sysSet",DEFAULT_SHOW_MENU);
 //        addDefaultFunctionMenu(91,poutOut, "共享文件夹", "orderSetting", "system/orderSetting/index", "sysSet",DEFAULT_SHOW_MENU);
-
+        addDefaultFunctionMenu(120,poutOut,  "扫码灭灯", "codeLight", "neolight/codeLight/index","findOut");
 
 
         //MSD管理：MSD库存.MSD追溯性.MSD设置
         //MSD管理：MSD库存.MSD追溯性.MSD设置
         Menu msd = Menu.CreatePMenu("MSD管理", 4, "msd", "MSD",null);
         Menu msd = Menu.CreatePMenu("MSD管理", 4, "msd", "MSD",null);

src/main/java/com/neotel/smfcore/custom/zhongche1568/bean/dto/ShelfDto.java

+package com.neotel.smfcore.custom.zhongche1568.bean.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ShelfDto {
+    @ApiModelProperty("料架rfid")
+    private String rfid ;
+    @ApiModelProperty("位置")
+    private String loc ;
+    @ApiModelProperty("工单信息")
+    private String orderNo ;
+
+    @ApiModelProperty("物料列表")
+    private List<ShelfReelDto> reelList;
+}

src/main/java/com/neotel/smfcore/custom/zhongche1568/bean/dto/ShelfReelDto.java

+package com.neotel.smfcore.custom.zhongche1568.bean.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ShelfReelDto implements Serializable {
+    @ApiModelProperty("PN")
+    private String pn;
+    @ApiModelProperty("RI")
+    private String ri;
+    @ApiModelProperty("库位号")
+    private String posName;
+    @ApiModelProperty("是否有任务")
+    private boolean hasTask = false;
+}

src/main/java/com/neotel/smfcore/custom/zhongche1568/controller/ZhongCheAgvController.java

@@ -14,9 +14,7 @@ import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -57,12 +55,12 @@ public class ZhongCheAgvController {
                 line = line.substring(0,line.lastIndexOf("-"));
                 line = line.substring(0,line.lastIndexOf("-"));
             }
             }
             //判断是否还有任务
             //判断是否还有任务
-            /*boolean hasLastShelf = hasLastShelf(shelfInfo.getOrderNo());
+            boolean hasLastShelf = hasLastShelf(shelfInfo.getOrderNo());
             try {
             try {
                 zhongcheApi.shelfFullNotification(shelfInfo, hasLastShelf);
                 zhongcheApi.shelfFullNotification(shelfInfo, hasLastShelf);
             }catch (ValidateException e){
             }catch (ValidateException e){
-                return ResultBean.newErrorResult(-1,e.getMsgKey(),e.getMessage(),e.getMsgParam());
-            }*/
+                //return ResultBean.newErrorResult(-1,e.getMsgKey(),e.getMessage(),e.getMsgParam());
+            }
 
 
 
 
             log.info("getShelfTargetLoc 料架 ，rfid=[" + rfid + "]，目标位置：[" + line + "]");
             log.info("getShelfTargetLoc 料架 ，rfid=[" + rfid + "]，目标位置：[" + line + "]");