From 37a8b4bd1b8a5f09ad9e258733d4d12d6b19c6fa Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期五, 04 八月 2023 16:21:01 +0800 Subject: [PATCH] erp轮询,登录,查询创建物料,查询创建订单,审核 --- src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 122 ++++++++++++++++++++++++++++++++-------- 1 files changed, 96 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java index 6b8c21f..4fa9711 100644 --- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java @@ -1,23 +1,28 @@ package com.zy.asrs.task.handler; import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.core.common.Cools; +import com.zy.asrs.entity.WaitPakin; import com.zy.asrs.entity.WrkDetl; import com.zy.asrs.entity.WrkMast; -import com.zy.asrs.service.WrkDetlLogService; -import com.zy.asrs.service.WrkDetlService; -import com.zy.asrs.service.WrkMastLogService; -import com.zy.asrs.service.WrkMastService; +import com.zy.asrs.service.*; import com.zy.asrs.task.AbstractHandler; +import com.zy.asrs.task.core.ReturnT; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.interceptor.TransactionAspectSupport; + +import java.util.Iterator; +import java.util.List; /** * Created by vincent on 2020/7/6 */ +@Slf4j @Service -@Transactional -public class WorkLogHandler extends AbstractHandler { +public class WorkLogHandler extends AbstractHandler<String> { @Autowired private WrkMastService wrkMastService; @@ -27,28 +32,93 @@ private WrkDetlService wrkDetlService; @Autowired private WrkDetlLogService wrkDetlLogService; + @Autowired + private WaitPakinService waitPakinService; + @Autowired + private WaitPakinLogService waitPakinLogService; + @Autowired + private OrderService orderService; - public void start() { - WrkMast wrkMast = wrkMastService.selectToBeHistoryData(); - if (null == wrkMast) { - return; + @Transactional + public ReturnT<String> start(WrkMast wrkMast) { + try { + List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()); + // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴� + if (!Cools.isEmpty(wrkDetls)) { + Iterator<WrkDetl> iterator = wrkDetls.iterator(); + while (iterator.hasNext()) { + WrkDetl wrkDetl = iterator.next(); + if (!Cools.isEmpty(wrkDetl.getOrderNo())) { + orderService.checkComplete(wrkDetl.getOrderNo()); + iterator.remove(); + } + } + } + + // 鍏ュ簱 -------------------------------------------------------------------------------- + if (wrkMast.getWrkSts() == 5) { + // 鍏ㄦ澘鍏ュ簱 + if (wrkMast.getIoType() == 1) { + // 鍏ュ簱閫氱煡鍗� + if (!Cools.isEmpty(wrkMast.getBarcode())) { + // 淇濆瓨鍏ュ簱閫氱煡妗e巻鍙叉。 + if (!waitPakinLogService.save(wrkMast.getBarcode())) { + exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗e巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo()); + } + // 鍒犻櫎鍏ュ簱閫氱煡妗� + if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) { + exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo()); + } + } + // 鎵嬪姩鍏ュ簱鐢熸垚鍗曟嵁 銆� 涓婃姤涓夋柟骞冲彴 銆� + if (!Cools.isEmpty(wrkDetls)) { + if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) { + exceptionHandle("鐢熸垚鎵嬪姩鍏ュ簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo()); + } + } + // 鎷f枡鍐嶅叆搴� + } else if (wrkMast.getIoType() == 53) { + if (!Cools.isEmpty(wrkDetls)) { + if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) { + exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo()); + } + } + } + + // 鍑哄簱 -------------------------------------------------------------------------------- + } else if (wrkMast.getWrkSts() == 15) { + if (!Cools.isEmpty(wrkDetls)) { + if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) { + exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo()); + } + } + } + + // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗� + if (!wrkMastLogService.save(wrkMast.getWrkNo())) { + exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo()); + } + // 鍒犻櫎宸ヤ綔涓绘。 + if (!wrkMastService.deleteById(wrkMast)) { + exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo()); + } + if(!wrkMast.getEmptyMk().equals("Y")) { + // 淇濆瓨宸ヤ綔鏄庣粏妗e巻鍙叉。 + if (!wrkDetlLogService.save(wrkMast.getWrkNo())) { + exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo()); + } + // 鍒犻櫎宸ヤ綔鏄庣粏妗� + if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) { + exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo()); + } + } + } catch (Exception e) { + log.error("fail", e); + e.printStackTrace(); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return FAIL.setMsg(e.getMessage()); } - // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗� - if (!wrkMastLogService.save(wrkMast.getWrkNo())) { - exceptionHandle(""); // todo - } - // 鍒犻櫎宸ヤ綔涓绘。 - if (!wrkMastService.deleteById(wrkMast)) { - exceptionHandle(""); // todo - } - // 淇濆瓨宸ヤ綔鏄庣粏妗e巻鍙叉。 - if (!wrkDetlLogService.save(wrkMast.getWrkNo())) { - exceptionHandle(""); // todo - } - // 鍒犻櫎宸ヤ綔鏄庣粏妗� - if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) { - exceptionHandle(""); // todo - } + return SUCCESS; } } -- Gitblit v1.9.1