From b8961a199ed77ca06cbb3a88f68e3466e83df43a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 20 四月 2024 14:15:20 +0800
Subject: [PATCH] 解决堆垛机不可用异常
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 247 ++++++++++++++++++++++++++++---------------------
1 files changed, 142 insertions(+), 105 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..f4ed538 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,19 +1,25 @@
package com.zy.asrs.service.impl;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
+import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.result.InOutCountDto;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
+import com.zy.asrs.utils.Utils;
import com.zy.common.model.DetlDto;
import com.zy.common.utils.NodeUtils;
+import com.zy.common.utils.Synchro;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -48,6 +54,14 @@
private TagService tagService;
@Autowired
private TagMapper tagMapper;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private NodeService nodeService;
+ @Autowired
+ private ManLocDetlService manLocDetlService;
+ @Autowired
+ private MatV2Service matV2Service;
@Override
@Transactional
@@ -113,12 +127,24 @@
}
for (DetlDto detlDto : list) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
- }
OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
- orderDetl.setBatch(detlDto.getBatch());
+ if (Cools.isEmpty(mat)) {
+ MatV2 matV2 = matV2Service.selectOne(new EntityWrapper<MatV2>().eq("matnr", detlDto.getMatnr()));
+ if(Cools.isEmpty(matV2)){
+ throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+ }
+ orderDetl.sync(matV2);
+ } else {
+ orderDetl.sync(mat);
+ }
+
+ //鎵瑰彿涓虹┖浼氬嚭鐜伴棶棰橈紝璁剧疆涓�涓粯璁ゅ��
+ if (detlDto.getBatch() == null) {
+ orderDetl.setBatch("");
+ } else {
+ orderDetl.setBatch(detlDto.getBatch());
+
+ }
orderDetl.setAnfme(detlDto.getAnfme());
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
@@ -134,51 +160,51 @@
}
}
- @Override
- @Transactional
- public List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param) {
- List<OpenOrderCompeteResult> results = new ArrayList<>();
- if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
- // 鎸囧畾璁㈠崟
- Order order = orderService.selectByNo(param.getOrderNo());
- if (null != order) {
- OpenOrderCompeteResult result = new OpenOrderCompeteResult();
- results.add(result);
- result.setOrderNo(order.getOrderNo());
- result.setOrderTime(order.getOrderTime());
- result.setOrderType(order.getDocType$());
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
- for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
- }
- if (order.getSettle() == 4L) {
- // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- }
- }
- } else {
- // 鎵�鏈夎鍗�
- List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
- for (Order order : orders) {
- OpenOrderCompeteResult result = new OpenOrderCompeteResult();
- results.add(result);
- result.setOrderNo(order.getOrderNo());
- result.setOrderTime(order.getOrderTime());
- result.setOrderType(order.getDocType$());
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
- for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
- }
- // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- }
- }
- return results;
- }
+// @Override
+// @Transactional
+// public List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param) {
+// List<OpenOrderCompeteResult> results = new ArrayList<>();
+// if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
+// // 鎸囧畾璁㈠崟
+// Order order = orderService.selectByNo(param.getOrderNo());
+// if (null != order) {
+// OpenOrderCompeteResult result = new OpenOrderCompeteResult();
+// results.add(result);
+// result.setOrderNo(order.getOrderNo());
+// result.setOrderTime(order.getOrderTime());
+// result.setOrderType(order.getDocType$());
+// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+// for (OrderDetl orderDetl : orderDetls) {
+// result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
+// }
+// if (order.getSettle() == 4L) {
+// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+// if (!orderService.updateSettle(order.getId(), 6L, null)) {
+// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+// }
+// }
+// }
+// } else {
+// // 鎵�鏈夎鍗�
+// List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
+// for (Order order : orders) {
+// OpenOrderCompeteResult result = new OpenOrderCompeteResult();
+// results.add(result);
+// result.setOrderNo(order.getOrderNo());
+// result.setOrderTime(order.getOrderTime());
+// result.setOrderType(order.getDocType$());
+// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+// for (OrderDetl orderDetl : orderDetls) {
+// result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
+// }
+// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+// if (!orderService.updateSettle(order.getId(), 6L, null)) {
+// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+// }
+// }
+// }
+// return results;
+// }
@Override
@Transactional
@@ -248,12 +274,17 @@
}
for (DetlDto detlDto : list) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
- }
OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
- orderDetl.setBatch(detlDto.getBatch());
+ if (Cools.isEmpty(mat)) {
+ MatV2 matV2 = matV2Service.selectOne(new EntityWrapper<MatV2>().eq("matnr", detlDto.getMatnr()));
+ if(Cools.isEmpty(matV2)){
+ throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+ }
+ orderDetl.sync(matV2);
+ } else {
+ orderDetl.sync(mat);
+ }
+ orderDetl.setBatch(detlDto.getBatch() == null ? "" : detlDto.getBatch());
orderDetl.setAnfme(detlDto.getAnfme());
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
@@ -269,50 +300,50 @@
}
}
- @Override
- public List<OpenOrderCompeteResult> pakoutOrderComplete(OpenOrderCompleteParam param) {
- List<OpenOrderCompeteResult> results = new ArrayList<>();
- if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
- // 鎸囧畾璁㈠崟
- Order order = orderService.selectByNo(param.getOrderNo());
- if (null != order) {
- OpenOrderCompeteResult result = new OpenOrderCompeteResult();
- results.add(result);
- result.setOrderNo(order.getOrderNo());
- result.setOrderTime(order.getOrderTime());
- result.setOrderType(order.getDocType$());
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
- for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
- }
- if (order.getSettle() == 4L) {
- // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- }
- }
- } else {
- // 鎵�鏈夎鍗�
- List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
- for (Order order : orders) {
- OpenOrderCompeteResult result = new OpenOrderCompeteResult();
- results.add(result);
- result.setOrderNo(order.getOrderNo());
- result.setOrderTime(order.getOrderTime());
- result.setOrderType(order.getDocType$());
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
- for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
- }
- // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- }
- }
- return results;
- }
+// @Override
+// public List<OpenOrderCompeteResult> pakoutOrderComplete(OpenOrderCompleteParam param) {
+// List<OpenOrderCompeteResult> results = new ArrayList<>();
+// if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
+// // 鎸囧畾璁㈠崟
+// Order order = orderService.selectByNo(param.getOrderNo());
+// if (null != order) {
+// OpenOrderCompeteResult result = new OpenOrderCompeteResult();
+// results.add(result);
+// result.setOrderNo(order.getOrderNo());
+// result.setOrderTime(order.getOrderTime());
+// result.setOrderType(order.getDocType$());
+// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+// for (OrderDetl orderDetl : orderDetls) {
+// result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
+// }
+// if (order.getSettle() == 4L) {
+// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+// if (!orderService.updateSettle(order.getId(), 6L, null)) {
+// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+// }
+// }
+// }
+// } else {
+// // 鎵�鏈夎鍗�
+// List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
+// for (Order order : orders) {
+// OpenOrderCompeteResult result = new OpenOrderCompeteResult();
+// results.add(result);
+// result.setOrderNo(order.getOrderNo());
+// result.setOrderTime(order.getOrderTime());
+// result.setOrderType(order.getDocType$());
+// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+// for (OrderDetl orderDetl : orderDetls) {
+// result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
+// }
+// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+// if (!orderService.updateSettle(order.getId(), 6L, null)) {
+// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+// }
+// }
+// }
+// return results;
+// }
@Override
@Transactional
@@ -438,12 +469,12 @@
@Override
@Transactional
public void syncMat(MatSyncParam param) {
- if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <=0 ) {
+ if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <= 0) {
throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
}
- for(MatSyncParam.MatParam matParam : param.getMatDetails()){
- if(Cools.isEmpty(matParam.getMatnr())){
+ for (MatSyncParam.MatParam matParam : param.getMatDetails()) {
+ if (Cools.isEmpty(matParam.getMatnr())) {
throw new CoolException("鍟嗗搧缂栫爜涓嶈兘涓虹┖");
}
@@ -519,8 +550,8 @@
} else {
tagId = tagService.getTop().getId();
}
- mat.sync(param);
-// mat.setMatnr(param.getMatnr());
+ mat.sync(matParam);
+// mat.setMatnr(para);
// mat.setMaktx(param.getMaktx());
// mat.setSpecs(param.getSpecs());
// mat.setModel(param.getModel());
@@ -536,7 +567,7 @@
}
} else {
mat.sync(param);
- if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
+ if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr()))) {
throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
}
@@ -544,4 +575,10 @@
}
+ @Override
+ public R getInOutDetl() {
+ List<InOutCountDto> top100 = wrkMastService.selectTop100();
+ return R.ok().add(top100);
+ }
+
}
--
Gitblit v1.9.1