From 816536ec6e6c394689ca050a9a4f59e5ce7d67ad Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期四, 12 十月 2023 19:02:53 +0800 Subject: [PATCH] 自动补货单 --- src/main/java/com/zy/common/web/WcsController.java | 36 +++++++++++++++++++++++++++++++++--- 1 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java index d2ccfbb..213dc39 100644 --- a/src/main/java/com/zy/common/web/WcsController.java +++ b/src/main/java/com/zy/common/web/WcsController.java @@ -10,7 +10,6 @@ import com.zy.common.model.LocTypeDto; import com.zy.common.model.StartupDto; import com.zy.common.service.CommonService; -import com.zy.common.service.erp.ErpService; import com.zy.common.web.param.ReplenishmentParam; import com.zy.common.web.param.SearchLocParam; import lombok.extern.slf4j.Slf4j; @@ -49,7 +48,11 @@ @Autowired private MatService matService; @Autowired - private ErpService erpService; + private AgvWaitPakinService agvWaitPakinService; + @Autowired + private AgvWorkService agvWorkService; +// @Autowired +// private ErpService erpService; @PostMapping("/pakin/loc/v1") @ResponseBody @@ -299,11 +302,38 @@ } /* - 鍥涢」搴撳線AGV琛ヨ揣锛寃cs璋冪敤姝ゆ帴鍙� + 鍥涢」搴撳線AGV琛ヨ揣锛岀敓鎴怉GV鍏ュ簱閫氱煡妗� */ @PostMapping("/replenishment") @ResponseBody public R replenishment(@RequestBody ReplenishmentParam param){ + Date now = new Date(); + Integer wrkNo = param.getWrkNo(); + List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkNo); + wrkDetls.forEach(wrkDetl -> { + AgvWaitPakin agvWaitPakin = new AgvWaitPakin(); + BeanUtils.copyProperties(wrkDetl,agvWaitPakin); + agvWaitPakin.setIoStatus("Y"); + agvWaitPakin.setModiTime(now); + agvWaitPakin.setAppeTime(now); + agvWaitPakinService.insert(agvWaitPakin); + + }); + + return R.ok(); + } + + /* + 鐢熸垚AGV宸ヤ綔妗� + */ + @PostMapping("/start") + @ResponseBody + public R start(@RequestBody ReplenishmentParam param){ + + //缁戝畾绔欑偣 + + + //agvWorkService.createWaitPainWrkMastStart(agvBasDevpList, getUserId()); return R.ok(); -- Gitblit v1.9.1