From 57ae0c8f7a909327ed6058c0e78e8f808f91be4a Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 01 二月 2024 15:56:20 +0800
Subject: [PATCH] 1.导入自动解析主体、车间以及产线 2.增加搜索字段
---
src/main/java/com/zy/asrs/controller/NodeController.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/NodeController.java b/src/main/java/com/zy/asrs/controller/NodeController.java
index 1a3d6b3..84356f1 100644
--- a/src/main/java/com/zy/asrs/controller/NodeController.java
+++ b/src/main/java/com/zy/asrs/controller/NodeController.java
@@ -13,9 +13,8 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.Node;
import com.zy.asrs.entity.param.InitPakoutParam;
-import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.entity.param.NodeInitPatam;
import com.zy.asrs.entity.param.PakinParam;
import com.zy.asrs.entity.result.KeyValueVo;
@@ -24,7 +23,6 @@
import com.zy.common.entity.NodeExcel;
import com.zy.common.entity.NodeExcelListener;
import com.zy.common.entity.Parameter;
-import com.zy.common.model.Shelves;
import com.zy.common.utils.ListUtils;
import com.zy.common.utils.NodeUtils;
import com.zy.common.utils.TreeUtils;
@@ -38,8 +36,6 @@
import java.io.IOException;
import java.net.URLEncoder;
import java.util.*;
-
-import static jdk.nashorn.api.scripting.ScriptUtils.convert;
@RestController
public class NodeController extends BaseController {
@@ -389,11 +385,14 @@
}
}else {
- locNo = param.getName()+"-" +String.format("%02d", r) + String.format("%02d", b) + String.format("%02d", l);
+ locNo = param.getName()+String.format("%02d", r) + String.format("%02d", b) + String.format("%02d", l);
}
-
-
+ //瀹㈡埛瑕佹眰鏍煎紡浣岮-01-01-01
+ StringBuilder sb = new StringBuilder(locNo);
+ sb.insert(sb.length()-4,"-");
+ sb.insert(sb.length()-2,"-");
+ locNo = sb.toString();
if (locNo == null){
continue;
--
Gitblit v1.9.1