1.挑料按入库时间,排序

2.任务已经修改过状态,直接返回ok

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -2363,7 +2363,7 @@ public class LiteOrderCache {
 
     private  List<StoragePos> findTargetPos(List<StoragePos> numbers, int targetNum) {
         numbers.sort((a, b) -> Integer.valueOf(b.getBarcode().getQty()).compareTo(Integer.valueOf(a.getBarcode().getQty())));
-        //System.out.println(numbers);
+        Collections.sort(numbers, (s1, s2) -> Long.compare(s2.getBarcode().getPutInTime(), s1.getBarcode().getPutInTime()));
         int target = targetNum;
         List<StoragePos> result = new ArrayList<>();
         for (int i = 0; i < 3000; i++) {

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

@@ -116,7 +116,7 @@ public class AgvDeviceController {
 
         //2.判断更新状态和当前状态任务是否相同
         if (task.getStatus().equals(statusStr)) {
-            return ResultBean.newErrorResult(-1, "smfcore.taskStatusHasUpdate", "任务{0}已经修改状态", new String[]{task.getBarcode()});
+            return ResultBean.newOkResult("");
         }