From 92ff7ea27e6f99c004c727d471f2f3d82c1c3a30 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 12 十二月 2025 09:54:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jsxswms' into jsxswms
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 884 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 620 insertions(+), 264 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index f703d75..28662ed 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.zy.api.enums.MatLocType;
+import com.zy.api.enums.MatType;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
@@ -134,7 +136,7 @@
@Override
@Transactional
public R WarehouseOutPickMergeV1(WarehouseOutPickMergeParam param, Long hostId, Long userId) {
- //鍒ゆ柇搴撲綅鐘舵��
+ // 鍒ゆ柇搴撲綅鐘舵��
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getLocNo()));
if (Cools.isEmpty(locMast)) {
return R.error("璇ュ簱浣嶄笉瀛樺湪");
@@ -203,7 +205,10 @@
if (Cools.isEmpty(order)) {
continue;
}
- OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
+ OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(order.getId(), orderDetl.getMatnr(),
+ orderDetl.getBatch(), orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(),
+ orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(),
+ orderDetl.getBoxType3());
if (Cools.isEmpty(orderDetlPakin)) {
continue;
}
@@ -211,8 +216,11 @@
throw new CoolException("骞舵澘鏁伴噺鍑洪敊,璁㈠崟鍓╀綑鍑哄簱鏁伴噺灏忎簬宸插嚭搴撴暟閲忎笌灏嗗苟鏉挎暟閲忎箣鍜岋紒锛侊紒");
}
// 淇敼璁㈠崟鏄庣粏浣滀笟鏁伴噺
- if (!orderDetlPakinService.increaseWorkQty(orderDetlPakin.getOrderId(), orderDetlPakin.getMatnr(), orderDetlPakin.getBatch(), orderDetlPakin.getBrand(),
- orderDetlPakin.getStandby1(), orderDetlPakin.getStandby2(), orderDetlPakin.getStandby3(), orderDetlPakin.getBoxType1(), orderDetlPakin.getBoxType2(), orderDetlPakin.getBoxType3(), orderDetl.getAnfme())) {
+ if (!orderDetlPakinService.increaseWorkQty(orderDetlPakin.getOrderId(), orderDetlPakin.getMatnr(),
+ orderDetlPakin.getBatch(), orderDetlPakin.getBrand(),
+ orderDetlPakin.getStandby1(), orderDetlPakin.getStandby2(), orderDetlPakin.getStandby3(),
+ orderDetlPakin.getBoxType1(), orderDetlPakin.getBoxType2(), orderDetlPakin.getBoxType3(),
+ orderDetl.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁鏄庣粏宸ヤ綔鏁伴噺澶辫触");
}
@@ -248,17 +256,17 @@
return R.error("绔欑偣涓嶅瓨鍦�");
}
OrderDetlPakin orderDetlPakin = null;
- //妫�楠屼紶鍙傛槸鍚﹀拰璁㈠崟鏄庣粏鍖归厤
+ // 妫�楠屼紶鍙傛槸鍚﹀拰璁㈠崟鏄庣粏鍖归厤
for (PickMatParam matParam : param.getList()) {
- orderDetlPakin = orderDetlPakinService.selectItem
- (matParam.getOrderNo(), matParam.getMatnr(), matParam.getBatch(), matParam.getBrand(),
- matParam.getStandby1(), matParam.getStandby2(), matParam.getStandby3(),
- matParam.getBoxType1(), matParam.getBoxType2(), matParam.getBoxType3());
+ orderDetlPakin = orderDetlPakinService.selectItem(matParam.getOrderNo(), matParam.getMatnr(),
+ matParam.getBatch(), matParam.getBrand(),
+ matParam.getStandby1(), matParam.getStandby2(), matParam.getStandby3(),
+ matParam.getBoxType1(), matParam.getBoxType2(), matParam.getBoxType3());
if (orderDetlPakin == null) {
return R.error("鐗╂枡鏁版嵁涓嶅瓨鍦�");
}
- //鍓╀綑鍙敤鏁伴噺
+ // 鍓╀綑鍙敤鏁伴噺
double count = orderDetlPakin.getAnfme() - orderDetlPakin.getWorkQty();
if (matParam.getCount() != count) {
return R.error("鐗╂枡鏁版嵁宸茶繃鏈�");
@@ -324,14 +332,15 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
- //鏇存柊璁㈠崟宸ヤ綔鏁伴噺
+ // 鏇存柊璁㈠崟宸ヤ綔鏁伴噺
orderDetlPakinService.increaseWorkQty(orderDetlPakin.getOrderId(), matParam.getMatnr(),
- matParam.getBatch(), matParam.getBrand(), matParam.getStandby1(), matParam.getStandby2(), matParam.getStandby3(),
+ matParam.getBatch(), matParam.getBrand(), matParam.getStandby1(), matParam.getStandby2(),
+ matParam.getStandby3(),
matParam.getBoxType1(), matParam.getBoxType2(), matParam.getBoxType3(), matParam.getUseCount());
// 鏇存柊宸ヤ綔妗ｇ姸鎬�
orderPakinService.updateSettle(orderDetlPakin.getOrderId(), 2L, userId);
}
- // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
+ // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getLocNo()));
if (locMast.getLocSts().equals("F")) {
locMast.setLocSts("P");
@@ -350,7 +359,7 @@
@Override
@Transactional
public R WarehouseOutV1(CombParam combParam, Long hostId, Long userId) {
- //鍒ゆ柇搴撲綅鐘舵��
+ // 鍒ゆ柇搴撲綅鐘舵��
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", combParam.getLocNo()));
if (Cools.isEmpty(locMast)) {
return R.error("璇ュ簱浣嶄笉瀛樺湪");
@@ -358,12 +367,11 @@
if (!locMast.getLocSts().equals("P")) {
return R.error("璇ュ簱浣嶇姸鎬佷负锛�" + locMast.getLocSts() + ",涓嶆弧瓒冲苟鏉块�斾腑鎷ｉ�夋潯浠讹紒锛侊紒");
}
- //鏌ヨ搴撳瓨鏁版嵁
+ // 鏌ヨ搴撳瓨鏁版嵁
for (CombParam.CombMat combMat : combParam.getCombMats()) {
List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>()
.eq("loc_no", combParam.getLocNo())
- .eq("matnr", combMat.getMatnr())
- );
+ .eq("matnr", combMat.getMatnr()));
if (locDetlList.isEmpty()) {
return R.error("鏈煡璇㈠埌搴撳瓨鏁版嵁");
}
@@ -382,8 +390,10 @@
if (orderPakout.getSettle() == 1) {
OrderInAndOutUtil.updateOrder(false, orderPakout.getId(), 2L, 9527L);
}
- OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderPakout.getId(), combMat.getMatnr(), combMat.getBatch(),
- combMat.getBrand(), combMat.getStandby1(), combMat.getStandby2(), combMat.getStandby3(), combMat.getBoxType1(), combMat.getBoxType2(), combMat.getBoxType3());
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderPakout.getId(),
+ combMat.getMatnr(), combMat.getBatch(),
+ combMat.getBrand(), combMat.getStandby1(), combMat.getStandby2(), combMat.getStandby3(),
+ combMat.getBoxType1(), combMat.getBoxType2(), combMat.getBoxType3());
if (Cools.isEmpty(orderDetlPakout)) {
continue;
}
@@ -391,17 +401,22 @@
throw new CoolException("鎷ｉ�夋暟閲忓嚭閿�,璁㈠崟鍓╀綑鍑哄簱鏁伴噺灏忎簬宸插嚭搴撴暟閲忎笌灏嗘嫞閫夋暟閲忎箣鍜岋紒锛侊紒");
}
// 淇敼璁㈠崟鏄庣粏浣滀笟鏁伴噺
- if (!orderDetlPakoutService.increaseWorkQty(orderDetlPakout.getOrderId(), combMat.getMatnr(), combMat.getBatch(), combMat.getBrand(),
- combMat.getStandby1(), combMat.getStandby2(), combMat.getStandby3(), combMat.getBoxType1(), combMat.getBoxType2(), combMat.getBoxType3(), combMat.getAnfme())) {
+ if (!orderDetlPakoutService.increaseWorkQty(orderDetlPakout.getOrderId(), combMat.getMatnr(),
+ combMat.getBatch(), combMat.getBrand(),
+ combMat.getStandby1(), combMat.getStandby2(), combMat.getStandby3(), combMat.getBoxType1(),
+ combMat.getBoxType2(), combMat.getBoxType3(), combMat.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁鏄庣粏宸ヤ綔鏁伴噺澶辫触");
}
-// // 淇敼璁㈠崟鏄庣粏瀹屾垚鏁伴噺
-// if (!orderDetlPakoutService.increase(orderPakout.getId(),combMat.getMatnr(), combMat.getBatch(), combMat.getBrand(),
-// combMat.getStandby1(), combMat.getStandby2(), combMat.getStandby3(), combMat.getBoxType1(), combMat.getBoxType2(), combMat.getBoxType3(),combMat.getAnfme())) {
-// throw new CoolException("淇敼鍗曟嵁鏄庣粏瀹屾垚鏁伴噺澶辫触");
-// }
-// // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
-// orderPakoutService.checkComplete(combMat.getOrderNo());
+ // // 淇敼璁㈠崟鏄庣粏瀹屾垚鏁伴噺
+ // if (!orderDetlPakoutService.increase(orderPakout.getId(),combMat.getMatnr(),
+ // combMat.getBatch(), combMat.getBrand(),
+ // combMat.getStandby1(), combMat.getStandby2(), combMat.getStandby3(),
+ // combMat.getBoxType1(), combMat.getBoxType2(),
+ // combMat.getBoxType3(),combMat.getAnfme())) {
+ // throw new CoolException("淇敼鍗曟嵁鏄庣粏瀹屾垚鏁伴噺澶辫触");
+ // }
+ // // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
+ // orderPakoutService.checkComplete(combMat.getOrderNo());
}
try {
Date now = new Date();
@@ -510,8 +525,7 @@
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
.like("barcode", barcode)
.eq("wrk_sts", 199L)
- .eq("io_type", 103)
- );
+ .eq("io_type", 103));
wrkMastArrayList.addAll(wrkMasts);
List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
.like("barcode", barcode)
@@ -540,7 +554,7 @@
orderIds.add(order.getId());
}
- //鎼滅储鏄庣粏
+ // 鎼滅储鏄庣粏
Wrapper<OrderDetl> wrapper1 = new EntityWrapper<>();
wrapper1.eq("status", 1);
wrapper1.in("order_id", orderIds);
@@ -555,7 +569,7 @@
ArrayList<PickMatParam> maps = new ArrayList<>();
for (OrderDetl orderDetl : list) {
- //鍓╀綑鍙敤鏁伴噺
+ // 鍓╀綑鍙敤鏁伴噺
double count = orderDetl.getAnfme() - orderDetl.getWorkQty();
if (count <= 0) {
continue;
@@ -583,19 +597,26 @@
throw new CoolException("璇锋彁鍙栦竴涓晢鍝侊紝鎴栬�呭埛鏂伴噸鏂扮粍鎵橈紒");
}
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
- if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode())
+ if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode())
.eq("io_status", "N")) > 0) {
throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
}
- if (param.getBarcode().length() != 8) {
- throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + param.getBarcode());
+ if (Objects.isNull(param.getBarcode())) {
+ throw new CoolException("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
}
+ // if (param.getBarcode().length() != 8) {
+ // throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + param.getBarcode());
+ // }
+ if (Objects.isNull(param.getType())) {
+ param.setType("0");
+ }
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
- int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
+ int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>()
+ .eq(!Objects.isNull(param.getType()), "type", param.getType())
+ .eq("zpallet", param.getBarcode()));
if (countLoc > 0 || countWrk > 0 || countwait > 0) {
throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
}
@@ -606,8 +627,10 @@
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
- elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme(), elem.getThreeCode());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(),
+ elem.getStandby2(), elem.getStandby3(),
+ elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme(),
+ elem.getThreeCode());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.findDto(detlDtos, detlDto);
assert one != null;
@@ -649,7 +672,7 @@
}
// 鍏宠仈缁勬墭
} else {
-// Order order = orderService.selectByNo(param.getOrderNo());
+ // Order order = orderService.selectByNo(param.getOrderNo());
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
@@ -658,8 +681,10 @@
throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
}
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
-// OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
-// elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3());
+ // OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE,
+ // order.getId(), elem.getMatnr(), elem.getBatch(), elem.getBrand(),
+ // elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
+ // elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3());
OrderDetlPakin detls = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>()
.eq("order_id", order.getId())
.eq("matnr", elem.getMatnr()));
@@ -671,10 +696,13 @@
if (elem.getAnfme() > detls.getEnableQty()) {
throw new CoolException(detls.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎瑙勫垯");
}
- OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
+ OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(),
+ elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
- elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme(), elem.getThreeCode());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(),
+ elem.getStandby2(), elem.getStandby3(),
+ elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme(),
+ elem.getThreeCode());
detlDto.setOrderId(order.getId());
detlDto.setOrderNo(order.getOrderNo());
if (DetlDto.has(detlDtos, detlDto)) {
@@ -686,49 +714,55 @@
}
});
- BasContainer container = basContainerService.selectOne(new EntityWrapper<BasContainer>().eq("barcode", param.getBarcode()));
- if (Objects.isNull(container)) {
- throw new CoolException("鏁版嵁閿欒锛氬鍣ㄧ爜涓嶅瓨鍦紒锛�");
- }
- if (container.getMixMax() < detlDtos.size()) {
- throw new CoolException("瓒呭嚭瀹瑰櫒鏈�澶ф贩瑁呮暟閲忥紝褰撳墠瀹瑰櫒鏈�澶ф暟閲忎负锛�" + container.getMixMax() + "!!");
- }
Set<String> matnrs = detlDtos.stream().map(DetlDto::getMatnr).collect(Collectors.toSet());
List<Mat> mats = matService.selectList(new EntityWrapper<Mat>().in("matnr", matnrs));
Set<Long> tagIds = mats.stream().map(Mat::getTagId).collect(Collectors.toSet());
if (tagIds.size() > 1) {
throw new CoolException("缁勬墭鐗╂枡绫诲瀷涓嶄竴鑷达紝鍙湁鐩稿悓鐨勭墿鏂欏垎绫绘墠鍙互缁勬墭锛侊紒");
}
- //杩樺彲浠ユ斁鍏ュ灏戠鐗╂枡
- Integer suplus = container.getMixMax();
+
+ // BasContainer container = basContainerService.selectOne(new
+ // EntityWrapper<BasContainer>().eq("barcode", param.getBarcode()));
+ // if (Objects.isNull(container)) {
+ // throw new CoolException("鏁版嵁閿欒锛氬鍣ㄧ爜涓嶅瓨鍦紒锛�");
+ // }
+ // if (container.getMixMax() < detlDtos.size()) {
+ // throw new CoolException("瓒呭嚭瀹瑰櫒鏈�澶ф贩瑁呮暟閲忥紝褰撳墠瀹瑰櫒鏈�澶ф暟閲忎负锛�" + container.getMixMax() +
+ // "!!");
+ // }
+ // 杩樺彲浠ユ斁鍏ュ灏戠鐗╂枡
+ // Integer suplus = container.getMixMax();
for (DetlDto detlDto : detlDtos) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
- //鏈�澶氬彲鏀炬暟閲�
- Double singleMax = mat.getUpQty() * suplus;
- if (singleMax.compareTo(detlDto.getAnfme()) < 0) {
- throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + "鍗曟缁勬墭涓婇檺涓猴細" + mat.getUpQty() + ",褰撳墠鎬婚噺瓒呭嚭鎵樼洏瑁呰浇涓婇檺!!");
- }
- BigDecimal decimal = new BigDecimal(detlDto.getAnfme() / mat.getUpQty());
- //褰撳墠鐗╂枡闇�瑕佸崰鐢ㄦ枡绠辨牸鏁�
- Integer curr = decimal.setScale(0, RoundingMode.CEILING).intValue();
- suplus = suplus - curr;
- if (suplus < 0) {
- throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + ", 瓒呭嚭褰撳墠鎵樼洏瑁呰浇涓婇檺锛侊紒");
- }
+ // //鏈�澶氬彲鏀炬暟閲�
+ // Double singleMax = mat.getUpQty() * suplus;
+ // if (singleMax.compareTo(detlDto.getAnfme()) < 0) {
+ // throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + "鍗曟缁勬墭涓婇檺涓猴細" +
+ // mat.getUpQty() + ",褰撳墠鎬婚噺瓒呭嚭鎵樼洏瑁呰浇涓婇檺!!");
+ // }
+ // BigDecimal decimal = new BigDecimal(detlDto.getAnfme() / mat.getUpQty());
+ // //褰撳墠鐗╂枡闇�瑕佸崰鐢ㄦ枡绠辨牸鏁�
+ // Integer curr = decimal.setScale(0, RoundingMode.CEILING).intValue();
+ // suplus = suplus - curr;
+ // if (suplus < 0) {
+ // throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + ", 瓒呭嚭褰撳墠鎵樼洏瑁呰浇涓婇檺锛侊紒");
+ // }
WaitPakin waitPakin = new WaitPakin();
BeanUtils.copyProperties(mat, waitPakin);
-// waitPakin.sync(mat);
- waitPakin.setOrderNo(detlDto.getOrderNo()); // 鍗曟嵁缂栧彿
+ waitPakin.setOrderNo(detlDto.getOrderNo()); // 鍗曟嵁缂栧彿
+ waitPakin.setType(param.getType());
waitPakin.setOrderId(detlDto.getOrderId());
- waitPakin.setBatch(detlDto.getBatch()); // 搴忓垪鐮�
- waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
- waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
- waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
- waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setBatch(detlDto.getBatch()); // 搴忓垪鐮�
+ waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
+ waitPakin.setThreeCode(detlDto.getThreeCode());
+ waitPakin.setSuppCode(detlDto.getStandby1());
+ waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+ waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
+ waitPakin.setStatus("Y"); // 鐘舵��
waitPakin.setAppeUser(userId);
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
@@ -738,7 +772,8 @@
}
}
- Set<String> stringSet = param.getCombMats().stream().map(CombParam.CombMat::getOrderNo).collect(Collectors.toSet());
+ Set<String> stringSet = param.getCombMats().stream().map(CombParam.CombMat::getOrderNo)
+ .collect(Collectors.toSet());
stringSet.forEach(orderNo -> {
Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, orderNo);
OrderInAndOutUtil.updateOrder(Boolean.TRUE, order.getId(), 2L, userId);
@@ -768,7 +803,7 @@
throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鏁伴噺鏈夎锛�");
}
if (Cools.isEmpty(combMat.getBatch())) {
-// throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鎵瑰彿鏈夎锛�");
+ // throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鎵瑰彿鏈夎锛�");
}
ManLocDetl manLocDetl = new ManLocDetl();
manLocDetl.setLocNo(locno);
@@ -802,7 +837,6 @@
// 鏌ユ壘鍟嗗搧
-
@Override
@Transactional
public void adjust(MobileAdjustParam param, Long userId) {
@@ -832,12 +866,15 @@
if (wrkDetl1.getAnfme() == 0) {
iterator1.remove();
}
- if (wrkDetl.getMatnr().equals(wrkDetl1.getMatnr()) && Cools.eq(wrkDetl.getBatch(), wrkDetl1.getBatch())) {
+ if (wrkDetl.getMatnr().equals(wrkDetl1.getMatnr())
+ && Cools.eq(wrkDetl.getBatch(), wrkDetl1.getBatch())) {
if (!wrkDetl.getAnfme().equals(wrkDetl1.getAnfme())) {
// todo 鐩樼偣璁板綍銆佷繚瀛樿皟鏁磋褰�
// 淇敼鏄庣粏
- if (!wrkDetlService.updateAnfme(wrkDetl1.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
- throw new CoolException(wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�" + wrkDetl.getBatch() + "鎵瑰彿淇敼鏁伴噺澶辫触");
+ if (!wrkDetlService.updateAnfme(wrkDetl1.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(),
+ wrkDetl.getBatch())) {
+ throw new CoolException(wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�"
+ + wrkDetl.getBatch() + "鎵瑰彿淇敼鏁伴噺澶辫触");
}
}
iterator.remove();
@@ -850,7 +887,8 @@
for (WrkDetl wrkDetl : wrkDetls) {
// todo 鐩樼偣璁板綍銆佷繚瀛樿皟鏁磋褰�
if (!wrkDetlService.updateAnfme(-1.0D, wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
- throw new CoolException("鍒犻櫎" + wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�" + wrkDetl.getBatch() + "鎵瑰彿浠诲姟鏄庣粏澶辫触");
+ throw new CoolException("鍒犻櫎" + wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�"
+ + wrkDetl.getBatch() + "鎵瑰彿浠诲姟鏄庣粏澶辫触");
}
}
@@ -869,7 +907,8 @@
wrkDetl.setAppeTime(now);
wrkDetl.setAppeUser(userId);
if (!wrkDetlService.insert(wrkDetl)) {
- throw new CoolException("娣诲姞" + wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�" + wrkDetl.getBatch() + "鎵瑰彿浠诲姟鏄庣粏澶辫触");
+ throw new CoolException("娣诲姞" + wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�"
+ + wrkDetl.getBatch() + "鎵瑰彿浠诲姟鏄庣粏澶辫触");
}
}
@@ -890,8 +929,8 @@
throw new CoolException(BaseRes.PARAM);
}
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
- if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+ if (waitPakinService.selectCount(
+ new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
}
Date now = new Date();
@@ -916,11 +955,15 @@
}
Mat analyse = MatUtils.analyseMat(elem.getMatnr());
// 鏉＄爜銆佺墿鏂欎唬鐮併�佸簭鍒楀彿銆佹暟閲�
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), analyse.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
- elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme(), elem.getThreeCode());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), analyse.getBrand(), elem.getStandby1(),
+ elem.getStandby2(), elem.getStandby3(),
+ elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme(),
+ elem.getThreeCode());
-// DetlDto detlDto = new DetlDto(elem.getMatnr(), analyse.getMatnr(), analyse.getBarcode(), elem.getAnfme());
-// DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
+ // DetlDto detlDto = new DetlDto(elem.getMatnr(), analyse.getMatnr(),
+ // analyse.getBarcode(), elem.getAnfme());
+ // DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(),
+ // elem.getAnfme());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.findDto(detlDtos, detlDto);
assert one != null;
@@ -954,10 +997,12 @@
if (jsonObject.getInteger("code").equals(200)) {
success = true;
} else if (jsonObject.getInteger("code").equals(500)) {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL + MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL + MesConstant.PACK_DOWN_URL,
+ JSON.toJSONString(mesCombParam), response);
throw new CoolException(jsonObject.getString("msg"));
} else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL + MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL + MesConstant.PACK_DOWN_URL,
+ JSON.toJSONString(mesCombParam), response);
throw new CoolException("涓婃姤mes绯荤粺澶辫触");
}
} catch (Exception e) {
@@ -973,8 +1018,7 @@
"127.0.0.1",
JSON.toJSONString(mesCombParam),
response,
- success
- );
+ success);
} catch (Exception e) {
log.error("", e);
}
@@ -989,15 +1033,15 @@
openParam.setOrderType("鎵撳寘鍏ュ簱鍗�");
openParam.setOrderDetails(detlDtos);
openService.pakinOrderCreate(openParam);
-// Order order = orderService.selectByNo(orderNo);
+ // Order order = orderService.selectByNo(orderNo);
Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, param.getOrderNo());
if (null == order) {
throw new CoolException("鐢熸垚鍗曟嵁澶辫触");
}
-// if (!orderService.updateSettle(order.getId(), 2L, userId)) {
-// throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
-// }
+ // if (!orderService.updateSettle(order.getId(), 2L, userId)) {
+ // throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+ // }
OrderInAndOutUtil.updateOrder(Boolean.TRUE, order.getId(), 2L, userId);
// 鐢熸垚鍏ュ簱閫氱煡妗�
@@ -1005,18 +1049,22 @@
// 淇敼浣滀笟鏁伴噺 ----------------------------------------
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
-// OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), detlDto.getMatnr(), detlDto.getBatch());
- OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(), detlDto.getStandby3()
- , detlDto.getBoxType1(), detlDto.getBoxType2(), detlDto.getBoxType3());
+ // OrderDetl orderDetl = orderDetlService.selectItem(order.getId(),
+ // detlDto.getMatnr(), detlDto.getBatch());
+ OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), detlDto.getMatnr(),
+ detlDto.getBatch(), detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(),
+ detlDto.getStandby3(), detlDto.getBoxType1(), detlDto.getBoxType2(), detlDto.getBoxType3());
if (detlDto.getAnfme() > orderDetl.getEnableQty()) {
throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
}
// 淇敼璁㈠崟浣滀笟鏁伴噺
-// if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
-// throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
-// }
- OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE, order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(), detlDto.getStandby3()
- , detlDto.getBoxType1(), detlDto.getBoxType2(), detlDto.getBoxType3(), detlDto.getAnfme());
+ // if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(),
+ // detlDto.getBatch(), detlDto.getAnfme())) {
+ // throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
+ // }
+ OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE, order.getId(), detlDto.getMatnr(), detlDto.getBatch(),
+ detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(), detlDto.getStandby3(),
+ detlDto.getBoxType1(), detlDto.getBoxType2(), detlDto.getBoxType3(), detlDto.getAnfme());
// 淇濆瓨鍏ュ簱閫氱煡妗�
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
if (Cools.isEmpty(mat)) {
@@ -1026,10 +1074,10 @@
BeanUtils.copyProperties(mat, waitPakin);
waitPakin.setOrderNo(orderNo);
waitPakin.setBatch(detlDto.getBatch());
- waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
- waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
- waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
- waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
+ waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+ waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
+ waitPakin.setStatus("Y"); // 鐘舵��
waitPakin.setAppeUser(userId);
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
@@ -1057,25 +1105,27 @@
String orderNo = param.containsKey("orderNo") ? param.get("orderNo").toString() : "";
BasDevp sta = basDevpService.checkSiteStatus(staNo);
- //鏍规嵁璁㈠崟鍙风敓鎴愬嚭搴撲换鍔″伐浣滄。
+ // 鏍规嵁璁㈠崟鍙风敓鎴愬嚭搴撲换鍔″伐浣滄。
Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, orderNo);
-// Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderNo));
+ // Order order = orderService.selectOne(new
+ // EntityWrapper<Order>().eq("order_no", orderNo));
if (order.getSettle() != 1 && order.getSettle() != 2) {
throw new CoolException("璇ヨ鍗曞凡澶勭悊");
}
-// List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
+ // List<OrderDetl> orderDetls = orderDetlService.selectList(new
+ // EntityWrapper<OrderDetl>().eq("order_no", orderNo));
List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(Boolean.FALSE, order.getId());
Date now = new Date();
for (OrderDetl orderDetl : orderDetls) {
- //鏌ヨ鎵�鏈夊簱浣嶇姸鎬佷负F鐨勫簱浣嶄俊鎭�
+ // 鏌ヨ鎵�鏈夊簱浣嶇姸鎬佷负F鐨勫簱浣嶄俊鎭�
List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, null);
if (locDetls.size() == 0) {
throw new CoolException("搴撳瓨涓病鏈夎鐗╂枡");
}
for (LocDetl locDetl : locDetls) {
- //濡傛灉璇ュ簱浣嶅嚭搴撹矾绾挎墍鐢ㄧ殑鍫嗗灈鏈簅ut_enable涓嶄负Y,璺宠繃璇ュ惊鐜�
+ // 濡傛灉璇ュ簱浣嶅嚭搴撹矾绾挎墍鐢ㄧ殑鍫嗗灈鏈簅ut_enable涓嶄负Y,璺宠繃璇ュ惊鐜�
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_no", locDetl.getLocNo()));
if (Cools.isEmpty(locMast)) {
@@ -1087,23 +1137,24 @@
continue;
}
- //鍙嚭搴撴暟閲� = 璁㈠崟鏁伴噺 - 浣滀笟涓暟閲�
+ // 鍙嚭搴撴暟閲� = 璁㈠崟鏁伴噺 - 浣滀笟涓暟閲�
Double outQty = orderDetl.getAnfme() - orderDetl.getWorkQty();
if (outQty <= 0) {
break;
}
// 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷ｆ枡鍑哄簱
Double sumCount = locDetlService.getLocDetlSumQty(locDetl.getLocNo());
- Double curOutQty = outQty >= locDetl.getAnfme() ? locDetl.getAnfme() : outQty; //鏈鍑哄簱閲�
+ Double curOutQty = outQty >= locDetl.getAnfme() ? locDetl.getAnfme() : outQty; // 鏈鍑哄簱閲�
int ioType = sumCount <= curOutQty ? 101 : 103;
stockOut(orderDetl, sta, locDetl, curOutQty, ioType, userId, now);
order.setSettle(2L);
order.setUpdateBy(userId);
order.setUpdateTime(now);
-// if(!orderService.update(order, new EntityWrapper<Order>().eq("order_no", orderNo))){
-// throw new CoolException("鏇存柊璁㈠崟鐘舵�佸け璐�");
-// }
+ // if(!orderService.update(order, new EntityWrapper<Order>().eq("order_no",
+ // orderNo))){
+ // throw new CoolException("鏇存柊璁㈠崟鐘舵�佸け璐�");
+ // }
OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 2L, userId);
orderDetl.setWorkQty(orderDetl.getWorkQty() + curOutQty);
orderDetl.setUpdateBy(userId);
@@ -1113,9 +1164,9 @@
if (!Cools.isEmpty(orderDetl.getBatch())) {
wrapper.eq("batch", orderDetl.getBatch());
}
-// if(!orderDetlService.update(orderDetl, wrapper)){
-// throw new CoolException("鏇存柊璁㈠崟鏄庣粏澶辫触");
-// }
+ // if(!orderDetlService.update(orderDetl, wrapper)){
+ // throw new CoolException("鏇存柊璁㈠崟鏄庣粏澶辫触");
+ // }
OrderInAndOutUtil.updateOrderDetl(order.getPakinPakoutStatus$(), order, orderDetl);
}
@@ -1126,7 +1177,7 @@
@Override
@Transactional
public void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
- Double curOutQty, Integer ioType, Long userId, Date now) {
+ Double curOutQty, Integer ioType, Long userId, Date now) {
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(locDetl.getLocNo());
// 鑾峰彇璺緞
@@ -1180,7 +1231,7 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
- // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
+ // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
locMast = locMastService.selectById(locDetl.getLocNo());
if (locMast.getLocSts().equals("F")) {
locMast.setLocSts(ioType == 101 ? "R" : "P");
@@ -1215,24 +1266,29 @@
* @version 1.0
*/
@Override
- public R callAgvMove(AgvCallParams params, Long userId) {
- if (Objects.isNull(params.getTarSite())) {
- throw new CoolException("鐩爣鍙傛暟涓嶈兘涓虹┖锛侊紒");
- }
+ @Transactional
+ public synchronized R callAgvMove(AgvCallParams params, Long userId) {
if (Objects.isNull(params.getOrgSite())) {
throw new CoolException("婧愮珯鐐逛笉鑳戒负绌猴紒锛�");
}
+ BasAreas basAreas = basAreasService
+ .selectOne(new EntityWrapper<BasAreas>().eq("whs_type_id", LocAreaType.LOC_AREA_TYPE_IN_CACHE.type));
LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>()
+ .eq("area_id", basAreas.getId())
.eq("frozen", 0)
.eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type)
- .eq("loc_no", params.getTarSite())
+ // .eq("loc_no", params.getTarSite())
.orderAsc(Arrays.asList("loc_no"))
.last("OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY"));
if (Objects.isNull(locCache)) {
throw new CoolException("璇锋鏌ョ洰鏍囧簱浣嶆槸鍚﹂棽缃腑锛侊紒");
}
- generateAgvTask("agv", locCache, params.getOrgSite(), params.getBarcode(), userId);
+ try {
+ generateAgvTask("agv", locCache, params.getOrgSite(), params.getBarcode(), userId);
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
return R.ok();
}
@@ -1251,7 +1307,8 @@
if (Objects.isNull(params.getOrderNo())) {
throw new CoolException("鍗曞彿涓嶈兘涓虹┖锛侊紒");
}
- OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", params.getOrderNo()));
+ OrderPakin orderPakin = orderPakinService
+ .selectOne(new EntityWrapper<OrderPakin>().eq("order_no", params.getOrderNo()));
if (Objects.isNull(orderPakin)) {
throw new CoolException("鏁版嵁閿欒锛氬崟鎹笉瀛樺湪锛侊紒");
}
@@ -1272,30 +1329,76 @@
* @version 1.0
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public R OutCallAgv(AgvCallParams params, Long userId) {
- /**鑾峰彇鍏ュ簱鏈�鏃╃殑涓�鏉℃暟鎹�**/
- LocCache locCaches = locCacheService.selectOne(new EntityWrapper<LocCache>()
- .eq("loc_sts", LocStsType.LOC_STS_TYPE_F.type)
- .eq("frozen", 0)
- .orderDesc(Arrays.asList("sort", "first_time"))
- .last("OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY"));
- if (Objects.isNull(locCaches)) {
- throw new CoolException("鏆傛棤婊¤冻闇�姹傚簱浣嶏紒");
- }
+
BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
.eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type)
.eq("dev_no", params.getTarSite()));
if (Objects.isNull(station)) {
- throw new CoolException("绔欑偣姝ｅ湪鎵ц浠诲姟锛侊紒");
+ throw new CoolException("璇锋鏌ョ珯鐐逛俊鎭紒");
}
- /**鐢熸垚缂撳瓨鍖哄嚭搴撲换鍔�*/
- generateCacheOutTask(station, locCaches, userId);
+ /** 鑾峰彇鍏ュ簱鏈�鏃╃殑涓�鏉℃暟鎹� **/
+ List<LocCache> locCaches = locCacheService.selectList(new EntityWrapper<LocCache>()
+ .eq("loc_sts", LocStsType.LOC_STS_TYPE_F.type)
+ .eq("frozen", 0)
+ .in("loc_no", new EntityWrapper<LocDetl>()
+ .setSqlSelect("DISTINCT loc_no")
+ .in("matnr", new EntityWrapper<Mat>()
+ .setSqlSelect("matnr")
+ .eq("tag_id", station.getCtnType())))
+ .orderDesc(Arrays.asList("sort", "first_time")));
- /**鐢熸垚绔嬪簱鍑哄簱浠诲姟*/
- generateCRNOutTask(station, locCaches, userId);
+ if (locCaches.isEmpty()) {
+ throw new CoolException("鏆傛棤婊¤冻闇�姹傚簱浣嶏紒");
+ }
- return R.ok();
+ for (LocCache locCache : locCaches) {
+ // 鑾峰彇缂撳瓨鍖轰俊鎭�
+ BasAreas basAreas = basAreasService.selectOne(
+ new EntityWrapper<BasAreas>().eq("whs_type_id", LocAreaType.LOC_AREA_TYPE_IN_CACHE.type));
+ if (Objects.isNull(basAreas)) {
+ throw new CoolException("搴撳尯涓嶅瓨鍦紒锛�");
+ }
+
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+ .eq("area_id", basAreas.getId())
+ .eq("loc_no", locCache.getLocNo()));
+ if (Objects.isNull(locDetls) || locDetls.isEmpty()) {
+ throw new CoolException("搴撳瓨鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+
+ Set<String> set = locDetls.stream().map(LocDetl::getMatnr).collect(Collectors.toSet());
+ List<Mat> matList = matService.selectList(new EntityWrapper<Mat>().in("matnr", set));
+ if (Objects.isNull(matList) || matList.isEmpty()) {
+ throw new CoolException("鐗╂枡搴撲笉瀛樺湪璇ョ墿鏂�!!");
+ }
+ Set<Long> longs = matList.stream().map(Mat::getTagId).collect(Collectors.toSet());
+ if (!longs.isEmpty() && longs.size() > 1) {
+ throw new CoolException("鐗╂枡绫诲瀷涓嶄竴鑷�,璇锋鏌ユ暟鎹槸鍚︽纭�!!");
+ }
+
+ Mat mat = matList.stream().findFirst().get();
+
+// BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
+// .eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type)
+// .eq("ctn_type", mat.getTagId())
+// .eq("dev_no", params.getTarSite()));
+
+ if (mat.getTagId() != station.getCtnType().longValue()){
+ continue;
+ }
+
+ /** 鐢熸垚缂撳瓨鍖哄嚭搴撲换鍔� */
+ generateCacheOutTask(station, locCache, userId);
+
+ /** 鐢熸垚绔嬪簱鍑哄簱浠诲姟 */
+ generateCRNOutTask(station, locCache, userId);
+
+ return R.ok();
+ }
+ return R.error("鏈壘鍒颁笌绔欑偣绫诲瀷鍖归厤鐨勫簱瀛�");
}
@Override
@@ -1303,11 +1406,9 @@
BasAreas basAreas = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("name", params.getOrgSite()));
-
List<LocCache> locCaches = locCacheService.selectList(new EntityWrapper<LocCache>()
.eq("loc_sts", LocStsType.LOC_STS_TYPE_D.type)
- .eq("area_id", basAreas.getId())
- );
+ .eq("area_id", basAreas.getId()));
if (locCaches.isEmpty()) {
throw new CoolException("鏆傛棤绌烘澘搴撲綅");
}
@@ -1320,48 +1421,142 @@
}
generateCacheOutTask(station, locCaches.get(0), userId);
-
-// HIKApiDTO hikApiDTO =new HIKApiDTO()
-// .setOrg(locCaches.get(0).getLocNo())
-// .setOrgType("05")
-// .setTar(params.getTarSite())
-// .setTarType("05")
-// .setTaskType("GT5")
-// .setPriority("1")
-// .setCtnrType("2")
-// ;
-// HIKResultDTO hikResultDTO = sendAgvTask(hikApiDTO, HIKApiConstant.AGV_CALL_IN_PATH);
-// if (!hikResultDTO.isSuccess()){
-// return R.error(hikResultDTO.getMessage());
-// }
+ // HIKApiDTO hikApiDTO =new HIKApiDTO()
+ // .setOrg(locCaches.get(0).getLocNo())
+ // .setOrgType("05")
+ // .setTar(params.getTarSite())
+ // .setTarType("05")
+ // .setTaskType("GT5")
+ // .setPriority("1")
+ // .setCtnrType("2")
+ // ;
+ // HIKResultDTO hikResultDTO = sendAgvTask(hikApiDTO,
+ // HIKApiConstant.AGV_CALL_IN_PATH);
+ // if (!hikResultDTO.isSuccess()){
+ // return R.error(hikResultDTO.getMessage());
+ // }
return R.ok();
}
@Override
-// @Transactional(rollbackFor = Exception.class)
+ @Transactional(rollbackFor = Exception.class)
public R collectionInCall(AgvCallParams params, Long userId) {
if (Objects.isNull(params.getOrgSite())) {
throw new CoolException("婧愮珯鐐逛笉鑳戒负绌猴紒锛�");
}
- List<Task> tasks = taskService.selectList(new EntityWrapper<Task>().eq("barcode", params.getBarcode()));
- if (!tasks.isEmpty()) {
- throw new CoolException("鎵樼洏鐮佸凡鐢熸垚浠诲姟");
- }
-
BasAreas basAreas = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("name", params.getTarSite()));
List<LocCache> locCaches = locCacheService.selectList(new EntityWrapper<LocCache>()
- .in("loc_sts", LocStsType.LOC_STS_TYPE_O.type, LocStsType.LOC_STS_TYPE_D.type)
+ .in("loc_sts", LocStsType.LOC_STS_TYPE_O.type)
.eq("area_id", basAreas.getId()));
if (locCaches.isEmpty()) {
throw new CoolException("褰撳墠鏆傛棤绌哄簱浣嶏紒锛�");
}
- generateAgvTask("agv", locCaches.get(0), params.getOrgSite(), params.getBarcode(), userId);
+ BasStation station = basStationService
+ .selectOne(new EntityWrapper<BasStation>().eq("dev_no", params.getOrgSite()));
+ if (Objects.isNull(station)) {
+ throw new CoolException("婧愮珯鐐规湭妫�绱㈠埌鏁版嵁锛侊紒");
+ }
+
+ generateSOEOInTask("agv", locCaches.get(0), params.getOrgSite(), station.getBarcode(), userId);
return R.ok();
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public void generateSOEOInTask(String type, LocCache loc, String orgSite, String barcode, Long userId) {
+ List<BasStationDetl> basStationDetls = basStationDetlService
+ .selectList(new EntityWrapper<BasStationDetl>().eq("dev_no", orgSite));
+ if (Objects.isNull(basStationDetls) || basStationDetls.isEmpty()) {
+ throw new CoolException("绔欑偣淇℃伅涓嶅瓨鍦紒锛�");
+ }
+
+ List<Task> tasks = taskService.selectList(new EntityWrapper<Task>().eq("barcode", barcode));
+ if (!tasks.isEmpty()) {
+ throw new CoolException("鎵樼洏宸插湪浠诲姟鎵ц涓�..");
+ }
+ // 鑾峰彇宸ヤ綔鍙�
+ int workNo = commonService.getWorkNo(WorkNoType.PICK.type);
+ // 淇濆瓨宸ヤ綔妗�
+ Task task = new Task();
+ task.setWrkNo(workNo)
+ .setIoTime(new Date())
+ .setWrkSts(1L) // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+ .setIoType(1) // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
+ .setTaskType("agv")
+ .setIoPri(10D)
+ .setLocNo(loc.getLocNo()) // 鐩爣搴撲綅
+ .setFullPlt("Y") // 婊℃澘锛歒
+ .setPicking("N") // 鎷ｆ枡
+ .setExitMk("N")// 閫�鍑�
+ .setSourceStaNo(orgSite)
+ .setEmptyMk(loc.getLocSts().equals("D") ? "Y" : "N")// 绌烘澘
+ .setBarcode(barcode)// 鎵樼洏鐮�
+ .setLinkMis("N")
+ .setAppeUser(userId)
+ .setAppeTime(new Date())
+ .setModiUser(userId)
+ .setModiTime(new Date());
+ if (!taskService.insert(task)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+
+ for (BasStationDetl basStationDetl : basStationDetls) {
+ TaskDetl wrkDetl = new TaskDetl();
+ BeanUtils.copyProperties(basStationDetl, wrkDetl);
+ wrkDetl.setWrkNo(workNo)
+ .setIoTime(new Date())
+ .setOrderNo(basStationDetl.getOrderNo())
+ .setAnfme(basStationDetl.getAnfme())
+ .setZpallet(basStationDetl.getBarcode())
+ .setBatch(basStationDetl.getBatch())
+ .setMatnr(basStationDetl.getMatnr())
+ .setMaktx(basStationDetl.getMaktx())
+ .setStandby1(basStationDetl.getStandby1())
+ .setAppeUser(userId)
+ .setUnit(basStationDetl.getUnit())
+ .setModel(basStationDetl.getModel())
+ .setAppeTime(new Date())
+ .setModiUser(userId);
+
+ // 淇濆瓨宸ヤ綔妗ｆ槑缁�
+ if (!taskDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
+ }
+
+ // 淇敼鐩爣搴撲綅鐘舵��
+ if (loc.getLocSts().equals(LocStsType.LOC_STS_TYPE_O.type)) {
+ loc.setLocSts(LocStsType.LOC_STS_TYPE_S.type); // S.鍏ュ簱棰勭害
+ loc.setModiTime(new Date());
+ loc.setModiUser(userId);
+ if (!locCacheService.updateById(loc)) {
+ throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�");
+ }
+ } else {
+ throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細" + loc.getLocSts$());
+ }
+
+ // 淇敼鐩爣绔欑偣淇℃伅
+ BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", orgSite));
+ if (Objects.isNull(station)) {
+ throw new CoolException("绔欑偣涓嶅瓨鍦�!!");
+ }
+
+ if (station.getLocSts().equals(LocStsType.LOC_STS_TYPE_F.type)) {
+ station.setLocSts("R"); // S.鍏ュ簱棰勭害
+ station.setBarcode(barcode);
+ station.setModiTime(new Date());
+ station.setModiUser(userId);
+ if (!basStationService.updateById(station)) {
+ throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�");
+ }
+ } else {
+ throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細" + station.getLocSts());
+ }
}
/**
@@ -1388,8 +1583,8 @@
*/
@Override
public R combCacehList(AgvCallParams params) {
- if (Objects.isNull(params.getBarcode())) {
- throw new CoolException("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ if (Objects.isNull(params.getCarBarcode())) {
+ throw new CoolException("鍙拌溅鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
}
if (Objects.isNull(params.getBsCode())) {
throw new CoolException("BS鐮佷笉鑳戒负绌猴紒锛�");
@@ -1397,14 +1592,15 @@
Task task = taskService.selectOne(new EntityWrapper<Task>()
.eq("io_type", TaskIOType.PICK_OUT.type)
.eq("wrk_sts", 14)
- .eq("barcode", params.getBarcode()));
+ .eq("barcode", params.getCarBarcode()));
if (Objects.isNull(task)) {
throw new CoolException("鏁版嵁閿欒锛氫换鍔′俊鎭瓨鍦紒锛�");
}
List<TaskDetl> taskDetl = taskDetlService.selectList(new EntityWrapper<TaskDetl>()
.eq("three_code", params.getBsCode())
- .eq("zpallet", params.getBarcode()));
+ .eq("wrk_no", task.getWrkNo())
+ .eq("zpallet", params.getCarBarcode()));
if (Objects.isNull(taskDetl) || taskDetl.isEmpty()) {
throw new CoolException("褰撳墠BS缂栫爜涓嶅瓨鍦紒锛�");
@@ -1431,8 +1627,7 @@
throw new CoolException("缁勬墭鏄庣粏涓嶈兘涓虹┖锛侊紒");
}
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
- if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode())
+ if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode())
.eq("io_status", "N")) > 0) {
throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
}
@@ -1447,7 +1642,8 @@
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(),
+ elem.getStandby2(), elem.getStandby3(),
elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme(), elem.getThreeCode());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.findDto(detlDtos, detlDto);
@@ -1457,22 +1653,47 @@
detlDtos.add(detlDto);
}
});
-
+ BasContainer container = basContainerService
+ .selectOne(new EntityWrapper<BasContainer>().eq("barcode", param.getBarcode()));
+ if (Objects.isNull(container)) {
+ throw new CoolException("鏁版嵁閿欒锛氬鍣ㄧ爜涓嶅瓨鍦紒锛�");
+ }
+ if (container.getMixMax() < detlDtos.size()) {
+ throw new CoolException("瓒呭嚭瀹瑰櫒鏈�澶ф贩瑁呮暟閲忥紝褰撳墠瀹瑰櫒鏈�澶ф暟閲忎负锛�" + container.getMixMax() + "!!");
+ }
+ Set<String> matnrs = detlDtos.stream().map(DetlDto::getMatnr).collect(Collectors.toSet());
+ List<Mat> mats = matService.selectList(new EntityWrapper<Mat>().in("matnr", matnrs));
+ Set<Long> tagIds = mats.stream().map(Mat::getTagId).collect(Collectors.toSet());
+ if (tagIds.size() > 1) {
+ throw new CoolException("缁勬墭鐗╂枡绫诲瀷涓嶄竴鑷达紝鍙湁鐩稿悓鐨勭墿鏂欏垎绫绘墠鍙互缁勬墭锛侊紒");
+ }
+ // 杩樺彲浠ユ斁鍏ュ灏戠鐗╂枡
+ Integer suplus = container.getMixMax();
Date now = new Date();
for (DetlDto detlDto : detlDtos) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
- if (mat.getUpQty().compareTo(detlDto.getAnfme()) < 0) {
- throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + "鍗曟鏈�澶х粍鎵樹笂闄愪负锛�" + mat.getUpQty());
+ // 鏈�澶氬彲鏀炬暟閲�
+ Double singleMax = mat.getUpQty() * suplus;
+ if (singleMax.compareTo(detlDto.getAnfme()) < 0) {
+ throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + "鍗曟缁勬墭涓婇檺涓猴細" + mat.getUpQty() + ",褰撳墠鎬婚噺瓒呭嚭鎵樼洏瑁呰浇涓婇檺!!");
}
+ BigDecimal decimal = new BigDecimal(detlDto.getAnfme() / mat.getUpQty());
+ // 褰撳墠鐗╂枡闇�瑕佸崰鐢ㄦ枡绠辨牸鏁�
+ Integer curr = decimal.setScale(0, RoundingMode.CEILING).intValue();
+ suplus = suplus - curr;
+ if (suplus < 0) {
+ throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + ", 瓒呭嚭褰撳墠鎵樼洏瑁呰浇涓婇檺锛侊紒");
+ }
+
WaitPakin waitPakin = new WaitPakin();
BeanUtils.copyProperties(mat, waitPakin);
waitPakin.setBatch(detlDto.getBatch());
waitPakin.setZpallet(param.getBarcode());
- //璁剧疆缁勬墭绫诲瀷
- waitPakin.setType(CommonEnum.COMMON_ENUM_Y.type + "");
+ // 璁剧疆缁勬墭绫诲瀷
+ waitPakin.setType(param.getType());
waitPakin.setIoStatus("N");
waitPakin.setAnfme(detlDto.getAnfme());
waitPakin.setThreeCode(detlDto.getThreeCode());
@@ -1510,12 +1731,15 @@
if (Objects.isNull(param.getStation())) {
throw new CoolException("绔欑偣涓嶈兘涓虹┖!!");
}
- //TODO 淇敼缂撳瓨绔欑偣鐘舵�佸強鏁版嵁
- Task task = taskService.selectOne(new EntityWrapper<Task>().eq("barcode", param.getBarcode()));
+ // TODO 淇敼缂撳瓨绔欑偣鐘舵�佸強鏁版嵁
+ Task task = taskService.selectOne(new EntityWrapper<Task>()
+ .eq("wrk_sts", 14L)
+ .eq("barcode", param.getCarBarcode()));
if (Objects.isNull(task)) {
throw new CoolException("鏁版嵁閿欒,浠诲姟涓嶅瓨鍦�!!");
}
- List<TaskDetl> taskDetls = taskDetlService.selectList(new EntityWrapper<TaskDetl>().eq("wrk_no", task.getWrkNo()));
+ List<TaskDetl> taskDetls = taskDetlService
+ .selectList(new EntityWrapper<TaskDetl>().eq("wrk_no", task.getWrkNo()));
if (Objects.isNull(taskDetls) || taskDetls.isEmpty()) {
throw new CoolException("鏁版嵁閿欒,浠诲姟鏄庣粏涓嶅瓨鍦�!!");
}
@@ -1530,24 +1754,138 @@
if (!basStationService.updateById(station)) {
throw new CoolException("绔欑偣鐘舵�佷慨鏀瑰け璐�!");
}
+ basStationDetlService.delete(new EntityWrapper<BasStationDetl>().eq("dev_no", station.getDevNo()));
- if (!basStationDetlService.delete(new EntityWrapper<BasStationDetl>().eq("dev_no", station.getDevNo()))) {
- throw new CoolException("绔欑偣鍒犻櫎澶辫触!");
- }
-
- //浠诲姟瀹屾垚
+ // 浠诲姟瀹屾垚
task.setWrkSts(15L);
if (!taskService.updateById(task)) {
throw new CoolException("AGV浠诲姟瀹屾垚澶辫触!!");
}
- List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("barcodee", param.getBarcode()));
+ List<WaitPakin> waitPakins = waitPakinService
+ .selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
if (Objects.isNull(waitPakins) || waitPakins.isEmpty()) {
throw new CoolException("鏁版嵁閿欒,缁勬嫋妗ｅ凡涓嶅瓨鍦�!!");
}
generateCrnInTask(waitPakins, station, param.getLocType1(), userId);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R collectionPakin(CollectionPakinParams params, Long userId) {
+ List<BasStation> basStations = basStationService
+ .selectList(new EntityWrapper<BasStation>().eq("barcode", params.getTarBarcode()));
+ if (basStations.isEmpty() && Cools.isEmpty(params.getDevNo())) {
+ throw new CoolException("璇疯緭鍏ョ珯鐐瑰彿");
+ }
+ BasStation basStation = null;
+ if (!basStations.isEmpty()) {
+ basStation = basStations.get(0);
+ } else {
+ basStation = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", params.getDevNo()));
+ }
+ if (Cools.isEmpty(basStation)) {
+ throw new CoolException("璇疯緭鍏ユ纭殑绔欑偣鍙�");
+ }
+ for (CollectionPakinParams.CombMat combMat : params.getCombMats()) {
+ if (combMat.getWorkQty().compareTo(BigDecimal.ZERO) == 0) {
+ continue;
+ }
+
+ OrderPakin orderPakin = orderPakinService.selectByNo(combMat.getOrderNo());
+ if (Cools.isEmpty(orderPakin)) {
+ throw new CoolException("鏈壘鍒板璐у叆搴撳崟");
+ }
+
+ UpdateDetailsOfPakin(orderPakin, combMat);
+
+ BasStationDetl basStationDetl = basStationDetlService.selectOne(new EntityWrapper<BasStationDetl>()
+ .eq("dev_no", basStation.getDevNo())
+ .eq("matnr", combMat.getMatnr())
+ .eq("batch", combMat.getBatch())
+ .eq("standby1", combMat.getStandby1()));
+ if (Cools.isEmpty(basStationDetl)) {
+ basStationDetl = new BasStationDetl();
+ Mat mat = matService.selectByMatnr(combMat.getMatnr());
+ BeanUtils.copyProperties(mat, basStationDetl);
+ basStationDetl
+ .setOrderNo(orderPakin.getOrderNo())
+ .setDevNo(basStation.getDevNo())
+ .setBarcode(params.getTarBarcode())
+ .setBatch(combMat.getBatch())
+ .setStandby1(combMat.getStandby1())
+ .setAnfme(combMat.getWorkQty().doubleValue());
+ if (!basStationDetlService.insert(basStationDetl)) {
+ throw new CoolException("鎻掑叆鏄庣粏澶辫触");
+ }
+
+ } else {
+ BigDecimal anfme = new BigDecimal(basStationDetl.getAnfme().toString()).add(combMat.getWorkQty());
+ basStationDetl.setAnfme(anfme.doubleValue());
+ if (!basStationDetlService.updateById(basStationDetl)) {
+ throw new CoolException("鏇存柊鏄庣粏鏁版嵁澶辫触");
+ }
+
+ }
+ }
+ if (basStation.getLocSts().equals(LocStsType.LOC_STS_TYPE_D.type)
+ || basStation.getLocSts().equals(LocStsType.LOC_STS_TYPE_O.type)) {
+ basStation.setBarcode(params.getTarBarcode());
+ basStation.setLocSts(LocStsType.LOC_STS_TYPE_F.type);
+ basStationService.updateById(basStation);
+ }
+
+ return R.ok();
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public void UpdateDetailsOfPakin(OrderPakin orderPakin, CollectionPakinParams.CombMat combMat) {
+ OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>()
+ .eq("order_id", orderPakin.getId())
+ .eq("matnr", combMat.getMatnr())
+ .eq("batch", combMat.getBatch())
+ .eq("standby1", combMat.getStandby1()));
+ if (Cools.isEmpty(orderDetlPakin)) {
+ throw new CoolException("妫�绱㈠崟鎹槑缁嗘暟鎹け璐�");
+ }
+ if (orderDetlPakin.getWorkQty() >= orderDetlPakin.getAnfme()) {
+ throw new CoolException("璇峰嬁瓒呭嚭璁㈠崟鏄庣粏鏁伴噺");
+ }
+ BigDecimal workQty = new BigDecimal(orderDetlPakin.getWorkQty().toString()).add(combMat.getWorkQty());
+ orderDetlPakin.setWorkQty(workQty.doubleValue());
+ if (!orderDetlPakinService.updateById(orderDetlPakin)) {
+ throw new CoolException("鏇存柊鍗曟嵁鏄庣粏鏁版嵁澶辫触");
+ }
+ if (!orderPakin.getSettle().equals(2L)) {
+ orderPakin.setSettle(2L);
+ if (!orderPakinService.updateById(orderPakin)) {
+ throw new CoolException("鏇存柊鍗曟嵁鐘舵�佸け璐�");
+ }
+ }
+
+ }
+
+ @Override
+ public R collectionPakinView(CollectionPakinParams params) {
+
+ WrkMast wrkMast = wrkMastService.selectByBarcode(params.getOrgBarcode());
+ if (Cools.isEmpty(wrkMast)) {
+ throw new CoolException("鏈壘鍒颁换鍔�");
+ }
+
+ if (wrkMast.getIoType().equals(TaskIOType.ALL_OUT.type)
+ && wrkMast.getIoType().equals(TaskIOType.PICK_OUT.type)) {
+ throw new CoolException("浜虹墿绫诲瀷閿欒");
+ }
+
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ if (Cools.isEmpty(wrkDetls)) {
+ throw new CoolException("鏈壘鍒颁换鍔℃槑缁�");
+ }
+
+ return R.ok(wrkDetls);
}
/**
@@ -1558,10 +1896,11 @@
* @date 2025/12/9 13:54
*/
@Transactional(rollbackFor = Exception.class)
- public void generateCrnInTask(List<WaitPakin> waitPakins, BasStation station, Short locType, Long userId) {
+ public void generateCrnInTask(List<WaitPakin> waitPakins, BasStation station, Short locType, Long userId) {
Date now = new Date();
StationRela rela = stationRelaService.selectOne(new EntityWrapper<StationRela>()
- .eq("dev_no", station.getDevNo())
+ .eq("agv_sta", station.getDevNo())
+ .orderAsc(Arrays.asList("crn_sta"))
.last("OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY"));
if (Objects.isNull(rela)) {
@@ -1574,7 +1913,7 @@
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
WaitPakin pakin = waitPakins.stream().findFirst().get();
FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(pakin);
- StartupDto dto = commonService.getLocNo( 1, sourceStaNo.getDevNo(),findLocNoAttributeVo, locTypeDto);
+ StartupDto dto = commonService.getLocNo(1, sourceStaNo.getDevNo(), findLocNoAttributeVo, locTypeDto);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -1617,7 +1956,7 @@
});
// 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
- .eq("zpallet", pakin.getBarcode());
+ .eq("zpallet", pakin.getZpallet());
WaitPakin setParam = new WaitPakin();
setParam.setLocNo(dto.getLocNo());
setParam.setIoStatus("Y");
@@ -1628,19 +1967,19 @@
// 鏇存柊婧愮珯鐐逛俊鎭�
sourceStaNo.setWrkNo(workNo);
sourceStaNo.setModiTime(now);
- if (!basDevpService.updateById(sourceStaNo)){
+ if (!basDevpService.updateById(sourceStaNo)) {
throw new CoolException("鏇存柊婧愮珯澶辫触");
}
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(dto.getLocNo());
- if (locMast.getLocSts().equals("O")){
+ if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)){
+ if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
}
@@ -1659,42 +1998,50 @@
if (Objects.isNull(locCaches)) {
throw new CoolException("搴撲綅涓嶈兘涓虹┖锛侊紒");
}
- //鑾峰彇缂撳瓨鍖轰俊鎭�
- BasAreas basAreas = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("whs_type_id", LocAreaType.LOC_AREA_TYPE_IN_CACHE.type));
+ // 鑾峰彇缂撳瓨鍖轰俊鎭�
+ BasAreas basAreas = basAreasService
+ .selectOne(new EntityWrapper<BasAreas>().eq("whs_type_id", LocAreaType.LOC_AREA_TYPE_IN_CACHE.type));
if (Objects.isNull(basAreas)) {
throw new CoolException("搴撳尯涓嶅瓨鍦紒锛�");
}
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
.eq("area_id", basAreas.getId())
- .eq("loc_id", locCaches.getId()));
+ .eq("loc_no", locCaches.getLocNo()));
if (Objects.isNull(locDetls) || locDetls.isEmpty()) {
throw new CoolException("搴撳瓨鏄庣粏涓嶅瓨鍦紒锛�");
}
- Set<String> set = locDetls.stream().map(LocDetl::getMatnr).collect(Collectors.toSet());
- List<Mat> matList = matService.selectList(new EntityWrapper<Mat>().in("matnr", set));
- if (Objects.isNull(matList) || matList.isEmpty()) {
- throw new CoolException("鐗╂枡搴撲笉瀛樺湪璇ョ墿鏂�!!");
- }
- Set<Long> longs = matList.stream().map(Mat::getTagId).collect(Collectors.toSet());
- if (!longs.isEmpty() && longs.size() > 1) {
- throw new CoolException("鐗╂枡绫诲瀷涓嶄竴鑷�,璇锋鏌ユ暟鎹槸鍚︽纭�!!");
- }
+ // Set<String> set =
+ // locDetls.stream().map(LocDetl::getMatnr).collect(Collectors.toSet());
+ // List<Mat> matList = matService.selectList(new
+ // EntityWrapper<Mat>().in("matnr", set));
+ //
+ // if (Objects.isNull(matList) || matList.isEmpty()) {
+ // throw new CoolException("鐗╂枡搴撲笉瀛樺湪璇ョ墿鏂�!!");
+ // }
+ // Set<Long> longs =
+ // matList.stream().map(Mat::getTagId).collect(Collectors.toSet());
+ // if (!longs.isEmpty() && longs.size() > 1) {
+ // throw new CoolException("鐗╂枡绫诲瀷涓嶄竴鑷�,璇锋鏌ユ暟鎹槸鍚︽纭�!!");
+ // }
- //鑾峰彇绔嬪簱鍖轰俊鎭�
- BasAreas one = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("whs_type_id", LocAreaType.LOC_AREA_TYPE_CRN.type));
+ // 鑾峰彇绔嬪簱鍖轰俊鎭�
+ BasAreas one = basAreasService
+ .selectOne(new EntityWrapper<BasAreas>().eq("whs_type_id", LocAreaType.LOC_AREA_TYPE_CRN.type));
if (Objects.isNull(one)) {
throw new CoolException("鏁版嵁閿欒锛氬簱鍖轰笉瀛樺湪锛侊紒");
}
- List<StationRela> relas = stationRelaService.selectList(new EntityWrapper<StationRela>().eq("agv_sta", station.getDevNo()));
+ List<StationRela> relas = stationRelaService
+ .selectList(new EntityWrapper<StationRela>().eq("agv_sta", station.getDevNo()));
if (Objects.isNull(relas) || relas.isEmpty()) {
throw new CoolException("绔欑偣鏈叧鑱斿爢鍨涙満浣滀笟绔欑偣锛侊紒");
}
Set<String> crnStas = relas.stream().map(StationRela::getCrnSta).collect(Collectors.toSet());
- List<BasDevp> devps = basDevpService.selectList(new EntityWrapper<BasDevp>().in("dev_no", crnStas).eq("loading", CommonStation.COMMON_STATION_Y.type));
+ List<BasDevp> devps = basDevpService.selectList(
+ new EntityWrapper<BasDevp>().in("dev_no", crnStas).eq("loading", CommonStation.COMMON_STATION_Y.type));
if (Objects.isNull(devps) || devps.isEmpty()) {
throw new CoolException("鏃犵珯鐐瑰彲鐢紒");
}
@@ -1702,31 +2049,34 @@
BasDevp basDevp = devps.stream().findFirst().get();
List<LocMast> locMasts = new ArrayList<>();
Map<String, List<LocDetl>> listMap = locDetls.stream().collect(Collectors.groupingBy(LocDetl::getMatnr));
- AtomicReference<Double> totalOut = new AtomicReference<>(locDetls.stream().mapToDouble(LocDetl::getAnfme).sum());
+ AtomicReference<Double> totalOut = new AtomicReference<>(
+ locDetls.stream().mapToDouble(LocDetl::getAnfme).sum());
listMap.forEach((matnr, detls) -> {
- //鏍规嵁supId(渚涘簲鍟�)鍒嗙被锛屽緱鍒板嚭搴撴�绘暟
+ // 鏍规嵁supId(渚涘簲鍟�)鍒嗙被锛屽緱鍒板嚭搴撴�绘暟
Map<String, List<LocDetl>> supIds = detls.stream().collect(Collectors.groupingBy(LocDetl::getStandby1));
supIds.forEach((supId, sups) -> {
Double sum = sups.stream().mapToDouble(LocDetl::getAnfme).sum();
- //鑾峰彇褰撳墠渚涘簲鍟�+ 鐗╂枡鍦ㄥ簱
+ // 鑾峰彇褰撳墠渚涘簲鍟�+ 鐗╂枡鍦ㄥ簱
List<LocDetl> detlList = locDetlService.selectList(new EntityWrapper<LocDetl>()
.eq("matnr", matnr)
.eq("area_id", one.getId())
.eq("standby1", supId).orderAsc(Arrays.asList("appe_time")));
- //TODO銆� 鍒ゆ柇鏄惁鏈夋柊搴撲綅锛屾病鏈夋柊搴撲綅锛屽啀鎵炬湁绌烘牸鐨勪綅缃斁 1. 鍒ゆ柇褰撳墠鐗╂枡鏄惁鏈夊簱瀛� 2. 娌℃湁浣欐枡鏌ヨ鏂板簱浣�
+ // TODO 鍒ゆ柇鏄惁鏈夋柊搴撲綅锛屾病鏈夋柊搴撲綅锛屽啀鎵炬湁绌烘牸鐨勪綅缃斁 1. 鍒ゆ柇褰撳墠鐗╂枡鏄惁鏈夊簱瀛� 2. 娌℃湁浣欐枡鏌ヨ鏂板簱浣�
if (!Objects.isNull(detlList) && !detlList.isEmpty()) {
- Map<String, List<LocDetl>> locMaps = detlList.stream().collect(Collectors.groupingBy(LocDetl::getLocNo));
+ Map<String, List<LocDetl>> locMaps = detlList.stream()
+ .collect(Collectors.groupingBy(LocDetl::getLocNo));
locMaps.forEach((locNo, adetls) -> {
LocMast locMast = locMastService.selectById(locNo);
if (Objects.isNull(locMast)) {
throw new CoolException("鏁版嵁閿欒锛屽簱浣嶄俊鎭笉瀛樺湪锛侊紒");
}
- BasContainer container = basContainerService.selectOne(new EntityWrapper<BasContainer>().eq("barcode", locMast.getBarcode()));
+ BasContainer container = basContainerService
+ .selectOne(new EntityWrapper<BasContainer>().eq("barcode", locMast.getBarcode()));
if (Objects.isNull(container)) {
throw new CoolException("鏁版嵁閿欒锛屽鍣ㄤ笉瀛樺湪锛侊紒");
}
Set<String> sets = adetls.stream().map(LocDetl::getMatnr).collect(Collectors.toSet());
- //鍒ゆ柇瀹瑰櫒鏄惁杩樺彲娣锋斁,鍙婂綋鍓嶇墿鏂欏彲鏀惧灏�
+ // 鍒ゆ柇瀹瑰櫒鏄惁杩樺彲娣锋斁,鍙婂綋鍓嶇墿鏂欏彲鏀惧灏�
if (container.getMixMax() > sets.size()) {
int suplus = container.getMixMax() - sets.size();
Mat mats = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", matnr));
@@ -1734,9 +2084,9 @@
throw new CoolException("鐗╂枡涓嶅瓨鍦紒锛�");
}
Double v = mats.getUpQty() * suplus;
- //灏忎簬闆�
+ // 灏忎簬闆�
if (sum.compareTo(v) <= 0) {
- //鍙斁涓�
+ // 鍙斁涓�
locMasts.add(locMast);
totalOut.set(Math.round((totalOut.get() - sum) * 10000) / 10000.0);
}
@@ -1746,28 +2096,28 @@
});
});
- //鍒ゆ柇鏍规嵁鍒嗘嫞鍑哄簱鍚�,杩橀渶瑕佸嚭澶氬皯鎵樼洏鎴栨枡绠�;濡傛灉浣欐枡澶т簬0, 鍑烘柊鎵樼洏鎴栨枡绠�
+ // 鍒ゆ柇鏍规嵁鍒嗘嫞鍑哄簱鍚�,杩橀渶瑕佸嚭澶氬皯鎵樼洏鎴栨枡绠�;濡傛灉浣欐枡澶т簬0, 鍑烘柊鎵樼洏鎴栨枡绠�
if (totalOut.get().compareTo(0.0) > 0) {
-// Set<String> matnrs = locDetls.stream().map(LocDetl::getMatnr).collect(Collectors.toSet());
-// List<Mat> mats = matService.selectList(new EntityWrapper<Mat>().in("matnr", matnrs));
+ // Set<String> matnrs =
+ // locDetls.stream().map(LocDetl::getMatnr).collect(Collectors.toSet());
+ // List<Mat> mats = matService.selectList(new EntityWrapper<Mat>().in("matnr",
+ // matnrs));
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
- //todo 鏍规嵁鐗╂枡绉嶇被,鍖哄垎搴撳尯绫诲瀷
+ // todo 鏍规嵁鐗╂枡绉嶇被,鍖哄垎搴撳尯绫诲瀷
.eq("loc_sts", LocStsType.LOC_STS_TYPE_D.type)
.orderAsc(Arrays.asList("row1", "bay1", "lev1"))
.last("OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY"));
locMasts.add(locMast);
-
- //绌烘澘鍑哄簱
+ // 绌烘澘鍑哄簱
generateTask(locMasts, TaskIOType.EMPTY_OUT.type, basDevp, userId);
-
} else {
- if (!locMasts.isEmpty()) {
- //鐢熸垚鍫嗗灈鏈哄嚭搴撲换鍔�
- generateTask(locMasts, TaskIOType.MERGE_OUT.type, basDevp, userId);
- }
+ // 鐢熸垚鍫嗗灈鏈哄嚭搴撲换鍔�
+ generateTask(locMasts, TaskIOType.MERGE_OUT.type, basDevp, userId);
+ // if (!locMasts.isEmpty()) {
+ //
+ // }
}
}
-
/**
* 鐢熸垚鍫嗗灈鏈哄嚭搴撲换鍔�
@@ -1813,7 +2163,8 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + locMast.getLocNo());
}
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
+ List<LocDetl> locDetls = locDetlService
+ .selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
for (LocDetl detlDto : locDetls) {
@@ -1830,9 +2181,10 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
}
- // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
+ // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
locMast = locMastService.selectById(locMast.getLocNo());
- if (locMast.getLocSts().equals(LocStsType.LOC_STS_TYPE_F.type)) {
+ if (locMast.getLocSts().equals(LocStsType.LOC_STS_TYPE_F.type)
+ || locMast.getLocSts().equals(LocStsType.LOC_STS_TYPE_D.type)) {
locMast.setLocSts(ioType == 101 ? "R" : "P");
locMast.setModiUser(userId);
locMast.setModiTime(now);
@@ -1860,7 +2212,7 @@
task.setWrkNo(workNo)
.setIoTime(new Date())
.setWrkSts(11L) // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
- .setIoType(loc.getLocSts().equals("D") ? 110 : 103) // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
+ .setIoType(loc.getLocSts().equals("D") ? 110 : 101) // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
.setTaskType("agv")
.setIoPri(10D)
.setFullPlt(loc.getLocSts().equals("D") ? "N" : "Y") // 婊℃澘锛歒
@@ -1900,12 +2252,11 @@
.setModel(pakin.getModel())
.setAppeTime(new Date())
.setModiUser(userId);
- taskDetls.add(wrkDetl);
+ // 淇濆瓨宸ヤ綔妗ｆ槑缁�
+ if (!taskDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
});
- //淇濆瓨宸ヤ綔妗ｆ槑缁�
- if (!taskDetlService.insertBatch(taskDetls)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
- }
}
loc.setLocSts(LocStsType.LOC_STS_TYPE_R.type);
@@ -1941,6 +2292,11 @@
if (Objects.isNull(pakins) || pakins.isEmpty()) {
throw new CoolException("缁勬墭淇℃伅涓嶅瓨鍦紒锛�");
}
+
+ List<Task> tasks = taskService.selectList(new EntityWrapper<Task>().eq("barcode", barcode));
+ if (!tasks.isEmpty()) {
+ throw new CoolException("鎵樼洏宸插湪浠诲姟鎵ц涓�..");
+ }
// 鑾峰彇宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.PICK.type);
// 淇濆瓨宸ヤ綔妗�
@@ -1967,11 +2323,10 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
- List<TaskDetl> taskDetls = new ArrayList<>();
- pakins.forEach(pakin -> {
+ for (WaitPakin pakin : pakins) {
TaskDetl wrkDetl = new TaskDetl();
BeanUtils.copyProperties(pakin, wrkDetl);
- wrkDetl.setWrkNo(workNo)
+ wrkDetl.setId(null).setWrkNo(workNo)
.setIoTime(new Date())
.setOrderNo(pakin.getOrderNo())
.setAnfme(pakin.getAnfme())
@@ -1984,20 +2339,17 @@
.setModel(pakin.getModel())
.setAppeTime(new Date())
.setModiUser(userId);
- taskDetls.add(wrkDetl);
- });
+ if (!taskDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
- //淇濆瓨宸ヤ綔妗ｆ槑缁�
- if (!taskDetlService.insertBatch(taskDetls)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
- pakins.forEach(pakin -> {
+ for (WaitPakin pakin : pakins) {
pakin.setIoStatus("Y");
- });
-
- if (!waitPakinService.updateBatchById(pakins)) {
- throw new CoolException("鏇存柊缁勬墭淇℃伅澶辫触");
+ if (!waitPakinService.updateById(pakin)) {
+ throw new CoolException("鏇存柊缁勬墭淇℃伅澶辫触");
+ }
}
// 淇敼鐩爣搴撲綅鐘舵��
@@ -2014,7 +2366,11 @@
// 淇敼鐩爣绔欑偣淇℃伅
BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", orgSite));
- if (station.getLocSts().equals("O")) {
+ if (Objects.isNull(station)) {
+ throw new CoolException("绔欑偣涓嶅瓨鍦�!!");
+ }
+
+ if (station.getLocSts().equals(LocStsType.LOC_STS_TYPE_O.type)) {
station.setLocSts("R"); // S.鍏ュ簱棰勭害
station.setBarcode(barcode);
station.setModiTime(new Date());
@@ -2027,7 +2383,6 @@
}
}
-
public HIKResultDTO sendAgvTask(HIKApiDTO haiKangApiDTO, String path) {
HIKResultDTO result = new HIKResultDTO();
@@ -2038,8 +2393,10 @@
forwardAGVTaskParam.setCtnrTyp(haiKangApiDTO.getCtnrType());
forwardAGVTaskParam.setPriority(haiKangApiDTO.getPriority());
List<ForwardAGVTaskDTO.PositionCodePaths> positionCodePathsList = new ArrayList<>();
- positionCodePathsList.add(new ForwardAGVTaskDTO.PositionCodePaths(haiKangApiDTO.getOrg(), haiKangApiDTO.getOrgType()));
- positionCodePathsList.add(new ForwardAGVTaskDTO.PositionCodePaths(haiKangApiDTO.getTar(), haiKangApiDTO.getTarType()));
+ positionCodePathsList
+ .add(new ForwardAGVTaskDTO.PositionCodePaths(haiKangApiDTO.getOrg(), haiKangApiDTO.getOrgType()));
+ positionCodePathsList
+ .add(new ForwardAGVTaskDTO.PositionCodePaths(haiKangApiDTO.getTar(), haiKangApiDTO.getTarType()));
forwardAGVTaskParam.setPositionCodePath(positionCodePathsList);
String body = JSON.toJSONString(forwardAGVTaskParam);
@@ -2058,7 +2415,7 @@
result.setMessage(jsonObject.getString("message"));
log.error("鍙戦�乤gv浠诲姟澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", HIKApiConstant.AGV_IP + path, body, response);
}
-// {"code":"1","data":"","interrupt":false,"message":"閲嶅鎻愪氦","msgErrCode":"0x3a80D012","reqCode":"fa92b49481a44627ae4d80c1400f28f6"}
+ // {"code":"1","data":"","interrupt":false,"message":"閲嶅鎻愪氦","msgErrCode":"0x3a80D012","reqCode":"fa92b49481a44627ae4d80c1400f28f6"}
} catch (Exception e) {
result.setMessage(e.getMessage());
log.error("鍙戦�乤gv浠诲姟寮傚父", e);
@@ -2072,8 +2429,7 @@
"127.0.0.1",
body,
response,
- result.isSuccess()
- );
+ result.isSuccess());
} catch (Exception e) {
log.error("", e);
}
--
Gitblit v1.9.1