From 07fc18f77a9764bd47857e30d65abc03cc1e439c Mon Sep 17 00:00:00 2001 From: zhangchao <zc857179121@qq.com> Date: 星期五, 08 十一月 2024 16:21:56 +0800 Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp --- src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java index e107f79..dd9a982 100644 --- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java @@ -41,11 +41,15 @@ wrkDetl.setIoTime(now); wrkDetl.setBatch(dto.getBatch()); wrkDetl.setAnfme(dto.getAnfme()); // 鏁伴噺 - wrkDetl.setZpallet(barcode); // 鎵樼洏鏉$爜 + wrkDetl.setZpallet(barcode); // 璐ф灦鏉$爜 wrkDetl.setAppeUser(userId); wrkDetl.setAppeTime(now); wrkDetl.setModiUser(userId); wrkDetl.setModiTime(now); + + wrkDetl.setThreeCode(dto.getCsocode()); + wrkDetl.setDeadTime(dto.getIsoseq()); + wrkDetl.setSuppCode(dto.getContainerCode()); if (!this.insert(wrkDetl)) { throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触"); } @@ -72,7 +76,23 @@ } @Override + public List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo) { + return this.baseMapper.selectAndLogByOrderNoGroupByMatnrOfSum(orderNo); + } + + @Override public boolean updateInspect(Integer wrkNo, String matnr, String batch) { return this.baseMapper.updateInspect(wrkNo, matnr, batch) > 0; } + + @Override + public List<WrkDetl> selectPakoutQuery(Integer staNo, String matnr) { + return this.baseMapper.selectPakoutQuery(staNo, matnr); + } + + @Override + public boolean updateOrderNo(String orderNo, Integer wrkNo, String matnr, String batch) { + return baseMapper.updateOrderNo(orderNo, wrkNo, matnr, batch) > 0; + } + } -- Gitblit v1.9.1