1.odn重复使用

2.入库新增目的地

src/main/java/com/neotel/smfcore/custom/luxsan/api/LuxsanApi.java

@@ -736,7 +736,7 @@ public class LuxsanApi extends DefaultSmfApiListener {
                 return resultList;
                 return resultList;
             }
             }
 
 
-        } catch (ApiException e) {
+        } catch (Exception e) {
             log.error("fetchHoldInfo请求失败:" + e.getMessage());
             log.error("fetchHoldInfo请求失败:" + e.getMessage());
             //throw new ValidateException("smfcore.api.error", "接口请求失败[{0}]", new String[]{e.getMessage()});
             //throw new ValidateException("smfcore.api.error", "接口请求失败[{0}]", new String[]{e.getMessage()});
             return new ArrayList<>();
             return new ArrayList<>();
@@ -891,7 +891,7 @@ public class LuxsanApi extends DefaultSmfApiListener {
                 return resultList;
                 return resultList;
             }
             }
 
 
-        } catch (ApiException e) {
+        } catch (Exception e) {
             log.error("fetchShipmentInfo接口请求失败:" + e.getMessage());
             log.error("fetchShipmentInfo接口请求失败:" + e.getMessage());
             throw new ValidateException("smfcore.api.error", "接口请求失败[{0}]", new String[]{e.getMessage()});
             throw new ValidateException("smfcore.api.error", "接口请求失败[{0}]", new String[]{e.getMessage()});
         }
         }

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/OdnCheckOutNewController.java

@@ -68,7 +68,7 @@ public class OdnCheckOutNewController {
     @ApiOperation("获取odn要出库的箱子")
     @ApiOperation("获取odn要出库的箱子")
     @RequestMapping("/getOdnCheckOutBox")
     @RequestMapping("/getOdnCheckOutBox")
     @AnonymousAccess
     @AnonymousAccess
-    public ResultBean getOdnCheckOutBox(@RequestBody Map<String, String> paramMap) {
+    public synchronized ResultBean getOdnCheckOutBox(@RequestBody Map<String, String> paramMap) {
         log.info("收到odn出库信息为:" + JSON.toJSONString(paramMap));
         log.info("收到odn出库信息为:" + JSON.toJSONString(paramMap));
         //判断有没有正在执行的任务
         //判断有没有正在执行的任务
         if (StringUtils.isNotEmpty(liteOrderCache.hasExecutingOrder())) {
         if (StringUtils.isNotEmpty(liteOrderCache.hasExecutingOrder())) {
@@ -93,6 +93,22 @@ public class OdnCheckOutNewController {
         if (liteOrder == null) {
         if (liteOrder == null) {
             liteOrder = liteOrderManager.findByOrderNo(odn);
             liteOrder = liteOrderManager.findByOrderNo(odn);
         }
         }
+        if (liteOrder != null) {
+            String newOrder = odn + "_backup_"+System.currentTimeMillis();
+            liteOrder.setOrderNo(newOrder);
+            liteOrder.setClosed(true);
+            List<LiteOrderItem> newItemList = new ArrayList<>();
+            for (LiteOrderItem orderItem : liteOrder.getOrderItems()) {
+                orderItem.setOrderNo(newOrder);
+                newItemList.add(orderItem);
+            }
+            liteOrder.setOrderItems(newItemList);
+            liteOrder = liteOrderManager.createWithItems(liteOrder);
+            liteOrderCache.addOrderToMap(liteOrder);
+            liteOrder= null;
+        }
+
+
         if (liteOrder == null) {
         if (liteOrder == null) {
             liteOrder = odnInfoToLiteOrder(odn);
             liteOrder = odnInfoToLiteOrder(odn);
         }
         }

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/util/TaskLocUtil.java

@@ -3,6 +3,7 @@ package com.neotel.smfcore.custom.luxsan.factory_c.wipstor.util;
 public class TaskLocUtil {
 public class TaskLocUtil {
 
 
     public static final String  IN = "semiFinished_In";
     public static final String  IN = "semiFinished_In";
+    public static final String  IN_2 = "semiFinished_In_2";
     public static final String  OUT = "semiFinished_Out";
     public static final String  OUT = "semiFinished_Out";
     public static final String  NG = "semiFinished_ng";
     public static final String  NG = "semiFinished_ng";
     public static final String  MW = "semiFinished_mw"; //人工工位
     public static final String  MW = "semiFinished_mw"; //人工工位

src/main/resources/config/application-prod.yml

@@ -15,8 +15,10 @@ spring:
       host: 10.68.27.88      # 主机地址
       host: 10.68.27.88      # 主机地址
       port: 27017           # 端口
       port: 27017           # 端口
       database: wipsmf  #原材料仓数据库
       database: wipsmf  #原材料仓数据库
+      username: neotel
+      password: neotel
 
 
-#kafka配置
+  #kafka配置
   kafka:
   kafka:
     bootstrap-servers: 10.68.16.18:9092,10.68.16.19:9092,10.68.16.20:9092
     bootstrap-servers: 10.68.16.18:9092,10.68.16.19:9092,10.68.16.20:9092
     consumer:
     consumer: