opt:单据按创建时间倒序查询，增加异常信息

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/ToPickPlatformTask.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.common.domain.exception.BadRequestException;
 import org.nl.common.enums.StatusEnum;
@@ -79,7 +80,9 @@ public class ToPickPlatformTask extends AbstractTask {
             throw new BadRequestException("当前载具存在任务:"+list.stream().map(SchBaseTask::getTask_code).collect(Collectors.joining(",")));
         }
         StIvtStructattr struct = iStIvtStructattrService.getOne(new QueryWrapper<StIvtStructattr>().eq("vehicle_code", vehicle_code));
-
+        if (ObjectUtils.isEmpty(struct)){
+            throw new BadRequestException("创建任务失败:未找到该物料对应起点仓位");
+        }
         SchBaseTask task = new SchBaseTask();
             task.setId(IdUtil.getStringId());
             task.setTask_code(CodeUtil.getNewCode("TASK_CODE"));

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/impl/CockpitServiceImpl.java

@@ -387,11 +387,11 @@ public class CockpitServiceImpl implements CockpitService {
 
     private static JSONObject getElapsedTime(JSONObject item, List<TaskInfo> stockList1) {
         //计算数量
-        BigDecimal total = stockList1.stream().map(TaskInfo::getQty)
+        BigDecimal total = stockList1.stream().filter(r->StringUtils.isNotBlank(r.getUpdate_time())).map(TaskInfo::getQty)
                 .reduce(BigDecimal.ZERO, BigDecimal::add).setScale(0, RoundingMode.HALF_UP);
         item.put("total", total);
         //计算箱数
-        int box = stockList1.stream()
+        int box = stockList1.stream().filter(r->StringUtils.isNotBlank(r.getUpdate_time()))
                 .mapToInt(taskInfo -> taskInfo.getVehicle_code().split(",").length)
                 .sum();
         item.put("box", box);
@@ -423,9 +423,10 @@ public class CockpitServiceImpl implements CockpitService {
         }
         if (ObjectUtil.isNotEmpty(real_qty)) {
             Map<String, BigDecimal> ghRealQtyMap = real_qty.stream()
-                    .collect(Collectors.toMap(
+                    .filter(r -> StringUtils.isNotBlank(r.getUpdate_time()))
+                    .collect(Collectors.groupingBy(
                             TaskInfo::getCreate_time,
-                            TaskInfo::getQty
+                            Collectors.reducing(BigDecimal.ZERO, TaskInfo::getQty, BigDecimal::add)
                     ));
             real_qty_default.forEach(tbItem -> {
                 String date = (String) tbItem.get("date");

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/mapper/CockpitMapper.xml

@@ -23,7 +23,7 @@
         `st_ivt_iostorinvdtl` d
         LEFT JOIN st_ivt_iostorinv i ON d.inv_id = i.id
         WHERE
-        d.`status` = '80'
+        i.`status`='80'
         AND i.create_time >=
         <choose>
             <when test="days == 0">
@@ -38,6 +38,7 @@
         SELECT
             i.`bill_type` as task_type,
             DATE_FORMAT(i.create_time,'%m-%d') as create_time ,
+            i.update_time,
             d.stor_code,
             d.qty,
             d.vehicle_code
@@ -45,7 +46,7 @@
             `st_ivt_iostorinvdtl` d
                 LEFT JOIN st_ivt_iostorinv i ON d.inv_id = i.id
         WHERE
-            d.`status` = '80'
+            i.`status` = '80'
           AND i.create_time >=  CURDATE() - INTERVAL 7  DAY
     </select>
     <select id="getPickingTask" resultType="org.nl.wms.pda_manage.cockpit.service.dao.TaskInfo">

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml

@@ -93,6 +93,7 @@
                 </foreach>
             </if>
         </where>
+        ORDER BY create_time DESC
     </select>
     <select id="selectChild" resultMap="dataDetail">
         select