盘点接口调整

src/main/java/com/jsh/erp/controller/pda/PdaController.java

@@ -169,15 +169,22 @@ public class PdaController extends BaseController {
 
     @ApiOperation("开始任务")
     @GetMapping("/startTask/{id}")
-    public AjaxResult startTask(@PathVariable("id") Long id) {
-        taskStocktakingService.update(new UpdateWrapper<TaskStocktaking>().set("task_status", 2).eq("id", id));
+    public AjaxResult startTask(@PathVariable("id") Long id){
+
+        taskStocktakingService.update(new UpdateWrapper<TaskStocktaking>()
+                .set("task_status", 2)
+                .eq("id", id));
         return AjaxResult.success();
     }
 
     @ApiOperation("任务完成")
     @GetMapping("/taskComplete/{id}")
-    public AjaxResult taskComplete(@PathVariable("id") Long id) {
-        taskStocktakingService.update(new UpdateWrapper<TaskStocktaking>().set("task_status", 3).eq("id", id));
+    public AjaxResult taskComplete(@PathVariable("id") Long id) throws Exception {
+        User currentUser = userService.getCurrentUser();
+        taskStocktakingService.update(new UpdateWrapper<TaskStocktaking>().set("task_status", 3)
+                .set("oper_time", new Date())
+                .set("oper_by", currentUser.getId())
+                .eq("id", id));
         return AjaxResult.success();
     }
 

src/main/java/com/jsh/erp/controller/stocktaking/StocktakingController.java

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 @RestController
@@ -158,15 +159,21 @@ public class StocktakingController extends BaseController {
 
     @ApiOperation("完成任务")
     @GetMapping("/taskComplete/{id}")
-    public AjaxResult taskComplete(@PathVariable("id") Long id) {
-        taskStocktakingService.update(new UpdateWrapper<TaskStocktaking>().set("task_status", 3).eq("id", id));
+    public AjaxResult taskComplete(@PathVariable("id") Long id) throws Exception {
+        User currentUser = userService.getCurrentUser();
+        taskStocktakingService.update(new UpdateWrapper<TaskStocktaking>().set("task_status", 3)
+                .set("oper_time", new Date())
+                .set("oper_by", currentUser.getId())
+                .eq("id", id));
         return AjaxResult.success();
     }
 
     @ApiOperation("任务更新库存")
-    @GetMapping("/taskUpdateStock/{id}")
-    public AjaxResult updateStock(@PathVariable("id") Long id) {
-        taskStocktakingService.update(new UpdateWrapper<TaskStocktaking>().set("task_status", 5).eq("id", id));
+    @GetMapping("/taskUpdateStock/{ids}")
+    public AjaxResult updateStock(@PathVariable("ids") Long[] ids) {
+        for (Long id : ids) {
+            taskStocktakingService.update(new UpdateWrapper<TaskStocktaking>().set("task_status", 5).eq("id", id));
+        }
         return AjaxResult.success();
     }
 

src/main/java/com/jsh/erp/datasource/pda/vo/PDATaskStocktakingVO.java

@@ -1,5 +1,6 @@
 package com.jsh.erp.datasource.pda.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -36,12 +37,17 @@ public class PDATaskStocktakingVO {
     private String operName;
 
     @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     @ApiModelProperty("盘点时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date operTime;
 
     @ApiModelProperty("任务状态 1.未开始，2.进行中，3.已完成，4.已取消")
     private Integer taskStatus;
 
+    @ApiModelProperty("盘点范围")
+    private String positionRange;
+
 }

src/main/java/com/jsh/erp/service/impl/TaskStocktakingServiceImpl.java

@@ -270,6 +270,7 @@ public class TaskStocktakingServiceImpl extends ServiceImpl<TaskStocktakingMappe
                 accuracyRate = subtract.divide(BigDecimal.valueOf(itemCount), 4, RoundingMode.HALF_UP).doubleValue();
             }
         }
+        detail.setItemCount(itemCount);
         detail.setDifferenceRate(differenceRate);
         detail.setAccuracyRate(accuracyRate);
         detail.setFinishCount(finishCount);