From 7a79eaa785da277289ccdce588206a349e5fac6e Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 14 一月 2026 10:26:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 380 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 281 insertions(+), 99 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 e97f2f5..b3f4727 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -3,10 +3,7 @@
import com.alibaba.fastjson.JSON;
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.SnowflakeIdWorker;
-import com.core.common.SpringUtils;
+import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
@@ -21,20 +18,20 @@
import com.zy.common.constant.AgvConstant;
import com.zy.common.constant.ArmConstant;
import com.zy.common.model.DetlDto;
+import com.zy.common.model.LocDetlDto;
+import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.common.utils.NodeUtils;
import com.zy.erp.kingdee.utils.PostMesDataUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.rmi.CORBA.Util;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
/**
* Created by vincent on 2022/4/9
@@ -79,6 +76,19 @@
private LocMastServiceImpl locMastService;
@Autowired
private WrkDetlService wrkDetlService;
+ @Autowired
+ private BasDevpServiceImpl basDevpService;
+ @Autowired
+ private StaDescServiceImpl staDescService;
+ @Value("${mes.url}")
+ private String mesUrl;
+ @Value("${mes.stationaddress}")
+ private String stationAddress;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private WrkMastService wrkMastService;
+
@Override
@Transactional
public void pakinOrderCreate(OpenOrderPakinParam param) {
@@ -139,9 +149,9 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(),detail.getLineNumber(),detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(), detail.getLineNumber(), detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
if (DetlDto.hasLineNumber(list, dto)) {
- DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getLineNumber(),dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
+ DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getLineNumber(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
} else {
@@ -199,23 +209,23 @@
List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getQty()));
+ result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getLineNumber(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(), orderDetl.getQty()));
}
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
// if (!orderService.updateSettle(order.getId(), 6L, null)) {
// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(), 6L, null);
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 6L, null);
}
}
} else {
// 鎵�鏈夎鍗�
// List<Order> orders = orderService.selectBySettle(4L);
List<Order> orders = OrderInAndOutUtil.selectBySettle(null, 4L);
- if (orders.isEmpty()){
+ if (orders.isEmpty()) {
orders = new ArrayList<>();
}
for (Order order : orders) {
@@ -228,16 +238,16 @@
// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(),
+ result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getLineNumber(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(),
orderDetl.getQty()));
}
// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
// if (!orderService.updateSettle(order.getId(), 6L, null)) {
// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 6L, null);
}
}
@@ -308,11 +318,11 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(),detail.getLineNumber(),
- detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(), detail.getLineNumber(),
+ detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
if (DetlDto.hasLineNumber(list, dto)) {
- DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getLineNumber(),
- dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
+ DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getLineNumber(),
+ dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
} else {
@@ -368,15 +378,15 @@
// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(),order.getId());
for (OrderDetl orderDetl : orderDetls) {
result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getQty()));
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getLineNumber(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(), orderDetl.getQty()));
}
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
// if (!orderService.updateSettle(order.getId(), 6L, null)) {
// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 6L, null);
}
}
} else {
@@ -392,15 +402,15 @@
List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getQty()));
+ result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getLineNumber(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(), orderDetl.getQty()));
}
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
// if (!orderService.updateSettle(order.getId(), 6L, null)) {
// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 6L, null);
}
}
return results;
@@ -530,19 +540,19 @@
@Override
@Transactional
public void syncMat(MatSyncParam param) {
- if(param.getMatDetails().get(0).getOperateType()==3){
+ if (param.getMatDetails().get(0).getOperateType() == 3) {
Mat mat1 = matService.selectByMatnr(param.getMatDetails().get(0).getMatnr());
- if(Cools.isEmpty(mat1)){
+ if (Cools.isEmpty(mat1)) {
throw new CoolException("鍟嗗搧涓嶅瓨鍦ㄦ棤娉曠鐢�");
}
}
- 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("鍟嗗搧缂栫爜涓嶈兘涓虹┖");
}
@@ -635,7 +645,7 @@
}
} else {
mat.sync(matParam);
- 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("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
}
@@ -649,7 +659,7 @@
BasArmMast basArmMast = new BasArmMast(param);
List<BasArm> basArmList = basArmService.selectList(new EntityWrapper<BasArm>().eq("sorting_line_sou", basArmMast.getSortingLine()));
for (BasArm basArm : basArmList) {
- if (basArm.getStatus()!=1){
+ if (basArm.getStatus() != 1) {
continue;
}
basArmMast.setArmNo(basArm.getArmNo());
@@ -662,10 +672,10 @@
.eq("arm_no", basArmMast.getArmNo())
.eq("status", 0)
);
- if (Cools.isEmpty(basArmMastOld)){
+ if (Cools.isEmpty(basArmMastOld)) {
basArmMastService.insert(basArmMast);
} else {
- throw new CoolException("绛夊緟鍓嶈竟璐х墿鎶撳彇锛侊紒锛�"+ JSON.toJSONString(param));
+ throw new CoolException("绛夊緟鍓嶈竟璐х墿鎶撳彇锛侊紒锛�" + JSON.toJSONString(param));
}
}
@@ -677,23 +687,23 @@
.eq("sorting_line", Integer.parseInt(param.getStaNo()))
.eq("status", 1)
);
- if (Cools.isEmpty(basArm)){
+ if (Cools.isEmpty(basArm)) {
return;
// throw new CoolException("鏈烘鑷傞厤缃紓甯革紝鏌ヨ涓嶅埌鏈烘鑷傛暟鎹紒锛侊紒"+ JSON.toJSONString(param));
}
- try{
+ try {
BasArmMastSign basArmMastSign = basArmMastSignService.selectOne(
new EntityWrapper<BasArmMastSign>()
.eq("matnr", param.getMatnr())
.eq("order_no", param.getOrderNo())
.eq("create_time", param.getBindingTags())
);
- if (!Cools.isEmpty(basArmMastSign)){
+ if (!Cools.isEmpty(basArmMastSign)) {
basArmMastSign.setStatus(1);
basArmMastSignService.updateById(basArmMastSign);
}
- } catch (Exception e){
+ } catch (Exception e) {
}
BasArmMast basArmMastListError = basArmMastService.selectOne(
@@ -702,8 +712,8 @@
.eq("arm_no", param.getArm_no())
.eq("status", 9)
);
- if (!Cools.isEmpty(basArmMastListError)){
- if (Integer.parseInt(param.getPick_num()) ==1){
+ if (!Cools.isEmpty(basArmMastListError)) {
+ if (Integer.parseInt(param.getPick_num()) == 1) {
basArmMastListError.setStatus(2);
basArmMastService.updateById(basArmMastListError);
}
@@ -717,11 +727,11 @@
.eq("arm_no", param.getArm_no())
.eq("status", 1)
);
- if (Cools.isEmpty(basArmMast)){
+ if (Cools.isEmpty(basArmMast)) {
return;
// throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
}
- if (Integer.parseInt(param.getPick_num()) !=1){
+ if (Integer.parseInt(param.getPick_num()) != 1) {
basArmMast.setStatus(9);
basArmMastService.updateById(basArmMast);
} else {
@@ -738,28 +748,28 @@
.eq("sta_no", param.getStaNo())
.eq("status", 1)
);
- if (Cools.isEmpty(basArm)){
- log.error("鏈烘鑷傞厤缃紓甯革紝鏌ヨ涓嶅埌鏈烘鑷傛暟鎹紒锛侊紒"+ JSON.toJSONString(param));
+ if (Cools.isEmpty(basArm)) {
+ log.error("鏈烘鑷傞厤缃紓甯革紝鏌ヨ涓嶅埌鏈烘鑷傛暟鎹紒锛侊紒" + JSON.toJSONString(param));
return false;
}
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", basArm.getStaNoSou()));
- if (Cools.isEmpty(locMast)){
- log.error("鏌ヨ涓嶅埌locMast鏁版嵁锛侊紒锛�"+ JSON.toJSONString(param));
+ if (Cools.isEmpty(locMast)) {
+ log.error("鏌ヨ涓嶅埌locMast鏁版嵁锛侊紒锛�" + JSON.toJSONString(param));
return false;
}
- if (locMast.getLocSts().equals("D")){
+ if (locMast.getLocSts().equals("D")) {
BasArmMast basArmMast = basArmMastService.selectOne(
new EntityWrapper<BasArmMast>()
.eq("sta_no", basArm.getStaNoSou())
.eq("arm_no", param.getArmNo())
.eq("status", 3)
);
- if (Cools.isEmpty(basArmMast)){
+ if (Cools.isEmpty(basArmMast)) {
return true;
}
- log.error("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
+ log.error("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�" + JSON.toJSONString(param));
} else {
- log.error("locMast鐘舵�佷笉涓篋锛侊紒锛�"+ JSON.toJSONString(param));
+ log.error("locMast鐘舵�佷笉涓篋锛侊紒锛�" + JSON.toJSONString(param));
}
return false;
}
@@ -772,8 +782,8 @@
.eq("sta_no", Integer.parseInt(param.getId()))
.eq("status", 1)
);
- if (Cools.isEmpty(basArm)){
- throw new CoolException("鏈烘鑷傞厤缃紓甯革紝鏌ヨ涓嶅埌鏈烘鑷傛暟鎹紒锛侊紒"+ JSON.toJSONString(param));
+ if (Cools.isEmpty(basArm)) {
+ throw new CoolException("鏈烘鑷傞厤缃紓甯革紝鏌ヨ涓嶅埌鏈烘鑷傛暟鎹紒锛侊紒" + JSON.toJSONString(param));
}
BasArmMast basArmMast = basArmMastService.selectOne(
new EntityWrapper<BasArmMast>()
@@ -781,11 +791,11 @@
.eq("arm_no", param.getArm_no())
.eq("status", 2)
);
- if (Cools.isEmpty(basArmMast)){
- throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
+ if (Cools.isEmpty(basArmMast)) {
+ throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�" + JSON.toJSONString(param));
}
// basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),1,3);
- basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),2,3);
+ basArmMastService.updateArmMastStatus(param.getArm_no(), basArmMast.getSortingLine(), basArmMast.getStaNo(), 2, 3);
}
@Override
@@ -796,33 +806,33 @@
.eq("sorting_line", Integer.parseInt(param.getStaNo()))
.eq("status", 1)
);
- if (Cools.isEmpty(basArm)){
- throw new CoolException("鏈烘鑷傞厤缃紓甯革紝鏌ヨ涓嶅埌鏈烘鑷傛暟鎹紒锛侊紒"+ JSON.toJSONString(param));
+ if (Cools.isEmpty(basArm)) {
+ throw new CoolException("鏈烘鑷傞厤缃紓甯革紝鏌ヨ涓嶅埌鏈烘鑷傛暟鎹紒锛侊紒" + JSON.toJSONString(param));
}
BasArmMast basArmMast = basArmMastService.selectOne(
new EntityWrapper<BasArmMast>()
- .eq("sorting_line",basArm.getSortingLineSou())
+ .eq("sorting_line", basArm.getSortingLineSou())
.eq("arm_no", param.getArm_no())
.eq("status", 5)
);
- if (!Cools.isEmpty(basArmMast)){
- basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(), 5,6);
+ if (!Cools.isEmpty(basArmMast)) {
+ basArmMastService.updateArmMastStatus(param.getArm_no(), basArmMast.getSortingLine(), basArmMast.getStaNo(), 5, 6);
}
}
@Override
@Transactional
- public boolean taskArmOrderResult(OrderArmEndParam param){
- if(param.getDone_num() == 0){
- if(basArmMastService.delete(new EntityWrapper<BasArmMast>().eq("arm_no",param.getArm_no())
- .eq("status",1))){
+ public boolean taskArmOrderResult(OrderArmEndParam param) {
+ if (param.getDone_num() == 0) {
+ if (basArmMastService.delete(new EntityWrapper<BasArmMast>().eq("arm_no", param.getArm_no())
+ .eq("status", 1))) {
return true;
}
}
- if(param.getDone_num() == 1){
+ if (param.getDone_num() == 1) {
return true;
}
- log.error("鏈壘鍒板搴斾换鍔�"+ param);
+ log.error("鏈壘鍒板搴斾换鍔�" + param);
return false;
}
@@ -835,7 +845,7 @@
.eq("create_time", param.getBindingTags())
.eq("status", 0)
);
- if (Cools.isEmpty(basArmMastSignNew)){
+ if (Cools.isEmpty(basArmMastSignNew)) {
return false;
}
return true;
@@ -845,7 +855,7 @@
@Transactional
public boolean TaskAgvReport(TaskAgvReportParam param) {
BasAgvMast basAgvMast = basAgvMastService.selectOne(new EntityWrapper<BasAgvMast>().eq("task_no", param.getTaskNo()));
- if (Cools.isEmpty(basAgvMast)){
+ if (Cools.isEmpty(basAgvMast)) {
return false;
}
basAgvMast.setStatus(2);
@@ -886,7 +896,7 @@
basAgvMast.setModiTime(new Date());
basAgvMast.setIoType(param.getIoType());
basAgvMast.setFloorNo(param.getFloorNo());
- switch (basAgvMast.getIoType()){
+ switch (basAgvMast.getIoType()) {
// AGV搴撲綅==銆嬭緭閫佺嚎绔欑偣 0
// AGV搴撲綅==銆婣GV搴撲綅 1
// 杈撻�佺嚎绔欑偣==銆婣GV搴撲綅 2
@@ -908,12 +918,13 @@
bindParam.setFloorNo(basAgvMast.getFloorNo());
bindParam.setLocNo(locNo);
bindParam.setStaNo(staNo);
- if(bindCtnrAndBin(bindParam)){
+ if (bindCtnrAndBin(bindParam)) {
return true;
- }else{
+ } else {
throw new CoolException("鏈兘缁戝畾");
}
}
+
@Override
@Transactional
public List<PickWrkDetlListParam> getPickList(PdaPickListParam param) {
@@ -953,6 +964,7 @@
return result;
}
+
@Override
@Transactional
public List<AgvLocListDetlParam> getAgvLocList(AgvLocListParam param) {
@@ -973,7 +985,7 @@
);
result.add(buildAgvLocListDetlParam(param.getLocNo(), locMast.getLocSts$()));
}
-
+
return result;
}
@@ -981,7 +993,7 @@
List<BasAgvLocDetl> detlList = basAgvLocDetlService.selectList(
new EntityWrapper<BasAgvLocDetl>().eq("loc_no", locNo)
);
-
+
AgvLocListDetlParam dto = new AgvLocListDetlParam();
dto.setLocNo(locNo);
dto.setLocSys(locSts);
@@ -997,7 +1009,7 @@
if (param == null) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
}
- if (param.getFloorNo()==1){
+ if (param.getFloorNo() == 1) {
AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam();
BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
BasAgvLocNo basAgvLocNoSou = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("loc_no", param.getLocNo()));
@@ -1005,15 +1017,15 @@
agvBindCtnrAndBinParam.setReqCode(String.valueOf(System.currentTimeMillis()));
agvBindCtnrAndBinParam.setCtnrCode(param.getBarcode());
agvBindCtnrAndBinParam.setCtnrTyp("1");
- if(basAgvLocNoEnd != null && basAgvLocNoEnd.getAgvLocNo() != null){
+ if (basAgvLocNoEnd != null && basAgvLocNoEnd.getAgvLocNo() != null) {
agvBindCtnrAndBinParam.setStgBinCode(basAgvLocNoEnd.getAgvLocNo());
}
- if(basAgvLocNoSou != null && basAgvLocNoSou.getAgvLocNo() != null){
+ if (basAgvLocNoSou != null && basAgvLocNoSou.getAgvLocNo() != null) {
agvBindCtnrAndBinParam.setStgBinCode(basAgvLocNoSou.getAgvLocNo());
}
agvBindCtnrAndBinParam.setIndBind(param.getIndBind());
try {
- String URL = AgvConstant.AGV_URL+"/"+AgvConstant.AGV_hikRpcService; // AGV鎺ュ彛鍦板潃
+ String URL = AgvConstant.AGV_URL + "/" + AgvConstant.AGV_hikRpcService; // AGV鎺ュ彛鍦板潃
String mesPath = AgvConstant.getAGVADAPTOR(param.getFloorNo()); // 鎺ュ彛璺緞
String response = "";
boolean success = false;
@@ -1043,18 +1055,17 @@
} catch (Exception e) {
throw new CoolException(e.getMessage());
}
- } else {}
+ } else {
+ }
return true;
}
-
-
@Override
@Transactional
public boolean agvApplicationPassedTheGrating(ArmAgvGratingParam arm) {
ReturnT<String> result = new PostMesDataUtils().postMesDataArmGrating("鍏夋爡璇锋眰涓嬪彂锛�", ArmConstant.getArmUrl(arm.getArmNo()), ArmConstant.ARM_ADAPTOR_GRATING_AGVENTER, arm);
- if (result.getCode()==200){
+ if (result.getCode() == 200) {
return true;
}
return false;
@@ -1071,7 +1082,7 @@
agvGoParam.setReqCode(param.getReqCode());
agvGoParam.setTaskCode(param.getTaskCode());
ReturnT<String> result = new PostMesDataUtils().postMesDataArmGrating("鍏夋爡涓嬪彂鍚庣户缁换鍔★細", URL, AGVPath, agvGoParam);
- if (result.getCode()==200){
+ if (result.getCode() == 200) {
return true;
}
return false;
@@ -1082,11 +1093,11 @@
public boolean agvBindAndBin(String taskNo) {
String URL = "http://10.10.10.200:8181"; // AGV鎺ュ彛鍦板潃
String AGVPath = "rcms/services/rest/hikRpcService/bindCtnrAndBin"; // 鎺ュ彛璺緞
- BasAgvMast basAgvMast = basAgvMastService.selectOne(new EntityWrapper<BasAgvMast>().eq("task_no",taskNo));
- if (Cools.isEmpty(basAgvMast)){
+ BasAgvMast basAgvMast = basAgvMastService.selectOne(new EntityWrapper<BasAgvMast>().eq("task_no", taskNo));
+ if (Cools.isEmpty(basAgvMast)) {
return false;
}
- if (basAgvMast.getFloorNo()==1){
+ if (basAgvMast.getFloorNo() == 1) {
BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(
new EntityWrapper<BasAgvLocNo>().eq("sta_no", basAgvMast.getStaNo())
@@ -1097,37 +1108,38 @@
String binCode = basAgvLocNoEnd != null
? basAgvLocNoEnd.getAgvLocNo()
: (locNo != null ? locNo.getAgvLocNo() : null);
- if (Cools.isEmpty(basAgvMast)){
+ if (Cools.isEmpty(basAgvMast)) {
return false;
}
- String ctnrCode = basAgvMast.getBarcode().length() > 1?basAgvMast.getBarcode():basAgvMast.getTimestamp().toString();
+ String ctnrCode = basAgvMast.getBarcode().length() > 1 ? basAgvMast.getBarcode() : basAgvMast.getTimestamp().toString();
AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam();
agvBindCtnrAndBinParam.setReqCode(basAgvMast.getTaskNo() + "-" + System.currentTimeMillis());
agvBindCtnrAndBinParam.setCtnrCode(ctnrCode);
agvBindCtnrAndBinParam.setCtnrTyp("1");
agvBindCtnrAndBinParam.setStgBinCode(binCode);
agvBindCtnrAndBinParam.setIndBind("0");
- ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV瀹瑰櫒瑙ｇ粦", URL,AGVPath, agvBindCtnrAndBinParam);
- if (resultBind.getCode() ==200){
+ ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV瀹瑰櫒瑙ｇ粦", URL, AGVPath, agvBindCtnrAndBinParam);
+ if (resultBind.getCode() == 200) {
basAgvMast.setStatus(4);
basAgvMastService.updateById(basAgvMast);
return true;
}
return false;
- }else {
+ } else {
if (basAgvMast != null
&& basAgvMast.getIoType() != null
&& (basAgvMast.getIoType() == 0)
&& (Objects.equals(basAgvMast.getSourceStaNo(), 2033) || Objects.equals(basAgvMast.getStaNo(), 2034)
- || Objects.equals(basAgvMast.getStaNo(), 4003)|| Objects.equals(basAgvMast.getSourceStaNo(), 4006))){
+ || Objects.equals(basAgvMast.getStaNo(), 4003) || Objects.equals(basAgvMast.getSourceStaNo(), 4006))) {
AgvBindCtnrAndBinTwoParam agvBindCtnrAndBinTwoParam = new AgvBindCtnrAndBinTwoParam();
agvBindCtnrAndBinTwoParam.setReqCode(String.valueOf(snowflakeIdWorker.nextId()));
agvBindCtnrAndBinTwoParam.setPodcode(basAgvMast.getBarcode());
agvBindCtnrAndBinTwoParam.setPositionCode(basAgvMast.getStaNo().toString());
- agvBindCtnrAndBinTwoParam.setIndBind("0");;
+ agvBindCtnrAndBinTwoParam.setIndBind("0");
+ ;
ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV瀹瑰櫒瑙ｇ粦",
- AgvConstant.AGV_URL+"/"+AgvConstant.AGV_hikRpcService,AgvConstant.getAGVADAPTOR(2), agvBindCtnrAndBinTwoParam);
- if (resultBind.getCode()!=1){
+ AgvConstant.AGV_URL + "/" + AgvConstant.AGV_hikRpcService, AgvConstant.getAGVADAPTOR(2), agvBindCtnrAndBinTwoParam);
+ if (resultBind.getCode() != 1) {
basAgvMast.setStatus(4);
basAgvMastService.updateById(basAgvMast);
return true;
@@ -1138,6 +1150,176 @@
}
+ @Override
+ @Transactional
+ public R stationAll() {
+ List<StationParam> stationParams = new ArrayList<>();
+ List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>());
+ for (BasDevp basDevp : basDevps) {
+ StationParam stationParam = new StationParam();
+ Boolean boo1 = false;
+ Boolean boo2 = false;
+ StaDesc staDescIn = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("stn_no", basDevp.getDevNo()).eq("type_no", 1));
+ if (!Cools.isEmpty(staDescIn)) {
+ stationParam.setStationId(basDevp.getDevNo() + "");
+ stationParam.setStationType("1");
+ stationParam.setStationName(basDevp.getDevNo() + "");
+ stationParam.setOperateType(1);
+ boo1 = true;
+ }
+ StaDesc staDescOut = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("stn_no", basDevp.getDevNo()).eq("type_no", 101));
+ if (!Cools.isEmpty(staDescOut)) {
+ stationParam.setStationId(basDevp.getDevNo() + "");
+ stationParam.setStationType("1");
+ stationParam.setStationName(basDevp.getDevNo() + "");
+ stationParam.setOperateType(2);
+ if (boo1) {
+ stationParam.setOperateType(3);
+ }
+ boo2 = true;
+ }
+ if (boo1 || boo2) {
+ stationParams.add(stationParam);
+ }
+ }
+ String response = "";
+ try {
+ //鑾峰彇Cookie鍊�
+ HashMap<String, Object> headers = new HashMap<>();
+// headers.put("accesstoken", erpSecret.getAccessToken());
+// headers.put("x-acgw-identity", xAcfwIdentity); // 鑷畾涔夎姹傚ご
+ response = new HttpHandler.Builder()
+ .setHeaders(headers)
+ .setUri(mesUrl)
+ .setPath(stationAddress)
+ .setJson(JSON.toJSONString(stationParams))
+ .build()
+ .doPost();
+ JSONObject jsonResponse = JSON.parseObject(response);
+ if (jsonResponse.getInteger("code") == 200) {
+ } else {
+ return R.error();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return R.ok();
+ }
+ @Override
+ public R mesToComb(MesToCombParam param) {
+ if (Cools.isEmpty(param.getPalletId())) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ Date now = new Date();
+
+ Mat mat = matService.selectByMatnr(param.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ if (param.getFull()==1){
+ //婊℃墭鐩�
+ mat = matService.selectByMatnr("1");
+ }else if (param.getFull()==0){
+ //绌烘墭鐩�
+ mat = matService.selectByMatnr("0");
+ }
+
+ }
+ WaitPakin waitPakin = new WaitPakin();
+ waitPakin.sync(mat);
+ waitPakin.setBatch(String.valueOf(param.getBatchId()));
+ waitPakin.setZpallet(param.getPalletId()); // 鎵樼洏鐮�
+ waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+ waitPakin.setAnfme(param.getAnfme()); // 鏁伴噺
+ waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setAppeUser(9995L);
+ waitPakin.setAppeTime(now);
+ waitPakin.setModiUser(9995L);
+ waitPakin.setModiTime(now);
+ waitPakin.setOrderNo(String.valueOf(param.getOrderId()));
+ waitPakin.setOrigin(String.valueOf(param.getStorageArea()));//寤鸿鍏ュ簱鍖哄煙
+ waitPakin.setManu(String.valueOf(param.getLocId()));//mes鍏蜂綋搴撲綅缂栧彿
+ waitPakin.setThreeCode(param.getBizNo());
+ if (!waitPakinService.insert(waitPakin)) {
+ throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ return null;
+ }
+
+ @Override
+ public R outOrder(OutTaskParam param) {
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").eq("barcode", param.getPalletId()));
+ if (locMast == null) {
+ return R.error("娌℃湁鎵惧埌鎵樼洏鐮�="+param.getPalletId()+"瀵瑰簲鐨勫簱浣�");
+ }
+ Integer ioType = 101;
+ // 鑾峰彇璺緞
+ StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), Integer.valueOf(param.getStationId()));
+ Date now = new Date();
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+ wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
+ wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast.setCrnNo(locMast.getCrnNo());
+ wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
+ wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
+ wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
+ wrkMast.setBarcode(locMast.getBarcode());
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("N");
+ wrkMast.setUserNo(param.getOrderId());//璁㈠崟鍙�
+ wrkMast.setPltType(param.getSeq());//鍑哄簱椤哄簭锛屼粠1寮�濮�
+ wrkMast.setTakeNone("0"); //0闈炶嚜鍔�
+ wrkMast.setAppeUser(9995L); // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiUser(9995L);
+ wrkMast.setModiTime(now);
+ if (!wrkMastService.insert(wrkMast)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細"+locMast.getLocNo());
+ }
+ List<LocDetl> locNo = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
+ if (locNo == null || locNo.size() == 0) {
+ throw new CoolException("鏌ヨ搴撳瓨鏄庣粏澶辫触锛屽嚭搴撳簱浣嶅彿锛�"+locMast.getLocNo());
+ }
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ for (LocDetl locDetl : locNo) {
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(locDetl);
+ wrkDetl.setOrderNo(param.getOrderId()); // 鎵嬪姩鍑哄簱涓嶉渶瑕佸甫鍑哄簱瀛樹腑鐨勫崟鎹紪鍙�
+ wrkDetl.setWrkNo(workNo);
+ wrkDetl.setIoTime(now);
+ Double anfme = locDetl.getAnfme();
+ wrkDetl.setAnfme(anfme); // 鏁伴噺
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setAppeUser(9995L);
+ wrkDetl.setModiTime(now);
+ wrkDetl.setModiUser(9995L);
+
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
+ }
+ // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
+ locMast = locMastService.selectById(locMast.getLocNo());
+ if (locMast.getLocSts().equals("F")) {
+ locMast.setLocSts("R");
+ locMast.setModiUser(9995L);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+locMast.getLocNo());
+ }
+ } else {
+ log.error(locMast.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
+ throw new CoolException(locMast.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.9.1