From d61db365fdfaf3c9556e7fbcf3c6bf6df54688f1 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Thu, 7 Dec 2023 14:53:55 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9newcode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/modules/system/util/CodeUtil.java     | 16 +++++++++-------
 .../service/impl/HandPFOutIvtServiceImpl.java    |  2 --
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java
index 01ea0087..43e17d9b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java
@@ -13,13 +13,15 @@ public class CodeUtil {
         HashMap<String,String> map = new HashMap<>();
         map.put("flag",flag);
         map.put("code",ruleCode);
-        if ("TASK_CODE".equals(ruleCode)){
-            GenCodeServiceImpl service = SpringContextHolder.getBean(GenCodeServiceImpl.class);
-            return service.taskCode(map);
-        }else {
-            GenCodeService service=new GenCodeServiceImpl();
-            return service.codeDemo(map);
-        }
+        GenCodeServiceImpl service = SpringContextHolder.getBean(GenCodeServiceImpl.class);
+        return service.taskCode(map);
+//        if ("TASK_CODE".equals(ruleCode)){
+//            GenCodeServiceImpl service = SpringContextHolder.getBean(GenCodeServiceImpl.class);
+//            return service.taskCode(map);
+//        }else {
+//            GenCodeService service=new GenCodeServiceImpl();
+//            return service.codeDemo(map);
+//        }
     }
 
     public  static  String getNewCode2(String ruleCode){
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java
index 0e86c917..5fb1f9dd 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java
@@ -750,7 +750,6 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService {
     public Map<String, Object> backStore(Map<String, String> jsonObject) {
         String point_code = jsonObject.get("point_code");
         String storagevehicle_code = jsonObject.get("storagevehicle_code");
-        JSONObject vehiclejo = WQLObject.getWQLObject("md_pb_storagevehicleinfo").query("storagevehicle_code='" + storagevehicle_code + "' and is_delete='0' and is_used='1'").uniqueResult(0);
         if (StrUtil.isEmpty(point_code)) {
             throw new PdaRequestException("请选择一个点位");
         }
@@ -821,7 +820,6 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService {
 
         //生成移库单(调用pc的移库单据)
         int seq_no = 1;
-        String task_id = IdUtil.getSnowflake(1, 1).nextId() + "";
         //根据其中一种物料寻找一个合适的仓位
         MaterialbaseDto materialbaseDto = materialbaseService.findById(Long.valueOf(bucketrows.getJSONObject(0).getString("material_id")));
         Long material_type_id = materialbaseDto.getMaterial_type_id();