1.根据唯一码获取尺寸信息 修改

2.获取工单时，如果工单已经存在，则提示出来

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -679,16 +679,20 @@ public class DeviceController {
     public ResultBean getHeightandWidthByCode(@RequestBody Map<String, String> paramMap) {
         String code = paramMap.get("code");
         if (StringUtils.isNotBlank(code)) {
-            Barcode barcode = codeResolve.resolveOneValideBarcode(code);
-            if (barcode != null) {
-                String partNumber = barcode.getPartNumber();
-                Component component = componentManager.findOneByPN(partNumber);
-                if (component != null) {
-                    Map<String, Object> resultMap = new HashMap<>();
-                    resultMap.put("partNumber", partNumber);
-                    resultMap.put("plateSize", component.getPlateSize());
-                    resultMap.put("height", component.getHeight());
-                    return ResultBean.newOkResult(resultMap);
+            String[] barcodeItemStrs = code.split("##");
+            for (String barcodeItemStr : barcodeItemStrs) {
+                log.info("开始解析:"+barcodeItemStr);
+                Barcode barcode = codeResolve.resolveCode(barcodeItemStr);
+                if (barcode != null) {
+                    String partNumber = barcode.getPartNumber();
+                    Component component = componentManager.findOneByPN(partNumber);
+                    if (component != null) {
+                        Map<String, Object> resultMap = new HashMap<>();
+                        resultMap.put("partNumber", partNumber);
+                        resultMap.put("plateSize", component.getPlateSize());
+                        resultMap.put("height", component.getHeight());
+                        return ResultBean.newOkResult(resultMap);
+                    }
                 }
             }
         }

src/main/java/com/neotel/smfcore/core/order/rest/OrderController.java

@@ -670,10 +670,16 @@ public class OrderController {
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"orderNo"});
         }
 
-        LiteOrder liteOrder = smfApi.fetchOrder(orderNo, SecurityUtils.getCurrentUsername());
+        //判断工单是否存在
+        LiteOrder liteOrder = liteOrderManager.findByOrderNo(orderNo);
+        if (liteOrder != null){
+            throw new ValidateException("smfcore.order.ameExists", "工单名称[{0}]已存在",new String[]{orderNo});
+        }
 
+        //从api获取
+        liteOrder = smfApi.fetchOrder(orderNo, SecurityUtils.getCurrentUsername());
         if (liteOrder == null) {
-            throw new ValidateException("smfcore.api.noUrl", "未配置API地址");
+            throw new ValidateException("smfcore.order.out.notFound", "工单未找到");
         }
 
         OrderDto dto = orderMapper.toDto(liteOrder);