From f3e116dd3bbdd132cd5cb49c99cbf9ba59f112d8 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期六, 31 一月 2026 08:40:47 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 112 insertions(+), 0 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 6c976ca..6fc2806 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -13,10 +13,13 @@
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 org.springframework.beans.BeanUtils;
@@ -43,6 +46,8 @@
private MatService matService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private RowLastnoService rowLastnoService;
/**
* 閫氱煡WCS閿佸畾搴撲綅锛屽強绂佹褰撳墠搴撲綅鐨勪竴鍒囨搷浣�
@@ -150,6 +155,7 @@
}
return R.ok();
}
+
/**
* 鍫嗗灈鏈烘墽琛岀姸鎬佷笂鎶�
*
@@ -191,6 +197,7 @@
/**
* 鐛插彇搴綅淇℃伅
+ *
* @param params
* @return
*/
@@ -234,6 +241,7 @@
/**
* 鏉＄爜绔欏叆搴撶敵璇�
+ *
* @param combParam
* @param l
* @return
@@ -242,4 +250,108 @@
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