From 518099da49917ed319318dc88860e3c5bbf04925 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期日, 01 二月 2026 17:20:04 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 151 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
index 994112b..599d58b 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -12,12 +12,17 @@
import com.zy.api.entity.dto.LocMastDto;
import com.zy.api.service.WcsApiService;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.CompleteParam;
+import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.LocDetlServiceImpl;
import com.zy.asrs.service.impl.MatServiceImpl;
+import com.zy.asrs.service.impl.RowLastnoServiceImpl;
import com.zy.asrs.service.impl.WrkDetlServiceImpl;
+import com.zy.asrs.utils.Utils;
import com.zy.common.constant.MesConstant;
import com.zy.common.utils.HttpHandler;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -27,6 +32,9 @@
import java.util.*;
import java.util.stream.Collectors;
+import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
+
+@Slf4j
@Service
public class WcsApiServiceImpl implements WcsApiService {
@@ -42,6 +50,8 @@
private MatService matService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private RowLastnoService rowLastnoService;
/**
* 閫氱煡WCS閿佸畾搴撲綅锛屽強绂佹褰撳墠搴撲綅鐨勪竴鍒囨搷浣�
@@ -121,34 +131,43 @@
if (Objects.isNull(params.getTaskNo())) {
return R.error("浠诲姟鍙蜂笉鑳戒负绌猴紒锛�");
}
- if (Objects.isNull(params.getBarcode())) {
- return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
- }
- if (Objects.isNull(params.getLocNo())) {
- return R.error("鐩爣搴撲綅涓嶈兘涓虹┖锛侊紒");
- }
+// if (params.getType().equals("in"))
+// if (Objects.isNull(params.getBarcode())) {
+// return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+// }
+// if (Objects.isNull(params.getLocNo())) {
+// return R.error("鐩爣搴撲綅涓嶈兘涓虹┖锛侊紒");
+// }
String url = MesConstant.PUB_TASK_IN;
- if (Objects.isNull(params.getType()) && params.getType().equals("out")) {
+ if (!Objects.isNull(params.getType()) && params.getType().equals("out")) {
url = MesConstant.PUB_TASK_OUT;
}
+
+ log.info("鍑哄簱浠诲姟涓嬪彂鍙傛暟锛歿}", JSON.toJSONString(params));
String response;
try {
response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
+ .setUri(MesConstant.WCS_URL)
.setPath(url)
.setJson(JSON.toJSONString(params))
.build()
.doPost();
- R result = JSON.parseObject(response, R.class);
+ Map<String, Object> result = JSON.parseObject(response, Map.class);
- if (result.get("code").equals("200")) {
+ if (result.get("code").equals(200)) {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", params.getTaskNo()));
+ wrkMast.setWrkSts(12L);
+ wrkMastService.updateById(wrkMast);
//TODO 涓婃姤鏄惁鎴愬姛
+ } else {
+ return R.error().add(result);
}
} catch (IOException e) {
throw new RuntimeException(e);
}
return R.ok();
}
+
/**
* 鍫嗗灈鏈烘墽琛岀姸鎬佷笂鎶�
*
@@ -160,22 +179,23 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R receviceTaskFromWcs(ReceviceTaskParams params) {
- if (Objects.isNull(params.getWrkNo())) {
+ if (Objects.isNull(params.getSuperTaskNo())) {
throw new CoolException("WMS浠诲姟鍙蜂笉鑳戒负绌猴紒锛�");
}
if (Objects.isNull(params.getNotifyType())) {
throw new CoolException("鍔ㄤ綔绫诲瀷涓嶈兘涓虹┖锛侊紒");
}
- WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", params.getWrkNo()));
+ WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", params.getSuperTaskNo()));
if (Objects.isNull(mast)) {
throw new CoolException("浠诲姟妗ｄ笉瀛樺湪锛侊紒");
}
+ log.info("浠诲姟鎵ц鍙傛暟鍥炲啓:{}", JSON.toJSONString(params));
if (params.getNotifyType().equals("task")) {
//浠诲姟
if (params.getMsgType().equals("task_complete")) {
- if (mast.getIoType() == 1) {
+ if (mast.getIoType() == 1 || mast.getIoType() == 10 || mast.getIoType() == 53 || mast.getIoType() == 54 || mast.getIoType() == 57) {
mast.setWrkSts(4L);
- } else if (mast.getIoType() == 101) {
+ } else if (mast.getIoType() == 101 || mast.getIoType() == 110 || mast.getIoType() == 103 || mast.getIoType() == 104 || mast.getIoType() == 107) {
mast.setWrkSts(14L);
}
if (!wrkMastService.updateById(mast)) {
@@ -190,6 +210,7 @@
/**
* 鐛插彇搴綅淇℃伅
+ *
* @param params
* @return
*/
@@ -230,4 +251,120 @@
public R getStations(Map<String, String> params) {
return null;
}
+
+ /**
+ * 鏉＄爜绔欏叆搴撶敵璇�
+ *
+ * @param combParam
+ * @param l
+ * @return
+ */
+ @Override
+ public R combInPub(CompleteParam combParam, long l) {
+ return null;
+ }
+
+ /**
+ * WCS鐢宠浠诲姟閲嶆柊鍒嗛厤鍏ュ簱
+ *
+ * @param params
+ * @return
+ */
+ @Override
+ public R repeatLoc(CompleteParam params) {
+ if (Objects.isNull(params.getTaskNo())) {
+ return R.error("宸ヤ綔鍙蜂笉鑳戒负绌猴紒锛�");
+ }
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", params.getTaskNo()));
+ if (Objects.isNull(wrkMast)) {
+ return R.error("浠诲姟妗ｄ笉瀛樺湪锛屾垨宸插姞鍏ュ巻鍙叉。");
+ }
+ LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+ if (Objects.isNull(locMast)) {
+ return R.error("搴撲綅淇℃伅涓嶅瓨鍦紒锛�");
+ }
+
+ Integer whsType = Utils.GetWhsType(Integer.parseInt(wrkMast.getSourceStaNo()));
+ if (whsType.equals(1)) {
+ RowLastno lastno = rowLastnoService.selectById(whsType);
+ if (Objects.isNull(lastno)) {
+ return R.error("鍫嗗灈瑕佺瓥鐣ヤ笉瀛樺湪锛侊紒");
+ }
+ if (locMast.getRow1().equals(141)) {
+ LocMast selectOne = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .ne("row1", 141)
+ .ge("crn_no", lastno.getsCrnNo())
+ .le("crn_no", lastno.geteCrnNo())
+ .eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type)
+ .orderAsc(Arrays.asList("row1", "bay1", "lev1")));
+ if (!Objects.isNull(selectOne)) {
+ Map<String, Object> response = new HashMap<>();
+ response.put("locNo", selectOne.getLocNo());
+
+ //鍘熷簱浣嶇疆绌�
+ locMast.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
+ locMastService.updateById(locMast);
+
+ //鏂板簱浣嶉绾﹀叆搴�
+ selectOne.setLocSts(LocStsType.LOC_STS_TYPE_S.type);
+ locMastService.updateById(selectOne);
+
+ wrkMast.setLocNo(selectOne.getLocNo());
+ wrkMastService.updateById(wrkMast);
+
+ return R.ok().add(response);
+ } else {
+ return R.error("鏆傛棤鍙敤搴撲綅锛侊紒");
+ }
+ } else {
+ LocMast selectOne = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("crn_no", wrkMast.getCrnNo())
+ .eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type)
+ .orderAsc(Arrays.asList("row1", "bay1", "lev1")));
+ if (!Objects.isNull(selectOne)) {
+ Map<String, Object> response = new HashMap<>();
+ response.put("locNo", selectOne.getLocNo());
+
+ //鍘熷簱浣嶇疆绌�
+ locMast.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
+ locMastService.updateById(locMast);
+
+ //鏂板簱浣嶉绾﹀叆搴�
+ selectOne.setLocSts(LocStsType.LOC_STS_TYPE_S.type);
+ locMastService.updateById(selectOne);
+
+ wrkMast.setLocNo(selectOne.getLocNo());
+ wrkMastService.updateById(wrkMast);
+
+ return R.ok().add(response);
+ } else {
+ return R.error("鏆傛棤鍙敤搴撲綅锛侊紒");
+ }
+ }
+ } else {
+ LocMast selectOne = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("crn_no", wrkMast.getCrnNo())
+ .eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type)
+ .orderAsc(Arrays.asList("row1", "bay1", "lev1")));
+ if (!Objects.isNull(selectOne)) {
+ Map<String, Object> response = new HashMap<>();
+ response.put("locNo", selectOne.getLocNo());
+
+ //鍘熷簱浣嶇疆绌�
+ locMast.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
+ locMastService.updateById(locMast);
+
+ //鏂板簱浣嶉绾﹀叆搴�
+ selectOne.setLocSts(LocStsType.LOC_STS_TYPE_S.type);
+ locMastService.updateById(selectOne);
+
+ wrkMast.setLocNo(selectOne.getLocNo());
+ wrkMastService.updateById(wrkMast);
+
+ return R.ok().add(response);
+ } else {
+ return R.error("鏆傛棤鍙敤搴撲綅锛侊紒");
+ }
+ }
+ }
}
--
Gitblit v1.9.1