diff --git a/web/src/main/java/com/zhehekeji/web/controller/CheckLogController.java b/web/src/main/java/com/zhehekeji/web/controller/CheckLogController.java new file mode 100644 index 0000000..4c22b24 --- /dev/null +++ b/web/src/main/java/com/zhehekeji/web/controller/CheckLogController.java @@ -0,0 +1,38 @@ +package com.zhehekeji.web.controller; + +import com.github.pagehelper.PageInfo; +import com.zhehekeji.common.util.ValidatorUtil; +import com.zhehekeji.core.pojo.Result; +import com.zhehekeji.web.entity.CheckLog; +import com.zhehekeji.web.entity.StockLog; +import com.zhehekeji.web.pojo.stock.CheckLogSearch; +import com.zhehekeji.web.pojo.stock.StockLogSearch; +import com.zhehekeji.web.service.CheckLogService; +import com.zhehekeji.web.service.StockLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags = "盘点历史") +@RequestMapping("/checkLog") +@RestController +public class CheckLogController { + + @Resource + private CheckLogService checkLogService; + @Resource + private ValidatorUtil validatorUtil; + + @ApiOperation("盘点历史") + @PostMapping("") + public Result> list(@RequestBody CheckLogSearch checkLogSearch){ + return Result.success(checkLogService.list(checkLogSearch)); + } + + +} diff --git a/web/src/main/java/com/zhehekeji/web/controller/StockLogController.java b/web/src/main/java/com/zhehekeji/web/controller/StockLogController.java index 4b05628..d8e3dde 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/StockLogController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/StockLogController.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -@Api(tags = "盘点库存历史") +@Api(tags = "库存历史") @RequestMapping("/stockLog") @RestController public class StockLogController { @@ -22,7 +22,7 @@ public class StockLogController { @Resource private ValidatorUtil validatorUtil; - @ApiOperation("盘点历史") + @ApiOperation("库存历史") @PostMapping("") public Result> list(@RequestBody StockLogSearch stockLogSearch){ return Result.success(stockLogService.page(stockLogSearch)); diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml index 9655773..c9aad48 100644 --- a/web/src/main/resources/application-prod.yml +++ b/web/src/main/resources/application-prod.yml @@ -37,7 +37,7 @@ cameraConfig: # 下载mp4延迟 海康的下载mp4需要2分钟 # 利珀延迟10s就可 # 单位毫秒 - delayDownloadMp4: 120000 + delayDownloadMp4: 10000 # ------------ # -----图片 mp4下载地址 savePath: @@ -64,7 +64,7 @@ lightSource: # -----goods 货物 # 扫码模式 0:此处不盘点 1:球机扫码 2:sick扫码枪 3:南北达RFID scanCodeMode: - tray: 1 + tray: 2 goods: 0 goodsCodeTypes: - 14