From d1ef13d1f116e69a7f44e78d64fd0fe4ce2cad80 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期一, 10 二月 2025 13:17:10 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/service/CommonService.java | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 110 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index 8604944..42cc7bb 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -2,10 +2,10 @@ import com.core.common.Cools; import com.core.exception.CoolException; -import com.zy.asrs.domain.param.CancelTaskParam; -import com.zy.asrs.domain.param.CompleteTaskParam; +import com.zy.asrs.domain.param.*; import com.zy.asrs.entity.*; import com.zy.asrs.service.*; +import com.zy.core.News; import com.zy.core.enums.WrkIoType; import com.zy.core.enums.WrkStsType; import lombok.extern.slf4j.Slf4j; @@ -24,6 +24,8 @@ private WrkMastLogService wrkMastLogService; @Autowired private WrkLastnoService wrkLastnoService; + @Autowired + private LocMastService locMastService; /** * 鐢熸垚宸ヤ綔鍙� @@ -111,4 +113,110 @@ return true; } + //绉诲簱浠诲姟 + public boolean createLocMoveTask(CreateLocMoveTaskParam param) { + Date now = new Date(); + LocMast locMast = locMastService.queryByLoc(param.getSourceLocNo()); + if (null == locMast) { + throw new CoolException("婧愬簱浣嶄笉瀛樺湪"); + } + + if (!locMast.getLocSts().equals("F")) { + throw new CoolException("婧愬簱浣嶄笉澶勪簬鍦ㄥ簱鐘舵��"); + } + + // 鑾峰彇宸ヤ綔鍙� + int workNo = getWorkNo(WrkIoType.LOC_MOVE.id); + // 淇濆瓨宸ヤ綔妗� + WrkMast wrkMast = new WrkMast(); + wrkMast.setWrkNo(workNo); + wrkMast.setIoTime(now); + wrkMast.setWrkSts(WrkStsType.NEW_LOC_MOVE.sts); // 宸ヤ綔鐘舵�侊細501.鐢熸垚绉诲簱浠诲姟 + wrkMast.setIoType(WrkIoType.LOC_MOVE.id); // 鍏ュ嚭搴撶姸鎬侊細 201.绉诲簱浠诲姟 + wrkMast.setIoPri(800D); + wrkMast.setSourceLocNo(param.getSourceLocNo()); + wrkMast.setLocNo(param.getLocNo()); // 鐩爣搴撲綅 + wrkMast.setWmsWrkNo(param.getTaskNo()); + wrkMast.setAppeTime(now); + wrkMast.setModiTime(now); + boolean res = wrkMastService.insert(wrkMast); + if (!res) { + News.error("绉诲簱浠诲姟 --- 淇濆瓨宸ヤ綔妗eけ璐ワ紒"); + throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�"); + } + + return true; + } + + //鍏ュ簱浠诲姟 + public boolean createInTask(CreateInTaskParam param) { + Date now = new Date(); + LocMast locMast = locMastService.queryByLoc(param.getLocNo()); + if (null == locMast) { + throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦�"); + } + + if (!locMast.getLocSts().equals("O")) { + throw new CoolException("鐩爣搴撲綅涓嶅浜庣┖搴撶姸鎬�"); + } + + // 鑾峰彇宸ヤ綔鍙� + int workNo = getWorkNo(WrkIoType.IN.id); + // 淇濆瓨宸ヤ綔妗� + WrkMast wrkMast = new WrkMast(); + wrkMast.setWrkNo(workNo); + wrkMast.setIoTime(now); + wrkMast.setWrkSts(WrkStsType.NEW_INBOUND.sts); // 宸ヤ綔鐘舵�侊細1.鐢熸垚鍏ュ簱浠诲姟 + wrkMast.setIoType(WrkIoType.IN.id); // 鍏ュ嚭搴撶姸鎬侊細 1.鍏ュ簱 + wrkMast.setIoPri(100D); + wrkMast.setLocNo(param.getLocNo()); // 鐩爣搴撲綅 + wrkMast.setSourceStaNo(param.getSourceStaNo());//婧愮珯 + wrkMast.setStaNo(param.getStaNo());//鐩爣绔� + wrkMast.setWmsWrkNo(param.getTaskNo()); + wrkMast.setAppeTime(now); + wrkMast.setModiTime(now); + boolean res = wrkMastService.insert(wrkMast); + if (!res) { + News.error("鍏ュ簱浠诲姟 --- 淇濆瓨宸ヤ綔妗eけ璐ワ紒"); + throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�"); + } + + return true; + } + + //鍑哄簱浠诲姟 + public boolean createOutTask(CreateOutTaskParam param) { + Date now = new Date(); + LocMast locMast = locMastService.queryByLoc(param.getSourceLocNo()); + if (null == locMast) { + throw new CoolException("婧愬簱浣嶄笉瀛樺湪"); + } + + if (!locMast.getLocSts().equals("F")) { + throw new CoolException("婧愬簱浣嶄笉澶勪簬鍦ㄥ簱鐘舵��"); + } + + // 鑾峰彇宸ヤ綔鍙� + int workNo = getWorkNo(WrkIoType.OUT.id); + // 淇濆瓨宸ヤ綔妗� + WrkMast wrkMast = new WrkMast(); + wrkMast.setWrkNo(workNo); + wrkMast.setIoTime(now); + wrkMast.setWrkSts(WrkStsType.NEW_OUTBOUND.sts); // 宸ヤ綔鐘舵�侊細101.鐢熸垚鍑哄簱浠诲姟 + wrkMast.setIoType(WrkIoType.OUT.id); // 鍏ュ嚭搴撶姸鎬侊細 101.鍑哄簱 + wrkMast.setIoPri(100D); + wrkMast.setSourceLocNo(param.getSourceLocNo()); // 婧愬簱浣� + wrkMast.setStaNo(param.getStaNo());//鐩爣绔� + wrkMast.setWmsWrkNo(param.getTaskNo()); + wrkMast.setAppeTime(now); + wrkMast.setModiTime(now); + boolean res = wrkMastService.insert(wrkMast); + if (!res) { + News.error("鍑哄簱浠诲姟 --- 淇濆瓨宸ヤ綔妗eけ璐ワ紒"); + throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�"); + } + + return true; + } + } -- Gitblit v1.9.1