From d290c28f525eee3da63a95c63a1c42c69d6cdb46 Mon Sep 17 00:00:00 2001 From: mrzhssss <pro6@qq.com> Date: 星期三, 21 九月 2022 11:12:30 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/WorkService.java | 8 ++++ src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 64 ++++++++++++++++++++++++++++++++ src/main/java/com/zy/common/web/WcsController.java | 19 +++++++++ 3 files changed, 91 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java index 239535b..e0cce87 100644 --- a/src/main/java/com/zy/asrs/service/WorkService.java +++ b/src/main/java/com/zy/asrs/service/WorkService.java @@ -2,6 +2,7 @@ import com.zy.asrs.entity.BasDevp; import com.zy.asrs.entity.WaitPakin; +import com.zy.asrs.entity.WrkMast; import com.zy.asrs.entity.param.EmptyPlateOutParam; import com.zy.asrs.entity.param.FullStoreParam; import com.zy.asrs.entity.param.LocDetlAdjustParam; @@ -48,6 +49,13 @@ void emptyPlateOut(EmptyPlateOutParam param, Long userId); /** + * 鑷姩绌烘澘鍑哄簱 + * @param param + * @return + */ + public WrkMast emptyPlateOut(EmptyPlateOutParam param); + + /** * 鐩樼偣鍑哄簱 */ void locCheckOut(StockOutParam param, Long userId); diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java index 3ebff2a..d02fdd3 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -480,6 +480,70 @@ @Override @Transactional + public WrkMast emptyPlateOut(EmptyPlateOutParam param) { + WrkMast wrkMast = new WrkMast(); + if (Cools.isEmpty(param.getOutSite())) { + throw new CoolException("绔欑偣涓嶅瓨鍦�"); + } + for (String locNo : param.getLocNos()) { + // 鑾峰彇宸ヤ綔鍙� + int workNo = commonService.getWorkNo(0); + // 鑾峰彇搴撲綅 + LocMast locMast = locMastService.selectById(locNo); + if (Cools.isEmpty(locMast)) { + throw new CoolException(locNo+"搴撲綅涓嶅瓨鍦�"); + } + // 鑾峰彇婧愮珯 + Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>() + .eq("type_no", 110) + .eq("stn_no", param.getOutSite()) + .eq("crn_no", locMast.getCrnNo()); + StaDesc staDesc = staDescService.selectOne(wrapper); + Integer sourceStaNo = staDesc.getCrnStn(); + if (Cools.isEmpty(sourceStaNo)) { + throw new CoolException("妫�绱㈡簮绔欏け璐�"); + } + Date now = new Date(); + // 淇濆瓨宸ヤ綔妗� + + wrkMast.setWrkNo(workNo); + wrkMast.setIoTime(now); + wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID + wrkMast.setIoType(110); // 鍏ュ嚭搴撶姸鎬侊細 110.绌烘澘鍑哄簱 + wrkMast.setIoPri(10D); + wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯 + wrkMast.setStaNo(param.getOutSite()); // 鐩爣绔� + wrkMast.setCrnNo(locMast.getCrnNo()); + wrkMast.setSourceLocNo(locNo); // 婧愬簱浣� + wrkMast.setFullPlt("N"); // 婊℃澘锛歒 + wrkMast.setPicking("N"); // 鎷f枡 + wrkMast.setExitMk("N"); // 閫�鍑� + wrkMast.setEmptyMk("Y"); // 绌烘澘 + wrkMast.setLinkMis("N"); + wrkMast.setAppeUser(1L); + wrkMast.setAppeTime(now); + wrkMast.setModiUser(1L); + wrkMast.setModiTime(now); + wrkMast.setMemo("鐢熸垚鑷姩绌烘澘鍑哄簱"); + boolean res = wrkMastService.insert(wrkMast); + if (!res) { + throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�"); + } + // 鏇存柊搴撲綅鐘舵�� D.绌烘澘 -> R.鍑哄簱棰勭害 + if (locMast.getLocSts().equals("D")){ + locMast.setLocSts("R"); + locMast.setModiUser(1L); + locMast.setModiTime(now); + if (!locMastService.updateById(locMast)) { + throw new CoolException("鏇存柊搴撲綅鐘舵�佸け璐�"); + } + } + } + return wrkMast; + } + + @Override + @Transactional public void locCheckOut(StockOutParam param, Long userId) { // 鐩爣绔欑偣鐘舵�佹娴� BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite()); diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java index 1ed25a3..d822f05 100644 --- a/src/main/java/com/zy/common/web/WcsController.java +++ b/src/main/java/com/zy/common/web/WcsController.java @@ -6,6 +6,7 @@ import com.core.common.R; import com.core.exception.CoolException; import com.zy.asrs.entity.*; +import com.zy.asrs.entity.param.EmptyPlateOutParam; import com.zy.asrs.service.*; import com.zy.common.CodeRes; import com.zy.common.model.LocTypeDto; @@ -17,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -45,6 +47,8 @@ private LocDetlService locDetlService; @Autowired private RowLastnoService rowLastnoService; + @Autowired + private WorkService workService; @PostMapping("/pakin/loc/v1") @ResponseBody @@ -133,6 +137,21 @@ return wrkMastService.insert(wrkMast) ? R.ok("鑷姩绌烘墭鍏ュ簱鎴愬姛,宸ヤ綔鍙�:"+wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍏ュ簱澶辫触"); } + @PostMapping("auto/emptyOut/v1") + @ResponseBody + public R autoEmptyOut(){ + LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>() + .eq("loc_sts", "D")); + if (Cools.isEmpty(locMast)) { + return R.error("搴撳瓨娌℃湁绌烘澘"); + } + EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam(); + emptyPlateOutParam.setOutSite(11); + emptyPlateOutParam.setLocNos(new ArrayList<String>(){{add(locMast.getLocNo()+"");}}); + WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam); + return R.ok(!Cools.isEmpty(wrkMast)? R.ok("鑷姩绌烘墭鍑哄簱鎴愬姛,宸ヤ綔鍙�:" + wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍑哄簱澶辫触")); + } + /** * 鍏ㄦ澘鍏ュ簱 */ -- Gitblit v1.9.1