1.uid出库禁用料修改

src/main/java/com/neotel/smfcore/core/message/rest/MessageController.java

@@ -35,10 +35,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.regex.Pattern;
 import java.util.regex.Pattern;
 
 
 @Slf4j
 @Slf4j
@@ -132,7 +129,9 @@ public class MessageController {
                 resultList.add("未找到对应的异常信息,请判断是否入库扫码失败等,重新入库");
                 resultList.add("未找到对应的异常信息,请判断是否入库扫码失败等,重新入库");
             }
             }
         }
         }
-        return ResultBean.newOkResult(resultList);
+        Map<String,List> resultMap = new HashMap<>();
+        resultMap.put(barcode.getBarcode(),resultList);
+        return ResultBean.newOkResult(resultMap);
     }
     }
 
 
 }
 }

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

@@ -669,6 +669,7 @@ public class StoragePosController {
                 Locale locale = request.getLocale();
                 Locale locale = request.getLocale();
                 header.add(Arrays.asList("条码编号"));
                 header.add(Arrays.asList("条码编号"));
                 header.add(Arrays.asList("料号"));
                 header.add(Arrays.asList("料号"));
+                header.add(Arrays.asList("是否禁用"));
                 header.add(Arrays.asList("LabelId"));
                 header.add(Arrays.asList("LabelId"));
                 header.add(Arrays.asList("状态"));
                 header.add(Arrays.asList("状态"));
                 header.add(Arrays.asList("库别"));
                 header.add(Arrays.asList("库别"));
@@ -697,6 +698,7 @@ public class StoragePosController {
                     }
                     }
                     data.add(barcode.getBarcode());
                     data.add(barcode.getBarcode());
                     data.add(barcode.getPartNumber());
                     data.add(barcode.getPartNumber());
+                    data.add(barcode.getDisableMsg());
                     data.add(barcode.getLabelId());
                     data.add(barcode.getLabelId());
 
 
                     if (barcode.getStatus() == BARCODE_STATUS.IN_STORE) {
                     if (barcode.getStatus() == BARCODE_STATUS.IN_STORE) {