diff --git a/src/main/java/com/dsic/gj_erp/controller/kban/KanBanController.java b/src/main/java/com/dsic/gj_erp/controller/kban/KanBanController.java index 5882f3e..9fcae44 100644 --- a/src/main/java/com/dsic/gj_erp/controller/kban/KanBanController.java +++ b/src/main/java/com/dsic/gj_erp/controller/kban/KanBanController.java @@ -10,6 +10,7 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import java.math.BigDecimal; import java.math.RoundingMode; @@ -29,14 +30,22 @@ public class KanBanController { /** * 年度切割完成重量 */ - @RequestMapping("/ndwcl") + @RequestMapping("ndwcl") public Object getndWcl() { String lastUpdateDate= (String) redisTemplate.opsForValue().get(key+"mbdcUpateTime"); DateTime date = DateUtil.date(); String today=date.toString("yyyyMMdd"); if (today.equals(lastUpdateDate)){ return "redirect:/YdjhKban/getMbdc"; + }else{ + return "redirect:/kban/getndWclOther"; } + } + + @RequestMapping("getndWclOther") + @ResponseBody + public Object getndWclOther() { + DateTime date = DateUtil.date(); String from = DateUtil.beginOfYear(date).toString("yyyy/MM/dd"); String to = DateUtil.offsetDay(date,1).toString("yyyy/MM/dd"); AtomicInteger maxVersion = xbjhService.getMaxVersion();