From 83e9a3d09b8eda7e3976425302ebe61d6f8c1d14 Mon Sep 17 00:00:00 2001 From: LSH <brook_w@163.com> Date: 星期四, 11 八月 2022 17:07:05 +0800 Subject: [PATCH] Default Changelist --- src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java index 5d8970a..81b1045 100644 --- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java @@ -1,6 +1,7 @@ package com.zy.asrs.service.impl; import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.core.common.BaseRes; import com.core.common.Cools; import com.core.common.DateUtils; import com.core.common.SnowflakeIdWorker; @@ -19,6 +20,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -48,6 +51,10 @@ private TagService tagService; @Autowired private TagMapper tagMapper; + @Autowired + private WaitPakinService waitPakinService; + @Autowired + private WrkDetlService wrkDetlService; @Override @Transactional @@ -544,4 +551,51 @@ } + @Override + @Transactional + public void combPACK(CombParam param) { + if (Cools.isEmpty(param.getPackNo())) { + throw new CoolException(BaseRes.PARAM); + } + // 鍒ゆ柇鏄惁鏈夌浉鍚孭ack鐮佺殑鏁版嵁 + if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>(). + eq("zpallet", param.getPackNo()).eq("io_status", "N")) > 0) { + throw new CoolException(param.getPackNo() + "鏁版嵁姝e湪杩涜鍏ュ簱"); + } + + int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getPackNo())); + int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getPackNo())); + if (countLoc > 0 || countWrk > 0) { + throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉$爜鏁版嵁宸插瓨鍦�===>>" + param.getPackNo()); + } + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + java.util.Date date=null; + try { + date= sdf.parse(param.getRequestTime()); + } catch (ParseException e) { + e.printStackTrace(); + } + java.sql.Date requestTime = new java.sql.Date(date.getTime()); + + // 鐢熸垚鍏ュ簱閫氱煡妗� + Mat mat = matService.selectByMatnr(param.getPackName()); + if (Cools.isEmpty(mat)) { + throw new CoolException(param.getPackName() + "鍟嗗搧妗f涓嶅瓨鍦�"); + } + WaitPakin waitPakin = new WaitPakin(); + waitPakin.sync(mat); + waitPakin.setZpallet(param.getPackNo()); // Pack鐮� + waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵�� + waitPakin.setAnfme(1.0); // 鏁伴噺 + waitPakin.setStatus("Y"); // 鐘舵�� + waitPakin.setAppeUser(null); + waitPakin.setAppeTime(requestTime); + waitPakin.setModiUser(null); + waitPakin.setModiTime(requestTime); + if (!waitPakinService.insert(waitPakin)) { + throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�"); + } + } + } -- Gitblit v1.9.1