no message

youchain-system/src/main/java/com/youchain/appupdate/service/impl/NioF3AppServiceImpl.java

@@ -163,6 +163,15 @@ public class NioF3AppServiceImpl implements NioF3AppService {
             throw new BadRequestException("料箱和Dolly未扫描绑定");
         }
 
+        for (BoxAndDolly item : bindLarge.getBoxAndDolly()) {
+            if (item.getBoxNo() == null || item.getBoxNo().trim().isEmpty()) {
+                throw new BadRequestException("料箱必填");
+            }
+            if (item.getDolly() == null || item.getDolly().trim().isEmpty()) {
+                throw new BadRequestException("Dolly编号必填");
+            }
+        }
+
         //验证起点
         pointService.validatePoint(bindLarge.getSrcPositionCode());
     }

youchain-system/src/main/java/com/youchain/businessdata/service/impl/KMReServiceImpl.java

@@ -362,45 +362,30 @@ public class KMReServiceImpl implements KMReService {
                 .map(String::trim)
                 .filter(s -> !s.isEmpty())
                 .collect(Collectors.toList());
-        if (stations.size() == 1) {
+
+        //途径点
+        for (int i = 0; i < stations.size(); i++) {
             JSONObject missionDataObj2 = new JSONObject(true);
             Map<String, Object> missionDataMap2 = new LinkedHashMap<>();
-            missionDataMap2.put("sequence", 2);//序号
+            int sequence = (1 + (i + 1));
+            missionDataMap2.put("sequence", sequence);//序号
             missionDataMap2.put("type", "NODE_POINT");//作业类型:点位：NODE_POINT;区域：NODE_AREA
-            missionDataMap2.put("position", stations.get(0));//终点
+            missionDataMap2.put("position", stations.get(i));//途径点
-            missionDataMap2.put("actionType", "TUGGER_DETACH");//动作：TUGGER_ATTACH：挂钩；TUGGER_DETACH：脱钩
+            missionDataMap2.put("passStrategy", "MANUAL");//当前任务点结束后放行策略:自动：AUTO;手动：MANUAL
-            missionDataMap2.put("passStrategy", "AUTO");//当前任务点结束后放行策略:自动：AUTO;手动：MANUAL
-            missionDataMap2.put("waitingMillis", 0);//自动触发离开当前任务节点的时间，默认单位:毫秒
             missionDataObj2.putAll(missionDataMap2);
             missionDataArray.add(missionDataObj2);
-        } else {
-            //途径点
-            List<String> waypoints = stations.subList(0, stations.size() - 1);
-            for (int i = 0; i < waypoints.size(); i++) {
-                JSONObject missionDataObj3 = new JSONObject(true);
-                Map<String, Object> missionDataMap3 = new LinkedHashMap<>();
-                int sequence = (1 + (i + 1));
-                missionDataMap3.put("sequence", sequence);//序号
-                missionDataMap3.put("type", "NODE_POINT");//作业类型:点位：NODE_POINT;区域：NODE_AREA
-                missionDataMap3.put("position", waypoints.get(i));//途径点
-                missionDataMap3.put("actionType", "");//动作：TUGGER_ATTACH：挂钩；TUGGER_DETACH：脱钩；移动
-                missionDataMap3.put("passStrategy", "MANUAL");//当前任务点结束后放行策略:自动：AUTO;手动：MANUAL
-                missionDataMap3.put("waitingMillis", 0);//自动触发离开当前任务节点的时间，默认单位:毫秒
-                missionDataObj3.putAll(missionDataMap3);
-                missionDataArray.add(missionDataObj3);
         }
 
-            JSONObject missionDataObj4 = new JSONObject(true);
+        JSONObject missionDataObj3 = new JSONObject(true);
-            Map<String, Object> missionDataMap4 = new LinkedHashMap<>();
+        Map<String, Object> missionDataMap3 = new LinkedHashMap<>();
-            missionDataMap4.put("sequence", stations.size() + 1);//序号
+        missionDataMap3.put("sequence", stations.size() + 2);//序号
-            missionDataMap4.put("type", "NODE_POINT");//作业类型:点位：NODE_POINT;区域：NODE_AREA
+        missionDataMap3.put("type", "NODE_POINT");//作业类型:点位：NODE_POINT;区域：NODE_AREA
-            missionDataMap4.put("position", stations.get(stations.size() - 1));//终点
+        missionDataMap3.put("position", point.getBeatCode());//终点
-            missionDataMap4.put("actionType", "TUGGER_DETACH");//动作：TUGGER_ATTACH：挂钩；TUGGER_DETACH：脱钩
+        missionDataMap3.put("actionType", "TUGGER_DETACH");//动作：TUGGER_ATTACH：挂钩；TUGGER_DETACH：脱钩
-            missionDataMap4.put("passStrategy", "AUTO");//当前任务点结束后放行策略:自动：AUTO;手动：MANUAL
+        missionDataMap3.put("passStrategy", "AUTO");//当前任务点结束后放行策略:自动：AUTO;手动：MANUAL
-            missionDataMap4.put("waitingMillis", 0);//自动触发离开当前任务节点的时间，默认单位:毫秒
+        missionDataMap3.put("waitingMillis", 0);//自动触发离开当前任务节点的时间，默认单位:毫秒
-            missionDataObj4.putAll(missionDataMap4);
+        missionDataObj3.putAll(missionDataMap3);
-            missionDataArray.add(missionDataObj4);
+        missionDataArray.add(missionDataMap3);
-        }
 
         objMap.put("missionData", missionDataArray);
         jsonObject.putAll(objMap);

youchain-system/src/main/java/com/youchain/businessdata/service/impl/LesServiceImpl.java

@@ -165,7 +165,7 @@ public class LesServiceImpl implements LesService {
         Dict dict = dictRepository.findDictByName("OPEN");
         String resultJson = "";
         if (dict != null) {
-            resultJson = HttpPostUtil.sendPostReq(UrlApi.submitMission(), json);
+            resultJson = HttpPostUtil.sendPostReq(UrlApi.lesCallBack(), json);
             if (StringUtils.isEmpty(resultJson)) {
                 throw new BadRequestException("LES返回信息:LES回传接口调用失败!");
             }

youchain-system/src/main/java/com/youchain/utils/UrlApi.java

@@ -61,6 +61,9 @@ public class UrlApi {
         return getByKey("updateTuggerTrailerInfo" + URL_SUFFIX);
     }
 
-
+    //les回传
+    public static String lesCallBack() {
+        return getByKey("lesCallBack" + URL_SUFFIX);
+    }
 
 }