add: 物料信息添加入库天数显示,任务新增执行时间

lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java

@@ -15,6 +15,7 @@
  */
 package org.nl.system.controller.user;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.secure.SaSecureUtil;
 import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -66,7 +67,7 @@ public class UserController {
     @Log("新增用户")
     @ApiOperation("新增用户")
     @PostMapping
-//    @SaCheckPermission("user:add")
+    @SaCheckPermission("user:add")
     public ResponseEntity<Object> create(@RequestBody Map user){
         userService.create(user);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -75,7 +76,7 @@ public class UserController {
     @Log("修改用户")
     @ApiOperation("修改用户")
     @PutMapping
-//    @SaCheckPermission("user:edit")
+    @SaCheckPermission("user:edit")
     public ResponseEntity<Object> update( @RequestBody Map resources) throws Exception {
         userService.update(resources);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -95,7 +96,7 @@ public class UserController {
     @Log("删除用户")
     @ApiOperation("删除用户")
     @DeleteMapping
-//    @SaCheckPermission("user:del")
+    @SaCheckPermission("user:del")
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
         userService.removeByIds(ids);
         return new ResponseEntity<>(HttpStatus.OK);

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -570,6 +570,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                             log.info("wms反馈sorting->JobName完成,失败{}", e.getMessage());
                         }
                     }
+                    schBaseTask.setCarry_out_time(DateUtil.now());
+                    taskService.update(schBaseTask);
                 } else {
                     throw new BadRequestException("LMS向Connector请求取货");
                 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java

@@ -117,6 +117,7 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl<SchBaseV
             item.setBetween(daysBetween + "");
             item.setHas_work(true);
         });
+        schBaseVehiclematerialgroupIPage.getRecords().sort(Comparator.comparingLong(group -> Long.parseLong(group.getBetween())));
         return schBaseVehiclematerialgroupIPage;
     }
 

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java

@@ -135,4 +135,10 @@ public interface ISchBaseTaskService extends IService<SchBaseTask> {
      * @return
      */
     List<SchBaseTask> queryAll(Map whereJson);
+
+    /**
+     * 根据点位查询未完成的任务
+     * @return
+     */
+    List<SchBaseTask> selectNoFinishTaskByPointCode(String taskCode,String pointCode);
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java

@@ -131,6 +131,9 @@ public class SchBaseTask implements Serializable {
     @ApiModelProperty(value = "修改时间")
     private String update_time;
 
+    @ApiModelProperty(value = "执行时间")
+    private String carry_out_time;
+
     @ApiModelProperty(value = "点位1高度")
     private String point_code1_height="0";
 

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java

@@ -359,10 +359,11 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
             task.add(item.getPoint_code1());
             task.add(item.getPoint_code2());
             task.add(item.getCreate_time());
+            task.add(item.getCarry_out_time());
             task.add(item.getUpdate_time());
             jsonObjects.add(task);
         });
-        String[] tableHeaderArr = {"任务ID", "任务编码", "任务状态", "配置编码", "载具类型", "载具号", "提示信息", "起点", "终点", "创建时间", "修改时间"};
+        String[] tableHeaderArr = {"任务ID", "任务编码", "任务状态", "配置编码", "载具类型", "载具号", "提示信息", "起点", "终点", "创建时间","执行时间", "修改时间"};
         String fileName = "导出文件.csv";
         byte[] bytes = writeExcelAfterToBytes(tableHeaderArr, jsonObjects);
         responseSetProperties(fileName, bytes, response);
@@ -392,6 +393,15 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
         return schBaseTaskMapper.selectList(lam);
     }
 
+    @Override
+    public List<SchBaseTask> selectNoFinishTaskByPointCode(String taskCode,String pointCode) {
+        return schBaseTaskMapper.selectList(Wrappers.lambdaQuery(SchBaseTask.class)
+                .lt(SchBaseTask::getTask_status, TaskStatus.FINISHED.getCode())
+                .eq(SchBaseTask::getPoint_code1, pointCode)
+                .or()
+                .eq(SchBaseTask::getPoint_code2, pointCode));
+    }
+
     public static byte[] writeExcelAfterToBytes(String[] headers, ArrayList<List> cellList) {
         ExcelWriter writer = null;
         ByteArrayOutputStream outputStream = null;

lms/nladmin-ui/src/views/wms/sch/task/index.vue

@@ -224,6 +224,7 @@
         <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
         <el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
         <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
+        <el-table-column prop="carry_out_time" label="执行时间" :min-width="flexWidth('carry_out_time',crud.data,'执行时间')" />
         <el-table-column v-permission="[]" label="操作" width="160px" align="center" fixed="right">
           <template slot-scope="scope">
             <el-button